thirdweb 5.102.2 → 5.102.3

package/src/bridge/Token.ts

@@ -0,0 +1,184 @@
+import type { ThirdwebClient } from "../client/client.js";
+import { getThirdwebBaseUrl } from "../utils/domains.js";
+import { getClientFetch } from "../utils/fetch.js";
+import { ApiError } from "./types/Errors.js";
+import type { Token } from "./types/Token.js";
+
+/**
+ * Retrieves supported Universal Bridge tokens based on the provided filters.
+ *
+ * When multiple filters are specified, a token must satisfy all filters to be included (it acts as an AND operator).
+ *
+ * @example
+ * ```typescript
+ * import { Bridge } from "thirdweb";
+ *
+ * const tokens = await Bridge.tokens({
+ *   client: thirdwebClient,
+ * });
+ * ```
+ *
+ * Returned tokens might look something like:
+ * ```typescript
+ * [
+ *   {
+ *     chainId: 1,
+ *     address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+ *     decimals: 18,
+ *     symbol: "ETH",
+ *     name: "Ethereum",
+ *     iconUri: "https://assets.relay.link/icons/1/light.png",
+ *     priceUsd: 2000.50
+ *   },
+ *   {
+ *     chainId: 1,
+ *     address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+ *     decimals: 6,
+ *     symbol: "USDC",
+ *     name: "USD Coin",
+ *     iconUri: "https://assets.coingecko.com/coins/images/6319/large/USD_Coin_icon.png",
+ *     priceUsd: 1.00
+ *   }
+ * ]
+ * ```
+ *
+ * You can filter for specific chains or tokens:
+ * ```typescript
+ * import { Bridge } from "thirdweb";
+ *
+ * // Get all tokens on Ethereum mainnet
+ * const ethTokens = await Bridge.tokens({
+ *   chainId: 1,
+ *   client: thirdwebClient,
+ * });
+ * ```
+ *
+ * You can search for tokens by symbol or name:
+ * ```typescript
+ * import { Bridge } from "thirdweb";
+ *
+ * // Search for USDC tokens
+ * const usdcTokens = await Bridge.tokens({
+ *   symbol: "USDC",
+ *   client: thirdwebClient,
+ * });
+ *
+ * // Search for tokens by name
+ * const ethereumTokens = await Bridge.tokens({
+ *   name: "Ethereum",
+ *   client: thirdwebClient,
+ * });
+ * ```
+ *
+ * You can filter by a specific token address:
+ * ```typescript
+ * import { Bridge } from "thirdweb";
+ *
+ * // Get a specific token
+ * const token = await Bridge.tokens({
+ *   tokenAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+ *   client: thirdwebClient,
+ * });
+ * ```
+ *
+ * The returned tokens will be limited based on the API. You can paginate through the results using the `limit` and `offset` parameters:
+ * ```typescript
+ * import { Bridge } from "thirdweb";
+ *
+ * // Get the first 50 tokens
+ * const tokens = await Bridge.tokens({
+ *   limit: 50,
+ *   offset: 0,
+ *   client: thirdwebClient,
+ * });
+ *
+ * // Get the next 50 tokens
+ * const nextTokens = await Bridge.tokens({
+ *   limit: 50,
+ *   offset: 50,
+ *   client: thirdwebClient,
+ * });
+ * ```
+ *
+ * @param options - The options for retrieving tokens.
+ * @param options.client - Your thirdweb client.
+ * @param options.chainId - Filter by a specific chain ID.
+ * @param options.tokenAddress - Filter by a specific token address.
+ * @param options.symbol - Filter by token symbol.
+ * @param options.name - Filter by token name.
+ * @param options.limit - Number of tokens to return (min: 1, default: 100).
+ * @param options.offset - Number of tokens to skip (min: 0, default: 0).
+ *
+ * @returns A promise that resolves to an array of tokens.
+ *
+ * @throws Will throw an error if there is an issue fetching the tokens.
+ * @bridge
+ * @beta
+ */
+export async function tokens(options: tokens.Options): Promise<tokens.Result> {
+  const { client, chainId, tokenAddress, symbol, name, limit, offset } =
+    options;
+
+  const clientFetch = getClientFetch(client);
+  const url = new URL(`${getThirdwebBaseUrl("bridge")}/v1/tokens`);
+
+  if (chainId !== null && chainId !== undefined) {
+    url.searchParams.set("chainId", chainId.toString());
+  }
+  if (tokenAddress) {
+    url.searchParams.set("tokenAddress", tokenAddress);
+  }
+  if (symbol) {
+    url.searchParams.set("symbol", symbol);
+  }
+  if (name) {
+    url.searchParams.set("name", name);
+  }
+  if (limit !== undefined) {
+    url.searchParams.set("limit", limit.toString());
+  }
+  if (offset !== null && offset !== undefined) {
+    url.searchParams.set("offset", offset.toString());
+  }
+
+  const response = await clientFetch(url.toString());
+  if (!response.ok) {
+    const errorJson = await response.json();
+    throw new ApiError({
+      code: errorJson.code || "UNKNOWN_ERROR",
+      message: errorJson.message || response.statusText,
+      correlationId: errorJson.correlationId || undefined,
+      statusCode: response.status,
+    });
+  }
+
+  const { data }: { data: Token[] } = await response.json();
+  return data;
+}
+
+export declare namespace tokens {
+  /**
+   * Input parameters for {@link Bridge.tokens}.
+   */
+  type Options = {
+    /** Your {@link ThirdwebClient} instance. */
+    client: ThirdwebClient;
+    /** Filter by a specific chain ID. */
+    chainId?: number | null;
+    /** Filter by a specific token address. */
+    tokenAddress?: string;
+    /** Filter by token symbol. */
+    symbol?: string;
+    /** Filter by token name. */
+    name?: string;
+    /** Number of tokens to return (min: 1, default: 100). */
+    limit?: number;
+    /** Number of tokens to skip (min: 0, default: 0). */
+    offset?: number | null;
+  };
+
+  /**
+   * The result returned from {@link Bridge.tokens}.
+   */
+  type Result = Token[];
+}

