diff --git a/ui/components/app/account-menu/account-menu.component.js b/ui/components/app/account-menu/account-menu.component.js index e4cb629c7..880f93aa1 100644 --- a/ui/components/app/account-menu/account-menu.component.js +++ b/ui/components/app/account-menu/account-menu.component.js @@ -31,21 +31,14 @@ import { ///: END:ONLY_INCLUDE_IN } from '../../../helpers/constants/routes'; import TextField from '../../ui/text-field'; -import IconCheck from '../../ui/icon/icon-check'; import IconCog from '../../ui/icon/icon-cog'; import IconImport from '../../ui/icon/icon-import'; import Button from '../../ui/button'; import SearchIcon from '../../ui/icon/search-icon'; import { SUPPORT_LINK } from '../../../../shared/lib/ui-utils'; -import { Color } from '../../../helpers/constants/design-system'; -import { - Icon, - ICON_NAMES, - ///: BEGIN:ONLY_INCLUDE_IN(flask) - ICON_SIZES, - ///: END:ONLY_INCLUDE_IN -} from '../../component-library'; +import { IconColor } from '../../../helpers/constants/design-system'; +import { Icon, ICON_NAMES, ICON_SIZES } from '../../component-library'; import KeyRingLabel from './keyring-label'; export function AccountMenuItem(props) { @@ -231,7 +224,11 @@ export default class AccountMenu extends Component { >
{isSelected ? ( - + ) : null}
@@ -377,7 +374,7 @@ export default class AccountMenu extends Component { icon={ } @@ -422,7 +419,10 @@ export default class AccountMenu extends Component { } }} icon={ - + } text={t('connectHardwareWallet')} /> @@ -468,7 +468,10 @@ export default class AccountMenu extends Component { global.platform.openTab({ url: supportLink }); }} icon={ - + } text={supportText} /> diff --git a/ui/components/app/dropdowns/network-dropdown.js b/ui/components/app/dropdowns/network-dropdown.js index f54c8ddce..f15bbe5af 100644 --- a/ui/components/app/dropdowns/network-dropdown.js +++ b/ui/components/app/dropdowns/network-dropdown.js @@ -22,8 +22,8 @@ import { ADD_POPULAR_CUSTOM_NETWORK, ADVANCED_ROUTE, } from '../../../helpers/constants/routes'; -import IconCheck from '../../ui/icon/icon-check'; +import { Icon, ICON_NAMES } from '../../component-library'; import { Dropdown, DropdownMenuItem } from './dropdown'; // classes from nodes of the toggle element. @@ -175,7 +175,7 @@ class NetworkDropdown extends Component { }} > {isCurrentRpcTarget ? ( - + ) : (
)} @@ -243,7 +243,7 @@ class NetworkDropdown extends Component { style={DROP_DOWN_MENU_ITEM_STYLE} > {providerType === network ? ( - + ) : (
)} diff --git a/ui/components/app/modals/metametrics-opt-in-modal/__snapshots__/metametrics-opt-in-modal.test.js.snap b/ui/components/app/modals/metametrics-opt-in-modal/__snapshots__/metametrics-opt-in-modal.test.js.snap index 199f7c2b7..4b6a393d2 100644 --- a/ui/components/app/modals/metametrics-opt-in-modal/__snapshots__/metametrics-opt-in-modal.test.js.snap +++ b/ui/components/app/modals/metametrics-opt-in-modal/__snapshots__/metametrics-opt-in-modal.test.js.snap @@ -237,8 +237,9 @@ exports[`MetaMetrics Opt In should match snapshot 1`] = `
-
-
- +
{t('metametricsCommitmentsAllowOptOut')}
- +
{t('metametricsCommitmentsSendAnonymizedEvents')}
diff --git a/ui/components/app/modals/transaction-confirmed/__snapshots__/transaction-confirmed.test.js.snap b/ui/components/app/modals/transaction-confirmed/__snapshots__/transaction-confirmed.test.js.snap index becdc38e4..5368bd397 100644 --- a/ui/components/app/modals/transaction-confirmed/__snapshots__/transaction-confirmed.test.js.snap +++ b/ui/components/app/modals/transaction-confirmed/__snapshots__/transaction-confirmed.test.js.snap @@ -11,8 +11,9 @@ exports[`Transaction Confirmed should match snapshot 1`] = `
-
-
{`${t('confirmed')}!`} diff --git a/ui/components/ui/editable-label/editable-label.js b/ui/components/ui/editable-label/editable-label.js index 9fd9f1d50..2445aa527 100644 --- a/ui/components/ui/editable-label/editable-label.js +++ b/ui/components/ui/editable-label/editable-label.js @@ -58,12 +58,11 @@ export default class EditableLabel extends Component { })} autoFocus /> - + />
{errorMessage}
diff --git a/ui/components/ui/form-field/form-field.stories.js b/ui/components/ui/form-field/form-field.stories.js index f570350ea..38cd19dc9 100644 --- a/ui/components/ui/form-field/form-field.stories.js +++ b/ui/components/ui/form-field/form-field.stories.js @@ -70,7 +70,7 @@ export const FormFieldWithTitleDetail = (args) => { Click Me ), - checkmark: , + checkmark: , }; return ; diff --git a/ui/components/ui/icon/icon-check.js b/ui/components/ui/icon/icon-check.js deleted file mode 100644 index 02586e7d1..000000000 --- a/ui/components/ui/icon/icon-check.js +++ /dev/null @@ -1,47 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; - -/** - * @deprecated This has been deprecated in favour of the `` component in ./ui/components/component-library/icon/icon.js - * See storybook documentation for Icon here https://metamask.github.io/metamask-storybook/?path=/docs/components-componentlibrary-icon--default-story#icon - */ - -const IconCheck = ({ - size = 24, - color = 'currentColor', - ariaLabel, - className, -}) => ( - - - -); - -IconCheck.propTypes = { - /** - * The size of the Icon follows an 8px grid 2 = 16px, 3 = 24px etc - */ - size: PropTypes.number, - /** - * The color of the icon accepts design token css variables - */ - color: PropTypes.string, - /** - * An additional className to assign the Icon - */ - className: PropTypes.string, - /** - * The aria-label of the icon for accessibility purposes - */ - ariaLabel: PropTypes.string, -}; - -export default IconCheck; diff --git a/ui/components/ui/icon/icon.stories.js b/ui/components/ui/icon/icon.stories.js index 00a88adf1..ee2939a42 100644 --- a/ui/components/ui/icon/icon.stories.js +++ b/ui/components/ui/icon/icon.stories.js @@ -22,7 +22,6 @@ import SendIcon from './send-icon.component'; import Sign from './sign-icon.component'; import SunCheck from './sun-check-icon.component'; import Swap from './swap-icon-for-list.component'; -import IconCheck from './icon-check'; import IconCog from './icon-cog'; import IconImport from './icon-import'; import IconEye from './icon-eye'; @@ -117,7 +116,6 @@ export const DefaultStory = (args) => ( gridTemplateColumns: 'repeat(auto-fill, 176px)', }} > - } /> } /> } /> } /> diff --git a/ui/pages/onboarding-flow/create-password/create-password.js b/ui/pages/onboarding-flow/create-password/create-password.js index 02f8e1e0d..6fa0b5f66 100644 --- a/ui/pages/onboarding-flow/create-password/create-password.js +++ b/ui/pages/onboarding-flow/create-password/create-password.js @@ -32,6 +32,7 @@ import { getFirstTimeFlowType, getCurrentKeyring } from '../../../selectors'; import { FIRST_TIME_FLOW_TYPES } from '../../../helpers/constants/onboarding'; import { MetaMetricsContext } from '../../../contexts/metametrics'; import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics'; +import { Icon, ICON_NAMES } from '../../../components/component-library'; export default function CreatePassword({ createNewAccount, @@ -220,7 +221,7 @@ export default function CreatePassword({ titleDetail={ isValid && (
- +
) } diff --git a/ui/pages/onboarding-flow/metametrics/index.scss b/ui/pages/onboarding-flow/metametrics/index.scss index 0848a8aa4..b8654373e 100644 --- a/ui/pages/onboarding-flow/metametrics/index.scss +++ b/ui/pages/onboarding-flow/metametrics/index.scss @@ -20,16 +20,6 @@ } } - .fa { - width: 16px; - } - - .fa-check { - margin-inline-end: 12px; - color: var(--color-success-default); - padding-top: 2px; - } - .fa-times { margin-inline-end: 12px; color: var(--color-error-default); diff --git a/ui/pages/onboarding-flow/metametrics/metametrics.js b/ui/pages/onboarding-flow/metametrics/metametrics.js index fa149e9eb..38d76770f 100644 --- a/ui/pages/onboarding-flow/metametrics/metametrics.js +++ b/ui/pages/onboarding-flow/metametrics/metametrics.js @@ -7,6 +7,7 @@ import { FONT_WEIGHT, TEXT_ALIGN, TextColor, + IconColor, } from '../../../helpers/constants/design-system'; import Button from '../../../components/ui/button'; import { useI18nContext } from '../../../hooks/useI18nContext'; @@ -19,6 +20,7 @@ import { import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics'; import { MetaMetricsContext } from '../../../contexts/metametrics'; +import { Icon, ICON_NAMES } from '../../../components/component-library'; export default function OnboardingMetametrics() { const t = useI18nContext(); @@ -86,11 +88,19 @@ export default function OnboardingMetametrics() {
  • - + {t('onboardingMetametricsAllowOptOut')}
  • - + {t('onboardingMetametricsSendAnonymize')}
  • diff --git a/ui/pages/permissions-connect/redirect/permissions-redirect.component.js b/ui/pages/permissions-connect/redirect/permissions-redirect.component.js index 4524e6687..9313077dd 100644 --- a/ui/pages/permissions-connect/redirect/permissions-redirect.component.js +++ b/ui/pages/permissions-connect/redirect/permissions-redirect.component.js @@ -10,6 +10,11 @@ import { AlignItems, } from '../../../helpers/constants/design-system'; import { I18nContext } from '../../../contexts/i18n'; +import { + Icon, + ICON_NAMES, + ICON_SIZES, +} from '../../../components/component-library'; export default function PermissionsRedirect({ subjectMetadata }) { const t = useContext(I18nContext); @@ -36,7 +41,11 @@ export default function PermissionsRedirect({ subjectMetadata }) { alignItems={AlignItems.center} justifyContent={JustifyContent.center} > - +
    {hasSelectedAddress ? ( - ) : ( {isCurrentRpcTarget ? ( - + ) : ( -