Handle null metadata in ERC721 and ERC1155 getNFT functions

Author: jnsdls

packages/thirdweb/src/extensions/erc1155/read/getNFT.ts

@@ -83,11 +83,23 @@ async function getNFTFromRPC(
       client: options.contract.client,
       tokenId: options.tokenId,
       tokenUri,
-    }).catch(() => ({
-      id: options.tokenId,
-      type: "ERC1155",
-      uri: tokenUri,
-    })),
+    })
+      .then((metadata) => {
+        // if the metadata is null-ish, return a default metadata object
+        if (!metadata) {
+          return {
+            id: options.tokenId,
+            type: "ERC1155",
+            uri: tokenUri,
+          };
+        }
+        return metadata;
+      })
+      .catch(() => ({
+        id: options.tokenId,
+        type: "ERC1155",
+        uri: tokenUri,
+      })),
     {
       chainId: options.contract.chain.id,
       owner: null,

packages/thirdweb/src/extensions/erc1155/read/getNFTs.ts

@@ -52,18 +52,12 @@ export async function getNFTs(
   const { useIndexer = true } = options;
   if (useIndexer) {
     try {
-      return await getNFTsFromInsight(options).then((nfts) =>
-        nfts.filter((nft) => nft?.id !== undefined && nft?.id !== null),
-      );
+      return await getNFTsFromInsight(options);
     } catch {
-      return await getNFTsFromRPC(options).then((nfts) =>
-        nfts.filter((nft) => nft?.id !== undefined && nft?.id !== null),
-      );
+      return await getNFTsFromRPC(options);
     }
   }
-  return await getNFTsFromRPC(options).then((nfts) =>
-    nfts.filter((nft) => nft?.id !== undefined && nft?.id !== null),
-  );
+  return await getNFTsFromRPC(options);
 }
 
 async function getNFTsFromInsight(

packages/thirdweb/src/extensions/erc721/read/getNFT.ts

@@ -139,11 +139,23 @@ async function getNFTFromRPC(
       client: options.contract.client,
       tokenId,
       tokenUri: uri,
-    }).catch(() => ({
-      id: tokenId,
-      type: "ERC721",
-      uri,
-    })),
+    })
+      .then((metadata) => {
+        // if the metadata is null-ish, return a default metadata object
+        if (!metadata) {
+          return {
+            id: tokenId,
+            type: "ERC721",
+            uri,
+          };
+        }
+        return metadata;
+      })
+      .catch(() => ({
+        id: tokenId,
+        type: "ERC721",
+        uri,
+      })),
     {
       chainId: options.contract.chain.id,
       owner,

packages/thirdweb/src/extensions/erc721/read/getNFTs.ts

@@ -71,18 +71,12 @@ export async function getNFTs(
   const { useIndexer = true } = options;
   if (useIndexer) {
     try {
-      return await getNFTsFromInsight(options).then((nfts) =>
-        nfts.filter((nft) => nft?.id !== undefined && nft?.id !== null),
-      );
+      return await getNFTsFromInsight(options);
     } catch {
-      return await getNFTsFromRPC(options).then((nfts) =>
-        nfts.filter((nft) => nft?.id !== undefined && nft?.id !== null),
-      );
+      return await getNFTsFromRPC(options);
     }
   }
-  return await getNFTsFromRPC(options).then((nfts) =>
-    nfts.filter((nft) => nft?.id !== undefined && nft?.id !== null),
-  );
+  return await getNFTsFromRPC(options);
 }
 
 /**