diff --git a/src/components/header/WalletDropdownMenu.tsx b/src/components/header/WalletDropdownMenu.tsx index c7b8128..5e57d6c 100644 --- a/src/components/header/WalletDropdownMenu.tsx +++ b/src/components/header/WalletDropdownMenu.tsx @@ -7,14 +7,13 @@ import { GradientAvatar, Modal, SignoutIcon, - Text + Text, + truncateAddress } from '@0xsequence/design-system' import * as PopoverPrimitive from '@radix-ui/react-popover' import { useEffect, useState } from 'react' import { useNavigate } from 'react-router-dom' -import { truncateMiddle } from '~/utils/truncatemiddle' - import { useObservable, useStore } from '~/stores' import { AuthStore } from '~/stores/AuthStore' @@ -52,7 +51,7 @@ export default function SettingsDropdownMenu() { - {truncateMiddle(walletAddress!, 4, 4)} + {truncateAddress(walletAddress!, 2, 4)} } diff --git a/src/components/wallet/collectibles/ImportCollectible.tsx b/src/components/wallet/collectibles/ImportCollectible.tsx index e42fbe9..13f4bcb 100644 --- a/src/components/wallet/collectibles/ImportCollectible.tsx +++ b/src/components/wallet/collectibles/ImportCollectible.tsx @@ -47,6 +47,7 @@ export default function ImportCollectible({ onClose }: { onClose: () => void }) const [isAddingCollection, setIsAddingCollection] = useState(false) const [collectionList, setCollectionList] = useState([]) + const [collectionListDate, setCollectionListDate] = useState() const [collectionListFilter, setCollectionListFilter] = useState('') const [filteredCollectionList, setFilteredCollectionList] = useState([]) @@ -78,9 +79,13 @@ export default function ImportCollectible({ onClose }: { onClose: () => void }) const fetchCollectibleList = async () => { if (selectedNetwork && contractType) { if (contractType === CollectibleContractTypeValues.ERC721) { - setCollectionList(await collectibleStore.getDefaultERC721List(selectedNetwork.chainId)) + const data = await collectibleStore.getERC721List(selectedNetwork.chainId) + setCollectionList(data.tokens) + setCollectionListDate(new Date(data.date)) } else if (contractType === CollectibleContractTypeValues.ERC1155) { - setCollectionList(await collectibleStore.getDefaultERC1155List(selectedNetwork.chainId)) + const data = await collectibleStore.getERC1155List(selectedNetwork.chainId) + setCollectionList(data.tokens) + setCollectionListDate(new Date(data.date)) } } } @@ -151,9 +156,13 @@ export default function ImportCollectible({ onClose }: { onClose: () => void }) const fetchCollectionList = async () => { if (selectedNetwork) { if (contractType === CollectibleContractTypeValues.ERC721) { - setCollectionList(await collectibleStore.getDefaultERC721List(selectedNetwork.chainId)) + const data = await collectibleStore.getERC721List(selectedNetwork.chainId) + setCollectionList(data.tokens) + setCollectionListDate(new Date(data.date)) } else if (contractType === CollectibleContractTypeValues.ERC1155) { - setCollectionList(await collectibleStore.getDefaultERC1155List(selectedNetwork.chainId)) + const data = await collectibleStore.getERC1155List(selectedNetwork.chainId) + setCollectionList(data.tokens) + setCollectionListDate(new Date(data.date)) } } } @@ -488,6 +497,25 @@ export default function ImportCollectible({ onClose }: { onClose: () => void }) ref={fileInputRef} onChange={handleFileChange} /> + + {selectedNetwork && ( +