Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/good-regions-dig.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"thirdweb": patch
---

filter out null-ish values from `ERC721.getNFTs()` and `ERC1155.getNFTs()` arrays
12 changes: 9 additions & 3 deletions packages/thirdweb/src/extensions/erc1155/read/getNFTs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,18 @@
const { useIndexer = true } = options;
if (useIndexer) {
try {
return await getNFTsFromInsight(options);
return await getNFTsFromInsight(options).then((nfts) =>
nfts.filter((nft) => nft?.id !== undefined && nft?.id !== null),

Check warning on line 56 in packages/thirdweb/src/extensions/erc1155/read/getNFTs.ts

View check run for this annotation

Codecov / codecov/patch

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

Added line #L56 was not covered by tests
);
} catch {
return await getNFTsFromRPC(options);
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),
);

Check warning on line 66 in packages/thirdweb/src/extensions/erc1155/read/getNFTs.ts

View check run for this annotation

Codecov / codecov/patch

packages/thirdweb/src/extensions/erc1155/read/getNFTs.ts#L64-L66

Added lines #L64 - L66 were not covered by tests
}

async function getNFTsFromInsight(
Expand Down
12 changes: 9 additions & 3 deletions packages/thirdweb/src/extensions/erc721/read/getNFTs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,18 @@ export async function getNFTs(
const { useIndexer = true } = options;
if (useIndexer) {
try {
return await getNFTsFromInsight(options);
return await getNFTsFromInsight(options).then((nfts) =>
nfts.filter((nft) => nft?.id !== undefined && nft?.id !== null),
);
} catch {
return await getNFTsFromRPC(options);
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),
);
}

/**
Expand Down
Loading