@rhinestone/deposit-modal 0.1.40 → 0.1.41

package/dist/{chunk-AHOFT42H.cjs → chunk-LT3QKJI2.cjs}

@@ -7,7 +7,7 @@
 
 
 
-var _chunkFLXTBFMZcjs = require('./chunk-FLXTBFMZ.cjs');
+var _chunkNELAYNA3cjs = require('./chunk-NELAYNA3.cjs');
 
 // src/components/ui/Modal.tsx
 
@@ -139,6 +139,79 @@ function Modal({
 }
 Modal.displayName = "Modal";
 
+// src/core/debug.ts
+function truncateString(value, max = 240) {
+  if (value.length <= max) return value;
+  return `${value.slice(0, max)}...`;
+}
+function normalizeForLog(value, depth = 0) {
+  if (depth > 3) return "[MaxDepth]";
+  if (value === null || value === void 0) return value;
+  if (typeof value === "bigint") return value.toString();
+  if (typeof value === "string") return truncateString(value);
+  if (typeof value === "number" || typeof value === "boolean") return value;
+  if (value instanceof Error) {
+    return {
+      name: value.name,
+      message: value.message,
+      stack: value.stack ? truncateString(value.stack, 600) : void 0
+    };
+  }
+  if (Array.isArray(value)) {
+    return value.slice(0, 12).map((entry) => normalizeForLog(entry, depth + 1));
+  }
+  if (typeof value === "object") {
+    const input = value;
+    const output = {};
+    for (const [key, raw] of Object.entries(input)) {
+      const keyLower = key.toLowerCase();
+      if (keyLower.includes("signature") || keyLower.includes("privatekey") || keyLower.includes("sessiondetails")) {
+        output[key] = "[Redacted]";
+        continue;
+      }
+      output[key] = normalizeForLog(raw, depth + 1);
+    }
+    return output;
+  }
+  return String(value);
+}
+function debugLog(enabled, scope, message, data) {
+  if (!enabled) return;
+  if (data === void 0) {
+    console.log(`[deposit-modal:${scope}] ${message}`);
+    return;
+  }
+  console.log(
+    `[deposit-modal:${scope}] ${message}`,
+    normalizeForLog(data)
+  );
+}
+function debugError(enabled, scope, message, error, data) {
+  if (!enabled) return;
+  const payload = data === void 0 ? { error: normalizeForLog(error) } : { error: normalizeForLog(error), meta: normalizeForLog(data) };
+  console.error(`[deposit-modal:${scope}] ${message}`, payload);
+}
+
+// src/core/caip.ts
+var SOLANA_MAINNET_GENESIS = "5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp";
+var SOLANA_MAINNET_CAIP2 = `solana:${SOLANA_MAINNET_GENESIS}`;
+function toEvmCaip2(chainId) {
+  return `eip155:${chainId}`;
+}
+function parseEvmChainId(value) {
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return value;
+  }
+  if (typeof value !== "string") return null;
+  const match = value.match(/^eip155:(\d+)$/);
+  if (!_optionalChain([match, 'optionalAccess', _ => _[1]])) return null;
+  const parsed = Number.parseInt(match[1], 10);
+  return Number.isFinite(parsed) ? parsed : null;
+}
+function isSolanaCaip2(value) {
+  return typeof value === "string" && value.startsWith("solana:");
+}
+
 // src/core/deposit-service.ts
 function jsonReplacer(_key, value) {
   return typeof value === "bigint" ? value.toString() : value;
@@ -187,6 +260,7 @@ function normalizeSetupAccountResponse(raw) {
     targetChain: data.targetChain,
     targetToken: data.targetToken,
     needsRegistration: data.needsRegistration,
+    solanaDepositAddress: data.solanaDepositAddress,
     accountParams: data.accountParams,
     sessionDetailsUnsigned: data.sessionDetailsUnsigned ? {
       hashesAndChainIds: data.sessionDetailsUnsigned.hashesAndChainIds.map(
@@ -208,30 +282,67 @@ function buildSessionDetails(unsigned, signature) {
     signature
   };
 }
-function createDepositService(baseUrl) {
+function createDepositService(baseUrl, options) {
   const normalizedBaseUrl = baseUrl.replace(/\/$/, "");
+  const debug = _optionalChain([options, 'optionalAccess', _2 => _2.debug]) === true;
+  const scope = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _3 => _3.debugScope]), () => ( "service"));
   function apiUrl(path) {
     const normalizedPath = path.startsWith("/") ? path : `/${path}`;
     return `${normalizedBaseUrl}${normalizedPath}`;
   }
+  function shortRef(value) {
+    if (value.length <= 20) return value;
+    return `${value.slice(0, 10)}...${value.slice(-8)}`;
+  }
   return {
     async setupAccount(params) {
-      const response = await fetch(apiUrl("/setup-account"), {
+      const url = apiUrl("/setup-account");
+      debugLog(debug, scope, "setupAccount:request", {
+        url,
+        ownerAddress: params.ownerAddress,
+        targetChain: params.targetChain,
+        targetToken: params.targetToken,
+        forceRegister: params.forceRegister
+      });
+      const response = await fetch(url, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify(params)
       });
       if (!response.ok) {
         const error = await response.json().catch(() => ({ error: "Unknown error" }));
+        debugError(
+          debug,
+          scope,
+          "setupAccount:failed",
+          error,
+          { status: response.status, ownerAddress: params.ownerAddress }
+        );
         throw new Error(
           error.error || `Setup account failed: ${response.status}`
         );
       }
-      return normalizeSetupAccountResponse(await response.json());
+      const normalized = normalizeSetupAccountResponse(await response.json());
+      debugLog(debug, scope, "setupAccount:success", {
+        smartAccount: normalized.smartAccount,
+        needsRegistration: normalized.needsRegistration,
+        isRegistered: normalized.isRegistered,
+        hasSolanaDepositAddress: Boolean(normalized.solanaDepositAddress)
+      });
+      return normalized;
     },
     async registerAccount(params) {
       const { eoaAddress, sessionOwner, ...account } = params;
-      const response = await fetch(apiUrl("/register"), {
+      const url = apiUrl("/register");
+      debugLog(debug, scope, "registerAccount:request", {
+        url,
+        address: params.address,
+        targetChain: params.target.chain,
+        targetToken: params.target.token,
+        eoaAddress,
+        sessionOwner
+      });
+      const response = await fetch(url, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify(
@@ -245,19 +356,41 @@ function createDepositService(baseUrl) {
       });
       if (!response.ok) {
         const error = await response.json().catch(() => ({ error: "Unknown error" }));
+        debugError(
+          debug,
+          scope,
+          "registerAccount:failed",
+          error,
+          { status: response.status, address: params.address }
+        );
         throw new Error(
           error.error || `Registration failed: ${response.status}`
         );
       }
-      return response.json();
+      const result = await response.json();
+      debugLog(debug, scope, "registerAccount:success", {
+        address: params.address,
+        evmDepositAddress: _optionalChain([result, 'optionalAccess', _4 => _4.evmDepositAddress]),
+        hasSolanaDepositAddress: Boolean(_optionalChain([result, 'optionalAccess', _5 => _5.solanaDepositAddress]))
+      });
+      return result;
     },
     async fetchPortfolio(address) {
-      const response = await fetch(apiUrl(`/portfolio/${address}`), {
+      const url = apiUrl(`/portfolio/${address}`);
+      debugLog(debug, scope, "fetchPortfolio:request", { url, address });
+      const response = await fetch(url, {
         method: "GET",
         headers: { "Content-Type": "application/json" }
       });
       if (!response.ok) {
         const error = await response.json().catch(() => ({ error: "Unknown error" }));
+        debugError(
+          debug,
+          scope,
+          "fetchPortfolio:failed",
+          error,
+          { status: response.status, address }
+        );
         throw new Error(
           error.error || `Portfolio fetch failed: ${response.status}`
         );
@@ -265,18 +398,95 @@ function createDepositService(baseUrl) {
       const data = await response.json();
       const direct = normalizeDirectPortfolio(data);
       if (direct.tokens.length > 0) {
+        debugLog(debug, scope, "fetchPortfolio:success", {
+          address,
+          source: "direct",
+          tokenCount: direct.tokens.length,
+          totalUsd: direct.totalUsd
+        });
         return direct;
       }
       const portfolioData = extractOrchestratorPortfolio(data);
       if (portfolioData) {
-        return normalizeOrchestratorPortfolio(portfolioData);
+        const normalized = normalizeOrchestratorPortfolio(portfolioData);
+        debugLog(debug, scope, "fetchPortfolio:success", {
+          address,
+          source: "orchestrator",
+          tokenCount: normalized.tokens.length,
+          totalUsd: normalized.totalUsd
+        });
+        return normalized;
       }
+      debugLog(debug, scope, "fetchPortfolio:empty", { address });
       return { tokens: [], totalUsd: 0 };
     },
+    async fetchSolanaPortfolio(address) {
+      const url = apiUrl(`/portfolio/solana/${address}`);
+      debugLog(debug, scope, "fetchSolanaPortfolio:request", { url, address });
+      const response = await fetch(url, {
+        method: "GET",
+        headers: { "Content-Type": "application/json" }
+      });
+      if (!response.ok) {
+        const error = await response.json().catch(() => ({ error: "Unknown error" }));
+        debugError(
+          debug,
+          scope,
+          "fetchSolanaPortfolio:failed",
+          error,
+          { status: response.status, address }
+        );
+        throw new Error(
+          error.error || `Solana portfolio fetch failed: ${response.status}`
+        );
+      }
+      const data = await response.json();
+      const normalized = normalizeDirectPortfolio(data);
+      debugLog(debug, scope, "fetchSolanaPortfolio:success", {
+        address,
+        tokenCount: normalized.tokens.length,
+        totalUsd: normalized.totalUsd
+      });
+      return normalized;
+    },
+    async checkAccount(address) {
+      const url = apiUrl(`/check/${address}`);
+      debugLog(debug, scope, "checkAccount:request", { url, address });
+      const response = await fetch(url, {
+        method: "GET",
+        headers: { "Content-Type": "application/json" }
+      });
+      if (!response.ok) {
+        const error = await response.json().catch(() => ({ error: "Unknown error" }));
+        debugError(
+          debug,
+          scope,
+          "checkAccount:failed",
+          error,
+          { status: response.status, address }
+        );
+        throw new Error(error.error || `Account check failed: ${response.status}`);
+      }
+      const data = await response.json();
+      const result = {
+        isRegistered: _optionalChain([data, 'optionalAccess', _6 => _6.isRegistered]) === true,
+        targetChain: _optionalChain([data, 'optionalAccess', _7 => _7.targetChain]),
+        targetToken: _optionalChain([data, 'optionalAccess', _8 => _8.targetToken])
+      };
+      debugLog(debug, scope, "checkAccount:success", {
+        address,
+        isRegistered: result.isRegistered,
+        targetChain: result.targetChain,
+        targetToken: result.targetToken
+      });
+      return result;
+    },
     async fetchStatus(address, txHash) {
-      const txHashParam = encodeURIComponent(txHash.toLowerCase());
+      const normalized = txHash.startsWith("0x") || txHash.startsWith("0X") ? txHash.toLowerCase() : txHash;
+      const txHashParam = encodeURIComponent(normalized);
+      const url = apiUrl(`/status/${address}?txHash=${txHashParam}`);
       const response = await fetch(
-        apiUrl(`/status/${address}?txHash=${txHashParam}`),
+        url,
         {
           method: "GET",
           headers: { "Content-Type": "application/json" },
@@ -284,24 +494,53 @@ function createDepositService(baseUrl) {
         }
       );
       if (!response.ok) {
+        debugLog(debug, scope, "fetchStatus:miss", {
+          address,
+          txHash: shortRef(normalized),
+          status: response.status
+        });
         return { lastEvent: void 0 };
       }
-      return response.json();
+      const result = await response.json();
+      debugLog(debug, scope, "fetchStatus:success", {
+        address,
+        txHash: shortRef(normalized),
+        eventType: _optionalChain([result, 'optionalAccess', _9 => _9.lastEvent, 'optionalAccess', _10 => _10.type])
+      });
+      return result;
     },
     async fetchLatestStatus(address) {
-      const response = await fetch(apiUrl(`/status/${address}`), {
+      const url = apiUrl(`/status/${address}`);
+      const response = await fetch(url, {
         method: "GET",
         headers: { "Content-Type": "application/json" },
         cache: "no-store"
       });
       if (!response.ok) {
+        debugLog(debug, scope, "fetchLatestStatus:miss", {
+          address,
+          status: response.status
+        });
         return { lastEvent: void 0 };
       }
-      return response.json();
+      const result = await response.json();
+      debugLog(debug, scope, "fetchLatestStatus:success", {
+        address,
+        eventType: _optionalChain([result, 'optionalAccess', _11 => _11.lastEvent, 'optionalAccess', _12 => _12.type])
+      });
+      return result;
     },
     async relayWithdraw(params) {
       const { smartAccount, chainId, safeAddress, safeTransaction, signature } = params;
-      const response = await fetch(apiUrl(`/relay-withdraw`), {
+      const url = apiUrl(`/relay-withdraw`);
+      debugLog(debug, scope, "relayWithdraw:request", {
+        url,
+        smartAccount,
+        chainId,
+        safeAddress,
+        to: safeTransaction.to
+      });
+      const response = await fetch(url, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify(
@@ -327,26 +566,46 @@ function createDepositService(baseUrl) {
       });
       if (!response.ok) {
         const error = await response.json().catch(() => ({ error: "Unknown error" }));
+        debugError(
+          debug,
+          scope,
+          "relayWithdraw:failed",
+          error,
+          {
+            status: response.status,
+            smartAccount,
+            chainId,
+            safeAddress,
+            signature
+          }
+        );
         throw new Error(
           error.error || `Relay withdraw failed: ${response.status}`
         );
       }
-      return response.json();
+      const result = await response.json();
+      debugLog(debug, scope, "relayWithdraw:success", {
+        smartAccount,
+        chainId,
+        safeAddress,
+        txHash: _optionalChain([result, 'optionalAccess', _13 => _13.txHash]) ? shortRef(result.txHash) : void 0
+      });
+      return result;
     }
   };
 }
 function normalizeDirectPortfolio(data) {
   const rawTokens = _nullishCoalesce(_nullishCoalesce(extractArray(data, "tokens"), () => ( extractArray(
-    _optionalChain([data, 'optionalAccess', _ => _.data]),
+    _optionalChain([data, 'optionalAccess', _14 => _14.data]),
     "tokens"
   ))), () => ( []));
-  const totalUsd = _nullishCoalesce(_nullishCoalesce(extractNumber(data, "totalUsd"), () => ( extractNumber(_optionalChain([data, 'optionalAccess', _2 => _2.data]), "totalUsd"))), () => ( 0));
+  const totalUsd = _nullishCoalesce(_nullishCoalesce(extractNumber(data, "totalUsd"), () => ( extractNumber(_optionalChain([data, 'optionalAccess', _15 => _15.data]), "totalUsd"))), () => ( 0));
   const tokens = rawTokens.map((token) => normalizeDirectToken(token)).filter((token) => Boolean(token));
   return { tokens, totalUsd };
 }
 function extractOrchestratorPortfolio(data) {
   const portfolio = _nullishCoalesce(extractArray(data, "portfolio"), () => ( extractArray(
-    _optionalChain([data, 'optionalAccess', _3 => _3.data]),
+    _optionalChain([data, 'optionalAccess', _16 => _16.data]),
     "portfolio"
   )));
   if (!portfolio || !Array.isArray(portfolio)) return null;
@@ -357,17 +616,17 @@ function normalizeOrchestratorPortfolio(data) {
   for (const tokenData of data.portfolio || []) {
     const chainBalances = _nullishCoalesce(_nullishCoalesce(tokenData.tokenChainBalance, () => ( tokenData.chainBalances)), () => ( []));
     for (const chainBalance of chainBalances) {
-      const unlocked = _nullishCoalesce(_optionalChain([chainBalance, 'access', _4 => _4.balance, 'optionalAccess', _5 => _5.unlocked]), () => ( "0"));
+      const unlocked = _nullishCoalesce(_optionalChain([chainBalance, 'access', _17 => _17.balance, 'optionalAccess', _18 => _18.unlocked]), () => ( "0"));
       const normalizedName = tokenData.tokenName.trim();
       const isNativeSymbol = normalizedName.toUpperCase() === "ETH" || normalizedName.toUpperCase() === "ETHER";
-      const tokenAddress = _nullishCoalesce(_nullishCoalesce(chainBalance.tokenAddress, () => ( extractTokenAddress(tokenData, chainBalance.chainId))), () => ( _chunkFLXTBFMZcjs.getTokenAddress.call(void 0, tokenData.tokenName, chainBalance.chainId)));
-      const resolvedTokenAddress = isNativeSymbol ? _chunkFLXTBFMZcjs.NATIVE_TOKEN_ADDRESS : tokenAddress;
+      const tokenAddress = _nullishCoalesce(_nullishCoalesce(chainBalance.tokenAddress, () => ( extractTokenAddress(tokenData, chainBalance.chainId))), () => ( _chunkNELAYNA3cjs.getTokenAddress.call(void 0, tokenData.tokenName, chainBalance.chainId)));
+      const resolvedTokenAddress = isNativeSymbol ? _chunkNELAYNA3cjs.NATIVE_TOKEN_ADDRESS : tokenAddress;
       if (!resolvedTokenAddress) {
         continue;
       }
-      const registrySymbol = _chunkFLXTBFMZcjs.getTokenSymbol.call(void 0, resolvedTokenAddress, chainBalance.chainId);
+      const registrySymbol = _chunkNELAYNA3cjs.getTokenSymbol.call(void 0, resolvedTokenAddress, chainBalance.chainId);
       const symbol = registrySymbol !== "Token" ? registrySymbol : normalizedName || "Token";
-      const decimals = registrySymbol !== "Token" ? _chunkFLXTBFMZcjs.getTokenDecimalsByAddress.call(void 0, resolvedTokenAddress, chainBalance.chainId) : _nullishCoalesce(tokenData.tokenDecimals, () => ( 18));
+      const decimals = registrySymbol !== "Token" ? _chunkNELAYNA3cjs.getTokenDecimalsByAddress.call(void 0, resolvedTokenAddress, chainBalance.chainId) : _nullishCoalesce(tokenData.tokenDecimals, () => ( 18));
       tokens.push({
         chainId: chainBalance.chainId,
         address: resolvedTokenAddress,
@@ -385,26 +644,28 @@ function normalizeOrchestratorPortfolio(data) {
   };
 }
 function normalizeDirectToken(token) {
-  const chainId = _nullishCoalesce(extractNumber(token, "chainId"), () => ( extractNumber(token.chain, "id")));
-  if (!chainId) return null;
+  const rawChainId = _nullishCoalesce(extractNumber(token, "chainId"), () => ( extractNumber(token.chain, "id")));
+  const rawChainString = _nullishCoalesce(extractString(token, "chainId"), () => ( extractString(token.chain, "id")));
+  const chainId = _nullishCoalesce(rawChainId, () => ( (rawChainString ? isSolanaCaip2(rawChainString) || rawChainString.toLowerCase() === "solana" ? "solana" : parseEvmChainId(rawChainString) : null)));
+  if (chainId === null) return null;
   const symbol = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(extractString(token, "symbol"), () => ( extractString(token, "tokenSymbol"))), () => ( extractString(token, "tokenName"))), () => ( extractString(token, "name")));
   if (!symbol) return null;
-  const balanceValue = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(extractString(token, "balance"), () => ( extractString(token, "amount"))), () => ( extractString(token, "value"))), () => ( extractString(token, "rawBalance"))), () => ( _optionalChain([extractNumber, 'call', _6 => _6(token, "balance"), 'optionalAccess', _7 => _7.toString, 'call', _8 => _8()]))), () => ( _optionalChain([extractNumber, 'call', _9 => _9(token, "amount"), 'optionalAccess', _10 => _10.toString, 'call', _11 => _11()]))), () => ( _optionalChain([extractNumber, 'call', _12 => _12(token, "value"), 'optionalAccess', _13 => _13.toString, 'call', _14 => _14()]))), () => ( _optionalChain([extractNumber, 'call', _15 => _15(token, "rawBalance"), 'optionalAccess', _16 => _16.toString, 'call', _17 => _17()])));
+  const balanceValue = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(extractString(token, "balance"), () => ( extractString(token, "amount"))), () => ( extractString(token, "value"))), () => ( extractString(token, "rawBalance"))), () => ( _optionalChain([extractNumber, 'call', _19 => _19(token, "balance"), 'optionalAccess', _20 => _20.toString, 'call', _21 => _21()]))), () => ( _optionalChain([extractNumber, 'call', _22 => _22(token, "amount"), 'optionalAccess', _23 => _23.toString, 'call', _24 => _24()]))), () => ( _optionalChain([extractNumber, 'call', _25 => _25(token, "value"), 'optionalAccess', _26 => _26.toString, 'call', _27 => _27()]))), () => ( _optionalChain([extractNumber, 'call', _28 => _28(token, "rawBalance"), 'optionalAccess', _29 => _29.toString, 'call', _30 => _30()])));
   if (!balanceValue) return null;
   const address = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(extractString(token, "address"), () => ( extractString(token, "tokenAddress"))), () => ( extractString(
     token.token,
     "address"
-  ))), () => ( _chunkFLXTBFMZcjs.getTokenAddress.call(void 0, symbol, chainId)));
+  ))), () => ( (typeof chainId === "number" ? _chunkNELAYNA3cjs.getTokenAddress.call(void 0, symbol, chainId) : void 0)));
   if (!address) return null;
-  const addressAsToken = address;
   const balanceUsd = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(extractNumber(token, "balanceUsd"), () => ( extractNumber(token, "usdValue"))), () => ( extractNumber(token, "valueUsd"))), () => ( extractNumericString(token, "balanceUsd"))), () => ( extractNumericString(token, "usdValue"))), () => ( extractNumericString(token, "valueUsd"))), () => ( 0));
