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

package/dist/index.mjs

@@ -442,6 +442,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",
@@ -473,7 +487,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";
@@ -517,6 +531,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",
@@ -1114,12 +1131,33 @@ var init_deepLink = __esm({
 });
 
 // src/wallets/metadata.ts
-var WALLETS;
+var POPULAR_ORDER, WALLETS;
 var init_metadata = __esm({
   "src/wallets/metadata.ts"() {
     "use strict";
     init_deepLink();
     init_constants();
+    POPULAR_ORDER = [
+      "rabby",
+      "metamask",
+      "walletconnect",
+      "rainbow",
+      "phantom-evm",
+      "phantom-solana",
+      "metamask-solana",
+      "solflare",
+      "okx",
+      "brave",
+      "coinbase",
+      "zerion",
+      "taho",
+      "trust",
+      "bitget",
+      "backpack",
+      "imtoken",
+      "safe",
+      "kucoin"
+    ];
     WALLETS = [
       {
         id: "metamask",
@@ -4356,6 +4394,27 @@ var init_wallets = __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));
 }
@@ -4374,6 +4433,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 = {
@@ -4412,6 +4472,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 = {
@@ -4470,6 +4531,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`,
@@ -5160,18 +5234,112 @@ var init_registryClient = __esm({
 });
 
 // src/core/tx.ts
-import { keccak256 } from "viem";
+import { keccak256, encodeFunctionData, parseAbi } from "viem";
 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 = 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;
@@ -5198,6 +5366,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";
@@ -5294,11 +5471,17 @@ async function runTopUp(params) {
     }
   }
 }
+var erc20ApproveAbi, UNLIMITED_APPROVAL_FLOOR;
 var init_tx = __esm({
   "src/core/tx.ts"() {
     "use strict";
     init_wallets();
     init_routes();
+    init_sdkRpc();
+    erc20ApproveAbi = parseAbi([
+      "function approve(address spender, uint256 amount) returns (bool)"
+    ]);
+    UNLIMITED_APPROVAL_FLOOR = 1n << 255n;
   }
 });
 
@@ -7572,6 +7755,7 @@ var init_core = __esm({
       buildRoute,
       buildDepositAddress,
       submitReceipt,
+      submitStepReceipt,
       getStatus,
       pollStatus,
       getBalances,
@@ -8802,75 +8986,17 @@ var init_useTransactionSubmit = __esm({
 
 // src/hooks/useGTM.ts
 import { useEffect as useEffect11, useRef as useRef3, useCallback as useCallback8 } from "react";
-function useGTM(gtmId) {
-  const isInitialized = useRef3(false);
-  const scriptRef = useRef3(null);
-  const isGA4Allowed = useCallback8(() => {
-    try {
-      return Trustware.getConfig().features.shouldAllowGA4;
-    } catch {
-      return false;
-    }
-  }, []);
-  useEffect11(() => {
-    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 = useCallback8(() => {
-    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 = useCallback8(
     (eventName, eventParams = {}) => {
-      if (!isInitialized.current) {
+      if (!isContainerInitialized) {
         console.warn(
           "useGTM: Not initialized. Ensure a valid GTM Container ID was provided."
         );
@@ -8897,7 +9023,7 @@ function useGTM(gtmId) {
   );
   const setUserProperty = useCallback8(
     (propertyName, value) => {
-      if (!isInitialized.current) {
+      if (!isContainerInitialized) {
         console.warn(
           "useGTM: Not initialized. Ensure a valid GTM Container ID was provided."
         );
@@ -8923,20 +9049,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 = useRef3(null);
+  const tracker = useGTMTracker();
+  useEffect11(() => {
+    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 = useCallback8(() => {
+    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;
   }
 });
 
@@ -8963,7 +9146,7 @@ function useTransactionPolling() {
       return void 0;
     }
   })();
-  const { trackEvent } = useGTM(GTM_ID);
+  const { trackEvent } = useGTMTracker();
   const [state, setState] = useState13({
     isPolling: false,
     apiStatus: null,
@@ -9063,8 +9246,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();
@@ -9200,10 +9396,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;
@@ -28385,7 +28581,7 @@ var init_utils5 = __esm({
 });
 
 // node_modules/@account-kit/smart-contracts/dist/esm/src/light-account/accounts/base.js
-import { concat as concat5, encodeFunctionData, fromHex as fromHex4, hashMessage, hashTypedData, trim } from "viem";
+import { concat as concat5, encodeFunctionData as encodeFunctionData2, fromHex as fromHex4, hashMessage, hashTypedData, trim } from "viem";
 async function createLightAccountBase({ transport, chain, signer, abi, version, type, entryPoint, accountAddress, getAccountInitCode }) {
   const client = createBundlerClient({
     transport,
@@ -28404,7 +28600,7 @@ async function createLightAccountBase({ transport, chain, signer, abi, version,
     if (fromHex4(storage, "number") !== 0 && !implementationAddresses.some((x) => x === trim(storage))) {
       throw new Error(`could not determine if smart account implementation is ${type} ${String(version)}`);
     }
-    return encodeFunctionData({
+    return encodeFunctionData2({
       abi,
       functionName: "upgradeToAndCall",
       args: [upgradeToAddress, upgradeToInitData]
@@ -28463,7 +28659,7 @@ async function createLightAccountBase({ transport, chain, signer, abi, version,
     prepareSign,
     formatSign,
     encodeExecute: async ({ target, data, value }) => {
-      return encodeFunctionData({
+      return encodeFunctionData2({
         abi,
         functionName: "execute",
         args: [target, value ?? 0n, data]
@@ -28476,7 +28672,7 @@ async function createLightAccountBase({ transport, chain, signer, abi, version,
         accum[2].push(curr.data);
         return accum;
       }, [[], [], []]);
-      return encodeFunctionData({
+      return encodeFunctionData2({
         abi,
         functionName: "executeBatch",
         args: [targets, values, datas]
@@ -28570,7 +28766,7 @@ var init_OZ_ERC1967Proxy = __esm({
 });
 
 // node_modules/@account-kit/smart-contracts/dist/esm/src/light-account/accounts/predictAddress.js
-import { encodeAbiParameters as encodeAbiParameters4, encodeDeployData, keccak256 as keccak2565, getContractAddress, toHex as toHex6, encodeFunctionData as encodeFunctionData2 } from "viem";
+import { encodeAbiParameters as encodeAbiParameters4, encodeDeployData, keccak256 as keccak2565, getContractAddress, toHex as toHex6, encodeFunctionData as encodeFunctionData3 } from "viem";
 function predictLightAccountAddress({ factoryAddress, salt, ownerAddress, version }) {
   const implementationAddress = (
     // If we aren't using the default factory address, we compute the implementation address from the factory's `create` deployment.
@@ -28594,7 +28790,7 @@ function predictLightAccountAddress({ factoryAddress, salt, ownerAddress, versio
           abi: OZ_ERC1967Proxy_ConstructorAbi,
           args: [
             implementationAddress,
-            encodeFunctionData2({
+            encodeFunctionData3({
               abi: LightAccountAbi_v1,
               functionName: "initialize",
               args: [ownerAddress]
@@ -28631,7 +28827,7 @@ var init_predictAddress = __esm({
 });
 
 // node_modules/@account-kit/smart-contracts/dist/esm/src/light-account/accounts/account.js
-import { concatHex as concatHex2, encodeFunctionData as encodeFunctionData3 } from "viem";
+import { concatHex as concatHex2, encodeFunctionData as encodeFunctionData4 } from "viem";
 async function createLightAccount({ transport, chain, signer, initCode, version = defaultLightAccountVersion(), entryPoint = getEntryPoint(chain, {
   version: AccountVersionRegistry["LightAccount"][version].entryPointVersion
 }), accountAddress, factoryAddress = getDefaultLightAccountFactoryAddress(chain, version), salt: salt_ = 0n }) {
@@ -28648,7 +28844,7 @@ async function createLightAccount({ transport, chain, signer, initCode, version
       return initCode;
     return concatHex2([
       factoryAddress,
-      encodeFunctionData3({
+      encodeFunctionData4({
         abi: factoryAbi,
         functionName: "createAccount",
         args: [signerAddress, salt]
@@ -28675,7 +28871,7 @@ async function createLightAccount({ transport, chain, signer, initCode, version
   return {
     ...account,
     encodeTransferOwnership: (newOwner) => {
-      return encodeFunctionData3({
+      return encodeFunctionData4({
         abi: accountAbi,
         functionName: "transferOwnership",
         args: [newOwner]
@@ -29983,7 +30179,7 @@ var init_feeEstimator2 = __esm({
 });
 
 // node_modules/@account-kit/infra/dist/esm/gas-manager.js
-import { encodeFunctionData as encodeFunctionData4 } from "viem";
+import { encodeFunctionData as encodeFunctionData5 } from "viem";
 var AlchemyPaymasterAddressV06Unify, AlchemyPaymasterAddressV07Unify, AlchemyPaymasterAddressV4, AlchemyPaymasterAddressV3, AlchemyPaymasterAddressV2, ArbSepoliaPaymasterAddress, AlchemyPaymasterAddressV1, AlchemyPaymasterAddressV07V2, AlchemyPaymasterAddressV07V1, getAlchemyPaymasterAddress, PermitTypes, ERC20Abis, EIP7597Abis;
 var init_gas_manager = __esm({
   "node_modules/@account-kit/infra/dist/esm/gas-manager.js"() {
@@ -30172,7 +30368,7 @@ var init_invalidSignedPermit = __esm({
 });
 
 // node_modules/@account-kit/infra/dist/esm/middleware/gasManager.js
-import { fromHex as fromHex5, isHex as isHex2, encodeAbiParameters as encodeAbiParameters5, encodeFunctionData as encodeFunctionData5, parseAbi } from "viem";
+import { fromHex as fromHex5, isHex as isHex2, encodeAbiParameters as encodeAbiParameters5, encodeFunctionData as encodeFunctionData6, parseAbi as parseAbi2 } from "viem";
 function alchemyGasManagerMiddleware(policyId, policyToken, webhookData) {
   const buildContext = async (args) => {
     const context = { policyId };
@@ -30354,16 +30550,16 @@ var init_gasManager = __esm({
       }
       let allowanceFuture = client.call({
         to: policyToken.address,
-        data: encodeFunctionData5({
-          abi: parseAbi(ERC20Abis),
+        data: encodeFunctionData6({
+          abi: parseAbi2(ERC20Abis),
           functionName: "allowance",
           args: [account.address, paymasterAddress]
         })
       });
       let nonceFuture = client.call({
         to: policyToken.address,
-        data: encodeFunctionData5({
-          abi: parseAbi(EIP7597Abis),
+        data: encodeFunctionData6({
+          abi: parseAbi2(EIP7597Abis),
           functionName: "nonces",
           args: [account.address]
         })
@@ -30816,7 +31012,7 @@ var init_fee_utils = __esm({
 
 // src/smart-account/permit2.ts
 import {
-  encodeFunctionData as encodeFunctionData6,
+  encodeFunctionData as encodeFunctionData7,
   keccak256 as keccak2567,
   encodeAbiParameters as encodeAbiParameters6,
   concat as concat6,
@@ -30940,7 +31136,7 @@ async function signPermit2(eip1193Request, params) {
   return sig;
 }
 function encodePermitTransferFrom(token, amount, nonce, deadline, saAddress, eoaAddress, sig) {
-  return encodeFunctionData6({
+  return encodeFunctionData7({
     abi: PERMIT2_ABI,
     functionName: "permitTransferFrom",
     args: [
@@ -30952,28 +31148,28 @@ function encodePermitTransferFrom(token, amount, nonce, deadline, saAddress, eoa
   });
 }
 function encodeErc20Approve(spender, amount) {
-  return encodeFunctionData6({
+  return encodeFunctionData7({
     abi: ERC20_APPROVE_ABI,
     functionName: "approve",
     args: [spender, amount]
   });
 }
 function encodeErc20Allowance(owner, spender) {
-  return encodeFunctionData6({
+  return encodeFunctionData7({
     abi: ERC20_ALLOWANCE_ABI,
     functionName: "allowance",
     args: [owner, spender]
   });
 }
 function encodeErc20BalanceOf(owner) {
-  return encodeFunctionData6({
+  return encodeFunctionData7({
     abi: ERC20_BALANCE_OF_ABI,
     functionName: "balanceOf",
     args: [owner]
   });
 }
 function encodeWethWithdraw(amount) {
-  return encodeFunctionData6({
+  return encodeFunctionData7({
     abi: WETH_ABI,
     functionName: "withdraw",
     args: [amount]
@@ -31066,9 +31262,9 @@ var init_permit2 = __esm({
 });
 
 // src/smart-account/uniswap.ts
-import { encodeFunctionData as encodeFunctionData7 } from "viem";
+import { encodeFunctionData as encodeFunctionData8 } from "viem";
 function encodeUniswapExactOutputSingle(tokenIn, tokenOut, fee, recipient, amountOut, amountInMaximum) {
-  return encodeFunctionData7({
+  return encodeFunctionData8({
     abi: SWAP_ROUTER_ABI,
     functionName: "exactOutputSingle",
     args: [
@@ -31596,14 +31792,14 @@ var init_smart_account2 = __esm({
 
 // src/widget/features/transaction/hooks/useTransactionActionModel.ts
 import { useCallback as useCallback19, useEffect as useEffect26, useMemo as useMemo20, useRef as useRef13, useState as useState26 } from "react";
-import { encodeFunctionData as encodeFunctionData8, erc20Abi } from "viem";
+import { encodeFunctionData as encodeFunctionData9, erc20Abi } from "viem";
 function normalizeTokenAddressForCompare(chain, addr) {
   const chainType = (chain.type ?? chain.chainType ?? "").toLowerCase();
   const value = (addr ?? "").trim();
   if (chainType === "solana") return value;
   return value.toLowerCase();
 }
-function sleep2(ms) {
+function sleep3(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 function useTransactionActionModel({
@@ -31619,7 +31815,7 @@ function useTransactionActionModel({
 }) {
   const feeDataCacheRef = useRef13({});
   const { isSubmitting, submitTransaction } = useTransactionSubmit();
-  const { trackEvent } = useGTM(GTM_ID);
+  const { trackEvent } = useGTMTracker();
   const destinationConfig = (() => {
     try {
       return Trustware.getConfig();
@@ -31721,7 +31917,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");
     },
@@ -31761,7 +31957,7 @@ function useTransactionActionModel({
           }
         }
       }
-      const data = encodeFunctionData8({
+      const data = encodeFunctionData9({
         abi: erc20Abi,
         functionName: "approve",
         args: [spender, amountWei]
@@ -32052,7 +32248,6 @@ var init_useTransactionActionModel = __esm({
     init_chainHelpers();
     init_utils();
     init_hooks();
-    init_constants();
   }
 });
 
@@ -33371,7 +33566,7 @@ var init_useSwapRoute = __esm({
 
 // src/modes/swap/hooks/useSwapExecution.ts
 import { useCallback as useCallback21, useRef as useRef16, useState as useState29 } from "react";
-import { encodeFunctionData as encodeFunctionData9, erc20Abi as erc20Abi2 } from "viem";
+import { encodeFunctionData as encodeFunctionData10, erc20Abi as erc20Abi2 } from "viem";
 function normalizeTx(raw) {
   const r = raw;
   return {
@@ -33382,7 +33577,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) {
@@ -33400,10 +33595,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] = useState29({
     txStatus: "idle",
@@ -33460,7 +33665,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;
@@ -33486,24 +33699,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" }));
@@ -33607,19 +33851,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");
@@ -33627,7 +33901,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) {
@@ -33639,18 +33913,18 @@ function useSwapExecution(fromChain) {
             }
             const approveAmount = maxApproval ? BigInt(
               "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-            ) : fromAmountWei;
-            const data = encodeFunctionData9({
+            ) : 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"
               };
@@ -33663,14 +33937,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",
@@ -33678,9 +33960,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);
@@ -33748,6 +34034,8 @@ var init_useSwapExecution = __esm({
     "use client";
     init_core2();
     init_routes();
+    init_http();
+    init_tx();
     init_sdkRpc();
     init_chainHelpers();
     FAST_POLL_MS = 1500;
@@ -39712,6 +40000,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);
@@ -39785,6 +40074,8 @@ var init_TrustwareWidgetV2 = __esm({
     init_provider();
     init_manager();
     init_useTrustwareConfig();
+    init_hooks();
+    init_constants();
     init_swap();
     widgetContentContainerStyle = {
       position: "relative",
@@ -39945,6 +40236,7 @@ export {
   DEFAULT_SLIPPAGE2 as DEFAULT_SLIPPAGE,
   GTM_ID,
   IdentityStore,
+  POPULAR_ORDER,
   RateLimitError,
   SDK_NAME,
   SDK_VERSION,
@@ -39953,6 +40245,7 @@ export {
   TrustwareProvider,
   TrustwareWidgetV2 as TrustwareWidget,
   WALLETCONNECT_PROJECT_ID,
+  WALLETS,
   buildWalletIdentityAddress,
   connectDetectedWallet,
   createWalletIdentity,