@rhinestone/deposit-modal 0.1.4 → 0.1.6

package/dist/index.cjs

@@ -38,12 +38,17 @@ __export(index_exports, {
   getExplorerName: () => getExplorerName,
   getExplorerTxUrl: () => getExplorerTxUrl,
   getExplorerUrl: () => getExplorerUrl,
+  getSupportedChainIds: () => getSupportedChainIds,
+  getSupportedTargetTokens: () => getSupportedTargetTokens,
+  getSupportedTokenSymbolsForChain: () => getSupportedTokenSymbolsForChain,
   getTokenAddress: () => getTokenAddress,
   getTokenDecimals: () => getTokenDecimals,
+  getTokenDecimalsByAddress: () => getTokenDecimalsByAddress,
   getTokenIcon: () => getTokenIcon,
   getTokenSymbol: () => getTokenSymbol,
   getUsdcAddress: () => getUsdcAddress,
-  getUsdcDecimals: () => getUsdcDecimals
+  getUsdcDecimals: () => getUsdcDecimals,
+  isSupportedTokenAddressForChain: () => isSupportedTokenAddressForChain
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -308,13 +313,56 @@ var import_shared_configs = require("@rhinestone/shared-configs");
 var DEFAULT_BACKEND_URL = "https://v1.orchestrator.rhinestone.dev/deposit-widget";
 var DEFAULT_SIGNER_ADDRESS = "0xcc47aa2d96c35bc6aab12ffb0e2edab8042274bd";
 var NATIVE_TOKEN_ADDRESS = "0x0000000000000000000000000000000000000000";
-var SOURCE_CHAINS = [import_chains.base, import_chains.optimism, import_chains.arbitrum];
-var CHAIN_BY_ID = {
+var ALL_CHAINS_BY_ID = {
+  [import_chains.mainnet.id]: import_chains.mainnet,
   [import_chains.base.id]: import_chains.base,
   [import_chains.optimism.id]: import_chains.optimism,
-  [import_chains.arbitrum.id]: import_chains.arbitrum
+  [import_chains.arbitrum.id]: import_chains.arbitrum,
+  [import_chains.polygon.id]: import_chains.polygon,
+  [import_chains.bsc.id]: import_chains.bsc
+};
+var SUPPORTED_TOKEN_MATRIX = {
+  ETH: [import_chains.mainnet.id, import_chains.base.id, import_chains.arbitrum.id, import_chains.optimism.id, import_chains.polygon.id],
+  WETH: [import_chains.mainnet.id, import_chains.base.id, import_chains.arbitrum.id, import_chains.optimism.id, import_chains.polygon.id],
+  USDC: [import_chains.mainnet.id, import_chains.base.id, import_chains.arbitrum.id, import_chains.optimism.id, import_chains.polygon.id],
+  USDT: [import_chains.mainnet.id, import_chains.arbitrum.id, import_chains.polygon.id, import_chains.bsc.id]
+};
+var CHAIN_DISPLAY_ORDER = [
+  import_chains.mainnet.id,
+  import_chains.base.id,
+  import_chains.arbitrum.id,
+  import_chains.optimism.id,
+  import_chains.polygon.id,
+  import_chains.bsc.id
+];
+var supportedChainSet = /* @__PURE__ */ new Set();
+for (const chainIds of Object.values(SUPPORTED_TOKEN_MATRIX)) {
+  for (const chainId of chainIds) {
+    supportedChainSet.add(chainId);
+  }
+}
+var SUPPORTED_CHAIN_IDS = CHAIN_DISPLAY_ORDER.filter(
+  (chainId) => supportedChainSet.has(chainId) && Boolean(ALL_CHAINS_BY_ID[chainId])
+);
+var CHAIN_BY_ID = Object.fromEntries(
+  SUPPORTED_CHAIN_IDS.map((id) => [id, ALL_CHAINS_BY_ID[id]])
+);
+var SOURCE_CHAINS = SUPPORTED_CHAIN_IDS.map(
+  (id) => CHAIN_BY_ID[id]
+);
+var SUPPORTED_CHAINS = SOURCE_CHAINS;
+var SUPPORTED_TOKENS_BY_CHAIN = Object.fromEntries(
+  SUPPORTED_CHAIN_IDS.map((chainId) => {
+    const symbols = Object.entries(SUPPORTED_TOKEN_MATRIX).filter(([, chainIds]) => chainIds.includes(chainId)).map(([symbol]) => symbol);
+    return [chainId, symbols];
+  })
+);
+var SYMBOL_ALIASES = {
+  USDT: ["USDT", "USDT0"]
+};
+var CANONICAL_SYMBOL_BY_REGISTRY_SYMBOL = {
+  USDT0: "USDT"
 };
-var SUPPORTED_CHAINS = Object.values(CHAIN_BY_ID);
 function getChainId(chain) {
   return typeof chain === "number" ? chain : chain.id;
 }
@@ -324,15 +372,32 @@ function getChainObject(chain) {
   }
   return chain;
 }
+function normalizeTokenSymbol(symbol) {
+  const trimmed = symbol.trim();
+  const wrapped = trimmed.match(/\(([^)]+)\)/);
+  if (wrapped?.[1]) {
+    return wrapped[1].trim().toUpperCase();
+  }
+  const upper = trimmed.toUpperCase();
+  return CANONICAL_SYMBOL_BY_REGISTRY_SYMBOL[upper] ?? upper;
+}
+function isSymbolSupportedOnChain(symbol, chainId) {
+  const symbols = SUPPORTED_TOKENS_BY_CHAIN[chainId];
+  if (!symbols) return false;
+  return symbols.includes(normalizeTokenSymbol(symbol));
+}
 function getTokenFromRegistry(chainId, symbol) {
   const chainEntry = import_shared_configs.chainRegistry[String(chainId)];
   if (!chainEntry) return void 0;
-  const upperSymbol = symbol.toUpperCase();
-  const token = chainEntry.tokens.find(
-    (t) => t.symbol.toUpperCase() === upperSymbol
-  );
-  if (token) {
-    return { address: token.address, decimals: token.decimals };
+  const normalized = normalizeTokenSymbol(symbol);
+  const candidates = SYMBOL_ALIASES[normalized] ?? [normalized];
+  for (const candidate of candidates) {
+    const token = chainEntry.tokens.find(
+      (t) => t.symbol.toUpperCase() === candidate
+    );
+    if (token) {
+      return { address: token.address, decimals: token.decimals };
+    }
   }
   return void 0;
 }
@@ -346,8 +411,14 @@ function getUsdcDecimals(chainId) {
 }
 function getTokenAddress(symbol, chainId) {
   if (symbol.toUpperCase() === "ETH") {
+    if (!isSymbolSupportedOnChain("ETH", chainId)) {
+      return void 0;
+    }
     return NATIVE_TOKEN_ADDRESS;
   }
+  if (!isSymbolSupportedOnChain(symbol, chainId)) {
+    return void 0;
+  }
   const token = getTokenFromRegistry(chainId, symbol);
   return token?.address;
 }
@@ -358,6 +429,61 @@ function getTokenDecimals(symbol, chainId) {
   const token = getTokenFromRegistry(chainId, symbol);
   return token?.decimals ?? 18;
 }
+function getSupportedTokenSymbolsForChain(chainId) {
+  const symbols = SUPPORTED_TOKENS_BY_CHAIN[chainId] ?? [];
+  return [...symbols];
+}
+function getSupportedChainIds() {
+  return [...SUPPORTED_CHAIN_IDS];
+}
+function isSupportedTokenAddressForChain(token, chainId) {
+  const normalized = token.toLowerCase();
+  if (normalized === NATIVE_TOKEN_ADDRESS) {
+    return isSymbolSupportedOnChain("ETH", chainId);
+  }
+  const symbol = getTokenSymbol(token, chainId);
+  if (!symbol || symbol === "Token") return false;
+  if (!isSymbolSupportedOnChain(symbol, chainId)) return false;
+  const expected = getTokenFromRegistry(chainId, symbol);
+  if (!expected) return false;
+  return expected.address.toLowerCase() === normalized;
+}
+function getSupportedTargetTokens(chainId) {
+  const symbols = getSupportedTokenSymbolsForChain(chainId);
+  const options = [];
+  for (const symbol of symbols) {
+    const address = getTokenAddress(symbol, chainId);
+    if (!address) continue;
+    options.push({
+      symbol,
+      address,
+      decimals: getTokenDecimals(symbol, chainId)
+    });
+  }
+  return options;
+}
+function getTokenDecimalsByAddress(token, chainId) {
+  const normalized = token.toLowerCase();
+  if (normalized === NATIVE_TOKEN_ADDRESS) {
+    return 18;
+  }
+  if (chainId) {
+    const chainEntry = import_shared_configs.chainRegistry[String(chainId)];
+    if (chainEntry) {
+      const found = chainEntry.tokens.find(
+        (t) => t.address.toLowerCase() === normalized
+      );
+      if (found) return found.decimals;
+    }
+  }
+  for (const chainEntry of Object.values(import_shared_configs.chainRegistry)) {
+    const found = chainEntry.tokens.find(
+      (t) => t.address.toLowerCase() === normalized
+    );
+    if (found) return found.decimals;
+  }
+  return 18;
+}
 function findChainIdForToken(address) {
   const normalized = address.toLowerCase();
   for (const [chainIdStr, chainEntry] of Object.entries(import_shared_configs.chainRegistry)) {
@@ -380,21 +506,26 @@ function getTokenSymbol(token, chainId) {
       const found = chainEntry.tokens.find(
         (t) => t.address.toLowerCase() === normalized
       );
-      if (found) return found.symbol;
+      if (found)
+        return CANONICAL_SYMBOL_BY_REGISTRY_SYMBOL[found.symbol.toUpperCase()] ?? found.symbol;
     }
   }
   for (const chainEntry of Object.values(import_shared_configs.chainRegistry)) {
     const found = chainEntry.tokens.find(
       (t) => t.address.toLowerCase() === normalized
     );
-    if (found) return found.symbol;
+    if (found)
+      return CANONICAL_SYMBOL_BY_REGISTRY_SYMBOL[found.symbol.toUpperCase()] ?? found.symbol;
   }
   return "Token";
 }
 var CHAIN_BADGES = {
+  [import_chains.mainnet.id]: { shortLabel: "ETH", color: "#627EEA", bg: "#EEF2FF" },
   [import_chains.base.id]: { shortLabel: "Base", color: "#0052FF", bg: "#E7F0FF" },
   [import_chains.optimism.id]: { shortLabel: "OP", color: "#FF0420", bg: "#FFE9EC" },
-  [import_chains.arbitrum.id]: { shortLabel: "Arb", color: "#28A0F0", bg: "#E6F6FF" }
+  [import_chains.arbitrum.id]: { shortLabel: "Arb", color: "#28A0F0", bg: "#E6F6FF" },
+  [import_chains.polygon.id]: { shortLabel: "Matic", color: "#8247E5", bg: "#EFE7FF" },
+  [import_chains.bsc.id]: { shortLabel: "BSC", color: "#F3BA2F", bg: "#FFF8E0" }
 };
 function getChainName(chainId) {
   const chain = CHAIN_BY_ID[chainId];
@@ -424,9 +555,12 @@ function getExplorerName(chainId) {
   return chain?.blockExplorers?.default?.name ?? "Explorer";
 }
 var CHAIN_ICONS = {
+  [import_chains.mainnet.id]: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 784.37 1277.39'%3E%3Cpolygon fill='%23627EEA' points='392.07 0 383.5 29.11 383.5 873.74 392.07 882.29 784.13 650.54'/%3E%3Cpolygon fill='%23C0CBF6' points='392.07 0 0 650.54 392.07 882.29 392.07 472.33'/%3E%3Cpolygon fill='%238EA2F2' points='392.07 956.52 387.24 962.41 387.24 1263.28 392.07 1277.38 784.37 724.89'/%3E%3Cpolygon fill='%23C0CBF6' points='392.07 1277.38 392.07 956.52 0 724.89'/%3E%3Cpolygon fill='%23627EEA' points='392.07 882.29 784.13 650.54 392.07 472.33'/%3E%3Cpolygon fill='%238EA2F2' points='0 650.54 392.07 882.29 392.07 472.33'/%3E%3C/svg%3E",
   [import_chains.base.id]: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 111 111'%3E%3Ccircle cx='55.5' cy='55.5' r='55.5' fill='%230052FF'/%3E%3Cpath d='M54.921 93.4c20.942 0 37.92-16.978 37.92-37.921S75.863 17.558 54.92 17.558c-19.498 0-35.57 14.725-37.655 33.647h49.82v5.548h-49.82C19.351 75.675 35.423 93.4 54.921 93.4z' fill='%23fff'/%3E%3C/svg%3E",
   [import_chains.optimism.id]: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 500 500'%3E%3Ccircle cx='250' cy='250' r='250' fill='%23FF0420'/%3E%3Cpath fill='%23fff' d='M177.1 316.4c-14.9 0-27.1-3.5-36.6-10.5-9.4-7.1-14.1-17.3-14.1-30.4 0-2.8.3-6.1.9-10.1 1.6-9 3.9-19.8 6.9-32.5 8.5-34.4 30.5-51.6 65.9-51.6 9.6 0 18.3 1.6 25.9 4.9 7.6 3.1 13.6 7.9 18 14.3 4.4 6.3 6.6 13.8 6.6 22.5 0 2.6-.3 5.9-.9 9.9-1.9 11.1-4.1 22-6.8 32.5-4.4 17.1-11.9 30-22.7 38.5-10.6 8.2-25 12.3-42.9 12.3zm2.7-27c7 0 12.9-2.1 17.8-6.2 5-4.1 8.6-10.4 10.7-19 2.9-11.8 5.1-22 6.6-30.8.5-2.6.8-5.3.8-8.1 0-11.4-5.9-17.1-17.8-17.1-7 0-13 2.1-18 6.2-4.9 4.1-8.4 10.4-10.5 19-2.3 8.4-4.5 18.6-6.8 30.8-.5 2.5-.8 5.1-.8 7.9 0 11.6 6.1 17.3 18.1 17.3zm79.5 25.2c-1.4 0-2.4-.4-3.2-1.3-.6-1-.8-2.1-.6-3.4l25.9-122c.2-1.4.9-2.5 2.1-3.4 1.1-.9 2.3-1.3 3.6-1.3H337c13.9 0 25 2.9 33.4 8.6 8.5 5.8 12.8 14.1 12.8 25 0 3.1-.4 6.4-1.1 9.8-3.1 14.4-9.4 25-19 31.9-9.4 6.9-22.3 10.3-38.7 10.3h-25.3l-8.6 41.1c-.3 1.4-.9 2.5-2.1 3.4-1.1.9-2.3 1.3-3.6 1.3h-25.5zm66.4-71.7c5.3 0 9.8-1.4 13.7-4.3 4-2.9 6.6-7 7.9-12.4.4-2.1.6-4 .6-5.6 0-3.6-1.1-6.4-3.2-8.3-2.1-2-5.8-3-10.9-3h-22.5l-7.1 33.6h21.5z'/%3E%3C/svg%3E",
-  [import_chains.arbitrum.id]: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 2500 2500'%3E%3Crect fill='none' width='2500' height='2500'/%3E%3Cpath fill='%23213147' d='M226 760v980c0 63 33 120 88 152l849 490c54 31 121 31 175 0l849-490c54-31 88-89 88-152V760c0-63-33-120-88-152l-849-490c-54-31-121-31-175 0L314 608c-54 31-87 89-87 152z'/%3E%3Cpath fill='%2312AAFF' d='M1435 1440l-121 332c-3 9-3 19 0 29l208 571 241-139-289-793c-7-18-32-18-39 0zm243-558c-7-18-32-18-39 0l-121 332c-3 9-3 19 0 29l341 935 241-139-422-1156z'/%3E%3Cpath fill='%239DCCED' d='M1250 155c6 0 12 2 17 5l918 530c11 6 17 18 17 30v1060c0 12-7 24-17 30l-918 530c-5 3-11 5-17 5s-12-2-17-5l-918-530c-11-6-17-18-17-30V719c0-12 7-24 17-30l918-530c5-3 11-5 17-5zm0-155c-33 0-65 8-95 25L237 555c-59 34-95 96-95 164v1060c0 68 36 130 95 164l918 530c29 17 62 25 95 25s65-8 95-25l918-530c59-34 95-96 95-164V719c0-68-36-130-95-164L1344 25c-29-17-62-25-95-25z'/%3E%3Cpolygon fill='%23213147' points='642 2179 727 1947 897 2088 738 2234'/%3E%3Cpath fill='%23fff' d='M1172 644H939c-17 0-33 11-39 27L401 2039l241 139 550-1507c5-14-5-28-19-28zm408 0h-233c-17 0-33 11-39 27L738 2233l241 139 620-1701c5-14-5-28-19-28z'/%3E%3C/svg%3E"
+  [import_chains.arbitrum.id]: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 2500 2500'%3E%3Crect fill='none' width='2500' height='2500'/%3E%3Cpath fill='%23213147' d='M226 760v980c0 63 33 120 88 152l849 490c54 31 121 31 175 0l849-490c54-31 88-89 88-152V760c0-63-33-120-88-152l-849-490c-54-31-121-31-175 0L314 608c-54 31-87 89-87 152z'/%3E%3Cpath fill='%2312AAFF' d='M1435 1440l-121 332c-3 9-3 19 0 29l208 571 241-139-289-793c-7-18-32-18-39 0zm243-558c-7-18-32-18-39 0l-121 332c-3 9-3 19 0 29l341 935 241-139-422-1156z'/%3E%3Cpath fill='%239DCCED' d='M1250 155c6 0 12 2 17 5l918 530c11 6 17 18 17 30v1060c0 12-7 24-17 30l-918 530c-5 3-11 5-17 5s-12-2-17-5l-918-530c-11-6-17-18-17-30V719c0-12 7-24 17-30l918-530c5-3 11-5 17-5zm0-155c-33 0-65 8-95 25L237 555c-59 34-95 96-95 164v1060c0 68 36 130 95 164l918 530c29 17 62 25 95 25s65-8 95-25l918-530c59-34 95-96 95-164V719c0-68-36-130-95-164L1344 25c-29-17-62-25-95-25z'/%3E%3Cpolygon fill='%23213147' points='642 2179 727 1947 897 2088 738 2234'/%3E%3Cpath fill='%23fff' d='M1172 644H939c-17 0-33 11-39 27L401 2039l241 139 550-1507c5-14-5-28-19-28zm408 0h-233c-17 0-33 11-39 27L738 2233l241 139 620-1701c5-14-5-28-19-28z'/%3E%3C/svg%3E",
+  [import_chains.polygon.id]: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 38 33'%3E%3Cpath fill='%238247E5' d='M29.6 10.1c-.4-.2-.9-.2-1.3 0l-3 1.7-2-1.2-3-1.7c-.4-.2-.9-.2-1.3 0l-3 1.7-2 1.2-3 1.7c-.4.2-.7.7-.7 1.1v3.5c0 .5.3.9.7 1.1l3 1.7 2 1.2 3 1.7c.4.2.9.2 1.3 0l3-1.7 2-1.2 3-1.7c.4-.2.7-.7.7-1.1v-3.5c0-.5-.3-.9-.7-1.1l-3-1.7 2-1.2 3-1.7c.4-.2.7-.7.7-1.1V8.4c0-.5-.3-.9-.7-1.1l-3-1.7-2-1.2-3-1.7c-.4-.2-.9-.2-1.3 0l-3 1.7-2 1.2-3 1.7c-.4.2-.7.7-.7 1.1v3.5c0 .5.3.9.7 1.1l3 1.7-2 1.2-3 1.7c-.4.2-.7.7-.7 1.1v3.5c0 .5.3.9.7 1.1l3 1.7 2 1.2 3 1.7c.4.2.9.2 1.3 0l3-1.7 2-1.2 3-1.7c.4-.2.7-.7.7-1.1v-3.5c0-.5-.3-.9-.7-1.1l-3-1.7 2-1.2 3-1.7c.4-.2.7-.7.7-1.1V11.2c0-.5-.3-.9-.7-1.1z'/%3E%3C/svg%3E",
+  [import_chains.bsc.id]: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 96 96'%3E%3Ccircle cx='48' cy='48' r='48' fill='%23F3BA2F'/%3E%3Cpath fill='%23fff' d='M48 19.2l7.2 7.2-18 18-7.2-7.2 18-18zm18 18l7.2 7.2-18 18-7.2-7.2 18-18zM30 37.2l7.2 7.2-7.2 7.2-7.2-7.2 7.2-7.2zm36 0l7.2 7.2-7.2 7.2-7.2-7.2 7.2-7.2zm-18 18l7.2 7.2-7.2 7.2-7.2-7.2 7.2-7.2z'/%3E%3C/svg%3E"
 };
 var TOKEN_ICONS = {
   USDC: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 2000 2000'%3E%3Cpath d='M1000 2000c554.17 0 1000-445.83 1000-1000S1554.17 0 1000 0 0 445.83 0 1000s445.83 1000 1000 1000z' fill='%232775ca'/%3E%3Cpath d='M1275 1158.33c0-145.83-87.5-195.83-262.5-216.66-125-16.67-150-50-150-108.34s41.67-95.83 125-95.83c75 0 116.67 25 137.5 87.5 4.17 12.5 16.67 20.83 29.17 20.83h66.66c16.67 0 29.17-12.5 29.17-29.16v-4.17c-16.67-91.67-91.67-162.5-187.5-170.83v-100c0-16.67-12.5-29.17-33.33-33.34h-62.5c-16.67 0-29.17 12.5-33.34 33.34v95.83c-125 16.67-204.16 100-204.16 204.17 0 137.5 83.33 191.66 258.33 212.5 116.67 20.83 154.17 45.83 154.17 112.5s-58.34 112.5-137.5 112.5c-108.34 0-145.84-45.84-158.34-108.34-4.16-16.66-16.66-25-29.16-25h-70.84c-16.66 0-29.16 12.5-29.16 29.17v4.17c16.66 104.16 83.33 179.16 220.83 200v100c0 16.66 12.5 29.16 33.33 33.33h62.5c16.67 0 29.17-12.5 33.34-33.33v-100c125-20.84 208.33-108.34 208.33-220.84z' fill='%23fff'/%3E%3Cpath d='M787.5 1595.83c-325-116.66-491.67-479.16-370.83-800 62.5-175 200-308.33 370.83-370.83 16.67-8.33 25-20.83 25-41.67V325c0-16.67-8.33-29.17-25-33.33-4.17 0-12.5 0-16.67 4.16-395.83 125-612.5 545.84-487.5 941.67 75 233.33 254.17 412.5 487.5 487.5 16.67 8.33 33.34 0 37.5-16.67 4.17-4.16 4.17-8.33 4.17-16.66v-58.34c0-12.5-12.5-29.16-25-37.5zm441.67-1300c-16.67-8.33-33.34 0-37.5 16.67-4.17 4.17-4.17 8.33-4.17 16.67v58.33c0 16.67 12.5 33.33 25 41.67 325 116.66 491.67 479.16 370.83 800-62.5 175-200 308.33-370.83 370.83-16.67 8.33-25 20.83-25 41.67V1700c0 16.67 8.33 29.17 25 33.33 4.17 0 12.5 0 16.67-4.16 395.83-125 612.5-545.84 487.5-941.67-75-237.5-258.34-416.67-487.5-491.67z' fill='%23fff'/%3E%3C/svg%3E",
@@ -517,12 +651,29 @@ async function signEnableSessionWithOwner(rhinestoneAccount, sessionDetails, sig
     rhinestoneAccount.config.owners = originalOwners;
   }
 }
-async function getSessionDetails(rhinestoneAccount, targetChain, signerAddress, sessionSigner) {
-  const allChains = [...SUPPORTED_CHAINS];
-  if (!allChains.some((c) => c.id === targetChain.id)) {
-    allChains.push(targetChain);
+async function getSessionDetails(rhinestoneAccount, targetChain, signerAddress, sessionSigner, targetToken) {
+  const isTargetTestnet = Boolean(targetChain.testnet);
+  const chainsByNetworkType = SUPPORTED_CHAINS.filter(
+    (chain) => Boolean(chain.testnet) === isTargetTestnet
+  );
+  let selectedChains = [...chainsByNetworkType];
+  if (targetToken) {
+    const targetSymbol = getTokenSymbol(targetToken, targetChain.id).toUpperCase();
+    if (targetSymbol && targetSymbol !== "TOKEN") {
+      const chainsForToken = selectedChains.filter(
+        (chain) => getSupportedTokenSymbolsForChain(chain.id).includes(targetSymbol)
+      );
+      if (chainsForToken.length > 0) {
+        selectedChains = chainsForToken;
+      }
+    }
+  }
+  if (!selectedChains.some((c) => c.id === targetChain.id)) {
+    selectedChains.push(targetChain);
   }
-  const sessions = allChains.map((chain) => buildSession(chain, signerAddress));
+  const sessions = selectedChains.map(
+    (chain) => buildSession(chain, signerAddress)
+  );
   const sessionDetails = await rhinestoneAccount.experimental_getSessionDetails(sessions);
   const enableSignature = sessionSigner ? await signEnableSessionWithOwner(
     rhinestoneAccount,
@@ -647,7 +798,8 @@ function SetupStep({
         account,
         targetChainObj,
         signerAddress,
-        sessionOwner.account
+        sessionOwner.account,
+        targetToken
       );
       setState({ type: "registering" });
       await service.registerAccount({
@@ -921,16 +1073,29 @@ function normalizeOrchestratorPortfolio(data) {
     const chainBalances = tokenData.tokenChainBalance ?? tokenData.chainBalances ?? [];
     for (const chainBalance of chainBalances) {
       const unlocked = chainBalance.balance?.unlocked ?? "0";
+      const normalizedName = tokenData.tokenName.trim();
+      const isNativeSymbol = normalizedName.toUpperCase() === "ETH" || normalizedName.toUpperCase() === "ETHER";
       const tokenAddress = chainBalance.tokenAddress ?? extractTokenAddress(tokenData, chainBalance.chainId) ?? getTokenAddress(tokenData.tokenName, chainBalance.chainId);
-      if (!tokenAddress) {
+      const resolvedTokenAddress = isNativeSymbol ? NATIVE_TOKEN_ADDRESS : tokenAddress;
+      if (!resolvedTokenAddress) {
         continue;
       }
+      if (!isSupportedTokenAddressForChain(
+        resolvedTokenAddress,
+        chainBalance.chainId
+      )) {
+        continue;
+      }
+      const symbol = getTokenSymbol(resolvedTokenAddress, chainBalance.chainId);
       tokens.push({
         chainId: chainBalance.chainId,
-        address: tokenAddress,
-        symbol: tokenData.tokenName,
-        name: tokenData.tokenName,
-        decimals: tokenData.tokenDecimals,
+        address: resolvedTokenAddress,
+        symbol,
+        name: symbol,
+        decimals: getTokenDecimalsByAddress(
+          resolvedTokenAddress,
+          chainBalance.chainId
+        ),
         balance: unlocked,
         balanceUsd: 0
       });
@@ -946,9 +1111,6 @@ function normalizeDirectToken(token) {
   if (!chainId) return null;
   const symbol = extractString(token, "symbol") ?? extractString(token, "tokenSymbol") ?? extractString(token, "tokenName") ?? extractString(token, "name");
   if (!symbol) return null;
-  const name = extractString(token, "name") ?? extractString(token, "tokenName") ?? symbol;
-  const decimals = extractNumber(token, "decimals") ?? extractNumber(token, "tokenDecimals");
-  if (decimals === null) return null;
   const balanceValue = extractString(token, "balance") ?? extractString(token, "amount") ?? extractString(token, "value") ?? extractString(token, "rawBalance") ?? extractNumber(token, "balance")?.toString() ?? extractNumber(token, "amount")?.toString() ?? extractNumber(token, "value")?.toString() ?? extractNumber(token, "rawBalance")?.toString();
   if (!balanceValue) return null;
   const address = extractString(token, "address") ?? extractString(token, "tokenAddress") ?? extractString(
@@ -956,13 +1118,15 @@ function normalizeDirectToken(token) {
     "address"
   ) ?? getTokenAddress(symbol, chainId);
   if (!address) return null;
+  const addressAsToken = address;
+  if (!isSupportedTokenAddressForChain(addressAsToken, chainId)) return null;
   const balanceUsd = extractNumber(token, "balanceUsd") ?? extractNumber(token, "usdValue") ?? extractNumber(token, "valueUsd") ?? extractNumericString(token, "balanceUsd") ?? extractNumericString(token, "usdValue") ?? extractNumericString(token, "valueUsd") ?? 0;
   return {
     chainId,
-    address,
-    symbol,
-    name,
-    decimals,
+    address: addressAsToken,
+    symbol: getTokenSymbol(addressAsToken, chainId),
+    name: getTokenSymbol(addressAsToken, chainId),
+    decimals: getTokenDecimalsByAddress(addressAsToken, chainId),
     balance: balanceValue,
     balanceUsd
   };
@@ -1272,29 +1436,30 @@ function AssetSelectStep({
 }
 async function fetchNativeAssets(address, publicClient, existing) {
   const existingIds = new Set(existing.map((asset) => asset.id));
-  const settled = await Promise.allSettled(
-    SOURCE_CHAINS.map(async (chain) => {
-      const id = getAssetId({ chainId: chain.id, token: NATIVE_TOKEN_ADDRESS });
-      if (existingIds.has(id)) return null;
-      const balance = await publicClient.getBalance({ address });
-      return {
+  const connectedChainId = publicClient.chain?.id;
+  if (!connectedChainId) return [];
+  if (!SOURCE_CHAINS.some((chain) => chain.id === connectedChainId)) return [];
+  const id = getAssetId({
+    chainId: connectedChainId,
+    token: NATIVE_TOKEN_ADDRESS
+  });
+  if (existingIds.has(id)) return [];
+  try {
+    const balance = await publicClient.getBalance({ address });
+    return [
+      {
         id,
-        chainId: chain.id,
+        chainId: connectedChainId,
         token: NATIVE_TOKEN_ADDRESS,
         symbol: "ETH",
         name: "Ethereum",
         decimals: 18,
         balance: balance.toString()
-      };
-    })
-  );
-  const results = [];
-  for (const r of settled) {
-    if (r.status === "fulfilled" && r.value !== null) {
-      results.push(r.value);
-    }
+      }
+    ];
+  } catch {
+    return [];
   }
-  return results;
 }
 function mergeAssets(existing, incoming) {
   if (incoming.length === 0) return existing;
@@ -2174,7 +2339,7 @@ function ProcessingStep({
   };
   const sourceSymbol = getTokenSymbol(sourceToken, sourceChain);
   const targetSymbol = getTokenSymbol(targetToken, targetChain);
-  const sourceDecimals = getTokenDecimals(sourceSymbol, sourceChain);
+  const sourceDecimals = getTokenDecimalsByAddress(sourceToken, sourceChain);
   const formattedReceivedAmount = (() => {
     try {
       const raw = (0, import_viem6.formatUnits)(BigInt(amount), sourceDecimals);
@@ -3078,6 +3243,7 @@ function WithdrawFormStep({
   targetChain,
   targetToken,
   targetChains,
+  targetTokenOptions,
   onTargetChainChange,
   onTargetTokenChange,
   switchChain,
@@ -3110,9 +3276,6 @@ function WithdrawFormStep({
   const targetSymbol = getTokenSymbol(targetToken, targetChain);
   const targetChainName = getChainName(targetChain);
   const isBusy = submitting || isSubmitting;
-  const targetTokenOptions = (0, import_react9.useMemo)(() => {
-    return [{ address: targetToken, symbol: targetSymbol }];
-  }, [targetToken, targetSymbol]);
   (0, import_react9.useEffect)(() => {
     if (chainMismatch && switchChain && !hasAttemptedSwitch.current) {
       hasAttemptedSwitch.current = true;
@@ -3151,9 +3314,16 @@ function WithdrawFormStep({
         }
       }
     }
-    fetchBalance();
+    void fetchBalance();
+    const unwatch = publicClient.watchBlockNumber({
+      emitOnBegin: false,
+      onBlockNumber() {
+        void fetchBalance();
+      }
+    });
     return () => {
       active = false;
+      unwatch();
     };
   }, [safeAddress, publicClient, publicClientChainId, asset]);
   const formattedBalance = (0, import_react9.useMemo)(() => {
@@ -3171,7 +3341,8 @@ function WithdrawFormStep({
   }, [balance, asset.decimals]);
   (0, import_react9.useEffect)(() => {
     if (balance === null) return;
-    if (asset.symbol.toUpperCase() !== "USDC") return;
+    const sym = asset.symbol.toUpperCase();
+    if (sym !== "USDC" && sym !== "USDT") return;
     try {
       const raw = (0, import_viem7.formatUnits)(balance, asset.decimals);
       const numeric = Number(raw);
@@ -3185,7 +3356,8 @@ function WithdrawFormStep({
     if (!amount) return null;
     const parsed = Number(amount);
     if (!Number.isFinite(parsed) || parsed <= 0) return null;
-    if (asset.symbol.toUpperCase() === "USDC") {
+    const sym = asset.symbol.toUpperCase();
+    if (sym === "USDC" || sym === "USDT") {
       return parsed;
     }
     return null;
@@ -3817,7 +3989,7 @@ function WithdrawFlow({
   const targetChainObj = (0, import_react10.useMemo)(() => CHAIN_BY_ID[targetChain], [targetChain]);
   const asset = (0, import_react10.useMemo)(() => {
     const symbol = getTokenSymbol(sourceToken, sourceChain);
-    const decimals = getTokenDecimals(symbol, sourceChain);
+    const decimals = getTokenDecimalsByAddress(sourceToken, sourceChain);
     return {
       id: getAssetId({ chainId: sourceChain, token: sourceToken }),
       chainId: sourceChain,
@@ -3885,7 +4057,8 @@ function WithdrawFlow({
           account,
           targetChainObj,
           signerAddress,
-          sessionOwner.account
+          sessionOwner.account,
+          targetToken
         );
         await service.registerAccount({
           address: smartAccount,
@@ -3975,22 +4148,38 @@ function WithdrawFlow({
     [onWithdrawFailed]
   );
   const targetChainOptions = (0, import_react10.useMemo)(() => {
-    if (isSourceNative) return SOURCE_CHAINS;
-    return SOURCE_CHAINS.filter((chain) => Boolean(getUsdcAddress(chain.id)));
-  }, [isSourceNative]);
+    return SOURCE_CHAINS.filter(
+      (chain) => getSupportedTargetTokens(chain.id).length > 0
+    );
+  }, []);
+  const targetTokenOptions = (0, import_react10.useMemo)(
+    () => getSupportedTargetTokens(targetChain),
+    [targetChain]
+  );
+  (0, import_react10.useEffect)(() => {
+    if (targetTokenOptions.length === 0) return;
+    const matches = targetTokenOptions.some(
+      (option) => option.address.toLowerCase() === targetToken.toLowerCase()
+    );
+    if (!matches) {
+      setTargetToken(targetTokenOptions[0].address);
+    }
+  }, [targetToken, targetTokenOptions]);
   const handleTargetChainChange = (0, import_react10.useCallback)(
     (chainId) => {
       setTargetChain(chainId);
-      if (isSourceNative) {
-        setTargetToken(NATIVE_TOKEN_ADDRESS);
+      const options = getSupportedTargetTokens(chainId);
+      if (options.length === 0) {
         return;
       }
-      const nextToken = getUsdcAddress(chainId);
-      if (nextToken) {
-        setTargetToken(nextToken);
-      }
+      const currentlySupported = options.some(
+        (option) => option.address.toLowerCase() === targetToken.toLowerCase()
+      );
+      setTargetToken(
+        currentlySupported ? targetToken : options[0].address
+      );
     },
-    [isSourceNative]
+    [targetToken]
   );
   const handleTargetTokenChange = (0, import_react10.useCallback)((token) => {
     setTargetToken(token);
@@ -4018,6 +4207,7 @@ function WithdrawFlow({
         targetChain,
         targetToken,
         targetChains: targetChainOptions,
+        targetTokenOptions,
         onTargetChainChange: handleTargetChainChange,
         onTargetTokenChange: handleTargetTokenChange,
         switchChain,
@@ -4272,10 +4462,15 @@ WithdrawModal.displayName = "WithdrawModal";
   getExplorerName,
   getExplorerTxUrl,
   getExplorerUrl,
+  getSupportedChainIds,
+  getSupportedTargetTokens,
+  getSupportedTokenSymbolsForChain,
   getTokenAddress,
   getTokenDecimals,
+  getTokenDecimalsByAddress,
   getTokenIcon,
   getTokenSymbol,
   getUsdcAddress,
-  getUsdcDecimals
+  getUsdcDecimals,
+  isSupportedTokenAddressForChain
 });

package/dist/index.d.cts

@@ -149,15 +149,25 @@ declare namespace WithdrawModal {
 declare const DEFAULT_BACKEND_URL = "https://v1.orchestrator.rhinestone.dev/deposit-widget";
 declare const DEFAULT_SIGNER_ADDRESS: Address;
 declare const NATIVE_TOKEN_ADDRESS: Address;
-declare const SOURCE_CHAINS: Chain$1[];
 declare const CHAIN_BY_ID: Record<number, Chain$1>;
+declare const SOURCE_CHAINS: Chain$1[];
 declare const SUPPORTED_CHAINS: Chain$1[];
+type SupportedTokenOption = {
+    symbol: string;
+    address: Address;
+    decimals: number;
+};
 declare function getChainId(chain: Chain$1 | number): number;
 declare function getChainObject(chain: Chain$1 | number): Chain$1 | undefined;
 declare function getUsdcAddress(chainId: number): Address | undefined;
 declare function getUsdcDecimals(chainId: number): number;
 declare function getTokenAddress(symbol: string, chainId: number): Address | undefined;
 declare function getTokenDecimals(symbol: string, chainId: number): number;
+declare function getSupportedTokenSymbolsForChain(chainId: number): string[];
+declare function getSupportedChainIds(): number[];
+declare function isSupportedTokenAddressForChain(token: Address, chainId: number): boolean;
+declare function getSupportedTargetTokens(chainId: number): SupportedTokenOption[];
+declare function getTokenDecimalsByAddress(token: Address, chainId?: number): number;
 declare function findChainIdForToken(address: Address): number | undefined;
 declare function getTokenSymbol(token: Address, chainId?: number): string;
 declare function getChainName(chainId: number): string;
@@ -172,4 +182,4 @@ declare function getExplorerName(chainId: number): string;
 declare function getChainIcon(chainId: number): string | undefined;
 declare function getTokenIcon(symbol: string): string | undefined;
 
-export { type AssetOption, CHAIN_BY_ID, type ConnectedEventData, DEFAULT_BACKEND_URL, DEFAULT_SIGNER_ADDRESS, type DepositCompleteEventData, type DepositFailedEventData, DepositModal, type DepositModalBranding, type DepositModalProps, type DepositModalTheme, type DepositModalUIConfig, type DepositSubmittedEventData, type ErrorEventData, NATIVE_TOKEN_ADDRESS, SOURCE_CHAINS, SUPPORTED_CHAINS, type WithdrawCompleteEventData, type WithdrawFailedEventData, WithdrawModal, type WithdrawModalProps, type WithdrawSubmittedEventData, findChainIdForToken, getChainBadge, getChainIcon, getChainId, getChainName, getChainObject, getExplorerName, getExplorerTxUrl, getExplorerUrl, getTokenAddress, getTokenDecimals, getTokenIcon, getTokenSymbol, getUsdcAddress, getUsdcDecimals };
+export { type AssetOption, CHAIN_BY_ID, type ConnectedEventData, DEFAULT_BACKEND_URL, DEFAULT_SIGNER_ADDRESS, type DepositCompleteEventData, type DepositFailedEventData, DepositModal, type DepositModalBranding, type DepositModalProps, type DepositModalTheme, type DepositModalUIConfig, type DepositSubmittedEventData, type ErrorEventData, NATIVE_TOKEN_ADDRESS, SOURCE_CHAINS, SUPPORTED_CHAINS, type WithdrawCompleteEventData, type WithdrawFailedEventData, WithdrawModal, type WithdrawModalProps, type WithdrawSubmittedEventData, findChainIdForToken, getChainBadge, getChainIcon, getChainId, getChainName, getChainObject, getExplorerName, getExplorerTxUrl, getExplorerUrl, getSupportedChainIds, getSupportedTargetTokens, getSupportedTokenSymbolsForChain, getTokenAddress, getTokenDecimals, getTokenDecimalsByAddress, getTokenIcon, getTokenSymbol, getUsdcAddress, getUsdcDecimals, isSupportedTokenAddressForChain };

package/dist/index.d.ts

@@ -149,15 +149,25 @@ declare namespace WithdrawModal {
 declare const DEFAULT_BACKEND_URL = "https://v1.orchestrator.rhinestone.dev/deposit-widget";
 declare const DEFAULT_SIGNER_ADDRESS: Address;
 declare const NATIVE_TOKEN_ADDRESS: Address;
-declare const SOURCE_CHAINS: Chain$1[];
 declare const CHAIN_BY_ID: Record<number, Chain$1>;
+declare const SOURCE_CHAINS: Chain$1[];
 declare const SUPPORTED_CHAINS: Chain$1[];
+type SupportedTokenOption = {
+    symbol: string;
+    address: Address;
+    decimals: number;
+};
 declare function getChainId(chain: Chain$1 | number): number;
 declare function getChainObject(chain: Chain$1 | number): Chain$1 | undefined;
 declare function getUsdcAddress(chainId: number): Address | undefined;
 declare function getUsdcDecimals(chainId: number): number;
 declare function getTokenAddress(symbol: string, chainId: number): Address | undefined;
 declare function getTokenDecimals(symbol: string, chainId: number): number;
+declare function getSupportedTokenSymbolsForChain(chainId: number): string[];
+declare function getSupportedChainIds(): number[];
+declare function isSupportedTokenAddressForChain(token: Address, chainId: number): boolean;
+declare function getSupportedTargetTokens(chainId: number): SupportedTokenOption[];
+declare function getTokenDecimalsByAddress(token: Address, chainId?: number): number;
 declare function findChainIdForToken(address: Address): number | undefined;
 declare function getTokenSymbol(token: Address, chainId?: number): string;
 declare function getChainName(chainId: number): string;
@@ -172,4 +182,4 @@ declare function getExplorerName(chainId: number): string;
 declare function getChainIcon(chainId: number): string | undefined;
 declare function getTokenIcon(symbol: string): string | undefined;
 
-export { type AssetOption, CHAIN_BY_ID, type ConnectedEventData, DEFAULT_BACKEND_URL, DEFAULT_SIGNER_ADDRESS, type DepositCompleteEventData, type DepositFailedEventData, DepositModal, type DepositModalBranding, type DepositModalProps, type DepositModalTheme, type DepositModalUIConfig, type DepositSubmittedEventData, type ErrorEventData, NATIVE_TOKEN_ADDRESS, SOURCE_CHAINS, SUPPORTED_CHAINS, type WithdrawCompleteEventData, type WithdrawFailedEventData, WithdrawModal, type WithdrawModalProps, type WithdrawSubmittedEventData, findChainIdForToken, getChainBadge, getChainIcon, getChainId, getChainName, getChainObject, getExplorerName, getExplorerTxUrl, getExplorerUrl, getTokenAddress, getTokenDecimals, getTokenIcon, getTokenSymbol, getUsdcAddress, getUsdcDecimals };
+export { type AssetOption, CHAIN_BY_ID, type ConnectedEventData, DEFAULT_BACKEND_URL, DEFAULT_SIGNER_ADDRESS, type DepositCompleteEventData, type DepositFailedEventData, DepositModal, type DepositModalBranding, type DepositModalProps, type DepositModalTheme, type DepositModalUIConfig, type DepositSubmittedEventData, type ErrorEventData, NATIVE_TOKEN_ADDRESS, SOURCE_CHAINS, SUPPORTED_CHAINS, type WithdrawCompleteEventData, type WithdrawFailedEventData, WithdrawModal, type WithdrawModalProps, type WithdrawSubmittedEventData, findChainIdForToken, getChainBadge, getChainIcon, getChainId, getChainName, getChainObject, getExplorerName, getExplorerTxUrl, getExplorerUrl, getSupportedChainIds, getSupportedTargetTokens, getSupportedTokenSymbolsForChain, getTokenAddress, getTokenDecimals, getTokenDecimalsByAddress, getTokenIcon, getTokenSymbol, getUsdcAddress, getUsdcDecimals, isSupportedTokenAddressForChain };

package/dist/index.mjs

@@ -260,18 +260,68 @@ import { zeroAddress } from "viem";
 import { toAccount } from "viem/accounts";
 
 // src/core/constants.ts
-import { base, optimism, arbitrum } from "viem/chains";
+import {
+  arbitrum,
+  base,
+  bsc,
+  mainnet,
+  optimism,
+  polygon
+} from "viem/chains";
 import { chainRegistry } from "@rhinestone/shared-configs";
 var DEFAULT_BACKEND_URL = "https://v1.orchestrator.rhinestone.dev/deposit-widget";
 var DEFAULT_SIGNER_ADDRESS = "0xcc47aa2d96c35bc6aab12ffb0e2edab8042274bd";
 var NATIVE_TOKEN_ADDRESS = "0x0000000000000000000000000000000000000000";
-var SOURCE_CHAINS = [base, optimism, arbitrum];
-var CHAIN_BY_ID = {
+var ALL_CHAINS_BY_ID = {
+  [mainnet.id]: mainnet,
   [base.id]: base,
   [optimism.id]: optimism,
-  [arbitrum.id]: arbitrum
+  [arbitrum.id]: arbitrum,
+  [polygon.id]: polygon,
+  [bsc.id]: bsc
+};
+var SUPPORTED_TOKEN_MATRIX = {
+  ETH: [mainnet.id, base.id, arbitrum.id, optimism.id, polygon.id],
+  WETH: [mainnet.id, base.id, arbitrum.id, optimism.id, polygon.id],
+  USDC: [mainnet.id, base.id, arbitrum.id, optimism.id, polygon.id],
+  USDT: [mainnet.id, arbitrum.id, polygon.id, bsc.id]
+};
+var CHAIN_DISPLAY_ORDER = [
+  mainnet.id,
+  base.id,
+  arbitrum.id,
+  optimism.id,
+  polygon.id,
+  bsc.id
+];
+var supportedChainSet = /* @__PURE__ */ new Set();
+for (const chainIds of Object.values(SUPPORTED_TOKEN_MATRIX)) {
+  for (const chainId of chainIds) {
+    supportedChainSet.add(chainId);
+  }
+}
+var SUPPORTED_CHAIN_IDS = CHAIN_DISPLAY_ORDER.filter(
+  (chainId) => supportedChainSet.has(chainId) && Boolean(ALL_CHAINS_BY_ID[chainId])
+);
+var CHAIN_BY_ID = Object.fromEntries(
+  SUPPORTED_CHAIN_IDS.map((id) => [id, ALL_CHAINS_BY_ID[id]])
+);
+var SOURCE_CHAINS = SUPPORTED_CHAIN_IDS.map(
+  (id) => CHAIN_BY_ID[id]
+);
+var SUPPORTED_CHAINS = SOURCE_CHAINS;
+var SUPPORTED_TOKENS_BY_CHAIN = Object.fromEntries(
+  SUPPORTED_CHAIN_IDS.map((chainId) => {
+    const symbols = Object.entries(SUPPORTED_TOKEN_MATRIX).filter(([, chainIds]) => chainIds.includes(chainId)).map(([symbol]) => symbol);
+    return [chainId, symbols];
+  })
+);
+var SYMBOL_ALIASES = {
+  USDT: ["USDT", "USDT0"]
+};
+var CANONICAL_SYMBOL_BY_REGISTRY_SYMBOL = {
+  USDT0: "USDT"
 };
-var SUPPORTED_CHAINS = Object.values(CHAIN_BY_ID);
 function getChainId(chain) {
   return typeof chain === "number" ? chain : chain.id;
 }
@@ -281,15 +331,32 @@ function getChainObject(chain) {
   }
   return chain;
 }
+function normalizeTokenSymbol(symbol) {
+  const trimmed = symbol.trim();
+  const wrapped = trimmed.match(/\(([^)]+)\)/);
+  if (wrapped?.[1]) {
+    return wrapped[1].trim().toUpperCase();
+  }
+  const upper = trimmed.toUpperCase();
+  return CANONICAL_SYMBOL_BY_REGISTRY_SYMBOL[upper] ?? upper;
+}
+function isSymbolSupportedOnChain(symbol, chainId) {
+  const symbols = SUPPORTED_TOKENS_BY_CHAIN[chainId];
+  if (!symbols) return false;
+  return symbols.includes(normalizeTokenSymbol(symbol));
+}
 function getTokenFromRegistry(chainId, symbol) {
   const chainEntry = chainRegistry[String(chainId)];
   if (!chainEntry) return void 0;
-  const upperSymbol = symbol.toUpperCase();
-  const token = chainEntry.tokens.find(
-    (t) => t.symbol.toUpperCase() === upperSymbol
-  );
-  if (token) {
-    return { address: token.address, decimals: token.decimals };
+  const normalized = normalizeTokenSymbol(symbol);
+  const candidates = SYMBOL_ALIASES[normalized] ?? [normalized];
+  for (const candidate of candidates) {
+    const token = chainEntry.tokens.find(
+      (t) => t.symbol.toUpperCase() === candidate
+    );
+    if (token) {
+      return { address: token.address, decimals: token.decimals };
+    }
   }
   return void 0;
 }
@@ -303,8 +370,14 @@ function getUsdcDecimals(chainId) {
 }
 function getTokenAddress(symbol, chainId) {
   if (symbol.toUpperCase() === "ETH") {
+    if (!isSymbolSupportedOnChain("ETH", chainId)) {
+      return void 0;
+    }
     return NATIVE_TOKEN_ADDRESS;
   }
+  if (!isSymbolSupportedOnChain(symbol, chainId)) {
+    return void 0;
+  }
   const token = getTokenFromRegistry(chainId, symbol);
   return token?.address;
 }
@@ -315,6 +388,61 @@ function getTokenDecimals(symbol, chainId) {
   const token = getTokenFromRegistry(chainId, symbol);
   return token?.decimals ?? 18;
 }
+function getSupportedTokenSymbolsForChain(chainId) {
+  const symbols = SUPPORTED_TOKENS_BY_CHAIN[chainId] ?? [];
+  return [...symbols];
+}
+function getSupportedChainIds() {
+  return [...SUPPORTED_CHAIN_IDS];
+}
+function isSupportedTokenAddressForChain(token, chainId) {
+  const normalized = token.toLowerCase();
+  if (normalized === NATIVE_TOKEN_ADDRESS) {
+    return isSymbolSupportedOnChain("ETH", chainId);
+  }
+  const symbol = getTokenSymbol(token, chainId);
+  if (!symbol || symbol === "Token") return false;
+  if (!isSymbolSupportedOnChain(symbol, chainId)) return false;
+  const expected = getTokenFromRegistry(chainId, symbol);
+  if (!expected) return false;
+  return expected.address.toLowerCase() === normalized;
+}
+function getSupportedTargetTokens(chainId) {
+  const symbols = getSupportedTokenSymbolsForChain(chainId);
+  const options = [];
+  for (const symbol of symbols) {
+    const address = getTokenAddress(symbol, chainId);
+    if (!address) continue;
+    options.push({
+      symbol,
+      address,
+      decimals: getTokenDecimals(symbol, chainId)
+    });
+  }
+  return options;
+}
+function getTokenDecimalsByAddress(token, chainId) {
+  const normalized = token.toLowerCase();
+  if (normalized === NATIVE_TOKEN_ADDRESS) {
+    return 18;
+  }
+  if (chainId) {
+    const chainEntry = chainRegistry[String(chainId)];
+    if (chainEntry) {
+      const found = chainEntry.tokens.find(
+        (t) => t.address.toLowerCase() === normalized
+      );
+      if (found) return found.decimals;
+    }
+  }
+  for (const chainEntry of Object.values(chainRegistry)) {
+    const found = chainEntry.tokens.find(
+      (t) => t.address.toLowerCase() === normalized
+    );
+    if (found) return found.decimals;
+  }
+  return 18;
+}
 function findChainIdForToken(address) {
   const normalized = address.toLowerCase();
   for (const [chainIdStr, chainEntry] of Object.entries(chainRegistry)) {
@@ -337,21 +465,26 @@ function getTokenSymbol(token, chainId) {
       const found = chainEntry.tokens.find(
         (t) => t.address.toLowerCase() === normalized
       );
-      if (found) return found.symbol;
+      if (found)
+        return CANONICAL_SYMBOL_BY_REGISTRY_SYMBOL[found.symbol.toUpperCase()] ?? found.symbol;
     }
   }
   for (const chainEntry of Object.values(chainRegistry)) {
     const found = chainEntry.tokens.find(
       (t) => t.address.toLowerCase() === normalized
     );
-    if (found) return found.symbol;
+    if (found)
+      return CANONICAL_SYMBOL_BY_REGISTRY_SYMBOL[found.symbol.toUpperCase()] ?? found.symbol;
   }
   return "Token";
 }
 var CHAIN_BADGES = {
+  [mainnet.id]: { shortLabel: "ETH", color: "#627EEA", bg: "#EEF2FF" },
   [base.id]: { shortLabel: "Base", color: "#0052FF", bg: "#E7F0FF" },
   [optimism.id]: { shortLabel: "OP", color: "#FF0420", bg: "#FFE9EC" },
-  [arbitrum.id]: { shortLabel: "Arb", color: "#28A0F0", bg: "#E6F6FF" }
+  [arbitrum.id]: { shortLabel: "Arb", color: "#28A0F0", bg: "#E6F6FF" },
+  [polygon.id]: { shortLabel: "Matic", color: "#8247E5", bg: "#EFE7FF" },
+  [bsc.id]: { shortLabel: "BSC", color: "#F3BA2F", bg: "#FFF8E0" }
 };
 function getChainName(chainId) {
   const chain = CHAIN_BY_ID[chainId];
@@ -381,9 +514,12 @@ function getExplorerName(chainId) {
   return chain?.blockExplorers?.default?.name ?? "Explorer";
 }
 var CHAIN_ICONS = {
+  [mainnet.id]: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 784.37 1277.39'%3E%3Cpolygon fill='%23627EEA' points='392.07 0 383.5 29.11 383.5 873.74 392.07 882.29 784.13 650.54'/%3E%3Cpolygon fill='%23C0CBF6' points='392.07 0 0 650.54 392.07 882.29 392.07 472.33'/%3E%3Cpolygon fill='%238EA2F2' points='392.07 956.52 387.24 962.41 387.24 1263.28 392.07 1277.38 784.37 724.89'/%3E%3Cpolygon fill='%23C0CBF6' points='392.07 1277.38 392.07 956.52 0 724.89'/%3E%3Cpolygon fill='%23627EEA' points='392.07 882.29 784.13 650.54 392.07 472.33'/%3E%3Cpolygon fill='%238EA2F2' points='0 650.54 392.07 882.29 392.07 472.33'/%3E%3C/svg%3E",
   [base.id]: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 111 111'%3E%3Ccircle cx='55.5' cy='55.5' r='55.5' fill='%230052FF'/%3E%3Cpath d='M54.921 93.4c20.942 0 37.92-16.978 37.92-37.921S75.863 17.558 54.92 17.558c-19.498 0-35.57 14.725-37.655 33.647h49.82v5.548h-49.82C19.351 75.675 35.423 93.4 54.921 93.4z' fill='%23fff'/%3E%3C/svg%3E",
   [optimism.id]: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 500 500'%3E%3Ccircle cx='250' cy='250' r='250' fill='%23FF0420'/%3E%3Cpath fill='%23fff' d='M177.1 316.4c-14.9 0-27.1-3.5-36.6-10.5-9.4-7.1-14.1-17.3-14.1-30.4 0-2.8.3-6.1.9-10.1 1.6-9 3.9-19.8 6.9-32.5 8.5-34.4 30.5-51.6 65.9-51.6 9.6 0 18.3 1.6 25.9 4.9 7.6 3.1 13.6 7.9 18 14.3 4.4 6.3 6.6 13.8 6.6 22.5 0 2.6-.3 5.9-.9 9.9-1.9 11.1-4.1 22-6.8 32.5-4.4 17.1-11.9 30-22.7 38.5-10.6 8.2-25 12.3-42.9 12.3zm2.7-27c7 0 12.9-2.1 17.8-6.2 5-4.1 8.6-10.4 10.7-19 2.9-11.8 5.1-22 6.6-30.8.5-2.6.8-5.3.8-8.1 0-11.4-5.9-17.1-17.8-17.1-7 0-13 2.1-18 6.2-4.9 4.1-8.4 10.4-10.5 19-2.3 8.4-4.5 18.6-6.8 30.8-.5 2.5-.8 5.1-.8 7.9 0 11.6 6.1 17.3 18.1 17.3zm79.5 25.2c-1.4 0-2.4-.4-3.2-1.3-.6-1-.8-2.1-.6-3.4l25.9-122c.2-1.4.9-2.5 2.1-3.4 1.1-.9 2.3-1.3 3.6-1.3H337c13.9 0 25 2.9 33.4 8.6 8.5 5.8 12.8 14.1 12.8 25 0 3.1-.4 6.4-1.1 9.8-3.1 14.4-9.4 25-19 31.9-9.4 6.9-22.3 10.3-38.7 10.3h-25.3l-8.6 41.1c-.3 1.4-.9 2.5-2.1 3.4-1.1.9-2.3 1.3-3.6 1.3h-25.5zm66.4-71.7c5.3 0 9.8-1.4 13.7-4.3 4-2.9 6.6-7 7.9-12.4.4-2.1.6-4 .6-5.6 0-3.6-1.1-6.4-3.2-8.3-2.1-2-5.8-3-10.9-3h-22.5l-7.1 33.6h21.5z'/%3E%3C/svg%3E",
-  [arbitrum.id]: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 2500 2500'%3E%3Crect fill='none' width='2500' height='2500'/%3E%3Cpath fill='%23213147' d='M226 760v980c0 63 33 120 88 152l849 490c54 31 121 31 175 0l849-490c54-31 88-89 88-152V760c0-63-33-120-88-152l-849-490c-54-31-121-31-175 0L314 608c-54 31-87 89-87 152z'/%3E%3Cpath fill='%2312AAFF' d='M1435 1440l-121 332c-3 9-3 19 0 29l208 571 241-139-289-793c-7-18-32-18-39 0zm243-558c-7-18-32-18-39 0l-121 332c-3 9-3 19 0 29l341 935 241-139-422-1156z'/%3E%3Cpath fill='%239DCCED' d='M1250 155c6 0 12 2 17 5l918 530c11 6 17 18 17 30v1060c0 12-7 24-17 30l-918 530c-5 3-11 5-17 5s-12-2-17-5l-918-530c-11-6-17-18-17-30V719c0-12 7-24 17-30l918-530c5-3 11-5 17-5zm0-155c-33 0-65 8-95 25L237 555c-59 34-95 96-95 164v1060c0 68 36 130 95 164l918 530c29 17 62 25 95 25s65-8 95-25l918-530c59-34 95-96 95-164V719c0-68-36-130-95-164L1344 25c-29-17-62-25-95-25z'/%3E%3Cpolygon fill='%23213147' points='642 2179 727 1947 897 2088 738 2234'/%3E%3Cpath fill='%23fff' d='M1172 644H939c-17 0-33 11-39 27L401 2039l241 139 550-1507c5-14-5-28-19-28zm408 0h-233c-17 0-33 11-39 27L738 2233l241 139 620-1701c5-14-5-28-19-28z'/%3E%3C/svg%3E"
+  [arbitrum.id]: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 2500 2500'%3E%3Crect fill='none' width='2500' height='2500'/%3E%3Cpath fill='%23213147' d='M226 760v980c0 63 33 120 88 152l849 490c54 31 121 31 175 0l849-490c54-31 88-89 88-152V760c0-63-33-120-88-152l-849-490c-54-31-121-31-175 0L314 608c-54 31-87 89-87 152z'/%3E%3Cpath fill='%2312AAFF' d='M1435 1440l-121 332c-3 9-3 19 0 29l208 571 241-139-289-793c-7-18-32-18-39 0zm243-558c-7-18-32-18-39 0l-121 332c-3 9-3 19 0 29l341 935 241-139-422-1156z'/%3E%3Cpath fill='%239DCCED' d='M1250 155c6 0 12 2 17 5l918 530c11 6 17 18 17 30v1060c0 12-7 24-17 30l-918 530c-5 3-11 5-17 5s-12-2-17-5l-918-530c-11-6-17-18-17-30V719c0-12 7-24 17-30l918-530c5-3 11-5 17-5zm0-155c-33 0-65 8-95 25L237 555c-59 34-95 96-95 164v1060c0 68 36 130 95 164l918 530c29 17 62 25 95 25s65-8 95-25l918-530c59-34 95-96 95-164V719c0-68-36-130-95-164L1344 25c-29-17-62-25-95-25z'/%3E%3Cpolygon fill='%23213147' points='642 2179 727 1947 897 2088 738 2234'/%3E%3Cpath fill='%23fff' d='M1172 644H939c-17 0-33 11-39 27L401 2039l241 139 550-1507c5-14-5-28-19-28zm408 0h-233c-17 0-33 11-39 27L738 2233l241 139 620-1701c5-14-5-28-19-28z'/%3E%3C/svg%3E",
+  [polygon.id]: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 38 33'%3E%3Cpath fill='%238247E5' d='M29.6 10.1c-.4-.2-.9-.2-1.3 0l-3 1.7-2-1.2-3-1.7c-.4-.2-.9-.2-1.3 0l-3 1.7-2 1.2-3 1.7c-.4.2-.7.7-.7 1.1v3.5c0 .5.3.9.7 1.1l3 1.7 2 1.2 3 1.7c.4.2.9.2 1.3 0l3-1.7 2-1.2 3-1.7c.4-.2.7-.7.7-1.1v-3.5c0-.5-.3-.9-.7-1.1l-3-1.7 2-1.2 3-1.7c.4-.2.7-.7.7-1.1V8.4c0-.5-.3-.9-.7-1.1l-3-1.7-2-1.2-3-1.7c-.4-.2-.9-.2-1.3 0l-3 1.7-2 1.2-3 1.7c-.4.2-.7.7-.7 1.1v3.5c0 .5.3.9.7 1.1l3 1.7-2 1.2-3 1.7c-.4.2-.7.7-.7 1.1v3.5c0 .5.3.9.7 1.1l3 1.7 2 1.2 3 1.7c.4.2.9.2 1.3 0l3-1.7 2-1.2 3-1.7c.4-.2.7-.7.7-1.1v-3.5c0-.5-.3-.9-.7-1.1l-3-1.7 2-1.2 3-1.7c.4-.2.7-.7.7-1.1V11.2c0-.5-.3-.9-.7-1.1z'/%3E%3C/svg%3E",
+  [bsc.id]: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 96 96'%3E%3Ccircle cx='48' cy='48' r='48' fill='%23F3BA2F'/%3E%3Cpath fill='%23fff' d='M48 19.2l7.2 7.2-18 18-7.2-7.2 18-18zm18 18l7.2 7.2-18 18-7.2-7.2 18-18zM30 37.2l7.2 7.2-7.2 7.2-7.2-7.2 7.2-7.2zm36 0l7.2 7.2-7.2 7.2-7.2-7.2 7.2-7.2zm-18 18l7.2 7.2-7.2 7.2-7.2-7.2 7.2-7.2z'/%3E%3C/svg%3E"
 };
 var TOKEN_ICONS = {
   USDC: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 2000 2000'%3E%3Cpath d='M1000 2000c554.17 0 1000-445.83 1000-1000S1554.17 0 1000 0 0 445.83 0 1000s445.83 1000 1000 1000z' fill='%232775ca'/%3E%3Cpath d='M1275 1158.33c0-145.83-87.5-195.83-262.5-216.66-125-16.67-150-50-150-108.34s41.67-95.83 125-95.83c75 0 116.67 25 137.5 87.5 4.17 12.5 16.67 20.83 29.17 20.83h66.66c16.67 0 29.17-12.5 29.17-29.16v-4.17c-16.67-91.67-91.67-162.5-187.5-170.83v-100c0-16.67-12.5-29.17-33.33-33.34h-62.5c-16.67 0-29.17 12.5-33.34 33.34v95.83c-125 16.67-204.16 100-204.16 204.17 0 137.5 83.33 191.66 258.33 212.5 116.67 20.83 154.17 45.83 154.17 112.5s-58.34 112.5-137.5 112.5c-108.34 0-145.84-45.84-158.34-108.34-4.16-16.66-16.66-25-29.16-25h-70.84c-16.66 0-29.16 12.5-29.16 29.17v4.17c16.66 104.16 83.33 179.16 220.83 200v100c0 16.66 12.5 29.16 33.33 33.33h62.5c16.67 0 29.17-12.5 33.34-33.33v-100c125-20.84 208.33-108.34 208.33-220.84z' fill='%23fff'/%3E%3Cpath d='M787.5 1595.83c-325-116.66-491.67-479.16-370.83-800 62.5-175 200-308.33 370.83-370.83 16.67-8.33 25-20.83 25-41.67V325c0-16.67-8.33-29.17-25-33.33-4.17 0-12.5 0-16.67 4.16-395.83 125-612.5 545.84-487.5 941.67 75 233.33 254.17 412.5 487.5 487.5 16.67 8.33 33.34 0 37.5-16.67 4.17-4.16 4.17-8.33 4.17-16.66v-58.34c0-12.5-12.5-29.16-25-37.5zm441.67-1300c-16.67-8.33-33.34 0-37.5 16.67-4.17 4.17-4.17 8.33-4.17 16.67v58.33c0 16.67 12.5 33.33 25 41.67 325 116.66 491.67 479.16 370.83 800-62.5 175-200 308.33-370.83 370.83-16.67 8.33-25 20.83-25 41.67V1700c0 16.67 8.33 29.17 25 33.33 4.17 0 12.5 0 16.67-4.16 395.83-125 612.5-545.84 487.5-941.67-75-237.5-258.34-416.67-487.5-491.67z' fill='%23fff'/%3E%3C/svg%3E",
@@ -474,12 +610,29 @@ async function signEnableSessionWithOwner(rhinestoneAccount, sessionDetails, sig
     rhinestoneAccount.config.owners = originalOwners;
   }
 }
-async function getSessionDetails(rhinestoneAccount, targetChain, signerAddress, sessionSigner) {
-  const allChains = [...SUPPORTED_CHAINS];
-  if (!allChains.some((c) => c.id === targetChain.id)) {
-    allChains.push(targetChain);
+async function getSessionDetails(rhinestoneAccount, targetChain, signerAddress, sessionSigner, targetToken) {
+  const isTargetTestnet = Boolean(targetChain.testnet);
+  const chainsByNetworkType = SUPPORTED_CHAINS.filter(
+    (chain) => Boolean(chain.testnet) === isTargetTestnet
+  );
+  let selectedChains = [...chainsByNetworkType];
+  if (targetToken) {
+    const targetSymbol = getTokenSymbol(targetToken, targetChain.id).toUpperCase();
+    if (targetSymbol && targetSymbol !== "TOKEN") {
+      const chainsForToken = selectedChains.filter(
+        (chain) => getSupportedTokenSymbolsForChain(chain.id).includes(targetSymbol)
+      );
+      if (chainsForToken.length > 0) {
+        selectedChains = chainsForToken;
+      }
+    }
+  }
+  if (!selectedChains.some((c) => c.id === targetChain.id)) {
+    selectedChains.push(targetChain);
   }
-  const sessions = allChains.map((chain) => buildSession(chain, signerAddress));
+  const sessions = selectedChains.map(
+    (chain) => buildSession(chain, signerAddress)
+  );
   const sessionDetails = await rhinestoneAccount.experimental_getSessionDetails(sessions);
   const enableSignature = sessionSigner ? await signEnableSessionWithOwner(
     rhinestoneAccount,
@@ -607,7 +760,8 @@ function SetupStep({
         account,
         targetChainObj,
         signerAddress,
-        sessionOwner.account
+        sessionOwner.account,
+        targetToken
       );
       setState({ type: "registering" });
       await service.registerAccount({
@@ -881,16 +1035,29 @@ function normalizeOrchestratorPortfolio(data) {
     const chainBalances = tokenData.tokenChainBalance ?? tokenData.chainBalances ?? [];
     for (const chainBalance of chainBalances) {
       const unlocked = chainBalance.balance?.unlocked ?? "0";
+      const normalizedName = tokenData.tokenName.trim();
+      const isNativeSymbol = normalizedName.toUpperCase() === "ETH" || normalizedName.toUpperCase() === "ETHER";
       const tokenAddress = chainBalance.tokenAddress ?? extractTokenAddress(tokenData, chainBalance.chainId) ?? getTokenAddress(tokenData.tokenName, chainBalance.chainId);
-      if (!tokenAddress) {
+      const resolvedTokenAddress = isNativeSymbol ? NATIVE_TOKEN_ADDRESS : tokenAddress;
+      if (!resolvedTokenAddress) {
         continue;
       }
+      if (!isSupportedTokenAddressForChain(
+        resolvedTokenAddress,
+        chainBalance.chainId
+      )) {
+        continue;
+      }
+      const symbol = getTokenSymbol(resolvedTokenAddress, chainBalance.chainId);
       tokens.push({
         chainId: chainBalance.chainId,
-        address: tokenAddress,
-        symbol: tokenData.tokenName,
-        name: tokenData.tokenName,
-        decimals: tokenData.tokenDecimals,
+        address: resolvedTokenAddress,
+        symbol,
+        name: symbol,
+        decimals: getTokenDecimalsByAddress(
+          resolvedTokenAddress,
+          chainBalance.chainId
+        ),
         balance: unlocked,
         balanceUsd: 0
       });
@@ -906,9 +1073,6 @@ function normalizeDirectToken(token) {
   if (!chainId) return null;
   const symbol = extractString(token, "symbol") ?? extractString(token, "tokenSymbol") ?? extractString(token, "tokenName") ?? extractString(token, "name");
   if (!symbol) return null;
-  const name = extractString(token, "name") ?? extractString(token, "tokenName") ?? symbol;
-  const decimals = extractNumber(token, "decimals") ?? extractNumber(token, "tokenDecimals");
-  if (decimals === null) return null;
   const balanceValue = extractString(token, "balance") ?? extractString(token, "amount") ?? extractString(token, "value") ?? extractString(token, "rawBalance") ?? extractNumber(token, "balance")?.toString() ?? extractNumber(token, "amount")?.toString() ?? extractNumber(token, "value")?.toString() ?? extractNumber(token, "rawBalance")?.toString();
   if (!balanceValue) return null;
   const address = extractString(token, "address") ?? extractString(token, "tokenAddress") ?? extractString(
@@ -916,13 +1080,15 @@ function normalizeDirectToken(token) {
     "address"
   ) ?? getTokenAddress(symbol, chainId);
   if (!address) return null;
+  const addressAsToken = address;
+  if (!isSupportedTokenAddressForChain(addressAsToken, chainId)) return null;
   const balanceUsd = extractNumber(token, "balanceUsd") ?? extractNumber(token, "usdValue") ?? extractNumber(token, "valueUsd") ?? extractNumericString(token, "balanceUsd") ?? extractNumericString(token, "usdValue") ?? extractNumericString(token, "valueUsd") ?? 0;
   return {
     chainId,
-    address,
-    symbol,
-    name,
-    decimals,
+    address: addressAsToken,
+    symbol: getTokenSymbol(addressAsToken, chainId),
+    name: getTokenSymbol(addressAsToken, chainId),
+    decimals: getTokenDecimalsByAddress(addressAsToken, chainId),
     balance: balanceValue,
     balanceUsd
   };
@@ -1232,29 +1398,30 @@ function AssetSelectStep({
 }
 async function fetchNativeAssets(address, publicClient, existing) {
   const existingIds = new Set(existing.map((asset) => asset.id));
-  const settled = await Promise.allSettled(
-    SOURCE_CHAINS.map(async (chain) => {
-      const id = getAssetId({ chainId: chain.id, token: NATIVE_TOKEN_ADDRESS });
-      if (existingIds.has(id)) return null;
-      const balance = await publicClient.getBalance({ address });
-      return {
+  const connectedChainId = publicClient.chain?.id;
+  if (!connectedChainId) return [];
+  if (!SOURCE_CHAINS.some((chain) => chain.id === connectedChainId)) return [];
+  const id = getAssetId({
+    chainId: connectedChainId,
+    token: NATIVE_TOKEN_ADDRESS
+  });
+  if (existingIds.has(id)) return [];
+  try {
+    const balance = await publicClient.getBalance({ address });
+    return [
+      {
         id,
-        chainId: chain.id,
+        chainId: connectedChainId,
         token: NATIVE_TOKEN_ADDRESS,
         symbol: "ETH",
         name: "Ethereum",
         decimals: 18,
         balance: balance.toString()
-      };
-    })
-  );
-  const results = [];
-  for (const r of settled) {
-    if (r.status === "fulfilled" && r.value !== null) {
-      results.push(r.value);
-    }
+      }
+    ];
+  } catch {
+    return [];
   }
-  return results;
 }
 function mergeAssets(existing, incoming) {
   if (incoming.length === 0) return existing;
@@ -2134,7 +2301,7 @@ function ProcessingStep({
   };
   const sourceSymbol = getTokenSymbol(sourceToken, sourceChain);
   const targetSymbol = getTokenSymbol(targetToken, targetChain);
-  const sourceDecimals = getTokenDecimals(sourceSymbol, sourceChain);
+  const sourceDecimals = getTokenDecimalsByAddress(sourceToken, sourceChain);
   const formattedReceivedAmount = (() => {
     try {
       const raw = formatUnits4(BigInt(amount), sourceDecimals);
@@ -3038,6 +3205,7 @@ function WithdrawFormStep({
   targetChain,
   targetToken,
   targetChains,
+  targetTokenOptions,
   onTargetChainChange,
   onTargetTokenChange,
   switchChain,
@@ -3070,9 +3238,6 @@ function WithdrawFormStep({
   const targetSymbol = getTokenSymbol(targetToken, targetChain);
   const targetChainName = getChainName(targetChain);
   const isBusy = submitting || isSubmitting;
-  const targetTokenOptions = useMemo6(() => {
-    return [{ address: targetToken, symbol: targetSymbol }];
-  }, [targetToken, targetSymbol]);
   useEffect8(() => {
     if (chainMismatch && switchChain && !hasAttemptedSwitch.current) {
       hasAttemptedSwitch.current = true;
@@ -3111,9 +3276,16 @@ function WithdrawFormStep({
         }
       }
     }
-    fetchBalance();
+    void fetchBalance();
+    const unwatch = publicClient.watchBlockNumber({
+      emitOnBegin: false,
+      onBlockNumber() {
+        void fetchBalance();
+      }
+    });
     return () => {
       active = false;
+      unwatch();
     };
   }, [safeAddress, publicClient, publicClientChainId, asset]);
   const formattedBalance = useMemo6(() => {
@@ -3131,7 +3303,8 @@ function WithdrawFormStep({
   }, [balance, asset.decimals]);
   useEffect8(() => {
     if (balance === null) return;
-    if (asset.symbol.toUpperCase() !== "USDC") return;
+    const sym = asset.symbol.toUpperCase();
+    if (sym !== "USDC" && sym !== "USDT") return;
     try {
       const raw = formatUnits5(balance, asset.decimals);
       const numeric = Number(raw);
@@ -3145,7 +3318,8 @@ function WithdrawFormStep({
     if (!amount) return null;
     const parsed = Number(amount);
     if (!Number.isFinite(parsed) || parsed <= 0) return null;
-    if (asset.symbol.toUpperCase() === "USDC") {
+    const sym = asset.symbol.toUpperCase();
+    if (sym === "USDC" || sym === "USDT") {
       return parsed;
     }
     return null;
@@ -3785,7 +3959,7 @@ function WithdrawFlow({
   const targetChainObj = useMemo7(() => CHAIN_BY_ID[targetChain], [targetChain]);
   const asset = useMemo7(() => {
     const symbol = getTokenSymbol(sourceToken, sourceChain);
-    const decimals = getTokenDecimals(symbol, sourceChain);
+    const decimals = getTokenDecimalsByAddress(sourceToken, sourceChain);
     return {
       id: getAssetId({ chainId: sourceChain, token: sourceToken }),
       chainId: sourceChain,
@@ -3853,7 +4027,8 @@ function WithdrawFlow({
           account,
           targetChainObj,
           signerAddress,
-          sessionOwner.account
+          sessionOwner.account,
+          targetToken
         );
         await service.registerAccount({
           address: smartAccount,
@@ -3943,22 +4118,38 @@ function WithdrawFlow({
     [onWithdrawFailed]
   );
   const targetChainOptions = useMemo7(() => {
-    if (isSourceNative) return SOURCE_CHAINS;
-    return SOURCE_CHAINS.filter((chain) => Boolean(getUsdcAddress(chain.id)));
-  }, [isSourceNative]);
+    return SOURCE_CHAINS.filter(
+      (chain) => getSupportedTargetTokens(chain.id).length > 0
+    );
+  }, []);
+  const targetTokenOptions = useMemo7(
+    () => getSupportedTargetTokens(targetChain),
+    [targetChain]
+  );
+  useEffect9(() => {
+    if (targetTokenOptions.length === 0) return;
+    const matches = targetTokenOptions.some(
+      (option) => option.address.toLowerCase() === targetToken.toLowerCase()
+    );
+    if (!matches) {
+      setTargetToken(targetTokenOptions[0].address);
+    }
+  }, [targetToken, targetTokenOptions]);
   const handleTargetChainChange = useCallback6(
     (chainId) => {
       setTargetChain(chainId);
-      if (isSourceNative) {
-        setTargetToken(NATIVE_TOKEN_ADDRESS);
+      const options = getSupportedTargetTokens(chainId);
+      if (options.length === 0) {
         return;
       }
-      const nextToken = getUsdcAddress(chainId);
-      if (nextToken) {
-        setTargetToken(nextToken);
-      }
+      const currentlySupported = options.some(
+        (option) => option.address.toLowerCase() === targetToken.toLowerCase()
+      );
+      setTargetToken(
+        currentlySupported ? targetToken : options[0].address
+      );
     },
-    [isSourceNative]
+    [targetToken]
   );
   const handleTargetTokenChange = useCallback6((token) => {
     setTargetToken(token);
@@ -3986,6 +4177,7 @@ function WithdrawFlow({
         targetChain,
         targetToken,
         targetChains: targetChainOptions,
+        targetTokenOptions,
         onTargetChainChange: handleTargetChainChange,
         onTargetTokenChange: handleTargetTokenChange,
         switchChain,
@@ -4239,10 +4431,15 @@ export {
   getExplorerName,
   getExplorerTxUrl,
   getExplorerUrl,
+  getSupportedChainIds,
+  getSupportedTargetTokens,
+  getSupportedTokenSymbolsForChain,
   getTokenAddress,
   getTokenDecimals,
+  getTokenDecimalsByAddress,
   getTokenIcon,
   getTokenSymbol,
   getUsdcAddress,
-  getUsdcDecimals
+  getUsdcDecimals,
+  isSupportedTokenAddressForChain
 };

package/dist/styles.css

@@ -1829,10 +1829,10 @@
   position: relative;
 }
 
-/* Dropdown menu - clean popover */
+/* Dropdown menu - opens upward to avoid modal overflow clipping */
 .rs-withdraw-dropdown-menu {
   position: absolute;
-  top: calc(100% + 4px);
+  bottom: calc(100% + 4px);
   left: 0;
   right: 0;
   z-index: 20;
@@ -1840,19 +1840,21 @@
   border: 1px solid var(--rs-border);
   border-radius: var(--rs-radius-sm);
   box-shadow:
-    0 4px 12px rgba(0, 0, 0, 0.08),
-    0 1px 3px rgba(0, 0, 0, 0.06);
+    0 -4px 12px rgba(0, 0, 0, 0.08),
+    0 -1px 3px rgba(0, 0, 0, 0.06);
   padding: 4px;
   display: flex;
   flex-direction: column;
   gap: 2px;
+  max-height: 200px;
+  overflow-y: auto;
   animation: rs-dropdown-in 0.12s ease-out;
 }
 
 @keyframes rs-dropdown-in {
   from {
     opacity: 0;
-    transform: translateY(-4px);
+    transform: translateY(4px);
   }
   to {
     opacity: 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhinestone/deposit-modal",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "React modal component for Rhinestone cross-chain deposits",
   "author": "Rhinestone <dev@rhinestone.wtf>",
   "bugs": {
@@ -40,8 +40,8 @@
     "viem": ">=2.0.0"
   },
   "dependencies": {
-    "@rhinestone/sdk": "^1.2.9",
-    "@rhinestone/shared-configs": "^1.4.91"
+    "@rhinestone/sdk": "^1.2.10",
+    "@rhinestone/shared-configs": "^1.4.93"
   },
   "devDependencies": {
     "@types/react": "^19.0.0",