more optimizations

Author: joaquim-verges

packages/thirdweb/src/insight/get-tokens.ts

@@ -1,12 +1,12 @@
 import type {
   GetV1TokensData,
-  GetV1TokensErc20ByOwnerAddressResponse,
+  GetV1TokensResponse,
 } from "@thirdweb-dev/insight";
 import type { Chain } from "../chains/types.js";
 import type { ThirdwebClient } from "../client/client.js";
 import type { GetWalletBalanceResult } from "../wallets/utils/getWalletBalance.js";
 
-type OwnedToken = GetV1TokensErc20ByOwnerAddressResponse["data"][number];
+type OwnedToken = GetV1TokensResponse["data"][number];
 
 /**
  * Get ERC20 tokens owned by an address
@@ -53,6 +53,7 @@ export async function getOwnedTokens(args: {
     owner_address: ownerAddress,
     chain_id: chains.map((chain) => chain.id),
     include_native: "true",
+    include_spam: "false",
     metadata: "true",
     limit: 50,
   };

packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/fetchBalancesForWallet.tsx

@@ -141,14 +141,31 @@ async function fetchBalancesForWallet({
   const insightChunks = chunkChains(insightEnabledChains);
   await Promise.all(
     insightChunks.map(async (chunk) => {
-      const owned = await getOwnedTokens({
-        ownerAddress: account.address,
-        chains: chunk,
-        client,
-        queryOptions: {
-          limit: 100,
-        },
-      });
+      let owned: GetWalletBalanceResult[] = [];
+      let page = 0;
+      const limit = 100;
+
+      while (true) {
+        const batch = await getOwnedTokens({
+          ownerAddress: account.address,
+          chains: chunk,
+          client,
+          queryOptions: {
+            limit,
+            page,
+          },
+        }).catch((err) => {
+          console.error("error fetching balances from insight", err);
+          return [];
+        });
+
+        if (batch.length === 0) {
+          break;
+        }
+
+        owned = [...owned, ...batch];
+        page += 1;
+      }
 
       for (const b of owned) {
         const matching = sourceSupportedTokens[b.chainId]?.find(
@@ -190,6 +207,10 @@ async function fetchBalancesForWallet({
     const chainId = Number(chainIdStr);
     const chain = getCachedChain(chainId);
 
+    if (insightEnabledChains.some((c) => c.id === chainId)) {
+      continue;
+    }
+
     for (const token of tokens) {
       const isNative = isNativeToken(token);
       const isAlreadyFetched = balances.some(
@@ -225,7 +246,7 @@ async function fetchBalancesForWallet({
             }
           } catch (err) {
             console.warn(
-              `Failed to fetch balance for ${token.symbol} on chain ${chainId}`,
+              `Failed to fetch RPC balance for ${token.symbol} on chain ${chainId}`,
               err,
             );
           }