-  const registrySymbol = _chunkFLXTBFMZcjs.getTokenSymbol.call(void 0, addressAsToken, chainId);
-  const resolvedSymbol = registrySymbol !== "Token" ? registrySymbol : symbol;
+  const isSolanaToken = chainId === "solana";
+  const registrySymbol = isSolanaToken ? "Token" : _chunkNELAYNA3cjs.getTokenSymbol.call(void 0, address, chainId);
+  const resolvedSymbol = isSolanaToken ? symbol : registrySymbol !== "Token" ? registrySymbol : symbol;
   const backendDecimals = _nullishCoalesce(extractNumber(token, "decimals"), () => ( extractNumber(token, "tokenDecimals")));
-  const resolvedDecimals = registrySymbol !== "Token" ? _chunkFLXTBFMZcjs.getTokenDecimalsByAddress.call(void 0, addressAsToken, chainId) : _nullishCoalesce(backendDecimals, () => ( 18));
+  const resolvedDecimals = !isSolanaToken && registrySymbol !== "Token" ? _chunkNELAYNA3cjs.getTokenDecimalsByAddress.call(void 0, address, chainId) : _nullishCoalesce(backendDecimals, () => ( 18));
   return {
     chainId,
-    address: addressAsToken,
+    address,
     symbol: resolvedSymbol,
     name: resolvedSymbol,
     decimals: resolvedDecimals,
@@ -414,7 +675,7 @@ function normalizeDirectToken(token) {
 }
 function extractTokenAddress(tokenData, chainId) {
   const token = tokenData;
-  return _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(token.tokenAddress, () => ( token.address)), () => ( _optionalChain([token, 'access', _18 => _18.addresses, 'optionalAccess', _19 => _19[chainId]]))), () => ( _optionalChain([token, 'access', _20 => _20.token, 'optionalAccess', _21 => _21.address]))), () => ( _optionalChain([token, 'access', _22 => _22.token, 'optionalAccess', _23 => _23.addresses, 'optionalAccess', _24 => _24[chainId]])));
+  return _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(token.tokenAddress, () => ( token.address)), () => ( _optionalChain([token, 'access', _31 => _31.addresses, 'optionalAccess', _32 => _32[chainId]]))), () => ( _optionalChain([token, 'access', _33 => _33.token, 'optionalAccess', _34 => _34.address]))), () => ( _optionalChain([token, 'access', _35 => _35.token, 'optionalAccess', _36 => _36.addresses, 'optionalAccess', _37 => _37[chainId]])));
 }
 function extractArray(data, key) {
   if (!data || typeof data !== "object") return null;
@@ -443,7 +704,12 @@ function extractNumericString(data, key) {
 function getAssetId(asset) {
   return `${asset.chainId}:${asset.token.toLowerCase()}`;
 }
+function isEvmAddress(value) {
+  return /^0x[a-fA-F0-9]{40}$/.test(value);
+}
 function portfolioTokenToAsset(token) {
+  if (typeof token.chainId !== "number") return null;
+  if (!isEvmAddress(token.address)) return null;
   return {
     id: getAssetId({ chainId: token.chainId, token: token.address }),
     chainId: token.chainId,
@@ -456,7 +722,7 @@ function portfolioTokenToAsset(token) {
   };
 }
 function portfolioToAssets(tokens) {
-  return tokens.map(portfolioTokenToAsset).sort((a, b) => {
+  return tokens.map(portfolioTokenToAsset).filter((token) => token !== null).sort((a, b) => {
     const balanceA = safeBigInt(a.balance);
     const balanceB = safeBigInt(b.balance);
     if (balanceB > balanceA) return 1;
@@ -499,6 +765,9 @@ function formatUserError(raw) {
   if (lower.includes("execution reverted")) {
     return "Transaction would fail on-chain";
   }
+  if (lower.includes("recent blockhash") || lower.includes("latest blockhash")) {
+    return "Solana RPC unavailable \u2014 please retry";
+  }
   if (lower.includes("network") || lower.includes("disconnected")) {
     return "Network error \u2014 check your connection";
   }
@@ -523,35 +792,35 @@ var RADIUS_VALUES = {
 };
 function applyTheme(element, theme) {
   if (!element) return;
-  if (_optionalChain([theme, 'optionalAccess', _25 => _25.mode])) {
+  if (_optionalChain([theme, 'optionalAccess', _38 => _38.mode])) {
     element.setAttribute("data-theme", theme.mode);
   } else {
     element.removeAttribute("data-theme");
   }
-  if (_optionalChain([theme, 'optionalAccess', _26 => _26.fontColor])) {
+  if (_optionalChain([theme, 'optionalAccess', _39 => _39.fontColor])) {
     element.style.setProperty("--rs-foreground", theme.fontColor);
   }
-  if (_optionalChain([theme, 'optionalAccess', _27 => _27.iconColor])) {
+  if (_optionalChain([theme, 'optionalAccess', _40 => _40.iconColor])) {
     element.style.setProperty("--rs-icon", theme.iconColor);
   }
-  if (_optionalChain([theme, 'optionalAccess', _28 => _28.ctaColor])) {
+  if (_optionalChain([theme, 'optionalAccess', _41 => _41.ctaColor])) {
     element.style.setProperty("--rs-primary", theme.ctaColor);
     element.style.setProperty("--rs-border-accent", theme.ctaColor);
     element.style.setProperty(
       "--rs-primary-hover",
       _nullishCoalesce(theme.ctaHoverColor, () => ( theme.ctaColor))
     );
-  } else if (_optionalChain([theme, 'optionalAccess', _29 => _29.ctaHoverColor])) {
+  } else if (_optionalChain([theme, 'optionalAccess', _42 => _42.ctaHoverColor])) {
     element.style.setProperty("--rs-primary-hover", theme.ctaHoverColor);
   }
-  if (_optionalChain([theme, 'optionalAccess', _30 => _30.borderColor])) {
+  if (_optionalChain([theme, 'optionalAccess', _43 => _43.borderColor])) {
     element.style.setProperty("--rs-border", theme.borderColor);
     element.style.setProperty("--rs-border-surface", theme.borderColor);
   }
-  if (_optionalChain([theme, 'optionalAccess', _31 => _31.backgroundColor])) {
+  if (_optionalChain([theme, 'optionalAccess', _44 => _44.backgroundColor])) {
     element.style.setProperty("--rs-background", theme.backgroundColor);
   }
-  if (_optionalChain([theme, 'optionalAccess', _32 => _32.radius])) {
+  if (_optionalChain([theme, 'optionalAccess', _45 => _45.radius])) {
     element.style.setProperty("--rs-radius", RADIUS_VALUES[theme.radius]);
   }
 }
@@ -698,12 +967,13 @@ function ChevronRightIcon() {
 
 function rowIcon(kind) {
   if (kind === "connected") return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, WalletIcon, {});
+  if (kind === "solana") return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ExternalLinkIcon, {});
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ExternalLinkIcon, {});
 }
 function ConnectStep({
   walletOptions,
-  selectedAddress,
-  onSelectAddress,
+  selectedWalletId,
+  onSelectWallet,
   onSelectTransferCrypto,
   onRequestConnect,
   onConnect,
@@ -712,22 +982,25 @@ function ConnectStep({
   continueButtonLabel = "Continue",
   connectButtonLabel = "Connect external wallet"
 }) {
-  const hasWalletOptions = (_nullishCoalesce(_optionalChain([walletOptions, 'optionalAccess', _33 => _33.length]), () => ( 0))) > 0;
+  const hasWalletOptions = (_nullishCoalesce(_optionalChain([walletOptions, 'optionalAccess', _46 => _46.length]), () => ( 0))) > 0;
   if (hasWalletOptions) {
-    const hasExternalWallet = _nullishCoalesce(_optionalChain([walletOptions, 'optionalAccess', _34 => _34.some, 'call', _35 => _35((option) => option.kind === "external")]), () => ( false));
-    const showConnectDifferentWalletOption = Boolean(onConnect) && !hasExternalWallet;
+    const hasReownWallet = _nullishCoalesce(_optionalChain([walletOptions, 'optionalAccess', _47 => _47.some, 'call', _48 => _48(
+      (option) => option.kind === "external" || option.kind === "solana"
+    )]), () => ( false));
+    const showConnectDifferentWalletOption = Boolean(onConnect) && !hasReownWallet;
     return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-step", children: [
       /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-connect-centered rs-connect-centered--wallets", children: [
         /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-connect-wallet-list", children: [
-          _optionalChain([walletOptions, 'optionalAccess', _36 => _36.map, 'call', _37 => _37((option) => {
-            const isSelected = option.address.toLowerCase() === (_nullishCoalesce(selectedAddress, () => ( ""))).toLowerCase();
-            const shortAddress = `${option.address.slice(0, 6)}...${option.address.slice(-4)}`;
+          _optionalChain([walletOptions, 'optionalAccess', _49 => _49.map, 'call', _50 => _50((option) => {
+            const isSelected = option.id === selectedWalletId;
+            const rawAddress = _nullishCoalesce(_nullishCoalesce(option.address, () => ( option.solanaAddress)), () => ( option.id));
+            const shortAddress = rawAddress.length > 12 ? `${rawAddress.slice(0, 6)}...${rawAddress.slice(-4)}` : rawAddress;
             return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, 
               "button",
               {
                 type: "button",
                 className: `rs-connect-wallet-row ${isSelected ? "rs-connect-wallet-row--selected" : ""}`,
-                onClick: () => _optionalChain([onSelectAddress, 'optionalCall', _38 => _38(option.address)]),
+                onClick: () => _optionalChain([onSelectWallet, 'optionalCall', _51 => _51(option.id)]),
                 children: [
                   /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
                     "div",
@@ -750,7 +1023,7 @@ function ConnectStep({
                   /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-connect-wallet-indicator", children: isSelected ? /* @__PURE__ */ _jsxruntime.jsx.call(void 0, CheckIcon, {}) : /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ChevronRightIcon, {}) })
                 ]
               },
-              `${option.label}-${option.address}`
+              option.id
             );
           })]),
           showConnectDifferentWalletOption && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, 
@@ -786,7 +1059,9 @@ function ConnectStep({
             }
           )
         ] }),
-        (onDisconnect || onConnect) && _optionalChain([walletOptions, 'optionalAccess', _39 => _39.some, 'call', _40 => _40((option) => option.kind === "external")]) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+        (onDisconnect || onConnect) && _optionalChain([walletOptions, 'optionalAccess', _52 => _52.some, 'call', _53 => _53(
+          (option) => option.kind === "external" || option.kind === "solana"
+        )]) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
           "button",
           {
             type: "button",
@@ -802,7 +1077,7 @@ function ConnectStep({
           onClick: onContinue,
           variant: "accent",
           fullWidth: true,
-          disabled: !selectedAddress || !onContinue,
+          disabled: !selectedWalletId || !onContinue,
           children: continueButtonLabel
         }
       ) })
@@ -1001,7 +1276,7 @@ function asNumber(value) {
   const trimmed = value.trim();
   if (!trimmed) return void 0;
   const caipMatch = trimmed.match(/^eip155:(\d+)$/);
-  if (_optionalChain([caipMatch, 'optionalAccess', _41 => _41[1]])) {
+  if (_optionalChain([caipMatch, 'optionalAccess', _54 => _54[1]])) {
     const parsed2 = Number(caipMatch[1]);
     return Number.isFinite(parsed2) ? parsed2 : void 0;
   }
@@ -1020,24 +1295,24 @@ function asAddress(value) {
   return /^0x[a-fA-F0-9]{40}$/.test(value) ? value : void 0;
 }
 function getEventTxHash(event) {
-  if (!_optionalChain([event, 'optionalAccess', _42 => _42.type])) return void 0;
+  if (!_optionalChain([event, 'optionalAccess', _55 => _55.type])) return void 0;
   if (event.type === "deposit-received") {
-    return asString(_optionalChain([event, 'access', _43 => _43.data, 'optionalAccess', _44 => _44.transactionHash]));
+    return asString(_optionalChain([event, 'access', _56 => _56.data, 'optionalAccess', _57 => _57.transactionHash]));
   }
   if (event.type === "bridge-started" || event.type === "bridge-complete") {
-    const deposit = isRecord(_optionalChain([event, 'access', _45 => _45.data, 'optionalAccess', _46 => _46.deposit])) ? event.data.deposit : void 0;
-    const source = isRecord(_optionalChain([event, 'access', _47 => _47.data, 'optionalAccess', _48 => _48.source])) ? event.data.source : void 0;
-    return _nullishCoalesce(asString(_optionalChain([deposit, 'optionalAccess', _49 => _49.transactionHash])), () => ( asString(_optionalChain([source, 'optionalAccess', _50 => _50.transactionHash]))));
+    const deposit = isRecord(_optionalChain([event, 'access', _58 => _58.data, 'optionalAccess', _59 => _59.deposit])) ? event.data.deposit : void 0;
+    const source = isRecord(_optionalChain([event, 'access', _60 => _60.data, 'optionalAccess', _61 => _61.source])) ? event.data.source : void 0;
+    return _nullishCoalesce(asString(_optionalChain([deposit, 'optionalAccess', _62 => _62.transactionHash])), () => ( asString(_optionalChain([source, 'optionalAccess', _63 => _63.transactionHash]))));
   }
   if (event.type === "bridge-failed" || event.type === "error") {
-    const deposit = isRecord(_optionalChain([event, 'access', _51 => _51.data, 'optionalAccess', _52 => _52.deposit])) ? event.data.deposit : void 0;
-    const source = isRecord(_optionalChain([event, 'access', _53 => _53.data, 'optionalAccess', _54 => _54.source])) ? event.data.source : void 0;
-    return _nullishCoalesce(asString(_optionalChain([deposit, 'optionalAccess', _55 => _55.transactionHash])), () => ( asString(_optionalChain([source, 'optionalAccess', _56 => _56.transactionHash]))));
+    const deposit = isRecord(_optionalChain([event, 'access', _64 => _64.data, 'optionalAccess', _65 => _65.deposit])) ? event.data.deposit : void 0;
+    const source = isRecord(_optionalChain([event, 'access', _66 => _66.data, 'optionalAccess', _67 => _67.source])) ? event.data.source : void 0;
+    return _nullishCoalesce(asString(_optionalChain([deposit, 'optionalAccess', _68 => _68.transactionHash])), () => ( asString(_optionalChain([source, 'optionalAccess', _69 => _69.transactionHash]))));
   }
   return void 0;
 }
 function getEventSourceDetails(event) {
-  if (!_optionalChain([event, 'optionalAccess', _57 => _57.type]) || !isRecord(event.data)) return {};
+  if (!_optionalChain([event, 'optionalAccess', _70 => _70.type]) || !isRecord(event.data)) return {};
   if (event.type === "deposit-received") {
     return {
       chainId: asNumber(event.data.chain),
@@ -1049,15 +1324,24 @@ function getEventSourceDetails(event) {
   const deposit = isRecord(event.data.deposit) ? event.data.deposit : void 0;
   if (event.type === "bridge-started" || event.type === "bridge-complete" || event.type === "bridge-failed" || event.type === "error") {
     return {
-      chainId: _nullishCoalesce(asNumber(_optionalChain([source, 'optionalAccess', _58 => _58.chain])), () => ( asNumber(_optionalChain([deposit, 'optionalAccess', _59 => _59.chain])))),
-      amount: _nullishCoalesce(asAmount(_optionalChain([source, 'optionalAccess', _60 => _60.amount])), () => ( asAmount(_optionalChain([deposit, 'optionalAccess', _61 => _61.amount])))),
-      token: _nullishCoalesce(_nullishCoalesce(asAddress(_optionalChain([source, 'optionalAccess', _62 => _62.asset])), () => ( asAddress(_optionalChain([deposit, 'optionalAccess', _63 => _63.asset])))), () => ( asAddress(_optionalChain([deposit, 'optionalAccess', _64 => _64.token]))))
+      chainId: _nullishCoalesce(asNumber(_optionalChain([source, 'optionalAccess', _71 => _71.chain])), () => ( asNumber(_optionalChain([deposit, 'optionalAccess', _72 => _72.chain])))),
+      amount: _nullishCoalesce(asAmount(_optionalChain([source, 'optionalAccess', _73 => _73.amount])), () => ( asAmount(_optionalChain([deposit, 'optionalAccess', _74 => _74.amount])))),
+      token: _nullishCoalesce(_nullishCoalesce(asAddress(_optionalChain([source, 'optionalAccess', _75 => _75.asset])), () => ( asAddress(_optionalChain([deposit, 'optionalAccess', _76 => _76.asset])))), () => ( asAddress(_optionalChain([deposit, 'optionalAccess', _77 => _77.token]))))
     };
   }
   return {};
 }
 function isDepositEvent(event) {
-  return _optionalChain([event, 'optionalAccess', _65 => _65.type]) === "deposit-received" || _optionalChain([event, 'optionalAccess', _66 => _66.type]) === "bridge-started" || _optionalChain([event, 'optionalAccess', _67 => _67.type]) === "bridge-complete" || _optionalChain([event, 'optionalAccess', _68 => _68.type]) === "bridge-failed" || _optionalChain([event, 'optionalAccess', _69 => _69.type]) === "error";
+  return _optionalChain([event, 'optionalAccess', _78 => _78.type]) === "deposit-received" || _optionalChain([event, 'optionalAccess', _79 => _79.type]) === "bridge-started" || _optionalChain([event, 'optionalAccess', _80 => _80.type]) === "bridge-complete" || _optionalChain([event, 'optionalAccess', _81 => _81.type]) === "bridge-failed" || _optionalChain([event, 'optionalAccess', _82 => _82.type]) === "error";
+}
+function isHexString(value) {
+  return value.startsWith("0x") || value.startsWith("0X");
+}
+function txRefsMatch(a, b) {
+  if (isHexString(a) && isHexString(b)) {
+    return a.toLowerCase() === b.toLowerCase();
+  }
+  return a === b;
 }
 
 // src/components/steps/ProcessingStep.tsx
@@ -1069,15 +1353,32 @@ var PROCESS_TIMEOUT_MS = 10 * 60 * 1e3;
 function isEventForTx(event, txHash) {
   const eventTxHash = getEventTxHash(event);
   if (!eventTxHash) return false;
-  return eventTxHash.toLowerCase() === txHash.toLowerCase();
+  return txRefsMatch(eventTxHash, txHash);
 }
 function formatBridgeFailedMessage(event) {
-  const eventData = _nullishCoalesce(_optionalChain([event, 'optionalAccess', _70 => _70.data]), () => ( {}));
+  const eventData = _nullishCoalesce(_optionalChain([event, 'optionalAccess', _83 => _83.data]), () => ( {}));
   const code = typeof eventData.errorCode === "string" ? eventData.errorCode : void 0;
   const backendMessage = typeof eventData.message === "string" ? eventData.message.trim() : "";
+  function toUserFacingFailure(raw) {
+    const lower = raw.toLowerCase();
+    if (lower.includes("insufficient funds")) {
+      return "Deposit was received, but processing could not continue due to insufficient funds. Please retry.";
+    }
+    if (lower.includes("no valid quote available")) {
+      return "No bridge route is currently available for this transfer. Please try again shortly.";
+    }
+    if (lower.includes("simulation failed")) {
+      return "Transfer processing failed during simulation. Please retry.";
+    }
+    if (raw.length > 220) {
+      return "Transfer processing failed. Please retry.";
+    }
+    return raw;
+  }
   if (backendMessage.length > 0) {
+    const userMessage = toUserFacingFailure(backendMessage);
     return {
-      message: backendMessage,
+      message: userMessage,
       code
     };
   }
@@ -1093,6 +1394,8 @@ function ProcessingStep({
   sourceToken,
   targetChain,
   amount,
+  sourceSymbol: providedSourceSymbol,
+  sourceDecimals: providedSourceDecimals,
   waitForFinalTx,
   service,
   directTransfer,
@@ -1112,10 +1415,14 @@ function ProcessingStep({
   const intervalRef = _react.useRef.call(void 0, null);
   _react.useEffect.call(void 0, () => {
     if (directTransfer) {
-      _optionalChain([onDepositComplete, 'optionalCall', _71 => _71(txHash)]);
+      debugLog(debug, "processing", "direct-transfer:complete", {
+        txHash,
+        flowLabel
+      });
+      _optionalChain([onDepositComplete, 'optionalCall', _84 => _84(txHash)]);
       return;
     }
-  }, [directTransfer, txHash, onDepositComplete]);
+  }, [debug, directTransfer, flowLabel, txHash, onDepositComplete]);
   _react.useEffect.call(void 0, () => {
     if (directTransfer) return;
     startTimeRef.current = Date.now();
@@ -1146,54 +1453,81 @@ function ProcessingStep({
     let isMounted = true;
     async function pollStatus() {
       try {
+        debugLog(debug, "processing", "poll:request", {
+          smartAccount,
+          txHash,
+          intervalMs: pollIntervalRef.current
+        });
         const data = await service.fetchStatus(smartAccount, txHash);
         const lastEvent2 = data.lastEvent;
         const eventMatchesTx = isEventForTx(lastEvent2, txHash);
         const eventForCurrentTx = eventMatchesTx ? lastEvent2 : void 0;
-        if (debug && lastEvent2) {
+        if (lastEvent2) {
           const eventData = lastEvent2.data;
-          console.log("[deposit-modal] status poll", {
+          debugLog(debug, "processing", "poll:event", {
             type: lastEvent2.type,
             matchesTx: eventMatchesTx,
-            intentId: _optionalChain([eventData, 'optionalAccess', _72 => _72.intentId]),
-            data: eventData
+            intentId: _optionalChain([eventData, 'optionalAccess', _85 => _85.intentId])
           });
         }
         if (!isMounted) return;
-        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _73 => _73.type]) === "bridge-complete") {
+        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _86 => _86.type]) === "bridge-complete") {
           setState({ type: "complete", lastEvent: eventForCurrentTx });
-          const destinationTxHash2 = _optionalChain([eventForCurrentTx, 'access', _74 => _74.data, 'optionalAccess', _75 => _75.destination, 'optionalAccess', _76 => _76.transactionHash]);
-          _optionalChain([onDepositComplete, 'optionalCall', _77 => _77(txHash, destinationTxHash2)]);
+          const destinationTxHash2 = _optionalChain([eventForCurrentTx, 'access', _87 => _87.data, 'optionalAccess', _88 => _88.destination, 'optionalAccess', _89 => _89.transactionHash]);
+          debugLog(debug, "processing", "state:complete", {
+            txHash,
+            destinationTxHash: destinationTxHash2,
+            event: eventForCurrentTx.type
+          });
+          _optionalChain([onDepositComplete, 'optionalCall', _90 => _90(txHash, destinationTxHash2)]);
           return;
         }
-        if (!waitForFinalTx && _optionalChain([eventForCurrentTx, 'optionalAccess', _78 => _78.type]) === "bridge-started") {
+        if (!waitForFinalTx && _optionalChain([eventForCurrentTx, 'optionalAccess', _91 => _91.type]) === "bridge-started") {
           setState({ type: "complete", lastEvent: eventForCurrentTx });
-          _optionalChain([onDepositComplete, 'optionalCall', _79 => _79(txHash)]);
+          debugLog(debug, "processing", "state:early-complete", {
+            txHash,
+            event: eventForCurrentTx.type
+          });
+          _optionalChain([onDepositComplete, 'optionalCall', _92 => _92(txHash)]);
           return;
         }
-        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _80 => _80.type]) === "bridge-failed") {
+        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _93 => _93.type]) === "bridge-failed") {
           const formatted = formatBridgeFailedMessage(eventForCurrentTx);
           setState({
             type: "failed",
             message: formatted.message,
             lastEvent: eventForCurrentTx
           });
-          _optionalChain([onDepositFailed, 'optionalCall', _81 => _81(txHash, formatted.message)]);
+          debugLog(debug, "processing", "state:failed", {
+            txHash,
+            message: formatted.message,
+            code: formatted.code
+          });
+          _optionalChain([onDepositFailed, 'optionalCall', _94 => _94(txHash, formatted.message)]);
           return;
         }
-        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _82 => _82.type]) === "error") {
-          const errorMessage = _nullishCoalesce(_optionalChain([eventForCurrentTx, 'access', _83 => _83.data, 'optionalAccess', _84 => _84.message]), () => ( "Unknown error"));
+        if (_optionalChain([eventForCurrentTx, 'optionalAccess', _95 => _95.type]) === "error") {
+          const errorMessage = _nullishCoalesce(_optionalChain([eventForCurrentTx, 'access', _96 => _96.data, 'optionalAccess', _97 => _97.message]), () => ( "Unknown error"));
           setState({
             type: "failed",
             message: errorMessage,
             lastEvent: eventForCurrentTx
           });
-          _optionalChain([onDepositFailed, 'optionalCall', _85 => _85(txHash, errorMessage)]);
+          debugLog(debug, "processing", "state:error-event", {
+            txHash,
+            message: errorMessage
+          });
+          _optionalChain([onDepositFailed, 'optionalCall', _98 => _98(txHash, errorMessage)]);
           return;
         }
         setState({ type: "processing", lastEvent: eventForCurrentTx });
         scheduleNextPoll();
-      } catch (e3) {
+      } catch (error) {
+        debugError(debug, "processing", "poll:failure", error, {
+          smartAccount,
+          txHash,
+          intervalMs: pollIntervalRef.current
+        });
         scheduleNextPoll();
       }
     }
@@ -1204,6 +1538,9 @@ function ProcessingStep({
           pollIntervalRef.current * BACKOFF_MULTIPLIER,
           MAX_POLL_INTERVAL
         );
+        debugLog(debug, "processing", "poll:scheduled", {
+          nextIntervalMs: pollIntervalRef.current
+        });
         pollStatus();
       }, pollIntervalRef.current);
     }
@@ -1215,6 +1552,7 @@ function ProcessingStep({
       }
     };
   }, [
+    debug,
     directTransfer,
     state.type,
     smartAccount,
@@ -1235,8 +1573,12 @@ function ProcessingStep({
     }
     processTimeoutRef.current = setTimeout(() => {
       const message = "We couldn't confirm your transfer. Please contact support if funds do not arrive.";
+      debugLog(debug, "processing", "state:timeout", {
+        txHash,
+        timeoutMs: PROCESS_TIMEOUT_MS
+      });
       setState({ type: "error", message });
-      _optionalChain([onError, 'optionalCall', _86 => _86(message, "PROCESS_TIMEOUT")]);
+      _optionalChain([onError, 'optionalCall', _99 => _99(message, "PROCESS_TIMEOUT")]);
     }, PROCESS_TIMEOUT_MS);
     return () => {
       if (processTimeoutRef.current) {
@@ -1244,21 +1586,21 @@ function ProcessingStep({
         processTimeoutRef.current = null;
       }
     };
-  }, [directTransfer, state.type, onError]);
+  }, [debug, directTransfer, state.type, txHash, onError]);
   const isError = state.type === "error" || state.type === "failed";
   const isComplete = state.type === "complete";
   const isProcessing = state.type === "processing";
   const lastEvent = state.type === "processing" || state.type === "complete" || state.type === "failed" ? state.lastEvent : void 0;
-  const isEarlyComplete = !waitForFinalTx && _optionalChain([lastEvent, 'optionalAccess', _87 => _87.type]) === "bridge-started";
+  const isEarlyComplete = !waitForFinalTx && _optionalChain([lastEvent, 'optionalAccess', _100 => _100.type]) === "bridge-started";
   const flowNoun = flowLabel === "withdraw" ? "withdrawal" : "deposit";
   const flowCapitalized = flowLabel === "withdraw" ? "Withdrawal" : "Deposit";
-  const destinationTxHash = _optionalChain([lastEvent, 'optionalAccess', _88 => _88.data, 'optionalAccess', _89 => _89.destination, 'optionalAccess', _90 => _90.transactionHash]) || null;
+  const destinationTxHash = _optionalChain([lastEvent, 'optionalAccess', _101 => _101.data, 'optionalAccess', _102 => _102.destination, 'optionalAccess', _103 => _103.transactionHash]) || null;
   const sourceDetails = getEventSourceDetails(lastEvent);
   const displaySourceChain = _nullishCoalesce(sourceDetails.chainId, () => ( sourceChain));
   const displaySourceToken = _nullishCoalesce(sourceDetails.token, () => ( sourceToken));
   const displayAmount = _nullishCoalesce(sourceDetails.amount, () => ( amount));
-  const sourceExplorerUrl = _chunkFLXTBFMZcjs.getExplorerTxUrl.call(void 0, displaySourceChain, txHash);
-  const destExplorerUrl = destinationTxHash ? _chunkFLXTBFMZcjs.getExplorerTxUrl.call(void 0, targetChain, destinationTxHash) : null;
+  const sourceExplorerUrl = _chunkNELAYNA3cjs.getExplorerTxUrl.call(void 0, displaySourceChain, txHash);
+  const destExplorerUrl = destinationTxHash ? _chunkNELAYNA3cjs.getExplorerTxUrl.call(void 0, targetChain, destinationTxHash) : null;
   const truncateHash = (hash) => `${hash.slice(0, 10)}...${hash.slice(-8)}`;
   const formatElapsedTime = (seconds) => {
     if (seconds < 60) return `${seconds} second${seconds !== 1 ? "s" : ""}`;
@@ -1266,18 +1608,16 @@ function ProcessingStep({
     const secs = seconds % 60;
     return `${mins}m ${secs}s`;
   };
-  const sourceSymbol = _chunkFLXTBFMZcjs.getTokenSymbol.call(void 0, displaySourceToken, displaySourceChain);
-  const sourceDecimals = _chunkFLXTBFMZcjs.getTokenDecimalsByAddress.call(void 0, 
-    displaySourceToken,
-    displaySourceChain
-  );
+  const isEvmSourceToken = /^0x[a-fA-F0-9]{40}$/.test(displaySourceToken);
+  const sourceSymbol = displaySourceChain === "solana" ? _nullishCoalesce(providedSourceSymbol, () => ( "SOL")) : isEvmSourceToken ? _chunkNELAYNA3cjs.getTokenSymbol.call(void 0, displaySourceToken, displaySourceChain) : _nullishCoalesce(providedSourceSymbol, () => ( "Token"));
+  const sourceDecimals = displaySourceChain === "solana" ? _nullishCoalesce(providedSourceDecimals, () => ( 9)) : isEvmSourceToken ? _chunkNELAYNA3cjs.getTokenDecimalsByAddress.call(void 0, displaySourceToken, displaySourceChain) : _nullishCoalesce(providedSourceDecimals, () => ( 18));
   const formattedReceivedAmount = (() => {
     try {
       const raw = _viem.formatUnits.call(void 0, BigInt(displayAmount), sourceDecimals);
       const numeric = Number(raw);
       if (!Number.isFinite(numeric)) return raw;
       return numeric.toLocaleString("en-US", { maximumFractionDigits: 6 });
-    } catch (e4) {
+    } catch (e3) {
       return Number(displayAmount).toLocaleString("en-US", {
         maximumFractionDigits: 6
       });
@@ -1341,15 +1681,15 @@ function ProcessingStep({
                 className: "rs-card-value",
                 style: { display: "flex", alignItems: "center", gap: 6 },
                 children: [
-                  _chunkFLXTBFMZcjs.getChainIcon.call(void 0, displaySourceChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+                  _chunkNELAYNA3cjs.getChainIcon.call(void 0, displaySourceChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
                     "img",
                     {
-                      src: _chunkFLXTBFMZcjs.getChainIcon.call(void 0, displaySourceChain),
+                      src: _chunkNELAYNA3cjs.getChainIcon.call(void 0, displaySourceChain),
                       alt: "",
                       style: { width: 14, height: 14, borderRadius: "50%" }
                     }
                   ),
-                  _chunkFLXTBFMZcjs.getChainName.call(void 0, displaySourceChain)
+                  _chunkNELAYNA3cjs.getChainName.call(void 0, displaySourceChain)
                 ]
               }
             )
@@ -1362,15 +1702,15 @@ function ProcessingStep({
                 className: "rs-card-value",
                 style: { display: "flex", alignItems: "center", gap: 6 },
                 children: [
-                  _chunkFLXTBFMZcjs.getChainIcon.call(void 0, targetChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+                  _chunkNELAYNA3cjs.getChainIcon.call(void 0, targetChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
                     "img",
                     {
-                      src: _chunkFLXTBFMZcjs.getChainIcon.call(void 0, targetChain),
+                      src: _chunkNELAYNA3cjs.getChainIcon.call(void 0, targetChain),
                       alt: "",
                       style: { width: 14, height: 14, borderRadius: "50%" }
                     }
                   ),
-                  _chunkFLXTBFMZcjs.getChainName.call(void 0, targetChain)
+                  _chunkNELAYNA3cjs.getChainName.call(void 0, targetChain)
                 ]
               }
             )
@@ -1492,7 +1832,7 @@ function ProcessingStep({
         {
           className: `rs-step-description ${isError ? "rs-text-error" : "rs-text-secondary"}`,
           children: [
-            state.type === "processing" && (_optionalChain([lastEvent, 'optionalAccess', _91 => _91.type]) === "deposit-received" ? "Transfer received. Preparing bridge..." : _optionalChain([lastEvent, 'optionalAccess', _92 => _92.type]) === "bridge-started" ? "Transfer confirmed. Funds arriving shortly..." : `Bridging your ${flowNoun} to ${_chunkFLXTBFMZcjs.getChainName.call(void 0, targetChain)}.`),
+            state.type === "processing" && (_optionalChain([lastEvent, 'optionalAccess', _104 => _104.type]) === "deposit-received" ? "Transfer received. Preparing bridge..." : _optionalChain([lastEvent, 'optionalAccess', _105 => _105.type]) === "bridge-started" ? "Transfer confirmed. Funds arriving shortly..." : `Bridging your ${flowNoun} to ${_chunkNELAYNA3cjs.getChainName.call(void 0, targetChain)}.`),
             state.type === "failed" && state.message,
             state.type === "error" && state.message
           ]
@@ -1548,15 +1888,15 @@ function ProcessingStep({
               className: "rs-card-value",
               style: { display: "flex", alignItems: "center", gap: 8 },
               children: [
-                _chunkFLXTBFMZcjs.getChainIcon.call(void 0, displaySourceChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+                _chunkNELAYNA3cjs.getChainIcon.call(void 0, displaySourceChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
                   "img",
                   {
-                    src: _chunkFLXTBFMZcjs.getChainIcon.call(void 0, displaySourceChain),
+                    src: _chunkNELAYNA3cjs.getChainIcon.call(void 0, displaySourceChain),
                     alt: "",
                     style: { width: 16, height: 16, borderRadius: "50%" }
                   }
                 ),
-                _chunkFLXTBFMZcjs.getChainName.call(void 0, displaySourceChain)
+                _chunkNELAYNA3cjs.getChainName.call(void 0, displaySourceChain)
               ]
             }
           )
@@ -1569,15 +1909,15 @@ function ProcessingStep({
               className: "rs-card-value",
               style: { display: "flex", alignItems: "center", gap: 8 },
               children: [
-                _chunkFLXTBFMZcjs.getChainIcon.call(void 0, targetChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+                _chunkNELAYNA3cjs.getChainIcon.call(void 0, targetChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
                   "img",
                   {
-                    src: _chunkFLXTBFMZcjs.getChainIcon.call(void 0, targetChain),
+                    src: _chunkNELAYNA3cjs.getChainIcon.call(void 0, targetChain),
                     alt: "",
                     style: { width: 16, height: 16, borderRadius: "50%" }
                   }
                 ),
-                _chunkFLXTBFMZcjs.getChainName.call(void 0, targetChain)
+                _chunkNELAYNA3cjs.getChainName.call(void 0, targetChain)
               ]
             }
           )
@@ -1630,7 +1970,7 @@ var clientCache = /* @__PURE__ */ new Map();
 function getPublicClient(chainId) {
   let client = clientCache.get(chainId);
   if (!client) {
-    const chain = _chunkFLXTBFMZcjs.CHAIN_BY_ID[chainId];
+    const chain = _chunkNELAYNA3cjs.CHAIN_BY_ID[chainId];
     client = _viem.createPublicClient.call(void 0, {
       chain,
       transport: _viem.http.call(void 0, )
@@ -1664,4 +2004,7 @@ function getPublicClient(chainId) {
 
 
 
-exports.Modal = Modal; exports.Spinner = Spinner; exports.Button = Button; exports.ConnectStep = ConnectStep; exports.buildSessionDetails = buildSessionDetails; exports.createDepositService = createDepositService; exports.getAssetId = getAssetId; exports.portfolioToAssets = portfolioToAssets; exports.isNativeAsset = isNativeAsset; exports.loadSessionOwnerFromStorage = loadSessionOwnerFromStorage; exports.saveSessionOwnerToStorage = saveSessionOwnerToStorage; exports.createSessionOwnerKey = createSessionOwnerKey; exports.accountFromPrivateKey = accountFromPrivateKey; exports.PoweredBy = PoweredBy; exports.currencyFormatter = currencyFormatter; exports.tokenFormatter = tokenFormatter; exports.formatUserError = formatUserError; exports.getEventTxHash = getEventTxHash; exports.getEventSourceDetails = getEventSourceDetails; exports.isDepositEvent = isDepositEvent; exports.ProcessingStep = ProcessingStep; exports.getPublicClient = getPublicClient; exports.applyTheme = applyTheme;
+
+
+
+exports.Modal = Modal; exports.Spinner = Spinner; exports.Button = Button; exports.ConnectStep = ConnectStep; exports.debugLog = debugLog; exports.debugError = debugError; exports.toEvmCaip2 = toEvmCaip2; exports.buildSessionDetails = buildSessionDetails; exports.createDepositService = createDepositService; exports.getAssetId = getAssetId; exports.portfolioToAssets = portfolioToAssets; exports.isNativeAsset = isNativeAsset; exports.loadSessionOwnerFromStorage = loadSessionOwnerFromStorage; exports.saveSessionOwnerToStorage = saveSessionOwnerToStorage; exports.createSessionOwnerKey = createSessionOwnerKey; exports.accountFromPrivateKey = accountFromPrivateKey; exports.PoweredBy = PoweredBy; exports.currencyFormatter = currencyFormatter; exports.tokenFormatter = tokenFormatter; exports.formatUserError = formatUserError; exports.getEventTxHash = getEventTxHash; exports.isDepositEvent = isDepositEvent; exports.txRefsMatch = txRefsMatch; exports.ProcessingStep = ProcessingStep; exports.getPublicClient = getPublicClient; exports.applyTheme = applyTheme;