@trustware/sdk-staging 1.1.9-staging.7 → 1.1.11-staging.1

package/dist/widget.cjs

@@ -585,7 +585,7 @@ var init_constants = __esm({
   "src/constants.ts"() {
     "use strict";
     SDK_NAME = "@trustware/sdk";
-    SDK_VERSION = "1.1.9-staging.7";
+    SDK_VERSION = "1.1.11-staging.1";
     API_ROOT = "https://bv-staging-api.trustware.io";
     GTM_ID = "GTM-TZDGNCXB";
     API_PREFIX = "/api";
@@ -629,6 +629,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",
@@ -2464,6 +2467,27 @@ var init_balances = __esm({
 });
 
 // src/core/routes.ts
+function assertValidPostHook(hooks) {
+  const postHook = hooks?.postHook;
+  if (!postHook) return;
+  if (!postHook.target?.trim()) {
+    throw new Error("hooks.postHook.target is required.");
+  }
+  if (!postHook.callData?.trim()) {
+    throw new Error("hooks.postHook.callData is required.");
+  }
+  if (postHook.fullAmount) {
+    if (postHook.amountInputPos === void 0) {
+      throw new Error(
+        "hooks.postHook.amountInputPos is required when fullAmount is true."
+      );
+    }
+  } else if (!postHook.fundAmount?.trim()) {
+    throw new Error(
+      "hooks.postHook.fundAmount is required unless fullAmount is set."
+    );
+  }
+}
 function isEvmTxRequest(txReq) {
   return Boolean(txReq?.data && (txReq.to || txReq.target));
 }
@@ -2482,6 +2506,7 @@ async function buildRoute(body, signal) {
   if (!addressValidation.isValid) {
     throw new Error(addressValidation.error || "Invalid route addresses.");
   }
+  assertValidPostHook(body.hooks);
   const cfg = TrustwareConfigStore.get();
   const url = `${apiBase()}/v1/routes/route`;
   const payload = {
@@ -2520,6 +2545,7 @@ async function buildRoute(body, signal) {
   return { intentId, txReq, actions, finalExchangeRate, route, sponsorship };
 }
 async function buildDepositAddress(body, signal) {
+  assertValidPostHook(body.hooks);
   const cfg = TrustwareConfigStore.get();
   const url = `${apiBase()}/v1/routes/deposit-address`;
   const payload = {
@@ -2578,6 +2604,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`,
@@ -5302,75 +5341,17 @@ var init_useTransactionSubmit = __esm({
 });
 
 // src/hooks/useGTM.ts
-function useGTM(gtmId) {
-  const isInitialized = (0, import_react7.useRef)(false);
-  const scriptRef = (0, import_react7.useRef)(null);
-  const isGA4Allowed = (0, import_react7.useCallback)(() => {
-    try {
-      return Trustware.getConfig().features.shouldAllowGA4;
-    } catch {
-      return false;
-    }
-  }, []);
-  (0, import_react7.useEffect)(() => {
-    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 = (0, import_react7.useCallback)(() => {
-    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 = (0, import_react7.useCallback)(
     (eventName, eventParams = {}) => {
-      if (!isInitialized.current) {
+      if (!isContainerInitialized) {
         console.warn(
           "useGTM: Not initialized. Ensure a valid GTM Container ID was provided."
         );
@@ -5397,7 +5378,7 @@ function useGTM(gtmId) {
   );
   const setUserProperty = (0, import_react7.useCallback)(
     (propertyName, value) => {
-      if (!isInitialized.current) {
+      if (!isContainerInitialized) {
         console.warn(
           "useGTM: Not initialized. Ensure a valid GTM Container ID was provided."
         );
@@ -5423,22 +5404,78 @@ function useGTM(gtmId) {
       }
       window.gtag(command, ...args);
     },
-    [isGA4Allowed]
+    []
   );
-  return {
-    trackEvent,
-    trackPageView,
-    setUserProperty,
-    directGtag,
-    addNoscriptIframe
-  };
+  return { trackEvent, trackPageView, setUserProperty, directGtag };
+}
+function useGTM(gtmId) {
+  const scriptRef = (0, import_react7.useRef)(null);
+  const tracker = useGTMTracker();
+  (0, import_react7.useEffect)(() => {
+    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 = (0, import_react7.useCallback)(() => {
+    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 import_react7;
+var import_react7, isContainerInitialized;
 var init_useGTM = __esm({
   "src/hooks/useGTM.ts"() {
     "use strict";
     import_react7 = require("react");
     init_core2();
+    isContainerInitialized = false;
   }
 });
 
@@ -5464,7 +5501,7 @@ function useTransactionPolling() {
       return void 0;
     }
   })();
-  const { trackEvent } = useGTM(GTM_ID);
+  const { trackEvent } = useGTMTracker();
   const [state, setState] = (0, import_react8.useState)({
     isPolling: false,
     apiStatus: null,
@@ -5564,8 +5601,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();
@@ -5702,10 +5752,10 @@ var init_useTransactionPolling = __esm({
     "use client";
     import_react8 = require("react");
     init_routes();
+    init_http();
     init_DepositContext();
     init_provider();
     init_core2();
-    init_constants();
     init_hooks();
     FAST_POLL_INTERVAL_MS = 1500;
     NORMAL_POLL_INTERVAL_MS = 2500;
@@ -5787,6 +5837,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",
@@ -9024,13 +9088,107 @@ function backendChainId(chain, fallback) {
   const preferred = chain?.networkIdentifier ?? chain?.chainId ?? chain?.id;
   return String(preferred ?? fallback ?? "");
 }
+function sleep2(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function sendEvmTx(w, tx) {
+  if (w.type === "eip1193") {
+    const from = await w.getAddress();
+    const params = {
+      from,
+      to: tx.to,
+      data: tx.data,
+      value: tx.value ? `0x${tx.value.toString(16)}` : "0x0"
+    };
+    if (tx.chainId !== void 0) {
+      params.chainId = `0x${tx.chainId.toString(16)}`;
+    }
+    const hash = await w.request({
+      method: "eth_sendTransaction",
+      params: [params]
+    });
+    return hash;
+  }
+  const response = await w.sendTransaction({
+    to: tx.to,
+    data: tx.data,
+    value: tx.value,
+    chainId: tx.chainId
+  });
+  return response.hash;
+}
+async function waitForTxConfirmation(chainId, txHash) {
+  const timeoutMs = 12e4;
+  const intervalMs = 2e3;
+  const started = Date.now();
+  while (Date.now() - started < timeoutMs) {
+    const status = await getEVMTxStatus({ chainId, txHash });
+    if (status.status === "success") return;
+    if (status.status === "reverted") {
+      throw new Error("Approval transaction reverted");
+    }
+    await sleep2(intervalMs);
+  }
+  throw new Error("Timed out waiting for approval confirmation");
+}
+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 [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 = requiredApprovalAmount(BigInt(amount), routeAmountWei);
+    let currentAllowance = 0n;
+    try {
+      const { allowance } = await getEVMAllowance({
+        chainId,
+        tokenAddress,
+        ownerAddress: owner,
+        spenderAddress: spender
+      });
+      currentAllowance = BigInt(allowance || "0");
+    } catch {
+    }
+    if (approvalSatisfied(currentAllowance, amountWei)) continue;
+    const data = (0, import_viem2.encodeFunctionData)({
+      abi: erc20ApproveAbi,
+      functionName: "approve",
+      args: [spender, amountWei]
+    });
+    const hash = await sendEvmTx(w, {
+      to: tokenAddress,
+      data,
+      value: 0n,
+      chainId: Number.isFinite(Number(chainId)) ? Number(chainId) : void 0
+    });
+    if (intentId) {
+      void submitStepReceipt(intentId, stepIndex, hash).catch(() => {
+      });
+    }
+    await waitForTxConfirmation(chainId, hash);
+  }
+}
 function isUserRejected(e2) {
   const code = e2?.code ?? e2?.data?.code;
   if (code === 4001) return true;
   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;
@@ -9057,6 +9215,15 @@ async function sendRouteTransaction(b, fallbackChainId) {
         }
       }
     }
+    if (!validatedSponsorship && !options?.approvalsEnsured) {
+      await ensureApprovals(
+        w,
+        b.route?.execution?.approvals,
+        Number.isFinite(target) ? target : void 0,
+        b.intentId,
+        BigInt(b.route?.estimate?.fromAmount ?? "0")
+      );
+    }
     if (w.type === "eip1193") {
       const from = await w.getAddress();
       const hexValue = value ? `0x${value.toString(16)}` : "0x0";
@@ -9153,13 +9320,18 @@ async function runTopUp(params) {
     }
   }
 }
-var import_viem2;
+var import_viem2, erc20ApproveAbi, UNLIMITED_APPROVAL_FLOOR;
 var init_tx = __esm({
   "src/core/tx.ts"() {
     "use strict";
     init_wallets();
     init_routes();
+    init_sdkRpc();
     import_viem2 = require("viem");
+    erc20ApproveAbi = (0, import_viem2.parseAbi)([
+      "function approve(address spender, uint256 amount) returns (bool)"
+    ]);
+    UNLIMITED_APPROVAL_FLOOR = 1n << 255n;
   }
 });
 
@@ -9305,6 +9477,7 @@ var init_core = __esm({
       buildRoute,
       buildDepositAddress,
       submitReceipt,
+      submitStepReceipt,
       getStatus,
       pollStatus,
       getBalances,
@@ -31517,7 +31690,7 @@ function normalizeTokenAddressForCompare(chain, addr) {
   if (chainType === "solana") return value;
   return value.toLowerCase();
 }
-function sleep2(ms) {
+function sleep3(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 function useTransactionActionModel({
@@ -31533,7 +31706,7 @@ function useTransactionActionModel({
 }) {
   const feeDataCacheRef = (0, import_react37.useRef)({});
   const { isSubmitting, submitTransaction } = useTransactionSubmit();
-  const { trackEvent } = useGTM(GTM_ID);
+  const { trackEvent } = useGTMTracker();
   const destinationConfig = (() => {
     try {
       return Trustware.getConfig();
@@ -31635,7 +31808,7 @@ function useTransactionActionModel({
         if (status.status === "reverted") {
           throw new Error("Approval transaction reverted");
         }
-        await sleep2(intervalMs);
+        await sleep3(intervalMs);
       }
       throw new Error("Timed out waiting for approval confirmation");
     },
@@ -31969,7 +32142,6 @@ var init_useTransactionActionModel = __esm({
     init_chainHelpers();
     init_utils2();
     init_hooks();
-    init_constants();
   }
 });
 
@@ -33300,7 +33472,7 @@ function normalizeTx(raw) {
     toChainTxUrl: r.toChainTxUrl || r.to_chain_tx_url || void 0
   };
 }
-function sleep3(ms) {
+function sleep4(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 function isUserRejection(err) {
@@ -33318,10 +33490,20 @@ async function waitForApprovalConfirmation(chainId, txHash) {
     if (status.status === "success") return;
     if (status.status === "reverted")
       throw new Error("Approval transaction reverted");
-    await sleep3(2e3);
+    await sleep4(2e3);
   }
   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] = (0, import_react45.useState)({
     txStatus: "idle",
@@ -33378,7 +33560,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;
@@ -33404,24 +33594,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" }));
@@ -33525,19 +33746,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");
@@ -33545,7 +33796,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) {
@@ -33557,18 +33808,18 @@ function useSwapExecution(fromChain) {
             }
             const approveAmount = maxApproval ? BigInt(
               "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-            ) : fromAmountWei;
+            ) : required.amountWei;
             const data = (0, import_viem43.encodeFunctionData)({
               abi: import_viem43.erc20Abi,
               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"
               };
@@ -33581,14 +33832,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",
@@ -33596,9 +33855,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);
@@ -33668,6 +33931,8 @@ var init_useSwapExecution = __esm({
     import_viem43 = require("viem");
     init_core2();
     init_routes();
+    init_http();
+    init_tx();
     init_sdkRpc();
     init_chainHelpers();
     FAST_POLL_MS = 1500;
@@ -39617,6 +39882,7 @@ function WidgetInner({
   const { resolvedTheme } = useDepositUi();
   const { status, revalidate, errors } = useTrustware();
   const [showConfirmDialog, setShowConfirmDialog] = (0, import_react51.useState)(false);
+  useGTM(GTM_ID);
   const handleCloseRequest = (0, import_react51.useCallback)(() => {
     if (ACTIVE_TRANSACTION_STATUSES.includes(transactionStatus)) {
       setShowConfirmDialog(true);
@@ -39691,6 +39957,8 @@ var init_TrustwareWidgetV2 = __esm({
     init_provider();
     init_manager();
     init_useTrustwareConfig();
+    init_hooks();
+    init_constants();
     init_swap();
     import_jsx_runtime60 = require("react/jsx-runtime");
     widgetContentContainerStyle = {