package/src/bridge/index.ts

@@ -6,6 +6,7 @@ export * as Webhook from "./Webhook.js";
 export { status } from "./Status.js";
 export { routes } from "./Routes.js";
 export { chains } from "./Chains.js";
+export { tokens } from "./Token.js";
 export { parse } from "./Webhook.js";
 
 export type { Chain } from "./types/Chain.js";

package/src/extensions/erc1155/read/getNFTs.ts

@@ -84,8 +84,14 @@ async function getNFTsFromInsight(
     Math.max(0, Number(supply) - currentOffset),
   );
   if (result.length < expectedResultLength) {
-    // fresh contracts might be delayed in indexing, so we fallback to RPC
-    return getNFTsFromRPC(options);
+    try {
+      // fresh contracts might be delayed in indexing, so we fallback to RPC
+      // must use await here
+      return await getNFTsFromRPC(options);
+    } catch {
+      // if RPC fails, we return the result from insight
+      return result;
+    }
   }
   return result;
 }

package/src/extensions/erc721/read/getNFTs.ts

@@ -132,8 +132,14 @@ async function getNFTsFromInsight(
     ),
   );
   if (result.length < expectedResultLength) {
-    // fresh contracts might be delayed in indexing, so we fallback to RPC
-    return getNFTsFromRPC(options);
+    try {
+      // fresh contracts might be delayed in indexing, so we fallback to RPC
+      // must use await here
+      return await getNFTsFromRPC(options);
+    } catch {
+      // if RPC fails, we return the result from insight
+      return result;
+    }
   }
 
   return result;

package/src/pay/convert/cryptoToFiat.test.ts

@@ -3,10 +3,7 @@ import { TEST_CLIENT } from "~test/test-clients.js";
 import { base } from "../../chains/chain-definitions/base.js";
 import { ethereum } from "../../chains/chain-definitions/ethereum.js";
 import { sepolia } from "../../chains/chain-definitions/sepolia.js";
