@trustware/sdk-staging 1.1.10-staging.0 → 1.1.11-staging.2

package/dist/widget.mjs

@@ -535,16 +535,14 @@ var init_defaults = __esm({
 });
 
 // src/types/config.ts
-var DEFAULT_RETRY_CONFIG, DEFAULT_FEATURE_FLAGS;
+var DEFAULT_RETRY_CONFIG, RATE_LIMIT_WAIT_BUDGET_MS, DEFAULT_FEATURE_FLAGS;
 var init_config = __esm({
   "src/types/config.ts"() {
     "use strict";
     DEFAULT_RETRY_CONFIG = {
-      autoRetry: true,
-      maxRetries: 3,
-      baseDelayMs: 1e3,
       approachingThreshold: 5
     };
+    RATE_LIMIT_WAIT_BUDGET_MS = 1e4;
     DEFAULT_FEATURE_FLAGS = {
       tokensPagination: true,
       balanceStreaming: false,
@@ -563,7 +561,7 @@ var init_constants = __esm({
   "src/constants.ts"() {
     "use strict";
     SDK_NAME = "@trustware/sdk";
-    SDK_VERSION = "1.1.10-staging.0";
+    SDK_VERSION = "1.1.11-staging.2";
     API_ROOT = "https://bv-staging-api.trustware.io";
     GTM_ID = "GTM-TZDGNCXB";
     API_PREFIX = "/api";
@@ -607,6 +605,9 @@ async function assertOK(r) {
   }
   throw new Error(`HTTP ${r.status}: ${msg}`);
 }
+function isNotFoundError(err) {
+  return err instanceof Error && err.message.startsWith("HTTP 404");
+}
 async function validateSdkAccess() {
   const r = await fetch(`${apiBase()}/sdk/validate`, {
     method: "GET",
@@ -647,60 +648,66 @@ function notifyRateLimitCallbacks(info, isRateLimited, retryCount) {
     retry.onRateLimitApproaching(info, retry.approachingThreshold);
   }
 }
-function calculateBackoffDelay(baseDelayMs, retryCount, retryAfter) {
-  if (retryAfter && retryAfter > 0) {
-    return retryAfter * 1e3;
+function serverDirectedWaitMs(info) {
+  if (!info) return null;
+  if (typeof info.retryAfter === "number" && info.retryAfter > 0) {
+    return info.retryAfter * 1e3;
+  }
+  if (typeof info.reset === "number" && info.reset > 0) {
+    const untilReset = info.reset * 1e3 - Date.now();
+    if (untilReset > 0) return untilReset;
   }
-  return baseDelayMs * Math.pow(2, retryCount);
+  return null;
 }
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
-async function rateLimitedFetch(url, options = {}) {
-  const { skipRateLimit, ...fetchOptions } = options;
-  const cfg = TrustwareConfigStore.get();
-  if (!cfg.retry.autoRetry || skipRateLimit) {
-    return fetch(url, fetchOptions);
-  }
-  const { maxRetries, baseDelayMs } = cfg.retry;
+async function withRateLimitRetry(attempt) {
+  let waitedMs = 0;
   let retryCount = 0;
   while (true) {
-    const response = await fetch(url, fetchOptions);
+    const response = await attempt();
     const rateLimitInfo = parseRateLimitHeaders(response);
-    if (response.status === 429) {
+    if (response.status !== 429) {
       if (rateLimitInfo) {
-        notifyRateLimitCallbacks(rateLimitInfo, true, retryCount);
+        notifyRateLimitCallbacks(rateLimitInfo, false, 0);
       }
-      if (retryCount >= maxRetries) {
-        throw new RateLimitError(
-          rateLimitInfo || { limit: 0, remaining: 0, reset: 0 },
-          true
-        );
-      }
-      const delay = calculateBackoffDelay(
-        baseDelayMs,
-        retryCount,
-        rateLimitInfo?.retryAfter
-      );
-      await sleep(delay);
-      retryCount++;
-      continue;
+      return response;
     }
     if (rateLimitInfo) {
-      notifyRateLimitCallbacks(rateLimitInfo, false, 0);
+      notifyRateLimitCallbacks(rateLimitInfo, true, retryCount);
     }
-    return response;
+    const waitMs = serverDirectedWaitMs(rateLimitInfo);
+    const info = rateLimitInfo || { limit: 0, remaining: 0, reset: 0 };
+    if (waitMs === null) {
+      throw new RateLimitError(info, true);
+    }
+    if (waitedMs + waitMs > RATE_LIMIT_WAIT_BUDGET_MS) {
+      throw new RateLimitError(info, false);
+    }
+    await sleep(waitMs);
+    waitedMs += waitMs;
+    retryCount++;
   }
 }
+async function rateLimitedFetch(url, options = {}) {
+  const { skipRateLimit, ...fetchOptions } = options;
+  if (skipRateLimit) {
+    return fetch(url, fetchOptions);
+  }
+  return withRateLimitRetry(() => fetch(url, fetchOptions));
+}
 var RateLimitError;
 var init_http = __esm({
   "src/core/http.ts"() {
     "use strict";
     init_constants();
     init_config2();
+    init_config();
     RateLimitError = class extends Error {
       constructor(info, retriesExhausted) {
-        const message = retriesExhausted ? `Rate limit exceeded after max retries. Try again in ${info.retryAfter ?? Math.ceil((info.reset * 1e3 - Date.now()) / 1e3)} seconds.` : `Rate limit exceeded. Try again in ${info.retryAfter} seconds.`;
+        const seconds = info.retryAfter ?? (info.reset > 0 ? Math.max(0, Math.ceil((info.reset * 1e3 - Date.now()) / 1e3)) : null);
+        const message = seconds === null ? "Rate limit exceeded. The server did not say when to retry." : `Rate limit exceeded. Try again in ${seconds} seconds.`;
         super(message);
         this.name = "RateLimitError";
         this.rateLimitInfo = info;
@@ -2357,7 +2364,7 @@ async function getBalances(chainRef, address, opts) {
     if (cached) return cached;
   }
   const url = `${apiBase()}/v1/data/wallets/${encodeURIComponent(chainKey)}/${trimmedAddress}/balances`;
-  const response = await fetch(url, {
+  const response = await rateLimitedFetch(url, {
     method: "GET",
     credentials: "omit",
     headers: jsonHeaders()
@@ -2579,6 +2586,19 @@ async function submitReceipt(intentId, txHash, sponsorshipRequestId, eoaAddress)
   const j = await r.json();
   return j.data;
 }
+async function submitStepReceipt(intentId, stepIndex, txHash) {
+  const r = await rateLimitedFetch(
+    `${apiBase()}/v1/route-intent/${intentId}/steps/${stepIndex}/receipt`,
+    {
+      method: "POST",
+      headers: jsonHeaders({ "Idempotency-Key": txHash }),
+      body: JSON.stringify({ txHash })
+    }
+  );
+  await assertOK(r);
+  const j = await r.json();
+  return j.data;
+}
 async function getStatus(intentId) {
   const r = await rateLimitedFetch(
     `${apiBase()}/v1/route-intent/${intentId}/status`,
@@ -2588,7 +2608,18 @@ async function getStatus(intentId) {
   );
   await assertOK(r);
   const j = await r.json();
-  return j.data;
+  return normalizeStatusPayload(j.data);
+}
+function normalizeStatusPayload(raw) {
+  if (!raw || typeof raw !== "object") return raw;
+  const wire = raw;
+  const out = { ...wire };
+  for (const [snake, camel] of Object.entries(STATUS_WIRE_TO_CAMEL)) {
+    if (out[camel] !== void 0) continue;
+    if (!(snake in wire)) continue;
+    out[camel] = wire[snake];
+  }
+  return out;
 }
 async function pollStatus(intentId, { intervalMs = 2e3, timeoutMs = 5 * 6e4 } = {}) {
   const t0 = Date.now();
@@ -2599,12 +2630,39 @@ async function pollStatus(intentId, { intervalMs = 2e3, timeoutMs = 5 * 6e4 } =
     await new Promise((r) => setTimeout(r, intervalMs));
   }
 }
+var STATUS_WIRE_TO_CAMEL;
 var init_routes = __esm({
   "src/core/routes.ts"() {
     "use strict";
     init_http();
     init_store();
     init_address();
+    STATUS_WIRE_TO_CAMEL = {
+      intent_id: "intentId",
+      from_address: "fromAddress",
+      to_address: "toAddress",
+      from_chain_id: "fromChainId",
+      to_chain_id: "toChainId",
+      source_tx_hash: "sourceTxHash",
+      dest_tx_hash: "destTxHash",
+      request_id: "requestId",
+      provider_request_id: "providerRequestId",
+      transaction_request: "transactionRequest",
+      status_raw: "statusRaw",
+      route_path: "routePath",
+      route_status: "routeStatus",
+      to_amount_wei: "toAmountWei",
+      from_chain_block: "fromChainBlock",
+      to_chain_block: "toChainBlock",
+      from_chain_tx_url: "fromChainTxUrl",
+      to_chain_tx_url: "toChainTxUrl",
+      gas_status: "gasStatus",
+      is_gmp_transaction: "isGMPTransaction",
+      axelar_transaction_url: "axelarTransactionUrl",
+      create_date: "createdDate",
+      update_date: "updatedDate",
+      time_spent_ms: "timeSpentMs"
+    };
   }
 });
 
@@ -2895,12 +2953,9 @@ function useTrustwareConfig() {
           title: "Trustware SDK",
           description: "Seamlessly bridge assets across chains with Trustware."
         },
-        retry: {
-          autoRetry: true,
-          maxRetries: 3,
-          baseDelayMs: 1e3,
-          approachingThreshold: 5
-        },
+        // Shared with the resolver rather than restated, so this placeholder
+        // can't drift from the real defaults.
+        retry: { ...DEFAULT_RETRY_CONFIG },
         features: {
           tokensPagination: true,
           balanceStreaming: false,
@@ -2925,6 +2980,7 @@ var init_useTrustwareConfig = __esm({
   "src/hooks/useTrustwareConfig.ts"() {
     "use strict";
     "use client";
+    init_config();
     init_store();
   }
 });
@@ -5300,75 +5356,17 @@ var init_useTransactionSubmit = __esm({
 
 // src/hooks/useGTM.ts
 import { useEffect as useEffect5, useRef as useRef2, useCallback as useCallback2 } from "react";
-function useGTM(gtmId) {
-  const isInitialized = useRef2(false);
-  const scriptRef = useRef2(null);
-  const isGA4Allowed = useCallback2(() => {
-    try {
-      return Trustware.getConfig().features.shouldAllowGA4;
-    } catch {
-      return false;
-    }
-  }, []);
-  useEffect5(() => {
-    if (!isGA4Allowed()) {
-      console.warn(
-        "useGTM: GA4 tracking is disabled or Trustware config not initialized."
-      );
-      return;
-    }
-    if (!gtmId || typeof gtmId !== "string") {
-      console.error(
-        "useGTM: A valid GTM Container ID is required (format: GTM-XXXXX)."
-      );
-      return;
-    }
-    if (isInitialized.current) return;
-    const alreadyLoaded = document.querySelector(
-      `script[src*="googletagmanager.com/gtm.js?id=${gtmId}"]`
-    );
-    if (alreadyLoaded) {
-      window.dataLayer = window.dataLayer || [];
-      isInitialized.current = true;
-      return;
-    }
-    window.dataLayer = window.dataLayer || [];
-    window.dataLayer.push({
-      "gtm.start": (/* @__PURE__ */ new Date()).getTime(),
-      event: "gtm.js"
-    });
-    const firstScript = document.getElementsByTagName("script")[0];
-    const script = document.createElement("script");
-    script.async = true;
-    script.src = `https://www.googletagmanager.com/gtm.js?id=${gtmId}`;
-    firstScript.parentNode?.insertBefore(script, firstScript);
-    scriptRef.current = script;
-    isInitialized.current = true;
-    return () => {
-      if (scriptRef.current) {
-        scriptRef.current.parentNode?.removeChild(scriptRef.current);
-        scriptRef.current = null;
-      }
-      isInitialized.current = false;
-    };
-  }, [gtmId, isGA4Allowed]);
-  const addNoscriptIframe = useCallback2(() => {
-    if (!isGA4Allowed()) return;
-    if (document.querySelector('iframe[src*="googletagmanager.com/ns.html"]'))
-      return;
-    const noscript = document.createElement("noscript");
-    const iframe = document.createElement("iframe");
-    iframe.src = `https://www.googletagmanager.com/ns.html?id=${gtmId}`;
-    iframe.height = "0";
-    iframe.width = "0";
-    iframe.style.display = "none";
-    iframe.style.visibility = "hidden";
-    noscript.appendChild(iframe);
-    document.body.insertBefore(noscript, document.body.firstChild);
-  }, [gtmId, isGA4Allowed]);
+function isGA4Allowed() {
+  try {
+    return Trustware.getConfig().features.shouldAllowGA4;
+  } catch {
+    return false;
+  }
+}
+function useGTMTracker() {
   const trackEvent = useCallback2(
     (eventName, eventParams = {}) => {
-      if (!isInitialized.current) {
+      if (!isContainerInitialized) {
         console.warn(
           "useGTM: Not initialized. Ensure a valid GTM Container ID was provided."
         );
@@ -5395,7 +5393,7 @@ function useGTM(gtmId) {
   );
   const setUserProperty = useCallback2(
     (propertyName, value) => {
-      if (!isInitialized.current) {
+      if (!isContainerInitialized) {
         console.warn(
           "useGTM: Not initialized. Ensure a valid GTM Container ID was provided."
         );
@@ -5421,20 +5419,77 @@ function useGTM(gtmId) {
       }
       window.gtag(command, ...args);
     },
-    [isGA4Allowed]
+    []
   );
-  return {
-    trackEvent,
-    trackPageView,
-    setUserProperty,
-    directGtag,
-    addNoscriptIframe
-  };
+  return { trackEvent, trackPageView, setUserProperty, directGtag };
+}
+function useGTM(gtmId) {
+  const scriptRef = useRef2(null);
+  const tracker = useGTMTracker();
+  useEffect5(() => {
+    if (!isGA4Allowed()) {
+      console.warn(
+        "useGTM: GA4 tracking is disabled or Trustware config not initialized."
+      );
+      return;
+    }
+    if (!gtmId || typeof gtmId !== "string") {
+      console.error(
+        "useGTM: A valid GTM Container ID is required (format: GTM-XXXXX)."
+      );
+      return;
+    }
+    if (isContainerInitialized) return;
+    const alreadyLoaded = document.querySelector(
+      `script[src*="googletagmanager.com/gtm.js?id=${gtmId}"]`
+    );
+    if (alreadyLoaded) {
+      window.dataLayer = window.dataLayer || [];
+      isContainerInitialized = true;
+      return;
+    }
+    window.dataLayer = window.dataLayer || [];
+    window.dataLayer.push({
+      "gtm.start": (/* @__PURE__ */ new Date()).getTime(),
+      event: "gtm.js"
+    });
+    const firstScript = document.getElementsByTagName("script")[0];
+    const script = document.createElement("script");
+    script.async = true;
+    script.src = `https://www.googletagmanager.com/gtm.js?id=${gtmId}`;
+    firstScript.parentNode?.insertBefore(script, firstScript);
+    scriptRef.current = script;
+    isContainerInitialized = true;
+    return () => {
+      if (scriptRef.current) {
+        scriptRef.current.parentNode?.removeChild(scriptRef.current);
+        scriptRef.current = null;
+      }
+      isContainerInitialized = false;
+    };
+  }, [gtmId]);
+  const addNoscriptIframe = useCallback2(() => {
+    if (!isGA4Allowed()) return;
+    if (document.querySelector('iframe[src*="googletagmanager.com/ns.html"]'))
+      return;
+    const noscript = document.createElement("noscript");
+    const iframe = document.createElement("iframe");
+    iframe.src = `https://www.googletagmanager.com/ns.html?id=${gtmId}`;
+    iframe.height = "0";
+    iframe.width = "0";
+    iframe.style.display = "none";
+    iframe.style.visibility = "hidden";
+    noscript.appendChild(iframe);
+    document.body.insertBefore(noscript, document.body.firstChild);
+  }, [gtmId]);
+  return { ...tracker, addNoscriptIframe };
 }
+var isContainerInitialized;
 var init_useGTM = __esm({
   "src/hooks/useGTM.ts"() {
     "use strict";
     init_core2();
+    isContainerInitialized = false;
   }
 });
 
@@ -5461,7 +5516,7 @@ function useTransactionPolling() {
       return void 0;
     }
   })();
-  const { trackEvent } = useGTM(GTM_ID);
+  const { trackEvent } = useGTMTracker();
   const [state, setState] = useState6({
     isPolling: false,
     apiStatus: null,
@@ -5561,8 +5616,21 @@ function useTransactionPolling() {
             pollCountRef.current += 1;
             const pollInterval = pollCountRef.current <= 10 ? FAST_POLL_INTERVAL_MS : NORMAL_POLL_INTERVAL_MS;
             pollingRef.current = setTimeout(poll, pollInterval);
-          } catch {
+          } catch (err) {
             if (abortRef.current) return;
+            if (isNotFoundError(err)) {
+              clearPolling();
+              const notFoundError = "Transaction session expired. Please try again.";
+              setState((prev) => ({
+                ...prev,
+                isPolling: false,
+                error: notFoundError
+              }));
+              setErrorMessage(notFoundError);
+              setTransactionStatus("error");
+              setCurrentStep("error");
+              return;
+            }
             const elapsed = Date.now() - startTimeRef.current;
             if (elapsed > POLL_TIMEOUT_MS) {
               clearPolling();
@@ -5698,10 +5766,10 @@ var init_useTransactionPolling = __esm({
     "use strict";
     "use client";
     init_routes();
+    init_http();
     init_DepositContext();
     init_provider();
     init_core2();
-    init_constants();
     init_hooks();
     FAST_POLL_INTERVAL_MS = 1500;
     NORMAL_POLL_INTERVAL_MS = 2500;
@@ -5783,6 +5851,20 @@ var init_eipWallets = __esm({
   "src/wallets/eipWallets.ts"() {
     "use strict";
     CHAIN_PARAMS = {
+      1: {
+        chainIdHex: "0x1",
+        chainName: "Ethereum",
+        rpcUrls: ["https://eth.llamarpc.com"],
+        nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+        blockExplorerUrls: ["https://etherscan.io"]
+      },
+      137: {
+        chainIdHex: "0x89",
+        chainName: "Polygon",
+        rpcUrls: ["https://polygon-rpc.com"],
+        nativeCurrency: { name: "POL", symbol: "POL", decimals: 18 },
+        blockExplorerUrls: ["https://polygonscan.com"]
+      },
       8453: {
         chainIdHex: "0x2105",
         chainName: "Base",
@@ -8887,9 +8969,6 @@ function resolveConfig(input) {
   const theme = input.theme ?? "system";
   const messages = deepMerge(DEFAULT_MESSAGES, input.messages);
   const retry = {
-    autoRetry: input.retry?.autoRetry ?? DEFAULT_RETRY_CONFIG.autoRetry,
-    maxRetries: input.retry?.maxRetries ?? DEFAULT_RETRY_CONFIG.maxRetries,
-    baseDelayMs: input.retry?.baseDelayMs ?? DEFAULT_RETRY_CONFIG.baseDelayMs,
     approachingThreshold: input.retry?.approachingThreshold ?? DEFAULT_RETRY_CONFIG.approachingThreshold,
     onRateLimitInfo: input.retry?.onRateLimitInfo,
     onRateLimited: input.retry?.onRateLimited,
@@ -9063,18 +9142,27 @@ async function waitForTxConfirmation(chainId, txHash) {
   }
   throw new Error("Timed out waiting for approval confirmation");
 }
-async function ensureApprovals(w, approvals, fallbackChainId) {
+function requiredApprovalAmount(planAmountWei, routeAmountWei) {
+  if (planAmountWei >= UNLIMITED_APPROVAL_FLOOR && routeAmountWei !== void 0 && routeAmountWei > 0n) {
+    return routeAmountWei;
+  }
+  return planAmountWei;
+}
+function approvalSatisfied(currentAllowance, requiredWei) {
+  if (requiredWei === 0n) return currentAllowance === 0n;
+  return currentAllowance >= requiredWei;
+}
+async function ensureApprovals(w, approvals, fallbackChainId, intentId, routeAmountWei) {
   if (!approvals || approvals.length === 0) return;
   const owner = await w.getAddress();
-  for (const approval of approvals) {
+  for (const [stepIndex, approval] of approvals.entries()) {
     const spender = approval.spender;
     const tokenAddress = approval.tokenAddress;
     const amount = approval.amount;
     if (!spender || !tokenAddress || !amount) continue;
     const chainId = approval.chainId || String(fallbackChainId ?? "");
     if (!chainId) continue;
-    const amountWei = BigInt(amount);
-    if (amountWei === 0n) continue;
+    const amountWei = requiredApprovalAmount(BigInt(amount), routeAmountWei);
     let currentAllowance = 0n;
     try {
       const { allowance } = await getEVMAllowance({
@@ -9086,7 +9174,7 @@ async function ensureApprovals(w, approvals, fallbackChainId) {
       currentAllowance = BigInt(allowance || "0");
     } catch {
     }
-    if (currentAllowance >= amountWei) continue;
+    if (approvalSatisfied(currentAllowance, amountWei)) continue;
     const data = encodeFunctionData({
       abi: erc20ApproveAbi,
       functionName: "approve",
@@ -9098,6 +9186,10 @@ async function ensureApprovals(w, approvals, fallbackChainId) {
       value: 0n,
       chainId: Number.isFinite(Number(chainId)) ? Number(chainId) : void 0
     });
+    if (intentId) {
+      void submitStepReceipt(intentId, stepIndex, hash).catch(() => {
+      });
+    }
     await waitForTxConfirmation(chainId, hash);
   }
 }
@@ -9107,7 +9199,7 @@ function isUserRejected(e2) {
   const msg = String(e2?.message || e2)?.toLowerCase?.() || "";
   return msg.includes("user rejected") || msg.includes("user denied");
 }
-async function sendRouteTransaction(b, fallbackChainId) {
+async function sendRouteTransaction(b, fallbackChainId, options) {
   const w = walletManager.wallet;
   if (!w) throw new Error("Trustware.wallet not configured");
   const txReq = b.txReq;
@@ -9134,11 +9226,13 @@ async function sendRouteTransaction(b, fallbackChainId) {
         }
       }
     }
-    if (!validatedSponsorship) {
+    if (!validatedSponsorship && !options?.approvalsEnsured) {
       await ensureApprovals(
         w,
         b.route?.execution?.approvals,
-        Number.isFinite(target) ? target : void 0
+        Number.isFinite(target) ? target : void 0,
+        b.intentId,
+        BigInt(b.route?.estimate?.fromAmount ?? "0")
       );
     }
     if (w.type === "eip1193") {
@@ -9237,7 +9331,7 @@ async function runTopUp(params) {
     }
   }
 }
-var erc20ApproveAbi;
+var erc20ApproveAbi, UNLIMITED_APPROVAL_FLOOR;
 var init_tx = __esm({
   "src/core/tx.ts"() {
     "use strict";
@@ -9247,6 +9341,7 @@ var init_tx = __esm({
     erc20ApproveAbi = parseAbi([
       "function approve(address spender, uint256 amount) returns (bool)"
     ]);
+    UNLIMITED_APPROVAL_FLOOR = 1n << 255n;
   }
 });
 
@@ -9392,6 +9487,7 @@ var init_core = __esm({
       buildRoute,
       buildDepositAddress,
       submitReceipt,
+      submitStepReceipt,
       getStatus,
       pollStatus,
       getBalances,
@@ -30548,7 +30644,7 @@ import {
   keccak256 as keccak2566,
   stringToHex
 } from "viem";
-async function fetchWithTimeout(url, init) {
+async function fetchOnceWithTimeout(url, init) {
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
   try {
@@ -30569,6 +30665,9 @@ async function fetchWithTimeout(url, init) {
     clearTimeout(timer);
   }
 }
+async function fetchWithTimeout(url, init) {
+  return withRateLimitRetry(() => fetchOnceWithTimeout(url, init));
+}
 function extractRevertHex(err) {
   if (typeof err.data === "string" && err.data.startsWith("0x"))
     return err.data;
@@ -31068,7 +31167,7 @@ async function estimateRelayFeeInToken(valueWei, fromAmountWei, fromAmountUSD, c
     tokenUnitsPerDollar = Number(fromAmountWei) / fromUSD;
   } else if (fromToken && fromDecimals !== void 0) {
     try {
-      const resp = await fetch(
+      const resp = await rateLimitedFetch(
         `${apiBase()}/v1/price/token?chainId=${cid}&address=${fromToken}`,
         { headers: jsonHeaders() }
       );
@@ -31084,9 +31183,10 @@ async function estimateRelayFeeInToken(valueWei, fromAmountWei, fromAmountUSD, c
     return 0n;
   }
   try {
-    const resp = await fetch(`${apiBase()}/v1/price/native?chainId=${cid}`, {
-      headers: jsonHeaders()
-    });
+    const resp = await rateLimitedFetch(
+      `${apiBase()}/v1/price/native?chainId=${cid}`,
+      { headers: jsonHeaders() }
+    );
     if (!resp.ok) throw new Error(`native price HTTP ${resp.status}`);
     const json = await resp.json();
     const ethPriceUSD = parseFloat(json.data?.priceUSD ?? "0");
@@ -31594,7 +31694,7 @@ function useTransactionActionModel({
 }) {
   const feeDataCacheRef = useRef13({});
   const { isSubmitting, submitTransaction } = useTransactionSubmit();
-  const { trackEvent } = useGTM(GTM_ID);
+  const { trackEvent } = useGTMTracker();
   const destinationConfig = (() => {
     try {
       return Trustware.getConfig();
@@ -32027,7 +32127,6 @@ var init_useTransactionActionModel = __esm({
     init_chainHelpers();
     init_utils2();
     init_hooks();
-    init_constants();
   }
 });
 
@@ -33379,6 +33478,16 @@ async function waitForApprovalConfirmation(chainId, txHash) {
   }
   throw new Error("Timed out waiting for approval confirmation");
 }
+async function requireActiveAddress(wallet, plannedFor) {
+  if (!wallet) throw new Error("Wallet not connected. Please reconnect.");
+  const active = await wallet.getAddress();
+  if (active?.toLowerCase() !== plannedFor?.toLowerCase()) {
+    throw new Error(
+      "Wallet account changed. Please review and confirm the swap again."
+    );
+  }
+  return active;
+}
 function useSwapExecution(fromChain) {
   const [state, setState] = useState29({
     txStatus: "idle",
@@ -33435,7 +33544,15 @@ function useSwapExecution(fromChain) {
           if (tx.status === "bridging") {
             setState((p) => ({ ...p, txStatus: "bridging" }));
           }
-        } catch {
+        } catch (err) {
+          if (abortRef.current) return;
+          if (isNotFoundError(err)) {
+            clearPolling();
+            const msg = "Transaction session expired. Please try again.";
+            setState((p) => ({ ...p, txStatus: "error", errorMessage: msg }));
+            onError(msg);
+            return;
+          }
         }
         if (abortRef.current) return;
         pollCountRef.current += 1;
@@ -33461,24 +33578,55 @@ function useSwapExecution(fromChain) {
       }
       const txReq = routeResult.txReq;
       const chainIdStr = String(txReq?.chainId ?? fromChain?.chainId ?? "");
-      const spender = txReq?.to ?? txReq?.target;
       const amountWei = BigInt(routeResult.route?.estimate?.fromAmount ?? "0");
-      if (!spender || !chainIdStr || amountWei === 0n) {
+      const plannedApprovals = routeResult.route?.execution?.approvals ?? [];
+      const toCheck = plannedApprovals.length ? plannedApprovals.flatMap((a) => {
+        const token = a.tokenAddress ?? fromTokenAddress;
+        const required = requiredApprovalAmount(
+          BigInt(a.amount || "0"),
+          amountWei
+        );
+        if (!token || !a.spender) return [];
+        return [
+          {
+            chainId: a.chainId || chainIdStr,
+            token,
+            spender: a.spender,
+            required
+          }
+        ];
+      }) : (() => {
+        const spender = txReq?.to ?? txReq?.target;
+        if (!spender) return [];
+        return [
+          {
+            chainId: chainIdStr,
+            token: fromTokenAddress,
+            spender,
+            required: amountWei
+          }
+        ];
+      })();
+      if (toCheck.length === 0 || !chainIdStr || amountWei === 0n) {
         setState((p) => ({ ...p, allowanceStatus: "unknown" }));
         return;
       }
       setState((p) => ({ ...p, allowanceStatus: "checking" }));
       try {
-        const { allowance } = await getEVMAllowance({
-          chainId: chainIdStr,
-          tokenAddress: fromTokenAddress,
-          ownerAddress: walletAddress,
-          spenderAddress: spender
-        });
-        const allowanceWei = BigInt(allowance || "0");
+        const results = await Promise.all(
+          toCheck.map(async (c) => {
+            const { allowance } = await getEVMAllowance({
+              chainId: c.chainId,
+              tokenAddress: c.token,
+              ownerAddress: walletAddress,
+              spenderAddress: c.spender
+            });
+            return approvalSatisfied(BigInt(allowance || "0"), c.required);
+          })
+        );
         setState((p) => ({
           ...p,
-          allowanceStatus: allowanceWei >= amountWei ? "sufficient" : "needed"
+          allowanceStatus: results.every(Boolean) ? "sufficient" : "needed"
         }));
       } catch {
         setState((p) => ({ ...p, allowanceStatus: "needed" }));
@@ -33582,19 +33730,49 @@ function useSwapExecution(fromChain) {
         }
       }
       try {
-        if (!isNative && walletAddress && spender && chainIdStr && fromTokenAddress) {
+        const plannedApprovals = routeResult.route?.execution?.approvals ?? [];
+        const requiredApprovals = plannedApprovals.length ? plannedApprovals.flatMap((a, index) => {
+          const token = a.tokenAddress ?? fromTokenAddress;
+          const approvalSpender = a.spender;
+          if (!token || !approvalSpender) return [];
+          const amountWei = requiredApprovalAmount(
+            BigInt(a.amount || "0"),
+            fromAmountWei
+          );
+          return [
+            {
+              stepIndex: index,
+              token,
+              spender: approvalSpender,
+              amountWei,
+              chainId: a.chainId || chainIdStr
+            }
+          ];
+        }) : spender && fromTokenAddress ? [
+          {
+            stepIndex: null,
+            token: fromTokenAddress,
+            spender,
+            amountWei: fromAmountWei,
+            chainId: chainIdStr
+          }
+        ] : [];
+        const ownsApprovals = !isNative && !!walletAddress && !!chainIdStr;
+        const activeAddress = ownsApprovals ? await requireActiveAddress(wallet, walletAddress) : void 0;
+        for (const required of requiredApprovals) {
+          if (!ownsApprovals) break;
           let allowanceWei = 0n;
           try {
             const { allowance } = await getEVMAllowance({
-              chainId: chainIdStr,
-              tokenAddress: fromTokenAddress,
-              ownerAddress: walletAddress,
-              spenderAddress: spender
+              chainId: required.chainId,
+              tokenAddress: required.token,
+              ownerAddress: activeAddress,
+              spenderAddress: required.spender
             });
             allowanceWei = BigInt(allowance || "0");
           } catch {
           }
-          if (allowanceWei < fromAmountWei) {
+          if (!approvalSatisfied(allowanceWei, required.amountWei)) {
             setState((p) => ({ ...p, txStatus: "approving" }));
             if (!wallet || wallet.ecosystem !== "evm") {
               throw new Error("EVM wallet required for token approval");
@@ -33602,7 +33780,7 @@ function useSwapExecution(fromChain) {
             if (!chainIdStr || chainIdStr === "0") {
               throw new Error("Invalid chain ID for token approval");
             }
-            const targetChain = Number(txReq.chainId ?? fromChain?.chainId);
+            const targetChain = Number(required.chainId ?? txReq.chainId);
             if (Number.isFinite(targetChain)) {
               const current = await wallet.getChainId();
               if (current !== targetChain) {
@@ -33614,18 +33792,18 @@ function useSwapExecution(fromChain) {
             }
             const approveAmount = maxApproval ? BigInt(
               "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-            ) : fromAmountWei;
+            ) : required.amountWei;
             const data = encodeFunctionData10({
               abi: erc20Abi2,
               functionName: "approve",
-              args: [spender, approveAmount]
+              args: [required.spender, approveAmount]
             });
             let approvalHash;
             if (wallet.type === "eip1193") {
               const from = await wallet.getAddress();
               const params = {
                 from,
-                to: fromTokenAddress,
+                to: required.token,
                 data,
                 value: "0x0"
               };
@@ -33638,14 +33816,22 @@ function useSwapExecution(fromChain) {
               });
             } else {
               const response = await wallet.sendTransaction({
-                to: fromTokenAddress,
+                to: required.token,
                 data,
                 value: 0n,
                 chainId: Number.isFinite(targetChain) ? targetChain : void 0
               });
               approvalHash = response.hash;
             }
-            await waitForApprovalConfirmation(chainIdStr, approvalHash);
+            if (required.stepIndex !== null) {
+              void submitStepReceipt(
+                routeResult.intentId,
+                required.stepIndex,
+                approvalHash
+              ).catch(() => {
+              });
+            }
+            await waitForApprovalConfirmation(required.chainId, approvalHash);
             setState((p) => ({
               ...p,
               txStatus: "confirming",
@@ -33653,9 +33839,13 @@ function useSwapExecution(fromChain) {
             }));
           }
         }
+        if (ownsApprovals) {
+          await requireActiveAddress(wallet, walletAddress);
+        }
         const hash = await Trustware.sendRouteTransaction(
           routeResult,
-          numericChainId
+          numericChainId,
+          { approvalsEnsured: ownsApprovals }
         );
         try {
           await submitReceipt(routeResult.intentId, hash);
@@ -33723,6 +33913,8 @@ var init_useSwapExecution = __esm({
     "use client";
     init_core2();
     init_routes();
+    init_http();
+    init_tx();
     init_sdkRpc();
     init_chainHelpers();
     FAST_POLL_MS = 1500;
@@ -33734,9 +33926,14 @@ var init_useSwapExecution = __esm({
 
 // src/core/forex.ts
 async function fetchForexRates(base2 = "USD") {
-  const r = await fetch(`${apiBase()}/v1/forex?base=${base2}`, {
-    headers: jsonHeaders()
-  });
+  let r;
+  try {
+    r = await rateLimitedFetch(`${apiBase()}/v1/forex?base=${base2}`, {
+      headers: jsonHeaders()
+    });
+  } catch {
+    return {};
+  }
   if (!r.ok) return {};
   const j = await r.json();
   const rates = j?.data?.rates ?? j?.rates ?? j?.data ?? {};
@@ -39687,6 +39884,7 @@ function WidgetInner({
   const { resolvedTheme } = useDepositUi();
   const { status, revalidate, errors } = useTrustware();
   const [showConfirmDialog, setShowConfirmDialog] = useState35(false);
+  useGTM(GTM_ID);
   const handleCloseRequest = useCallback23(() => {
     if (ACTIVE_TRANSACTION_STATUSES.includes(transactionStatus)) {
       setShowConfirmDialog(true);
@@ -39760,6 +39958,8 @@ var init_TrustwareWidgetV2 = __esm({
     init_provider();
     init_manager();
     init_useTrustwareConfig();
+    init_hooks();
+    init_constants();
     init_swap();
     widgetContentContainerStyle = {
       position: "relative",