diff --git a/ui/helpers/utils/permission.js b/ui/helpers/utils/permission.js index 0efb8b49ca30..fa1b00a531f2 100644 --- a/ui/helpers/utils/permission.js +++ b/ui/helpers/utils/permission.js @@ -18,12 +18,12 @@ import { AvatarIcon, ///: BEGIN:ONLY_INCLUDE_IN(snaps) Icon, + Text, ///: END:ONLY_INCLUDE_IN IconName, IconSize, } from '../../components/component-library'; ///: BEGIN:ONLY_INCLUDE_IN(snaps) -import { Text } from '../../components/component-library/text/deprecated'; import { Color, FontWeight, IconColor } from '../constants/design-system'; import { coinTypeToProtocolName, diff --git a/ui/pages/confirm-add-suggested-nft/confirm-add-suggested-nft.js b/ui/pages/confirm-add-suggested-nft/confirm-add-suggested-nft.js index f74dd27e94ac..4285135b9654 100644 --- a/ui/pages/confirm-add-suggested-nft/confirm-add-suggested-nft.js +++ b/ui/pages/confirm-add-suggested-nft/confirm-add-suggested-nft.js @@ -25,8 +25,8 @@ import { ButtonLink, IconName, Box, + Text, } from '../../components/component-library'; -import { Text } from '../../components/component-library/text/deprecated'; import { getCurrentChainId, getRpcPrefsForCurrentProvider, diff --git a/ui/pages/confirm-approve/confirm-approve-content/__snapshots__/confirm-approve-content.component.test.js.snap b/ui/pages/confirm-approve/confirm-approve-content/__snapshots__/confirm-approve-content.component.test.js.snap index dc9d1836c44f..b8541a2cd3ea 100644 --- a/ui/pages/confirm-approve/confirm-approve-content/__snapshots__/confirm-approve-content.component.test.js.snap +++ b/ui/pages/confirm-approve/confirm-approve-content/__snapshots__/confirm-approve-content.component.test.js.snap @@ -21,7 +21,7 @@ exports[`ConfirmApproveContent Component should render Confirm approve page corr />
https://metamask.github.io/test-dapp/
@@ -195,7 +195,7 @@ exports[`ConfirmApproveContent Component should render Confirm approve page corr />
https://metamask.github.io/test-dapp/
@@ -380,7 +380,7 @@ exports[`ConfirmApproveContent Component should render Confirm approve page corr />
https://metamask.github.io/test-dapp/
@@ -565,7 +565,7 @@ exports[`ConfirmApproveContent Component should render Confirm approve page corr />
https://metamask.github.io/test-dapp/
diff --git a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js index 3a81f204c27b..b25933c8bb70 100644 --- a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js +++ b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js @@ -31,8 +31,8 @@ import { ButtonIcon, Icon, IconName, + Text, } from '../../../components/component-library'; -import { Text } from '../../../components/component-library/text/deprecated'; import TransactionDetailItem from '../../../components/app/transaction-detail-item/transaction-detail-item.component'; import UserPreferencedCurrencyDisplay from '../../../components/app/user-preferenced-currency-display'; import { PRIMARY, SECONDARY } from '../../../helpers/constants/common'; diff --git a/ui/pages/confirm-deploy-contract/confirm-deploy-contract.component.js b/ui/pages/confirm-deploy-contract/confirm-deploy-contract.component.js index 840f5b8acce3..6c663db0be27 100644 --- a/ui/pages/confirm-deploy-contract/confirm-deploy-contract.component.js +++ b/ui/pages/confirm-deploy-contract/confirm-deploy-contract.component.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import ConfirmTransactionBase from '../confirm-transaction-base'; import { toBuffer } from '../../../shared/modules/buffer-utils'; import Box from '../../components/ui/box'; -import { Text } from '../../components/component-library/text/deprecated'; +import { Text } from '../../components/component-library'; import { Color, DISPLAY, diff --git a/ui/pages/create-account/connect-hardware/index.js b/ui/pages/create-account/connect-hardware/index.js index b93a8671b297..717192998837 100644 --- a/ui/pages/create-account/connect-hardware/index.js +++ b/ui/pages/create-account/connect-hardware/index.js @@ -24,8 +24,8 @@ import { BUTTON_VARIANT, BUTTON_SIZES, Button, + Text, } from '../../../components/component-library'; -import { Text } from '../../../components/component-library/text/deprecated'; import ZENDESK_URLS from '../../../helpers/constants/zendesk-url'; import { TextColor } from '../../../helpers/constants/design-system'; import SelectHardware from './select-hardware'; diff --git a/ui/pages/desktop-pairing/__snapshots__/desktop-pairing.test.js.snap b/ui/pages/desktop-pairing/__snapshots__/desktop-pairing.test.js.snap index b61c196b7939..4a7735af9233 100644 --- a/ui/pages/desktop-pairing/__snapshots__/desktop-pairing.test.js.snap +++ b/ui/pages/desktop-pairing/__snapshots__/desktop-pairing.test.js.snap @@ -92,13 +92,13 @@ exports[`Desktop Pairing page should render otp component 1`] = `

Pair with Desktop

Open your MetaMask Desktop and type this code

@@ -119,7 +119,7 @@ exports[`Desktop Pairing page should render otp component 1`] = ` >

123456

@@ -130,7 +130,7 @@ exports[`Desktop Pairing page should render otp component 1`] = ` >

@@ -147,7 +147,7 @@ exports[`Desktop Pairing page should render otp component 1`] = `

If the pairing is successful, extension will restart and you'll have to re-enter your password.

diff --git a/ui/pages/desktop-pairing/desktop-pairing.component.js b/ui/pages/desktop-pairing/desktop-pairing.component.js index fb42e1d54ce1..06cdd3ece2a9 100644 --- a/ui/pages/desktop-pairing/desktop-pairing.component.js +++ b/ui/pages/desktop-pairing/desktop-pairing.component.js @@ -16,8 +16,7 @@ import { import Box from '../../components/ui/box/box'; import { useCopyToClipboard } from '../../hooks/useCopyToClipboard'; import Tooltip from '../../components/ui/tooltip'; -import { Button } from '../../components/component-library'; -import { Text } from '../../components/component-library/text/deprecated'; +import { Button, Text } from '../../components/component-library'; export default function DesktopPairingPage({ generateDesktopOtp, diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js index a61b285fcab1..5f4eb0c296b8 100644 --- a/ui/pages/home/home.component.js +++ b/ui/pages/home/home.component.js @@ -46,8 +46,8 @@ import { ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-mmi) ButtonLink, ///: END:ONLY_INCLUDE_IN + Text, } from '../../components/component-library'; -import { Text } from '../../components/component-library/text/deprecated'; import { ASSET_ROUTE, diff --git a/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js b/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js index c3ba507c55c7..f8d867f6aa56 100644 --- a/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js +++ b/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js @@ -24,8 +24,8 @@ import { BUTTON_SIZES, BUTTON_VARIANT, Box, + Text, } from '../../../components/component-library'; -import { Text } from '../../../components/component-library/text/deprecated'; import { MetaMetricsEventCategory, MetaMetricsEventName, diff --git a/ui/pages/institutional/connect-custody/__snapshots__/account-list.test.js.snap b/ui/pages/institutional/connect-custody/__snapshots__/account-list.test.js.snap index 87ea155d8711..21d5935acd4e 100644 --- a/ui/pages/institutional/connect-custody/__snapshots__/account-list.test.js.snap +++ b/ui/pages/institutional/connect-custody/__snapshots__/account-list.test.js.snap @@ -33,7 +33,7 @@ exports[`CustodyAccountList renders accounts 1`] = ` for="address-0" > Test Account 1 @@ -43,7 +43,7 @@ exports[`CustodyAccountList renders accounts 1`] = ` for="address-0" > @@ -118,7 +118,7 @@ exports[`CustodyAccountList renders accounts 1`] = ` for="address-1" > { diff --git a/ui/pages/institutional/custody/__snapshots__/custody.test.js.snap b/ui/pages/institutional/custody/__snapshots__/custody.test.js.snap index 4a5a1184caa0..eaacf61073e3 100644 --- a/ui/pages/institutional/custody/__snapshots__/custody.test.js.snap +++ b/ui/pages/institutional/custody/__snapshots__/custody.test.js.snap @@ -41,18 +41,18 @@ exports[`CustodyPage renders CustodyPage 2`] = ` />

Back

Custodial Accounts

Please choose the custodian you want to connect in order to add or refresh a token.
@@ -75,7 +75,7 @@ exports[`CustodyPage renders CustodyPage 2`] = ` width="32" />

Saturn Custody

diff --git a/ui/pages/institutional/custody/custody.js b/ui/pages/institutional/custody/custody.js index f5e5734542e1..07a171866f33 100644 --- a/ui/pages/institutional/custody/custody.js +++ b/ui/pages/institutional/custody/custody.js @@ -20,8 +20,8 @@ import { BUTTON_SIZES, BUTTON_VARIANT, Box, + Text, } from '../../../components/component-library'; -import { Text } from '../../../components/component-library/text/deprecated'; import { AlignItems, Display, diff --git a/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.js b/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.js index 48b8f01451bd..07fdf345b5b0 100644 --- a/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.js +++ b/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.js @@ -7,8 +7,8 @@ import { Box, Button, BUTTON_VARIANT, + Text, } from '../../../components/component-library'; -import { Text } from '../../../components/component-library/text/deprecated'; import { TextColor, TypographyVariant, diff --git a/ui/pages/institutional/interactive-replacement-token-page/__snapshots__/interactive-replacement-token-page.test.js.snap b/ui/pages/institutional/interactive-replacement-token-page/__snapshots__/interactive-replacement-token-page.test.js.snap index 886dd9d7d799..c0c0e80554cf 100644 --- a/ui/pages/institutional/interactive-replacement-token-page/__snapshots__/interactive-replacement-token-page.test.js.snap +++ b/ui/pages/institutional/interactive-replacement-token-page/__snapshots__/interactive-replacement-token-page.test.js.snap @@ -81,7 +81,7 @@ exports[`Interactive Replacement Token Page should reject if there are errors 2` overflowwrap="break-word" >

Please go to displayName and click the 'Connect to MMI' button within their user interface to connect your accounts to MMI again. diff --git a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.js b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.js index b39fc78ebc1c..db0c2d5af4b6 100644 --- a/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.js +++ b/ui/pages/institutional/interactive-replacement-token-page/interactive-replacement-token-page.js @@ -26,8 +26,8 @@ import { Button, BUTTON_VARIANT, BUTTON_SIZES, + Text, } from '../../../components/component-library'; -import { Text } from '../../../components/component-library/text/deprecated'; import { OverflowWrap, TextColor, diff --git a/ui/pages/keychains/__snapshots__/reveal-seed.test.js.snap b/ui/pages/keychains/__snapshots__/reveal-seed.test.js.snap index e95fb80121c2..0d6c31b91822 100644 --- a/ui/pages/keychains/__snapshots__/reveal-seed.test.js.snap +++ b/ui/pages/keychains/__snapshots__/reveal-seed.test.js.snap @@ -6,12 +6,12 @@ exports[`Reveal Seed Page should match snapshot 1`] = ` class="box page-container box--padding-top-8 box--padding-right-4 box--padding-bottom-8 box--padding-left-4 box--gap-4 box--flex-direction-row" >

Secret Recovery Phrase

@@ -26,7 +26,7 @@ exports[`Reveal Seed Page should match snapshot 1`] = ` provides full access to your wallet and funds. @@ -36,7 +36,7 @@ exports[`Reveal Seed Page should match snapshot 1`] = `

@@ -62,13 +62,13 @@ exports[`Reveal Seed Page should match snapshot 1`] = ` />

Make sure no one is looking at your screen. MetaMask Support will never request this. diff --git a/ui/pages/keychains/reveal-seed.js b/ui/pages/keychains/reveal-seed.js index 3b045a1733a6..8484f201aefb 100644 --- a/ui/pages/keychains/reveal-seed.js +++ b/ui/pages/keychains/reveal-seed.js @@ -31,8 +31,8 @@ import { TEXT_FIELD_SIZES, TEXT_FIELD_TYPES, BUTTON_SIZES, + Text, } from '../../components/component-library'; -import { Text } from '../../components/component-library/text/deprecated'; import { useI18nContext } from '../../hooks/useI18nContext'; import { MetaMetricsContext } from '../../contexts/metametrics'; import ZENDESK_URLS from '../../helpers/constants/zendesk-url'; diff --git a/ui/pages/keyring-snaps/add-snap-account-modal/add-snap-account-modal.tsx b/ui/pages/keyring-snaps/add-snap-account-modal/add-snap-account-modal.tsx index 37ea6e02d859..374f17b461b9 100644 --- a/ui/pages/keyring-snaps/add-snap-account-modal/add-snap-account-modal.tsx +++ b/ui/pages/keyring-snaps/add-snap-account-modal/add-snap-account-modal.tsx @@ -7,8 +7,8 @@ import { ModalContent, ModalHeader, ModalOverlay, + Text, } from '../../../components/component-library'; -import { Text } from '../../../components/component-library/text/deprecated'; import { AlignItems, Display, diff --git a/ui/pages/keyring-snaps/new-snap-account-page/new-snap-account-page.tsx b/ui/pages/keyring-snaps/new-snap-account-page/new-snap-account-page.tsx index 5510fdf735ae..2ec9aea8c6e9 100644 --- a/ui/pages/keyring-snaps/new-snap-account-page/new-snap-account-page.tsx +++ b/ui/pages/keyring-snaps/new-snap-account-page/new-snap-account-page.tsx @@ -2,8 +2,7 @@ import { Snap } from '@metamask/snaps-utils'; import React, { useState, useEffect } from 'react'; import { shallowEqual, useSelector } from 'react-redux'; import { useHistory } from 'react-router-dom'; -import { Box } from '../../../components/component-library'; -import { Text } from '../../../components/component-library/text/deprecated'; +import { Box, Text } from '../../../components/component-library'; import { AlignItems, Display, diff --git a/ui/pages/keyring-snaps/snap-account-detail-page/__snapshots__/snap-account-detail-page.test.tsx.snap b/ui/pages/keyring-snaps/snap-account-detail-page/__snapshots__/snap-account-detail-page.test.tsx.snap index df8387fb1dff..2cf92a64007c 100644 --- a/ui/pages/keyring-snaps/snap-account-detail-page/__snapshots__/snap-account-detail-page.test.tsx.snap +++ b/ui/pages/keyring-snaps/snap-account-detail-page/__snapshots__/snap-account-detail-page.test.tsx.snap @@ -21,7 +21,7 @@ exports[`SnapAccountDetails should take a snapshot 1`] = ` style="mask-image: url('./images/icons/arrow-right.svg');" />

Metamask Simple Keyring

@@ -33,7 +33,7 @@ exports[`SnapAccountDetails should take a snapshot 1`] = ` class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center" >

Metamask Simple Keyring

@@ -75,7 +75,7 @@ exports[`SnapAccountDetails should take a snapshot 1`] = ` />

By MetaMask

@@ -97,7 +97,7 @@ exports[`SnapAccountDetails should take a snapshot 1`] = ` />

Audited

@@ -113,12 +113,12 @@ exports[`SnapAccountDetails should take a snapshot 1`] = ` class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--width-4/5" >

Secure your account with MetaMask Mobile

A simple private key is a randomly generated string of characters that is used to sign transactions. This private key is stored securely within this snap.

@@ -130,7 +130,7 @@ exports[`SnapAccountDetails should take a snapshot 1`] = ` class="mm-box mm-box--margin-bottom-4 mm-box--flex-direction-column" >

Tags

@@ -148,12 +148,12 @@ exports[`SnapAccountDetails should take a snapshot 1`] = ` class="mm-box mm-box--margin-bottom-4 mm-box--flex-direction-column" >

Developer

Metamask

@@ -162,7 +162,7 @@ exports[`SnapAccountDetails should take a snapshot 1`] = ` class="mm-box mm-box--margin-bottom-4 mm-box--flex-direction-column" >

Website

@@ -172,12 +172,12 @@ exports[`SnapAccountDetails should take a snapshot 1`] = ` class="mm-box mm-box--margin-bottom-4 mm-box--flex-direction-column" >

Audit

Version

1.0.0

@@ -215,12 +215,12 @@ exports[`SnapAccountDetails should take a snapshot 1`] = ` class="mm-box mm-box--margin-bottom-4 mm-box--flex-direction-column" >

Updated

April 20, 2023

diff --git a/ui/pages/keyring-snaps/snap-account-detail-page/detail.tsx b/ui/pages/keyring-snaps/snap-account-detail-page/detail.tsx index 32aa9db0f6f1..7e47b59adc33 100644 --- a/ui/pages/keyring-snaps/snap-account-detail-page/detail.tsx +++ b/ui/pages/keyring-snaps/snap-account-detail-page/detail.tsx @@ -1,6 +1,5 @@ import React from 'react'; -import { Box } from '../../../components/component-library'; -import { Text } from '../../../components/component-library/text/deprecated'; +import { Box, Text } from '../../../components/component-library'; import { FlexDirection, TextVariant, diff --git a/ui/pages/keyring-snaps/snap-account-detail-page/header.tsx b/ui/pages/keyring-snaps/snap-account-detail-page/header.tsx index e0aac1947e2d..ff44b01d4906 100644 --- a/ui/pages/keyring-snaps/snap-account-detail-page/header.tsx +++ b/ui/pages/keyring-snaps/snap-account-detail-page/header.tsx @@ -9,8 +9,8 @@ import { Icon, IconName, Tag, + Text, } from '../../../components/component-library'; -import { Text } from '../../../components/component-library/text/deprecated'; import { AlignItems, BackgroundColor, diff --git a/ui/pages/keyring-snaps/snap-account-detail-page/snap-account-detail-page.tsx b/ui/pages/keyring-snaps/snap-account-detail-page/snap-account-detail-page.tsx index ae8cd738f517..711446ef4863 100644 --- a/ui/pages/keyring-snaps/snap-account-detail-page/snap-account-detail-page.tsx +++ b/ui/pages/keyring-snaps/snap-account-detail-page/snap-account-detail-page.tsx @@ -7,8 +7,8 @@ import { Box, Button, Tag, + Text, } from '../../../components/component-library'; -import { Text } from '../../../components/component-library/text/deprecated'; import { BlockSize, Display, diff --git a/ui/pages/keyring-snaps/snap-card/__snapshots__/snap-card.test.tsx.snap b/ui/pages/keyring-snaps/snap-card/__snapshots__/snap-card.test.tsx.snap index d9763d39293f..8ebecf6189c8 100644 --- a/ui/pages/keyring-snaps/snap-card/__snapshots__/snap-card.test.tsx.snap +++ b/ui/pages/keyring-snaps/snap-card/__snapshots__/snap-card.test.tsx.snap @@ -17,7 +17,7 @@ exports[`SnapCard should render 1`] = ` class="mm-box snap-detail-icon mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center" >

M

@@ -31,12 +31,12 @@ exports[`SnapCard should render 1`] = `

Metamask Simple Keyring

Secure your account with MetaMask Mobile

diff --git a/ui/pages/keyring-snaps/snap-card/snap-card.tsx b/ui/pages/keyring-snaps/snap-card/snap-card.tsx index c44e068d4757..b7040bb7e249 100644 --- a/ui/pages/keyring-snaps/snap-card/snap-card.tsx +++ b/ui/pages/keyring-snaps/snap-card/snap-card.tsx @@ -9,8 +9,8 @@ import { Button, Icon, IconName, + Text, } from '../../../components/component-library'; -import { Text } from '../../../components/component-library/text/deprecated'; import { AlignItems, BackgroundColor, diff --git a/ui/pages/onboarding-flow/pin-extension/pin-extension.js b/ui/pages/onboarding-flow/pin-extension/pin-extension.js index 75b6e3e6c8a0..0c14d704edde 100644 --- a/ui/pages/onboarding-flow/pin-extension/pin-extension.js +++ b/ui/pages/onboarding-flow/pin-extension/pin-extension.js @@ -18,7 +18,7 @@ import { import { MetaMetricsContext } from '../../../contexts/metametrics'; import { FIRST_TIME_FLOW_TYPES } from '../../../helpers/constants/onboarding'; import { getFirstTimeFlowType } from '../../../selectors'; -import { Text } from '../../../components/component-library/text/deprecated'; +import { Text } from '../../../components/component-library'; import OnboardingPinBillboard from './pin-billboard'; export default function OnboardingPinExtension() { diff --git a/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js b/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js index 9775b7cbbcc4..d9056a546277 100644 --- a/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js +++ b/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js @@ -30,8 +30,8 @@ import { Button, BUTTON_VARIANT, BUTTON_SIZES, + Text, } from '../../../components/component-library'; -import { Text } from '../../../components/component-library/text/deprecated'; import SkipSRPBackup from './skip-srp-backup-popover'; export default function SecureYourWallet() { diff --git a/ui/pages/onboarding-flow/welcome/welcome.js b/ui/pages/onboarding-flow/welcome/welcome.js index 2808a8a1ee2d..667d5e8fab8a 100644 --- a/ui/pages/onboarding-flow/welcome/welcome.js +++ b/ui/pages/onboarding-flow/welcome/welcome.js @@ -5,7 +5,7 @@ import { useHistory } from 'react-router-dom'; import { Carousel } from 'react-responsive-carousel'; import Mascot from '../../../components/ui/mascot'; import Button from '../../../components/ui/button'; -import { Text } from '../../../components/component-library/text/deprecated'; +import { Text } from '../../../components/component-library'; import CheckBox from '../../../components/ui/check-box'; import Box from '../../../components/ui/box'; import { diff --git a/ui/pages/permissions-connect/snaps/snap-install/snap-install.js b/ui/pages/permissions-connect/snaps/snap-install/snap-install.js index a69046846be3..435cace34262 100644 --- a/ui/pages/permissions-connect/snaps/snap-install/snap-install.js +++ b/ui/pages/permissions-connect/snaps/snap-install/snap-install.js @@ -23,8 +23,8 @@ import { AvatarIcon, IconName, ValidTag, + Text, } from '../../../../components/component-library'; -import { Text } from '../../../../components/component-library/text/deprecated'; import { getSnapName } from '../../../../helpers/utils/util'; import SnapPermissionsList from '../../../../components/app/snaps/snap-permissions-list'; import { useScrollRequired } from '../../../../hooks/useScrollRequired'; diff --git a/ui/pages/permissions-connect/snaps/snap-result/snap-result.js b/ui/pages/permissions-connect/snaps/snap-result/snap-result.js index 086f9f67d1ca..b5336e0e103b 100644 --- a/ui/pages/permissions-connect/snaps/snap-result/snap-result.js +++ b/ui/pages/permissions-connect/snaps/snap-result/snap-result.js @@ -22,8 +22,8 @@ import { IconName, IconSize, ValidTag, + Text, } from '../../../../components/component-library'; -import { Text } from '../../../../components/component-library/text/deprecated'; import PulseLoader from '../../../../components/ui/pulse-loader/pulse-loader'; import InstallError from '../../../../components/app/snaps/install-error/install-error'; import SnapAuthorshipHeader from '../../../../components/app/snaps/snap-authorship-header'; diff --git a/ui/pages/permissions-connect/snaps/snap-update/snap-update.js b/ui/pages/permissions-connect/snaps/snap-update/snap-update.js index 152d2a60696f..15bd1eda1cec 100644 --- a/ui/pages/permissions-connect/snaps/snap-update/snap-update.js +++ b/ui/pages/permissions-connect/snaps/snap-update/snap-update.js @@ -26,8 +26,8 @@ import { AvatarIcon, IconName, ValidTag, + Text, } from '../../../../components/component-library'; -import { Text } from '../../../../components/component-library/text/deprecated'; import { useOriginMetadata } from '../../../../hooks/useOriginMetadata'; import { getSnapName } from '../../../../helpers/utils/util'; import { useScrollRequired } from '../../../../hooks/useScrollRequired'; diff --git a/ui/pages/permissions-connect/snaps/snaps-connect/snaps-connect.js b/ui/pages/permissions-connect/snaps/snaps-connect/snaps-connect.js index caa8862e6545..5462699eafee 100644 --- a/ui/pages/permissions-connect/snaps/snaps-connect/snaps-connect.js +++ b/ui/pages/permissions-connect/snaps/snaps-connect/snaps-connect.js @@ -4,8 +4,11 @@ import PropTypes from 'prop-types'; import { useI18nContext } from '../../../../hooks/useI18nContext'; import Box from '../../../../components/ui/box'; import SiteOrigin from '../../../../components/ui/site-origin'; -import { IconSize, ValidTag } from '../../../../components/component-library'; -import { Text } from '../../../../components/component-library/text/deprecated'; +import { + IconSize, + ValidTag, + Text, +} from '../../../../components/component-library'; import { FlexDirection, TextVariant, diff --git a/ui/pages/send/send-content/add-recipient/__snapshots__/add-recipient.component.test.js.snap b/ui/pages/send/send-content/add-recipient/__snapshots__/add-recipient.component.test.js.snap index d45ee0317bfc..b6587dd99582 100644 --- a/ui/pages/send/send-content/add-recipient/__snapshots__/add-recipient.component.test.js.snap +++ b/ui/pages/send/send-content/add-recipient/__snapshots__/add-recipient.component.test.js.snap @@ -9,7 +9,7 @@ exports[`Add Recipient Component Domain Resolution should match snapshot 1`] = ` class="box box--margin-top-2 box--margin-right-4 box--margin-bottom-2 box--margin-left-4 box--flex-direction-row" >

Your accounts

@@ -445,7 +445,7 @@ exports[`Add Recipient Component render should match snapshot 1`] = ` class="box box--margin-top-2 box--margin-right-4 box--margin-bottom-2 box--margin-left-4 box--flex-direction-row" >

Your accounts

@@ -718,7 +718,7 @@ exports[`Add Recipient Component render should match snapshot 1`] = ` class="box box--margin-top-2 box--margin-right-4 box--margin-bottom-2 box--margin-left-4 box--flex-direction-row" >

Contacts

diff --git a/ui/pages/send/send-content/add-recipient/add-recipient.component.js b/ui/pages/send/send-content/add-recipient/add-recipient.component.js index 72f23f1ee617..67533a739787 100644 --- a/ui/pages/send/send-content/add-recipient/add-recipient.component.js +++ b/ui/pages/send/send-content/add-recipient/add-recipient.component.js @@ -7,7 +7,7 @@ import ContactList from '../../../../components/app/contact-list'; import RecipientGroup from '../../../../components/app/contact-list/recipient-group/recipient-group.component'; import { ellipsify } from '../../send.utils'; import Confusable from '../../../../components/ui/confusable'; -import { Text } from '../../../../components/component-library/text/deprecated'; +import { Text } from '../../../../components/component-library'; import Box from '../../../../components/ui/box'; import { TextColor, diff --git a/ui/pages/send/send-content/send-asset-row/send-asset-row.component.js b/ui/pages/send/send-content/send-asset-row/send-asset-row.component.js index b9b5f4c3baec..8b8b6d165e91 100644 --- a/ui/pages/send/send-content/send-asset-row/send-asset-row.component.js +++ b/ui/pages/send/send-content/send-asset-row/send-asset-row.component.js @@ -12,7 +12,7 @@ import { AssetType, TokenStandard, } from '../../../../../shared/constants/transaction'; -import { Text } from '../../../../components/component-library/text/deprecated'; +import { Text } from '../../../../components/component-library'; import { TextVariant } from '../../../../helpers/constants/design-system'; export default class SendAssetRow extends Component { diff --git a/ui/pages/settings/contact-list-tab/edit-contact/edit-contact.component.js b/ui/pages/settings/contact-list-tab/edit-contact/edit-contact.component.js index 8ff1a3b568c1..a53753ff34da 100644 --- a/ui/pages/settings/contact-list-tab/edit-contact/edit-contact.component.js +++ b/ui/pages/settings/contact-list-tab/edit-contact/edit-contact.component.js @@ -12,8 +12,9 @@ import { AvatarAccount, AvatarAccountSize, Box, + Text, } from '../../../../components/component-library'; -import { Text } from '../../../../components/component-library/text/deprecated'; + import { AlignItems, Display, diff --git a/ui/pages/settings/contact-list-tab/view-contact/view-contact.component.js b/ui/pages/settings/contact-list-tab/view-contact/view-contact.component.js index 21c80d990ea4..40c3e410f7b0 100644 --- a/ui/pages/settings/contact-list-tab/view-contact/view-contact.component.js +++ b/ui/pages/settings/contact-list-tab/view-contact/view-contact.component.js @@ -11,8 +11,8 @@ import { ButtonIcon, ButtonIconSize, IconName, + Text, } from '../../../../components/component-library'; -import { Text } from '../../../../components/component-library/text/deprecated'; import Tooltip from '../../../../components/ui/tooltip'; import { useI18nContext } from '../../../../hooks/useI18nContext'; diff --git a/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap b/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap index ecab1af296d7..ea627b70cff9 100644 --- a/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap +++ b/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap @@ -6,7 +6,7 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component class="settings-page__body" >

Security

@@ -23,17 +23,17 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component class="settings-page__content-description" >

Enable this to have your transactions and signature requests reviewed locally (no data shared with third parties) and warnings displayed when malicious activity is detected.

Always be sure to do your own due diligence before approving any requests. There's no guarantee all mailcious activity will be detected by this feature.

Select providers:

@@ -41,7 +41,7 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component class="settings-page__content-item-col settings-page__content-item-col-open-sea" >

Blockaid

@@ -88,7 +88,7 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component

More coming soon...

@@ -279,7 +279,7 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component class="settings-page__content-description" >

We use third-party APIs to detect NFTs in your wallet, which means your IP address may be exposed to centralized servers. There are a few things to be cautious about when enabling this feature.

@@ -297,7 +297,7 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component

Leave this feature off if you don't want the app to pull data from those services.

diff --git a/ui/pages/settings/experimental-tab/experimental-tab.component.js b/ui/pages/settings/experimental-tab/experimental-tab.component.js index 34e444c1a5d2..7fb22d178329 100644 --- a/ui/pages/settings/experimental-tab/experimental-tab.component.js +++ b/ui/pages/settings/experimental-tab/experimental-tab.component.js @@ -7,7 +7,7 @@ import { } from '../../../helpers/utils/settings-search'; import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics'; import Typography from '../../../components/ui/typography/typography'; -import { Text } from '../../../components/component-library/text/deprecated'; +import { Text } from '../../../components/component-library'; import { FONT_WEIGHT, TextColor, diff --git a/ui/pages/settings/networks-tab/networks-list/networks-list.js b/ui/pages/settings/networks-tab/networks-list/networks-list.js index 9fa629cd0e9a..7cb42959acf3 100644 --- a/ui/pages/settings/networks-tab/networks-list/networks-list.js +++ b/ui/pages/settings/networks-tab/networks-list/networks-list.js @@ -8,7 +8,7 @@ import { TextVariant, } from '../../../../helpers/constants/design-system'; import NetworksListItem from '../networks-list-item'; -import { Text } from '../../../../components/component-library/text/deprecated'; +import { Text } from '../../../../components/component-library'; const NetworksList = ({ networkIsSelected, diff --git a/ui/pages/settings/settings-tab/settings-tab.component.js b/ui/pages/settings/settings-tab/settings-tab.component.js index 1f3e5770a12f..a823478c2143 100644 --- a/ui/pages/settings/settings-tab/settings-tab.component.js +++ b/ui/pages/settings/settings-tab/settings-tab.component.js @@ -18,7 +18,7 @@ import { handleSettingsRefs, } from '../../../helpers/utils/settings-search'; import { ThemeType } from '../../../../shared/constants/preferences'; -import { Text } from '../../../components/component-library/text/deprecated'; +import { Text } from '../../../components/component-library'; const sortedCurrencies = availableCurrencies.sort((a, b) => { return a.name.toLocaleLowerCase().localeCompare(b.name.toLocaleLowerCase()); diff --git a/ui/pages/settings/settings.component.js b/ui/pages/settings/settings.component.js index 337c179522f3..c67769bada0f 100644 --- a/ui/pages/settings/settings.component.js +++ b/ui/pages/settings/settings.component.js @@ -34,8 +34,8 @@ import { Icon, IconName, Box, + Text, } from '../../components/component-library'; -import { Text } from '../../components/component-library/text/deprecated'; import { AlignItems, Color, diff --git a/ui/pages/settings/snaps/snaps-list-tab/snap-list-tab.js b/ui/pages/settings/snaps/snaps-list-tab/snap-list-tab.js index 422552a5af9c..86c722425def 100644 --- a/ui/pages/settings/snaps/snaps-list-tab/snap-list-tab.js +++ b/ui/pages/settings/snaps/snaps-list-tab/snap-list-tab.js @@ -23,8 +23,8 @@ import { Icon, IconName, IconSize, + Text, } from '../../../../components/component-library'; -import { Text } from '../../../../components/component-library/text/deprecated'; const SnapListTab = () => { const t = useI18nContext(); diff --git a/ui/pages/settings/snaps/view-snap/view-snap.js b/ui/pages/settings/snaps/view-snap/view-snap.js index 79d8ccb7eefa..6843799fb371 100644 --- a/ui/pages/settings/snaps/view-snap/view-snap.js +++ b/ui/pages/settings/snaps/view-snap/view-snap.js @@ -33,8 +33,7 @@ import { getTargetSubjectMetadata, } from '../../../../selectors'; import { getSnapName } from '../../../../helpers/utils/util'; -import { BUTTON_VARIANT } from '../../../../components/component-library'; -import { Text } from '../../../../components/component-library/text/deprecated'; +import { Text } from '../../../../components/component-library'; import SnapPermissionsList from '../../../../components/app/snaps/snap-permissions-list'; import { SnapDelineator } from '../../../../components/app/snaps/snap-delineator'; import { DelineatorType } from '../../../../helpers/constants/snaps'; @@ -138,7 +137,7 @@ function ViewSnap() { {shouldDisplayMoreButton && (