-import {
-  NATIVE_TOKEN_ADDRESS,
-  ZERO_ADDRESS,
-} from "../../constants/addresses.js";
+import { NATIVE_TOKEN_ADDRESS } from "../../constants/addresses.js";
 import { convertCryptoToFiat } from "./cryptoToFiat.js";
 
 describe.runIf(process.env.TW_SECRET_KEY)("Pay: crypto-to-fiat", () => {
@@ -78,18 +75,4 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: crypto-to-fiat", () => {
       "Invalid fromTokenAddress. Expected a valid EVM contract address",
     );
   });
-
-  it("should throw error if fromTokenAddress is set to a wallet address", async () => {
-    await expect(
-      convertCryptoToFiat({
-        chain: base,
-        fromTokenAddress: ZERO_ADDRESS,
-        fromAmount: 1,
-        to: "USD",
-        client: TEST_CLIENT,
-      }),
-    ).rejects.toThrowError(
-      `Error: ${ZERO_ADDRESS} on chainId: ${base.id} is not a valid contract address.`,
-    );
-  });
 });

package/src/pay/convert/cryptoToFiat.ts

@@ -1,15 +1,8 @@
-import { getV1TokensPrice } from "@thirdweb-dev/insight";
 import type { Address } from "abitype";
 import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.js";
-import { NATIVE_TOKEN_ADDRESS } from "../../constants/addresses.js";
-import { getBytecode } from "../../contract/actions/get-bytecode.js";
-import { getContract } from "../../contract/contract.js";
 import { isAddress } from "../../utils/address.js";
