bugfix: 🐛 Spam filtering errors unhandled

LedgerHQ · Nov 19, 2024 · a5c3a1b · a5c3a1b
1 parent 416a171
commit a5c3a1b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/.changeset/silly-seals-argue.md b/.changeset/silly-seals-argue.md
@@ -0,0 +1,7 @@
+---
+"ledger-live-desktop": minor
+"live-mobile": minor
+"@ledgerhq/live-nft-react": minor
+---
+
+Fix undefined join on Spam filter
diff --git a/apps/ledger-live-desktop/src/renderer/hooks/nfts/useSyncNFTsWithAccounts.ts b/apps/ledger-live-desktop/src/renderer/hooks/nfts/useSyncNFTsWithAccounts.ts
@@ -66,12 +66,12 @@ export function useSyncNFTsWithAccounts() {
   const [, setCurrentIndex] = useState(0);
 
   const { refetch } = useCheckNftAccount({
-    addresses: groupToFetch.join(","),
+    addresses: groupToFetch?.join(",") || "",
     nftsOwned,
     chains: SUPPORTED_NFT_CURRENCIES,
     threshold,
     action: hideSpamCollection,
-    enabled,
+    enabled: enabled && groupToFetch.length > 0,
   });
 
   // Refetch with new last group when addressGroups length changes

diff --git a/...ktop/src/renderer/screens/settings/sections/Developer/SimpleHashTools/SpamScore/index.tsx b/...ktop/src/renderer/screens/settings/sections/Developer/SimpleHashTools/SpamScore/index.tsx
@@ -72,7 +72,7 @@ export default function SpamScore(props: HookResult) {
       return (error as Error).message;
     };
 
-    const getScore = (data?: SimpleHashResponse) => data?.nfts[0].collection.spam_score;
+    const getScore = (data?: SimpleHashResponse) => data?.nfts[0]?.collection.spam_score || 100;
 
     const text = checkSpamScore.isError
       ? getErrorText(checkSpamScore.error)

diff --git a/apps/ledger-live-mobile/src/hooks/nfts/useSyncNFTsWithAccounts.ts b/apps/ledger-live-mobile/src/hooks/nfts/useSyncNFTsWithAccounts.ts
@@ -66,12 +66,12 @@ export function useSyncNFTsWithAccounts() {
   const [, setCurrentIndex] = useState(0);
 
   const { refetch } = useCheckNftAccount({
-    addresses: groupToFetch.join(","),
+    addresses: groupToFetch?.join(",") || "",
     nftsOwned,
     chains: SUPPORTED_NFT_CURRENCIES,
     threshold,
     action: hideSpamCollection,
-    enabled,
+    enabled: enabled && groupToFetch.length > 0,
   });
 
   // Refetch with new last group when addressGroups length changes

diff --git a/libs/live-nft-react/src/hooks/useCheckNftAccount.ts b/libs/live-nft-react/src/hooks/useCheckNftAccount.ts
@@ -65,7 +65,7 @@ export function useCheckNftAccount({
 
     const processingNFTs = queryResult.data?.pages.flatMap(page => page.nfts);
 
-    if (!queryResult.hasNextPage && processingNFTs) {
+    if (!queryResult.hasNextPage && processingNFTs?.length) {
       for (const nft of processingNFTs) {
         const hash = hashProtoNFT(nft.contract_address, nft.token_id, nft.chain);
         const existing = nftsWithProperties.get(hash);
@@ -76,14 +76,15 @@ export function useCheckNftAccount({
 
       if (action) {
         const spams = nftsOwned.filter(nft => !nfts.some(ownedNft => ownedNft.id === nft.id));
-
         const collections = nftsByCollections(spams);
 
-        Object.entries(collections).map(([contract, nfts]: [string, ProtoNFT[]]) => {
-          const { accountId } = decodeNftId(nfts[0].id);
-          const collection = `${accountId}|${contract}`;
-          action(collection);
-        });
+        if (spams.length > 0) {
+          Object.entries(collections).map(([contract, nfts]: [string, ProtoNFT[]]) => {
+            const { accountId } = decodeNftId(nfts[0].id);
+            const collection = `${accountId}|${contract}`;
+            action(collection);
+          });
+        }
       }
     }
     return { ...queryResult, nfts };