From c27731353b8f664806039cff46e8105aa3e541f6 Mon Sep 17 00:00:00 2001
From: Randolph <840094513@qq.com>
Date: Tue, 14 Jun 2022 01:28:15 +0800
Subject: [PATCH 1/7] fix: magic eden response handle function

---
 packages/web3-providers/src/MagicEden/index.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/web3-providers/src/MagicEden/index.ts b/packages/web3-providers/src/MagicEden/index.ts
index f2bd5712c568..1ffbfe369352 100644
--- a/packages/web3-providers/src/MagicEden/index.ts
+++ b/packages/web3-providers/src/MagicEden/index.ts
@@ -117,11 +117,11 @@ export class MagicEdenAPI implements NonFungibleTokenAPI.Provider<ChainId, Schem
                 chainId: ChainId.Mainnet,
                 type: TokenType.NonFungible,
                 schema: SchemaType.NonFungible,
-                tokenId: token.mintAddress,
+                tokenId: token?.title?.match(/\d+/)?.[0],
                 address: token.mintAddress,
                 metadata: {
                     chainId: ChainId.Mainnet,
-                    name: token.collectionName,
+                    name: token?.title,
                     symbol: '',
                     description: '',
                     imageURL: toImage(token.img),
@@ -137,11 +137,12 @@ export class MagicEdenAPI implements NonFungibleTokenAPI.Provider<ChainId, Schem
                 },
                 collection: {
                     chainId: ChainId.Mainnet,
-                    name: token.collectionName,
+                    name: token.collectionName ?? token?.collectionTittle,
                     slug: '',
                     description: '',
                     iconURL: '',
                     verified: false,
+                    address: token.mintAddress,
                 },
             }
         })

From 3e7fae7f620b91c3e7b53977cee1f7e04400a84c Mon Sep 17 00:00:00 2001
From: Randolph <840094513@qq.com>
Date: Tue, 14 Jun 2022 11:05:15 +0800
Subject: [PATCH 2/7] fix: change magic eden handle function

---
 packages/web3-providers/src/MagicEden/index.ts | 4 ++--
 packages/web3-providers/src/MagicEden/types.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/web3-providers/src/MagicEden/index.ts b/packages/web3-providers/src/MagicEden/index.ts
index 1ffbfe369352..55ebb5d615c2 100644
--- a/packages/web3-providers/src/MagicEden/index.ts
+++ b/packages/web3-providers/src/MagicEden/index.ts
@@ -117,7 +117,7 @@ export class MagicEdenAPI implements NonFungibleTokenAPI.Provider<ChainId, Schem
                 chainId: ChainId.Mainnet,
                 type: TokenType.NonFungible,
                 schema: SchemaType.NonFungible,