-import { getThirdwebDomains } from "../../utils/domains.js";
-import { getClientFetch } from "../../utils/fetch.js";
-import { stringify } from "../../utils/json.js";
-import { withCache } from "../../utils/promise/withCache.js";
+import { getTokenPrice } from "./get-token.js";
 import type { SupportedFiatCurrency } from "./type.js";
 
 /**
@@ -63,7 +56,7 @@ export type ConvertCryptoToFiatParams = {
 export async function convertCryptoToFiat(
   options: ConvertCryptoToFiatParams,
 ): Promise<{ result: number }> {
-  const { client, fromTokenAddress, to, chain, fromAmount } = options;
+  const { client, fromTokenAddress, chain, fromAmount } = options;
   if (Number(fromAmount) === 0) {
     return { result: 0 };
   }
@@ -80,50 +73,11 @@ export async function convertCryptoToFiat(
       "Invalid fromTokenAddress. Expected a valid EVM contract address",
     );
   }
-  // Make sure it's either a valid contract or a native token address
-  if (fromTokenAddress.toLowerCase() !== NATIVE_TOKEN_ADDRESS.toLowerCase()) {
-    const bytecode = await getBytecode(
-      getContract({
-        address: fromTokenAddress,
-        chain,
-        client,
-      }),
-    ).catch(() => undefined);
-    if (!bytecode || bytecode === "0x") {
-      throw new Error(
-        `Error: ${fromTokenAddress} on chainId: ${chain.id} is not a valid contract address.`,
-      );
-    }
-  }
-
-  const result = await withCache(
-    () =>
-      getV1TokensPrice({
-        baseUrl: `https://${getThirdwebDomains().insight}`,
-        fetch: getClientFetch(client),
-        query: {
-          address: fromTokenAddress,
-          chain_id: [chain.id],
-        },
-      }),
-    {
-      cacheKey: `convert-fiat-to-crypto-${to}-${chain.id}`,
-      cacheTime: 1000 * 60, // 1 minute cache
-    },
-  );
-
-  if (result.error) {
-    throw new Error(
-      `Failed to fetch ${to} value for token (${fromTokenAddress}) on chainId: ${chain.id} - ${result.response.status} ${result.response.statusText} - ${result.error ? stringify(result.error) : "Unknown error"}`,
-    );
-  }
-
-  const firstResult = result.data?.data[0];
-
-  if (!firstResult) {
+  const price = await getTokenPrice(client, fromTokenAddress, chain.id);
+  if (!price) {
     throw new Error(
-      `Failed to fetch ${to} value for token (${fromTokenAddress}) on chainId: ${chain.id}`,
+      `Error: Failed to fetch price for token ${fromTokenAddress} on chainId: ${chain.id}`,
     );
   }
-  return { result: firstResult.price_usd * fromAmount };
+  return { result: price * fromAmount };
 }

package/src/pay/convert/fiatToCrypto.test.ts

@@ -3,10 +3,7 @@ import { TEST_CLIENT } from "~test/test-clients.js";
 import { base } from "../../chains/chain-definitions/base.js";
 import { ethereum } from "../../chains/chain-definitions/ethereum.js";
 import { sepolia } from "../../chains/chain-definitions/sepolia.js";
-import {
-  NATIVE_TOKEN_ADDRESS,
-  ZERO_ADDRESS,
-} from "../../constants/addresses.js";
+import { NATIVE_TOKEN_ADDRESS } from "../../constants/addresses.js";
 import { convertFiatToCrypto } from "./fiatToCrypto.js";
 
 describe.runIf(process.env.TW_SECRET_KEY)("Pay: fiatToCrypto", () => {
@@ -81,18 +78,4 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: fiatToCrypto", () => {
       "Invalid `to`. Expected a valid EVM contract address",
     );
   });
-
-  it("should throw error if `to` is set to a wallet address", async () => {
-    await expect(
-      convertFiatToCrypto({
-        chain: base,
-        to: ZERO_ADDRESS,
-        fromAmount: 1,
-        from: "USD",
-        client: TEST_CLIENT,
-      }),
-    ).rejects.toThrowError(
-      `Error: ${ZERO_ADDRESS} on chainId: ${base.id} is not a valid contract address.`,
-    );
-  });
 });

package/src/pay/convert/fiatToCrypto.ts

@@ -1,15 +1,8 @@
-import { getV1TokensPrice } from "@thirdweb-dev/insight";
 import type { Address } from "abitype";
 import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.js";
-import { NATIVE_TOKEN_ADDRESS } from "../../constants/addresses.js";
-import { getBytecode } from "../../contract/actions/get-bytecode.js";
-import { getContract } from "../../contract/contract.js";
 import { isAddress } from "../../utils/address.js";
-import { getThirdwebDomains } from "../../utils/domains.js";
-import { getClientFetch } from "../../utils/fetch.js";
-import { stringify } from "../../utils/json.js";
-import { withCache } from "../../utils/promise/withCache.js";
+import { getTokenPrice } from "./get-token.js";
 import type { SupportedFiatCurrency } from "./type.js";
 
 /**
@@ -64,7 +57,7 @@ export type ConvertFiatToCryptoParams = {
 export async function convertFiatToCrypto(
   options: ConvertFiatToCryptoParams,
 ): Promise<{ result: number }> {
-  const { client, from, to, chain, fromAmount } = options;
+  const { client, to, chain, fromAmount } = options;
   if (Number(fromAmount) === 0) {
     return { result: 0 };
   }
@@ -79,49 +72,11 @@ export async function convertFiatToCrypto(
   if (!isAddress(to)) {
     throw new Error("Invalid `to`. Expected a valid EVM contract address");
   }
-  // Make sure it's either a valid contract or a native token
-  if (to.toLowerCase() !== NATIVE_TOKEN_ADDRESS.toLowerCase()) {
-    const bytecode = await getBytecode(
-      getContract({
-        address: to,
-        chain,
-        client,
-      }),
-    ).catch(() => undefined);
-    if (!bytecode || bytecode === "0x") {
-      throw new Error(
-        `Error: ${to} on chainId: ${chain.id} is not a valid contract address.`,
-      );
-    }
-  }
-  const result = await withCache(
-    () =>
-      getV1TokensPrice({
-        baseUrl: `https://${getThirdwebDomains().insight}`,
-        fetch: getClientFetch(client),
-        query: {
-          address: to,
-          chain_id: [chain.id],
-        },
-      }),
-    {
-      cacheKey: `convert-fiat-to-crypto-${to}-${chain.id}`,
-      cacheTime: 1000 * 60, // 1 minute cache
-    },
-  );
-
-  if (result.error) {
-    throw new Error(
-      `Failed to fetch ${from} value for token (${to}) on chainId: ${chain.id} - ${result.response.status} ${result.response.statusText} - ${result.error ? stringify(result.error) : "Unknown error"}`,
-    );
-  }
-
-  const firstResult = result.data?.data[0];
-
-  if (!firstResult || firstResult.price_usd === 0) {
+  const price = await getTokenPrice(client, to, chain.id);
+  if (!price || price === 0) {
     throw new Error(
-      `Failed to fetch ${from} value for token (${to}) on chainId: ${chain.id}`,
+      `Error: Failed to fetch price for token ${to} on chainId: ${chain.id}`,
     );
   }
-  return { result: fromAmount / firstResult.price_usd };
+  return { result: fromAmount / price };
 }

package/src/pay/convert/get-token.ts

@@ -0,0 +1,24 @@
+import { tokens } from "../../bridge/Token.js";
+import type { ThirdwebClient } from "../../client/client.js";
+import { withCache } from "../../utils/promise/withCache.js";
+
+export async function getTokenPrice(
+  client: ThirdwebClient,
+  tokenAddress: string,
+  chainId: number,
+) {
+  return withCache(
+    async () => {
+      const result = await tokens({
+        client,
+        tokenAddress,
+        chainId,
+      });
+      return result[0]?.priceUsd;
+    },
+    {
+      cacheKey: `get-token-price-${tokenAddress}-${chainId}`,
+      cacheTime: 1000 * 60, // 1 minute
+    },
+  );
+}

package/src/react/core/hooks/transaction/useSendTransaction.ts

@@ -13,12 +13,12 @@ import { getTransactionGasCost } from "../../../../transaction/utils.js";
 import type { Hex } from "../../../../utils/encoding/hex.js";
 import { resolvePromisedValue } from "../../../../utils/promise/resolve-promised-value.js";
 import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
+import { hasSponsoredTransactionsEnabled } from "../../../../wallets/smart/is-smart-wallet.js";
 import { getTokenBalance } from "../../../../wallets/utils/getTokenBalance.js";
 import { getWalletBalance } from "../../../../wallets/utils/getWalletBalance.js";
 import type { LocaleId } from "../../../web/ui/types.js";
 import type { Theme } from "../../design-system/index.js";
 import type { SupportedTokens } from "../../utils/defaultTokens.js";
-import { hasSponsoredTransactionsEnabled } from "../../utils/wallet.js";
 
 /**
  * Configuration for the "Pay Modal" that opens when the user doesn't have enough funds to send a transaction.

package/src/react/core/utils/wallet.ts

@@ -7,8 +7,7 @@ import { resolveName } from "../../../extensions/ens/resolve-name.js";
 import { shortenAddress } from "../../../utils/address.js";
 import { parseAvatarRecord } from "../../../utils/ens/avatar.js";
 import { getWalletInfo } from "../../../wallets/__generated__/getWalletInfo.js";
-import { isEcosystemWallet } from "../../../wallets/ecosystem/is-ecosystem-wallet.js";
-import type { Account, Wallet } from "../../../wallets/interfaces/wallet.js";
+import type { Account } from "../../../wallets/interfaces/wallet.js";
 import type { WalletInfo } from "../../../wallets/wallet-info.js";
 import type { WalletId } from "../../../wallets/wallet-types.js";
 import { useWalletBalance } from "../hooks/others/useWalletBalance.js";
@@ -215,50 +214,3 @@ export function useWalletImage(id: WalletId | undefined) {
     enabled: !!id,
   });
 }
-
-/**
- * @internal
- */
-export function hasSponsoredTransactionsEnabled(wallet: Wallet | undefined) {
-  if (!wallet) {
-    return false;
-  }
-  let sponsoredTransactionsEnabled = false;
-  if (wallet && wallet.id === "smart") {
-    const options = (wallet as Wallet<"smart">).getConfig();
-    if ("sponsorGas" in options) {
-      sponsoredTransactionsEnabled = options.sponsorGas;
-    }
-    if ("gasless" in options) {
-      sponsoredTransactionsEnabled = options.gasless;
-    }
-  }
-  if (wallet && (wallet.id === "inApp" || isEcosystemWallet(wallet))) {
-    const options = (wallet as Wallet<"inApp">).getConfig();
-    if (options && "smartAccount" in options && options.smartAccount) {
-      const smartOptions = options.smartAccount;
-      if ("sponsorGas" in smartOptions) {
-        sponsoredTransactionsEnabled = smartOptions.sponsorGas;
-      }
-      if ("gasless" in smartOptions) {
-        sponsoredTransactionsEnabled = smartOptions.gasless;
-      }
-    }
-    if (options?.executionMode) {
-      const execMode = options.executionMode;
-      if (execMode.mode === "EIP4337") {
-        const smartOptions = execMode.smartAccount;
-        if (smartOptions && "sponsorGas" in smartOptions) {
-          sponsoredTransactionsEnabled = smartOptions.sponsorGas;
-        }
-        if (smartOptions && "gasless" in smartOptions) {
-          sponsoredTransactionsEnabled = smartOptions.gasless;
-        }
-      }
-      if (execMode.mode === "EIP7702") {
-        sponsoredTransactionsEnabled = execMode.sponsorGas || false;
-      }
-    }
-  }
-  return sponsoredTransactionsEnabled;
-}

