thirdweb 5.105.16 → 5.105.17-nightly-0f38a1287af527da53e7948b54e0dfd4b738fa69-20250718000405

package/src/react/core/hooks/usePaymentMethods.ts

@@ -10,6 +10,10 @@ import type { ThirdwebClient } from "../../../client/client.js";
 import { getOwnedTokens } from "../../../insight/get-tokens.js";
 import { toTokens } from "../../../utils/units.js";
 import type { Wallet } from "../../../wallets/interfaces/wallet.js";
+import {
+  type GetWalletBalanceResult,
+  getWalletBalance,
+} from "../../../wallets/utils/getWalletBalance.js";
 import type { PaymentMethod } from "../machines/paymentMachine.js";
 import { useActiveWallet } from "./wallets/useActiveWallet.js";
 
@@ -80,16 +84,42 @@ export function usePaymentMethods(options: {
       const limit = 500;
 
       while (true) {
-        const batch = await getOwnedTokens({
-          chains: insightEnabledChains.map((c) => getCachedChain(c.chainId)),
-          client,
-          ownerAddress: wallet.getAccount()?.address || "",
-          queryOptions: {
-            limit,
-            metadata: "false",
-            page,
-          },
-        });
+        let batch: GetWalletBalanceResult[];
+        try {
+          batch = await getOwnedTokens({
+            chains: insightEnabledChains.map((c) => getCachedChain(c.chainId)),
+            client,
+            ownerAddress: wallet.getAccount()?.address || "",
+            queryOptions: {
+              limit,
+              metadata: "false",
+              page,
+            },
+          });
+        } catch (error) {
+          // If the batch fails, fall back to getting native balance for each chain
+          console.warn(`Failed to get owned tokens for batch ${page}:`, error);
+
+          const chainsInBatch = insightEnabledChains.map((c) =>
+            getCachedChain(c.chainId),
+          );
+          const nativeBalances = await Promise.allSettled(
+            chainsInBatch.map(async (chain) => {
+              const balance = await getWalletBalance({
+                address: wallet.getAccount()?.address || "",
+                chain,
+                client,
+              });
+              return balance;
+            }),
+          );
+
+          // Transform successful native balances into the same format as getOwnedTokens results
+          batch = nativeBalances
+            .filter((result) => result.status === "fulfilled")
+            .map((result) => result.value)
+            .filter((balance) => balance.value > 0n);
+        }
 
         if (batch.length === 0) {
           break;
@@ -126,7 +156,9 @@ export function usePaymentMethods(options: {
 
       // Add destination token if included
       if (includeDestinationToken) {
-        const tokenKey = `${destinationToken.chainId}-${destinationToken.address.toLowerCase()}`;
+        const tokenKey = `${
+          destinationToken.chainId
+        }-${destinationToken.address.toLowerCase()}`;
         allValidOriginTokens.set(tokenKey, destinationToken);
       }
 
@@ -155,7 +187,9 @@ export function usePaymentMethods(options: {
               ) {
                 continue;
               }
-              const tokenKey = `${route.originToken.chainId}-${route.originToken.address.toLowerCase()}`;
+              const tokenKey = `${
+                route.originToken.chainId
+              }-${route.originToken.address.toLowerCase()}`;
               allValidOriginTokens.set(tokenKey, route.originToken);
             }
           } catch (error) {
@@ -169,7 +203,9 @@ export function usePaymentMethods(options: {
       const validOwnedTokens: OwnedTokenWithQuote[] = [];
 
       for (const ownedToken of allOwnedTokens) {
-        const tokenKey = `${ownedToken.originToken.chainId}-${ownedToken.originToken.address.toLowerCase()}`;
+        const tokenKey = `${
+          ownedToken.originToken.chainId
+        }-${ownedToken.originToken.address.toLowerCase()}`;
         const validOriginToken = allValidOriginTokens.get(tokenKey);
 
         if (validOriginToken) {

package/src/react/web/ui/Bridge/BuyWidget.tsx

@@ -312,7 +312,18 @@ export function BuyWidget(props: BuyWidgetProps) {
           props.client,
           NATIVE_TOKEN_ADDRESS,
           props.chain.id,
-        );
+        ).catch((err) => {
+          err.message.includes("not supported")
+            ? undefined
+            : Promise.reject(err);
+        });
+        if (!ETH) {
+          return {
+            chain: props.chain,
+            tokenAddress: props.tokenAddress || NATIVE_TOKEN_ADDRESS,
+            type: "unsupported_token",
+          };
+        }
         return {
           data: {
             destinationToken: ETH,

package/src/react/web/ui/Bridge/TransactionPayment.tsx

@@ -212,22 +212,28 @@ export function TransactionPayment({
       <Spacer y="md" />
 
       {/* Contract Info */}
-      <Container
-        flex="row"
-        style={{
-          alignItems: "center",
-          justifyContent: "space-between",
-        }}
-      >
-        <Text color="secondaryText" size="sm">
-          Contract
-        </Text>
-        <Text color="primaryText" size="sm">
-          {contractName}
-        </Text>
-      </Container>
-
-      <Spacer y="xs" />
+      {contractName !== "UnknownContract" &&
+        contractName !== undefined &&
+        contractName !== "Unknown Contract" && (
+          <>
+            <Container
+              flex="row"
+              style={{
+                alignItems: "center",
+                justifyContent: "space-between",
+              }}
+            >
+              <Text color="secondaryText" size="sm">
+                Contract
+              </Text>
+              <Text color="primaryText" size="sm">
+                {contractName}
+              </Text>
+            </Container>
+
+            <Spacer y="xs" />
+          </>
+        )}
 
       {/* Address */}
       <Container

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.105.16";
+export const version = "5.105.17-nightly-0f38a1287af527da53e7948b54e0dfd4b738fa69-20250718000405";