-                tokenId: token?.title?.match(/\d+/)?.[0],
+                tokenId: token?.title?.match(/\d+/)?.[0] ?? '',
                 address: token.mintAddress,
                 metadata: {
                     chainId: ChainId.Mainnet,
@@ -137,7 +137,7 @@ export class MagicEdenAPI implements NonFungibleTokenAPI.Provider<ChainId, Schem
                 },
                 collection: {
                     chainId: ChainId.Mainnet,
-                    name: token.collectionName ?? token?.collectionTittle,
+                    name: token.collectionName ?? token?.collectionTitle,
                     slug: '',
                     description: '',
                     iconURL: '',
diff --git a/packages/web3-providers/src/MagicEden/types.ts b/packages/web3-providers/src/MagicEden/types.ts
index 7eb1dafd2548..8bc00c66e7cf 100644
--- a/packages/web3-providers/src/MagicEden/types.ts
+++ b/packages/web3-providers/src/MagicEden/types.ts
@@ -195,7 +195,7 @@ export interface MagicEdenNFT {
     price: number
     owner: string
     collectionName: string
-    collectionTittle: string
+    collectionTitle: string
     img: string
     title: string
     content: string

From b9c7fa330854a7f14f6aef37f600f4440ee590ff Mon Sep 17 00:00:00 2001
From: Randolph <840094513@qq.com>
Date: Tue, 14 Jun 2022 12:14:02 +0800
Subject: [PATCH 3/7] fix: opensea response handle function

---
 packages/web3-providers/src/opensea/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web3-providers/src/opensea/index.ts b/packages/web3-providers/src/opensea/index.ts
index cfbaccfce5f1..fd4f5ac70e7f 100644
--- a/packages/web3-providers/src/opensea/index.ts
+++ b/packages/web3-providers/src/opensea/index.ts
@@ -117,7 +117,7 @@ function createNFTAsset(chainId: ChainId, asset: OpenSeaResponse): NonFungibleAs
         (x) => x.address.toLowerCase(),
     )
     const offerTokens = uniqBy(
-        asset.collection.payment_tokens.map((x) => createTokenDetailed(chainId, x)),
+        asset.collection?.payment_tokens?.map((x) => createTokenDetailed(chainId, x)),
         (x) => x.address.toLowerCase(),
     )
     return {

From b126790225a73ed835d42e59fa92117d8cfb8e9d Mon Sep 17 00:00:00 2001
From: Randolph <840094513@qq.com>
Date: Tue, 14 Jun 2022 12:17:22 +0800
Subject: [PATCH 4/7] fix: magic eden tokenid from token title

---
 packages/web3-providers/src/MagicEden/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web3-providers/src/MagicEden/index.ts b/packages/web3-providers/src/MagicEden/index.ts
index 55ebb5d615c2..6c0f69fe199a 100644
--- a/packages/web3-providers/src/MagicEden/index.ts
+++ b/packages/web3-providers/src/MagicEden/index.ts
@@ -117,7 +117,7 @@ export class MagicEdenAPI implements NonFungibleTokenAPI.Provider<ChainId, Schem
                 chainId: ChainId.Mainnet,
                 type: TokenType.NonFungible,
                 schema: SchemaType.NonFungible,
-                tokenId: token?.title?.match(/\d+/)?.[0] ?? '',
+                tokenId: token?.title?.match(/#\d+/)?.[0]?.replace('#', '') ?? '',
                 address: token.mintAddress,
                 metadata: {
                     chainId: ChainId.Mainnet,

From a56fd9c0c2407a043062f1e4bdc8531ae57737e0 Mon Sep 17 00:00:00 2001
From: Randolph <840094513@qq.com>
Date: Tue, 14 Jun 2022 13:47:11 +0800
Subject: [PATCH 5/7] fix: nft list from alchemy will not display collection
 filter

---
 .../CollectibleList/index.tsx                 | 69 ++++++++++---------
 packages/web3-providers/src/alchemy/index.ts  |  2 +-
 2 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx b/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx
index 10a297fbec04..795849b513c9 100644
--- a/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx
+++ b/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx
@@ -265,6 +265,8 @@ export function CollectionList({
             .filter(Boolean) as Array<NonFungibleTokenCollection<Web3Helper.ChainIdAll>>
     }, [allCollectibles.length])
 
+    const isFromAlchemy = collections?.findIndex((collection) => collection?.name?.length > 0) === -1
+
     if (!allCollectibles.length && !done && !error && account) return <LoadingSkeleton />
 
     if (!allCollectibles.length && error && account) return <RetryHint retry={nextPage} />
@@ -362,39 +364,42 @@ export function CollectionList({
                         {!done && <LoadingBase />}
                     </ElementAnchor>
                 </Box>
-                <Box>
-                    <Box
-                        display="flex"
-                        alignItems="center"
-                        justifyContent="center"
-                        sx={{ marginTop: '8px', marginBottom: '12px', minWidth: 30, maxHeight: 24 }}>
-                        <AllNetworkButton
-                            className={classes.networkSelected}
-                            onClick={() => setSelectedCollection('all')}>
-                            ALL
-                        </AllNetworkButton>
+                {!isFromAlchemy && (
+                    <Box>
+                        <Box
+                            display="flex"
+                            alignItems="center"
+                            justifyContent="center"
+                            sx={{ marginTop: '8px', marginBottom: '12px', minWidth: 30, maxHeight: 24 }}>
+                            <AllNetworkButton
+                                className={classes.networkSelected}
+                                onClick={() => setSelectedCollection('all')}>
+                                ALL
+                            </AllNetworkButton>
+                        </Box>
+                        {collections?.[0]?.name &&
+                            collections.map((x, i) => {
+                                return (
+                                    <Box
+                                        display="flex"
+                                        key={i}
+                                        alignItems="center"
+                                        justifyContent="center"
+                                        sx={{ marginTop: '8px', marginBottom: '12px', minWidth: 30, maxHeight: 24 }}>
+                                        <CollectionIcon
+                                            selectedCollection={
+                                                selectedCollection === 'all' ? undefined : selectedCollection?.address
+                                            }
+                                            collection={x}
+                                            onClick={() => {
+                                                setSelectedCollection(x)
+                                            }}
+                                        />
+                                    </Box>
+                                )
+                            })}
                     </Box>
-                    {collections.map((x, i) => {
-                        return (
-                            <Box
-                                display="flex"
-                                key={i}
-                                alignItems="center"
-                                justifyContent="center"
-                                sx={{ marginTop: '8px', marginBottom: '12px', minWidth: 30, maxHeight: 24 }}>
-                                <CollectionIcon
-                                    selectedCollection={
-                                        selectedCollection === 'all' ? undefined : selectedCollection?.address
-                                    }
-                                    collection={x}
-                                    onClick={() => {
-                                        setSelectedCollection(x)
-                                    }}
-                                />
-                            </Box>
-                        )
-                    })}
-                </Box>
+                )}
             </Stack>
         </Box>
     )
diff --git a/packages/web3-providers/src/alchemy/index.ts b/packages/web3-providers/src/alchemy/index.ts
index 4a5d6b0a17a5..13fd6e9b0614 100644
--- a/packages/web3-providers/src/alchemy/index.ts
+++ b/packages/web3-providers/src/alchemy/index.ts
@@ -185,7 +185,7 @@ function createNftToken_EVM(
         collection: {
             address: contractAddress,
             chainId,
-            name: resolveCollectionName(asset),
+            name: '',
             slug: '',
             description: asset.description,
         },

From 4ebaf1fb1d48448328206eaeb0cac0037b4e40b9 Mon Sep 17 00:00:00 2001
From: Randolph <840094513@qq.com>
Date: Tue, 14 Jun 2022 14:02:40 +0800
Subject: [PATCH 6/7] feat: collections without name will not display in nft
 page

---
 .../DashboardComponents/CollectibleList/index.tsx        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx b/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx
index 795849b513c9..4da0386f997f 100644
--- a/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx
+++ b/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx
@@ -377,9 +377,9 @@ export function CollectionList({
                                 ALL
                             </AllNetworkButton>
                         </Box>
-                        {collections?.[0]?.name &&
-                            collections.map((x, i) => {
-                                return (
+                        {collections.map((x, i) => {
+                            return (
+                                x?.name?.length > 0 && (
                                     <Box
                                         display="flex"
                                         key={i}
@@ -397,7 +397,8 @@ export function CollectionList({
                                         />
                                     </Box>
                                 )
-                            })}
+                            )
+                        })}
                     </Box>
                 )}
             </Stack>

From ccd46dc568d7b58f3593c03d7d329ffca0d0e0c5 Mon Sep 17 00:00:00 2001
From: Randolph <840094513@qq.com>
Date: Tue, 14 Jun 2022 14:34:43 +0800
Subject: [PATCH 7/7] feat: add address to nft collection

---
 packages/web3-providers/src/opensea/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/web3-providers/src/opensea/index.ts b/packages/web3-providers/src/opensea/index.ts
index fd4f5ac70e7f..6b7efffef852 100644
--- a/packages/web3-providers/src/opensea/index.ts
+++ b/packages/web3-providers/src/opensea/index.ts
@@ -92,6 +92,7 @@ function createNFTToken(chainId: ChainId, asset: OpenSeaResponse): NonFungibleTo
             owner: asset.owner.address,
         },
         collection: {
+            address: asset.token_address ?? asset.asset_contract.address,
             chainId,
             name: asset.collection.name,
             slug: asset.collection.slug,