From 3be1fc6d0c42a5837e2933d572e814872ac91b5d Mon Sep 17 00:00:00 2001 From: Nidhi Kumari Date: Wed, 8 Feb 2023 20:04:56 +0530 Subject: [PATCH] converted collectibles files to nfts (#17658) * converted collectibles files to nfts * updated relative import for scss * updated scss for pages --- .../files-to-convert.json | 32 +++++++++---------- .../{collectibles.spec.js => nfts.spec.js} | 0 ui/components/app/app-components.scss | 12 +++---- .../app/collectible-default-image/index.js | 1 - .../collectibles-detection-notice/index.js | 1 - ui/components/app/collectibles-items/index.js | 1 - ui/components/app/collectibles-tab/index.js | 1 - .../nft-default-image.test.js.snap} | 0 ui/components/app/nft-default-image/index.js | 1 + .../index.scss | 0 .../nft-default-image.js} | 0 .../nft-default-image.stories.js} | 0 .../nft-default-image.test.js} | 0 .../__snapshots__/nft-details.test.js.snap} | 0 .../index.scss | 0 .../nft-details.js} | 6 ++-- .../nft-details.stories.js} | 2 +- .../nft-details.test.js} | 2 +- .../index.scss | 0 .../nft-options.js} | 0 .../nft-options.test.js} | 2 +- .../app/nfts-detection-notice/index.js | 1 + .../index.scss | 0 .../nfts-detection-notice.js} | 0 ui/components/app/nfts-items/index.js | 1 + .../index.scss | 0 .../nfts-items.js} | 4 +-- .../nfts-items.test.js} | 0 ui/components/app/nfts-tab/index.js | 1 + .../{collectibles-tab => nfts-tab}/index.scss | 0 .../nfts-tab.js} | 6 ++-- .../nfts-tab.test.js} | 0 .../nft-collection-image.js | 2 +- ui/helpers/utils/{collectibles.js => nfts.js} | 0 .../{collectibles.test.js => nfts.test.js} | 2 +- ...esCollections.js => useNftsCollections.js} | 0 ui/pages/add-collectible/index.js | 1 - .../add-collectible.js => add-nft/add-nft.js} | 2 +- .../add-nft.test.js} | 0 ui/pages/add-nft/index.js | 1 + .../{add-collectible => add-nft}/index.scss | 0 ui/pages/asset/asset.js | 2 +- ui/pages/home/home.component.js | 2 +- ui/pages/pages.scss | 2 +- ui/pages/routes/routes.component.js | 2 +- 45 files changed, 45 insertions(+), 45 deletions(-) rename test/e2e/tests/{collectibles.spec.js => nfts.spec.js} (100%) delete mode 100644 ui/components/app/collectible-default-image/index.js delete mode 100644 ui/components/app/collectibles-detection-notice/index.js delete mode 100644 ui/components/app/collectibles-items/index.js delete mode 100644 ui/components/app/collectibles-tab/index.js rename ui/components/app/{collectible-default-image/__snapshots__/collectible-default-image.test.js.snap => nft-default-image/__snapshots__/nft-default-image.test.js.snap} (100%) create mode 100644 ui/components/app/nft-default-image/index.js rename ui/components/app/{collectible-default-image => nft-default-image}/index.scss (100%) rename ui/components/app/{collectible-default-image/collectible-default-image.js => nft-default-image/nft-default-image.js} (100%) rename ui/components/app/{collectible-default-image/collectible-default-image.stories.js => nft-default-image/nft-default-image.stories.js} (100%) rename ui/components/app/{collectible-default-image/collectible-default-image.test.js => nft-default-image/nft-default-image.test.js} (100%) rename ui/components/app/{collectible-details/__snapshots__/collectible-details.test.js.snap => nft-details/__snapshots__/nft-details.test.js.snap} (100%) rename ui/components/app/{collectible-details => nft-details}/index.scss (100%) rename ui/components/app/{collectible-details/collectible-details.js => nft-details/nft-details.js} (98%) rename ui/components/app/{collectible-details/collectible-details.stories.js => nft-details/nft-details.stories.js} (95%) rename ui/components/app/{collectible-details/collectible-details.test.js => nft-details/nft-details.test.js} (99%) rename ui/components/app/{collectible-options => nft-options}/index.scss (100%) rename ui/components/app/{collectible-options/collectible-options.js => nft-options/nft-options.js} (100%) rename ui/components/app/{collectible-options/collectible-options.test.js => nft-options/nft-options.test.js} (97%) create mode 100644 ui/components/app/nfts-detection-notice/index.js rename ui/components/app/{collectibles-detection-notice => nfts-detection-notice}/index.scss (100%) rename ui/components/app/{collectibles-detection-notice/collectibles-detection-notice.js => nfts-detection-notice/nfts-detection-notice.js} (100%) create mode 100644 ui/components/app/nfts-items/index.js rename ui/components/app/{collectibles-items => nfts-items}/index.scss (100%) rename ui/components/app/{collectibles-items/collectibles-items.js => nfts-items/nfts-items.js} (98%) rename ui/components/app/{collectibles-items/collectibles-items.test.js => nfts-items/nfts-items.test.js} (100%) create mode 100644 ui/components/app/nfts-tab/index.js rename ui/components/app/{collectibles-tab => nfts-tab}/index.scss (100%) rename ui/components/app/{collectibles-tab/collectibles-tab.js => nfts-tab/nfts-tab.js} (95%) rename ui/components/app/{collectibles-tab/collectibles-tab.test.js => nfts-tab/nfts-tab.test.js} (100%) rename ui/helpers/utils/{collectibles.js => nfts.js} (100%) rename ui/helpers/utils/{collectibles.test.js => nfts.test.js} (93%) rename ui/hooks/{useCollectiblesCollections.js => useNftsCollections.js} (100%) delete mode 100644 ui/pages/add-collectible/index.js rename ui/pages/{add-collectible/add-collectible.js => add-nft/add-nft.js} (98%) rename ui/pages/{add-collectible/add-collectible.test.js => add-nft/add-nft.test.js} (100%) create mode 100644 ui/pages/add-nft/index.js rename ui/pages/{add-collectible => add-nft}/index.scss (100%) diff --git a/development/ts-migration-dashboard/files-to-convert.json b/development/ts-migration-dashboard/files-to-convert.json index 45ca3e5b6..4851f87ef 100644 --- a/development/ts-migration-dashboard/files-to-convert.json +++ b/development/ts-migration-dashboard/files-to-convert.json @@ -397,19 +397,19 @@ "ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js", "ui/components/app/cancel-speedup-popover/cancel-speedup-popover.test.js", "ui/components/app/cancel-speedup-popover/index.js", - "ui/components/app/collectible-default-image/collectible-default-image.js", - "ui/components/app/collectible-default-image/collectible-default-image.stories.js", - "ui/components/app/collectible-default-image/index.js", - "ui/components/app/collectible-details/collectible-details.js", - "ui/components/app/collectible-details/collectible-details.stories.js", - "ui/components/app/collectible-options/collectible-options.js", - "ui/components/app/collectibles-detection-notice/collectibles-detection-notice.js", - "ui/components/app/collectibles-detection-notice/index.js", - "ui/components/app/collectibles-items/collectibles-items.js", - "ui/components/app/collectibles-items/index.js", - "ui/components/app/collectibles-tab/collectibles-tab.js", - "ui/components/app/collectibles-tab/collectibles-tab.test.js", - "ui/components/app/collectibles-tab/index.js", + "ui/components/app/nft-default-image/nft-default-image.js", + "ui/components/app/nft-default-image/nft-default-image.stories.js", + "ui/components/app/nft-default-image/index.js", + "ui/components/app/nft-details/nft-details.js", + "ui/components/app/nft-details/nft-details.stories.js", + "ui/components/app/nft-options/nft-options.js", + "ui/components/app/nfts-detection-notice/nfts-detection-notice.js", + "ui/components/app/nfts-detection-notice/index.js", + "ui/components/app/nfts-items/nfts-items.js", + "ui/components/app/nfts-items/index.js", + "ui/components/app/nfts-tab/nfts-tab.js", + "ui/components/app/nfts-tab/nfts-tab.test.js", + "ui/components/app/nfts-tab/index.js", "ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.component.js", "ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.component.test.js", "ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.stories.js", @@ -1192,9 +1192,9 @@ "ui/hooks/useUserPreferencedCurrency.test.js", "ui/index.js", "ui/index.test.js", - "ui/pages/add-collectible/add-collectible.js", - "ui/pages/add-collectible/add-collectible.test.js", - "ui/pages/add-collectible/index.js", + "ui/pages/add-nft/add-nft.js", + "ui/pages/add-nft/add-nft.test.js", + "ui/pages/add-nft/index.js", "ui/pages/asset/asset.js", "ui/pages/asset/components/asset-breadcrumb.js", "ui/pages/asset/components/asset-navigation.js", diff --git a/test/e2e/tests/collectibles.spec.js b/test/e2e/tests/nfts.spec.js similarity index 100% rename from test/e2e/tests/collectibles.spec.js rename to test/e2e/tests/nfts.spec.js diff --git a/ui/components/app/app-components.scss b/ui/components/app/app-components.scss index 314a6c76b..2a3d935a7 100644 --- a/ui/components/app/app-components.scss +++ b/ui/components/app/app-components.scss @@ -13,12 +13,12 @@ @import 'cancel-speedup-popover/index'; @import 'confirm-page-container/index'; @import 'confirmation-warning-modal/index'; -@import 'collectibles-items/index'; -@import 'collectibles-tab/index'; -@import 'collectible-details/index'; -@import 'collectible-default-image/index'; -@import 'collectible-options/index'; -@import 'collectibles-detection-notice/index'; +@import 'nfts-items/index'; +@import 'nfts-tab/index'; +@import 'nft-details/index'; +@import 'nft-default-image/index'; +@import 'nft-options/index'; +@import 'nfts-detection-notice/index'; @import 'connected-accounts-list/index'; @import 'connected-accounts-permissions/index'; @import 'connected-sites-list/index'; diff --git a/ui/components/app/collectible-default-image/index.js b/ui/components/app/collectible-default-image/index.js deleted file mode 100644 index 76ab58746..000000000 --- a/ui/components/app/collectible-default-image/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './collectible-default-image'; diff --git a/ui/components/app/collectibles-detection-notice/index.js b/ui/components/app/collectibles-detection-notice/index.js deleted file mode 100644 index f0ae0eaa2..000000000 --- a/ui/components/app/collectibles-detection-notice/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './collectibles-detection-notice'; diff --git a/ui/components/app/collectibles-items/index.js b/ui/components/app/collectibles-items/index.js deleted file mode 100644 index 79b4e7302..000000000 --- a/ui/components/app/collectibles-items/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './collectibles-items'; diff --git a/ui/components/app/collectibles-tab/index.js b/ui/components/app/collectibles-tab/index.js deleted file mode 100644 index fac98327d..000000000 --- a/ui/components/app/collectibles-tab/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './collectibles-tab'; diff --git a/ui/components/app/collectible-default-image/__snapshots__/collectible-default-image.test.js.snap b/ui/components/app/nft-default-image/__snapshots__/nft-default-image.test.js.snap similarity index 100% rename from ui/components/app/collectible-default-image/__snapshots__/collectible-default-image.test.js.snap rename to ui/components/app/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/nft-default-image/index.js new file mode 100644 index 000000000..a3b1a2975 --- /dev/null +++ b/ui/components/app/nft-default-image/index.js @@ -0,0 +1 @@ +export { default } from './nft-default-image'; diff --git a/ui/components/app/collectible-default-image/index.scss b/ui/components/app/nft-default-image/index.scss similarity index 100% rename from ui/components/app/collectible-default-image/index.scss rename to ui/components/app/nft-default-image/index.scss diff --git a/ui/components/app/collectible-default-image/collectible-default-image.js b/ui/components/app/nft-default-image/nft-default-image.js similarity index 100% rename from ui/components/app/collectible-default-image/collectible-default-image.js rename to ui/components/app/nft-default-image/nft-default-image.js diff --git a/ui/components/app/collectible-default-image/collectible-default-image.stories.js b/ui/components/app/nft-default-image/nft-default-image.stories.js similarity index 100% rename from ui/components/app/collectible-default-image/collectible-default-image.stories.js rename to ui/components/app/nft-default-image/nft-default-image.stories.js diff --git a/ui/components/app/collectible-default-image/collectible-default-image.test.js b/ui/components/app/nft-default-image/nft-default-image.test.js similarity index 100% rename from ui/components/app/collectible-default-image/collectible-default-image.test.js rename to ui/components/app/nft-default-image/nft-default-image.test.js diff --git a/ui/components/app/collectible-details/__snapshots__/collectible-details.test.js.snap b/ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap similarity index 100% rename from ui/components/app/collectible-details/__snapshots__/collectible-details.test.js.snap rename to ui/components/app/nft-details/__snapshots__/nft-details.test.js.snap diff --git a/ui/components/app/collectible-details/index.scss b/ui/components/app/nft-details/index.scss similarity index 100% rename from ui/components/app/collectible-details/index.scss rename to ui/components/app/nft-details/index.scss diff --git a/ui/components/app/collectible-details/collectible-details.js b/ui/components/app/nft-details/nft-details.js similarity index 98% rename from ui/components/app/collectible-details/collectible-details.js rename to ui/components/app/nft-details/nft-details.js index 0329fcc01..a0b1949d3 100644 --- a/ui/components/app/collectible-details/collectible-details.js +++ b/ui/components/app/nft-details/nft-details.js @@ -23,7 +23,7 @@ import { getAssetImageURL, shortenAddress, } from '../../../helpers/utils/util'; -import { getCollectibleImageAlt } from '../../../helpers/utils/collectibles'; +import { getCollectibleImageAlt } from '../../../helpers/utils/nfts'; import { getCurrentChainId, getIpfsGateway, @@ -40,7 +40,7 @@ import { import { CHAIN_IDS } from '../../../../shared/constants/network'; import { getEnvironmentType } from '../../../../app/scripts/lib/util'; import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app'; -import CollectibleOptions from '../collectible-options/collectible-options'; +import CollectibleOptions from '../nft-options/nft-options'; import Button from '../../ui/button'; import { startNewDraftTransaction } from '../../../ducks/send'; import InfoTooltip from '../../ui/info-tooltip'; @@ -51,7 +51,7 @@ import { AssetType, TokenStandard, } from '../../../../shared/constants/transaction'; -import CollectibleDefaultImage from '../collectible-default-image'; +import CollectibleDefaultImage from '../nft-default-image'; import { ButtonIcon, ICON_NAMES } from '../../component-library'; import Tooltip from '../../ui/tooltip'; diff --git a/ui/components/app/collectible-details/collectible-details.stories.js b/ui/components/app/nft-details/nft-details.stories.js similarity index 95% rename from ui/components/app/collectible-details/collectible-details.stories.js rename to ui/components/app/nft-details/nft-details.stories.js index 88c37d586..aecfbce7a 100644 --- a/ui/components/app/collectible-details/collectible-details.stories.js +++ b/ui/components/app/nft-details/nft-details.stories.js @@ -1,5 +1,5 @@ import React from 'react'; -import CollectibleDetails from './collectible-details'; +import CollectibleDetails from './nft-details'; const collectible = { name: 'Catnip Spicywright', diff --git a/ui/components/app/collectible-details/collectible-details.test.js b/ui/components/app/nft-details/nft-details.test.js similarity index 99% rename from ui/components/app/collectible-details/collectible-details.test.js rename to ui/components/app/nft-details/nft-details.test.js index e389e2e6e..ab22f981c 100644 --- a/ui/components/app/collectible-details/collectible-details.test.js +++ b/ui/components/app/nft-details/nft-details.test.js @@ -12,7 +12,7 @@ import { removeAndIgnoreNft, setRemoveCollectibleMessage, } from '../../../store/actions'; -import CollectibleDetails from './collectible-details'; +import CollectibleDetails from './nft-details'; jest.mock('copy-to-clipboard'); diff --git a/ui/components/app/collectible-options/index.scss b/ui/components/app/nft-options/index.scss similarity index 100% rename from ui/components/app/collectible-options/index.scss rename to ui/components/app/nft-options/index.scss diff --git a/ui/components/app/collectible-options/collectible-options.js b/ui/components/app/nft-options/nft-options.js similarity index 100% rename from ui/components/app/collectible-options/collectible-options.js rename to ui/components/app/nft-options/nft-options.js diff --git a/ui/components/app/collectible-options/collectible-options.test.js b/ui/components/app/nft-options/nft-options.test.js similarity index 97% rename from ui/components/app/collectible-options/collectible-options.test.js rename to ui/components/app/nft-options/nft-options.test.js index 24b20490a..e01488443 100644 --- a/ui/components/app/collectible-options/collectible-options.test.js +++ b/ui/components/app/nft-options/nft-options.test.js @@ -1,7 +1,7 @@ import { fireEvent, waitFor } from '@testing-library/react'; import React from 'react'; import { renderWithProvider } from '../../../../test/lib/render-helpers'; -import CollectibleOptions from './collectible-options'; +import CollectibleOptions from './nft-options'; describe('Collectible Options Component', () => { const props = { diff --git a/ui/components/app/nfts-detection-notice/index.js b/ui/components/app/nfts-detection-notice/index.js new file mode 100644 index 000000000..5d4bec37a --- /dev/null +++ b/ui/components/app/nfts-detection-notice/index.js @@ -0,0 +1 @@ +export { default } from './nfts-detection-notice'; diff --git a/ui/components/app/collectibles-detection-notice/index.scss b/ui/components/app/nfts-detection-notice/index.scss similarity index 100% rename from ui/components/app/collectibles-detection-notice/index.scss rename to ui/components/app/nfts-detection-notice/index.scss diff --git a/ui/components/app/collectibles-detection-notice/collectibles-detection-notice.js b/ui/components/app/nfts-detection-notice/nfts-detection-notice.js similarity index 100% rename from ui/components/app/collectibles-detection-notice/collectibles-detection-notice.js rename to ui/components/app/nfts-detection-notice/nfts-detection-notice.js diff --git a/ui/components/app/nfts-items/index.js b/ui/components/app/nfts-items/index.js new file mode 100644 index 000000000..e0428c09b --- /dev/null +++ b/ui/components/app/nfts-items/index.js @@ -0,0 +1 @@ +export { default } from './nfts-items'; diff --git a/ui/components/app/collectibles-items/index.scss b/ui/components/app/nfts-items/index.scss similarity index 100% rename from ui/components/app/collectibles-items/index.scss rename to ui/components/app/nfts-items/index.scss diff --git a/ui/components/app/collectibles-items/collectibles-items.js b/ui/components/app/nfts-items/nfts-items.js similarity index 98% rename from ui/components/app/collectibles-items/collectibles-items.js rename to ui/components/app/nfts-items/nfts-items.js index 53e932240..dbe2ab454 100644 --- a/ui/components/app/collectibles-items/collectibles-items.js +++ b/ui/components/app/nfts-items/nfts-items.js @@ -25,12 +25,12 @@ import { } from '../../../selectors'; import { ASSET_ROUTE } from '../../../helpers/constants/routes'; import { getAssetImageURL } from '../../../helpers/utils/util'; -import { getCollectibleImageAlt } from '../../../helpers/utils/collectibles'; +import { getCollectibleImageAlt } from '../../../helpers/utils/nfts'; import { updateCollectibleDropDownState } from '../../../store/actions'; import { usePrevious } from '../../../hooks/usePrevious'; import { getCollectiblesDropdownState } from '../../../ducks/metamask/metamask'; import { useI18nContext } from '../../../hooks/useI18nContext'; -import CollectibleDefaultImage from '../collectible-default-image'; +import CollectibleDefaultImage from '../nft-default-image'; const width = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP diff --git a/ui/components/app/collectibles-items/collectibles-items.test.js b/ui/components/app/nfts-items/nfts-items.test.js similarity index 100% rename from ui/components/app/collectibles-items/collectibles-items.test.js rename to ui/components/app/nfts-items/nfts-items.test.js diff --git a/ui/components/app/nfts-tab/index.js b/ui/components/app/nfts-tab/index.js new file mode 100644 index 000000000..a95b210c3 --- /dev/null +++ b/ui/components/app/nfts-tab/index.js @@ -0,0 +1 @@ +export { default } from './nfts-tab'; diff --git a/ui/components/app/collectibles-tab/index.scss b/ui/components/app/nfts-tab/index.scss similarity index 100% rename from ui/components/app/collectibles-tab/index.scss rename to ui/components/app/nfts-tab/index.scss diff --git a/ui/components/app/collectibles-tab/collectibles-tab.js b/ui/components/app/nfts-tab/nfts-tab.js similarity index 95% rename from ui/components/app/collectibles-tab/collectibles-tab.js rename to ui/components/app/nfts-tab/nfts-tab.js index f4a1c7dc0..79b303d09 100644 --- a/ui/components/app/collectibles-tab/collectibles-tab.js +++ b/ui/components/app/nfts-tab/nfts-tab.js @@ -5,8 +5,8 @@ import { useHistory } from 'react-router-dom'; import Box from '../../ui/box'; import Button from '../../ui/button'; import Typography from '../../ui/typography/typography'; -import CollectiblesDetectionNotice from '../collectibles-detection-notice'; -import CollectiblesItems from '../collectibles-items'; +import CollectiblesDetectionNotice from '../nfts-detection-notice'; +import CollectiblesItems from '../nfts-items'; import { TypographyVariant, TEXT_ALIGN, @@ -23,7 +23,7 @@ import { checkAndUpdateAllNftsOwnershipStatus, detectNfts, } from '../../../store/actions'; -import { useCollectiblesCollections } from '../../../hooks/useCollectiblesCollections'; +import { useCollectiblesCollections } from '../../../hooks/useNftsCollections'; import ZENDESK_URLS from '../../../helpers/constants/zendesk-url'; export default function CollectiblesTab({ onAddNFT }) { diff --git a/ui/components/app/collectibles-tab/collectibles-tab.test.js b/ui/components/app/nfts-tab/nfts-tab.test.js similarity index 100% rename from ui/components/app/collectibles-tab/collectibles-tab.test.js rename to ui/components/app/nfts-tab/nfts-tab.test.js diff --git a/ui/components/ui/nft-collection-image/nft-collection-image.js b/ui/components/ui/nft-collection-image/nft-collection-image.js index 505637e85..0d218dbd8 100644 --- a/ui/components/ui/nft-collection-image/nft-collection-image.js +++ b/ui/components/ui/nft-collection-image/nft-collection-image.js @@ -5,7 +5,7 @@ import Box from '../box'; import { Color, TEXT_ALIGN } from '../../../helpers/constants/design-system'; import Identicon from '../identicon'; import { getTokenList } from '../../../selectors'; -import { useCollectiblesCollections } from '../../../hooks/useCollectiblesCollections'; +import { useCollectiblesCollections } from '../../../hooks/useNftsCollections'; export default function NftCollectionImage({ assetName, tokenAddress }) { const { collections } = useCollectiblesCollections(); diff --git a/ui/helpers/utils/collectibles.js b/ui/helpers/utils/nfts.js similarity index 100% rename from ui/helpers/utils/collectibles.js rename to ui/helpers/utils/nfts.js diff --git a/ui/helpers/utils/collectibles.test.js b/ui/helpers/utils/nfts.test.js similarity index 93% rename from ui/helpers/utils/collectibles.test.js rename to ui/helpers/utils/nfts.test.js index 0e224100c..a7da209a3 100644 --- a/ui/helpers/utils/collectibles.test.js +++ b/ui/helpers/utils/nfts.test.js @@ -1,4 +1,4 @@ -import { getCollectibleImageAlt } from './collectibles'; +import { getCollectibleImageAlt } from './nfts'; describe('Collectibles Utils', () => { describe('getCollectibleImageAlt', () => { diff --git a/ui/hooks/useCollectiblesCollections.js b/ui/hooks/useNftsCollections.js similarity index 100% rename from ui/hooks/useCollectiblesCollections.js rename to ui/hooks/useNftsCollections.js diff --git a/ui/pages/add-collectible/index.js b/ui/pages/add-collectible/index.js deleted file mode 100644 index 43c35006c..000000000 --- a/ui/pages/add-collectible/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './add-collectible'; diff --git a/ui/pages/add-collectible/add-collectible.js b/ui/pages/add-nft/add-nft.js similarity index 98% rename from ui/pages/add-collectible/add-collectible.js rename to ui/pages/add-nft/add-nft.js index e883a325e..62a8299bb 100644 --- a/ui/pages/add-collectible/add-collectible.js +++ b/ui/pages/add-nft/add-nft.js @@ -29,7 +29,7 @@ import { getUseNftDetection, } from '../../selectors'; import { getCollectiblesDropdownState } from '../../ducks/metamask/metamask'; -import CollectiblesDetectionNotice from '../../components/app/collectibles-detection-notice'; +import CollectiblesDetectionNotice from '../../components/app/nfts-detection-notice'; import { MetaMetricsContext } from '../../contexts/metametrics'; import { AssetType } from '../../../shared/constants/transaction'; import { EVENT, EVENT_NAMES } from '../../../shared/constants/metametrics'; diff --git a/ui/pages/add-collectible/add-collectible.test.js b/ui/pages/add-nft/add-nft.test.js similarity index 100% rename from ui/pages/add-collectible/add-collectible.test.js rename to ui/pages/add-nft/add-nft.test.js diff --git a/ui/pages/add-nft/index.js b/ui/pages/add-nft/index.js new file mode 100644 index 000000000..603e8378b --- /dev/null +++ b/ui/pages/add-nft/index.js @@ -0,0 +1 @@ +export { default } from './add-nft'; diff --git a/ui/pages/add-collectible/index.scss b/ui/pages/add-nft/index.scss similarity index 100% rename from ui/pages/add-collectible/index.scss rename to ui/pages/add-nft/index.scss diff --git a/ui/pages/asset/asset.js b/ui/pages/asset/asset.js index e88298243..f3ee5b428 100644 --- a/ui/pages/asset/asset.js +++ b/ui/pages/asset/asset.js @@ -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 CollectibleDetails from '../../components/app/collectible-details/collectible-details'; +import CollectibleDetails from '../../components/app/nft-details/nft-details'; import { getCollectibles, getTokens } from '../../ducks/metamask/metamask'; import { DEFAULT_ROUTE } from '../../helpers/constants/routes'; diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js index 6fc7336b2..ab8e895ba 100644 --- a/ui/pages/home/home.component.js +++ b/ui/pages/home/home.component.js @@ -7,7 +7,7 @@ import { CONTEXT_PROPS, } from '../../../shared/constants/metametrics'; import AssetList from '../../components/app/asset-list'; -import CollectiblesTab from '../../components/app/collectibles-tab'; +import CollectiblesTab from '../../components/app/nfts-tab'; import HomeNotification from '../../components/app/home-notification'; import MultipleNotifications from '../../components/app/multiple-notifications'; import TransactionList from '../../components/app/transaction-list'; diff --git a/ui/pages/pages.scss b/ui/pages/pages.scss index 48d5a653e..d1a091872 100644 --- a/ui/pages/pages.scss +++ b/ui/pages/pages.scss @@ -1,5 +1,5 @@ /** Please import your files in alphabetical order **/ -@import 'add-collectible/index'; +@import 'add-nft/index'; @import 'import-token/index'; @import 'asset/asset'; @import 'confirm-import-token/index'; diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js index 80a640505..cca891231 100644 --- a/ui/pages/routes/routes.component.js +++ b/ui/pages/routes/routes.component.js @@ -17,7 +17,7 @@ import RestoreVaultPage from '../keychains/restore-vault'; import RevealSeedConfirmation from '../keychains/reveal-seed'; import MobileSyncPage from '../mobile-sync'; import ImportTokenPage from '../import-token'; -import AddCollectiblePage from '../add-collectible'; +import AddCollectiblePage from '../add-nft'; import ConfirmImportTokenPage from '../confirm-import-token'; import ConfirmAddSuggestedTokenPage from '../confirm-add-suggested-token'; import CreateAccountPage from '../create-account';