package/src/react/native/ui/connect/ConnectedModal.tsx

@@ -5,6 +5,7 @@ import { getContract } from "../../../../contract/contract.js";
 import { isContractDeployed } from "../../../../utils/bytecode/is-contract-deployed.js";
 import { formatNumber } from "../../../../utils/formatNumber.js";
 import type { Account, Wallet } from "../../../../wallets/interfaces/wallet.js";
+import { isSmartWallet } from "../../../../wallets/smart/is-smart-wallet.js";
 import type { Theme } from "../../../core/design-system/index.js";
 import { useSiweAuth } from "../../../core/hooks/auth/useSiweAuth.js";
 import type { ConnectButtonProps } from "../../../core/hooks/connection/ConnectButtonProps.js";
@@ -13,7 +14,6 @@ import { useActiveAccount } from "../../../core/hooks/wallets/useActiveAccount.j
 import { useActiveWallet } from "../../../core/hooks/wallets/useActiveWallet.js";
 import { useActiveWalletChain } from "../../../core/hooks/wallets/useActiveWalletChain.js";
 import { useDisconnect } from "../../../core/hooks/wallets/useDisconnect.js";
-import { hasSmartAccount } from "../../../core/utils/isSmartWallet.js";
 import { useConnectedWalletDetails } from "../../../core/utils/wallet.js";
 import { fontSize, radius, spacing } from "../../design-system/index.js";
 import { Address } from "../components/Address.js";
