thirdweb 5.99.1-nightly-1985de89aae5196233789221ad06f1b6554d27fc-20250513000404 → 5.99.1-nightly-fb4c190eb3fa2da13da668281adf3ae45ed457a2-20250514000358

package/src/extensions/erc20/write/mintTo.ts

@@ -27,6 +27,7 @@ export type MintToParams = Prettify<
 
 /**
  * Mints a specified amount of tokens to a given address.
+ * This method is only available on the `TokenERC20` contract.
  * @param options - The options for minting tokens.
  * @returns A prepared transaction object.
  * @extension ERC20

package/src/extensions/erc20/write/sigMint.ts

@@ -17,6 +17,7 @@ import {
 
 /**
  * Mints a new ERC20 token with the given minter signature
+ * This method is only available on the `TokenERC20` contract.
  * @param options - The transaction options.
  * @extension ERC20
  * @example

package/src/extensions/erc721/drops/read/canClaim.ts

@@ -18,6 +18,8 @@ export type CanClaimResult = {
 /**
  * Check if a user can claim a drop.
  *
+ * This method is only available on the `DropERC721` contract.
+ *
  * @param options - The options for the transaction.
  * @returns Whether the user can claim the drop.
  *

package/src/extensions/erc721/drops/read/getActiveClaimCondition.ts

@@ -5,6 +5,8 @@ import * as ById from "../../__generated__/IDrop/read/getClaimConditionById.js";
 
 /**
  * Retrieves the active claim condition.
+ * This method is only available on the `DropERC721` contract.
+ *
  * @param options - The transaction options.
  * @returns A promise that resolves to the active claim condition.
  * @throws An error if the claim condition is unsupported.
@@ -28,6 +30,8 @@ export async function getActiveClaimCondition(
 
 /**
  * Checks if the `getActiveClaimCondition` method is supported by the given contract.
+ * This method is only available on the `DropERC721` contract.
+ *
  * @param availableSelectors An array of 4byte function selectors of the contract. You can get this in various ways, such as using "whatsabi" or if you have the ABI of the contract available you can use it to generate the selectors.
  * @returns A boolean indicating if the `getActiveClaimCondition` method is supported.
  * @extension ERC721

package/src/extensions/erc721/drops/read/getClaimConditions.ts

@@ -5,6 +5,9 @@ import * as MultiById from "../../__generated__/IDrop/read/getClaimConditionById
 
 /**
  * Retrieves all claim conditions.
+ *
+ * This method is only available on the `DropERC721` contract.
+ *
  * @param options - The transaction options.
  * @returns A promise that resolves to all claim conditions.
  * @throws An error if the claim conditions are unsupported by the contract.

package/src/extensions/erc721/drops/write/claimTo.ts

@@ -22,6 +22,7 @@ export type ClaimToParams = {
 
 /**
  * Claim ERC721 NFTs to a specified address
+ * This method is only available on the `DropERC721` contract.
  * @param options - The options for the transaction
  * @extension ERC721
  * @example

package/src/extensions/erc721/drops/write/claimToBatch.ts

@@ -22,6 +22,7 @@ export type ClaimToBatchParams = WithOverrides<{
  * This extension batches multiple `claimTo` extensions into one single multicall.
  * Keep in mind that there is a limit of how many NFTs you can claim per transaction.
  * This limit varies depends on the network that you are transacting on.
+ * This method is only available on the `DropERC721` contract.
  *
  * You are recommended to experiment with the number to figure out the best number for your chain of choice.
  * @extension ERC721

package/src/extensions/erc721/drops/write/resetClaimEligibility.ts

@@ -12,6 +12,7 @@ import {
 
 /**
  * Reset the claim eligibility for all users.
+ * This method is only available on the `DropERC721` contract.
  * @param options
  * @returns the prepared transaction
  * @extension ERC721

package/src/extensions/erc721/drops/write/setClaimConditions.ts

@@ -21,6 +21,7 @@ export type SetClaimConditionsParams = {
 
 /**
  * Set the claim conditions for a ERC721 drop
+ * This method is only available on the `DropERC721` contract.
  * @param options
  * @returns the prepared transaction
  * @extension ERC721

package/src/extensions/erc721/lazyMinting/write/createDelayedRevealBatch.ts

@@ -32,6 +32,7 @@ export type CreateDelayedRevealBatchParams = {
 
 /**
  * Creates a batch of encrypted NFTs that can be revealed at a later time.
+ * This method is only available on the `DropERC721` contract.
  *
  * @param options {CreateDelayedRevealBatchParams} - The delayed reveal options.
  * @param options.placeholderMetadata {@link NFTInput} - The placeholder metadata for the batch.

package/src/extensions/erc721/lazyMinting/write/reveal.ts

@@ -14,7 +14,7 @@ export type RevealParams = {
 
 /**
  * Reveals a previously lazy minted batch of NFTs.
- *
+ * This method is only available on the `DropERC721` contract.
  * @param options {RevealParams} - The reveal parameters.
  * @param options.batchId {number} - The ID of the batch to reveal. Get this by calling `getBatchesToReveal`. {@see getBatchesToReveal}
  * @param options.password {string} - The password for the reveal, set when the batch was created. {@see createDelayedRevealBatch}

package/src/extensions/erc721/write/lazyMint.ts

@@ -19,6 +19,8 @@ export type LazyMintParams = {
 
 /**
  * Lazily mints ERC721 tokens.
+ * This method is only available on the `DropERC721` contract.
+ *
  * @param options - The options for the lazy minting process.
  * @returns A promise that resolves to the prepared contract call.
  * @extension ERC721

package/src/extensions/erc721/write/mintTo.ts

@@ -17,6 +17,8 @@ export type MintToParams = WithOverrides<{
 
 /**
  * Mints a new ERC721 token and assigns it to the specified address.
+ * This method is only available on the `TokenERC721` contract.
+ *
  * If the `nft` parameter is a string, it will be used as the token URI.
  * If the `nft` parameter is a file, it will be uploaded to the storage server and the resulting URI will be used as the token URI.
  * @param options - The transaction options.

package/src/extensions/erc721/write/sigMint.ts

@@ -22,6 +22,8 @@ import {
 
 /**
  * Mints a new ERC721 token with the given minter signature
+ * This method is only available on the `TokenERC721` contract.
+ *
  * @param options - The transaction options.
  * @example
  * ```ts

package/src/extensions/erc721/write/updateTokenURI.ts

@@ -23,6 +23,7 @@ export type UpdateTokenURIParams = {
  * upload that content to IPFS and pass the IPFS URI (of said `NFTInput`) to the underlying `setTokenURI` method.
  *
  * This extension does not validate the NFTInput so make sure you are passing the proper content that you want to update.
+ * This method is only available on the `TokenERC721` contract.
  *
  * @extension ERC721
  * @returns the prepared transaction from `setTokenURI`

package/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx

@@ -63,6 +63,7 @@ import { SwapFlow } from "./swap/SwapFlow.js";
 import { SwapScreenContent } from "./swap/SwapScreenContent.js";
 import { TokenSelectorScreen } from "./swap/TokenSelectorScreen.js";
 import { TransferFlow } from "./swap/TransferFlow.js";
+import { useWalletsAndBalances } from "./swap/fetchBalancesForWallet.js";
 import {
   type SupportedChainAndTokens,
   useBuySupportedDestinations,
@@ -218,6 +219,15 @@ function BuyScreenContent(props: BuyScreenContentProps) {
     );
   }, [props.supportedTokens, supportedSourcesQuery.data, payOptions]);
 
+  // preload wallets and balances
+  useWalletsAndBalances({
+    client: props.client,
+    sourceSupportedTokens: sourceSupportedTokens || [],
+    toChain: toChain,
+    toToken: toToken,
+    mode: payOptions.mode,
+  });
+
   const { fromChain, setFromChain, fromToken, setFromToken } =
     useFromTokenSelectionStates({
       payOptions,

package/src/react/web/ui/ConnectWallet/screens/Buy/swap/TokenSelectorScreen.tsx

@@ -4,7 +4,6 @@ import {
   ChevronRightIcon,
   Cross2Icon,
 } from "@radix-ui/react-icons";
-import { useQuery } from "@tanstack/react-query";
 import { trackPayEvent } from "../../../../../../../analytics/track/pay.js";
 import type { Chain } from "../../../../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../../../../client/client.js";
@@ -43,14 +42,9 @@ import { FiatValue } from "./FiatValue.js";
 import { WalletRow } from "./WalletRow.js";
 import {
   type TokenBalance,
-  fetchBalancesForWallet,
+  useWalletsAndBalances,
 } from "./fetchBalancesForWallet.js";
 
-type WalletKey = {
-  id: WalletId;
-  address: string;
-};
-
 export function TokenSelectorScreen(props: {
   client: ThirdwebClient;
   sourceTokens: SupportedTokens | undefined;
@@ -71,46 +65,12 @@ export function TokenSelectorScreen(props: {
   const chainInfo = useChainMetadata(props.toChain);
   const theme = useCustomTheme();
 
-  const walletsAndBalances = useQuery({
-    queryKey: [
-      "wallets-and-balances",
-      props.sourceSupportedTokens,
-      props.toChain.id,
-      props.toToken,
-      props.tokenAmount,
-      props.mode,
-      activeAccount?.address,
-      connectedWallets.map((w) => w.getAccount()?.address),
-    ],
-    enabled: !!props.sourceSupportedTokens && !!chainInfo.data,
-    queryFn: async () => {
-      const entries = await Promise.all(
-        connectedWallets.map(async (wallet) => {
-          const balances = await fetchBalancesForWallet({
-            wallet,
-            accountAddress: activeAccount?.address,
-            sourceSupportedTokens: props.sourceSupportedTokens || [],
-            toChain: props.toChain,
-            toToken: props.toToken,
-            tokenAmount: props.tokenAmount,
-            mode: props.mode,
-            client: props.client,
-          });
-          return [
-            {
-              id: wallet.id,
-              address: wallet.getAccount()?.address || "",
-            } as WalletKey,
-            balances,
-          ] as const;
-        }),
-      );
-      const map = new Map<WalletKey, TokenBalance[]>();
-      for (const entry of entries) {
-        map.set(entry[0], entry[1]);
-      }
-      return map;
-    },
+  const walletsAndBalances = useWalletsAndBalances({
+    client: props.client,
+    sourceSupportedTokens: props.sourceSupportedTokens || [],
+    toChain: props.toChain,
+    toToken: props.toToken,
+    mode: props.mode,
   });
 
   if (

package/src/react/web/ui/ConnectWallet/screens/Buy/swap/{fetchBalancesForWallet.ts → fetchBalancesForWallet.tsx}

@@ -1,3 +1,4 @@
+import { useQuery } from "@tanstack/react-query";
 import type { Chain } from "../../../../../../../chains/types.js";
 import { getCachedChain } from "../../../../../../../chains/utils.js";
 import type { ThirdwebClient } from "../../../../../../../client/client.js";
@@ -9,7 +10,11 @@ import {
   type GetWalletBalanceResult,
   getWalletBalance,
 } from "../../../../../../../wallets/utils/getWalletBalance.js";
+import type { WalletId } from "../../../../../../../wallets/wallet-types.js";
 import type { PayUIOptions } from "../../../../../../core/hooks/connection/ConnectButtonProps.js";
+import { useChainMetadata } from "../../../../../../core/hooks/others/useChainQuery.js";
+import { useActiveAccount } from "../../../../../../core/hooks/wallets/useActiveAccount.js";
+import { useConnectedWallets } from "../../../../../../core/hooks/wallets/useConnectedWallets.js";
 import type {
   SupportedTokens,
   TokenInfo,
@@ -32,7 +37,6 @@ type FetchBalancesParams = {
   sourceSupportedTokens: SupportedTokens;
   toChain: Chain;
   toToken: ERC20OrNativeToken;
-  tokenAmount: string;
   mode: PayUIOptions["mode"];
   client: ThirdwebClient;
 };
@@ -43,13 +47,70 @@ export type TokenBalance = {
   token: TokenInfo;
 };
 
-export async function fetchBalancesForWallet({
+type WalletKey = {
+  id: WalletId;
+  address: string;
+};
+
+export function useWalletsAndBalances(props: {
+  sourceSupportedTokens: SupportedTokens;
+  toChain: Chain;
+  toToken: ERC20OrNativeToken;
+  mode: PayUIOptions["mode"];
+  client: ThirdwebClient;
+}) {
+  const activeAccount = useActiveAccount();
+  const connectedWallets = useConnectedWallets();
+  const chainInfo = useChainMetadata(props.toChain);
+
+  return useQuery({
+    queryKey: [
+      "wallets-and-balances",
+      props.sourceSupportedTokens,
+      props.toChain.id,
+      props.toToken,
+      props.mode,
+      activeAccount?.address,
+      connectedWallets.map((w) => w.getAccount()?.address),
+    ],
+    enabled:
+      !!props.sourceSupportedTokens && !!chainInfo.data && !!activeAccount,
+    queryFn: async () => {
+      const entries = await Promise.all(
+        connectedWallets.map(async (wallet) => {
+          const balances = await fetchBalancesForWallet({
+            wallet,
+            accountAddress: activeAccount?.address,
+            sourceSupportedTokens: props.sourceSupportedTokens || [],
+            toChain: props.toChain,
+            toToken: props.toToken,
+            mode: props.mode,
+            client: props.client,
+          });
+          return [
+            {
+              id: wallet.id,
+              address: wallet.getAccount()?.address || "",
+            } as WalletKey,
+            balances,
+          ] as const;
+        }),
+      );
+      const map = new Map<WalletKey, TokenBalance[]>();
+      for (const entry of entries) {
+        map.set(entry[0], entry[1]);
+      }
+      return map;
+    },
+  });
+}
+
+async function fetchBalancesForWallet({
   wallet,
   accountAddress,
   sourceSupportedTokens,
   toChain,
   toToken,
-  tokenAmount,
   mode,
   client,
 }: FetchBalancesParams): Promise<TokenBalance[]> {
@@ -133,7 +194,7 @@ export async function fetchBalancesForWallet({
           b.chain.id === chainId &&
           b.token.address.toLowerCase() === token.address.toLowerCase(),
       );
-      if (!isNative && !isAlreadyFetched) {
+      if (isAlreadyFetched && !isNative) {
         // ERC20 on insight-enabled chain already handled by insight call
         continue;
       }
@@ -148,11 +209,12 @@ export async function fetchBalancesForWallet({
             });
 
             const include =
-              token.address === destinationToken.address &&
+              token.address.toLowerCase() ===
+                destinationToken.address.toLowerCase() &&
               chain.id === toChain.id
-                ? mode === "fund_wallet" && account.address === accountAddress
-                  ? false
-                  : Number(balance.displayValue) > Number(tokenAmount)
+                ? !(
+                    mode === "fund_wallet" && account.address === accountAddress
+                  )
                 : balance.value > 0n;
 
             if (include) {

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.99.1-nightly-1985de89aae5196233789221ad06f1b6554d27fc-20250513000404";
+export const version = "5.99.1-nightly-fb4c190eb3fa2da13da668281adf3ae45ed457a2-20250514000358";