@trustware/sdk-staging 1.1.12-staging.2 → 1.1.12-staging.4

package/dist/widget.mjs

@@ -571,7 +571,7 @@ var init_constants = __esm({
   "src/constants.ts"() {
     "use strict";
     SDK_NAME = "@trustware/sdk";
-    SDK_VERSION = "1.1.12-staging.2";
+    SDK_VERSION = "1.1.12-staging.4";
     API_ROOT = "https://bv-staging-api.trustware.io";
     GTM_ID = "GTM-TZDGNCXB";
     API_PREFIX = "/api";
@@ -735,6 +735,7 @@ function inferChainTypeFromValue(normalized) {
   if (normalized === "evm" || normalized === "solana" || normalized === "cosmos" || normalized === "bitcoin") {
     return normalized;
   }
+  if (normalized === SOLANA_CHAIN_ID) return "solana";
   if (/^eip155:\d+$/.test(normalized) || /^\d+$/.test(normalized)) {
     return "evm";
   }
@@ -781,12 +782,13 @@ function isZeroAddressLike(address, chainType) {
   const normalized = normalizeAddress(address, chainType);
   return normalized === normalizeAddress(getNativeTokenAddress(chainType), chainType) || normalized === "0x0000000000000000000000000000000000000000";
 }
-var NATIVE_EVM, NATIVE_SOLANA, CHAIN_TYPE_ALIASES;
+var NATIVE_EVM, NATIVE_SOLANA, SOLANA_CHAIN_ID, CHAIN_TYPE_ALIASES;
 var init_chains = __esm({
   "src/utils/chains.ts"() {
     "use strict";
     NATIVE_EVM = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
     NATIVE_SOLANA = "So11111111111111111111111111111111111111111";
+    SOLANA_CHAIN_ID = "1151111081099710";
     CHAIN_TYPE_ALIASES = {
       btc: "bitcoin",
       bitcoin: "bitcoin",
@@ -2495,7 +2497,159 @@ var init_balances = __esm({
   }
 });
 
+// src/widget/helpers/chainHelpers.ts
+function normalizeChainKey2(id) {
+  if (id === void 0 || id === null) return "";
+  return String(id).trim().toLowerCase();
+}
+function getNativeTokenAddress2(chainType) {
+  const normalized = chainType?.toLowerCase?.();
+  return normalized === "solana" ? NATIVE_SOLANA2 : NATIVE_EVM2;
+}
+function isSolanaNativeTokenAlias2(address) {
+  if (!address) return false;
+  const trimmed = address.trim();
+  if (!trimmed) return false;
+  return trimmed === NATIVE_SOLANA2 || trimmed.toLowerCase() === NATIVE_EVM2;
+}
+function parseDecimalToWei(input, decimals) {
+  if (!input?.trim()) return null;
+  const s = input.trim();
+  if (!/^\d*\.?\d*$/.test(s)) return null;
+  const [intPartRaw, fracRaw = ""] = s.split(".");
+  const intPart = intPartRaw.length ? BigInt(intPartRaw) : 0n;
+  const frac = (fracRaw + "0".repeat(decimals)).slice(0, decimals);
+  const fracPart = frac ? BigInt(frac) : 0n;
+  const base2 = 10n ** BigInt(decimals);
+  return intPart * base2 + fracPart;
+}
+function inferChainTypeFromValue2(normalized) {
+  if (!normalized) return void 0;
+  const aliased = CHAIN_TYPE_ALIASES2[normalized];
+  if (aliased) return aliased;
+  if (normalized === "evm" || normalized === "solana" || normalized === "cosmos" || normalized === "bitcoin") {
+    return normalized;
+  }
+  if (normalized === SOLANA_CHAIN_ID2) return "solana";
+  if (/^eip155:\d+$/.test(normalized) || /^\d+$/.test(normalized)) {
+    return "evm";
+  }
+  if (normalized.startsWith("solana:") || normalized.includes("solana")) {
+    return "solana";
+  }
+  if (normalized.startsWith("cosmos:") || normalized.startsWith("sei:") || normalized === "sei-evm") {
+    return "cosmos";
+  }
+  return void 0;
+}
+function normalizeChainType2(chain) {
+  if (!chain) return void 0;
+  const raw = typeof chain === "string" ? chain : chain.type ?? chain.chainType ?? chain.networkIdentifier ?? chain.chainId ?? chain.id ?? chain.networkName ?? chain.axelarChainName;
+  if (!raw) return void 0;
+  const normalized = String(raw).trim().toLowerCase();
+  return inferChainTypeFromValue2(normalized) ?? normalized;
+}
+function canonicalChainKeyForLink(chain) {
+  const seiKey = canonicalSeiChainKey(chain.chainId ?? chain.id);
+  if (seiKey) return seiKey;
+  return normalizeChainKey2(
+    chain.networkIdentifier ?? chain.axelarChainName ?? chain.id ?? chain.chainId ?? chain.networkName
+  );
+}
+function canonicalSeiChainKey(chainId) {
+  const normalized = normalizeChainKey2(chainId);
+  if (!normalized) return null;
+  if (normalized === SEI_EVM_CHAIN_ID) return "sei-evm";
+  if (normalized === SEI_COSMOS_CHAIN_ID) return "sei";
+  return null;
+}
+function isZeroAddrLike(a, chainType) {
+  if (!a) return true;
+  if (!chainType) return false;
+  const s = normalizeAddress2(a, chainType);
+  return s === normalizeAddress2(getNativeTokenAddress2(chainType), chainType) || s === "0x0000000000000000000000000000000000000000";
+}
+function normalizeAddress2(address, chainType) {
+  if (chainType?.toLowerCase?.() === "solana") {
+    const trimmed = address.trim();
+    if (isSolanaNativeTokenAlias2(trimmed)) {
+      return NATIVE_SOLANA2;
+    }
+    return trimmed;
+  }
+  return address.toLowerCase();
+}
+function isNativeTokenAddress(address, chainType) {
+  if (!address) return false;
+  if (!chainType) return false;
+  return normalizeAddress2(address, chainType) === normalizeAddress2(getNativeTokenAddress2(chainType), chainType);
+}
+function isEvmAddress2(value) {
+  return !!value && EVM_ADDRESS_RE.test(value);
+}
+function needsErc20Approval(tokenAddress, chainType) {
+  if (!isEvmAddress2(tokenAddress)) return false;
+  const normalizedType = normalizeChainType2(chainType ?? void 0);
+  if (normalizedType && NON_EVM_CHAIN_TYPES.has(normalizedType)) return false;
+  return !isNativeTokenAddress(tokenAddress, chainType) && !isZeroAddrLike(tokenAddress, chainType);
+}
+function canonicalTokenAddressForChain(chain, address, chainTokens = []) {
+  const chainType = normalizeChainType2(chain);
+  const rawAddress = (address ?? "").trim();
+  if (chainType === "solana") return normalizeAddress2(rawAddress, "solana");
+  if (chainType === "cosmos") {
+    const chainIdKey = normalizeChainKey2(chain.chainId ?? chain.id ?? "");
+    const nativeSymbol = chain.nativeCurrency?.symbol?.toUpperCase?.();
+    const nativeFromRegistry = chainTokens.find(
+      (token) => normalizeChainKey2(token.chainId) === chainIdKey && token.symbol?.toUpperCase?.() === nativeSymbol
+    );
+    const nativeDenom = (nativeFromRegistry?.address ?? "usei").toLowerCase();
+    if (rawAddress.toLowerCase() === NATIVE_EVM2) {
+      return nativeDenom;
+    }
+    return rawAddress.toLowerCase();
+  }
+  const lowerAddress = rawAddress.toLowerCase();
+  if (lowerAddress === "0x0000000000000000000000000000000000000000") {
+    return NATIVE_EVM2;
+  }
+  return lowerAddress;
+}
+var NATIVE_EVM2, NATIVE_SOLANA2, SOLANA_CHAIN_ID2, CHAIN_TYPE_ALIASES2, SEI_EVM_CHAIN_ID, SEI_COSMOS_CHAIN_ID, EVM_ADDRESS_RE, NON_EVM_CHAIN_TYPES;
+var init_chainHelpers = __esm({
+  "src/widget/helpers/chainHelpers.ts"() {
+    "use strict";
+    NATIVE_EVM2 = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+    NATIVE_SOLANA2 = "So11111111111111111111111111111111111111111";
+    SOLANA_CHAIN_ID2 = "1151111081099710";
+    CHAIN_TYPE_ALIASES2 = {
+      btc: "bitcoin",
+      bitcoin: "bitcoin",
+      sei: "cosmos",
+      "pacific-1": "cosmos",
+      nibiru: "cosmos",
+      "cataclysm-1": "cosmos"
+    };
+    SEI_EVM_CHAIN_ID = "1329";
+    SEI_COSMOS_CHAIN_ID = "pacific-1";
+    EVM_ADDRESS_RE = /^0x[0-9a-fA-F]{40}$/;
+    NON_EVM_CHAIN_TYPES = /* @__PURE__ */ new Set(["solana", "bitcoin", "btc"]);
+  }
+});
+
 // src/core/routes.ts
+function canonicalRouteToken(address, chain) {
+  const chainType = normalizeChainType2(
+    chain === void 0 || chain === null ? void 0 : String(chain)
+  );
+  if (chainType !== "solana") return address ?? "";
+  if (!address) return SOLANA_NATIVE_ROUTE_TOKEN;
+  const trimmed = address.trim();
+  if (isSolanaNativeTokenAlias2(trimmed) || trimmed === "0x0000000000000000000000000000000000000000") {
+    return SOLANA_NATIVE_ROUTE_TOKEN;
+  }
+  return trimmed;
+}
 function assertValidPostHook(hooks) {
   const postHook = hooks?.postHook;
   if (!postHook) return;
@@ -2540,6 +2694,8 @@ async function buildRoute(body, signal) {
   const url = `${apiBase()}/v1/routes/route`;
   const payload = {
     ...body,
+    fromToken: canonicalRouteToken(body.fromToken, body.fromChain),
+    toToken: canonicalRouteToken(body.toToken, body.toChain),
     slippageBps: body.slippageBps ?? (body.slippage === void 0 ? void 0 : Math.round(body.slippage * 100)),
     fromAmountUSD: body.fromAmountUSD ?? body.fromAmountUsd
   };
@@ -2579,6 +2735,8 @@ async function buildDepositAddress(body, signal) {
   const url = `${apiBase()}/v1/routes/deposit-address`;
   const payload = {
     ...body,
+    fromToken: canonicalRouteToken(body.fromToken, body.fromChain),
+    toToken: canonicalRouteToken(body.toToken, body.toChain),
     slippageBps: body.slippageBps ?? (body.slippage === void 0 ? void 0 : Math.round(body.slippage * 100)),
     fromAmountUSD: body.fromAmountUSD ?? body.fromAmountUsd
   };
@@ -2677,13 +2835,15 @@ async function pollStatus(intentId, { intervalMs = 2e3, timeoutMs = 5 * 6e4 } =
     await new Promise((r) => setTimeout(r, intervalMs));
   }
 }
-var STATUS_WIRE_TO_CAMEL;
+var SOLANA_NATIVE_ROUTE_TOKEN, STATUS_WIRE_TO_CAMEL;
 var init_routes = __esm({
   "src/core/routes.ts"() {
     "use strict";
     init_http();
     init_store();
     init_address();
+    init_chainHelpers();
+    SOLANA_NATIVE_ROUTE_TOKEN = "So11111111111111111111111111111111111111112";
     STATUS_WIRE_TO_CAMEL = {
       intent_id: "intentId",
       from_address: "fromAddress",
@@ -3028,9 +3188,9 @@ var init_useTrustwareConfig = __esm({
 import { useMemo as useMemo2 } from "react";
 function parsePositiveNumber(value) {
   if (value === null || value === void 0) return void 0;
-  const str = String(value).trim();
-  if (!str) return void 0;
-  const n = Number(str);
+  const str2 = String(value).trim();
+  if (!str2) return void 0;
+  const n = Number(str2);
   return Number.isFinite(n) && n >= 0 ? n : void 0;
 }
 function useAmountConstraints() {
@@ -3039,10 +3199,10 @@ function useAmountConstraints() {
   const fixedFromAmountString = useMemo2(() => {
     const raw = routeOptions.fixedFromAmount;
     if (raw === null || raw === void 0) return void 0;
-    const str = String(raw).trim();
-    if (!str) return void 0;
-    const n = Number(str);
-    return Number.isFinite(n) && n > 0 ? str : void 0;
+    const str2 = String(raw).trim();
+    if (!str2) return void 0;
+    const n = Number(str2);
+    return Number.isFinite(n) && n > 0 ? str2 : void 0;
   }, [routeOptions.fixedFromAmount]);
   const fixedFromAmountValue = useMemo2(() => {
     if (!fixedFromAmountString) return void 0;
@@ -3121,133 +3281,6 @@ var init_registryClient = __esm({
   }
 });
 
-// src/widget/helpers/chainHelpers.ts
-function normalizeChainKey2(id) {
-  if (id === void 0 || id === null) return "";
-  return String(id).trim().toLowerCase();
-}
-function getNativeTokenAddress2(chainType) {
-  const normalized = chainType?.toLowerCase?.();
-  return normalized === "solana" ? NATIVE_SOLANA2 : NATIVE_EVM2;
-}
-function isSolanaNativeTokenAlias2(address) {
-  if (!address) return false;
-  const trimmed = address.trim();
-  if (!trimmed) return false;
-  return trimmed === NATIVE_SOLANA2 || trimmed.toLowerCase() === NATIVE_EVM2;
-}
-function parseDecimalToWei(input, decimals) {
-  if (!input?.trim()) return null;
-  const s = input.trim();
-  if (!/^\d*\.?\d*$/.test(s)) return null;
-  const [intPartRaw, fracRaw = ""] = s.split(".");
-  const intPart = intPartRaw.length ? BigInt(intPartRaw) : 0n;
-  const frac = (fracRaw + "0".repeat(decimals)).slice(0, decimals);
-  const fracPart = frac ? BigInt(frac) : 0n;
-  const base2 = 10n ** BigInt(decimals);
-  return intPart * base2 + fracPart;
-}
-function inferChainTypeFromValue2(normalized) {
-  if (!normalized) return void 0;
-  const aliased = CHAIN_TYPE_ALIASES2[normalized];
-  if (aliased) return aliased;
-  if (normalized === "evm" || normalized === "solana" || normalized === "cosmos" || normalized === "bitcoin") {
-    return normalized;
-  }
-  if (/^eip155:\d+$/.test(normalized) || /^\d+$/.test(normalized)) {
-    return "evm";
-  }
-  if (normalized.startsWith("solana:") || normalized.includes("solana")) {
-    return "solana";
-  }
-  if (normalized.startsWith("cosmos:") || normalized.startsWith("sei:") || normalized === "sei-evm") {
-    return "cosmos";
-  }
-  return void 0;
-}
-function normalizeChainType2(chain) {
-  if (!chain) return void 0;
-  const raw = typeof chain === "string" ? chain : chain.type ?? chain.chainType ?? chain.networkIdentifier ?? chain.chainId ?? chain.id ?? chain.networkName ?? chain.axelarChainName;
-  if (!raw) return void 0;
-  const normalized = String(raw).trim().toLowerCase();
-  return inferChainTypeFromValue2(normalized) ?? normalized;
-}
-function canonicalChainKeyForLink(chain) {
-  const seiKey = canonicalSeiChainKey(chain.chainId ?? chain.id);
-  if (seiKey) return seiKey;
-  return normalizeChainKey2(
-    chain.networkIdentifier ?? chain.axelarChainName ?? chain.id ?? chain.chainId ?? chain.networkName
-  );
-}
-function canonicalSeiChainKey(chainId) {
-  const normalized = normalizeChainKey2(chainId);
-  if (!normalized) return null;
-  if (normalized === SEI_EVM_CHAIN_ID) return "sei-evm";
-  if (normalized === SEI_COSMOS_CHAIN_ID) return "sei";
-  return null;
-}
-function isZeroAddrLike(a, chainType) {
-  if (!a) return true;
-  if (!chainType) return false;
-  const s = normalizeAddress2(a, chainType);
-  return s === normalizeAddress2(getNativeTokenAddress2(chainType), chainType) || s === "0x0000000000000000000000000000000000000000";
-}
-function normalizeAddress2(address, chainType) {
-  if (chainType?.toLowerCase?.() === "solana") {
-    const trimmed = address.trim();
-    if (isSolanaNativeTokenAlias2(trimmed)) {
-      return NATIVE_SOLANA2;
-    }
-    return trimmed;
-  }
-  return address.toLowerCase();
-}
-function isNativeTokenAddress(address, chainType) {
-  if (!address) return false;
-  if (!chainType) return false;
-  return normalizeAddress2(address, chainType) === normalizeAddress2(getNativeTokenAddress2(chainType), chainType);
-}
-function canonicalTokenAddressForChain(chain, address, chainTokens = []) {
-  const chainType = normalizeChainType2(chain);
-  const rawAddress = (address ?? "").trim();
-  if (chainType === "solana") return normalizeAddress2(rawAddress, "solana");
-  if (chainType === "cosmos") {
-    const chainIdKey = normalizeChainKey2(chain.chainId ?? chain.id ?? "");
-    const nativeSymbol = chain.nativeCurrency?.symbol?.toUpperCase?.();
-    const nativeFromRegistry = chainTokens.find(
-      (token) => normalizeChainKey2(token.chainId) === chainIdKey && token.symbol?.toUpperCase?.() === nativeSymbol
-    );
-    const nativeDenom = (nativeFromRegistry?.address ?? "usei").toLowerCase();
-    if (rawAddress.toLowerCase() === NATIVE_EVM2) {
-      return nativeDenom;
-    }
-    return rawAddress.toLowerCase();
-  }
-  const lowerAddress = rawAddress.toLowerCase();
-  if (lowerAddress === "0x0000000000000000000000000000000000000000") {
-    return NATIVE_EVM2;
-  }
-  return lowerAddress;
-}
-var NATIVE_EVM2, NATIVE_SOLANA2, CHAIN_TYPE_ALIASES2, SEI_EVM_CHAIN_ID, SEI_COSMOS_CHAIN_ID;
-var init_chainHelpers = __esm({
-  "src/widget/helpers/chainHelpers.ts"() {
-    "use strict";
-    NATIVE_EVM2 = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
-    NATIVE_SOLANA2 = "So11111111111111111111111111111111111111111";
-    CHAIN_TYPE_ALIASES2 = {
-      btc: "bitcoin",
-      bitcoin: "bitcoin",
-      sei: "cosmos",
-      "pacific-1": "cosmos",
-      nibiru: "cosmos",
-      "cataclysm-1": "cosmos"
-    };
-    SEI_EVM_CHAIN_ID = "1329";
-    SEI_COSMOS_CHAIN_ID = "pacific-1";
-  }
-});
-
 // src/widget/helpers/tokenAmount.ts
 function rawToDecimal(rawAmount, decimals) {
   if (!rawAmount) return "0";
@@ -5393,6 +5426,52 @@ var init_useTransactionSubmit = __esm({
   }
 });
 
+// src/core/failure.ts
+function asRecord(value) {
+  return typeof value === "object" && value !== null ? value : null;
+}
+function str(value) {
+  return typeof value === "string" ? value.trim() : "";
+}
+function tidy(detail) {
+  const collapsed = detail.replace(/\s+/g, " ").trim();
+  return collapsed.length > MAX_DETAIL ? `${collapsed.slice(0, MAX_DETAIL - 1).trimEnd()}\u2026` : collapsed;
+}
+function describeTransactionFailure(tx) {
+  const raw = asRecord(tx?.statusRaw);
+  const substatus = str(raw?.substatus);
+  const detail = str(raw?.substatusMessage) || str(raw?.reason) || str(raw?.error) || str(raw?.message);
+  const haystack = `${substatus} ${detail}`.toLowerCase();
+  if (/slippage|price impact|price movement/.test(haystack)) {
+    return "Transaction failed due to price movement. Please try again with a higher slippage.";
+  }
+  if (/liquidity/.test(haystack)) {
+    return "Transaction failed due to insufficient liquidity. Try a smaller amount.";
+  }
+  if (/timeout|timed out|expired/.test(haystack)) {
+    return "Transaction expired. Please start a new transaction.";
+  }
+  if (/out.?of.?gas|insufficient (gas|fee)/.test(haystack)) {
+    return "Transaction failed due to insufficient gas. Please ensure you have enough native tokens for gas.";
+  }
+  if (/insufficient (balance|funds)/.test(haystack)) {
+    return "Transaction failed due to insufficient balance.";
+  }
+  if (tx?.gasStatus === "insufficient") {
+    return "Transaction failed due to insufficient gas. Please ensure you have enough native tokens for gas.";
+  }
+  if (detail) return `Transaction failed on-chain: ${tidy(detail)}`;
+  return GENERIC;
+}
+var MAX_DETAIL, GENERIC;
+var init_failure = __esm({
+  "src/core/failure.ts"() {
+    "use strict";
+    MAX_DETAIL = 160;
+    GENERIC = "Transaction failed on-chain. Please try again.";
+  }
+});
+
 // src/hooks/useGTM.ts
 import { useEffect as useEffect5, useRef as useRef2, useCallback as useCallback2 } from "react";
 function isGA4Allowed() {
@@ -5637,7 +5716,7 @@ function useTransactionPolling() {
               return;
             }
             if (tx.status === "failed") {
-              const failError = mapFailedTransactionError(tx);
+              const failError = describeTransactionFailure(tx);
               clearPolling();
               setState((prev) => ({
                 ...prev,
@@ -5776,29 +5855,6 @@ function mapReceiptError(err) {
   }
   return cleanedMsg || "Failed to submit transaction. Please try again.";
 }
-function mapFailedTransactionError(tx) {
-  const statusRaw = tx.statusRaw;
-  if (typeof statusRaw === "object" && statusRaw !== null) {
-    const statusObj = statusRaw;
-    const reason = statusObj.reason || statusObj.error || statusObj.message;
-    if (reason) {
-      const reasonLower = String(reason).toLowerCase();
-      if (reasonLower.includes("slippage") || reasonLower.includes("price")) {
-        return "Transaction failed due to price movement. Please try again with a higher slippage.";
-      }
-      if (reasonLower.includes("liquidity")) {
-        return "Transaction failed due to insufficient liquidity. Try a smaller amount.";
-      }
-      if (reasonLower.includes("timeout") || reasonLower.includes("expired")) {
-        return "Transaction expired. Please start a new deposit.";
-      }
-    }
-  }
-  if (tx.gasStatus === "insufficient") {
-    return "Transaction failed due to insufficient gas. Please ensure you have enough native tokens for gas.";
-  }
-  return "Transaction failed. Please try again or contact support if the issue persists.";
-}
 var FAST_POLL_INTERVAL_MS, NORMAL_POLL_INTERVAL_MS, POLL_TIMEOUT_MS;
 var init_useTransactionPolling = __esm({
   "src/widget/hooks/useTransactionPolling.ts"() {
@@ -5806,6 +5862,7 @@ var init_useTransactionPolling = __esm({
     "use client";
     init_routes();
     init_http();
+    init_failure();
     init_DepositContext();
     init_provider();
     init_core2();
@@ -33291,10 +33348,12 @@ function mapError(raw) {
     };
   }
   if (lower.includes("transaction failed") || lower.includes("reverted")) {
+    const specific = msg.trim();
+    const isBare = /^transaction (failed|reverted)[.!]?$/i.test(specific) || specific.length > 200 || specific.includes("\n");
     return {
       category: "transaction_failed",
       title: "Transaction Failed",
-      message: "The transaction could not be completed. Please try again."
+      message: isBare ? "The transaction could not be completed. Please try again." : specific
     };
   }
   if (lower.includes("wrong network") || lower.includes("wrong chain") || lower.includes("chain mismatch")) {
@@ -33586,7 +33645,7 @@ function useSwapExecution(fromChain) {
           }
           if (tx.status === "failed") {
             clearPolling();
-            const msg = "Transaction failed on-chain. Please try again.";
+            const msg = describeTransactionFailure(tx);
             setState((p) => ({ ...p, txStatus: "error", errorMessage: msg }));
             onError(msg);
             return;
@@ -33621,8 +33680,7 @@ function useSwapExecution(fromChain) {
         return;
       }
       const chainType = normalizeChainType2(fromChain);
-      const isNative = !fromTokenAddress || isNativeTokenAddress(fromTokenAddress, chainType) || isZeroAddrLike(fromTokenAddress, chainType);
-      if (isNative) {
+      if (!needsErc20Approval(fromTokenAddress, chainType)) {
         setState((p) => ({ ...p, allowanceStatus: "sufficient" }));
         return;
       }
@@ -33636,7 +33694,7 @@ function useSwapExecution(fromChain) {
           BigInt(a.amount || "0"),
           amountWei
         );
-        if (!token || !a.spender) return [];
+        if (!isEvmAddress2(token) || !isEvmAddress2(a.spender)) return [];
         return [
           {
             chainId: a.chainId || chainIdStr,
@@ -33784,7 +33842,8 @@ function useSwapExecution(fromChain) {
         const requiredApprovals = plannedApprovals.length ? plannedApprovals.flatMap((a, index) => {
           const token = a.tokenAddress ?? fromTokenAddress;
           const approvalSpender = a.spender;
-          if (!token || !approvalSpender) return [];
+          if (!isEvmAddress2(token) || !isEvmAddress2(approvalSpender))
+            return [];
           const amountWei = requiredApprovalAmount(
             BigInt(a.amount || "0"),
             fromAmountWei
@@ -33807,7 +33866,8 @@ function useSwapExecution(fromChain) {
             chainId: chainIdStr
           }
         ] : [];
-        const ownsApprovals = !isNative && !!walletAddress && !!chainIdStr;
+        const coversEveryPlannedApproval = plannedApprovals.length === 0 || requiredApprovals.length === plannedApprovals.length;
+        const ownsApprovals = coversEveryPlannedApproval && needsErc20Approval(fromTokenAddress, chainType) && !!walletAddress && !!chainIdStr;
         const activeAddress = ownsApprovals ? await requireActiveAddress(wallet, walletAddress) : void 0;
         for (const required of requiredApprovals) {
           if (!ownsApprovals) break;
@@ -33962,6 +34022,7 @@ var init_useSwapExecution = __esm({
     init_core2();
     init_routes();
     init_http();
+    init_failure();
     init_tx();
     init_sdkRpc();
     init_chainHelpers();
@@ -35695,8 +35756,8 @@ function truncateDecimal(n, dp) {
   const s = truncated.toFixed(dp);
   return s.includes(".") ? s.replace(/\.?0+$/, "") || "0" : s;
 }
-function scaleFontSize(str) {
-  const len = str.replace(/[^0-9.]/g, "").length;
+function scaleFontSize(str2) {
+  const len = str2.replace(/[^0-9.]/g, "").length;
   if (len <= 6) return "2.5rem";
   if (len <= 9) return "2rem";
   if (len <= 12) return "1.5rem";
@@ -35995,6 +36056,10 @@ function SwapMode({
   }, [lockDestToken, fromToken, fromChain, toToken, toChain, route, emitEvent]);
   const fromChainType = normalizeChainType2(fromChain);
   const toChainType = normalizeChainType2(toChain);
+  const canSetMaxApproval = needsErc20Approval(
+    fromToken?.address,
+    fromChainType
+  );
   const needsDestAddress = !!fromChainType && !!toChainType && fromChainType !== toChainType;
   const isValidDestAddress = !needsDestAddress || validateDestAddress(destAddress, toChainType ?? "");
   const handleReview = useCallback22(async () => {
@@ -38215,7 +38280,7 @@ function SwapMode({
                               }
                             )
                           ] }),
-                          /* @__PURE__ */ jsx59("div", { style: { marginBottom: spacing[4] }, children: /* @__PURE__ */ jsxs47(
+                          canSetMaxApproval && /* @__PURE__ */ jsx59("div", { style: { marginBottom: spacing[4] }, children: /* @__PURE__ */ jsxs47(
                             "div",
                             {
                               style: {