Updating Text and import paths (#19949)

MetaMask · Jul 14, 2023 · 74cc312 · 74cc312
1 parent 5bc0ba7
commit 74cc312
Show file tree

Hide file tree

Showing 202 changed files with 740 additions and 653 deletions.
diff --git a/ui/components/app/add-network/add-network.js b/ui/components/app/add-network/add-network.js
@@ -36,12 +36,12 @@ import { ADD_NETWORK_ROUTE } from '../../../helpers/constants/routes';
 import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
 import {
-  Text,
   Icon,
   IconName,
   IconSize,
   AvatarNetwork,
 } from '../../component-library';
+import { Text } from '../../component-library/text/deprecated';
 import { MetaMetricsNetworkEventSource } from '../../../../shared/constants/metametrics';
 
 const AddNetwork = () => {

diff --git a/...nents/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js b/...nents/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';
+import { Text } from '../../../component-library/text/deprecated';
 
 const AdvancedGasFeeDefaults = () => {
   const t = useI18nContext();

diff --git a/...nts/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js b/...nts/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';
+import { Text } from '../../../component-library/text/deprecated';
 
 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
@@ -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';
+import { Text } from '../../component-library/text/deprecated';
 import {
   AlignItems,
   BlockSize,

diff --git a/ui/components/app/beta-header/index.js b/ui/components/app/beta-header/index.js
@@ -14,12 +14,8 @@ import {
 import { BETA_BUGS_URL } from '../../../helpers/constants/beta';
 
 import { hideBetaHeader } from '../../../store/actions';
-import {
-  ButtonIcon,
-  ButtonIconSize,
-  IconName,
-  Text,
-} from '../../component-library';
+import { Text } from '../../component-library/text/deprecated';
+import { ButtonIcon, ButtonIconSize, IconName } 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
@@ -18,7 +18,8 @@ import Box from '../../ui/box';
 import InfoTooltip from '../../ui/info-tooltip';
 import Popover from '../../ui/popover';
 import AppLoadingSpinner from '../app-loading-spinner';
-import { Text, Button, ButtonLink } from '../../component-library';
+import { Text } from '../../component-library/text/deprecated';
+import { Button, ButtonLink } 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
@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { Text } from '../../component-library/text/deprecated';
 import {
   BUTTON_VARIANT,
   Button,
-  Text,
   Box,
   Modal,
   ModalOverlay,

diff --git 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';
+import { Text } from '../../component-library/text/deprecated';
 
 const ConfirmData = ({ txData, dataComponent }) => {
   const t = useI18nContext();

diff --git a/...mponents/app/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js b/...mponents/app/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js
@@ -18,7 +18,7 @@ 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';
+import { Text } from '../../../component-library/text/deprecated';
 import {
   FONT_STYLE,
   TextVariant,

diff --git 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';
+import { Text } from '../../component-library/text/deprecated';
 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
@@ -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';
+import { Text } from '../../component-library/text/deprecated';
 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
@@ -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';
+import { Text } from '../../../component-library/text/deprecated';
 import {
   AlignItems,
   FLEX_DIRECTION,

diff --git 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';
+import { Text } from '../../component-library/text/deprecated';
 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
@@ -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';
+import { Text } from '../../component-library/text/deprecated';
 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
@@ -14,7 +14,8 @@ import {
   AlignItems,
   IconColor,
 } from '../../../helpers/constants/design-system';
-import { Icon, IconName, IconSize, Text } from '../../component-library';
+import { Icon, IconName, IconSize } from '../../component-library';
+import { Text } from '../../component-library/text/deprecated';
 
 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
@@ -8,7 +8,7 @@ import {
   TextColor,
   TextVariant,
 } from '../../../../helpers/constants/design-system';
-import { Text } from '../../../component-library';
+import { Text } from '../../../component-library/text/deprecated';
 
 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
@@ -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';
+import { Text } from '../../component-library/text/deprecated';
 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
@@ -8,7 +8,8 @@ import {
   TextVariant,
 } from '../../../helpers/constants/design-system';
 
-import { Icon, IconName, IconSize, Text } from '../../component-library';
+import { Icon, IconName, IconSize } from '../../component-library';
+import { Text } from '../../component-library/text/deprecated';
 
 export const CustomSpendingCapTooltip = ({
   tooltipContentText,

diff --git a/ui/components/app/custom-spending-cap/custom-spending-cap.js b/ui/components/app/custom-spending-cap/custom-spending-cap.js
@@ -8,7 +8,8 @@ import { addHexPrefix } from 'ethereumjs-util';
 import { I18nContext } from '../../../contexts/i18n';
 import Box from '../../ui/box';
 import FormField from '../../ui/form-field';
-import { Text, ButtonLink, Icon, IconName } from '../../component-library';
+import { ButtonLink, Icon, IconName } from '../../component-library';
+import { Text } from '../../component-library/text/deprecated';
 import {
   AlignItems,
   DISPLAY,

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
@@ -15,7 +15,7 @@ import {
 } from '../../../../helpers/constants/design-system';
 
 import { shortenAddress } from '../../../../helpers/utils/util';
-import { Text } from '../../../component-library';
+import { Text } from '../../../component-library/text/deprecated';
 
 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
@@ -8,7 +8,8 @@ import {
   FontWeight,
   TextVariant,
 } from '../../../../helpers/constants/design-system';
-import { Text, Box, ButtonLink } from '../../../component-library';
+import { Box, ButtonLink } from '../../../component-library';
+import { Text } from '../../../component-library/text/deprecated';
 
 const NUMBER_OF_AGGREGATORS_TO_DISPLAY = 2;
 

diff --git a/...nents/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.js b/...nents/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';
+import { Text } from '../../../component-library/text/deprecated';
 
 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
@@ -12,7 +12,8 @@ import {
 import { useTokenTracker } from '../../../../hooks/useTokenTracker';
 import { useTokenFiatAmount } from '../../../../hooks/useTokenFiatAmount';
 import { getUseCurrencyRateCheck } from '../../../../selectors';
-import { Text, Box } from '../../../component-library';
+import { Box } from '../../../component-library';
+import { Text } from '../../../component-library/text/deprecated';
 
 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
@@ -12,7 +12,7 @@ import {
   TextColor,
   TextVariant,
 } from '../../../helpers/constants/design-system';
-import { Text } from '../../component-library';
+import { Text } from '../../component-library/text/deprecated';
 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
@@ -13,7 +13,8 @@ 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, Text } from '../../component-library';
+import { Icon, IconName, IconSize } from '../../component-library';
+import { Text } from '../../component-library/text/deprecated';
 
 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
@@ -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';
+import { Text } from '../../component-library/text/deprecated';
 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
@@ -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';
+import { Text } from '../../../component-library/text/deprecated';
 
 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
@@ -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';
+import { Text } from '../../../component-library/text/deprecated';
 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
@@ -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';
+import { Text } from '../../../component-library/text/deprecated';
 
 const GasDetailsItemTitle = () => {
   const t = useI18nContext();

diff --git a/ui/components/app/ledger-instruction-field/ledger-instruction-field.js b/ui/components/app/ledger-instruction-field/ledger-instruction-field.js
@@ -19,7 +19,8 @@ import {
   getLedgerTransportStatus,
 } from '../../../ducks/app/app';
 
-import { BannerAlert, ButtonLink, Text } from '../../component-library';
+import { BannerAlert, ButtonLink } from '../../component-library';
+import { Text } from '../../component-library/text/deprecated';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
   SEVERITIES,

diff --git a/ui/components/app/loading-network-screen/loading-network-screen.component.js b/ui/components/app/loading-network-screen/loading-network-screen.component.js
@@ -10,8 +10,8 @@ import {
   Icon,
   IconName,
   IconSize,
-  Text,
 } from '../../component-library';
+import { Text } from '../../component-library/text/deprecated';
 import {
   DISPLAY,
   IconColor,

diff --git a/ui/components/app/modals/contract-details-modal/contract-details-modal.js b/ui/components/app/modals/contract-details-modal/contract-details-modal.js
@@ -24,7 +24,8 @@ import { useCopyToClipboard } from '../../../../hooks/useCopyToClipboard';
 import { getAddressBookEntry } from '../../../../selectors';
 import { TokenStandard } from '../../../../../shared/constants/transaction';
 import NftCollectionImage from '../../../ui/nft-collection-image/nft-collection-image';
-import { ButtonIcon, IconName, Text } from '../../../component-library';
+import { ButtonIcon, IconName } from '../../../component-library';
+import { Text } from '../../../component-library/text/deprecated';
 
 export default function ContractDetailsModal({
   onClose,

diff --git a/ui/components/app/modals/customize-nonce/customize-nonce.component.js b/ui/components/app/modals/customize-nonce/customize-nonce.component.js
@@ -17,8 +17,8 @@ import {
   ButtonIconSize,
   ButtonLink,
   IconName,
-  Text,
 } from '../../../component-library';
+import { Text } from '../../../component-library/text/deprecated';
 
 const CustomizeNonce = ({
   hideModal,

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
@@ -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/export-private-key-modal.component.js b/ui/components/app/modals/export-private-key-modal/export-private-key-modal.component.js
@@ -8,8 +8,8 @@ import {
   BUTTON_VARIANT,
   BannerAlert,
   Button,
-  Text,
 } from '../../../component-library';
+import { Text } from '../../../component-library/text/deprecated';
 import AccountModalContainer from '../account-modal-container';
 import { toChecksumHexAddress } from '../../../../../shared/modules/hexstring-utils';
 import {

diff --git a/ui/components/app/modals/hold-to-reveal-modal/hold-to-reveal-modal.js b/ui/components/app/modals/hold-to-reveal-modal/hold-to-reveal-modal.js
@@ -3,13 +3,13 @@ import React, { useContext } from 'react';
 import withModalProps from '../../../../helpers/higher-order-components/with-modal-props';
 import Box from '../../../ui/box';
 import {
-  Text,
   Button,
   BUTTON_SIZES,
   BUTTON_VARIANT,
   ButtonIcon,
   IconName,
 } from '../../../component-library';
+import { Text } from '../../../component-library/text/deprecated';
 import {
   AlignItems,
   Display,

diff --git a/ui/components/app/network-account-balance-header/network-account-balance-header.js b/ui/components/app/network-account-balance-header/network-account-balance-header.js
@@ -15,7 +15,7 @@ import {
 import Box from '../../ui/box/box';
 import { I18nContext } from '../../../contexts/i18n';
 import { CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP } from '../../../../shared/constants/network';
-import { Text } from '../../component-library';
+import { Text } from '../../component-library/text/deprecated';
 
 export default function NetworkAccountBalanceHeader({
   networkName,

diff --git 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';
+import { Text } from '../../component-library/text/deprecated';
 import Box from '../../ui/box/box';
 
 export default function NftDefaultImage({

diff --git a/ui/components/app/nft-details/nft-details.js b/ui/components/app/nft-details/nft-details.js
@@ -51,7 +51,8 @@ import {
   AssetType,
   TokenStandard,
 } from '../../../../shared/constants/transaction';
-import { ButtonIcon, IconName, Text } from '../../component-library';
+import { ButtonIcon, IconName } from '../../component-library';
+import { Text } from '../../component-library/text/deprecated';
 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-detection-notice/nfts-detection-notice.js b/ui/components/app/nfts-detection-notice/nfts-detection-notice.js
@@ -2,7 +2,8 @@ import React from 'react';
 import { useHistory } from 'react-router-dom';
 import Box from '../../ui/box';
 import Dialog from '../../ui/dialog';
-import { Icon, IconName, Text } from '../../component-library';
+import { Icon, IconName } from '../../component-library';
+import { Text } from '../../component-library/text/deprecated';
 import {
   TextVariant,
   TextAlign,