@trustware/sdk-staging 1.1.17-staging.7 → 1.1.18-staging.1

package/dist/wallet.cjs

@@ -305,7 +305,7 @@ var init_constants = __esm({
   "src/constants.ts"() {
     "use strict";
     SDK_NAME = "@trustware/sdk";
-    SDK_VERSION = "1.1.17-staging.7";
+    SDK_VERSION = "1.1.18-staging.1";
     API_ROOT = "https://bv-staging-api.trustware.io";
     API_PREFIX = "/api";
     WALLETCONNECT_PROJECT_ID = "72ea74c400f5111d43aea638d7d83a24";

package/dist/wallet.mjs

@@ -279,7 +279,7 @@ var init_constants = __esm({
   "src/constants.ts"() {
     "use strict";
     SDK_NAME = "@trustware/sdk";
-    SDK_VERSION = "1.1.17-staging.7";
+    SDK_VERSION = "1.1.18-staging.1";
     API_ROOT = "https://bv-staging-api.trustware.io";
     API_PREFIX = "/api";
     WALLETCONNECT_PROJECT_ID = "72ea74c400f5111d43aea638d7d83a24";

package/dist/widget.cjs

@@ -642,7 +642,7 @@ var init_constants = __esm({
   "src/constants.ts"() {
     "use strict";
     SDK_NAME = "@trustware/sdk";
-    SDK_VERSION = "1.1.17-staging.7";
+    SDK_VERSION = "1.1.18-staging.1";
     API_ROOT = "https://bv-staging-api.trustware.io";
     GTM_ID = "GTM-TZDGNCXB";
     API_PREFIX = "/api";
@@ -2903,6 +2903,32 @@ var init_routeError = __esm({
   }
 });
 
+// src/core/routeApprovals.ts
+function approvalAmountWei(approval, stepIndex) {
+  const { amount } = approval;
+  if (amount === void 0 || amount === "") {
+    throw new Error(
+      `Route approval ${stepIndex} (spender ${String(approval.spender)}) has no amount.`
+    );
+  }
+  if (!DECIMAL_INTEGER.test(amount)) {
+    throw new Error(
+      `Route approval ${stepIndex} (spender ${String(approval.spender)}) has an invalid amount "${amount}".`
+    );
+  }
+  return BigInt(amount);
+}
+function assertValidRouteApprovals(approvals) {
+  (approvals ?? []).forEach(approvalAmountWei);
+}
+var DECIMAL_INTEGER;
+var init_routeApprovals = __esm({
+  "src/core/routeApprovals.ts"() {
+    "use strict";
+    DECIMAL_INTEGER = /^\d+$/;
+  }
+});
+
 // src/core/routeValue.ts
 function parseUsd(value) {
   if (value == null) return null;
@@ -3063,6 +3089,7 @@ async function buildRoute(body, signal) {
   if (!txReq?.data) {
     throw new Error("Invalid route: missing transaction data");
   }
+  assertValidRouteApprovals(route?.execution?.approvals);
   assertRouteDeliversValue(route);
   return { intentId, txReq, actions, finalExchangeRate, route, sponsorship };
 }
@@ -3183,6 +3210,7 @@ var init_routes = __esm({
     "use strict";
     init_http();
     init_routeError();
+    init_routeApprovals();
     init_routeValue();
     init_store();
     init_address();
@@ -6544,11 +6572,13 @@ async function ensureApprovals(w, approvals, fallbackChainId, intentId, routeAmo
   for (const [stepIndex, approval] of approvals.entries()) {
     const spender = approval.spender;
     const tokenAddress = approval.tokenAddress;
-    const amount = approval.amount;
-    if (!spender || !tokenAddress || !amount) continue;
+    if (!spender || !tokenAddress) continue;
     const chainId = approval.chainId || String(fallbackChainId ?? "");
     if (!chainId) continue;
-    const amountWei = requiredApprovalAmount(BigInt(amount), routeAmountWei);
+    const amountWei = requiredApprovalAmount(
+      approvalAmountWei(approval, stepIndex),
+      routeAmountWei
+    );
     let currentAllowance = 0n;
     try {
       const { allowance } = await getEVMAllowance({
@@ -6634,7 +6664,6 @@ async function sendRouteTransactionReporting(b, fallbackChainId, options, onAcce
         )}).`
       );
     }
-    await ensureWalletOnChain(w, target);
     if (!validatedSponsorship && !options?.approvalsEnsured) {
       await ensureApprovals(
         w,
@@ -6644,6 +6673,7 @@ async function sendRouteTransactionReporting(b, fallbackChainId, options, onAcce
         BigInt(b.route?.estimate?.fromAmount ?? "0")
       );
     }
+    await ensureWalletOnChain(w, target);
     if (w.type === "eip1193") {
       const from = await w.getAddress();
       const hexValue = value ? `0x${value.toString(16)}` : "0x0";
@@ -6810,6 +6840,7 @@ var import_viem2, erc20ApproveAbi, NOT_FOUND_GRACE_MS, UNLIMITED_APPROVAL_FLOOR;
 var init_tx = __esm({
   "src/core/tx.ts"() {
     "use strict";
+    init_routeApprovals();
     init_routeValue();
     init_wallets();
     init_routes();
@@ -7061,11 +7092,7 @@ function mapRouteFacts(facts) {
     return INVALID_ADDRESS;
   }
   if (!facts.allDeclined) {
-    return {
-      category: "route_error",
-      title: "Route Unavailable",
-      message: "A routing provider did not respond. Please try again in a moment."
-    };
+    return ROUTING_BUSY;
   }
   const has = (code) => facts.codes.includes(code);
   if (has(RouteDeclineCode.FeesExceedOutput)) {
@@ -7085,12 +7112,8 @@ function mapRouteFacts(facts) {
       message: minimum ? `This route needs at least ${minimum}. Try a larger amount.` : "This amount is below the minimum for this route. Try a larger amount."
     };
   }
-  if (lowLiquidity && !tooLow) {
-    return {
-      category: "route_error",
-      title: "Insufficient Liquidity",
-      message: "Not enough liquidity for this swap. Try a smaller amount or different token."
-    };
+  if (facts.codes.every((code) => code === RouteDeclineCode.InsufficientLiquidity)) {
+    return INSUFFICIENT_LIQUIDITY;
   }
   if (facts.codes.every((code) => code === RouteDeclineCode.DestinationCallFailed)) {
     return DESTINATION_CALL_FAILED;
@@ -7142,11 +7165,7 @@ function classifyError(raw, msg) {
       };
     }
     if (bm.includes("liquidity") || bm.includes("slippage") || bm.includes("price impact")) {
-      return {
-        category: "route_error",
-        title: "Insufficient Liquidity",
-        message: "Not enough liquidity for this swap. Try a smaller amount or different token."
-      };
+      return INSUFFICIENT_LIQUIDITY;
     }
     if (bm.includes("insufficient funds") || bm.includes("insufficient balance")) {
       return {
@@ -7182,12 +7201,8 @@ function classifyError(raw, msg) {
       message: "Could not get a quote right now. Please try again."
     };
   }
-  if (lower.includes("not enough liquidity") || lower.includes("insufficient liquidity") || lower.includes("price impact too high")) {
-    return {
-      category: "route_error",
-      title: "Insufficient Liquidity",
-      message: "Not enough liquidity for this swap. Try a smaller amount or different token."
-    };
+  if (lower.includes("enough liquidity") || lower.includes("insufficient liquidity") || lower.includes("price impact too high")) {
+    return INSUFFICIENT_LIQUIDITY;
   }
   if (lower.includes("destination contract call")) {
     return DESTINATION_CALL_FAILED;
@@ -7195,6 +7210,9 @@ function classifyError(raw, msg) {
   if (lower.includes("invalid address") || lower.includes("address is not valid")) {
     return INVALID_ADDRESS;
   }
+  if (lower.includes("routing is busy")) {
+    return ROUTING_BUSY;
+  }
   if (lower.includes("did not respond") || lower.includes("routing provider")) {
     return {
       category: "route_error",
@@ -7273,7 +7291,7 @@ function classifyError(raw, msg) {
     message: "An unexpected error occurred. Please try again."
   };
 }
-var SELF_MAPPED, INVALID_ADDRESS, DESTINATION_CALL_FAILED;
+var SELF_MAPPED, INVALID_ADDRESS, DESTINATION_CALL_FAILED, INSUFFICIENT_LIQUIDITY, ROUTING_BUSY;
 var init_mapError = __esm({
   "src/widget/lib/mapError.ts"() {
     "use strict";
@@ -7294,6 +7312,16 @@ var init_mapError = __esm({
       title: "Destination Call Failed",
       message: "The destination contract call could not be simulated. Check the call data and target."
     };
+    INSUFFICIENT_LIQUIDITY = {
+      category: "route_error",
+      title: "Insufficient Liquidity",
+      message: "There isn't enough liquidity to route this swap right now. Try a different token or network, or a smaller amount."
+    };
+    ROUTING_BUSY = {
+      category: "route_error",
+      title: "Route Unavailable",
+      message: "Routing is busy right now. Please wait a moment and try again."
+    };
   }
 });
 
@@ -19930,6 +19958,37 @@ var init_SuccessSummaryCard = __esm({
   }
 });
 
+// src/widget/helpers/plannedApprovals.ts
+function plannedErc20Approvals(approvals, route) {
+  return (approvals ?? []).flatMap((approval, stepIndex) => {
+    const token = approval.tokenAddress ?? route.fromTokenAddress;
+    const spender = approval.spender;
+    if (!isEvmAddress2(token) || !isEvmAddress2(spender)) return [];
+    return [
+      {
+        stepIndex,
+        chainId: approval.chainId || route.chainId,
+        token,
+        spender,
+        // A planned 0 is the reset-to-zero step USDT-style tokens need
+        // before an existing allowance can change; it is kept as 0.
+        amountWei: requiredApprovalAmount(
+          approvalAmountWei(approval, stepIndex),
+          route.amountWei
+        )
+      }
+    ];
+  });
+}
+var init_plannedApprovals = __esm({
+  "src/widget/helpers/plannedApprovals.ts"() {
+    "use strict";
+    init_routeApprovals();
+    init_tx();
+    init_chainHelpers();
+  }
+});
+
 // src/widget/lib/routeChange.ts
 function describeRouteChange(change) {
   switch (change.kind) {
@@ -33227,9 +33286,6 @@ var init_smart_account2 = __esm({
 });
 
 // src/widget/features/transaction/hooks/useTransactionActionModel.ts
-function sleep3(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
 function useTransactionActionModel({
   actionErrorMessage,
   amountWei,
@@ -33267,92 +33323,72 @@ function useTransactionActionModel({
     selectedChain?.id,
     selectedChain?.networkIdentifier
   ]);
-  const selectedTokenOnBackendChain = (0, import_react38.useMemo)(() => {
-    if (!backendChainId2) return false;
-    const target = normalizeChainKey(backendChainId2);
-    return [
-      selectedChain?.chainId,
-      selectedChain?.id,
-      selectedChain?.networkIdentifier
-    ].some((c) => {
-      const k = normalizeChainKey(c ?? null);
-      return k !== "" && k === target;
-    });
-  }, [
-    backendChainId2,
-    selectedChain?.chainId,
-    selectedChain?.id,
-    selectedChain?.networkIdentifier
-  ]);
   const isNativeSelected = (0, import_react38.useMemo)(() => {
     const address = selectedToken?.address;
     return !address || isNativeTokenAddress(address, chainType);
   }, [chainType, selectedToken?.address]);
-  const spender = (0, import_react38.useMemo)(() => {
-    const txReq = routeResult?.txReq;
-    const addr = txReq?.to ?? txReq?.target;
-    return addr ?? null;
-  }, [routeResult?.txReq]);
-  const [allowanceWei, setAllowanceWei] = (0, import_react38.useState)(0n);
+  const requiredApprovals = (0, import_react38.useMemo)(
+    () => isEvm && !isNativeSelected && !routeResult?.sponsorship ? plannedErc20Approvals(routeResult?.route?.execution?.approvals, {
+      fromTokenAddress: selectedToken?.address,
+      chainId: backendChainId2 ?? "",
+      amountWei
+    }) : [],
+    [
+      amountWei,
+      backendChainId2,
+      isEvm,
+      isNativeSelected,
+      routeResult?.route?.execution?.approvals,
+      routeResult?.sponsorship,
+      selectedToken?.address
+    ]
+  );
+  const [unmetApprovals, setUnmetApprovals] = (0, import_react38.useState)(
+    []
+  );
   const [isReadingAllowance, setIsReadingAllowance] = (0, import_react38.useState)(false);
   const [isApproving, setIsApproving] = (0, import_react38.useState)(false);
   const [gasReservationWei, setGasReservationWei] = (0, import_react38.useState)(0n);
+  const findUnmetApprovals = (0, import_react38.useCallback)(async () => {
+    if (!walletAddress) return [];
+    const met = await Promise.all(
+      requiredApprovals.map(async (approval) => {
+        try {
+          const { allowance } = await getEVMAllowance({
+            chainId: approval.chainId,
+            tokenAddress: approval.token,
+            ownerAddress: walletAddress,
+            spenderAddress: approval.spender
+          });
+          return approvalSatisfied(
+            BigInt(allowance || "0"),
+            approval.amountWei
+          );
+        } catch {
+          return false;
+        }
+      })
+    );
+    return requiredApprovals.filter((_, index) => !met[index]);
+  }, [requiredApprovals, walletAddress]);
   const readAllowance = (0, import_react38.useCallback)(async () => {
-    if (!isEvm || isNativeSelected || !!routeResult?.sponsorship || // sponsored routes: SA approves bridge inside the UO batch
-    !backendChainId2 || !selectedTokenOnBackendChain || !walletAddress || !spender || !selectedToken?.address) {
-      setAllowanceWei(0n);
+    if (requiredApprovals.length === 0) {
+      setUnmetApprovals([]);
       return;
     }
+    setIsReadingAllowance(true);
     try {
-      setIsReadingAllowance(true);
-      const result = await getEVMAllowance({
-        chainId: backendChainId2,
-        tokenAddress: selectedToken.address,
-        ownerAddress: walletAddress,
-        spenderAddress: spender
-      });
-      setAllowanceWei(BigInt(result.allowance || "0"));
-    } catch {
-      setAllowanceWei(0n);
+      setUnmetApprovals(await findUnmetApprovals());
     } finally {
       setIsReadingAllowance(false);
     }
-  }, [
-    backendChainId2,
-    isEvm,
-    isNativeSelected,
-    routeResult?.sponsorship,
-    selectedTokenOnBackendChain,
-    selectedToken?.address,
-    spender,
-    walletAddress
-  ]);
+  }, [findUnmetApprovals, requiredApprovals.length]);
   (0, import_react38.useEffect)(() => {
     void readAllowance();
   }, [readAllowance]);
-  const needsApproval = isEvm && !isNativeSelected && !routeResult?.sponsorship && // sponsored routes use Permit2 + SA internal batch — no EOA bridge approval
-  !!walletAddress && !!spender && amountWei > 0n && allowanceWei < amountWei;
-  const waitForApprovalConfirmation2 = (0, import_react38.useCallback)(
-    async (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 sleep3(intervalMs);
-      }
-      throw new Error("Timed out waiting for approval confirmation");
-    },
-    []
-  );
+  const needsApproval = !!walletAddress && amountWei > 0n && unmetApprovals.length > 0;
   const handleApproveExact = (0, import_react38.useCallback)(async () => {
-    if (isApproving || amountWei <= 0n || !walletAddress || !spender || !selectedToken?.address) {
+    if (isApproving || amountWei <= 0n || !walletAddress || unmetApprovals.length === 0) {
       return;
     }
     const wallet = Trustware.getWallet();
@@ -33368,80 +33404,57 @@ function useTransactionActionModel({
     });
     setIsApproving(true);
     try {
-      const targetChain = Number(
-        routeResult?.txReq?.chainId ?? selectedChain?.chainId ?? selectedChain?.id
-      );
-      console.log("[approve] targetChain:", targetChain, {
-        txReqChainId: routeResult?.txReq?.chainId,
-        selectedChainId: selectedChain?.chainId,
-        selectedChainIdAlt: selectedChain?.id
-      });
-      if (Number.isFinite(targetChain)) {
-        const current = await wallet.getChainId();
-        if (current !== targetChain) {
-          try {
-            await wallet.switchChain(targetChain);
-          } catch {
-          }
-        }
-      }
-      const data = (0, import_viem42.encodeFunctionData)({
-        abi: import_viem42.erc20Abi,
-        functionName: "approve",
-        args: [spender, amountWei]
-      });
-      let hash;
-      if (wallet.type === "eip1193") {
-        const from = await wallet.getAddress();
-        const params = {
-          from,
-          to: selectedToken.address,
-          data,
-          value: "0x0"
-        };
-        if (Number.isFinite(targetChain)) {
-          params.chainId = `0x${targetChain.toString(16)}`;
-        }
-        hash = await wallet.request({
-          method: "eth_sendTransaction",
-          params: [params]
+      for (const approval of unmetApprovals) {
+        const approvalChain = Number(approval.chainId);
+        await ensureWalletOnChain(wallet, approvalChain);
+        const data = (0, import_viem42.encodeFunctionData)({
+          abi: import_viem42.erc20Abi,
+          functionName: "approve",
+          args: [approval.spender, approval.amountWei]
         });
-      } else {
-        const response = await wallet.sendTransaction({
-          to: selectedToken.address,
-          data,
-          value: 0n,
-          chainId: Number.isFinite(targetChain) ? targetChain : void 0
-        });
-        hash = response.hash;
-      }
-      if (backendChainId2) {
-        await waitForApprovalConfirmation2(backendChainId2, hash);
-        await readAllowance();
-      } else {
-        setAllowanceWei(amountWei);
+        let hash;
+        if (wallet.type === "eip1193") {
+          const from = await wallet.getAddress();
+          hash = await wallet.request({
+            method: "eth_sendTransaction",
+            params: [
+              {
+                from,
+                to: approval.token,
+                data,
+                value: "0x0",
+                chainId: `0x${approvalChain.toString(16)}`
+              }
+            ]
+          });
+        } else {
+          const response = await wallet.sendTransaction({
+            to: approval.token,
+            data,
+            value: 0n,
+            chainId: approvalChain
+          });
+          hash = response.hash;
+        }
+        await waitForApprovalConfirmation(approval.chainId, hash);
       }
+      await readAllowance();
     } catch {
     } finally {
       setIsApproving(false);
     }
   }, [
     amountWei,
-    backendChainId2,
     destinationConfig?.routes.toChain,
     destinationConfig?.routes.toToken,
     isApproving,
     readAllowance,
-    routeResult?.txReq?.chainId,
     selectedChain?.axelarChainName,
     selectedChain?.chainId,
-    selectedChain?.id,
     selectedChain?.networkName,
-    selectedToken?.address,
     selectedToken?.symbol,
-    spender,
     trackEvent,
-    waitForApprovalConfirmation2,
+    unmetApprovals,
     walletAddress
   ]);
   const getCachedFeeData = (0, import_react38.useCallback)(async () => {
@@ -33628,32 +33641,13 @@ function useTransactionActionModel({
   const handleSwipeConfirm = (0, import_react38.useCallback)(async () => {
     if (needsApproval) {
       await handleApproveExact();
-      if (!backendChainId2 || !selectedTokenOnBackendChain || !selectedToken?.address || !walletAddress || !spender) {
-        return;
-      }
-      const freshAllowance = await getEVMAllowance({
-        chainId: backendChainId2,
-        tokenAddress: selectedToken.address,
-        ownerAddress: walletAddress,
-        spenderAddress: spender
-      }).then((r) => BigInt(r.allowance || "0")).catch(() => 0n);
-      if (freshAllowance >= amountWei) {
+      if ((await findUnmetApprovals()).length === 0) {
         await handleConfirm();
       }
       return;
     }
     await handleConfirm();
-  }, [
-    amountWei,
-    backendChainId2,
-    handleApproveExact,
-    handleConfirm,
-    needsApproval,
-    selectedTokenOnBackendChain,
-    selectedToken?.address,
-    spender,
-    walletAddress
-  ]);
+  }, [findUnmetApprovals, handleApproveExact, handleConfirm, needsApproval]);
   const isWalletConnected = walletStatus === "connected";
   const canSwipe = parsedAmount > 0 && !!selectedToken && isWalletConnected && !isLoadingRoute && !isSubmitting && !!routeResult && !actionErrorMessage && !isApproving && !isReadingAllowance;
   const swipeResetKey = (0, import_react38.useMemo)(() => {
@@ -33700,9 +33694,11 @@ var init_useTransactionActionModel = __esm({
     import_viem42 = require("viem");
     init_core2();
     init_sdkRpc();
+    init_tx();
     init_hooks2();
     init_chains();
     init_utils2();
+    init_plannedApprovals();
     init_hooks();
     init_routeChange();
   }
@@ -35143,33 +35139,15 @@ function useSwapExecution(fromChain) {
       const chainIdStr = String(txReq?.chainId ?? fromChain?.chainId ?? "");
       const amountWei = BigInt(routeResult.route?.estimate?.fromAmount ?? "0");
       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 (!isEvmAddress2(token) || !isEvmAddress2(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 (plannedApprovals.length === 0) {
+        setState((p) => ({ ...p, allowanceStatus: "sufficient" }));
+        return;
+      }
+      const toCheck = plannedErc20Approvals(plannedApprovals, {
+        fromTokenAddress,
+        chainId: chainIdStr,
+        amountWei
+      });
       if (toCheck.length === 0 || !chainIdStr || amountWei === 0n) {
         setState((p) => ({ ...p, allowanceStatus: "unknown" }));
         return;
@@ -35184,7 +35162,7 @@ function useSwapExecution(fromChain) {
               ownerAddress: walletAddress,
               spenderAddress: c.spender
             });
-            return approvalSatisfied(BigInt(allowance || "0"), c.required);
+            return approvalSatisfied(BigInt(allowance || "0"), c.amountWei);
           })
         );
         setState((p) => ({
@@ -35239,7 +35217,6 @@ function useSwapExecution(fromChain) {
       const txReq = routeResult.txReq;
       const numericChainId = Number(txReq.chainId ?? fromChain?.chainId) || void 0;
       const chainIdStr = String(txReq.chainId ?? fromChain?.chainId ?? "");
-      const spender = txReq.to ?? txReq.target;
       const chainType = normalizeChainType(fromChain);
       const isNative = !fromTokenAddress || isNativeTokenAddress(fromTokenAddress, chainType);
       const fromAmountWei = BigInt(
@@ -35319,34 +35296,12 @@ function useSwapExecution(fromChain) {
       const acceptance = { tracking: false };
       try {
         const plannedApprovals = routeResult.route?.execution?.approvals ?? [];
-        const requiredApprovals = plannedApprovals.length ? plannedApprovals.flatMap((a, index) => {
-          const token = a.tokenAddress ?? fromTokenAddress;
-          const approvalSpender = a.spender;
-          if (!isEvmAddress2(token) || !isEvmAddress2(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 coversEveryPlannedApproval = plannedApprovals.length === 0 || requiredApprovals.length === plannedApprovals.length;
+        const requiredApprovals = plannedErc20Approvals(plannedApprovals, {
+          fromTokenAddress,
+          chainId: chainIdStr,
+          amountWei: fromAmountWei
+        });
+        const coversEveryPlannedApproval = requiredApprovals.length === plannedApprovals.length;
         const ownsApprovals = coversEveryPlannedApproval && needsErc20Approval(fromTokenAddress, chainType) && !!walletAddress && !!chainIdStr;
         const activeAddress = ownsApprovals ? await requireActiveAddress(wallet, walletAddress) : void 0;
         for (const required of requiredApprovals) {
@@ -35408,14 +35363,12 @@ function useSwapExecution(fromChain) {
               });
               approvalHash = response.hash;
             }
-            if (required.stepIndex !== null) {
-              void submitStepReceipt(
-                routeResult.intentId,
-                required.stepIndex,
-                approvalHash
-              ).catch(() => {
-              });
-            }
+            void submitStepReceipt(
+              routeResult.intentId,
+              required.stepIndex,
+              approvalHash
+            ).catch(() => {
+            });
             await waitForApprovalConfirmation(required.chainId, approvalHash);
             setState((p) => ({
               ...p,
@@ -35534,6 +35487,7 @@ var init_useSwapExecution = __esm({
     init_tx();
     init_sdkRpc();
     init_chainHelpers();
+    init_plannedApprovals();
     init_chains();
     SA_COOLDOWN_MS = 3e4;
   }