@@ -326,14 +326,14 @@ function SmartAccountBadge(props: {
 }) {
   const activeAccount = useActiveAccount();
   const activeWallet = useActiveWallet();
-  const isSmartWallet = hasSmartAccount(activeWallet);
+  const isSW = isSmartWallet(activeWallet);
   const chain = useActiveWalletChain();
   const { client, theme } = props;
 
   const [isSmartWalletDeployed, setIsSmartWalletDeployed] = useState(false);
 
   useEffect(() => {
-    if (activeAccount && isSmartWallet && activeAccount.address && chain) {
+    if (activeAccount && isSW && activeAccount.address && chain) {
       const contract = getContract({
         address: activeAccount.address,
         chain,
@@ -346,7 +346,7 @@ function SmartAccountBadge(props: {
     } else {
       setIsSmartWalletDeployed(false);
     }
-  }, [activeAccount, chain, client, isSmartWallet]);
+  }, [activeAccount, chain, client, isSW]);
 
   const content = (
     <View
@@ -377,7 +377,7 @@ function SmartAccountBadge(props: {
     </View>
   );
 
-  if (chain && activeAccount && isSmartWallet) {
+  if (chain && activeAccount && isSW) {
     return (
       <>
         <Spacer size="smd" />

package/src/react/web/ui/ConnectWallet/Details.tsx

@@ -30,6 +30,7 @@ import { webLocalStorage } from "../../../../utils/storage/webStorage.js";
 import { isEcosystemWallet } from "../../../../wallets/ecosystem/is-ecosystem-wallet.js";
 import type { Ecosystem } from "../../../../wallets/in-app/core/wallet/types.js";
 import type { Account, Wallet } from "../../../../wallets/interfaces/wallet.js";
+import { isSmartWallet } from "../../../../wallets/smart/is-smart-wallet.js";
 import type { SmartWalletOptions } from "../../../../wallets/smart/types.js";
 import {
   type AppMetadata,
@@ -77,7 +78,6 @@ import type {
   SupportedNFTs,
   SupportedTokens,
 } from "../../../core/utils/defaultTokens.js";
-import { hasSmartAccount } from "../../../core/utils/isSmartWallet.js";
 import { useWalletInfo } from "../../../core/utils/wallet.js";
 import { WalletUIStatesProvider } from "../../providers/wallet-ui-states-provider.js";
 import { ChainActiveDot } from "../components/ChainActiveDot.js";
@@ -1186,14 +1186,14 @@ export function ConnectedToSmartWallet(props: {
 }) {
   const activeAccount = useActiveAccount();
   const activeWallet = useActiveWallet();
-  const isSmartWallet = hasSmartAccount(activeWallet);
+  const isSW = isSmartWallet(activeWallet);
   const chain = useActiveWalletChain();
   const { client, connectLocale: locale } = props;
 
   const [isSmartWalletDeployed, setIsSmartWalletDeployed] = useState(false);
 
   useEffect(() => {
-    if (activeAccount && isSmartWallet && activeAccount.address && chain) {
+    if (activeAccount && isSW && activeAccount.address && chain) {
       const contract = getContract({
         address: activeAccount.address,
         chain,
@@ -1206,7 +1206,7 @@ export function ConnectedToSmartWallet(props: {
     } else {
       setIsSmartWalletDeployed(false);
     }
-  }, [activeAccount, chain, client, isSmartWallet]);
+  }, [activeAccount, chain, client, isSW]);
 
   const content = (
     <Container flex="row" gap="3xs" center="y">
@@ -1216,7 +1216,7 @@ export function ConnectedToSmartWallet(props: {
     </Container>
   );
 
-  if (chain && activeAccount && isSmartWallet) {
+  if (chain && activeAccount && isSW) {
     return (
       <>
         {isSmartWalletDeployed ? (
@@ -1251,7 +1251,7 @@ export function InAppWalletUserInfo(props: {
   const activeWallet = useActiveWallet();
   const adminWallet = useAdminWallet();
   const { data: walletInfo } = useWalletInfo(activeWallet?.id);
-  const isSmartWallet = hasSmartAccount(activeWallet);
+  const isSW = isSmartWallet(activeWallet);
   const { data: walletName } = useQuery({
     queryKey: [
       "wallet-name",
@@ -1317,7 +1317,7 @@ export function InAppWalletUserInfo(props: {
     enabled: !!adminWallet,
   });
 
-  if (!userInfoQuery.data && isSmartWallet) {
+  if (!userInfoQuery.data && isSW) {
     return <ConnectedToSmartWallet client={client} connectLocale={locale} />;
   }