m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Fix #17362 - Ensure NFT icons are correct (#17440)

Browse Source 
* Fix #17362 - Ensure NFT icons are correct

* Update trash icon
This commit is contained in:
David Walsh 2023-01-27 08:32:03 -06:00 committed by GitHub
parent b21e0df4fa
commit 6ee2d07706
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/components/app/collectible-options/collectible-options.js
View File

@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
import { I18nContext } from '../../../contexts/i18n'; import { I18nContext } from '../../../contexts/i18n';
import { Menu, MenuItem } from '../../ui/menu'; import { Menu, MenuItem } from '../../ui/menu';
import { ICON_NAMES } from '../../component-library';
const CollectibleOptions = ({ onRemove, onViewOnOpensea }) => { const CollectibleOptions = ({ onRemove, onViewOnOpensea }) => {
const t = useContext(I18nContext); const t = useContext(I18nContext);
@ -25,7 +26,7 @@ const CollectibleOptions = ({ onRemove, onViewOnOpensea }) => {
> >
{onViewOnOpensea ? ( {onViewOnOpensea ? (
<MenuItem <MenuItem
iconClassName="fas fa-qrcode" iconName={ICON_NAMES.EXPORT}
data-testid="collectible-options__view-on-opensea" data-testid="collectible-options__view-on-opensea"
onClick={() => { onClick={() => {
setCollectibleOptionsOpen(false); setCollectibleOptionsOpen(false);
@ -36,7 +37,7 @@ const CollectibleOptions = ({ onRemove, onViewOnOpensea }) => {
</MenuItem> </MenuItem>
) : null} ) : null}
<MenuItem <MenuItem
iconClassName="fas fa-trash-alt collectible-options__icon" iconName={ICON_NAMES.TRASH}
data-testid="collectible-options__hide" data-testid="collectible-options__hide"
onClick={() => { onClick={() => {
setCollectibleOptionsOpen(false); setCollectibleOptionsOpen(false);

8
ui/components/ui/menu/menu-item.js
View File

@ -2,11 +2,14 @@ import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import classnames from 'classnames'; import classnames from 'classnames';
import { Icon, ICON_SIZES } from '../../component-library';
const MenuItem = ({ const MenuItem = ({
children, children,
className, className,
'data-testid': dataTestId, 'data-testid': dataTestId,
iconClassName, iconClassName,
iconName,
onClick, onClick,
subtitle, subtitle,
}) => ( }) => (
@ -18,6 +21,9 @@ const MenuItem = ({
{iconClassName ? ( {iconClassName ? (
<i className={classnames('menu-item__icon', iconClassName)} /> <i className={classnames('menu-item__icon', iconClassName)} />
) : null} ) : null}
{iconName ? (
<Icon name={iconName} size={ICON_SIZES.SM} marginRight={2} />
) : null}
<span>{children}</span> <span>{children}</span>
{subtitle} {subtitle}
</button> </button>
@ -28,6 +34,7 @@ MenuItem.propTypes = {
className: PropTypes.string, className: PropTypes.string,
'data-testid': PropTypes.string, 'data-testid': PropTypes.string,
iconClassName: PropTypes.string, iconClassName: PropTypes.string,
iconName: PropTypes.string,
onClick: PropTypes.func, onClick: PropTypes.func,
subtitle: PropTypes.node, subtitle: PropTypes.node,
}; };
@ -36,6 +43,7 @@ MenuItem.defaultProps = {
className: undefined, className: undefined,
'data-testid': undefined, 'data-testid': undefined,
iconClassName: undefined, iconClassName: undefined,
iconName: undefined,
onClick: undefined, onClick: undefined,
subtitle: undefined, subtitle: undefined,
}; };