From 36be38e9790400583f5483b666039ecb2404066e Mon Sep 17 00:00:00 2001 From: George Marshall Date: Mon, 17 Jul 2023 22:02:02 -0700 Subject: [PATCH] Update Text import paths: /multichain (#20061) * Updating import paths for Text component * Updating snapshots * Adding story for TokenCell * Updating banner in account details * Fixing lint issue by removing unused import --- .../__snapshots__/token-cell.test.js.snap | 6 ++-- .../app/token-cell/token-cell.stories.js | 33 +++++++++++++++++++ .../account-details-authenticate.js | 10 +++--- .../account-details/account-details-key.js | 3 +- .../account-details/account-details.js | 2 +- .../account-list-item-menu.js | 2 +- .../account-list-item.test.js.snap | 8 ++--- .../account-list-item/account-list-item.js | 2 +- .../account-list-menu/account-list-menu.js | 2 +- .../__snapshots__/account-picker.test.js.snap | 2 +- .../account-picker/account-picker.js | 2 +- .../__snapshots__/app-header.test.js.snap | 2 +- .../multichain/global-menu/global-menu.js | 11 ++++--- .../__snapshots__/json.test.tsx.snap | 2 +- .../import-account/import-account.js | 3 +- .../multichain/import-account/json.js | 2 +- .../network-list-menu/network-list-menu.js | 2 +- .../product-tour-popover.js | 9 +++-- .../token-list-item.test.js.snap | 6 ++-- .../token-list-item/token-list-item.js | 2 +- 20 files changed, 77 insertions(+), 34 deletions(-) create mode 100644 ui/components/app/token-cell/token-cell.stories.js diff --git a/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap b/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap index bfc4fd66e..6013ae4af 100644 --- a/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap +++ b/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap @@ -51,7 +51,7 @@ exports[`Token Cell should match snapshot 1`] = ` title="" >

TEST

@@ -59,11 +59,11 @@ exports[`Token Cell should match snapshot 1`] = `

5.000 diff --git a/ui/components/app/token-cell/token-cell.stories.js b/ui/components/app/token-cell/token-cell.stories.js new file mode 100644 index 000000000..caa3a55cb --- /dev/null +++ b/ui/components/app/token-cell/token-cell.stories.js @@ -0,0 +1,33 @@ +import React from 'react'; +import TokenListItem from '.'; + +export default { + title: 'Components/App/TokenCell', + argTypes: { + address: { + control: 'text', + }, + symbol: { + control: 'text', + }, + string: { + control: 'text', + }, + onClick: { + action: 'onClick', + }, + image: { + control: 'text', + }, + }, + args: { + address: '0xAnotherToken', + symbol: 'TEST', + string: '5.000', + currentCurrency: 'usd', + }, +}; + +export const DefaultStory = (args) => ; + +DefaultStory.storyName = 'Default'; diff --git a/ui/components/multichain/account-details/account-details-authenticate.js b/ui/components/multichain/account-details/account-details-authenticate.js index d0deb1203..01e945308 100644 --- a/ui/components/multichain/account-details/account-details-authenticate.js +++ b/ui/components/multichain/account-details/account-details-authenticate.js @@ -14,7 +14,7 @@ import { FormTextField, Box, } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; + import { useI18nContext } from '../../../hooks/useI18nContext'; import { exportAccount, hideWarning } from '../../../store/actions'; @@ -60,9 +60,11 @@ export const AccountDetailsAuthenticate = ({ address, onCancel }) => { labelProps={{ fontWeight: FontWeight.Medium }} autoFocus /> - - {t('privateKeyWarning')} - + {t('cancel')} diff --git a/ui/components/multichain/account-details/account-details-key.js b/ui/components/multichain/account-details/account-details-key.js index e8358006f..8726b8aca 100644 --- a/ui/components/multichain/account-details/account-details-key.js +++ b/ui/components/multichain/account-details/account-details-key.js @@ -6,8 +6,9 @@ import { ButtonPrimary, IconName, Box, + Text, } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; + import { AlignItems, BorderColor, diff --git a/ui/components/multichain/account-details/account-details.js b/ui/components/multichain/account-details/account-details.js index d8bb25339..249e272ed 100644 --- a/ui/components/multichain/account-details/account-details.js +++ b/ui/components/multichain/account-details/account-details.js @@ -15,8 +15,8 @@ import { ModalHeader, ModalOverlay, Box, + Text, } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; import { getMetaMaskAccountsOrdered } from '../../../selectors'; import { useI18nContext } from '../../../hooks/useI18nContext'; import { diff --git a/ui/components/multichain/account-list-item-menu/account-list-item-menu.js b/ui/components/multichain/account-list-item-menu/account-list-item-menu.js index 68bb478fd..d066dcc7f 100644 --- a/ui/components/multichain/account-list-item-menu/account-list-item-menu.js +++ b/ui/components/multichain/account-list-item-menu/account-list-item-menu.js @@ -30,8 +30,8 @@ import { PopoverPosition, ModalFocus, PopoverRole, + Text, } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; import { MetaMetricsEventCategory, MetaMetricsEventLinkType, diff --git a/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap b/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap index cd5df6672..248a913dc 100644 --- a/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap +++ b/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap @@ -58,7 +58,7 @@ exports[`AccountListItem renders AccountListItem component and shows account nam class="mm-box mm-box--display-flex mm-box--justify-content-space-between" >

0x0dc...e7bc

Account 1 diff --git a/ui/components/multichain/account-picker/account-picker.js b/ui/components/multichain/account-picker/account-picker.js index a3986ad36..8ac99e61e 100644 --- a/ui/components/multichain/account-picker/account-picker.js +++ b/ui/components/multichain/account-picker/account-picker.js @@ -7,8 +7,8 @@ import { AvatarAccountVariant, Icon, IconName, + Text, } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; import { AlignItems, BackgroundColor, diff --git a/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap b/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap index e94459761..0687107d4 100644 --- a/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap +++ b/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap @@ -278,7 +278,7 @@ exports[`App Header should match snapshot 1`] = `
Test Account diff --git a/ui/components/multichain/global-menu/global-menu.js b/ui/components/multichain/global-menu/global-menu.js index d67107a67..350f15947 100644 --- a/ui/components/multichain/global-menu/global-menu.js +++ b/ui/components/multichain/global-menu/global-menu.js @@ -12,10 +12,13 @@ import { } from '../../../helpers/constants/routes'; import { lockMetamask } from '../../../store/actions'; import { useI18nContext } from '../../../hooks/useI18nContext'; -import { IconName } from '../../component-library'; -///: BEGIN:ONLY_INCLUDE_IN(snaps) -import { Text } from '../../component-library/text/deprecated'; -///: END:ONLY_INCLUDE_IN(snaps) +import { + IconName, + ///: BEGIN:ONLY_INCLUDE_IN(snaps) + Text, + ///: END:ONLY_INCLUDE_IN(snaps) +} from '../../component-library'; + import { Menu, MenuItem } from '../../ui/menu'; import { getEnvironmentType } from '../../../../app/scripts/lib/util'; import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../shared/constants/app'; diff --git a/ui/components/multichain/import-account/__snapshots__/json.test.tsx.snap b/ui/components/multichain/import-account/__snapshots__/json.test.tsx.snap index 2fcf0b8db..61de94813 100644 --- a/ui/components/multichain/import-account/__snapshots__/json.test.tsx.snap +++ b/ui/components/multichain/import-account/__snapshots__/json.test.tsx.snap @@ -3,7 +3,7 @@ exports[`Json should match snapshot 1`] = `

Used by a variety of different clients

diff --git a/ui/components/multichain/token-list-item/token-list-item.js b/ui/components/multichain/token-list-item/token-list-item.js index 5fdf36d59..dfdce0baf 100644 --- a/ui/components/multichain/token-list-item/token-list-item.js +++ b/ui/components/multichain/token-list-item/token-list-item.js @@ -19,8 +19,8 @@ import { AvatarToken, BadgeWrapper, Box, + Text, } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; import { getCurrentChainId, getCurrentNetwork,