thirdweb 5.109.2-nightly-f2121e9519719ef809986c919acc5069b5b7ce74-20251022000400 → 5.110.1

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

@@ -167,6 +167,9 @@ export function FundWallet(props: FundWalletProps) {
   const actionLabel = isReceiverDifferentFromActiveWallet ? "Pay" : "Buy";
   const isMobile = useIsMobile();
 
+  // if no receiver address is set - wallet must be connected because the user's wallet is the receiver
+  const showConnectButton = !props.receiverAddress && !activeWalletInfo;
+
   return (
     <WithHeader
       client={props.client}
@@ -283,7 +286,20 @@ export function FundWallet(props: FundWalletProps) {
       )}
 
       {/* Continue Button */}
-      {activeWalletInfo ? (
+      {showConnectButton ? (
+        <ConnectButton
+          client={props.client}
+          connectButton={{
+            label: props.buttonLabel || actionLabel,
+            style: {
+              width: "100%",
+              borderRadius: radius.full,
+            },
+          }}
+          theme={theme}
+          {...props.connectOptions}
+        />
+      ) : (
         <Button
           disabled={!receiver}
           fullWidth
@@ -316,19 +332,6 @@ export function FundWallet(props: FundWalletProps) {
         >
           {props.buttonLabel || actionLabel}
         </Button>
-      ) : (
-        <ConnectButton
-          client={props.client}
-          connectButton={{
-            label: props.buttonLabel || actionLabel,
-            style: {
-              width: "100%",
-              borderRadius: radius.full,
-            },
-          }}
-          theme={theme}
-          {...props.connectOptions}
-        />
       )}
 
       {props.showThirdwebBranding ? (

package/src/react/web/ui/prebuilt/thirdweb/ClaimButton/index.tsx

@@ -8,6 +8,7 @@ import { getContractMetadata } from "../../../../../../extensions/common/read/ge
 import { getNFT } from "../../../../../../extensions/erc1155/read/getNFT.js";
 import type { PreparedTransaction } from "../../../../../../transaction/prepare-transaction.js";
 import type { BaseTransactionOptions } from "../../../../../../transaction/types.js";
+import { isString } from "../../../../../../utils/type-guards.js";
 import type { Account } from "../../../../../../wallets/interfaces/wallet.js";
 import { useReadContract } from "../../../../../core/hooks/contract/useReadContract.js";
 import { useActiveAccount } from "../../../../../core/hooks/wallets/useActiveAccount.js";
@@ -191,8 +192,10 @@ async function getPayMetadata(
     };
   }
   return {
-    image: contractMetadata?.image,
-    name: contractMetadata?.name,
+    image: isString(contractMetadata?.image)
+      ? contractMetadata.image
+      : undefined,
+    name: isString(contractMetadata?.name) ? contractMetadata.name : undefined,
   };
 }
 

package/src/react/web/ui/prebuilt/thirdweb/CreateDirectListingButton/index.tsx

@@ -11,6 +11,7 @@ import {
   createListing,
 } from "../../../../../../extensions/marketplace/direct-listings/write/createListing.js";
 import type { BaseTransactionOptions } from "../../../../../../transaction/types.js";
+import { isString } from "../../../../../../utils/type-guards.js";
 import { useReadContract } from "../../../../../core/hooks/contract/useReadContract.js";
 import type { TransactionButtonProps } from "../../../../../core/hooks/transaction/transaction-button-utils.js";
 import { useActiveAccount } from "../../../../../core/hooks/wallets/useActiveAccount.js";
@@ -228,7 +229,9 @@ async function getPayMetadata(
   }
 
   return {
-    image: contractMetadata?.image,
-    name: contractMetadata?.name,
+    image: isString(contractMetadata?.image)
+      ? contractMetadata.image
+      : undefined,
+    name: isString(contractMetadata?.name) ? contractMetadata.name : undefined,
   };
 }

package/src/utils/contract/fetchContractMetadata.ts

@@ -18,8 +18,7 @@ export type FetchContractMetadata = {
  */
 export async function fetchContractMetadata(
   options: FetchContractMetadata,
-  // biome-ignore lint/suspicious/noExplicitAny: TODO: fix any
-): Promise<{ [key: string]: any } | undefined> {
+): Promise<{ [key: string]: unknown } | undefined> {
   const { client, uri } = options;
 
   // handle case where the URI is a base64 encoded JSON

package/src/utils/extensions/airdrop/fetch-proofs-erc1155.ts

@@ -3,6 +3,7 @@ import { getContractMetadata } from "../../../extensions/common/read/getContract
 import { MerkleTree } from "../../../merkletree/MerkleTree.js";
 import { download } from "../../../storage/download.js";
 import type { Address } from "../../address.js";
+import { isRecord } from "../../type-guards.js";
 import { hashEntryERC1155 } from "./hash-entry-erc1155.js";
 import type {
   ClaimProofERC1155,
@@ -54,7 +55,8 @@ export async function fetchProofsERC1155(options: {
   const metadata = await getContractMetadata({
     contract,
   });
-  const merkleData: Record<string, string> = metadata.merkle || {};
+
+  const merkleData = isRecord(metadata.merkle) ? metadata.merkle : {};
   const snapshotUri = merkleData[merkleRoot];
 
   if (!snapshotUri) {

package/src/utils/extensions/airdrop/fetch-proofs-erc20.ts

@@ -3,6 +3,7 @@ import { getContractMetadata } from "../../../extensions/common/read/getContract
 import { MerkleTree } from "../../../merkletree/MerkleTree.js";
 import { download } from "../../../storage/download.js";
 import type { Address } from "../../address.js";
+import { isRecord } from "../../type-guards.js";
 import { convertQuantity } from "../drops/convert-quantity.js";
 import { hashEntryERC20 } from "./hash-entry-erc20.js";
 import type {
@@ -56,7 +57,7 @@ export async function fetchProofsERC20(options: {
   const metadata = await getContractMetadata({
     contract,
   });
-  const merkleData: Record<string, string> = metadata.merkle || {};
+  const merkleData = isRecord(metadata.merkle) ? metadata.merkle : {};
   const snapshotUri = merkleData[merkleRoot];
 
   if (!snapshotUri) {

package/src/utils/extensions/airdrop/fetch-proofs-erc721.ts

@@ -3,6 +3,7 @@ import { getContractMetadata } from "../../../extensions/common/read/getContract
 import { MerkleTree } from "../../../merkletree/MerkleTree.js";
 import { download } from "../../../storage/download.js";
 import type { Address } from "../../address.js";
+import { isRecord } from "../../type-guards.js";
 import { hashEntryERC721 } from "./hash-entry-erc721.js";
 import type {
   ClaimProofERC721,
@@ -54,7 +55,8 @@ export async function fetchProofsERC721(options: {
   const metadata = await getContractMetadata({
     contract,
   });
-  const merkleData: Record<string, string> = metadata.merkle || {};
+
+  const merkleData = isRecord(metadata.merkle) ? metadata.merkle : {};
   const snapshotUri = merkleData[merkleRoot];
 
   if (!snapshotUri) {

package/src/utils/extensions/drops/get-claim-params.ts

@@ -6,6 +6,7 @@ import {
 import type { ThirdwebContract } from "../../../contract/contract.js";
 import { getContractMetadata } from "../../../extensions/common/read/getContractMetadata.js";
 import type { Hex } from "../../encoding/hex.js";
+import { isRecord } from "../../type-guards.js";
 import type { ClaimCondition, OverrideProof } from "./types.js";
 
 export type GetClaimParamsOptions = {
@@ -118,7 +119,8 @@ export async function getClaimParams(options: GetClaimParamsOptions) {
     const metadata = await getContractMetadata({
       contract: options.contract,
     });
-    const merkleData: Record<string, string> = metadata.merkle || {};
+
+    const merkleData = isRecord(metadata.merkle) ? metadata.merkle : {};
     const snapshotUri = merkleData[cc.merkleRoot];
 
     if (!snapshotUri) {

package/src/utils/extensions/drops/get-multicall-set-claim-claim-conditon-transactions.ts

@@ -5,6 +5,7 @@ import type { SetClaimConditionsParams as GeneratedParams } from "../../../exten
 import { upload } from "../../../storage/upload.js";
 import { dateToSeconds } from "../../date.js";
 import { type Hex, toHex } from "../../encoding/hex.js";
+import { isRecord } from "../../type-guards.js";
 import { convertErc20Amount } from "../convert-erc20-amount.js";
 import { processOverrideList } from "./process-override-list.js";
 import type { ClaimConditionsInput } from "./types.js";
@@ -74,7 +75,12 @@ export async function getMulticallSetClaimConditionTransactions(options: {
     });
     // keep the old merkle roots from other tokenIds
     for (const key of Object.keys(metadata.merkle || {})) {
-      merkleInfos[key] = metadata.merkle[key];
+      const merkleInfo = isRecord(metadata.merkle)
+        ? metadata.merkle[key]
+        : undefined;
+      if (merkleInfo) {
+        merkleInfos[key] = merkleInfo;
+      }
     }
     const mergedMetadata = {
       ...metadata,

package/src/utils/type-guard.test.ts

@@ -0,0 +1,115 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  isObject,
+  isObjectWithKeys,
+  isRecord,
+  isString,
+} from "./type-guards.js";
+
+describe("isObject", () => {
+  it("returns true for plain objects", () => {
+    expect(isObject({})).toBe(true);
+    expect(isObject({ a: 1 })).toBe(true);
+  });
+
+  it("returns true for non-null object-like values (arrays, dates, maps)", () => {
+    expect(isObject([])).toBe(true);
+    expect(isObject(new Date())).toBe(true);
+    expect(isObject(new Map())).toBe(true);
+  });
+
+  it("returns false for primitives, functions and null/undefined", () => {
+    expect(isObject(null)).toBe(false);
+    expect(isObject(undefined)).toBe(false);
+    expect(isObject(123)).toBe(false);
+    expect(isObject("str")).toBe(false);
+    expect(isObject(true)).toBe(false);
+    expect(isObject(() => {})).toBe(false);
+  });
+});
+
+describe("isString", () => {
+  it("returns true for string primitives", () => {
+    expect(isString("" as unknown)).toBe(true);
+    expect(isString("hello" as unknown)).toBe(true);
+  });
+
+  it("returns false for non-strings and String objects", () => {
+    // String objects are typeof "object"
+    // eslint-disable-next-line no-new-wrappers
+    expect(isString(new String("x") as unknown)).toBe(false);
+    expect(isString(1 as unknown)).toBe(false);
+    expect(isString({} as unknown)).toBe(false);
+    expect(isString([] as unknown)).toBe(false);
+    expect(isString(null as unknown)).toBe(false);
+    expect(isString(undefined as unknown)).toBe(false);
+  });
+});
+
+describe("isObjectWithKeys", () => {
+  it("returns true when object has all specified keys", () => {
+    const value = { a: 1, b: 2 } as const;
+    expect(isObjectWithKeys(value, ["a"])).toBe(true);
+    expect(isObjectWithKeys(value, ["a", "b"])).toBe(true);
+  });
+
+  it("returns false when any specified key is missing", () => {
+    const value = { a: 1 } as const;
+    expect(isObjectWithKeys(value, ["a", "b"])).toBe(false);
+  });
+
+  it("defaults to just checking object-ness when no keys are provided", () => {
+    expect(isObjectWithKeys({})).toBe(true);
+    expect(isObjectWithKeys([])).toBe(true);
+    expect(isObjectWithKeys(123 as unknown)).toBe(false);
+  });
+
+  it("works with arrays when keys exist on the array", () => {
+    const arr = ["x"];
+    expect(isObjectWithKeys(arr, ["0"])).toBe(true);
+    expect(isObjectWithKeys(arr, ["length"])).toBe(true);
+    expect(isObjectWithKeys([], ["0"])).toBe(false);
+  });
+});
+
+describe("isRecord", () => {
+  it("returns true for plain object with string values (default)", () => {
+    expect(isRecord({})).toBe(true);
+    expect(isRecord({ a: "x", b: "y" })).toBe(true);
+  });
+
+  it("returns false for arrays and non-objects", () => {
+    expect(isRecord([] as unknown)).toBe(false);
+    expect(isRecord(1 as unknown)).toBe(false);
+    expect(isRecord(null as unknown)).toBe(false);
+    expect(isRecord(undefined as unknown)).toBe(false);
+  });
+
+  it("returns false when any value is not a string (default guards)", () => {
+    expect(isRecord({ a: 1 })).toBe(false);
+    expect(isRecord({ a: "x", b: 2 as unknown as string })).toBe(false);
+  });
+
+  it("respects a custom value guard (numbers)", () => {
+    const numberGuard = (v: unknown): v is number => typeof v === "number";
+    expect(isRecord({ a: 1, b: 2 }, { value: numberGuard })).toBe(true);
+    expect(isRecord({ a: 1, b: "x" }, { value: numberGuard })).toBe(false);
+  });
+
+  it("applies a custom key guard", () => {
+    const keyStartsWithA = (k: unknown): k is string =>
+      typeof k === "string" && k.startsWith("a");
+    expect(
+      isRecord({ apple: "x", aardvark: "y" }, { key: keyStartsWithA }),
+    ).toBe(true);
+    expect(isRecord({ banana: "x" }, { key: keyStartsWithA })).toBe(false);
+  });
+
+  it("objects with only symbol keys are considered records (no enumerable string keys)", () => {
+    const s = Symbol("s");
+    const obj = { [s]: "x" } as Record<symbol, string>;
+    // Object.entries ignores symbol keys; guard will see zero entries
+    expect(isRecord(obj)).toBe(true);
+  });
+});

package/src/utils/type-guards.ts

@@ -4,10 +4,20 @@
  * @returns True if the value is an object, false otherwise.
  * @internal
  */
-function isObject(value: unknown): value is object {
+export function isObject(value: unknown): value is object {
   return typeof value === "object" && value !== null;
 }
 
+/**
+ * Checks if a value is a string.
+ * @param value - The value to check.
+ * @returns True if the value is a string, false otherwise.
+ * @internal
+ */
+export function isString(value: unknown): value is string {
+  return typeof value === "string";
+}
+
 /**
  * Checks if a value is an object with specified keys.
  * @param value - The value to check.
@@ -21,3 +31,29 @@ export function isObjectWithKeys<key extends string>(
 ): value is Record<key, unknown> {
   return isObject(value) && keys.every((key) => key in value);
 }
+
+/**
+ * Checks if a value is a record with string values.
+ * @param value - The value to check.
+ * @returns True if the value is a record with string values, false otherwise.
+ * @internal
+ */
+export function isRecord<
+  K extends string | number | symbol = string,
+  V = string,
+  T extends Record<K, V> = Record<K, V>,
+>(
+  value: unknown,
+  guards?: {
+    key?: (k: unknown) => k is K;
+    value?: (v: unknown) => v is V;
+  },
+): value is T {
+  const keyGuard = guards?.key ?? isString;
+  const valueGuard = guards?.value ?? isString;
+  return (
+    isObject(value) &&
+    !Array.isArray(value) &&
+    Object.entries(value).every(([k, v]) => keyGuard(k) && valueGuard(v))
+  );
+}

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.109.2-nightly-f2121e9519719ef809986c919acc5069b5b7ce74-20251022000400";
+export const version = "5.110.1";

package/src/wallets/in-app/core/eip5792/in-app-wallet-calls.ts

@@ -4,6 +4,7 @@ import { eth_getTransactionReceipt } from "../../../../rpc/actions/eth_getTransa
 import { getRpcClient } from "../../../../rpc/rpc.js";
 import { sendAndConfirmTransaction } from "../../../../transaction/actions/send-and-confirm-transaction.js";
 import { sendBatchTransaction } from "../../../../transaction/actions/send-batch-transaction.js";
+import type { SendTransactionOptions } from "../../../../transaction/actions/send-transaction.js";
 import { LruMap } from "../../../../utils/caching/lru.js";
 import type { Hex } from "../../../../utils/encoding/hex.js";
 import { randomBytesHex } from "../../../../utils/random.js";
@@ -22,21 +23,29 @@ const bundlesToTransactions = new LruMap<Hex[]>(1000);
 export async function inAppWalletSendCalls(args: {
   account: Account;
   calls: PreparedSendCall[];
+  chain: Chain;
 }): Promise<string> {
   const { account, calls } = args;
 
+  const transactions: SendTransactionOptions["transaction"][] = calls.map(
+    (call) => ({
+      ...call,
+      chain: args.chain,
+    }),
+  );
+
   const hashes: Hex[] = [];
   const id = randomBytesHex(65);
   bundlesToTransactions.set(id, hashes);
   if (account.sendBatchTransaction) {
     const receipt = await sendBatchTransaction({
       account,
-      transactions: calls,
+      transactions,
     });
     hashes.push(receipt.transactionHash);
     bundlesToTransactions.set(id, hashes);
   } else {
-    for (const tx of calls) {
+    for (const tx of transactions) {
       const receipt = await sendAndConfirmTransaction({
         account,
         transaction: tx,

package/src/wallets/in-app/core/eip7702/minimal-account.ts

@@ -341,6 +341,7 @@ export const create7702MinimalAccount = (args: {
       const id = await inAppWalletSendCalls({
         account: minimalAccount,
         calls: options.calls,
+        chain,
       });
       return { chain, client, id };
     },

package/src/wallets/in-app/core/wallet/enclave-wallet.ts

@@ -277,6 +277,7 @@ export class EnclaveWallet implements IWebWallet {
         const id = await inAppWalletSendCalls({
           account: account,
           calls: options.calls,
+          chain,
         });
         return { chain, client, id };
       },

package/src/wallets/smart/index.ts

@@ -379,6 +379,7 @@ async function createSmartAccount(
       const id = await inAppWalletSendCalls({
         account: account,
         calls: options.calls,
+        chain,
       });
       return { chain, client, id };
     },
@@ -556,6 +557,7 @@ function createZkSyncAccount(args: {
       const id = await inAppWalletSendCalls({
         account: account,
         calls: options.calls,
+        chain,
       });
       return { chain, client, id };
     },