diff --git a/ui/components/app/app-components.scss b/ui/components/app/app-components.scss index cc40f367a28a..321a5faf9448 100644 --- a/ui/components/app/app-components.scss +++ b/ui/components/app/app-components.scss @@ -8,11 +8,11 @@ @import 'alert-system/alert-modal/index'; @import 'alert-system/inline-alert/index'; @import 'import-token/index'; -@import 'nfts-items/index'; -@import 'nfts-tab/index'; -@import 'nft-details/index'; -@import 'nft-default-image/index'; -@import 'nft-options/index'; +@import 'assets/nfts/nfts-items/index'; +@import 'assets/nfts/nfts-tab/index'; +@import 'assets/nfts/nft-details/index'; +@import 'assets/nfts/nft-default-image/index'; +@import 'assets/nfts/nft-options/index'; @import 'connected-accounts-list/index'; @import 'connected-accounts-permissions/index'; @import 'connected-sites-list/index'; @@ -47,13 +47,13 @@ @import 'recovery-phrase-reminder/index'; @import 'step-progress-bar/index.scss'; @import 'selected-account/index'; -@import 'auto-detect-token/index'; +@import 'assets/auto-detect-token/index'; @import 'smart-transactions/index'; @import 'srp-input/srp-input'; @import 'snaps/snap-privacy-warning/index'; @import 'tab-bar/index'; -@import 'token-cell/token-cell'; -@import 'token-list-display/token-list-display'; +@import 'assets/token-cell/token-cell'; +@import 'assets/token-list-display/token-list-display'; @import 'transaction-activity-log/index'; @import 'transaction-breakdown/index'; @import 'transaction-icon/transaction-icon'; diff --git a/ui/components/app/asset-list/asset-list.js b/ui/components/app/assets/asset-list/asset-list.js similarity index 88% rename from ui/components/app/asset-list/asset-list.js rename to ui/components/app/assets/asset-list/asset-list.js index b9c200233c04..361cb4cfe5aa 100644 --- a/ui/components/app/asset-list/asset-list.js +++ b/ui/components/app/assets/asset-list/asset-list.js @@ -2,15 +2,15 @@ import React, { useContext, useState } from 'react'; import PropTypes from 'prop-types'; import { useSelector } from 'react-redux'; import TokenList from '../token-list'; -import { PRIMARY, SECONDARY } from '../../../helpers/constants/common'; -import { useUserPreferencedCurrency } from '../../../hooks/useUserPreferencedCurrency'; +import { PRIMARY, SECONDARY } from '../../../../helpers/constants/common'; +import { useUserPreferencedCurrency } from '../../../../hooks/useUserPreferencedCurrency'; import { getDetectedTokensInCurrentNetwork, getIstokenDetectionInactiveOnNonMainnetSupportedNetwork, getShouldHideZeroBalanceTokens, getSelectedAccount, getPreferences, -} from '../../../selectors'; +} from '../../../../selectors'; import { getMultichainCurrentNetwork, getMultichainNativeCurrency, @@ -23,33 +23,33 @@ import { getMultichainIsBitcoin, ///: END:ONLY_INCLUDE_IF getMultichainSelectedAccountCachedBalanceIsZero, -} from '../../../selectors/multichain'; -import { useCurrencyDisplay } from '../../../hooks/useCurrencyDisplay'; -import { MetaMetricsContext } from '../../../contexts/metametrics'; +} from '../../../../selectors/multichain'; +import { useCurrencyDisplay } from '../../../../hooks/useCurrencyDisplay'; +import { MetaMetricsContext } from '../../../../contexts/metametrics'; import { MetaMetricsEventCategory, MetaMetricsEventName, -} from '../../../../shared/constants/metametrics'; -import DetectedToken from '../detected-token/detected-token'; +} from '../../../../../shared/constants/metametrics'; +import DetectedToken from '../../detected-token/detected-token'; import { DetectedTokensBanner, TokenListItem, ImportTokenLink, ReceiveTokenLink, -} from '../../multichain'; -import { useAccountTotalFiatBalance } from '../../../hooks/useAccountTotalFiatBalance'; -import { useIsOriginalNativeTokenSymbol } from '../../../hooks/useIsOriginalNativeTokenSymbol'; +} from '../../../multichain'; +import { useAccountTotalFiatBalance } from '../../../../hooks/useAccountTotalFiatBalance'; +import { useIsOriginalNativeTokenSymbol } from '../../../../hooks/useIsOriginalNativeTokenSymbol'; import { showPrimaryCurrency, showSecondaryCurrency, -} from '../../../../shared/modules/currency-display.utils'; -import { roundToDecimalPlacesRemovingExtraZeroes } from '../../../helpers/utils/util'; +} from '../../../../../shared/modules/currency-display.utils'; +import { roundToDecimalPlacesRemovingExtraZeroes } from '../../../../helpers/utils/util'; ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask) import { RAMPS_CARD_VARIANT_TYPES, RampsCard, -} from '../../multichain/ramps-card/ramps-card'; -import { getIsNativeTokenBuyable } from '../../../ducks/ramps'; +} from '../../../multichain/ramps-card/ramps-card'; +import { getIsNativeTokenBuyable } from '../../../../ducks/ramps'; ///: END:ONLY_INCLUDE_IF const AssetList = ({ onClickAsset, showTokensLinks }) => { diff --git a/ui/components/app/asset-list/asset-list.ramps-card.test.js b/ui/components/app/assets/asset-list/asset-list.ramps-card.test.js similarity index 76% rename from ui/components/app/asset-list/asset-list.ramps-card.test.js rename to ui/components/app/assets/asset-list/asset-list.ramps-card.test.js index 1f795b4a992c..d74347f23651 100644 --- a/ui/components/app/asset-list/asset-list.ramps-card.test.js +++ b/ui/components/app/assets/asset-list/asset-list.ramps-card.test.js @@ -1,16 +1,19 @@ import React from 'react'; -import { renderWithProvider } from '../../../../test/jest'; -import configureStore from '../../../store/store'; -import mockState from '../../../../test/data/mock-state.json'; -import { CHAIN_IDS, NETWORK_TYPES } from '../../../../shared/constants/network'; -import { useIsOriginalNativeTokenSymbol } from '../../../hooks/useIsOriginalNativeTokenSymbol'; -import { getSelectedInternalAccountFromMockState } from '../../../../test/jest/mocks'; +import { renderWithProvider } from '../../../../../test/jest'; +import configureStore from '../../../../store/store'; +import mockState from '../../../../../test/data/mock-state.json'; +import { + CHAIN_IDS, + NETWORK_TYPES, +} from '../../../../../shared/constants/network'; +import { useIsOriginalNativeTokenSymbol } from '../../../../hooks/useIsOriginalNativeTokenSymbol'; +import { getSelectedInternalAccountFromMockState } from '../../../../../test/jest/mocks'; import AssetList from './asset-list'; // Specific to just the ETH FIAT conversion const ETH_BALANCE = '0x041173b2c0e57d'; // 0.0011 ETH ($1.83) -jest.mock('../../../hooks/useIsOriginalNativeTokenSymbol', () => { +jest.mock('../../../../hooks/useIsOriginalNativeTokenSymbol', () => { return { useIsOriginalNativeTokenSymbol: jest.fn(), }; diff --git a/ui/components/app/asset-list/asset-list.stories.js b/ui/components/app/assets/asset-list/asset-list.stories.js similarity index 100% rename from ui/components/app/asset-list/asset-list.stories.js rename to ui/components/app/assets/asset-list/asset-list.stories.js diff --git a/ui/components/app/asset-list/asset-list.test.js b/ui/components/app/assets/asset-list/asset-list.test.js similarity index 84% rename from ui/components/app/asset-list/asset-list.test.js rename to ui/components/app/assets/asset-list/asset-list.test.js index b2730a69ae5e..a06f74705cfb 100644 --- a/ui/components/app/asset-list/asset-list.test.js +++ b/ui/components/app/assets/asset-list/asset-list.test.js @@ -1,12 +1,15 @@ import React from 'react'; import { screen, act, waitFor } from '@testing-library/react'; -import { renderWithProvider } from '../../../../test/jest'; -import configureStore from '../../../store/store'; -import mockState from '../../../../test/data/mock-state.json'; -import { CHAIN_IDS, NETWORK_TYPES } from '../../../../shared/constants/network'; -import { useIsOriginalNativeTokenSymbol } from '../../../hooks/useIsOriginalNativeTokenSymbol'; -import { getTokenSymbol } from '../../../store/actions'; -import { getSelectedInternalAccountFromMockState } from '../../../../test/jest/mocks'; +import { renderWithProvider } from '../../../../../test/jest'; +import configureStore from '../../../../store/store'; +import mockState from '../../../../../test/data/mock-state.json'; +import { + CHAIN_IDS, + NETWORK_TYPES, +} from '../../../../../shared/constants/network'; +import { useIsOriginalNativeTokenSymbol } from '../../../../hooks/useIsOriginalNativeTokenSymbol'; +import { getTokenSymbol } from '../../../../store/actions'; +import { getSelectedInternalAccountFromMockState } from '../../../../../test/jest/mocks'; import AssetList from './asset-list'; // Specific to just the ETH FIAT conversion @@ -44,7 +47,7 @@ let mockTokens = [ }, ]; -jest.mock('../../../hooks/useTokenTracker', () => { +jest.mock('../../../../hooks/useTokenTracker', () => { return { useTokenTracker: () => ({ loading: false, @@ -54,13 +57,13 @@ jest.mock('../../../hooks/useTokenTracker', () => { }; }); -jest.mock('../../../hooks/useIsOriginalNativeTokenSymbol', () => { +jest.mock('../../../../hooks/useIsOriginalNativeTokenSymbol', () => { return { useIsOriginalNativeTokenSymbol: jest.fn(), }; }); -jest.mock('../../../store/actions', () => { +jest.mock('../../../../store/actions', () => { return { getTokenSymbol: jest.fn(), }; diff --git a/ui/components/app/asset-list/index.js b/ui/components/app/assets/asset-list/index.js similarity index 100% rename from ui/components/app/asset-list/index.js rename to ui/components/app/assets/asset-list/index.js diff --git a/ui/components/app/auto-detect-nft/auto-detect-nft-modal.test.stories.js b/ui/components/app/assets/auto-detect-nft/auto-detect-nft-modal.test.stories.js similarity index 88% rename from ui/components/app/auto-detect-nft/auto-detect-nft-modal.test.stories.js rename to ui/components/app/assets/auto-detect-nft/auto-detect-nft-modal.test.stories.js index 2d915d6a61f5..ee92b626b7ed 100644 --- a/ui/components/app/auto-detect-nft/auto-detect-nft-modal.test.stories.js +++ b/ui/components/app/assets/auto-detect-nft/auto-detect-nft-modal.test.stories.js @@ -1,7 +1,7 @@ import React from 'react'; import { Provider } from 'react-redux'; -import testData from '../../../../.storybook/test-data'; -import configureStore from '../../../store/store'; +import testData from '../../../../../.storybook/test-data'; +import configureStore from '../../../../store/store'; import AutoDetectNftModal from './auto-detect-nft-modal'; const customData = { diff --git a/ui/components/app/auto-detect-nft/auto-detect-nft-modal.test.tsx b/ui/components/app/assets/auto-detect-nft/auto-detect-nft-modal.test.tsx similarity index 92% rename from ui/components/app/auto-detect-nft/auto-detect-nft-modal.test.tsx rename to ui/components/app/assets/auto-detect-nft/auto-detect-nft-modal.test.tsx index e3fcc8b6e425..0c0708f0785e 100644 --- a/ui/components/app/auto-detect-nft/auto-detect-nft-modal.test.tsx +++ b/ui/components/app/assets/auto-detect-nft/auto-detect-nft-modal.test.tsx @@ -3,8 +3,8 @@ import { screen, fireEvent } from '@testing-library/react'; import '@testing-library/jest-dom'; import { useDispatch } from 'react-redux'; import configureMockStore from 'redux-mock-store'; -import mockState from '../../../../test/data/mock-state.json'; -import { renderWithProvider } from '../../../../test/lib/render-helpers'; +import mockState from '../../../../../test/data/mock-state.json'; +import { renderWithProvider } from '../../../../../test/lib/render-helpers'; import AutoDetectNftModal from './auto-detect-nft-modal'; // Mock store setup diff --git a/ui/components/app/auto-detect-nft/auto-detect-nft-modal.tsx b/ui/components/app/assets/auto-detect-nft/auto-detect-nft-modal.tsx similarity index 86% rename from ui/components/app/auto-detect-nft/auto-detect-nft-modal.tsx rename to ui/components/app/assets/auto-detect-nft/auto-detect-nft-modal.tsx index 3fa744a72e89..7645386c0c92 100644 --- a/ui/components/app/auto-detect-nft/auto-detect-nft-modal.tsx +++ b/ui/components/app/assets/auto-detect-nft/auto-detect-nft-modal.tsx @@ -10,8 +10,8 @@ import { Text, ModalBody, ModalFooter, -} from '../../component-library'; -import { useI18nContext } from '../../../hooks/useI18nContext'; +} from '../../../component-library'; +import { useI18nContext } from '../../../../hooks/useI18nContext'; import { AlignItems, BorderRadius, @@ -20,15 +20,18 @@ import { JustifyContent, TextAlign, TextVariant, -} from '../../../helpers/constants/design-system'; -import { setOpenSeaEnabled, setUseNftDetection } from '../../../store/actions'; -import { MetaMetricsContext } from '../../../contexts/metametrics'; +} from '../../../../helpers/constants/design-system'; +import { + setOpenSeaEnabled, + setUseNftDetection, +} from '../../../../store/actions'; +import { MetaMetricsContext } from '../../../../contexts/metametrics'; import { MetaMetricsEventCategory, MetaMetricsEventName, -} from '../../../../shared/constants/metametrics'; -import { getProviderConfig } from '../../../ducks/metamask/metamask'; -import { ORIGIN_METAMASK } from '../../../../shared/constants/app'; +} from '../../../../../shared/constants/metametrics'; +import { getProviderConfig } from '../../../../ducks/metamask/metamask'; +import { ORIGIN_METAMASK } from '../../../../../shared/constants/app'; type AutoDetectNftModalProps = { isOpen: boolean; diff --git a/ui/components/app/auto-detect-nft/index.scss b/ui/components/app/assets/auto-detect-nft/index.scss similarity index 100% rename from ui/components/app/auto-detect-nft/index.scss rename to ui/components/app/assets/auto-detect-nft/index.scss diff --git a/ui/components/app/auto-detect-token/auto-detect-token-modal.test.stories.js b/ui/components/app/assets/auto-detect-token/auto-detect-token-modal.test.stories.js similarity index 88% rename from ui/components/app/auto-detect-token/auto-detect-token-modal.test.stories.js rename to ui/components/app/assets/auto-detect-token/auto-detect-token-modal.test.stories.js index f9164697d402..d167a3130fbc 100644 --- a/ui/components/app/auto-detect-token/auto-detect-token-modal.test.stories.js +++ b/ui/components/app/assets/auto-detect-token/auto-detect-token-modal.test.stories.js @@ -1,7 +1,7 @@ import React from 'react'; import { Provider } from 'react-redux'; -import testData from '../../../../.storybook/test-data'; -import configureStore from '../../../store/store'; +import testData from '../../../../../.storybook/test-data'; +import configureStore from '../../../../store/store'; import AutoDetectTokenModal from './auto-detect-token-modal'; const customData = { diff --git a/ui/components/app/auto-detect-token/auto-detect-token-modal.test.tsx b/ui/components/app/assets/auto-detect-token/auto-detect-token-modal.test.tsx similarity index 93% rename from ui/components/app/auto-detect-token/auto-detect-token-modal.test.tsx rename to ui/components/app/assets/auto-detect-token/auto-detect-token-modal.test.tsx index 95f2dc8127a5..c051b243b046 100644 --- a/ui/components/app/auto-detect-token/auto-detect-token-modal.test.tsx +++ b/ui/components/app/assets/auto-detect-token/auto-detect-token-modal.test.tsx @@ -3,8 +3,8 @@ import { screen, fireEvent } from '@testing-library/react'; import '@testing-library/jest-dom'; import { useDispatch } from 'react-redux'; import configureMockStore from 'redux-mock-store'; -import mockState from '../../../../test/data/mock-state.json'; -import { renderWithProvider } from '../../../../test/lib/render-helpers'; +import mockState from '../../../../../test/data/mock-state.json'; +import { renderWithProvider } from '../../../../../test/lib/render-helpers'; import AutoDetectTokenModal from './auto-detect-token-modal'; // Mock store setup diff --git a/ui/components/app/auto-detect-token/auto-detect-token-modal.tsx b/ui/components/app/assets/auto-detect-token/auto-detect-token-modal.tsx similarity index 87% rename from ui/components/app/auto-detect-token/auto-detect-token-modal.tsx rename to ui/components/app/assets/auto-detect-token/auto-detect-token-modal.tsx index f5010eea25fd..0a5ae68a9462 100644 --- a/ui/components/app/auto-detect-token/auto-detect-token-modal.tsx +++ b/ui/components/app/assets/auto-detect-token/auto-detect-token-modal.tsx @@ -10,8 +10,8 @@ import { Text, ModalBody, ModalFooter, -} from '../../component-library'; -import { useI18nContext } from '../../../hooks/useI18nContext'; +} from '../../../component-library'; +import { useI18nContext } from '../../../../hooks/useI18nContext'; import { AlignItems, BorderRadius, @@ -20,16 +20,16 @@ import { JustifyContent, TextAlign, TextVariant, -} from '../../../helpers/constants/design-system'; -import { setUseTokenDetection } from '../../../store/actions'; -import { MetaMetricsContext } from '../../../contexts/metametrics'; +} from '../../../../helpers/constants/design-system'; +import { setUseTokenDetection } from '../../../../store/actions'; +import { MetaMetricsContext } from '../../../../contexts/metametrics'; import { MetaMetricsEventCategory, MetaMetricsEventName, -} from '../../../../shared/constants/metametrics'; -import { getProviderConfig } from '../../../ducks/metamask/metamask'; -import { getCurrentLocale } from '../../../ducks/locale/locale'; -import { ORIGIN_METAMASK } from '../../../../shared/constants/app'; +} from '../../../../../shared/constants/metametrics'; +import { getProviderConfig } from '../../../../ducks/metamask/metamask'; +import { getCurrentLocale } from '../../../../ducks/locale/locale'; +import { ORIGIN_METAMASK } from '../../../../../shared/constants/app'; type AutoDetectTokenModalProps = { isOpen: boolean; diff --git a/ui/components/app/auto-detect-token/index.scss b/ui/components/app/assets/auto-detect-token/index.scss similarity index 100% rename from ui/components/app/auto-detect-token/index.scss rename to ui/components/app/assets/auto-detect-token/index.scss diff --git a/ui/components/app/nft-default-image/__snapshots__/nft-default-image.test.js.snap b/ui/components/app/assets/nfts/nft-default-image/__snapshots__/nft-default-image.test.js.snap similarity index 100% rename from ui/components/app/nft-default-image/__snapshots__/nft-default-image.test.js.snap rename to ui/components/app/assets/nfts/nft-default-image/__snapshots__/nft-default-image.test.js.snap diff --git a/ui/components/app/nft-default-image/index.js b/ui/components/app/assets/nfts/nft-default-image/index.js similarity index 100% rename from ui/components/app/nft-default-image/index.js rename to ui/components/app/assets/nfts/nft-default-image/index.js diff --git a/ui/components/app/nft-default-image/index.scss b/ui/components/app/assets/nfts/nft-default-image/index.scss similarity index 100% rename from ui/components/app/nft-default-image/index.scss rename to ui/components/app/assets/nfts/nft-default-image/index.scss diff --git a/ui/components/app/nft-default-image/nft-default-image.js b/ui/components/app/assets/nfts/nft-default-image/nft-default-image.js similarity index 83% rename from ui/components/app/nft-default-image/nft-default-image.js rename to ui/components/app/assets/nfts/nft-default-image/nft-default-image.js index c85b0cabab27..37c31e1bf35e 100644 --- a/ui/components/app/nft-default-image/nft-default-image.js +++ b/ui/components/app/assets/nfts/nft-default-image/nft-default-image.js @@ -7,10 +7,10 @@ import { AlignItems, JustifyContent, BorderRadius, -} from '../../../helpers/constants/design-system'; -import { useI18nContext } from '../../../hooks/useI18nContext'; -import { ButtonLink, Box } from '../../component-library'; -import { showIpfsModal } from '../../../store/actions'; +} from '../../../../../helpers/constants/design-system'; +import { useI18nContext } from '../../../../../hooks/useI18nContext'; +import { ButtonLink, Box } from '../../../../component-library'; +import { showIpfsModal } from '../../../../../store/actions'; export default function NftDefaultImage({ className, clickable }) { const t = useI18nContext(); diff --git a/ui/components/app/nft-default-image/nft-default-image.stories.js b/ui/components/app/assets/nfts/nft-default-image/nft-default-image.stories.js similarity index 100% rename from ui/components/app/nft-default-image/nft-default-image.stories.js rename to ui/components/app/assets/nfts/nft-default-image/nft-default-image.stories.js diff --git a/ui/components/app/nft-default-image/nft-default-image.test.js b/ui/components/app/assets/nfts/nft-default-image/nft-default-image.test.js similarity index 87% rename from ui/components/app/nft-default-image/nft-default-image.test.js rename to ui/components/app/assets/nfts/nft-default-image/nft-default-image.test.js index f66044bdf5aa..1f4d11ee2c2f 100644 --- a/ui/components/app/nft-default-image/nft-default-image.test.js +++ b/ui/components/app/assets/nfts/nft-default-image/nft-default-image.test.js @@ -1,12 +1,12 @@ import React from 'react'; import configureStore from 'redux-mock-store'; -import { renderWithProvider } from '../../../../test/lib/render-helpers'; -import mockState from '../../../../test/data/mock-state.json'; +import { renderWithProvider } from '../../../../../../test/lib/render-helpers'; +import mockState from '../../../../../../test/data/mock-state.json'; import NftDefaultImage from '.'; describe('NFT Default Image', () => { const mockShowIpfsModal = jest.fn(); - jest.mock('../../../store/actions.ts', () => ({ + jest.mock('../../../../../store/actions.ts', () => ({ showIpfsModal: () => mockShowIpfsModal, })); diff --git a/ui/components/app/nft-default-image/toggle-ipfs-modal.js b/ui/components/app/assets/nfts/nft-default-image/toggle-ipfs-modal.js similarity index 79% rename from ui/components/app/nft-default-image/toggle-ipfs-modal.js rename to ui/components/app/assets/nfts/nft-default-image/toggle-ipfs-modal.js index 7a010bdda454..252ec0ee8ca4 100644 --- a/ui/components/app/nft-default-image/toggle-ipfs-modal.js +++ b/ui/components/app/assets/nfts/nft-default-image/toggle-ipfs-modal.js @@ -7,21 +7,21 @@ import { Modal, ModalOverlay, Text, -} from '../../component-library'; -import { ModalContent } from '../../component-library/modal-content/deprecated'; -import { ModalHeader } from '../../component-library/modal-header/deprecated'; -import { useI18nContext } from '../../../hooks/useI18nContext'; +} from '../../../../component-library'; +import { ModalContent } from '../../../../component-library/modal-content/deprecated'; +import { ModalHeader } from '../../../../component-library/modal-header/deprecated'; +import { useI18nContext } from '../../../../../hooks/useI18nContext'; import { hideIpfsModal, setIpfsGateway, setIsIpfsGatewayEnabled, -} from '../../../store/actions'; -import { IPFS_DEFAULT_GATEWAY_URL } from '../../../../shared/constants/network'; +} from '../../../../../store/actions'; +import { IPFS_DEFAULT_GATEWAY_URL } from '../../../../../../shared/constants/network'; import { Size, TextColor, TextVariant, -} from '../../../helpers/constants/design-system'; +} from '../../../../../helpers/constants/design-system'; export const ToggleIpfsModal = ({ onClose }) => { const t = useI18nContext(); diff --git a/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap b/ui/components/app/assets/nfts/nft-details/__snapshots__/nft-details.test.js.snap similarity index 100% rename from ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap rename to ui/components/app/assets/nfts/nft-details/__snapshots__/nft-details.test.js.snap diff --git a/ui/components/app/nft-details/index.scss b/ui/components/app/assets/nfts/nft-details/index.scss similarity index 100% rename from ui/components/app/nft-details/index.scss rename to ui/components/app/assets/nfts/nft-details/index.scss diff --git a/ui/components/app/nft-details/nft-detail-description.stories.js b/ui/components/app/assets/nfts/nft-details/nft-detail-description.stories.js similarity index 100% rename from ui/components/app/nft-details/nft-detail-description.stories.js rename to ui/components/app/assets/nfts/nft-details/nft-detail-description.stories.js diff --git a/ui/components/app/nft-details/nft-detail-description.tsx b/ui/components/app/assets/nfts/nft-details/nft-detail-description.tsx similarity index 85% rename from ui/components/app/nft-details/nft-detail-description.tsx rename to ui/components/app/assets/nfts/nft-details/nft-detail-description.tsx index d29aacc5ab0b..fb22ada16610 100644 --- a/ui/components/app/nft-details/nft-detail-description.tsx +++ b/ui/components/app/assets/nfts/nft-details/nft-detail-description.tsx @@ -1,12 +1,17 @@ import React, { useState } from 'react'; -import useIsOverflowing from '../../../hooks/snaps/useIsOverflowing'; -import { Box, Button, ButtonVariant, Text } from '../../component-library'; -import { useI18nContext } from '../../../hooks/useI18nContext'; +import useIsOverflowing from '../../../../../hooks/snaps/useIsOverflowing'; +import { + Box, + Button, + ButtonVariant, + Text, +} from '../../../../component-library'; +import { useI18nContext } from '../../../../../hooks/useI18nContext'; import { FontWeight, TextColor, TextVariant, -} from '../../../helpers/constants/design-system'; +} from '../../../../../helpers/constants/design-system'; const NftDetailDescription = ({ value }: { value: string | null }) => { const t = useI18nContext(); diff --git a/ui/components/app/nft-details/nft-detail-information-frame.stories.js b/ui/components/app/assets/nfts/nft-details/nft-detail-information-frame.stories.js similarity index 90% rename from ui/components/app/nft-details/nft-detail-information-frame.stories.js rename to ui/components/app/assets/nfts/nft-details/nft-detail-information-frame.stories.js index 241cf98ef9e1..52340e9e42c9 100644 --- a/ui/components/app/nft-details/nft-detail-information-frame.stories.js +++ b/ui/components/app/assets/nfts/nft-details/nft-detail-information-frame.stories.js @@ -4,8 +4,8 @@ import { TextAlign, TextColor, TextVariant, -} from '../../../helpers/constants/design-system'; -import { ButtonIcon, IconName, IconSize } from '../../component-library'; +} from '../../../../../helpers/constants/design-system'; +import { ButtonIcon, IconName, IconSize } from '../../../../component-library'; import NftDetailInformationFrame from './nft-detail-information-frame'; export default { diff --git a/ui/components/app/nft-details/nft-detail-information-frame.tsx b/ui/components/app/assets/nfts/nft-details/nft-detail-information-frame.tsx similarity index 92% rename from ui/components/app/nft-details/nft-detail-information-frame.tsx rename to ui/components/app/assets/nfts/nft-details/nft-detail-information-frame.tsx index 7e0a629fe470..cbaf564268f6 100644 --- a/ui/components/app/nft-details/nft-detail-information-frame.tsx +++ b/ui/components/app/assets/nfts/nft-details/nft-detail-information-frame.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import { Box, Text } from '../../component-library'; +import { Box, Text } from '../../../../component-library'; import { AlignItems, Display, JustifyContent, -} from '../../../helpers/constants/design-system'; +} from '../../../../../helpers/constants/design-system'; type NftDetailInformationFrameProps = { title?: string; diff --git a/ui/components/app/nft-details/nft-detail-information-row.stories.js b/ui/components/app/assets/nfts/nft-details/nft-detail-information-row.stories.js similarity index 100% rename from ui/components/app/nft-details/nft-detail-information-row.stories.js rename to ui/components/app/assets/nfts/nft-details/nft-detail-information-row.stories.js diff --git a/ui/components/app/nft-details/nft-detail-information-row.tsx b/ui/components/app/assets/nfts/nft-details/nft-detail-information-row.tsx similarity index 92% rename from ui/components/app/nft-details/nft-detail-information-row.tsx rename to ui/components/app/assets/nfts/nft-details/nft-detail-information-row.tsx index 0d320f1426b4..8b6abbb7caea 100644 --- a/ui/components/app/nft-details/nft-detail-information-row.tsx +++ b/ui/components/app/assets/nfts/nft-details/nft-detail-information-row.tsx @@ -1,12 +1,12 @@ import React from 'react'; -import { Box, Text } from '../../component-library'; +import { Box, Text } from '../../../../component-library'; import { Display, JustifyContent, TextColor, TextVariant, -} from '../../../helpers/constants/design-system'; +} from '../../../../../helpers/constants/design-system'; type NftDetailInformationRowProps = { title: string; diff --git a/ui/components/app/nft-details/nft-details.stories.js b/ui/components/app/assets/nfts/nft-details/nft-details.stories.js similarity index 100% rename from ui/components/app/nft-details/nft-details.stories.js rename to ui/components/app/assets/nfts/nft-details/nft-details.stories.js diff --git a/ui/components/app/nft-details/nft-details.test.js b/ui/components/app/assets/nfts/nft-details/nft-details.test.js similarity index 92% rename from ui/components/app/nft-details/nft-details.test.js rename to ui/components/app/assets/nfts/nft-details/nft-details.test.js index e2504179e60e..b13c7f03792d 100644 --- a/ui/components/app/nft-details/nft-details.test.js +++ b/ui/components/app/assets/nfts/nft-details/nft-details.test.js @@ -4,22 +4,25 @@ import configureMockStore from 'redux-mock-store'; import thunk from 'redux-thunk'; import copyToClipboard from 'copy-to-clipboard'; import { toHex } from '@metamask/controller-utils'; -import { startNewDraftTransaction } from '../../../ducks/send'; -import { renderWithProvider } from '../../../../test/lib/render-helpers'; -import mockState from '../../../../test/data/mock-state.json'; -import { DEFAULT_ROUTE, SEND_ROUTE } from '../../../helpers/constants/routes'; -import { COPY_OPTIONS } from '../../../../shared/constants/copy'; -import { AssetType } from '../../../../shared/constants/transaction'; +import { startNewDraftTransaction } from '../../../../../ducks/send'; +import { renderWithProvider } from '../../../../../../test/lib/render-helpers'; +import mockState from '../../../../../../test/data/mock-state.json'; +import { + DEFAULT_ROUTE, + SEND_ROUTE, +} from '../../../../../helpers/constants/routes'; +import { COPY_OPTIONS } from '../../../../../../shared/constants/copy'; +import { AssetType } from '../../../../../../shared/constants/transaction'; import { removeAndIgnoreNft, setRemoveNftMessage, -} from '../../../store/actions'; +} from '../../../../../store/actions'; import { CHAIN_IDS, CURRENCY_SYMBOLS, MAINNET_DISPLAY_NAME, NETWORK_TYPES, -} from '../../../../shared/constants/network'; +} from '../../../../../../shared/constants/network'; import NftDetails from './nft-details'; jest.mock('copy-to-clipboard'); @@ -33,15 +36,15 @@ jest.mock('react-router-dom', () => ({ }), })); -jest.mock('../../../ducks/send/index.js', () => ({ - ...jest.requireActual('../../../ducks/send/index.js'), +jest.mock('../../../../../ducks/send/index.js', () => ({ + ...jest.requireActual('../../../../../ducks/send/index.js'), startNewDraftTransaction: jest .fn() .mockReturnValue(jest.fn().mockResolvedValue()), })); -jest.mock('../../../store/actions.ts', () => ({ - ...jest.requireActual('../../../store/actions.ts'), +jest.mock('../../../../../store/actions.ts', () => ({ + ...jest.requireActual('../../../../../store/actions.ts'), checkAndUpdateSingleNftOwnershipStatus: jest.fn().mockReturnValue(jest.fn()), removeAndIgnoreNft: jest.fn().mockReturnValue(jest.fn()), setRemoveNftMessage: jest.fn().mockReturnValue(jest.fn()), diff --git a/ui/components/app/nft-details/nft-details.tsx b/ui/components/app/assets/nfts/nft-details/nft-details.tsx similarity index 95% rename from ui/components/app/nft-details/nft-details.tsx rename to ui/components/app/assets/nfts/nft-details/nft-details.tsx index eeb0a0a829b1..3ba520a3f59c 100644 --- a/ui/components/app/nft-details/nft-details.tsx +++ b/ui/components/app/assets/nfts/nft-details/nft-details.tsx @@ -16,37 +16,40 @@ import { FontStyle, TextAlign, AlignItems, -} from '../../../helpers/constants/design-system'; -import { useI18nContext } from '../../../hooks/useI18nContext'; -import { getAssetImageURL, shortenAddress } from '../../../helpers/utils/util'; -import { getNftImageAlt } from '../../../helpers/utils/nfts'; +} from '../../../../../helpers/constants/design-system'; +import { useI18nContext } from '../../../../../hooks/useI18nContext'; +import { + getAssetImageURL, + shortenAddress, +} from '../../../../../helpers/utils/util'; +import { getNftImageAlt } from '../../../../../helpers/utils/nfts'; import { getCurrentChainId, getCurrentCurrency, getCurrentNetwork, getIpfsGateway, -} from '../../../selectors'; +} from '../../../../../selectors'; import { ASSET_ROUTE, DEFAULT_ROUTE, SEND_ROUTE, -} from '../../../helpers/constants/routes'; +} from '../../../../../helpers/constants/routes'; import { checkAndUpdateSingleNftOwnershipStatus, removeAndIgnoreNft, setRemoveNftMessage, setNewNftAddedMessage, -} from '../../../store/actions'; -import { CHAIN_IDS } from '../../../../shared/constants/network'; +} from '../../../../../store/actions'; +import { CHAIN_IDS } from '../../../../../../shared/constants/network'; import NftOptions from '../nft-options/nft-options'; -import { startNewDraftTransaction } from '../../../ducks/send'; -import InfoTooltip from '../../ui/info-tooltip'; -import { usePrevious } from '../../../hooks/usePrevious'; -import { useCopyToClipboard } from '../../../hooks/useCopyToClipboard'; +import { startNewDraftTransaction } from '../../../../../ducks/send'; +import InfoTooltip from '../../../../ui/info-tooltip'; +import { usePrevious } from '../../../../../hooks/usePrevious'; +import { useCopyToClipboard } from '../../../../../hooks/useCopyToClipboard'; import { AssetType, TokenStandard, -} from '../../../../shared/constants/transaction'; +} from '../../../../../../shared/constants/transaction'; import { ButtonIcon, IconName, @@ -56,20 +59,20 @@ import { ButtonPrimarySize, ButtonPrimary, Icon, -} from '../../component-library'; -import { NftItem } from '../../multichain/nft-item'; +} from '../../../../component-library'; +import { NftItem } from '../../../../multichain/nft-item'; import { MetaMetricsEventName, MetaMetricsEventCategory, -} from '../../../../shared/constants/metametrics'; -import { MetaMetricsContext } from '../../../contexts/metametrics'; -import { Content, Footer, Page } from '../../multichain/pages/page'; -import { formatCurrency } from '../../../helpers/utils/confirm-tx.util'; -import { getShortDateFormatterV2 } from '../../../pages/asset/util'; -import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/swaps'; -import { getConversionRate } from '../../../ducks/metamask/metamask'; -import { Numeric } from '../../../../shared/modules/Numeric'; -import { addUrlProtocolPrefix } from '../../../../app/scripts/lib/util'; +} from '../../../../../../shared/constants/metametrics'; +import { MetaMetricsContext } from '../../../../../contexts/metametrics'; +import { Content, Footer, Page } from '../../../../multichain/pages/page'; +import { formatCurrency } from '../../../../../helpers/utils/confirm-tx.util'; +import { getShortDateFormatterV2 } from '../../../../../pages/asset/util'; +import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../../../shared/constants/swaps'; +import { getConversionRate } from '../../../../../ducks/metamask/metamask'; +import { Numeric } from '../../../../../../shared/modules/Numeric'; +import { addUrlProtocolPrefix } from '../../../../../../app/scripts/lib/util'; import NftDetailInformationRow from './nft-detail-information-row'; import NftDetailInformationFrame from './nft-detail-information-frame'; import NftDetailDescription from './nft-detail-description'; diff --git a/ui/components/app/nft-details/nft-full-image.tsx b/ui/components/app/assets/nfts/nft-details/nft-full-image.tsx similarity index 76% rename from ui/components/app/nft-details/nft-full-image.tsx rename to ui/components/app/assets/nfts/nft-details/nft-full-image.tsx index 8565150f7602..68562bc6d857 100644 --- a/ui/components/app/nft-details/nft-full-image.tsx +++ b/ui/components/app/assets/nfts/nft-details/nft-full-image.tsx @@ -1,28 +1,28 @@ import React, { useEffect, useState } from 'react'; import { useSelector } from 'react-redux'; import { useHistory, useParams } from 'react-router-dom'; -import { getAssetImageURL } from '../../../helpers/utils/util'; -import { getNftImageAlt } from '../../../helpers/utils/nfts'; -import { getCurrentNetwork, getIpfsGateway } from '../../../selectors'; +import { getAssetImageURL } from '../../../../../helpers/utils/util'; +import { getNftImageAlt } from '../../../../../helpers/utils/nfts'; +import { getCurrentNetwork, getIpfsGateway } from '../../../../../selectors'; import { Box, ButtonIcon, ButtonIconSize, IconName, -} from '../../component-library'; -import { NftItem } from '../../multichain/nft-item'; -import { Content, Header, Page } from '../../multichain/pages/page'; +} from '../../../../component-library'; +import { NftItem } from '../../../../multichain/nft-item'; +import { Content, Header, Page } from '../../../../multichain/pages/page'; -import { getNfts } from '../../../ducks/metamask/metamask'; -import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils'; +import { getNfts } from '../../../../../ducks/metamask/metamask'; +import { isEqualCaseInsensitive } from '../../../../../../shared/modules/string-utils'; import { Display, IconColor, JustifyContent, -} from '../../../helpers/constants/design-system'; -import { useI18nContext } from '../../../hooks/useI18nContext'; -import { ASSET_ROUTE } from '../../../helpers/constants/routes'; +} from '../../../../../helpers/constants/design-system'; +import { useI18nContext } from '../../../../../hooks/useI18nContext'; +import { ASSET_ROUTE } from '../../../../../helpers/constants/routes'; export default function NftFullImage() { const t = useI18nContext(); diff --git a/ui/components/app/nft-options/index.scss b/ui/components/app/assets/nfts/nft-options/index.scss similarity index 100% rename from ui/components/app/nft-options/index.scss rename to ui/components/app/assets/nfts/nft-options/index.scss diff --git a/ui/components/app/nft-options/nft-options.js b/ui/components/app/assets/nfts/nft-options/nft-options.js similarity index 85% rename from ui/components/app/nft-options/nft-options.js rename to ui/components/app/assets/nfts/nft-options/nft-options.js index c9ff893f710f..520d3a32c116 100644 --- a/ui/components/app/nft-options/nft-options.js +++ b/ui/components/app/assets/nfts/nft-options/nft-options.js @@ -1,10 +1,14 @@ import React, { useContext, useRef, useState } from 'react'; import PropTypes from 'prop-types'; -import { I18nContext } from '../../../contexts/i18n'; -import { Menu, MenuItem } from '../../ui/menu'; -import { ButtonIcon, ButtonIconSize, IconName } from '../../component-library'; -import { Color } from '../../../helpers/constants/design-system'; +import { I18nContext } from '../../../../../contexts/i18n'; +import { Menu, MenuItem } from '../../../../ui/menu'; +import { + ButtonIcon, + ButtonIconSize, + IconName, +} from '../../../../component-library'; +import { Color } from '../../../../../helpers/constants/design-system'; const NftOptions = ({ onRemove, onViewOnOpensea }) => { const t = useContext(I18nContext); diff --git a/ui/components/app/nft-options/nft-options.stories.js b/ui/components/app/assets/nfts/nft-options/nft-options.stories.js similarity index 100% rename from ui/components/app/nft-options/nft-options.stories.js rename to ui/components/app/assets/nfts/nft-options/nft-options.stories.js diff --git a/ui/components/app/nft-options/nft-options.test.js b/ui/components/app/assets/nfts/nft-options/nft-options.test.js similarity index 96% rename from ui/components/app/nft-options/nft-options.test.js rename to ui/components/app/assets/nfts/nft-options/nft-options.test.js index e0797eedfe30..450206df7714 100644 --- a/ui/components/app/nft-options/nft-options.test.js +++ b/ui/components/app/assets/nfts/nft-options/nft-options.test.js @@ -1,6 +1,6 @@ import { fireEvent, waitFor } from '@testing-library/react'; import React from 'react'; -import { renderWithProvider } from '../../../../test/lib/render-helpers'; +import { renderWithProvider } from '../../../../../../test/lib/render-helpers'; import NftOptions from './nft-options'; describe('NFT Options Component', () => { diff --git a/ui/components/app/nfts-detection-notice-import-nfts/index.js b/ui/components/app/assets/nfts/nfts-detection-notice-import-nfts/index.js similarity index 100% rename from ui/components/app/nfts-detection-notice-import-nfts/index.js rename to ui/components/app/assets/nfts/nfts-detection-notice-import-nfts/index.js diff --git a/ui/components/app/nfts-detection-notice-import-nfts/nfts-detection-notice-import-nfts.js b/ui/components/app/assets/nfts/nfts-detection-notice-import-nfts/nfts-detection-notice-import-nfts.js similarity index 81% rename from ui/components/app/nfts-detection-notice-import-nfts/nfts-detection-notice-import-nfts.js rename to ui/components/app/assets/nfts/nfts-detection-notice-import-nfts/nfts-detection-notice-import-nfts.js index 98945c6378a9..90697c1535b9 100644 --- a/ui/components/app/nfts-detection-notice-import-nfts/nfts-detection-notice-import-nfts.js +++ b/ui/components/app/assets/nfts/nfts-detection-notice-import-nfts/nfts-detection-notice-import-nfts.js @@ -1,9 +1,9 @@ import React from 'react'; import PropTypes from 'prop-types'; import { useHistory } from 'react-router-dom'; -import { BannerAlert } from '../../component-library'; -import { useI18nContext } from '../../../hooks/useI18nContext'; -import { SECURITY_ROUTE } from '../../../helpers/constants/routes'; +import { BannerAlert } from '../../../../component-library'; +import { useI18nContext } from '../../../../../hooks/useI18nContext'; +import { SECURITY_ROUTE } from '../../../../../helpers/constants/routes'; export default function NftsDetectionNoticeImportNFTs({ onActionButtonClick }) { const t = useI18nContext(); diff --git a/ui/components/app/nfts-detection-notice-import-nfts/nfts-detection-notice-import-nfts.stories.js b/ui/components/app/assets/nfts/nfts-detection-notice-import-nfts/nfts-detection-notice-import-nfts.stories.js similarity index 100% rename from ui/components/app/nfts-detection-notice-import-nfts/nfts-detection-notice-import-nfts.stories.js rename to ui/components/app/assets/nfts/nfts-detection-notice-import-nfts/nfts-detection-notice-import-nfts.stories.js diff --git a/ui/components/app/nfts-detection-notice-nfts-tab/index.js b/ui/components/app/assets/nfts/nfts-detection-notice-nfts-tab/index.js similarity index 100% rename from ui/components/app/nfts-detection-notice-nfts-tab/index.js rename to ui/components/app/assets/nfts/nfts-detection-notice-nfts-tab/index.js diff --git a/ui/components/app/nfts-detection-notice-nfts-tab/nfts-detection-notice-nfts-tab.js b/ui/components/app/assets/nfts/nfts-detection-notice-nfts-tab/nfts-detection-notice-nfts-tab.js similarity index 84% rename from ui/components/app/nfts-detection-notice-nfts-tab/nfts-detection-notice-nfts-tab.js rename to ui/components/app/assets/nfts/nfts-detection-notice-nfts-tab/nfts-detection-notice-nfts-tab.js index 7ec66e532aec..3069b6cc5168 100644 --- a/ui/components/app/nfts-detection-notice-nfts-tab/nfts-detection-notice-nfts-tab.js +++ b/ui/components/app/assets/nfts/nfts-detection-notice-nfts-tab/nfts-detection-notice-nfts-tab.js @@ -1,14 +1,14 @@ import React from 'react'; import { useDispatch, useSelector } from 'react-redux'; -import { BannerAlert } from '../../component-library'; -import { useI18nContext } from '../../../hooks/useI18nContext'; +import { BannerAlert } from '../../../../component-library'; +import { useI18nContext } from '../../../../../hooks/useI18nContext'; import { detectNfts, setOpenSeaEnabled, setShowNftDetectionEnablementToast, setUseNftDetection, -} from '../../../store/actions'; -import { getOpenSeaEnabled } from '../../../selectors'; +} from '../../../../../store/actions'; +import { getOpenSeaEnabled } from '../../../../../selectors'; export default function NFTsDetectionNoticeNFTsTab() { const t = useI18nContext(); diff --git a/ui/components/app/nfts-detection-notice-nfts-tab/nfts-detection-notice.stories.js b/ui/components/app/assets/nfts/nfts-detection-notice-nfts-tab/nfts-detection-notice.stories.js similarity index 100% rename from ui/components/app/nfts-detection-notice-nfts-tab/nfts-detection-notice.stories.js rename to ui/components/app/assets/nfts/nfts-detection-notice-nfts-tab/nfts-detection-notice.stories.js diff --git a/ui/components/app/nfts-items/index.js b/ui/components/app/assets/nfts/nfts-items/index.js similarity index 100% rename from ui/components/app/nfts-items/index.js rename to ui/components/app/assets/nfts/nfts-items/index.js diff --git a/ui/components/app/nfts-items/index.scss b/ui/components/app/assets/nfts/nfts-items/index.scss similarity index 100% rename from ui/components/app/nfts-items/index.scss rename to ui/components/app/assets/nfts/nfts-items/index.scss diff --git a/ui/components/app/nfts-items/nfts-items.js b/ui/components/app/assets/nfts/nfts-items/nfts-items.js similarity index 89% rename from ui/components/app/nfts-items/nfts-items.js rename to ui/components/app/assets/nfts/nfts-items/nfts-items.js index 7f2cfce7c7cb..736f4acd6787 100644 --- a/ui/components/app/nfts-items/nfts-items.js +++ b/ui/components/app/assets/nfts/nfts-items/nfts-items.js @@ -3,8 +3,8 @@ import PropTypes from 'prop-types'; import { useDispatch, useSelector } from 'react-redux'; import { useHistory } from 'react-router-dom'; import { isEqual } from 'lodash'; -import Box from '../../ui/box'; -import Typography from '../../ui/typography/typography'; +import Box from '../../../../ui/box'; +import Typography from '../../../../ui/typography/typography'; import { Color, TypographyVariant, @@ -14,35 +14,38 @@ import { DISPLAY, BLOCK_SIZES, FLEX_WRAP, -} from '../../../helpers/constants/design-system'; -import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app'; -import { getEnvironmentType } from '../../../../app/scripts/lib/util'; +} from '../../../../../helpers/constants/design-system'; +import { ENVIRONMENT_TYPE_POPUP } from '../../../../../../shared/constants/app'; +import { getEnvironmentType } from '../../../../../../app/scripts/lib/util'; import { getCurrentChainId, getIpfsGateway, getSelectedInternalAccount, getCurrentNetwork, getOpenSeaEnabled, -} from '../../../selectors'; -import { ASSET_ROUTE, SEND_ROUTE } from '../../../helpers/constants/routes'; -import { getAssetImageURL } from '../../../helpers/utils/util'; -import { getNftImageAlt } from '../../../helpers/utils/nfts'; -import { updateNftDropDownState } from '../../../store/actions'; -import { usePrevious } from '../../../hooks/usePrevious'; -import { getNftsDropdownState } from '../../../ducks/metamask/metamask'; -import { useI18nContext } from '../../../hooks/useI18nContext'; -import { Icon, IconName, Text } from '../../component-library'; -import { NftItem } from '../../multichain/nft-item'; +} from '../../../../../selectors'; +import { + ASSET_ROUTE, + SEND_ROUTE, +} from '../../../../../helpers/constants/routes'; +import { getAssetImageURL } from '../../../../../helpers/utils/util'; +import { getNftImageAlt } from '../../../../../helpers/utils/nfts'; +import { updateNftDropDownState } from '../../../../../store/actions'; +import { usePrevious } from '../../../../../hooks/usePrevious'; +import { getNftsDropdownState } from '../../../../../ducks/metamask/metamask'; +import { useI18nContext } from '../../../../../hooks/useI18nContext'; +import { Icon, IconName, Text } from '../../../../component-library'; +import { NftItem } from '../../../../multichain/nft-item'; import { getSendAnalyticProperties, updateSendAsset, -} from '../../../ducks/send'; -import { AssetType } from '../../../../shared/constants/transaction'; -import { MetaMetricsContext } from '../../../contexts/metametrics'; +} from '../../../../../ducks/send'; +import { AssetType } from '../../../../../../shared/constants/transaction'; +import { MetaMetricsContext } from '../../../../../contexts/metametrics'; import { MetaMetricsEventCategory, MetaMetricsEventName, -} from '../../../../shared/constants/metametrics'; +} from '../../../../../../shared/constants/metametrics'; const width = (isModal) => { const env = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP; diff --git a/ui/components/app/nfts-items/nfts-items.test.js b/ui/components/app/assets/nfts/nfts-items/nfts-items.test.js similarity index 88% rename from ui/components/app/nfts-items/nfts-items.test.js rename to ui/components/app/assets/nfts/nfts-items/nfts-items.test.js index 5ee1bf93b9b0..8f405cf31306 100644 --- a/ui/components/app/nfts-items/nfts-items.test.js +++ b/ui/components/app/assets/nfts/nfts-items/nfts-items.test.js @@ -3,10 +3,10 @@ import { fireEvent } from '@testing-library/react'; import configureMockStore from 'redux-mock-store'; import thunk from 'redux-thunk'; import { toHex } from '@metamask/controller-utils'; -import mockState from '../../../../test/data/mock-state.json'; -import { renderWithProvider } from '../../../../test/lib/render-helpers'; -import { updateNftDropDownState } from '../../../store/actions'; -import { getSelectedInternalAccountFromMockState } from '../../../../test/jest/mocks'; +import mockState from '../../../../../../test/data/mock-state.json'; +import { renderWithProvider } from '../../../../../../test/lib/render-helpers'; +import { updateNftDropDownState } from '../../../../../store/actions'; +import { getSelectedInternalAccountFromMockState } from '../../../../../../test/jest/mocks'; import NftsItems from '.'; const mockHistoryPush = jest.fn(); @@ -19,8 +19,8 @@ jest.mock('react-router-dom', () => ({ }), })); -jest.mock('../../../store/actions.ts', () => ({ - ...jest.requireActual('../../../store/actions.ts'), +jest.mock('../../../../../store/actions.ts', () => ({ + ...jest.requireActual('../../../../../store/actions.ts'), updateNftDropDownState: jest.fn().mockReturnValue(jest.fn()), })); diff --git a/ui/components/app/nfts-tab/index.js b/ui/components/app/assets/nfts/nfts-tab/index.js similarity index 100% rename from ui/components/app/nfts-tab/index.js rename to ui/components/app/assets/nfts/nfts-tab/index.js diff --git a/ui/components/app/nfts-tab/index.scss b/ui/components/app/assets/nfts/nfts-tab/index.scss similarity index 100% rename from ui/components/app/nfts-tab/index.scss rename to ui/components/app/assets/nfts/nfts-tab/index.scss diff --git a/ui/components/app/nfts-tab/nfts-tab.js b/ui/components/app/assets/nfts/nfts-tab/nfts-tab.js similarity index 87% rename from ui/components/app/nfts-tab/nfts-tab.js rename to ui/components/app/assets/nfts/nfts-tab/nfts-tab.js index 43a0bd1a9d64..87bda9a71a85 100644 --- a/ui/components/app/nfts-tab/nfts-tab.js +++ b/ui/components/app/assets/nfts/nfts-tab/nfts-tab.js @@ -10,10 +10,10 @@ import { TextAlign, TextColor, TextVariant, -} from '../../../helpers/constants/design-system'; -import { SECURITY_ROUTE } from '../../../helpers/constants/routes'; -import { useI18nContext } from '../../../hooks/useI18nContext'; -import { useNftsCollections } from '../../../hooks/useNftsCollections'; +} from '../../../../../helpers/constants/design-system'; +import { SECURITY_ROUTE } from '../../../../../helpers/constants/routes'; +import { useI18nContext } from '../../../../../hooks/useI18nContext'; +import { useNftsCollections } from '../../../../../hooks/useNftsCollections'; import { getCurrentNetwork, ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask) @@ -23,34 +23,34 @@ import { getIsMainnet, getUseNftDetection, getNftIsStillFetchingIndication, -} from '../../../selectors'; +} from '../../../../../selectors'; import { checkAndUpdateAllNftsOwnershipStatus, detectNfts, showImportNftsModal, -} from '../../../store/actions'; -import { Box, ButtonLink, IconName, Text } from '../../component-library'; +} from '../../../../../store/actions'; +import { Box, ButtonLink, IconName, Text } from '../../../../component-library'; import NFTsDetectionNoticeNFTsTab from '../nfts-detection-notice-nfts-tab/nfts-detection-notice-nfts-tab'; import NftsItems from '../nfts-items'; ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask) -import ZENDESK_URLS from '../../../helpers/constants/zendesk-url'; +import ZENDESK_URLS from '../../../../../helpers/constants/zendesk-url'; ///: END:ONLY_INCLUDE_IF -import { MetaMetricsContext } from '../../../contexts/metametrics'; -import { ORIGIN_METAMASK } from '../../../../shared/constants/app'; +import { MetaMetricsContext } from '../../../../../contexts/metametrics'; +import { ORIGIN_METAMASK } from '../../../../../../shared/constants/app'; import { MetaMetricsEventCategory, MetaMetricsEventName, -} from '../../../../shared/constants/metametrics'; -import { getCurrentLocale } from '../../../ducks/locale/locale'; +} from '../../../../../../shared/constants/metametrics'; +import { getCurrentLocale } from '../../../../../ducks/locale/locale'; ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask) import { RAMPS_CARD_VARIANT_TYPES, RampsCard, -} from '../../multichain/ramps-card/ramps-card'; -import { useAccountTotalFiatBalance } from '../../../hooks/useAccountTotalFiatBalance'; -import { getIsNativeTokenBuyable } from '../../../ducks/ramps'; +} from '../../../../multichain/ramps-card/ramps-card'; +import { useAccountTotalFiatBalance } from '../../../../../hooks/useAccountTotalFiatBalance'; +import { getIsNativeTokenBuyable } from '../../../../../ducks/ramps'; ///: END:ONLY_INCLUDE_IF -import Spinner from '../../ui/spinner'; +import Spinner from '../../../../ui/spinner'; export default function NftsTab() { const useNftDetection = useSelector(getUseNftDetection); diff --git a/ui/components/app/nfts-tab/nfts-tab.test.js b/ui/components/app/assets/nfts/nfts-tab/nfts-tab.test.js similarity index 96% rename from ui/components/app/nfts-tab/nfts-tab.test.js rename to ui/components/app/assets/nfts/nfts-tab/nfts-tab.test.js index 1ef35fbb63ac..7fae8e6a7163 100644 --- a/ui/components/app/nfts-tab/nfts-tab.test.js +++ b/ui/components/app/assets/nfts/nfts-tab/nfts-tab.test.js @@ -2,12 +2,15 @@ import React from 'react'; import { fireEvent, screen } from '@testing-library/react'; import reactRouterDom from 'react-router-dom'; import { EthAccountType } from '@metamask/keyring-api'; -import configureStore from '../../../store/store'; -import { renderWithProvider } from '../../../../test/jest'; -import { SECURITY_ROUTE } from '../../../helpers/constants/routes'; -import { setBackgroundConnection } from '../../../store/background-connection'; -import { CHAIN_IDS, NETWORK_TYPES } from '../../../../shared/constants/network'; -import { ETH_EOA_METHODS } from '../../../../shared/constants/eth-methods'; +import configureStore from '../../../../../store/store'; +import { renderWithProvider } from '../../../../../../test/jest'; +import { SECURITY_ROUTE } from '../../../../../helpers/constants/routes'; +import { setBackgroundConnection } from '../../../../../store/background-connection'; +import { + CHAIN_IDS, + NETWORK_TYPES, +} from '../../../../../../shared/constants/network'; +import { ETH_EOA_METHODS } from '../../../../../../shared/constants/eth-methods'; import NftsTab from '.'; jest.mock('react-router-dom', () => ({ diff --git a/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap b/ui/components/app/assets/token-cell/__snapshots__/token-cell.test.js.snap similarity index 100% rename from ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap rename to ui/components/app/assets/token-cell/__snapshots__/token-cell.test.js.snap diff --git a/ui/components/app/token-cell/index.js b/ui/components/app/assets/token-cell/index.js similarity index 100% rename from ui/components/app/token-cell/index.js rename to ui/components/app/assets/token-cell/index.js diff --git a/ui/components/app/token-cell/token-cell.js b/ui/components/app/assets/token-cell/token-cell.js similarity index 76% rename from ui/components/app/token-cell/token-cell.js rename to ui/components/app/assets/token-cell/token-cell.js index 3b781424d3f6..a488682ea4a8 100644 --- a/ui/components/app/token-cell/token-cell.js +++ b/ui/components/app/assets/token-cell/token-cell.js @@ -1,12 +1,12 @@ import PropTypes from 'prop-types'; import React from 'react'; import { useSelector } from 'react-redux'; -import { getTokenList } from '../../../selectors'; -import { useTokenFiatAmount } from '../../../hooks/useTokenFiatAmount'; -import { TokenListItem } from '../../multichain'; -import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils'; -import { useIsOriginalTokenSymbol } from '../../../hooks/useIsOriginalTokenSymbol'; -import { getIntlLocale } from '../../../ducks/locale/locale'; +import { getTokenList } from '../../../../selectors'; +import { useTokenFiatAmount } from '../../../../hooks/useTokenFiatAmount'; +import { TokenListItem } from '../../../multichain'; +import { isEqualCaseInsensitive } from '../../../../../shared/modules/string-utils'; +import { useIsOriginalTokenSymbol } from '../../../../hooks/useIsOriginalTokenSymbol'; +import { getIntlLocale } from '../../../../ducks/locale/locale'; export default function TokenCell({ address, image, symbol, string, onClick }) { const tokenList = useSelector(getTokenList); diff --git a/ui/components/app/token-cell/token-cell.scss b/ui/components/app/assets/token-cell/token-cell.scss similarity index 100% rename from ui/components/app/token-cell/token-cell.scss rename to ui/components/app/assets/token-cell/token-cell.scss diff --git a/ui/components/app/token-cell/token-cell.stories.js b/ui/components/app/assets/token-cell/token-cell.stories.js similarity index 100% rename from ui/components/app/token-cell/token-cell.stories.js rename to ui/components/app/assets/token-cell/token-cell.stories.js diff --git a/ui/components/app/token-cell/token-cell.test.js b/ui/components/app/assets/token-cell/token-cell.test.js similarity index 89% rename from ui/components/app/token-cell/token-cell.test.js rename to ui/components/app/assets/token-cell/token-cell.test.js index 731361de7df6..210720de7f6f 100644 --- a/ui/components/app/token-cell/token-cell.test.js +++ b/ui/components/app/assets/token-cell/token-cell.test.js @@ -3,10 +3,10 @@ import thunk from 'redux-thunk'; import configureMockStore from 'redux-mock-store'; import { fireEvent } from '@testing-library/react'; import { useSelector } from 'react-redux'; -import { renderWithProvider } from '../../../../test/lib/render-helpers'; -import { useTokenFiatAmount } from '../../../hooks/useTokenFiatAmount'; +import { renderWithProvider } from '../../../../../test/lib/render-helpers'; +import { useTokenFiatAmount } from '../../../../hooks/useTokenFiatAmount'; -import { useIsOriginalTokenSymbol } from '../../../hooks/useIsOriginalTokenSymbol'; +import { useIsOriginalTokenSymbol } from '../../../../hooks/useIsOriginalTokenSymbol'; import TokenCell from '.'; jest.mock('react-redux', () => { @@ -18,13 +18,13 @@ jest.mock('react-redux', () => { }; }); -jest.mock('../../../hooks/useTokenFiatAmount', () => { +jest.mock('../../../../hooks/useTokenFiatAmount', () => { return { useTokenFiatAmount: jest.fn(), }; }); -jest.mock('../../../hooks/useIsOriginalTokenSymbol', () => { +jest.mock('../../../../hooks/useIsOriginalTokenSymbol', () => { return { useIsOriginalTokenSymbol: jest.fn(), }; diff --git a/ui/components/app/token-list-display/index.js b/ui/components/app/assets/token-list-display/index.js similarity index 100% rename from ui/components/app/token-list-display/index.js rename to ui/components/app/assets/token-list-display/index.js diff --git a/ui/components/app/token-list-display/token-list-display.js b/ui/components/app/assets/token-list-display/token-list-display.js similarity index 80% rename from ui/components/app/token-list-display/token-list-display.js rename to ui/components/app/assets/token-list-display/token-list-display.js index e1f4f3c6a8c7..a18f0a8f79f1 100644 --- a/ui/components/app/token-list-display/token-list-display.js +++ b/ui/components/app/assets/token-list-display/token-list-display.js @@ -3,12 +3,12 @@ import PropTypes from 'prop-types'; import { useSelector } from 'react-redux'; import { isEqual } from 'lodash'; -import { getShouldHideZeroBalanceTokens } from '../../../selectors'; -import { useTokenTracker } from '../../../hooks/useTokenTracker'; -import Identicon from '../../ui/identicon'; -import TokenBalance from '../../ui/token-balance'; -import { useI18nContext } from '../../../hooks/useI18nContext'; -import { getTokens } from '../../../ducks/metamask/metamask'; +import { getShouldHideZeroBalanceTokens } from '../../../../selectors'; +import { useTokenTracker } from '../../../../hooks/useTokenTracker'; +import Identicon from '../../../ui/identicon'; +import TokenBalance from '../../../ui/token-balance'; +import { useI18nContext } from '../../../../hooks/useI18nContext'; +import { getTokens } from '../../../../ducks/metamask/metamask'; export default function TokenListDisplay({ clickHandler }) { const t = useI18nContext(); diff --git a/ui/components/app/token-list-display/token-list-display.scss b/ui/components/app/assets/token-list-display/token-list-display.scss similarity index 100% rename from ui/components/app/token-list-display/token-list-display.scss rename to ui/components/app/assets/token-list-display/token-list-display.scss diff --git a/ui/components/app/token-list/index.js b/ui/components/app/assets/token-list/index.js similarity index 100% rename from ui/components/app/token-list/index.js rename to ui/components/app/assets/token-list/index.js diff --git a/ui/components/app/token-list/token-list.js b/ui/components/app/assets/token-list/token-list.js similarity index 83% rename from ui/components/app/token-list/token-list.js rename to ui/components/app/assets/token-list/token-list.js index c584eb4e184b..4dd8f57412db 100644 --- a/ui/components/app/token-list/token-list.js +++ b/ui/components/app/assets/token-list/token-list.js @@ -1,13 +1,13 @@ import React from 'react'; import PropTypes from 'prop-types'; import TokenCell from '../token-cell'; -import { useI18nContext } from '../../../hooks/useI18nContext'; -import { Box } from '../../component-library'; +import { useI18nContext } from '../../../../hooks/useI18nContext'; +import { Box } from '../../../component-library'; import { AlignItems, Display, JustifyContent, -} from '../../../helpers/constants/design-system'; +} from '../../../../helpers/constants/design-system'; export default function TokenList({ onTokenClick, tokens, loading = false }) { const t = useI18nContext(); diff --git a/ui/components/multichain/account-overview/account-overview-tabs.tsx b/ui/components/multichain/account-overview/account-overview-tabs.tsx index 543675d06201..33de033fa103 100644 --- a/ui/components/multichain/account-overview/account-overview-tabs.tsx +++ b/ui/components/multichain/account-overview/account-overview-tabs.tsx @@ -12,8 +12,8 @@ import { MetaMetricsEventName, } from '../../../../shared/constants/metametrics'; import { MetaMetricsContext } from '../../../contexts/metametrics'; -import NftsTab from '../../app/nfts-tab'; -import AssetList from '../../app/asset-list'; +import NftsTab from '../../app/assets/nfts/nfts-tab'; +import AssetList from '../../app/assets/asset-list'; import TransactionList from '../../app/transaction-list'; import { Tabs, Tab } from '../../ui/tabs'; ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-mmi) diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-nft-tab.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-nft-tab.tsx index 01f7cbe6e527..82ede1e20a8b 100644 --- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-nft-tab.tsx +++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal-nft-tab.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { useSelector } from 'react-redux'; -import NftsItems from '../../../app/nfts-items/nfts-items'; +import NftsItems from '../../../app/assets/nfts/nfts-items/nfts-items'; import { Box, Text, @@ -25,7 +25,7 @@ import { getNftIsStillFetchingIndication, getUseNftDetection, } from '../../../../selectors'; -import NFTsDetectionNoticeNFTsTab from '../../../app/nfts-detection-notice-nfts-tab/nfts-detection-notice-nfts-tab'; +import NFTsDetectionNoticeNFTsTab from '../../../app/assets/nfts/nfts-detection-notice-nfts-tab/nfts-detection-notice-nfts-tab'; type NFT = { address: string; diff --git a/ui/components/multichain/import-nfts-modal/import-nfts-modal.js b/ui/components/multichain/import-nfts-modal/import-nfts-modal.js index a955b8515d17..cccf0a481f66 100644 --- a/ui/components/multichain/import-nfts-modal/import-nfts-modal.js +++ b/ui/components/multichain/import-nfts-modal/import-nfts-modal.js @@ -34,7 +34,7 @@ import { setNewNftAddedMessage, updateNftDropDownState, } from '../../../store/actions'; -import NftsDetectionNoticeImportNFTs from '../../app/nfts-detection-notice-import-nfts/nfts-detection-notice-import-nfts'; +import NftsDetectionNoticeImportNFTs from '../../app/assets/nfts/nfts-detection-notice-import-nfts/nfts-detection-notice-import-nfts'; import { BannerAlert, Box, diff --git a/ui/components/multichain/nft-item/nft-item.js b/ui/components/multichain/nft-item/nft-item.js index d8df3e26a9cb..8e026ac72e3e 100644 --- a/ui/components/multichain/nft-item/nft-item.js +++ b/ui/components/multichain/nft-item/nft-item.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import classnames from 'classnames'; import { useSelector } from 'react-redux'; -import NftDefaultImage from '../../app/nft-default-image/nft-default-image'; +import NftDefaultImage from '../../app/assets/nfts/nft-default-image/nft-default-image'; import { AvatarNetwork, AvatarNetworkSize, diff --git a/ui/components/multichain/notification-detail-collection/notification-detail-collection.tsx b/ui/components/multichain/notification-detail-collection/notification-detail-collection.tsx index 556ef614eebe..52df8a48784c 100644 --- a/ui/components/multichain/notification-detail-collection/notification-detail-collection.tsx +++ b/ui/components/multichain/notification-detail-collection/notification-detail-collection.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import { useSelector } from 'react-redux'; import { getIpfsGateway, getOpenSeaEnabled } from '../../../selectors'; -import NftDefaultImage from '../../app/nft-default-image/nft-default-image'; +import NftDefaultImage from '../../app/assets/nfts/nft-default-image/nft-default-image'; import { isIpfsURL } from '../../../helpers/utils/notification.util'; import { NotificationDetail } from '../notification-detail'; diff --git a/ui/components/multichain/notification-list-item-icon/notification-list-item-icon.tsx b/ui/components/multichain/notification-list-item-icon/notification-list-item-icon.tsx index 027b44a8ec15..08efcf6b0382 100644 --- a/ui/components/multichain/notification-list-item-icon/notification-list-item-icon.tsx +++ b/ui/components/multichain/notification-list-item-icon/notification-list-item-icon.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import { useSelector } from 'react-redux'; import { getIpfsGateway, getOpenSeaEnabled } from '../../../selectors'; -import NftDefaultImage from '../../app/nft-default-image/nft-default-image'; +import NftDefaultImage from '../../app/assets/nfts/nft-default-image/nft-default-image'; import { isIpfsURL } from '../../../helpers/utils/notification.util'; import { diff --git a/ui/pages/asset/asset.tsx b/ui/pages/asset/asset.tsx index f81e377d581c..975ff2e5cc25 100644 --- a/ui/pages/asset/asset.tsx +++ b/ui/pages/asset/asset.tsx @@ -2,7 +2,7 @@ import React, { useEffect } from 'react'; import { useSelector } from 'react-redux'; import { Redirect, useParams } from 'react-router-dom'; import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils'; -import NftDetails from '../../components/app/nft-details/nft-details'; +import NftDetails from '../../components/app/assets/nfts/nft-details/nft-details'; import { getNativeCurrency, getNfts, diff --git a/ui/pages/asset/components/asset-page.tsx b/ui/pages/asset/components/asset-page.tsx index 38ea46e475f3..f10158e08ae3 100644 --- a/ui/pages/asset/components/asset-page.tsx +++ b/ui/pages/asset/components/asset-page.tsx @@ -34,7 +34,7 @@ import { TokenListItem, } from '../../../components/multichain'; import { AssetType } from '../../../../shared/constants/transaction'; -import TokenCell from '../../../components/app/token-cell'; +import TokenCell from '../../../components/app/assets/token-cell'; import TransactionList from '../../../components/app/transaction-list'; import { getPricePrecision, localizeLargeNumber } from '../util'; import { DEFAULT_ROUTE } from '../../../helpers/constants/routes'; 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 14b28d0f6ef8..c5be9de7c9f8 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 @@ -37,7 +37,7 @@ import { getSelectedAccountCachedBalance, getAddressBookEntryOrAccountName, } from '../../selectors'; -import NftDefaultImage from '../../components/app/nft-default-image/nft-default-image'; +import NftDefaultImage from '../../components/app/assets/nfts/nft-default-image/nft-default-image'; import { getAssetImageURL, shortenAddress } from '../../helpers/utils/util'; import { AlignItems, diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js index 89401830fb06..62a455ab74ff 100644 --- a/ui/pages/home/home.component.js +++ b/ui/pages/home/home.component.js @@ -14,8 +14,8 @@ import RecoveryPhraseReminder from '../../components/app/recovery-phrase-reminde import WhatsNewPopup from '../../components/app/whats-new-popup'; import { FirstTimeFlowType } from '../../../shared/constants/onboarding'; import SmartTransactionsOptInModal from '../../components/app/smart-transactions/smart-transactions-opt-in-modal'; -import AutoDetectTokenModal from '../../components/app/auto-detect-token/auto-detect-token-modal'; -import AutoDetectNftModal from '../../components/app/auto-detect-nft/auto-detect-nft-modal'; +import AutoDetectTokenModal from '../../components/app/assets/auto-detect-token/auto-detect-token-modal'; +import AutoDetectNftModal from '../../components/app/assets/auto-detect-nft/auto-detect-nft-modal'; ///: END:ONLY_INCLUDE_IF import HomeNotification from '../../components/app/home-notification'; import MultipleNotifications from '../../components/app/multiple-notifications'; diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js index 74c037e77aa5..80b0a26a2555 100644 --- a/ui/pages/routes/routes.component.js +++ b/ui/pages/routes/routes.component.js @@ -114,7 +114,7 @@ import { Icon, IconName, } from '../../components/component-library'; -import { ToggleIpfsModal } from '../../components/app/nft-default-image/toggle-ipfs-modal'; +import { ToggleIpfsModal } from '../../components/app/assets/nfts/nft-default-image/toggle-ipfs-modal'; import { BasicConfigurationModal } from '../../components/app/basic-configuration-modal'; ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps) import KeyringSnapRemovalResult from '../../components/app/modals/keyring-snap-removal-modal'; @@ -132,7 +132,7 @@ import { import { MILLISECOND, SECOND } from '../../../shared/constants/time'; import { MultichainMetaFoxLogo } from '../../components/multichain/app-header/multichain-meta-fox-logo'; import NetworkConfirmationPopover from '../../components/multichain/network-list-menu/network-confirmation-popover/network-confirmation-popover'; -import NftFullImage from '../../components/app/nft-details/nft-full-image'; +import NftFullImage from '../../components/app/assets/nfts/nft-details/nft-full-image'; const isConfirmTransactionRoute = (pathname) => Boolean(