diff --git a/ui/components/app/add-network/add-network.js b/ui/components/app/add-network/add-network.js index 4ffb947cb..834db14cc 100644 --- a/ui/components/app/add-network/add-network.js +++ b/ui/components/app/add-network/add-network.js @@ -40,8 +40,8 @@ import { IconName, IconSize, AvatarNetwork, + Text, } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; import { MetaMetricsNetworkEventSource } from '../../../../shared/constants/metametrics'; const AddNetwork = () => { diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js index b764b2351..033145d8a 100644 --- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js +++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js @@ -16,7 +16,7 @@ import { setAdvancedGasFee } from '../../../../store/actions'; import { useGasFeeContext } from '../../../../contexts/gasFee'; import { useAdvancedGasFeePopoverContext } from '../context'; import { useI18nContext } from '../../../../hooks/useI18nContext'; -import { Text } from '../../../component-library/text/deprecated'; +import { Text } from '../../../component-library'; const AdvancedGasFeeDefaults = () => { const t = useI18nContext(); diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js index 2c2eb0f0a..9c8af1bb7 100644 --- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js +++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js @@ -9,7 +9,7 @@ import Button from '../../../ui/button'; import FormField from '../../../ui/form-field'; import { useAdvancedGasFeePopoverContext } from '../context'; -import { Text } from '../../../component-library/text/deprecated'; +import { Text } from '../../../component-library'; const validateGasLimit = (gasLimit, minimumGasLimitDec) => { return bnLessThan(gasLimit, minimumGasLimitDec) || diff --git a/ui/components/app/approve-content-card/approve-content-card.js b/ui/components/app/approve-content-card/approve-content-card.js index 050e9c795..b9b177fe7 100644 --- a/ui/components/app/approve-content-card/approve-content-card.js +++ b/ui/components/app/approve-content-card/approve-content-card.js @@ -6,7 +6,7 @@ import { useSelector } from 'react-redux'; import Box from '../../ui/box/box'; import Button from '../../ui/button'; import EditGasFeeButton from '../edit-gas-fee-button/edit-gas-fee-button'; -import { Text } from '../../component-library/text/deprecated'; +import { Text } from '../../component-library'; import { AlignItems, BlockSize, diff --git a/ui/components/app/beta-header/__snapshots__/beta-header.test.js.snap b/ui/components/app/beta-header/__snapshots__/beta-header.test.js.snap index 72b1c312c..56524a2b9 100644 --- a/ui/components/app/beta-header/__snapshots__/beta-header.test.js.snap +++ b/ui/components/app/beta-header/__snapshots__/beta-header.test.js.snap @@ -6,7 +6,7 @@ exports[`Beta Header should match snapshot 1`] = ` class="box beta-header box--padding-2 box--display-flex box--flex-direction-row box--align-items-center box--width-full box--background-color-warning-default" >
diff --git a/ui/components/app/beta-header/index.js b/ui/components/app/beta-header/index.js index 9ff4e2a59..5e0751083 100644 --- a/ui/components/app/beta-header/index.js +++ b/ui/components/app/beta-header/index.js @@ -14,8 +14,13 @@ import { import { BETA_BUGS_URL } from '../../../helpers/constants/beta'; import { hideBetaHeader } from '../../../store/actions'; -import { Text } from '../../component-library/text/deprecated'; -import { ButtonIcon, ButtonIconSize, IconName } from '../../component-library'; + +import { + ButtonIcon, + ButtonIconSize, + IconName, + Text, +} from '../../component-library'; const BetaHeader = () => { const t = useI18nContext(); diff --git a/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js b/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js index 543669ca9..a1eda061c 100644 --- a/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js +++ b/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js @@ -18,8 +18,7 @@ import Box from '../../ui/box'; import InfoTooltip from '../../ui/info-tooltip'; import Popover from '../../ui/popover'; import AppLoadingSpinner from '../app-loading-spinner'; -import { Text } from '../../component-library/text/deprecated'; -import { Button, ButtonLink } from '../../component-library'; +import { Button, ButtonLink, Text } from '../../component-library'; const CancelSpeedupPopover = () => { const { diff --git a/ui/components/app/configure-snap-popup/configure-snap-popup.tsx b/ui/components/app/configure-snap-popup/configure-snap-popup.tsx index 62df8616d..ac9b77129 100644 --- a/ui/components/app/configure-snap-popup/configure-snap-popup.tsx +++ b/ui/components/app/configure-snap-popup/configure-snap-popup.tsx @@ -1,6 +1,5 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Text } from '../../component-library/text/deprecated'; import { BUTTON_VARIANT, Button, @@ -9,6 +8,7 @@ import { ModalOverlay, ModalContent, ModalHeader, + Text, } from '../../component-library'; import { useI18nContext } from '../../../hooks/useI18nContext'; import { diff --git a/ui/components/app/confirm-data/confirm-data.js b/ui/components/app/confirm-data/confirm-data.js index 017f280c5..b5030e0e1 100644 --- a/ui/components/app/confirm-data/confirm-data.js +++ b/ui/components/app/confirm-data/confirm-data.js @@ -14,7 +14,7 @@ import { useTransactionFunctionType } from '../../../hooks/useTransactionFunctio import Box from '../../ui/box/box'; import Disclosure from '../../ui/disclosure'; import TransactionDecoding from '../transaction-decoding'; -import { Text } from '../../component-library/text/deprecated'; +import { Text } from '../../component-library'; const ConfirmData = ({ txData, dataComponent }) => { const t = useI18nContext(); diff --git a/ui/components/app/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js b/ui/components/app/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js index 59419a96a..a98f2ca28 100644 --- a/ui/components/app/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js +++ b/ui/components/app/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js @@ -18,7 +18,6 @@ import TransactionDetailItem from '../../transaction-detail-item'; import UserPreferencedCurrencyDisplay from '../../user-preferenced-currency-display'; import InfoTooltip from '../../../ui/info-tooltip'; import LoadingHeartBeat from '../../../ui/loading-heartbeat'; -import { Text } from '../../../component-library/text/deprecated'; import { FONT_STYLE, TextVariant, @@ -27,7 +26,7 @@ import { import { useDraftTransactionWithTxParams } from '../../../../hooks/useDraftTransactionWithTxParams'; import { getNativeCurrency } from '../../../../ducks/metamask/metamask'; import MultilayerFeeMessage from '../../multilayer-fee-message/multi-layer-fee-message'; -import { Icon, IconName } from '../../../component-library'; +import { Icon, IconName, Text } from '../../../component-library'; const renderHeartBeatIfNotInTest = () => process.env.IN_TEST ? null : ; diff --git a/ui/components/app/confirm-hexdata/confirm-hexdata.js b/ui/components/app/confirm-hexdata/confirm-hexdata.js index 73d608b41..e85e46a5b 100644 --- a/ui/components/app/confirm-hexdata/confirm-hexdata.js +++ b/ui/components/app/confirm-hexdata/confirm-hexdata.js @@ -13,7 +13,7 @@ import { TextTransform, } from '../../../helpers/constants/design-system'; import Box from '../../ui/box'; -import { Text } from '../../component-library/text/deprecated'; +import { Text } from '../../component-library'; import CopyRawData from '../transaction-decoding/components/ui/copy-raw-data'; const ConfirmHexData = ({ txData, dataHexComponent }) => { diff --git a/ui/components/app/confirm-page-container/confirm-page-container.component.js b/ui/components/app/confirm-page-container/confirm-page-container.component.js index c103d6d73..cd489fea8 100644 --- a/ui/components/app/confirm-page-container/confirm-page-container.component.js +++ b/ui/components/app/confirm-page-container/confirm-page-container.component.js @@ -22,7 +22,7 @@ import EditGasFeePopover from '../edit-gas-fee-popover/edit-gas-fee-popover'; import EditGasPopover from '../edit-gas-popover'; import ErrorMessage from '../../ui/error-message'; import { INSUFFICIENT_FUNDS_ERROR_KEY } from '../../../helpers/constants/error-keys'; -import { Text } from '../../component-library/text/deprecated'; +import { Text } from '../../component-library'; import { TextVariant, TextAlign, diff --git a/ui/components/app/confirm-page-container/snaps/snap-insight.js b/ui/components/app/confirm-page-container/snaps/snap-insight.js index 938bc9434..d7fc925d7 100644 --- a/ui/components/app/confirm-page-container/snaps/snap-insight.js +++ b/ui/components/app/confirm-page-container/snaps/snap-insight.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { useSelector } from 'react-redux'; import Preloader from '../../../ui/icon/preloader/preloader-icon.component'; -import { Text } from '../../../component-library/text/deprecated'; +import { Text } from '../../../component-library'; import { AlignItems, FLEX_DIRECTION, diff --git a/ui/components/app/confirm-subtitle/confirm-subtitle.js b/ui/components/app/confirm-subtitle/confirm-subtitle.js index 1e5a571bc..1ac59dcd1 100644 --- a/ui/components/app/confirm-subtitle/confirm-subtitle.js +++ b/ui/components/app/confirm-subtitle/confirm-subtitle.js @@ -7,7 +7,7 @@ import { Color, TextVariant } from '../../../helpers/constants/design-system'; import { isNFTAssetStandard } from '../../../helpers/utils/transactions.util'; import { getShouldShowFiat } from '../../../selectors'; import { useTransactionInfo } from '../../../hooks/useTransactionInfo'; -import { Text } from '../../component-library/text/deprecated'; +import { Text } from '../../component-library'; import UserPreferencedCurrencyDisplay from '../user-preferenced-currency-display'; const ConfirmSubTitle = ({ diff --git a/ui/components/app/confirm-title/confirm-title.js b/ui/components/app/confirm-title/confirm-title.js index 406486656..125d8d8a3 100644 --- a/ui/components/app/confirm-title/confirm-title.js +++ b/ui/components/app/confirm-title/confirm-title.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { TransactionType } from '../../../../shared/constants/transaction'; import { PRIMARY } from '../../../helpers/constants/common'; -import { Text } from '../../component-library/text/deprecated'; +import { Text } from '../../component-library'; import { FONT_WEIGHT, TextVariant, diff --git a/ui/components/app/confirmation-warning-modal/confirmation-warning-modal.js b/ui/components/app/confirmation-warning-modal/confirmation-warning-modal.js index 120d72072..79b53a435 100644 --- a/ui/components/app/confirmation-warning-modal/confirmation-warning-modal.js +++ b/ui/components/app/confirmation-warning-modal/confirmation-warning-modal.js @@ -14,8 +14,7 @@ import { AlignItems, IconColor, } from '../../../helpers/constants/design-system'; -import { Icon, IconName, IconSize } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; +import { Icon, IconName, IconSize, Text } from '../../component-library'; const ConfirmationWarningModal = ({ onSubmit, onCancel }) => { const t = useI18nContext(); diff --git a/ui/components/app/contact-list/recipient-group/recipient-group.component.js b/ui/components/app/contact-list/recipient-group/recipient-group.component.js index dccf6b66f..031761f6a 100644 --- a/ui/components/app/contact-list/recipient-group/recipient-group.component.js +++ b/ui/components/app/contact-list/recipient-group/recipient-group.component.js @@ -8,7 +8,7 @@ import { TextColor, TextVariant, } from '../../../../helpers/constants/design-system'; -import { Text } from '../../../component-library/text/deprecated'; +import { Text } from '../../../component-library'; function addressesEqual(address1, address2) { return String(address1).toLowerCase() === String(address2).toLowerCase(); diff --git a/ui/components/app/create-new-vault/create-new-vault.js b/ui/components/app/create-new-vault/create-new-vault.js index d29d249e5..81e9e9063 100644 --- a/ui/components/app/create-new-vault/create-new-vault.js +++ b/ui/components/app/create-new-vault/create-new-vault.js @@ -4,7 +4,7 @@ import { useI18nContext } from '../../../hooks/useI18nContext'; import TextField from '../../ui/text-field'; import Button from '../../ui/button'; import CheckBox from '../../ui/check-box'; -import { Text } from '../../component-library/text/deprecated'; +import { Text } from '../../component-library'; import SrpInput from '../srp-input'; import { PASSWORD_MIN_LENGTH } from '../../../helpers/constants/common'; diff --git a/ui/components/app/custom-spending-cap/custom-spending-cap-tooltip.js b/ui/components/app/custom-spending-cap/custom-spending-cap-tooltip.js index a08442bd3..b2bac1b14 100644 --- a/ui/components/app/custom-spending-cap/custom-spending-cap-tooltip.js +++ b/ui/components/app/custom-spending-cap/custom-spending-cap-tooltip.js @@ -8,8 +8,7 @@ import { Display, } from '../../../helpers/constants/design-system'; -import { Icon, IconName, IconSize } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; +import { Icon, IconName, IconSize, Text } from '../../component-library'; export const CustomSpendingCapTooltip = ({ tooltipContentText, diff --git a/ui/components/app/detected-token/detected-token-address/detected-token-address.js b/ui/components/app/detected-token/detected-token-address/detected-token-address.js index dd9595d2f..2e752bce1 100644 --- a/ui/components/app/detected-token/detected-token-address/detected-token-address.js +++ b/ui/components/app/detected-token/detected-token-address/detected-token-address.js @@ -15,7 +15,7 @@ import { } from '../../../../helpers/constants/design-system'; import { shortenAddress } from '../../../../helpers/utils/util'; -import { Text } from '../../../component-library/text/deprecated'; +import { Text } from '../../../component-library'; const DetectedTokenAddress = ({ tokenAddress }) => { const t = useI18nContext(); diff --git a/ui/components/app/detected-token/detected-token-aggregators/detected-token-aggregators.js b/ui/components/app/detected-token/detected-token-aggregators/detected-token-aggregators.js index 0bf574c75..51ddffb69 100644 --- a/ui/components/app/detected-token/detected-token-aggregators/detected-token-aggregators.js +++ b/ui/components/app/detected-token/detected-token-aggregators/detected-token-aggregators.js @@ -8,8 +8,7 @@ import { FontWeight, TextVariant, } from '../../../../helpers/constants/design-system'; -import { Box, ButtonLink } from '../../../component-library'; -import { Text } from '../../../component-library/text/deprecated'; +import { Box, ButtonLink, Text } from '../../../component-library'; const NUMBER_OF_AGGREGATORS_TO_DISPLAY = 2; diff --git a/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.js b/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.js index f5635c8e4..708b078db 100644 --- a/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.js +++ b/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.js @@ -6,7 +6,7 @@ import { useI18nContext } from '../../../../hooks/useI18nContext'; import Popover from '../../../ui/popover'; import Button from '../../../ui/button'; import { TextVariant } from '../../../../helpers/constants/design-system'; -import { Text } from '../../../component-library/text/deprecated'; +import { Text } from '../../../component-library'; const DetectedTokenIgnoredPopover = ({ partiallyIgnoreDetectedTokens, diff --git a/ui/components/app/detected-token/detected-token-values/detected-token-values.js b/ui/components/app/detected-token/detected-token-values/detected-token-values.js index e4f71353b..bf2293dbf 100644 --- a/ui/components/app/detected-token/detected-token-values/detected-token-values.js +++ b/ui/components/app/detected-token/detected-token-values/detected-token-values.js @@ -12,8 +12,7 @@ import { import { useTokenTracker } from '../../../../hooks/useTokenTracker'; import { useTokenFiatAmount } from '../../../../hooks/useTokenFiatAmount'; import { getUseCurrencyRateCheck } from '../../../../selectors'; -import { Box } from '../../../component-library'; -import { Text } from '../../../component-library/text/deprecated'; +import { Box, Text } from '../../../component-library'; const DetectedTokenValues = ({ token, diff --git a/ui/components/app/edit-gas-display/edit-gas-display.component.js b/ui/components/app/edit-gas-display/edit-gas-display.component.js index 49f7d9a1d..6bd1ed4cc 100644 --- a/ui/components/app/edit-gas-display/edit-gas-display.component.js +++ b/ui/components/app/edit-gas-display/edit-gas-display.component.js @@ -12,7 +12,7 @@ import { TextColor, TextVariant, } from '../../../helpers/constants/design-system'; -import { Text } from '../../component-library/text/deprecated'; +import { Text } from '../../component-library'; import { areDappSuggestedAndTxParamGasFeesTheSame } from '../../../helpers/utils/confirm-tx.util'; import InfoTooltip from '../../ui/info-tooltip'; diff --git a/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js b/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js index b06bc0c11..70fb157e1 100644 --- a/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js +++ b/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js @@ -13,8 +13,7 @@ import { useI18nContext } from '../../../hooks/useI18nContext'; import { useTransactionEventFragment } from '../../../hooks/useTransactionEventFragment'; import { useTransactionModalContext } from '../../../contexts/transaction-modal'; import InfoTooltip from '../../ui/info-tooltip/info-tooltip'; -import { Icon, IconName, IconSize } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; +import { Icon, IconName, IconSize, Text } from '../../component-library'; export default function EditGasFeeButton({ userAcknowledgedGasMissing }) { const t = useI18nContext(); diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.js b/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.js index 5919b2aa8..d057f042b 100644 --- a/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.js +++ b/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.js @@ -15,7 +15,7 @@ import { INSUFFICIENT_FUNDS_ERROR_KEY } from '../../../helpers/constants/error-k import { useGasFeeContext } from '../../../contexts/gasFee'; import AppLoadingSpinner from '../app-loading-spinner'; import ZENDESK_URLS from '../../../helpers/constants/zendesk-url'; -import { Text } from '../../component-library/text/deprecated'; +import { Text } from '../../component-library'; import EditGasItem from './edit-gas-item'; import NetworkStatistics from './network-statistics'; diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-tooltip/edit-gas-tooltip.js b/ui/components/app/edit-gas-fee-popover/edit-gas-tooltip/edit-gas-tooltip.js index 975a2c6f0..2d700e3c7 100644 --- a/ui/components/app/edit-gas-fee-popover/edit-gas-tooltip/edit-gas-tooltip.js +++ b/ui/components/app/edit-gas-fee-popover/edit-gas-tooltip/edit-gas-tooltip.js @@ -11,7 +11,7 @@ import { } from '../../../../helpers/constants/design-system'; import { isMetamaskSuggestedGasEstimate } from '../../../../helpers/utils/gas'; import { roundToDecimalPlacesRemovingExtraZeroes } from '../../../../helpers/utils/util'; -import { Text } from '../../../component-library/text/deprecated'; +import { Text } from '../../../component-library'; const EditGasToolTip = ({ editGasMode, diff --git a/ui/components/app/edit-gas-fee-popover/network-statistics/network-statistics.js b/ui/components/app/edit-gas-fee-popover/network-statistics/network-statistics.js index 06bc0e81b..6a14f655b 100644 --- a/ui/components/app/edit-gas-fee-popover/network-statistics/network-statistics.js +++ b/ui/components/app/edit-gas-fee-popover/network-statistics/network-statistics.js @@ -8,7 +8,7 @@ import { isNullish } from '../../../../helpers/utils/util'; import { formatGasFeeOrFeeRange } from '../../../../helpers/utils/gas'; import { I18nContext } from '../../../../contexts/i18n'; import { useGasFeeContext } from '../../../../contexts/gasFee'; -import { Text } from '../../../component-library/text/deprecated'; +import { Text } from '../../../component-library'; import { BaseFeeTooltip, PriorityFeeTooltip } from './tooltips'; import StatusSlider from './status-slider'; diff --git a/ui/components/app/gas-details-item/gas-details-item-title/gas-details-item-title.js b/ui/components/app/gas-details-item/gas-details-item-title/gas-details-item-title.js index 060a43d55..9e7c267dd 100644 --- a/ui/components/app/gas-details-item/gas-details-item-title/gas-details-item-title.js +++ b/ui/components/app/gas-details-item/gas-details-item-title/gas-details-item-title.js @@ -6,7 +6,7 @@ import { useI18nContext } from '../../../../hooks/useI18nContext'; import { getIsMainnet } from '../../../../selectors'; import Box from '../../../ui/box'; import InfoTooltip from '../../../ui/info-tooltip/info-tooltip'; -import { Text } from '../../../component-library/text/deprecated'; +import { Text } from '../../../component-library'; const GasDetailsItemTitle = () => { const t = useI18nContext(); diff --git a/ui/components/app/ledger-instruction-field/__snapshots__/ledger-instruction-field.test.js.snap b/ui/components/app/ledger-instruction-field/__snapshots__/ledger-instruction-field.test.js.snap index 6aafe8e2c..013f895e8 100644 --- a/ui/components/app/ledger-instruction-field/__snapshots__/ledger-instruction-field.test.js.snap +++ b/ui/components/app/ledger-instruction-field/__snapshots__/ledger-instruction-field.test.js.snap @@ -18,22 +18,22 @@ exports[`LedgerInstructionField Component rendering should render properly with class="ledger-live-dialog" >
Prior to clicking confirm:
• Be sure your Ledger is plugged in and to select the Ethereum app.
• Enable "smart contract data" or "blind signing" on your Ledger device.

Use at your own risk

Allowing eth_sign requests can make you vulnerable to phishing attacks. Always review the URL and be careful when signing messages that contain code. I understand that I can lose all of my funds and NFTs if I enable eth_sign requests. diff --git a/ui/components/app/modals/eth-sign-modal/eth-sign-modal.js b/ui/components/app/modals/eth-sign-modal/eth-sign-modal.js index a2d5d09fb..47b056a7b 100644 --- a/ui/components/app/modals/eth-sign-modal/eth-sign-modal.js +++ b/ui/components/app/modals/eth-sign-modal/eth-sign-modal.js @@ -14,8 +14,8 @@ import { IconName, IconSize, Label, + Text, } from '../../../component-library'; -import { Text } from '../../../component-library/text/deprecated'; import { AlignItems, Display, diff --git a/ui/components/app/modals/export-private-key-modal/__snapshots__/export-private-key-modal.test.js.snap b/ui/components/app/modals/export-private-key-modal/__snapshots__/export-private-key-modal.test.js.snap index 55311667a..e424c1b24 100644 --- a/ui/components/app/modals/export-private-key-modal/__snapshots__/export-private-key-modal.test.js.snap +++ b/ui/components/app/modals/export-private-key-modal/__snapshots__/export-private-key-modal.test.js.snap @@ -59,7 +59,7 @@ exports[`Export PrivateKey Modal should match snapshot 1`] = ` class="account-modal__close" /> Test Account @@ -72,7 +72,7 @@ exports[`Export PrivateKey Modal should match snapshot 1`] = ` class="box export-private-key-modal__divider box--margin-5 box--md:margin-3 box--flex-direction-row box--width-full" />

Show Private Keys

@@ -99,7 +99,7 @@ exports[`Export PrivateKey Modal should match snapshot 1`] = `

NFT Name @@ -28,7 +28,7 @@ exports[`NFT Default Image should match snapshot with missing clickable prop 1`] tabindex="0" >
NFT Name @@ -48,7 +48,7 @@ exports[`NFT Default Image should render with no props 1`] = ` tabindex="0" >
[unknownCollection] diff --git a/ui/components/app/nft-default-image/nft-default-image.js b/ui/components/app/nft-default-image/nft-default-image.js index 3945a9108..54c5d688d 100644 --- a/ui/components/app/nft-default-image/nft-default-image.js +++ b/ui/components/app/nft-default-image/nft-default-image.js @@ -12,7 +12,7 @@ import { BackgroundColor, } from '../../../helpers/constants/design-system'; import { useI18nContext } from '../../../hooks/useI18nContext'; -import { Text } from '../../component-library/text/deprecated'; +import { Text } from '../../component-library'; import Box from '../../ui/box/box'; export default function NftDefaultImage({ diff --git a/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap b/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap index 6741e0199..48bb184d1 100644 --- a/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap +++ b/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap @@ -77,12 +77,12 @@ exports[`NFT Details should match minimal props and state snapshot 1`] = ` >

MUNK #1

# 1 @@ -109,7 +109,7 @@ exports[`NFT Details should match minimal props and state snapshot 1`] = ` class="box box--display-flex box--flex-direction-row" >
@@ -117,7 +117,7 @@ exports[`NFT Details should match minimal props and state snapshot 1`] = ` class="box nft-details__contract-wrapper box--display-flex box--flex-direction-row" >
1/18/2023
@@ -127,7 +127,7 @@ exports[`NFT Details should match minimal props and state snapshot 1`] = ` class="box box--display-flex box--flex-direction-row" > @@ -135,7 +135,7 @@ exports[`NFT Details should match minimal props and state snapshot 1`] = ` class="box nft-details__contract-wrapper box--display-flex box--flex-direction-row" >
0.0049 ETH
@@ -145,12 +145,12 @@ exports[`NFT Details should match minimal props and state snapshot 1`] = ` class="box box--display-flex box--flex-direction-row" >
@@ -174,7 +174,7 @@ exports[`NFT Details should match minimal props and state snapshot 1`] = ` class="box nft-details__contract-wrapper box--display-flex box--flex-direction-row" >
0xDc7...6414
@@ -204,7 +204,7 @@ exports[`NFT Details should match minimal props and state snapshot 1`] = `
Disclaimer: MetaMask pulls the media file from the source url. This url sometimes is changed by the marketplace the NFT was minted on.
diff --git a/ui/components/app/nft-details/nft-details.js b/ui/components/app/nft-details/nft-details.js index 491506339..c0a9cbd33 100644 --- a/ui/components/app/nft-details/nft-details.js +++ b/ui/components/app/nft-details/nft-details.js @@ -51,8 +51,7 @@ import { AssetType, TokenStandard, } from '../../../../shared/constants/transaction'; -import { ButtonIcon, IconName } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; +import { ButtonIcon, IconName, Text } from '../../component-library'; import Tooltip from '../../ui/tooltip'; import { decWEIToDecETH } from '../../../../shared/modules/conversion.utils'; import { NftItem } from '../../multichain/nft-item'; diff --git a/ui/components/app/nfts-tab/nfts-tab.js b/ui/components/app/nfts-tab/nfts-tab.js index 530e367c8..2e1918c0d 100644 --- a/ui/components/app/nfts-tab/nfts-tab.js +++ b/ui/components/app/nfts-tab/nfts-tab.js @@ -21,8 +21,7 @@ import { showImportNftsModal, } from '../../../store/actions'; import { useNftsCollections } from '../../../hooks/useNftsCollections'; -import { Box, ButtonLink, IconName } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; +import { Box, ButtonLink, IconName, Text } from '../../component-library'; import NftsDetectionNotice from '../nfts-detection-notice'; import ZENDESK_URLS from '../../../helpers/constants/zendesk-url'; diff --git a/ui/components/app/permission-cell/permission-cell-options.js b/ui/components/app/permission-cell/permission-cell-options.js index 768f23e05..ec7dda4cd 100644 --- a/ui/components/app/permission-cell/permission-cell-options.js +++ b/ui/components/app/permission-cell/permission-cell-options.js @@ -3,8 +3,7 @@ import PropTypes from 'prop-types'; import { useDispatch } from 'react-redux'; import Box from '../../ui/box'; import { useI18nContext } from '../../../hooks/useI18nContext'; -import { IconName, ButtonIcon } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; +import { IconName, ButtonIcon, Text } from '../../component-library'; import { Menu, MenuItem } from '../../ui/menu'; import { TextColor, diff --git a/ui/components/app/permission-cell/permission-cell.js b/ui/components/app/permission-cell/permission-cell.js index cd4b813b3..ea8f49c34 100644 --- a/ui/components/app/permission-cell/permission-cell.js +++ b/ui/components/app/permission-cell/permission-cell.js @@ -11,8 +11,13 @@ import { TextColor, TextVariant, } from '../../../helpers/constants/design-system'; -import { AvatarIcon, Icon, IconName, IconSize } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; +import { + AvatarIcon, + Icon, + IconName, + IconSize, + Text, +} from '../../component-library'; import { formatDate } from '../../../helpers/utils/util'; import { useI18nContext } from '../../../hooks/useI18nContext'; import Tooltip from '../../ui/tooltip'; diff --git a/ui/components/app/recovery-phrase-reminder/recovery-phrase-reminder.js b/ui/components/app/recovery-phrase-reminder/recovery-phrase-reminder.js index c6f496052..d21a3f7a6 100644 --- a/ui/components/app/recovery-phrase-reminder/recovery-phrase-reminder.js +++ b/ui/components/app/recovery-phrase-reminder/recovery-phrase-reminder.js @@ -17,7 +17,7 @@ import { TextColor, } from '../../../helpers/constants/design-system'; import { ONBOARDING_UNLOCK_ROUTE } from '../../../helpers/constants/routes'; -import { Text } from '../../component-library/text/deprecated'; +import { Text } from '../../component-library'; export default function RecoveryPhraseReminder({ onConfirm, hasBackedUp }) { const t = useI18nContext(); diff --git a/ui/components/app/security-provider-banner-message/security-provider-banner-message.js b/ui/components/app/security-provider-banner-message/security-provider-banner-message.js index 48ed96363..fdaba451f 100644 --- a/ui/components/app/security-provider-banner-message/security-provider-banner-message.js +++ b/ui/components/app/security-provider-banner-message/security-provider-banner-message.js @@ -8,8 +8,7 @@ import { } from '../../../helpers/constants/design-system'; import { SECURITY_PROVIDER_MESSAGE_SEVERITY } from '../../../../shared/constants/security-provider'; import { I18nContext } from '../../../../.storybook/i18n'; -import { BannerAlert, ButtonLink } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; +import { BannerAlert, ButtonLink, Text } from '../../component-library'; export default function SecurityProviderBannerMessage({ securityProviderResponse, diff --git a/ui/components/app/set-approval-for-all-warning/set-approval-for-all-warning.js b/ui/components/app/set-approval-for-all-warning/set-approval-for-all-warning.js index 715535445..424fca315 100644 --- a/ui/components/app/set-approval-for-all-warning/set-approval-for-all-warning.js +++ b/ui/components/app/set-approval-for-all-warning/set-approval-for-all-warning.js @@ -18,8 +18,8 @@ import { IconName, Button, BUTTON_VARIANT, + Text, } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; const SetApproveForAllWarning = ({ collectionName, diff --git a/ui/components/app/signature-request-header/__snapshots__/signature-request-header.test.js.snap b/ui/components/app/signature-request-header/__snapshots__/signature-request-header.test.js.snap index 58642cc3e..26c4468e8 100644 --- a/ui/components/app/signature-request-header/__snapshots__/signature-request-header.test.js.snap +++ b/ui/components/app/signature-request-header/__snapshots__/signature-request-header.test.js.snap @@ -69,12 +69,12 @@ exports[`SignatureRequestHeader should match snapshot 1`] = ` class="box box--display-flex box--flex-direction-column box--align-items-flex-start" >
Unknown private network
Test Account
@@ -84,13 +84,13 @@ exports[`SignatureRequestHeader should match snapshot 1`] = ` class="box box--display-flex box--flex-direction-column box--align-items-flex-end" >
Balance
966.987986 diff --git a/ui/components/app/signature-request-original/__snapshots__/signature-request-original.test.js.snap b/ui/components/app/signature-request-original/__snapshots__/signature-request-original.test.js.snap index 368ebeec2..6cd7195bd 100644 --- a/ui/components/app/signature-request-original/__snapshots__/signature-request-original.test.js.snap +++ b/ui/components/app/signature-request-original/__snapshots__/signature-request-original.test.js.snap @@ -145,12 +145,12 @@ exports[`SignatureRequestOriginal should match snapshot 1`] = ` class="box box--display-flex box--flex-direction-column box--align-items-flex-start" >
Unknown private network
Test Account
@@ -160,13 +160,13 @@ exports[`SignatureRequestOriginal should match snapshot 1`] = ` class="box box--display-flex box--flex-direction-column box--align-items-flex-end" >
Balance
966.987986 diff --git a/ui/components/app/signature-request-original/signature-request-original.component.js b/ui/components/app/signature-request-original/signature-request-original.component.js index 47dfcb8d3..6dc18e4a4 100644 --- a/ui/components/app/signature-request-original/signature-request-original.component.js +++ b/ui/components/app/signature-request-original/signature-request-original.component.js @@ -34,8 +34,7 @@ import { import ConfirmPageContainerNavigation from '../confirm-page-container/confirm-page-container-navigation'; import SecurityProviderBannerMessage from '../security-provider-banner-message/security-provider-banner-message'; ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) -import { Icon, IconName } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; +import { Icon, IconName, Text } from '../../component-library'; import Box from '../../ui/box/box'; ///: END:ONLY_INCLUDE_IN import SignatureRequestHeader from '../signature-request-header'; diff --git a/ui/components/app/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap b/ui/components/app/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap index bf99efd34..30bf2f736 100644 --- a/ui/components/app/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap +++ b/ui/components/app/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap @@ -142,12 +142,12 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`] class="box box--display-flex box--flex-direction-column box--align-items-flex-start" >
Unknown private network
Test Account
@@ -157,13 +157,13 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`] class="box box--display-flex box--flex-direction-column box--align-items-flex-end" >
Balance
966.987986 @@ -288,12 +288,12 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`] class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row" >

Message:

Click to sign in and accept the Terms of Service: https://community.metamask.io/tos

@@ -302,12 +302,12 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`] class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row" >

URI:

http://localhost:8080

@@ -316,12 +316,12 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`] class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row" >

Version:

1

@@ -330,12 +330,12 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`] class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row" >

Chain ID:

1

@@ -344,12 +344,12 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`] class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row" >

Nonce:

STMt6KQMwwdOXE306

@@ -358,12 +358,12 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`] class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row" >

Issued At:

2023-03-18T21:40:40.823Z

@@ -372,12 +372,12 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`] class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row" >

Resources: 2

ipfs://Qme7ss3ARVgxv6rXqVPiikMJ8u2NLgmgszg13pYrDKEoiu https://example.com/my-web2-claim.json diff --git a/ui/components/app/signature-request-siwe/signature-request-siwe-message/signature-request-siwe-message.js b/ui/components/app/signature-request-siwe/signature-request-siwe-message/signature-request-siwe-message.js index ef94acc17..565703ef2 100644 --- a/ui/components/app/signature-request-siwe/signature-request-siwe-message/signature-request-siwe-message.js +++ b/ui/components/app/signature-request-siwe/signature-request-siwe-message/signature-request-siwe-message.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import Box from '../../../ui/box'; -import { Text } from '../../../component-library/text/deprecated'; +import { Text } from '../../../component-library'; import { FLEX_DIRECTION, diff --git a/ui/components/app/signature-request-siwe/signature-request-siwe-tag/index.js b/ui/components/app/signature-request-siwe/signature-request-siwe-tag/index.js index 31595fdf9..a0dd7b326 100644 --- a/ui/components/app/signature-request-siwe/signature-request-siwe-tag/index.js +++ b/ui/components/app/signature-request-siwe/signature-request-siwe-tag/index.js @@ -9,7 +9,7 @@ import { TextColor, } from '../../../../helpers/constants/design-system'; import Box from '../../../ui/box'; -import { Text } from '../../../component-library/text/deprecated'; +import { Text } from '../../../component-library'; const SignatureRequestSIWETag = ({ text }) => { return ( diff --git a/ui/components/app/signature-request-siwe/signature-request-siwe.js b/ui/components/app/signature-request-siwe/signature-request-siwe.js index 68e1f73d6..ddd4319e5 100644 --- a/ui/components/app/signature-request-siwe/signature-request-siwe.js +++ b/ui/components/app/signature-request-siwe/signature-request-siwe.js @@ -5,8 +5,7 @@ import { useHistory } from 'react-router-dom'; import log from 'loglevel'; import { isValidSIWEOrigin } from '@metamask/controller-utils'; import { ethErrors, serializeError } from 'eth-rpc-errors'; -import { BannerAlert } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; +import { BannerAlert, Text } from '../../component-library'; import Popover from '../../ui/popover'; import Checkbox from '../../ui/check-box'; import Button from '../../ui/button'; diff --git a/ui/components/app/signature-request/__snapshots__/signature-request.component.test.js.snap b/ui/components/app/signature-request/__snapshots__/signature-request.component.test.js.snap index 61c4698d9..0f6778004 100644 --- a/ui/components/app/signature-request/__snapshots__/signature-request.component.test.js.snap +++ b/ui/components/app/signature-request/__snapshots__/signature-request.component.test.js.snap @@ -142,12 +142,12 @@ exports[`Signature Request Component render should match snapshot when we are us class="box box--display-flex box--flex-direction-column box--align-items-flex-start" >

Unknown private network
Antonio
@@ -157,13 +157,13 @@ exports[`Signature Request Component render should match snapshot when we are us class="box box--display-flex box--flex-direction-column box--align-items-flex-end" >
Balance
966.987986 @@ -206,13 +206,13 @@ exports[`Signature Request Component render should match snapshot when we are us

Signature request

Only sign this message if you fully understand the content and trust the requesting site.
@@ -224,7 +224,7 @@ exports[`Signature Request Component render should match snapshot when we are us tabindex="0" >
Verify third-party details
@@ -238,7 +238,7 @@ exports[`Signature Request Component render should match snapshot when we are us class="box signature-request-message__root box--margin-2 box--padding-top-3 box--padding-right-3 box--padding-bottom-3 box--flex-direction-row box--background-color-background-default box--rounded-xl box--border-color-border-muted box--border-style-solid box--border-width-1" >

Mail

@@ -919,12 +919,12 @@ exports[`Signature Request Component render should match snapshot when we want t class="box box--display-flex box--flex-direction-column box--align-items-flex-start" >
Unknown private network
Antonio
@@ -934,13 +934,13 @@ exports[`Signature Request Component render should match snapshot when we want t class="box box--display-flex box--flex-direction-column box--align-items-flex-end" >
Balance
1515270.174798 @@ -983,13 +983,13 @@ exports[`Signature Request Component render should match snapshot when we want t

Signature request

Only sign this message if you fully understand the content and trust the requesting site.
@@ -1001,7 +1001,7 @@ exports[`Signature Request Component render should match snapshot when we want t tabindex="0" >
Verify third-party details
@@ -1015,7 +1015,7 @@ exports[`Signature Request Component render should match snapshot when we want t class="box signature-request-message__root box--margin-2 box--padding-top-3 box--padding-right-3 box--padding-bottom-3 box--flex-direction-row box--background-color-background-default box--rounded-xl box--border-color-border-muted box--border-style-solid box--border-width-1" >

Mail

diff --git a/ui/components/app/signature-request/signature-request-message/signature-request-message.js b/ui/components/app/signature-request/signature-request-message/signature-request-message.js index fad259f1d..52322d084 100644 --- a/ui/components/app/signature-request/signature-request-message/signature-request-message.js +++ b/ui/components/app/signature-request/signature-request-message/signature-request-message.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { debounce } from 'lodash'; import { I18nContext } from '../../../../contexts/i18n'; import Box from '../../../ui/box'; -import { Text } from '../../../component-library/text/deprecated'; +import { Text } from '../../../component-library'; import { Display, FlexDirection, diff --git a/ui/components/app/signature-request/signature-request.component.js b/ui/components/app/signature-request/signature-request.component.js index f5eda00e9..c0358b99d 100644 --- a/ui/components/app/signature-request/signature-request.component.js +++ b/ui/components/app/signature-request/signature-request.component.js @@ -46,8 +46,8 @@ import { Icon, IconName, ///: END:ONLY_INCLUDE_IN + Text, } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; import Footer from './signature-request-footer'; import Message from './signature-request-message'; diff --git a/ui/components/app/snaps/install-error/install-error.js b/ui/components/app/snaps/install-error/install-error.js index e8003192b..dad100bda 100644 --- a/ui/components/app/snaps/install-error/install-error.js +++ b/ui/components/app/snaps/install-error/install-error.js @@ -13,8 +13,7 @@ import { TextVariant, } from '../../../../helpers/constants/design-system'; import ActionableMessage from '../../../ui/actionable-message/actionable-message'; -import { AvatarIcon, IconSize } from '../../../component-library'; -import { Text } from '../../../component-library/text/deprecated'; +import { AvatarIcon, IconSize, Text } from '../../../component-library'; const InstallError = ({ title, error, description, iconName }) => { return ( diff --git a/ui/components/app/snaps/snap-authorship-expanded/snap-authorship-expanded.js b/ui/components/app/snaps/snap-authorship-expanded/snap-authorship-expanded.js index c3efb4e24..ac3fefd72 100644 --- a/ui/components/app/snaps/snap-authorship-expanded/snap-authorship-expanded.js +++ b/ui/components/app/snaps/snap-authorship-expanded/snap-authorship-expanded.js @@ -25,8 +25,7 @@ import { removeSnapIdPrefix, } from '../../../../helpers/utils/util'; -import { ButtonLink } from '../../../component-library'; -import { Text } from '../../../component-library/text/deprecated'; +import { ButtonLink, Text } from '../../../component-library'; import { getTargetSubjectMetadata } from '../../../../selectors'; import SnapAvatar from '../snap-avatar'; import { useI18nContext } from '../../../../hooks/useI18nContext'; diff --git a/ui/components/app/snaps/snap-authorship-header/snap-authorship-header.js b/ui/components/app/snaps/snap-authorship-header/snap-authorship-header.js index 7945751e2..4f99c2162 100644 --- a/ui/components/app/snaps/snap-authorship-header/snap-authorship-header.js +++ b/ui/components/app/snaps/snap-authorship-header/snap-authorship-header.js @@ -19,7 +19,7 @@ import { removeSnapIdPrefix, } from '../../../../helpers/utils/util'; -import { Text } from '../../../component-library/text/deprecated'; +import { Text } from '../../../component-library'; import { getTargetSubjectMetadata } from '../../../../selectors'; import SnapAvatar from '../snap-avatar'; import SnapVersion from '../snap-version/snap-version'; diff --git a/ui/components/app/snaps/snap-connect-cell/snap-connect-cell.js b/ui/components/app/snaps/snap-connect-cell/snap-connect-cell.js index 9ca3e434f..f168b7920 100644 --- a/ui/components/app/snaps/snap-connect-cell/snap-connect-cell.js +++ b/ui/components/app/snaps/snap-connect-cell/snap-connect-cell.js @@ -9,8 +9,13 @@ import { FontWeight, } from '../../../../helpers/constants/design-system'; import { getSnapName } from '../../../../helpers/utils/util'; -import { Icon, IconName, IconSize, ValidTag } from '../../../component-library'; -import { Text } from '../../../component-library/text/deprecated'; +import { + Icon, + IconName, + IconSize, + ValidTag, + Text, +} from '../../../component-library'; import Tooltip from '../../../ui/tooltip/tooltip'; import { useI18nContext } from '../../../../hooks/useI18nContext'; import SnapAvatar from '../snap-avatar/snap-avatar'; diff --git a/ui/components/app/snaps/snap-delineator/snap-delineator.js b/ui/components/app/snaps/snap-delineator/snap-delineator.js index 93d2097ae..a1338abba 100644 --- a/ui/components/app/snaps/snap-delineator/snap-delineator.js +++ b/ui/components/app/snaps/snap-delineator/snap-delineator.js @@ -12,8 +12,12 @@ import { TextColor, } from '../../../../helpers/constants/design-system'; import Box from '../../../ui/box'; -import { AvatarIcon, IconName, IconSize } from '../../../component-library'; -import { Text } from '../../../component-library/text/deprecated'; +import { + AvatarIcon, + IconName, + IconSize, + Text, +} from '../../../component-library'; import { DelineatorType, getDelineatorTitle, diff --git a/ui/components/app/snaps/snap-install-warning/snap-install-warning.js b/ui/components/app/snaps/snap-install-warning/snap-install-warning.js index 83960e879..0eff25f13 100644 --- a/ui/components/app/snaps/snap-install-warning/snap-install-warning.js +++ b/ui/components/app/snaps/snap-install-warning/snap-install-warning.js @@ -16,8 +16,7 @@ import { } from '../../../../helpers/constants/design-system'; import Popover from '../../../ui/popover'; import Button from '../../../ui/button'; -import { AvatarIcon, IconName } from '../../../component-library'; -import { Text } from '../../../component-library/text/deprecated'; +import { AvatarIcon, IconName, Text } from '../../../component-library'; import Box from '../../../ui/box/box'; /** diff --git a/ui/components/app/snaps/snap-privacy-warning/snap-privacy-warning.js b/ui/components/app/snaps/snap-privacy-warning/snap-privacy-warning.js index 45a55a959..0d9e1d99b 100644 --- a/ui/components/app/snaps/snap-privacy-warning/snap-privacy-warning.js +++ b/ui/components/app/snaps/snap-privacy-warning/snap-privacy-warning.js @@ -12,8 +12,8 @@ import { ButtonLink, IconName, IconSize, + Text, } from '../../../component-library'; -import { Text } from '../../../component-library/text/deprecated'; import { AlignItems, BackgroundColor, diff --git a/ui/components/app/snaps/snap-settings-card/snap-settings-card.js b/ui/components/app/snaps/snap-settings-card/snap-settings-card.js index 54703c999..6f7fc6822 100644 --- a/ui/components/app/snaps/snap-settings-card/snap-settings-card.js +++ b/ui/components/app/snaps/snap-settings-card/snap-settings-card.js @@ -12,8 +12,7 @@ import { IconColor, TextVariant, } from '../../../../helpers/constants/design-system'; -import { Icon, IconName, IconSize } from '../../../component-library'; -import { Text } from '../../../component-library/text/deprecated'; +import { Icon, IconName, IconSize, Text } from '../../../component-library'; import SnapAvatar from '../snap-avatar'; const SnapSettingsCard = ({ name, packageName, onClick, snapId }) => { diff --git a/ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js b/ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js index 0a7378686..82a9a1c2f 100644 --- a/ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js +++ b/ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js @@ -17,7 +17,7 @@ import { useI18nContext } from '../../../../hooks/useI18nContext'; import Box from '../../../ui/box'; import { getSnapName } from '../../../../helpers/utils/util'; import { getTargetSubjectMetadata } from '../../../../selectors'; -import { Text } from '../../../component-library/text/deprecated'; +import { Text } from '../../../component-library'; import { Copyable } from '../copyable'; import { DelineatorType } from '../../../../helpers/constants/snaps'; diff --git a/ui/components/app/snaps/snap-version/snap-version.js b/ui/components/app/snaps/snap-version/snap-version.js index 88dd90b4a..f70653540 100644 --- a/ui/components/app/snaps/snap-version/snap-version.js +++ b/ui/components/app/snaps/snap-version/snap-version.js @@ -15,8 +15,8 @@ import { Icon, IconName, IconSize, + Text, } from '../../../component-library'; -import { Text } from '../../../component-library/text/deprecated'; import Preloader from '../../../ui/icon/preloader/preloader-icon.component'; const SnapVersion = ({ version, url }) => { diff --git a/ui/components/app/srp-input/srp-input.js b/ui/components/app/srp-input/srp-input.js index e23460f6b..be990e3cf 100644 --- a/ui/components/app/srp-input/srp-input.js +++ b/ui/components/app/srp-input/srp-input.js @@ -11,7 +11,7 @@ import { TextAlign, TextVariant, } from '../../../helpers/constants/design-system'; -import { Text } from '../../component-library/text/deprecated'; +import { Text } from '../../component-library'; import { parseSecretRecoveryPhrase } from './parse-secret-recovery-phrase'; const defaultNumberOfWords = 12; diff --git a/ui/components/app/srp-quiz-modal/QuizContent/QuizContent.tsx b/ui/components/app/srp-quiz-modal/QuizContent/QuizContent.tsx index 6a44f6676..8994573c2 100644 --- a/ui/components/app/srp-quiz-modal/QuizContent/QuizContent.tsx +++ b/ui/components/app/srp-quiz-modal/QuizContent/QuizContent.tsx @@ -9,8 +9,7 @@ import { TextVariant, } from '../../../../helpers/constants/design-system'; import { useI18nContext } from '../../../../hooks/useI18nContext'; -import { Button, Box } from '../../../component-library'; -import { Text } from '../../../component-library/text/deprecated'; +import { Button, Box, Text } from '../../../component-library'; import { IQuizInformationProps } from '../types'; export default function QuizContent({ diff --git a/ui/components/app/terms-of-use-popup/terms-of-use-popup.js b/ui/components/app/terms-of-use-popup/terms-of-use-popup.js index 46126b7de..ed16507ea 100644 --- a/ui/components/app/terms-of-use-popup/terms-of-use-popup.js +++ b/ui/components/app/terms-of-use-popup/terms-of-use-popup.js @@ -15,8 +15,8 @@ import { BUTTON_VARIANT, ButtonLink, Label, + Text, } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; import Box from '../../ui/box'; import CheckBox from '../../ui/check-box/check-box.component'; import { diff --git a/ui/components/app/transaction-alerts/transaction-alerts.js b/ui/components/app/transaction-alerts/transaction-alerts.js index ed8becda8..72b65c991 100644 --- a/ui/components/app/transaction-alerts/transaction-alerts.js +++ b/ui/components/app/transaction-alerts/transaction-alerts.js @@ -6,8 +6,7 @@ import { PriorityLevels } from '../../../../shared/constants/gas'; import { submittedPendingTransactionsSelector } from '../../../selectors'; import { useGasFeeContext } from '../../../contexts/gasFee'; import { useI18nContext } from '../../../hooks/useI18nContext'; -import { BannerAlert, ButtonLink } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; +import { BannerAlert, ButtonLink, Text } from '../../component-library'; import SimulationErrorMessage from '../../ui/simulation-error-message'; import { SEVERITIES } from '../../../helpers/constants/design-system'; import ZENDESK_URLS from '../../../helpers/constants/zendesk-url'; diff --git a/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js b/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js index d729c5dc1..502f62d94 100644 --- a/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js +++ b/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js @@ -13,8 +13,7 @@ import CancelButton from '../cancel-button'; import Popover from '../../ui/popover'; ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) import Box from '../../ui/box/box'; -import { Icon, IconName } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; +import { Icon, IconName, Text } from '../../component-library'; import { IconColor } from '../../../helpers/constants/design-system'; ///: END:ONLY_INCLUDE_IN import { SECOND } from '../../../../shared/constants/time'; diff --git a/ui/components/app/whats-new-popup/whats-new-popup.js b/ui/components/app/whats-new-popup/whats-new-popup.js index 8b8be5b48..09e26129f 100644 --- a/ui/components/app/whats-new-popup/whats-new-popup.js +++ b/ui/components/app/whats-new-popup/whats-new-popup.js @@ -9,12 +9,12 @@ import { I18nContext } from '../../../contexts/i18n'; import { useEqualityCheck } from '../../../hooks/useEqualityCheck'; import Popover from '../../ui/popover'; import { + Text, Button, ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) IconName, ///: END:ONLY_INCLUDE_IN } from '../../component-library'; -import { Text } from '../../component-library/text/deprecated'; import { updateViewedNotifications } from '../../../store/actions'; import { getTranslatedUINotifications } from '../../../../shared/notifications'; import { getSortedAnnouncementsToShow } from '../../../selectors'; diff --git a/ui/pages/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap b/ui/pages/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap index 7a2fde6eb..071e3cd61 100644 --- a/ui/pages/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap +++ b/ui/pages/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap @@ -284,7 +284,7 @@ exports[`ConfirmSendEther should render correct information for for confirm send class="confirm-page-container-summary__title" >

Goerli test network
Account 1
@@ -157,13 +157,13 @@ exports[`Signature Request Component render should match snapshot 1`] = ` class="box box--display-flex box--flex-direction-column box--align-items-flex-end" >
Balance
9.107408 @@ -205,13 +205,13 @@ exports[`Signature Request Component render should match snapshot 1`] = `

Signature request

Only sign this message if you fully understand the content and trust the requesting site.
@@ -223,7 +223,7 @@ exports[`Signature Request Component render should match snapshot 1`] = ` tabindex="0" >
Verify third-party details
@@ -237,7 +237,7 @@ exports[`Signature Request Component render should match snapshot 1`] = ` class="box signature-request-message__root box--margin-2 box--padding-top-3 box--padding-right-3 box--padding-bottom-3 box--flex-direction-row box--background-color-background-default box--rounded-xl box--border-color-border-muted box--border-style-solid box--border-width-1" >

Mail

diff --git a/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap b/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap index a4f40b4c1..85cbd71bd 100644 --- a/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap +++ b/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap @@ -254,7 +254,7 @@ exports[`Confirm Transaction Base should match snapshot 1`] = ` class="confirm-page-container-summary__title" >

Test Account

0x0dcd...e7bc

@@ -136,12 +136,12 @@ exports[`Add Recipient Component Domain Resolution should match snapshot 1`] = ` data-testid="recipient" >

Test Account 2

0xec1a...251b

@@ -199,12 +199,12 @@ exports[`Add Recipient Component Domain Resolution should match snapshot 1`] = ` data-testid="recipient" >

Test Ledger 1

0xc42e...8813

@@ -262,12 +262,12 @@ exports[`Add Recipient Component Domain Resolution should match snapshot 1`] = ` data-testid="recipient" >

Test Account 3

0xeb9e...4823

@@ -509,12 +509,12 @@ exports[`Add Recipient Component render should match snapshot 1`] = ` data-testid="recipient" >

Test Account

0x0dcd...e7bc

@@ -572,12 +572,12 @@ exports[`Add Recipient Component render should match snapshot 1`] = ` data-testid="recipient" >

Test Account 2

0xec1a...251b

@@ -635,12 +635,12 @@ exports[`Add Recipient Component render should match snapshot 1`] = ` data-testid="recipient" >

Test Ledger 1

0xc42e...8813

@@ -698,12 +698,12 @@ exports[`Add Recipient Component render should match snapshot 1`] = ` data-testid="recipient" >

Test Account 3

0xeb9e...4823

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

A

@@ -794,12 +794,12 @@ exports[`Add Recipient Component render should match snapshot 1`] = ` data-testid="recipient" >

Address Book Account 1

0xc42e...8813

diff --git a/ui/pages/token-allowance/__snapshots__/token-allowance.test.js.snap b/ui/pages/token-allowance/__snapshots__/token-allowance.test.js.snap index 465d0b882..ea4f9bf14 100644 --- a/ui/pages/token-allowance/__snapshots__/token-allowance.test.js.snap +++ b/ui/pages/token-allowance/__snapshots__/token-allowance.test.js.snap @@ -161,12 +161,12 @@ exports[`TokenAllowancePage should match snapshot 1`] = ` class="box box--display-flex box--flex-direction-column box--align-items-flex-start" >
mainnet
Account 1
@@ -176,13 +176,13 @@ exports[`TokenAllowancePage should match snapshot 1`] = ` class="box box--display-flex box--flex-direction-column box--align-items-flex-end" >
Balance
10