@rhinestone/deposit-modal 0.12.2 → 0.13.0

package/dist/{chunk-SDSKIJC7.mjs → chunk-DSIZNRWA.mjs}

@@ -13,14 +13,15 @@ import {
   getExchangeLogoSrc,
   isDepositEvent,
   isFailedEvent,
+  isSubmissionUncertain,
   readDedupedAccountSetupResult,
   runAccountSetupDeduped,
   txRefsMatch,
   warnRemovedProps
-} from "./chunk-J46WDSRD.mjs";
+} from "./chunk-COCBCQQC.mjs";
 import {
   ListRow
-} from "./chunk-JE4R5VA3.mjs";
+} from "./chunk-XYJFEN5D.mjs";
 import {
   AlertTriangleIcon,
   AppleIcon,
@@ -35,7 +36,6 @@ import {
   CheckIcon,
   ChevronDownIcon,
   ChevronLeftIcon,
-  ClockIcon,
   CloseIcon,
   CopyIcon,
   ExternalLinkIcon,
@@ -44,8 +44,7 @@ import {
   InfoIcon,
   MigrateAssetsIcon,
   Modal,
-  PercentIcon,
-  PlusCircleIcon,
+  PermitDepositSubmitError,
   PoweredBy,
   RpcUrlsProvider,
   SUPPORTED_CONNECT_EXCHANGE_COUNT,
@@ -86,8 +85,9 @@ import {
   useLatestRef,
   useRpcUrls,
   useStableRpcUrls
-} from "./chunk-FXXUIK4E.mjs";
+} from "./chunk-EOMT5LKX.mjs";
 import {
+  MULTICALL3_ADDRESS,
   POLYMARKET_COLLATERAL_OFFRAMP_ADDRESS,
   POLYMARKET_ICON_URL,
   POLYMARKET_POLYGON_CHAIN_ID,
@@ -97,26 +97,24 @@ import {
   executePolymarketSafeTransfer,
   fetchPolymarketProxyWallet,
   readPolymarketBalances
-} from "./chunk-4ZXQPFNU.mjs";
+} from "./chunk-RN5VKWI6.mjs";
 import {
-  CHAIN_BY_ID,
   HYPERCORE_CHAIN_ID,
   HYPERCORE_MIN_DEPOSIT_USD,
   HYPERCORE_SPOT_CAIP2,
   NATIVE_TOKEN_ADDRESS,
   SOLANA_TOKENS,
+  SUPPORTED_CHAIN_IDS,
   cdnIconUrl,
   findTokenDecimals,
   getChainBadge,
   getChainIcon,
   getChainId,
   getChainName,
-  getExplorerUrl,
   getNativeSymbol,
   getSupportedChainIds,
   getTargetTokenSymbol,
   getTargetTokenSymbolsForChain,
-  getTokenAddress,
   getTokenDecimalsByAddress,
   getTokenSymbol,
   isHyperCoreCaip2,
@@ -127,16 +125,15 @@ import {
   isVirtualDestination,
   parseEvmChainId,
   publishShortlistTokens,
-  targetChainToCaip2,
   targetChainToChainId
-} from "./chunk-3STTWRAN.mjs";
+} from "./chunk-VUATPOWJ.mjs";
 
 // src/DepositModal.tsx
 import {
   useMemo as useMemo9,
-  useEffect as useEffect12,
+  useEffect as useEffect13,
   useRef as useRef9,
-  useState as useState14,
+  useState as useState15,
   useCallback as useCallback9,
   lazy as lazy2,
   Suspense as Suspense2
@@ -144,10 +141,10 @@ import {
 
 // src/DepositFlow.tsx
 import {
-  useState as useState12,
+  useState as useState13,
   useCallback as useCallback7,
   useMemo as useMemo7,
-  useEffect as useEffect11,
+  useEffect as useEffect12,
   useLayoutEffect as useLayoutEffect2,
   useRef as useRef8
 } from "react";
@@ -495,7 +492,7 @@ function ConnectStep({
 }) {
   const rows = walletRows ?? [];
   const handleConnect = onConnect ?? onRequestConnect;
-  const hasReownWallet = rows.some(
+  const hasSessionWallet = rows.some(
     (row) => row.kind === "external" || row.kind === "solana"
   );
   const defaultSubtitle = onSelectTransferCrypto ? "Add money to your balance" : "Choose a wallet to continue";
@@ -538,7 +535,7 @@ function ConnectStep({
       )
     );
   }
-  if (!hasReownWallet && handleConnect) {
+  if (!hasSessionWallet && handleConnect) {
     cryptoRows.push(
       /* @__PURE__ */ jsx5(
         ListRow,
@@ -665,7 +662,7 @@ function ConnectStep({
         }
       )
     ] }),
-    onDisconnect && hasReownWallet && /* @__PURE__ */ jsx5("div", { className: "rs-screen-tight-row", children: /* @__PURE__ */ jsx5(
+    onDisconnect && hasSessionWallet && /* @__PURE__ */ jsx5("div", { className: "rs-screen-tight-row", children: /* @__PURE__ */ jsx5(
       "button",
       {
         type: "button",
@@ -1076,7 +1073,9 @@ function AmountStep({
   targetToken,
   uiConfig,
   tokenPriceUsdOverride,
+  sourcePriceUnavailable = false,
   appBalanceUsd,
+  title = "Wallet deposit",
   onContinue,
   onCtaClick,
   service
@@ -1093,7 +1092,7 @@ function AmountStep({
   const targetChainId = targetChainToChainId(targetChain);
   const targetSymbol = getTargetTokenSymbol(targetToken, targetChainId);
   const isSourceStablecoin = isStablecoinSymbol(asset.symbol);
-  const tokenPriceUsd = useMemo2(() => {
+  const derivedPriceUsd = useMemo2(() => {
     if (tokenPriceUsdOverride !== void 0 && tokenPriceUsdOverride > 0)
       return tokenPriceUsdOverride;
     if (asset.balanceUsd === void 0 || !asset.balanceUsd || !asset.balance)
@@ -1109,6 +1108,7 @@ function AmountStep({
       return null;
     }
   }, [tokenPriceUsdOverride, asset.balanceUsd, asset.balance, asset.decimals]);
+  const tokenPriceUsd = derivedPriceUsd;
   const hasPricing = tokenPriceUsd !== null;
   useEffect3(() => {
     let active = true;
@@ -1278,13 +1278,16 @@ function AmountStep({
     );
   };
   const continueLabel = exceedsBalance ? "Insufficient balance" : isAboveMax ? "Continue with max allowed deposit" : isBelowMin ? "Continue with minimum deposit" : "Continue";
-  const continueDisabled = chainMismatch || exceedsBalance || numericAmount === 0 && !isBelowMin || balance === null;
+  const knowsBalance = address !== void 0;
+  const needsPricing = !knowsBalance && !isSourceStablecoin;
+  const blockedOnPricing = needsPricing && !hasPricing;
+  const continueDisabled = chainMismatch || exceedsBalance || blockedOnPricing || numericAmount === 0 && !isBelowMin || knowsBalance && balance === null;
   const chainName = useChainName();
   const sourceChainName = chainName(asset.chainId);
   const targetChainName = chainName(targetChainId);
   return /* @__PURE__ */ jsxs6("div", { className: "rs-screen", children: [
     /* @__PURE__ */ jsxs6("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx8(BodyHeader, { icon: /* @__PURE__ */ jsx8(WalletIcon, {}), title: "Wallet deposit" }),
+      /* @__PURE__ */ jsx8(BodyHeader, { icon: /* @__PURE__ */ jsx8(WalletIcon, {}), title }),
       /* @__PURE__ */ jsxs6("div", { className: "rs-amount-section", children: [
         /* @__PURE__ */ jsxs6("div", { className: "rs-amount-display", children: [
           /* @__PURE__ */ jsx8(
@@ -1297,7 +1300,7 @@ function AmountStep({
             }
           ),
           /* @__PURE__ */ jsxs6("div", { className: "rs-amount-meta", children: [
-            /* @__PURE__ */ jsxs6("span", { className: "rs-amount-meta-balance", children: [
+            knowsBalance && /* @__PURE__ */ jsxs6("span", { className: "rs-amount-meta-balance", children: [
               formattedBalance,
               " ",
               asset.symbol,
@@ -1314,7 +1317,7 @@ function AmountStep({
             ] })
           ] })
         ] }),
-        /* @__PURE__ */ jsx8("div", { className: "rs-amount-presets", children: PRESETS.map((preset) => /* @__PURE__ */ jsx8(
+        knowsBalance && /* @__PURE__ */ jsx8("div", { className: "rs-amount-presets", children: PRESETS.map((preset) => /* @__PURE__ */ jsx8(
           "button",
           {
             type: "button",
@@ -1354,6 +1357,10 @@ function AmountStep({
           /* @__PURE__ */ jsx8("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
         ] })
       ] }),
+      blockedOnPricing && sourcePriceUnavailable && /* @__PURE__ */ jsxs6(Callout, { variant: "error", children: [
+        asset.symbol,
+        " can't be priced right now, so this deposit can't be estimated. You can still send any amount to the deposit address."
+      ] }),
       error && /* @__PURE__ */ jsx8(Callout, { variant: "error", children: error }),
       /* @__PURE__ */ jsx8(
         Button,
@@ -1373,13 +1380,213 @@ function AmountStep({
 import { useEffect as useEffect4, useRef as useRef3, useState as useState4 } from "react";
 import { erc20Abi as erc20Abi2, parseUnits as parseUnits2 } from "viem";
 
+// src/components/ui/ReviewDetails.tsx
+import { jsx as jsx9, jsxs as jsxs7 } from "react/jsx-runtime";
+function ReviewDetails({
+  sourceChainName,
+  sourceChainIcon,
+  targetChainName,
+  targetChainIcon,
+  estimatedTime,
+  sendAmount,
+  sendSymbol,
+  receiveDisplay,
+  receiveSymbol,
+  fee
+}) {
+  return /* @__PURE__ */ jsxs7("div", { className: "rs-review-details", children: [
+    /* @__PURE__ */ jsxs7("div", { className: "rs-review-detail-row", children: [
+      /* @__PURE__ */ jsx9("span", { children: "Source chain" }),
+      /* @__PURE__ */ jsxs7("span", { className: "rs-review-detail-value", children: [
+        /* @__PURE__ */ jsx9("span", { children: sourceChainName }),
+        sourceChainIcon && /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9(CdnIcon, { src: sourceChainIcon }) })
+      ] })
+    ] }),
+    /* @__PURE__ */ jsxs7("div", { className: "rs-review-detail-row", children: [
+      /* @__PURE__ */ jsx9("span", { children: "Destination chain" }),
+      /* @__PURE__ */ jsxs7("span", { className: "rs-review-detail-value", children: [
+        /* @__PURE__ */ jsx9("span", { children: targetChainName }),
+        targetChainIcon && /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9(CdnIcon, { src: targetChainIcon }) })
+      ] })
+    ] }),
+    /* @__PURE__ */ jsxs7("div", { className: "rs-review-detail-row", children: [
+      /* @__PURE__ */ jsx9("span", { children: "Estimated time" }),
+      /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-value", children: estimatedTime })
+    ] }),
+    /* @__PURE__ */ jsxs7("div", { className: "rs-review-detail-row", children: [
+      /* @__PURE__ */ jsx9("span", { children: "You send" }),
+      /* @__PURE__ */ jsxs7("span", { className: "rs-review-detail-value", children: [
+        /* @__PURE__ */ jsxs7("span", { children: [
+          sendAmount,
+          " ",
+          sendSymbol
+        ] }),
+        /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9(TokenIcon, { symbol: sendSymbol }) })
+      ] })
+    ] }),
+    /* @__PURE__ */ jsxs7("div", { className: "rs-review-detail-row", children: [
+      /* @__PURE__ */ jsx9("span", { children: "Receive" }),
+      /* @__PURE__ */ jsxs7("span", { className: "rs-review-detail-value", children: [
+        /* @__PURE__ */ jsx9("span", { children: receiveDisplay }),
+        /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9(TokenIcon, { symbol: receiveSymbol }) })
+      ] })
+    ] }),
+    /* @__PURE__ */ jsxs7("div", { className: "rs-review-detail-row", children: [
+      /* @__PURE__ */ jsx9("span", { children: "Fees" }),
+      /* @__PURE__ */ jsxs7("span", { className: "rs-review-detail-value", children: [
+        fee.display === null ? /* @__PURE__ */ jsx9("span", { className: "rs-skeleton rs-skeleton-fee", "aria-hidden": "true" }) : /* @__PURE__ */ jsx9("span", { style: fee.struck ? { textDecoration: "line-through" } : void 0, children: fee.display }),
+        fee.tooltip !== void 0 && /* @__PURE__ */ jsx9(Tooltip, { content: fee.tooltip, children: /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-info", "aria-label": "Fee info", children: /* @__PURE__ */ jsx9(InfoIcon, {}) }) })
+      ] })
+    ] })
+  ] });
+}
+ReviewDetails.displayName = "ReviewDetails";
+
+// src/core/permit2.ts
+var PERMIT2_ADDRESS = "0x000000000022D473030F116dDEE9F6B43aC78BA3";
+function sameAddress(a, b) {
+  return typeof a === "string" && a.toLowerCase() === b.toLowerCase();
+}
+function toBigInt(value) {
+  if (typeof value === "bigint") return value;
+  if (typeof value === "number" && Number.isSafeInteger(value)) {
+    return BigInt(value);
+  }
+  if (typeof value === "string" && value.length > 0) {
+    try {
+      return BigInt(value);
+    } catch {
+      return null;
+    }
+  }
+  return null;
+}
+function validatePermitTypedData(typedData, expected) {
+  if (typedData.primaryType !== "PermitTransferFrom") {
+    return {
+      ok: false,
+      reason: `unexpected primaryType "${typedData.primaryType}"`
+    };
+  }
+  const { domain, message } = typedData;
+  if (!sameAddress(domain?.verifyingContract, PERMIT2_ADDRESS)) {
+    return {
+      ok: false,
+      reason: `verifyingContract ${String(
+        domain?.verifyingContract
+      )} is not the canonical Permit2`
+    };
+  }
+  const domainChainId = toBigInt(domain?.chainId);
+  if (domainChainId === null || domainChainId !== BigInt(expected.chainId)) {
+    return {
+      ok: false,
+      reason: `domain.chainId ${String(
+        domain?.chainId
+      )} does not match source chain ${expected.chainId}`
+    };
+  }
+  if (!sameAddress(message?.spender, expected.spender)) {
+    return {
+      ok: false,
+      reason: `spender ${String(message?.spender)} is not the deposit account`
+    };
+  }
+  const permitted = message?.permitted;
+  if (!sameAddress(permitted?.token, expected.token)) {
+    return {
+      ok: false,
+      reason: `permitted.token ${String(
+        permitted?.token
+      )} is not the confirmed token`
+    };
+  }
+  const permittedAmount = toBigInt(permitted?.amount);
+  const expectedAmount = toBigInt(expected.amount);
+  if (permittedAmount === null || expectedAmount === null || permittedAmount !== expectedAmount) {
+    return {
+      ok: false,
+      reason: `permitted.amount ${String(
+        permitted?.amount
+      )} does not match the confirmed amount ${expected.amount}`
+    };
+  }
+  return { ok: true };
+}
+function sameInteger(a, b) {
+  const left = toBigInt(a);
+  const right = toBigInt(b);
+  return left !== null && right !== null && left === right;
+}
+function validatePreparedAuthorization(authorization, expected) {
+  const { typedData } = authorization;
+  const { domain, message } = typedData;
+  const domainChainId = toBigInt(domain?.chainId);
+  if (domainChainId === null || domainChainId !== BigInt(expected.chainId)) {
+    return {
+      ok: false,
+      reason: `domain.chainId ${String(
+        domain?.chainId
+      )} does not match source chain ${expected.chainId}`
+    };
+  }
+  if (authorization.kind === "permit2") {
+    const verdict = validatePermitTypedData(typedData, expected);
+    if (!verdict.ok) return verdict;
+    if (!sameInteger(message?.nonce, authorization.nonce) || !sameInteger(message?.deadline, authorization.deadline)) {
+      return { ok: false, reason: "Permit2 nonce or deadline mismatch" };
+    }
+    return { ok: true };
+  }
+  if (!sameAddress(domain?.verifyingContract, expected.token)) {
+    return {
+      ok: false,
+      reason: "token-native authorization verifies against the wrong token"
+    };
+  }
+  if (authorization.kind === "erc3009") {
+    if (typedData.primaryType !== "ReceiveWithAuthorization") {
+      return { ok: false, reason: "unexpected ERC-3009 primaryType" };
+    }
+    if (!sameAddress(message?.from, expected.owner) || !sameAddress(message?.to, expected.spender) || !sameInteger(message?.value, expected.amount)) {
+      return { ok: false, reason: "ERC-3009 transfer terms do not match" };
+    }
+    if (typeof message?.nonce !== "string" || message.nonce.toLowerCase() !== authorization.nonce.toLowerCase() || !sameInteger(message?.validAfter, authorization.validAfter) || !sameInteger(message?.validBefore, authorization.validBefore)) {
+      return {
+        ok: false,
+        reason: "ERC-3009 nonce or validity window mismatch"
+      };
+    }
+    return { ok: true };
+  }
+  if (typedData.primaryType !== "Permit") {
+    return { ok: false, reason: "unexpected ERC-2612 primaryType" };
+  }
+  if (!sameAddress(message?.owner, expected.owner) || !sameAddress(message?.spender, expected.spender) || !sameInteger(message?.value, expected.amount)) {
+    return { ok: false, reason: "ERC-2612 permit terms do not match" };
+  }
+  if (!sameInteger(message?.nonce, authorization.nonce) || !sameInteger(message?.deadline, authorization.deadline)) {
+    return { ok: false, reason: "ERC-2612 nonce or deadline mismatch" };
+  }
+  return { ok: true };
+}
+async function signTokenAuthorization(walletClient, ownerAddress, typedData) {
+  return walletClient.signTypedData({
+    account: walletClient.account ?? ownerAddress,
+    domain: typedData.domain,
+    types: typedData.types,
+    primaryType: typedData.primaryType,
+    message: typedData.message
+  });
+}
+
 // src/core/dapp-imports/types.ts
 function isDappImportAsset(asset) {
   return typeof asset.source === "string" && typeof asset.sourceLabel === "string" && "providerMetadata" in asset;
 }
 
 // src/components/steps/ConfirmStep.tsx
-import { jsx as jsx9, jsxs as jsxs7 } from "react/jsx-runtime";
+import { jsx as jsx10, jsxs as jsxs8 } from "react/jsx-runtime";
 function ConfirmStep({
   walletClient,
   address,
@@ -1402,15 +1609,27 @@ function ConfirmStep({
   service,
   setupRequestKey = "standalone",
   setupReady = true,
+  enableGaslessDeposit = false,
   onConfirm,
   onError,
   onDepositSubmitted,
+  onSubmittingChange,
   executeTransfer
 }) {
   const [isSubmitting, setIsSubmitting] = useState4(false);
   const [error, setError] = useState4(null);
   const [quoteResult, setQuoteResult] = useState4(null);
+  const [permitResult, setPermitResult] = useState4(null);
+  const [permitUnavailable, setPermitUnavailable] = useState4(null);
+  const [permitDisabled, setPermitDisabled] = useState4(false);
+  const [submissionUncertain, setSubmissionUncertain] = useState4(false);
   const hasAttemptedSwitch = useRef3(false);
+  const onSubmittingChangeRef = useRef3(onSubmittingChange);
+  onSubmittingChangeRef.current = onSubmittingChange;
+  useEffect4(() => {
+    onSubmittingChangeRef.current?.(isSubmitting);
+    return () => onSubmittingChangeRef.current?.(false);
+  }, [isSubmitting]);
   const chainMismatch = Boolean(
     walletClient?.chain?.id && walletClient.chain.id !== asset.chainId
   );
@@ -1444,6 +1663,16 @@ function ConfirmStep({
     quote?.fees
   );
   const directTransfer = sameRoute && !mustHaveQuote && !executeTransfer;
+  const permitEligible = enableGaslessDeposit && !isNativeAsset(asset) && !isDappImportAsset(asset) && !executeTransfer && !directTransfer && asset.chainId !== HYPERCORE_CHAIN_ID;
+  const permitRequestKey = JSON.stringify([
+    smartAccount.toLowerCase(),
+    asset.chainId,
+    asset.token.toLowerCase(),
+    asset.decimals,
+    amount,
+    address.toLowerCase()
+  ]);
+  const permit = permitEligible && !permitDisabled && permitResult?.requestKey === permitRequestKey ? permitResult.prepared : null;
   const receiveDisplay = (() => {
     if (directTransfer) return `${formattedSendAmount} ${asset.symbol}`;
     if (quote) {
@@ -1517,12 +1746,72 @@ function ConfirmStep({
     quoteSource.chainId,
     quoteSource.token
   ]);
+  useEffect4(() => {
+    setPermitResult(null);
+    setPermitUnavailable(null);
+    if (!permitEligible || permitDisabled) return;
+    let cancelled = false;
+    let units;
+    try {
+      units = parseUnits2(amount, asset.decimals);
+    } catch {
+      return;
+    }
+    if (units <= 0n) return;
+    service.preparePermitDeposit({
+      account: smartAccount,
+      sourceChain: `eip155:${asset.chainId}`,
+      token: asset.token,
+      amount: units.toString(),
+      owner: address
+    }).then((prepared) => {
+      if (cancelled || prepared === null) return;
+      if (!prepared.available) {
+        setPermitUnavailable(prepared.reason);
+        return;
+      }
+      const authorization = prepared.authorization;
+      const verdict = validatePreparedAuthorization(authorization, {
+        chainId: asset.chainId,
+        token: asset.token,
+        amount: units.toString(),
+        spender: smartAccount,
+        owner: address
+      });
+      if (!verdict.ok) {
+        console.warn(
+          `[deposit-modal] refusing gasless permit payload: ${verdict.reason}`
+        );
+        return;
+      }
+      setPermitUnavailable(null);
+      setPermitResult({
+        requestKey: permitRequestKey,
+        prepared: authorization
+      });
+    }).catch(() => {
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [
+    service,
+    permitEligible,
+    permitDisabled,
+    permitRequestKey,
+    smartAccount,
+    address,
+    asset.chainId,
+    asset.token,
+    asset.decimals,
+    amount
+  ]);
   const handleConfirm = async () => {
     if (!address || !walletClient) {
       setError("Wallet not connected");
       return;
     }
-    if (chainMismatch) {
+    if (chainMismatch && !permit) {
       setError(`Switch to ${sourceChainName} to sign`);
       return;
     }
@@ -1548,6 +1837,66 @@ function ConfirmStep({
     }
     setError(null);
     setIsSubmitting(true);
+    if (permit) {
+      let submitStarted = false;
+      try {
+        const signature = await signTokenAuthorization(
+          walletClient,
+          address,
+          permit.typedData
+        );
+        submitStarted = true;
+        const commonSubmit = {
+          account: smartAccount,
+          sourceChain: `eip155:${asset.chainId}`,
+          token: asset.token,
+          amount: amountUnits.toString(),
+          owner: address
+        };
+        const submitted = await service.submitPermitDeposit(
+          permit.kind === "erc3009" ? {
+            ...commonSubmit,
+            kind: permit.kind,
+            nonce: permit.nonce,
+            validAfter: permit.validAfter,
+            validBefore: permit.validBefore,
+            signature
+          } : {
+            ...commonSubmit,
+            kind: permit.kind,
+            nonce: permit.nonce,
+            deadline: permit.deadline,
+            signature
+          }
+        );
+        onConfirm(
+          submitted.txHash,
+          asset.chainId,
+          amountUnits.toString(),
+          asset.token,
+          // A permit deposit always routes through the smart account, so the
+          // previewed quote (when one resolved) describes the path taken.
+          quote ?? void 0,
+          {
+            smartAccount,
+            targetChain,
+            targetToken,
+            directTransfer: false,
+            sourceTxHashPending: true
+          }
+        );
+      } catch (err) {
+        const raw = err instanceof Error ? err.message : "Signing failed";
+        const safeToTransfer = !submitStarted || err instanceof PermitDepositSubmitError && err.safeToTransfer;
+        if (safeToTransfer) setPermitDisabled(true);
+        const message = safeToTransfer ? formatUserError(raw) : "Deposit submission status is uncertain. Check your activity before trying a transfer.";
+        setError(message);
+        onError?.(message, "PERMIT_ERROR", raw);
+      } finally {
+        setIsSubmitting(false);
+      }
+      return;
+    }
     try {
       const account = walletClient.account;
       const chain = walletClient.chain;
@@ -1592,104 +1941,173 @@ function ConfirmStep({
       );
     } catch (err) {
       const raw = err instanceof Error ? err.message : "Transfer failed";
-      const message = formatUserError(raw);
+      const uncertain = isSubmissionUncertain(err);
+      const message = uncertain ? "Deposit submission status is uncertain. Check your activity before trying again." : formatUserError(raw);
+      if (uncertain) setSubmissionUncertain(true);
       setError(message);
       onError?.(message, "TRANSFER_ERROR", raw);
     } finally {
       setIsSubmitting(false);
     }
   };
-  return /* @__PURE__ */ jsxs7("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs7("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx9(BodyHeader, { icon: /* @__PURE__ */ jsx9(WalletIcon, {}), title: "Review deposit" }),
-      /* @__PURE__ */ jsxs7("div", { className: "rs-review-details", children: [
-        /* @__PURE__ */ jsxs7("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx9("span", { children: "Source chain" }),
-          /* @__PURE__ */ jsxs7("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsx9("span", { children: sourceChainName }),
-            sourceChainIcon && /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9(CdnIcon, { src: sourceChainIcon }) })
-          ] })
-        ] }),
-        /* @__PURE__ */ jsxs7("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx9("span", { children: "Destination chain" }),
-          /* @__PURE__ */ jsxs7("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsx9("span", { children: targetChainName }),
-            targetChainIcon && /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9(CdnIcon, { src: targetChainIcon }) })
-          ] })
-        ] }),
-        /* @__PURE__ */ jsxs7("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx9("span", { children: "Estimated time" }),
-          /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-value", children: estimatedTimeDisplay })
-        ] }),
-        /* @__PURE__ */ jsxs7("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx9("span", { children: "You send" }),
-          /* @__PURE__ */ jsxs7("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsxs7("span", { children: [
-              formattedSendAmount,
-              " ",
-              asset.symbol
-            ] }),
-            /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9(TokenIcon, { symbol: asset.symbol }) })
-          ] })
-        ] }),
-        /* @__PURE__ */ jsxs7("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx9("span", { children: "Receive" }),
-          /* @__PURE__ */ jsxs7("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsx9("span", { children: receiveDisplay }),
-            /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9(TokenIcon, { symbol: targetSymbol }) })
-          ] })
-        ] }),
-        /* @__PURE__ */ jsxs7("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx9("span", { children: "Fees" }),
-          /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-value", children: feeDisplay === null ? /* @__PURE__ */ jsx9(
-            "span",
-            {
-              className: "rs-skeleton rs-skeleton-fee",
-              "aria-hidden": "true"
-            }
-          ) : /* @__PURE__ */ jsx9(
-            "span",
-            {
-              style: feesFullySponsored ? { textDecoration: "line-through" } : void 0,
-              children: feeDisplay
-            }
-          ) })
-        ] })
-      ] }),
-      error && /* @__PURE__ */ jsx9(Callout, { variant: "error", children: error }),
-      /* @__PURE__ */ jsx9(
+  return /* @__PURE__ */ jsxs8("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs8("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx10(BodyHeader, { icon: /* @__PURE__ */ jsx10(WalletIcon, {}), title: "Review deposit" }),
+      /* @__PURE__ */ jsx10(
+        ReviewDetails,
+        {
+          sourceChainName,
+          sourceChainIcon,
+          targetChainName,
+          targetChainIcon,
+          estimatedTime: estimatedTimeDisplay,
+          sendAmount: formattedSendAmount,
+          sendSymbol: asset.symbol,
+          receiveDisplay,
+          receiveSymbol: targetSymbol,
+          fee: { display: feeDisplay, struck: feesFullySponsored }
+        }
+      ),
+      error && /* @__PURE__ */ jsx10(Callout, { variant: "error", children: error }),
+      /* @__PURE__ */ jsx10(
         Button,
         {
           onClick: handleConfirm,
           loading: isSubmitting,
-          loadingText: "Submitting transaction...",
-          disabled: chainMismatch || !amount || Number(amount) <= 0 || // Fee-charging route: block until the authoritative quote resolves
-          // (covers both loading and an unavailable preview). Fee-free routes
-          // are unaffected — `mustHaveQuote` is false for them.
-          quote === null && mustHaveQuote,
+          loadingText: permit ? "Waiting for signature..." : "Submitting transaction...",
+          disabled: (
+            // An earlier send whose outcome is unknown. Never re-offered.
+            submissionUncertain || // Signing is off-chain, so a chain mismatch only blocks the
+            // transfer path.
+            chainMismatch && !permit || !amount || Number(amount) <= 0 || // Fee-charging route: block until the authoritative quote resolves
+            // (covers both loading and an unavailable preview). Fee-free routes
+            // are unaffected — `mustHaveQuote` is false for them.
+            quote === null && mustHaveQuote
+          ),
           fullWidth: true,
-          children: "Continue"
+          children: permit ? "Sign to deposit" : "Continue"
         }
-      )
+      ),
+      permit && /* @__PURE__ */ jsxs8("p", { className: "rs-gasless-note", children: [
+        "Gasless via",
+        " ",
+        permit.kind === "permit2" ? "Permit2" : permit.kind === "erc3009" ? "ERC-3009" : "ERC-2612",
+        " ",
+        "\u2014 sign, no transaction"
+      ] }),
+      !permit && permitEligible && permitUnavailable && /* @__PURE__ */ jsx10("p", { className: "rs-gasless-note", children: permitUnavailable === "permit2-approval-required" ? "Gasless unavailable until Permit2 is approved; Continue sends a token transaction." : "This wallet/token cannot use gasless authorization; Continue sends a token transaction." })
+    ] }),
+    /* @__PURE__ */ jsx10(PoweredBy, {})
+  ] });
+}
+
+// src/components/steps/QrReviewStep.tsx
+import { useEffect as useEffect5, useState as useState5 } from "react";
+import { parseUnits as parseUnits3 } from "viem";
+import { jsx as jsx11, jsxs as jsxs9 } from "react/jsx-runtime";
+function QrReviewStep({
+  smartAccount,
+  asset,
+  amount,
+  targetAmount,
+  targetTokenPriceUsd,
+  targetChain,
+  targetToken,
+  service,
+  onClose
+}) {
+  const [quote, setQuote] = useState5({ state: "loading", value: null });
+  const targetChainId = targetChainToChainId(targetChain);
+  const targetSymbol = getTargetTokenSymbol(targetToken, targetChainId);
+  useEffect5(() => {
+    let cancelled = false;
+    let units;
+    try {
+      units = parseUnits3(amount, asset.decimals);
+    } catch {
+      setQuote({ state: "unavailable", value: null });
+      return;
+    }
+    if (units <= 0n) {
+      setQuote({ state: "unavailable", value: null });
+      return;
+    }
+    setQuote({ state: "loading", value: null });
+    service.getQuotePreview({
+      account: smartAccount,
+      sourceChainId: asset.chainId,
+      sourceToken: asset.token,
+      amount: units.toString()
+    }).then((result) => {
+      if (cancelled) return;
+      setQuote(
+        result ? { state: "ready", value: result } : { state: "unavailable", value: null }
+      );
+    }).catch(() => {
+      if (!cancelled) setQuote({ state: "unavailable", value: null });
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [service, smartAccount, asset, amount]);
+  const formattedSendAmount = formatTokenAmount(Number(amount), asset.symbol) ?? amount;
+  const receiveDisplay = (() => {
+    if (quote.value) {
+      const quoted = formatQuotedReceive(quote.value.output, targetSymbol);
+      if (quoted !== void 0) return quoted;
+    }
+    const usdValue = Number(targetAmount);
+    const estimate = formatReceiveEstimate({
+      sourceAmount: Number.isFinite(Number(amount)) ? Number(amount) : void 0,
+      sourceSymbol: asset.symbol,
+      targetSymbol,
+      sourceAmountUsd: Number.isFinite(usdValue) && usdValue > 0 ? usdValue : void 0,
+      sourceTrusted: isRecognizedToken(asset.token, asset.chainId),
+      prices: targetTokenPriceUsd !== null && targetTokenPriceUsd > 0 ? { [targetSymbol.toUpperCase()]: targetTokenPriceUsd } : isDisplayStablecoinSymbol(targetSymbol) ? { [targetSymbol.toUpperCase()]: 1 } : {}
+    });
+    return estimate ?? targetSymbol;
+  })();
+  const estimatedTime = quote.value && Number.isFinite(quote.value.estimatedFillTimeSeconds) ? quote.value.estimatedFillTimeSeconds < 60 ? "< 1 min" : `~${Math.round(quote.value.estimatedFillTimeSeconds / 60)} min` : quote.state === "loading" ? "\u2026" : "\u2014";
+  const { display: quotedFee, struck } = quoteFeeRow(quote.value?.fees);
+  const feeDisplay = quote.state === "unavailable" ? "\u2014" : quotedFee;
+  return /* @__PURE__ */ jsxs9("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs9("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx11(BodyHeader, { icon: /* @__PURE__ */ jsx11(TransferCryptoIcon, {}), title: "Fee estimate" }),
+      /* @__PURE__ */ jsx11(
+        ReviewDetails,
+        {
+          sourceChainName: getChainName(asset.chainId),
+          sourceChainIcon: getChainIcon(asset.chainId),
+          targetChainName: getChainName(targetChainId),
+          targetChainIcon: getChainIcon(targetChainId),
+          estimatedTime,
+          sendAmount: formattedSendAmount,
+          sendSymbol: asset.symbol,
+          receiveDisplay,
+          receiveSymbol: targetSymbol,
+          fee: { display: feeDisplay, struck }
+        }
+      ),
+      /* @__PURE__ */ jsx11(Button, { onClick: onClose, fullWidth: true, children: "Close" })
     ] }),
-    /* @__PURE__ */ jsx9(PoweredBy, {})
+    /* @__PURE__ */ jsx11(PoweredBy, {})
   ] });
 }
+QrReviewStep.displayName = "QrReviewStep";
 
 // src/components/steps/DepositAddressStep.tsx
 import {
-  useState as useState6,
-  useEffect as useEffect6,
+  useState as useState7,
+  useEffect as useEffect7,
   useCallback as useCallback2,
   useRef as useRef5,
   useMemo as useMemo3,
   lazy,
   Suspense
 } from "react";
-import { formatUnits as formatUnits3 } from "viem";
 
 // src/components/steps/DepositAddressSkeleton.tsx
-import { jsx as jsx10, jsxs as jsxs8 } from "react/jsx-runtime";
+import { jsx as jsx12, jsxs as jsxs10 } from "react/jsx-runtime";
 var BASE_CHAIN_ID = 8453;
 function DepositAddressSkeleton({
   uiConfig
@@ -1700,32 +2118,32 @@ function DepositAddressSkeleton({
   const defaultToken = tokensForChain.includes("USDC") ? "USDC" : tokensForChain[0] ?? "USDC";
   const chainName = getChainName(defaultChainId);
   const chainIcon = getChainIcon(defaultChainId);
-  return /* @__PURE__ */ jsxs8("div", { className: "rs-screen", "aria-busy": "true", children: [
-    /* @__PURE__ */ jsx10("span", { className: "rs-sr-only", role: "status", children: "Preparing deposit details\u2026" }),
-    /* @__PURE__ */ jsxs8("div", { className: "rs-screen-body", children: [
-      /* @__PURE__ */ jsx10(BodyHeader, { icon: /* @__PURE__ */ jsx10(TransferCryptoIcon, {}), title: "Transfer crypto" }),
-      /* @__PURE__ */ jsxs8("div", { className: "rs-deposit-address-selectors", "aria-hidden": "true", children: [
-        /* @__PURE__ */ jsxs8("div", { className: "rs-deposit-address-dropdown", children: [
-          /* @__PURE__ */ jsx10("div", { className: "rs-deposit-address-dropdown-label", children: "Supported chain" }),
-          /* @__PURE__ */ jsxs8("div", { className: "rs-deposit-address-dropdown-trigger", children: [
-            /* @__PURE__ */ jsx10(
+  return /* @__PURE__ */ jsxs10("div", { className: "rs-screen", "aria-busy": "true", children: [
+    /* @__PURE__ */ jsx12("span", { className: "rs-sr-only", role: "status", children: "Preparing deposit details\u2026" }),
+    /* @__PURE__ */ jsxs10("div", { className: "rs-screen-body", children: [
+      /* @__PURE__ */ jsx12(BodyHeader, { icon: /* @__PURE__ */ jsx12(TransferCryptoIcon, {}), title: "Transfer crypto" }),
+      /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-selectors", "aria-hidden": "true", children: [
+        /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-dropdown", children: [
+          /* @__PURE__ */ jsx12("div", { className: "rs-deposit-address-dropdown-label", children: "Supported chain" }),
+          /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-dropdown-trigger", children: [
+            /* @__PURE__ */ jsx12(
               CdnIcon,
               {
                 src: chainIcon,
                 className: "rs-deposit-address-dropdown-icon"
               }
             ),
-            /* @__PURE__ */ jsx10("span", { children: chainName }),
-            /* @__PURE__ */ jsx10(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
+            /* @__PURE__ */ jsx12("span", { children: chainName }),
+            /* @__PURE__ */ jsx12(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs8("div", { className: "rs-deposit-address-dropdown", children: [
-          /* @__PURE__ */ jsxs8("div", { className: "rs-deposit-address-dropdown-label rs-deposit-address-dropdown-label--with-min", children: [
-            /* @__PURE__ */ jsx10("span", { children: "Supported token" }),
-            /* @__PURE__ */ jsxs8("span", { className: "rs-deposit-address-min", children: [
+        /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-dropdown", children: [
+          /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-dropdown-label rs-deposit-address-dropdown-label--with-min", children: [
+            /* @__PURE__ */ jsx12("span", { children: "Supported token" }),
+            /* @__PURE__ */ jsxs10("span", { className: "rs-deposit-address-min", children: [
               "Min.$",
               (uiConfig?.minDepositUsd ?? 0.1).toFixed(2),
-              /* @__PURE__ */ jsx10(Tooltip, { content: "Minimum deposit amount required for the selected chain.", children: /* @__PURE__ */ jsx10(
+              /* @__PURE__ */ jsx12(Tooltip, { content: "Minimum deposit amount required for the selected chain.", children: /* @__PURE__ */ jsx12(
                 InfoIcon,
                 {
                   className: "rs-deposit-address-min-icon",
@@ -1734,74 +2152,55 @@ function DepositAddressSkeleton({
               ) })
             ] })
           ] }),
-          /* @__PURE__ */ jsxs8("div", { className: "rs-deposit-address-dropdown-trigger", children: [
-            /* @__PURE__ */ jsx10(
+          /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-dropdown-trigger", children: [
+            /* @__PURE__ */ jsx12(
               TokenIcon,
               {
                 symbol: defaultToken,
                 className: "rs-deposit-address-dropdown-icon"
               }
             ),
-            /* @__PURE__ */ jsx10("span", { children: defaultToken }),
-            /* @__PURE__ */ jsx10(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
+            /* @__PURE__ */ jsx12("span", { children: defaultToken }),
+            /* @__PURE__ */ jsx12(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
           ] })
         ] })
       ] }),
-      /* @__PURE__ */ jsxs8(
+      /* @__PURE__ */ jsxs10(
         "div",
         {
           style: { display: "flex", flexDirection: "column", gap: 4, width: "100%" },
           children: [
-            /* @__PURE__ */ jsxs8("div", { className: "rs-deposit-address-well", children: [
-              /* @__PURE__ */ jsx10("div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ jsx10("div", { className: "rs-skeleton rs-skeleton-qr", "aria-hidden": "true" }) }),
-              /* @__PURE__ */ jsx10("div", { className: "rs-skeleton rs-skeleton-address", "aria-hidden": "true" })
+            /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-well", children: [
+              /* @__PURE__ */ jsx12("div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ jsx12("div", { className: "rs-skeleton rs-skeleton-qr", "aria-hidden": "true" }) }),
+              /* @__PURE__ */ jsx12("div", { className: "rs-skeleton rs-skeleton-address", "aria-hidden": "true" })
             ] }),
-            /* @__PURE__ */ jsxs8(
-              "button",
-              {
-                type: "button",
-                className: "rs-deposit-address-copy",
-                disabled: true,
-                "aria-hidden": "true",
-                children: [
-                  /* @__PURE__ */ jsx10(CopyIcon, {}),
-                  "Copy address"
-                ]
-              }
-            )
+            /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-actions", "aria-hidden": "true", children: [
+              /* @__PURE__ */ jsxs10("button", { type: "button", className: "rs-deposit-address-copy", disabled: true, children: [
+                /* @__PURE__ */ jsx12(CopyIcon, {}),
+                "Copy address"
+              ] }),
+              /* @__PURE__ */ jsx12(
+                "button",
+                {
+                  type: "button",
+                  className: "rs-deposit-address-copy rs-deposit-address-review",
+                  disabled: true,
+                  children: "Estimate fees"
+                }
+              )
+            ] })
           ]
         }
-      ),
-      /* @__PURE__ */ jsx10("div", { className: "rs-price-impact", "aria-hidden": "true", children: /* @__PURE__ */ jsxs8("div", { className: "rs-price-impact-header", children: [
-        /* @__PURE__ */ jsxs8("span", { className: "rs-price-impact-header-left", children: [
-          /* @__PURE__ */ jsx10("span", { className: "rs-price-impact-label", children: "Price impact" }),
-          /* @__PURE__ */ jsx10("span", { className: "rs-price-impact-label", children: /* @__PURE__ */ jsx10("strong", { children: "0.00%" }) }),
-          /* @__PURE__ */ jsx10(
-            Tooltip,
-            {
-              className: "rs-price-impact-info",
-              content: "Price impact is the difference between expected and execution price, due to trade size and liquidity.",
-              children: /* @__PURE__ */ jsx10(InfoIcon, { "aria-hidden": "true" })
-            }
-          )
-        ] }),
-        /* @__PURE__ */ jsx10(
-          ChevronDownIcon,
-          {
-            className: "rs-price-impact-chevron",
-            "aria-hidden": "true"
-          }
-        )
-      ] }) })
+      )
     ] }),
-    /* @__PURE__ */ jsx10(PoweredBy, {})
+    /* @__PURE__ */ jsx12(PoweredBy, {})
   ] });
 }
 DepositAddressSkeleton.displayName = "DepositAddressSkeleton";
 
 // src/components/ui/DepositNotification.tsx
-import { useState as useState5, useEffect as useEffect5, useRef as useRef4, useCallback } from "react";
-import { jsx as jsx11, jsxs as jsxs9 } from "react/jsx-runtime";
+import { useState as useState6, useEffect as useEffect6, useRef as useRef4, useCallback } from "react";
+import { jsx as jsx13, jsxs as jsxs11 } from "react/jsx-runtime";
 var INITIAL_POLL_INTERVAL = 3e3;
 var MAX_POLL_INTERVAL = 3e4;
 var BACKOFF_MULTIPLIER = 1.5;
@@ -1858,7 +2257,7 @@ function formatBridgeFailedMessage(event) {
   }
   return "Bridge failed";
 }
-var txLinkIcon = /* @__PURE__ */ jsx11(ExternalLinkIcon, { className: "rs-deposit-notification-link-icon" });
+var txLinkIcon = /* @__PURE__ */ jsx13(ExternalLinkIcon, { className: "rs-deposit-notification-link-icon" });
 function DepositNotification({
   deposit,
   smartAccount,
@@ -1879,14 +2278,14 @@ function DepositNotification({
     detectedAt,
     directTransfer
   } = deposit;
-  const [status, setStatus] = useState5(
+  const [status, setStatus] = useState6(
     directTransfer ? "complete" : "processing"
   );
-  const [expanded, setExpanded] = useState5(false);
-  const [completedAt, setCompletedAt] = useState5(
+  const [expanded, setExpanded] = useState6(false);
+  const [completedAt, setCompletedAt] = useState6(
     directTransfer ? detectedAt : null
   );
-  const [destinationTxHash, setDestinationTxHash] = useState5(
+  const [destinationTxHash, setDestinationTxHash] = useState6(
     null
   );
   const pollIntervalRef = useRef4(INITIAL_POLL_INTERVAL);
@@ -1930,7 +2329,7 @@ function DepositNotification({
     },
     [onFailedRef, txHash]
   );
-  useEffect5(() => {
+  useEffect6(() => {
     if (directTransfer) {
       handleComplete(void 0);
       return;
@@ -1997,7 +2396,7 @@ function DepositNotification({
   const destExplorerUrl = destinationTxHash ? explorerTxUrl(targetChainToChainId(targetChain), destinationTxHash) : null;
   const title = status === "complete" ? "Deposit completed" : status === "failed" ? "Deposit failed" : "Deposit received and processing\u2026";
   const subtitle = status === "complete" ? "Your deposit has been credited to your account." : status === "failed" ? "Your deposit could not be processed." : "Your deposit will be credited to your account shortly.";
-  const statusIcon = status === "complete" ? /* @__PURE__ */ jsx11("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--complete", children: /* @__PURE__ */ jsx11(CheckIcon, {}) }) : status === "failed" ? /* @__PURE__ */ jsx11("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--failed", children: /* @__PURE__ */ jsx11(CloseIcon, {}) }) : /* @__PURE__ */ jsx11("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--processing", children: /* @__PURE__ */ jsxs9(
+  const statusIcon = status === "complete" ? /* @__PURE__ */ jsx13("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--complete", children: /* @__PURE__ */ jsx13(CheckIcon, {}) }) : status === "failed" ? /* @__PURE__ */ jsx13("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--failed", children: /* @__PURE__ */ jsx13(CloseIcon, {}) }) : /* @__PURE__ */ jsx13("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--processing", children: /* @__PURE__ */ jsxs11(
     "svg",
     {
       className: "rs-deposit-notification-spinner",
@@ -2006,7 +2405,7 @@ function DepositNotification({
       xmlns: "http://www.w3.org/2000/svg",
       "aria-hidden": "true",
       children: [
-        /* @__PURE__ */ jsx11(
+        /* @__PURE__ */ jsx13(
           "path",
           {
             className: "rs-deposit-notification-spinner-track",
@@ -2016,7 +2415,7 @@ function DepositNotification({
             strokeLinecap: "round"
           }
         ),
-        /* @__PURE__ */ jsx11(
+        /* @__PURE__ */ jsx13(
           "path",
           {
             className: "rs-deposit-notification-spinner-head",
@@ -2030,31 +2429,31 @@ function DepositNotification({
     }
   ) });
   const showClose = status !== "processing";
-  return /* @__PURE__ */ jsxs9(
+  return /* @__PURE__ */ jsxs11(
     "div",
     {
       className: `rs-deposit-notification rs-deposit-notification--${status} ${expanded ? "rs-deposit-notification--expanded" : ""}`,
       children: [
-        /* @__PURE__ */ jsxs9("div", { className: "rs-deposit-notification-header", children: [
-          /* @__PURE__ */ jsx11("div", { className: "rs-deposit-notification-icon", children: statusIcon }),
-          /* @__PURE__ */ jsxs9("div", { className: "rs-deposit-notification-content", children: [
-            /* @__PURE__ */ jsxs9("div", { className: "rs-deposit-notification-title-row", children: [
-              /* @__PURE__ */ jsx11("span", { className: "rs-deposit-notification-title", children: title }),
-              showClose && /* @__PURE__ */ jsx11(
+        /* @__PURE__ */ jsxs11("div", { className: "rs-deposit-notification-header", children: [
+          /* @__PURE__ */ jsx13("div", { className: "rs-deposit-notification-icon", children: statusIcon }),
+          /* @__PURE__ */ jsxs11("div", { className: "rs-deposit-notification-content", children: [
+            /* @__PURE__ */ jsxs11("div", { className: "rs-deposit-notification-title-row", children: [
+              /* @__PURE__ */ jsx13("span", { className: "rs-deposit-notification-title", children: title }),
+              showClose && /* @__PURE__ */ jsx13(
                 "button",
                 {
                   type: "button",
                   className: "rs-deposit-notification-close",
                   onClick: () => onDismiss(deposit.id),
                   "aria-label": "Dismiss",
-                  children: /* @__PURE__ */ jsx11(CloseIcon, {})
+                  children: /* @__PURE__ */ jsx13(CloseIcon, {})
                 }
               )
             ] }),
-            /* @__PURE__ */ jsx11("div", { className: "rs-deposit-notification-subtitle", children: subtitle })
+            /* @__PURE__ */ jsx13("div", { className: "rs-deposit-notification-subtitle", children: subtitle })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs9(
+        /* @__PURE__ */ jsxs11(
           "button",
           {
             type: "button",
@@ -2062,15 +2461,15 @@ function DepositNotification({
             onClick: () => setExpanded(!expanded),
             "aria-expanded": expanded,
             children: [
-              /* @__PURE__ */ jsx11("span", { children: expanded ? "See less details" : "See more details" }),
-              /* @__PURE__ */ jsx11(ChevronDownIcon, { className: "rs-deposit-notification-toggle-chevron" })
+              /* @__PURE__ */ jsx13("span", { children: expanded ? "See less details" : "See more details" }),
+              /* @__PURE__ */ jsx13(ChevronDownIcon, { className: "rs-deposit-notification-toggle-chevron" })
             ]
           }
         ),
-        expanded && /* @__PURE__ */ jsxs9("div", { className: "rs-deposit-notification-details", children: [
-          /* @__PURE__ */ jsxs9("div", { className: "rs-deposit-notification-row", children: [
-            /* @__PURE__ */ jsx11("span", { className: "rs-deposit-notification-label", children: "Deposit tx" }),
-            /* @__PURE__ */ jsx11("span", { className: "rs-deposit-notification-value", children: sourceExplorerUrl ? /* @__PURE__ */ jsxs9(
+        expanded && /* @__PURE__ */ jsxs11("div", { className: "rs-deposit-notification-details", children: [
+          /* @__PURE__ */ jsxs11("div", { className: "rs-deposit-notification-row", children: [
+            /* @__PURE__ */ jsx13("span", { className: "rs-deposit-notification-label", children: "Deposit tx" }),
+            /* @__PURE__ */ jsx13("span", { className: "rs-deposit-notification-value", children: sourceExplorerUrl ? /* @__PURE__ */ jsxs11(
               "a",
               {
                 href: sourceExplorerUrl,
@@ -2084,9 +2483,9 @@ function DepositNotification({
               }
             ) : truncateHash(txHash) })
           ] }),
-          destinationTxHash && /* @__PURE__ */ jsxs9("div", { className: "rs-deposit-notification-row", children: [
-            /* @__PURE__ */ jsx11("span", { className: "rs-deposit-notification-label", children: "Completion tx" }),
-            /* @__PURE__ */ jsx11("span", { className: "rs-deposit-notification-value", children: destExplorerUrl ? /* @__PURE__ */ jsxs9(
+          destinationTxHash && /* @__PURE__ */ jsxs11("div", { className: "rs-deposit-notification-row", children: [
+            /* @__PURE__ */ jsx13("span", { className: "rs-deposit-notification-label", children: "Completion tx" }),
+            /* @__PURE__ */ jsx13("span", { className: "rs-deposit-notification-value", children: destExplorerUrl ? /* @__PURE__ */ jsxs11(
               "a",
               {
                 href: destExplorerUrl,
@@ -2100,13 +2499,13 @@ function DepositNotification({
               }
             ) : truncateHash(destinationTxHash) })
           ] }),
-          /* @__PURE__ */ jsxs9("div", { className: "rs-deposit-notification-row", children: [
-            /* @__PURE__ */ jsx11("span", { className: "rs-deposit-notification-label", children: "Order submitted" }),
-            /* @__PURE__ */ jsx11("span", { className: "rs-deposit-notification-value", children: formatTimestamp(detectedAt) })
+          /* @__PURE__ */ jsxs11("div", { className: "rs-deposit-notification-row", children: [
+            /* @__PURE__ */ jsx13("span", { className: "rs-deposit-notification-label", children: "Order submitted" }),
+            /* @__PURE__ */ jsx13("span", { className: "rs-deposit-notification-value", children: formatTimestamp(detectedAt) })
           ] }),
-          completedAt && /* @__PURE__ */ jsxs9("div", { className: "rs-deposit-notification-row", children: [
-            /* @__PURE__ */ jsx11("span", { className: "rs-deposit-notification-label", children: "Order filled" }),
-            /* @__PURE__ */ jsx11("span", { className: "rs-deposit-notification-value", children: formatTimestamp(completedAt) })
+          completedAt && /* @__PURE__ */ jsxs11("div", { className: "rs-deposit-notification-row", children: [
+            /* @__PURE__ */ jsx13("span", { className: "rs-deposit-notification-label", children: "Order filled" }),
+            /* @__PURE__ */ jsx13("span", { className: "rs-deposit-notification-value", children: formatTimestamp(completedAt) })
           ] })
         ] })
       ]
@@ -2115,9 +2514,9 @@ function DepositNotification({
 }
 
 // src/components/steps/DepositAddressStep.tsx
-import { jsx as jsx12, jsxs as jsxs10 } from "react/jsx-runtime";
+import { jsx as jsx14, jsxs as jsxs12 } from "react/jsx-runtime";
 var QRCode = lazy(
-  () => import("./QRCode-WUC652SH.mjs").then((m) => ({ default: m.QRCode }))
+  () => import("./QRCode-5RGIZZHL.mjs").then((m) => ({ default: m.QRCode }))
 );
 var POLL_INTERVAL_MS = 4e3;
 function isRecord(value) {
@@ -2204,20 +2603,31 @@ function computeTokensForChain(chainId, topTokens, catalogChain) {
   if (fromBackend) return fromBackend;
   return Array.isArray(catalogChain?.supportedTokens) ? catalogChain.supportedTokens.map((t) => t.symbol) : [];
 }
-function resolveSourceTokenAddress(symbol, chainId, topTokens, catalogChain) {
-  const top = topTokens?.[String(chainId)]?.find((t) => t.symbol === symbol);
-  if (top?.address) return top.address;
-  const fromRegistry = getTokenAddress(symbol, chainId);
-  if (fromRegistry) return fromRegistry;
-  return Array.isArray(catalogChain?.supportedTokens) ? catalogChain.supportedTokens.find((t) => t.symbol === symbol)?.address : void 0;
+function selectionAsAsset(chainId, symbol, topTokens, catalogChain) {
+  if (typeof chainId !== "number" || !symbol) return void 0;
+  const fromShortlist = topTokens?.[String(chainId)]?.find(
+    (t) => t.symbol === symbol
+  );
+  const fromCatalog = Array.isArray(catalogChain?.supportedTokens) ? catalogChain.supportedTokens.find((t) => t.symbol === symbol) : void 0;
+  const address = fromShortlist?.address ?? fromCatalog?.address;
+  const decimals = fromShortlist?.decimals ?? fromCatalog?.decimals;
+  if (!address || decimals === void 0) return void 0;
+  return {
+    id: `qr-${chainId}-${symbol}`,
+    chainId,
+    token: address,
+    symbol,
+    name: symbol,
+    decimals
+  };
 }
 function TokenGlyph({ symbol }) {
-  return /* @__PURE__ */ jsx12(
+  return /* @__PURE__ */ jsx14(
     TokenIcon,
     {
       symbol,
       className: "rs-deposit-address-dropdown-icon",
-      fallback: /* @__PURE__ */ jsx12("span", { className: "rs-deposit-address-dropdown-icon rs-deposit-address-dropdown-icon--fallback", children: symbol.slice(0, 3) })
+      fallback: /* @__PURE__ */ jsx14("span", { className: "rs-deposit-address-dropdown-icon rs-deposit-address-dropdown-icon--fallback", children: symbol.slice(0, 3) })
     }
   );
 }
@@ -2233,15 +2643,17 @@ function DepositAddressStep({
   targetChain,
   targetToken,
   uiConfig,
+  initialSource,
   onDepositSubmitted,
   onDepositComplete,
   onDepositFailed,
   onCopyAddress,
+  onReviewDeposit,
   onError
 }) {
   const hasSolana = Boolean(solanaDepositAddress);
-  const [topTokens, setTopTokens] = useState6(null);
-  useEffect6(() => {
+  const [topTokens, setTopTokens] = useState7(null);
+  useEffect7(() => {
     let active = true;
     setTopTokens(null);
     service.getTopTokens().then((t) => {
@@ -2276,96 +2688,63 @@ function DepositAddressStep({
     );
   }, [evmChainIds, hasSolana, topTokens, catalogFor]);
   const preferredChainId = (options) => options.includes(BASE_CHAIN_ID2) ? BASE_CHAIN_ID2 : options[0] ?? BASE_CHAIN_ID2;
-  const [sourceChainId, setSourceChainId] = useState6(() => preferredChainId(chainOptions));
-  const chainChosenByUser = useRef5(false);
-  useEffect6(() => {
+  const [sourceChainId, setSourceChainId] = useState7(() => initialSource?.chainId ?? preferredChainId(chainOptions));
+  const chainChosenByUser = useRef5(initialSource !== void 0);
+  const pendingChainRef = useRef5(initialSource?.chainId);
+  useEffect7(() => {
     if (chainOptions.length === 0) return;
+    const pendingChain = pendingChainRef.current;
+    if (pendingChain !== void 0) {
+      if (chainOptions.includes(pendingChain)) {
+        pendingChainRef.current = void 0;
+        setSourceChainId(pendingChain);
+        return;
+      }
+      if (catalogLoading || topTokens === null) return;
+      pendingChainRef.current = void 0;
+    }
     const stale = chainChosenByUser.current ? !chainOptions.includes(sourceChainId) : sourceChainId !== preferredChainId(chainOptions);
     if (stale) setSourceChainId(preferredChainId(chainOptions));
-  }, [chainOptions, sourceChainId]);
+  }, [chainOptions, sourceChainId, catalogLoading, topTokens]);
   const isSolana = sourceChainId === "solana";
   const isHyperCore = sourceChainId === "hypercore";
   const tokensForChain = useMemo3(
     () => computeTokensForChain(sourceChainId, topTokens, catalogFor(sourceChainId)),
     [sourceChainId, topTokens, catalogFor]
   );
-  const defaultToken = pickFallbackToken(tokensForChain, "USDC");
-  const [sourceTokenSymbol, setSourceTokenSymbol] = useState6(defaultToken);
-  useEffect6(() => {
-    if (!tokensForChain.includes(sourceTokenSymbol)) {
-      setSourceTokenSymbol(pickFallbackToken(tokensForChain, sourceTokenSymbol));
+  const defaultToken = pickFallbackToken(
+    tokensForChain,
+    initialSource?.symbol ?? "USDC"
+  );
+  const [sourceTokenSymbol, setSourceTokenSymbol] = useState7(defaultToken);
+  const pendingTokenRef = useRef5(initialSource?.symbol);
+  useEffect7(() => {
+    if (tokensForChain.includes(sourceTokenSymbol)) {
+      pendingTokenRef.current = void 0;
+      return;
+    }
+    const pending = pendingTokenRef.current;
+    if (pending && tokensForChain.includes(pending)) {
+      pendingTokenRef.current = void 0;
+      setSourceTokenSymbol(pending);
+      return;
     }
+    const next = pickFallbackToken(tokensForChain, sourceTokenSymbol);
+    if (next) pendingTokenRef.current = void 0;
+    setSourceTokenSymbol(next);
   }, [tokensForChain, sourceTokenSymbol]);
-  const [copied, setCopied] = useState6(false);
-  const [pollingError, setPollingError] = useState6(null);
-  const [chainDropdownOpen, setChainDropdownOpen] = useState6(false);
-  const [tokenDropdownOpen, setTokenDropdownOpen] = useState6(false);
-  const [priceImpactExpanded, setPriceImpactExpanded] = useState6(false);
+  const [copied, setCopied] = useState7(false);
+  const [pollingError, setPollingError] = useState7(null);
+  const [chainDropdownOpen, setChainDropdownOpen] = useState7(false);
+  const [tokenDropdownOpen, setTokenDropdownOpen] = useState7(false);
   const chainDropdownRef = useRef5(null);
   const tokenDropdownRef = useRef5(null);
-  const [notifications, setNotifications] = useState6([]);
+  const [notifications, setNotifications] = useState7([]);
   const isTrackingRef = useRef5(false);
   const baselineTxHashRef = useRef5(void 0);
   const notificationIdRef = useRef5(0);
-  const [liquidityHelper, setLiquidityHelper] = useState6({
-    kind: "idle"
-  });
-  useEffect6(() => {
-    if (isSolana || isHyperCore) {
-      setLiquidityHelper({ kind: "idle" });
-      return;
-    }
-    const sourceTokenAddress = resolveSourceTokenAddress(
-      sourceTokenSymbol,
-      sourceChainId,
-      topTokens,
-      catalogFor(sourceChainId)
-    );
-    if (!sourceTokenAddress) {
-      setLiquidityHelper({ kind: "idle" });
-      return;
-    }
-    let cancelled = false;
-    setLiquidityHelper({ kind: "loading" });
-    service.checkLiquidity({
-      sourceChainId,
-      sourceToken: sourceTokenAddress,
-      destinationChainId: targetChainToCaip2(targetChain),
-      destinationToken: targetToken,
-      amount: "1"
-    }).then((result) => {
-      if (cancelled) return;
-      if (result.unlimited) {
-        setLiquidityHelper({ kind: "unlimited" });
-      } else if (result.maxAmount === null) {
-        setLiquidityHelper({ kind: "unavailable" });
-      } else {
-        setLiquidityHelper({
-          kind: "max",
-          maxAmount: result.maxAmount,
-          decimals: result.decimals,
-          symbol: result.symbol || sourceTokenSymbol
-        });
-      }
-    }).catch(() => {
-      if (cancelled) return;
-      setLiquidityHelper({ kind: "error" });
-    });
-    return () => {
-      cancelled = true;
-    };
-  }, [
-    isSolana,
-    isHyperCore,
-    sourceChainId,
-    sourceTokenSymbol,
-    targetChain,
-    targetToken,
-    service,
-    topTokens
-  ]);
   const displayAddress = isSolana && solanaDepositAddress ? solanaDepositAddress : smartAccount;
-  useEffect6(() => {
+  useEffect7(() => {
     if (!chainDropdownOpen && !tokenDropdownOpen) return;
     function handlePointerDown(event) {
       const target = event.target;
@@ -2430,7 +2809,7 @@ function DepositAddressStep({
   targetChainRef.current = targetChain;
   const targetTokenRef = useRef5(targetToken);
   targetTokenRef.current = targetToken;
-  useEffect6(() => {
+  useEffect7(() => {
     baselineTxHashRef.current = void 0;
     isTrackingRef.current = false;
     let timeoutId;
@@ -2546,20 +2925,26 @@ function DepositAddressStep({
     setNotifications((prev) => prev.filter((n) => n.id !== id));
   }, []);
   const qrIconSrc = catalogFor(sourceChainId)?.iconUrl ?? getChainIcon(sourceChainId);
+  const reviewAsset = selectionAsAsset(
+    sourceChainId,
+    sourceTokenSymbol,
+    topTokens,
+    catalogFor(sourceChainId)
+  );
   if (chainOptions.length === 0) {
-    if (catalogLoading) return /* @__PURE__ */ jsx12(DepositAddressSkeleton, { uiConfig });
-    return /* @__PURE__ */ jsx12("div", { className: "rs-screen", children: /* @__PURE__ */ jsxs10("div", { className: "rs-screen-body", children: [
-      /* @__PURE__ */ jsx12(BodyHeader, { icon: /* @__PURE__ */ jsx12(TransferCryptoIcon, {}), title: "Transfer crypto" }),
-      /* @__PURE__ */ jsx12(Callout, { variant: "error", children: "Supported chains are unavailable right now, so there is no deposit address to show. Close and try again in a moment." })
+    if (catalogLoading) return /* @__PURE__ */ jsx14(DepositAddressSkeleton, { uiConfig });
+    return /* @__PURE__ */ jsx14("div", { className: "rs-screen", children: /* @__PURE__ */ jsxs12("div", { className: "rs-screen-body", children: [
+      /* @__PURE__ */ jsx14(BodyHeader, { icon: /* @__PURE__ */ jsx14(TransferCryptoIcon, {}), title: "Transfer crypto" }),
+      /* @__PURE__ */ jsx14(Callout, { variant: "error", children: "Supported chains are unavailable right now, so there is no deposit address to show. Close and try again in a moment." })
     ] }) });
   }
-  return /* @__PURE__ */ jsxs10("div", { className: "rs-screen rs-step--with-notifications", children: [
-    /* @__PURE__ */ jsxs10("div", { className: "rs-screen-body", children: [
-      /* @__PURE__ */ jsx12(BodyHeader, { icon: /* @__PURE__ */ jsx12(TransferCryptoIcon, {}), title: "Transfer crypto" }),
-      /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-selectors", children: [
-        /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-dropdown", ref: chainDropdownRef, children: [
-          /* @__PURE__ */ jsx12("div", { className: "rs-deposit-address-dropdown-label", children: "Supported chain" }),
-          /* @__PURE__ */ jsxs10(
+  return /* @__PURE__ */ jsxs12("div", { className: "rs-screen rs-step--with-notifications", children: [
+    /* @__PURE__ */ jsxs12("div", { className: "rs-screen-body", children: [
+      /* @__PURE__ */ jsx14(BodyHeader, { icon: /* @__PURE__ */ jsx14(TransferCryptoIcon, {}), title: "Transfer crypto" }),
+      /* @__PURE__ */ jsxs12("div", { className: "rs-deposit-address-selectors", children: [
+        /* @__PURE__ */ jsxs12("div", { className: "rs-deposit-address-dropdown", ref: chainDropdownRef, children: [
+          /* @__PURE__ */ jsx14("div", { className: "rs-deposit-address-dropdown-label", children: "Supported chain" }),
+          /* @__PURE__ */ jsxs12(
             "button",
             {
               type: "button",
@@ -2570,45 +2955,45 @@ function DepositAddressStep({
                 setTokenDropdownOpen(false);
               },
               children: [
-                /* @__PURE__ */ jsx12(
+                /* @__PURE__ */ jsx14(
                   CdnIcon,
                   {
                     src: catalogFor(sourceChainId)?.iconUrl ?? getChainIcon(sourceChainId),
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx12("span", { children: chainLabel(sourceChainId, catalogFor(sourceChainId)) }),
-                /* @__PURE__ */ jsx12(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
+                /* @__PURE__ */ jsx14("span", { children: chainLabel(sourceChainId, catalogFor(sourceChainId)) }),
+                /* @__PURE__ */ jsx14(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
               ]
             }
           ),
-          chainDropdownOpen && /* @__PURE__ */ jsx12("div", { className: "rs-deposit-address-dropdown-menu", children: chainOptions.map((chainId) => /* @__PURE__ */ jsxs10(
+          chainDropdownOpen && /* @__PURE__ */ jsx14("div", { className: "rs-deposit-address-dropdown-menu", children: chainOptions.map((chainId) => /* @__PURE__ */ jsxs12(
             "button",
             {
               type: "button",
               className: `rs-deposit-address-dropdown-item ${chainId === sourceChainId ? "rs-deposit-address-dropdown-item--active" : ""}`,
               onClick: () => handleSelectChain(chainId),
               children: [
-                /* @__PURE__ */ jsx12(
+                /* @__PURE__ */ jsx14(
                   CdnIcon,
                   {
                     src: catalogFor(chainId)?.iconUrl ?? getChainIcon(chainId),
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx12("span", { children: chainLabel(chainId, catalogFor(chainId)) })
+                /* @__PURE__ */ jsx14("span", { children: chainLabel(chainId, catalogFor(chainId)) })
               ]
             },
             String(chainId)
           )) })
         ] }),
-        /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-dropdown", ref: tokenDropdownRef, children: [
-          /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-dropdown-label rs-deposit-address-dropdown-label--with-min", children: [
-            /* @__PURE__ */ jsx12("span", { children: "Supported token" }),
-            /* @__PURE__ */ jsxs10("span", { className: "rs-deposit-address-min", children: [
+        /* @__PURE__ */ jsxs12("div", { className: "rs-deposit-address-dropdown", ref: tokenDropdownRef, children: [
+          /* @__PURE__ */ jsxs12("div", { className: "rs-deposit-address-dropdown-label rs-deposit-address-dropdown-label--with-min", children: [
+            /* @__PURE__ */ jsx14("span", { children: "Supported token" }),
+            /* @__PURE__ */ jsxs12("span", { className: "rs-deposit-address-min", children: [
               "Min.$",
               (isHyperCoreDestination(targetChain) || isHyperCore ? Math.max(HYPERCORE_MIN_DEPOSIT_USD, uiConfig?.minDepositUsd ?? 0) : uiConfig?.minDepositUsd ?? 0.1).toFixed(2),
-              /* @__PURE__ */ jsx12(Tooltip, { content: "Minimum deposit amount required for the selected chain.", children: /* @__PURE__ */ jsx12(
+              /* @__PURE__ */ jsx14(Tooltip, { content: "Minimum deposit amount required for the selected chain.", children: /* @__PURE__ */ jsx14(
                 InfoIcon,
                 {
                   className: "rs-deposit-address-min-icon",
@@ -2617,7 +3002,7 @@ function DepositAddressStep({
               ) })
             ] })
           ] }),
-          /* @__PURE__ */ jsxs10(
+          /* @__PURE__ */ jsxs12(
             "button",
             {
               type: "button",
@@ -2628,13 +3013,13 @@ function DepositAddressStep({
                 setChainDropdownOpen(false);
               },
               children: [
-                /* @__PURE__ */ jsx12(TokenGlyph, { symbol: sourceTokenSymbol }),
-                /* @__PURE__ */ jsx12("span", { children: sourceTokenSymbol }),
-                /* @__PURE__ */ jsx12(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
+                /* @__PURE__ */ jsx14(TokenGlyph, { symbol: sourceTokenSymbol }),
+                /* @__PURE__ */ jsx14("span", { children: sourceTokenSymbol }),
+                /* @__PURE__ */ jsx14(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
               ]
             }
           ),
-          tokenDropdownOpen && /* @__PURE__ */ jsx12("div", { className: "rs-deposit-address-dropdown-menu", children: tokensForChain.map((symbol) => /* @__PURE__ */ jsxs10(
+          tokenDropdownOpen && /* @__PURE__ */ jsx14("div", { className: "rs-deposit-address-dropdown-menu", children: tokensForChain.map((symbol) => /* @__PURE__ */ jsxs12(
             "button",
             {
               type: "button",
@@ -2644,120 +3029,58 @@ function DepositAddressStep({
                 setTokenDropdownOpen(false);
               },
               children: [
-                /* @__PURE__ */ jsx12(TokenGlyph, { symbol }),
-                /* @__PURE__ */ jsx12("span", { children: symbol })
+                /* @__PURE__ */ jsx14(TokenGlyph, { symbol }),
+                /* @__PURE__ */ jsx14("span", { children: symbol })
               ]
             },
             symbol
           )) })
         ] })
       ] }),
-      /* @__PURE__ */ jsxs10(
+      /* @__PURE__ */ jsxs12(
         "div",
         {
           style: { display: "flex", flexDirection: "column", gap: 4, width: "100%" },
           children: [
-            /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-well", children: [
-              /* @__PURE__ */ jsx12("div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ jsx12(
+            /* @__PURE__ */ jsxs12("div", { className: "rs-deposit-address-well", children: [
+              /* @__PURE__ */ jsx14("div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ jsx14(
                 Suspense,
                 {
-                  fallback: /* @__PURE__ */ jsx12("div", { className: "rs-skeleton rs-skeleton-qr", "aria-hidden": "true" }),
-                  children: /* @__PURE__ */ jsx12(QRCode, { value: displayAddress, size: 190, iconSrc: qrIconSrc })
+                  fallback: /* @__PURE__ */ jsx14("div", { className: "rs-skeleton rs-skeleton-qr", "aria-hidden": "true" }),
+                  children: /* @__PURE__ */ jsx14(QRCode, { value: displayAddress, size: 190, iconSrc: qrIconSrc })
                 }
               ) }),
-              /* @__PURE__ */ jsx12("div", { className: "rs-deposit-address-value", children: displayAddress })
+              /* @__PURE__ */ jsx14("div", { className: "rs-deposit-address-value", children: displayAddress })
             ] }),
-            /* @__PURE__ */ jsxs10(
-              "button",
-              {
-                type: "button",
-                className: "rs-deposit-address-copy",
-                onClick: handleCopy,
-                children: [
-                  copied ? /* @__PURE__ */ jsx12(CheckIcon, {}) : /* @__PURE__ */ jsx12(CopyIcon, {}),
-                  copied ? "Copied!" : "Copy address"
-                ]
-              }
-            )
-          ]
-        }
-      ),
-      /* @__PURE__ */ jsxs10(
-        "div",
-        {
-          className: `rs-price-impact ${priceImpactExpanded ? "rs-price-impact--open" : ""}`,
-          children: [
-            /* @__PURE__ */ jsxs10(
-              "button",
-              {
-                type: "button",
-                className: "rs-price-impact-header",
-                onClick: () => setPriceImpactExpanded((v) => !v),
-                "aria-expanded": priceImpactExpanded,
-                children: [
-                  /* @__PURE__ */ jsxs10("span", { className: "rs-price-impact-header-left", children: [
-                    /* @__PURE__ */ jsx12("span", { className: "rs-price-impact-label", children: "Price impact" }),
-                    /* @__PURE__ */ jsx12("span", { className: "rs-price-impact-label", children: /* @__PURE__ */ jsx12("strong", { children: "0.00%" }) }),
-                    /* @__PURE__ */ jsx12(
-                      Tooltip,
-                      {
-                        className: "rs-price-impact-info",
-                        content: "Price impact is the difference between expected and execution price, due to trade size and liquidity.",
-                        children: /* @__PURE__ */ jsx12(InfoIcon, { "aria-hidden": "true" })
-                      }
-                    )
-                  ] }),
-                  /* @__PURE__ */ jsx12(
-                    ChevronDownIcon,
-                    {
-                      className: "rs-price-impact-chevron",
-                      "aria-hidden": "true"
-                    }
-                  )
-                ]
-              }
-            ),
-            /* @__PURE__ */ jsx12("div", { className: "rs-price-impact-panel", children: /* @__PURE__ */ jsxs10("div", { className: "rs-price-impact-panel-inner", children: [
-              /* @__PURE__ */ jsxs10("div", { className: "rs-price-impact-row", children: [
-                /* @__PURE__ */ jsx12("span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx12(PercentIcon, {}) }),
-                /* @__PURE__ */ jsxs10("span", { className: "rs-price-impact-label", children: [
-                  "Max slippage: ",
-                  /* @__PURE__ */ jsx12("strong", { children: "0.2%" })
-                ] }),
-                /* @__PURE__ */ jsx12(
-                  Tooltip,
-                  {
-                    className: "rs-price-impact-info",
-                    content: "Slippage accounts for price changes during execution. Slippage is adjusted per pair to ensure reliable execution.",
-                    children: /* @__PURE__ */ jsx12(InfoIcon, { "aria-hidden": "true" })
-                  }
-                )
-              ] }),
-              /* @__PURE__ */ jsxs10("div", { className: "rs-price-impact-row", children: [
-                /* @__PURE__ */ jsx12("span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx12(ClockIcon, {}) }),
-                /* @__PURE__ */ jsxs10("span", { className: "rs-price-impact-label", children: [
-                  "Processing time: ",
-                  /* @__PURE__ */ jsx12("strong", { children: "< 1 min" })
-                ] })
-              ] }),
-              liquidityHelper.kind !== "idle" && /* @__PURE__ */ jsxs10("div", { className: "rs-price-impact-row", children: [
-                /* @__PURE__ */ jsx12("span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx12(PlusCircleIcon, {}) }),
-                /* @__PURE__ */ jsxs10("span", { className: "rs-price-impact-label", children: [
-                  "Max deposit:",
-                  " ",
-                  /* @__PURE__ */ jsx12("strong", { children: liquidityHelper.kind === "max" ? `${formatUnits3(
-                    BigInt(liquidityHelper.maxAmount),
-                    liquidityHelper.decimals
-                  )} ${liquidityHelper.symbol}` : liquidityHelper.kind === "unlimited" ? "Unlimited" : liquidityHelper.kind === "unavailable" ? "Unavailable" : liquidityHelper.kind === "error" ? "\u2014" : "\u2026" })
-                ] })
-              ] })
-            ] }) })
+            /* @__PURE__ */ jsxs12("div", { className: "rs-deposit-address-actions", children: [
+              /* @__PURE__ */ jsxs12(
+                "button",
+                {
+                  type: "button",
+                  className: "rs-deposit-address-copy",
+                  onClick: handleCopy,
+                  children: [
+                    copied ? /* @__PURE__ */ jsx14(CheckIcon, {}) : /* @__PURE__ */ jsx14(CopyIcon, {}),
+                    copied ? "Copied!" : "Copy address"
+                  ]
+                }
+              ),
+              onReviewDeposit && reviewAsset && /* @__PURE__ */ jsx14(
+                "button",
+                {
+                  type: "button",
+                  className: "rs-deposit-address-copy rs-deposit-address-review",
+                  onClick: () => onReviewDeposit(reviewAsset),
+                  children: "Estimate fees"
+                }
+              )
+            ] })
           ]
         }
       ),
-      pollingError && /* @__PURE__ */ jsx12("div", { className: "rs-deposit-address-error", children: pollingError })
+      pollingError && /* @__PURE__ */ jsx14("div", { className: "rs-deposit-address-error", children: pollingError })
     ] }),
-    notifications.length > 0 && /* @__PURE__ */ jsx12("div", { className: "rs-deposit-notifications", children: notifications.map((deposit) => /* @__PURE__ */ jsx12(
+    notifications.length > 0 && /* @__PURE__ */ jsx14("div", { className: "rs-deposit-notifications", children: notifications.map((deposit) => /* @__PURE__ */ jsx14(
       DepositNotification,
       {
         deposit,
@@ -2772,7 +3095,7 @@ function DepositAddressStep({
       },
       deposit.id
     )) }),
-    /* @__PURE__ */ jsx12(PoweredBy, {})
+    /* @__PURE__ */ jsx14(PoweredBy, {})
   ] });
 }
 DepositAddressStep.displayName = "DepositAddressStep";
@@ -2786,6 +3109,15 @@ var SWAPPED_ORIGINS = [
   "https://sandbox.swapped.com",
   "https://widget.swapped.com"
 ];
+function isTrustedSwappedWidgetUrl(url) {
+  let parsed;
+  try {
+    parsed = new URL(url);
+  } catch {
+    return false;
+  }
+  return SWAPPED_ORIGINS.includes(parsed.origin);
+}
 var WIDGET_URL_EXPIRY_BUFFER_MS = 1e4;
 function isSwappedWidgetUrlFresh(res, now = Date.now()) {
   if (!res.expiresAt) return false;
@@ -2794,15 +3126,15 @@ function isSwappedWidgetUrlFresh(res, now = Date.now()) {
   return expiry - now > WIDGET_URL_EXPIRY_BUFFER_MS;
 }
 
-// src/components/steps/SwappedIframeStep.tsx
-import { useState as useState7, useEffect as useEffect7, useRef as useRef6, useMemo as useMemo4 } from "react";
+// src/components/steps/SwappedProviderStep.tsx
+import { useState as useState8, useEffect as useEffect8, useRef as useRef6, useMemo as useMemo4 } from "react";
 
 // src/components/steps/FinalisingDepositStep.tsx
-import { jsx as jsx13, jsxs as jsxs11 } from "react/jsx-runtime";
+import { jsx as jsx15, jsxs as jsxs13 } from "react/jsx-runtime";
 function FinalisingDepositStep() {
-  return /* @__PURE__ */ jsxs11("div", { className: "rs-screen rs-finalising", children: [
-    /* @__PURE__ */ jsxs11("div", { className: "rs-screen-body rs-finalising-body", children: [
-      /* @__PURE__ */ jsxs11(
+  return /* @__PURE__ */ jsxs13("div", { className: "rs-screen rs-finalising", children: [
+    /* @__PURE__ */ jsxs13("div", { className: "rs-screen-body rs-finalising-body", children: [
+      /* @__PURE__ */ jsxs13(
         "svg",
         {
           className: "rs-finalising-spinner",
@@ -2810,23 +3142,23 @@ function FinalisingDepositStep() {
           fill: "none",
           "aria-hidden": "true",
           children: [
-            /* @__PURE__ */ jsx13("circle", { className: "rs-finalising-spinner-track", cx: "40", cy: "40", r: "34" }),
-            /* @__PURE__ */ jsx13("circle", { className: "rs-finalising-spinner-head", cx: "40", cy: "40", r: "34" })
+            /* @__PURE__ */ jsx15("circle", { className: "rs-finalising-spinner-track", cx: "40", cy: "40", r: "34" }),
+            /* @__PURE__ */ jsx15("circle", { className: "rs-finalising-spinner-head", cx: "40", cy: "40", r: "34" })
           ]
         }
       ),
-      /* @__PURE__ */ jsxs11("div", { className: "rs-finalising-text", children: [
-        /* @__PURE__ */ jsx13("h2", { className: "rs-finalising-title", children: "Finalising deposit" }),
-        /* @__PURE__ */ jsx13("p", { className: "rs-finalising-subtitle", children: "We are depositing your funds to the application." })
+      /* @__PURE__ */ jsxs13("div", { className: "rs-finalising-text", children: [
+        /* @__PURE__ */ jsx15("h2", { className: "rs-finalising-title", children: "Finalising deposit" }),
+        /* @__PURE__ */ jsx15("p", { className: "rs-finalising-subtitle", children: "We are depositing your funds to the application." })
       ] })
     ] }),
-    /* @__PURE__ */ jsx13(PoweredBy, {})
+    /* @__PURE__ */ jsx15(PoweredBy, {})
   ] });
 }
 FinalisingDepositStep.displayName = "FinalisingDepositStep";
 
 // src/components/steps/SwappedOrderTracker.tsx
-import { jsx as jsx14, jsxs as jsxs12 } from "react/jsx-runtime";
+import { jsx as jsx16, jsxs as jsxs14 } from "react/jsx-runtime";
 var STEP_LABELS = [
   "Payment received",
   null,
@@ -2848,29 +3180,29 @@ function SwappedOrderTracker({
     STEP_LABELS[2],
     STEP_LABELS[3]
   ];
-  return /* @__PURE__ */ jsxs12("div", { className: "rs-screen rs-swapped-tracker", children: [
-    /* @__PURE__ */ jsxs12("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx14(BodyHeader, { icon: /* @__PURE__ */ jsx14(HandCoinsIcon, {}), title }),
-      /* @__PURE__ */ jsx14("ol", { className: "rs-swapped-tracker-steps", children: labels.map((label, idx) => {
+  return /* @__PURE__ */ jsxs14("div", { className: "rs-screen rs-swapped-tracker", children: [
+    /* @__PURE__ */ jsxs14("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx16(BodyHeader, { icon: /* @__PURE__ */ jsx16(HandCoinsIcon, {}), title }),
+      /* @__PURE__ */ jsx16("ol", { className: "rs-swapped-tracker-steps", children: labels.map((label, idx) => {
         const status = stepStates[idx];
-        return /* @__PURE__ */ jsxs12(
+        return /* @__PURE__ */ jsxs14(
           "li",
           {
             className: `rs-swapped-tracker-step rs-swapped-tracker-step--${status}`,
             children: [
-              /* @__PURE__ */ jsx14("span", { className: "rs-swapped-tracker-step-label", children: label }),
-              /* @__PURE__ */ jsx14(
+              /* @__PURE__ */ jsx16("span", { className: "rs-swapped-tracker-step-label", children: label }),
+              /* @__PURE__ */ jsx16(
                 "span",
                 {
                   className: "rs-swapped-tracker-step-marker",
                   "aria-hidden": "true",
-                  children: status === "complete" ? /* @__PURE__ */ jsx14(CheckIcon, {}) : status === "failed" ? /* @__PURE__ */ jsx14(CloseIcon, {}) : status === "active" ? /* @__PURE__ */ jsx14(Spinner, {}) : /* @__PURE__ */ jsx14(
+                  children: status === "complete" ? /* @__PURE__ */ jsx16(CheckIcon, {}) : status === "failed" ? /* @__PURE__ */ jsx16(CloseIcon, {}) : status === "active" ? /* @__PURE__ */ jsx16(Spinner, {}) : /* @__PURE__ */ jsx16(
                     "svg",
                     {
                       className: "rs-swapped-tracker-step-ring",
                       viewBox: "0 0 16 16",
                       "aria-hidden": "true",
-                      children: /* @__PURE__ */ jsx14("circle", { cx: "8", cy: "8", r: "7" })
+                      children: /* @__PURE__ */ jsx16("circle", { cx: "8", cy: "8", r: "7" })
                     }
                   )
                 }
@@ -2880,13 +3212,13 @@ function SwappedOrderTracker({
           label
         );
       }) }),
-      terminal && /* @__PURE__ */ jsxs12(
+      terminal && /* @__PURE__ */ jsxs14(
         "div",
         {
           className: `rs-swapped-tracker-terminal rs-swapped-tracker-terminal--${terminal.kind}`,
           children: [
-            /* @__PURE__ */ jsx14("p", { className: "rs-swapped-tracker-terminal-message", children: terminal.message }),
-            terminal.kind === "cancelled" && onRetry && /* @__PURE__ */ jsx14(
+            /* @__PURE__ */ jsx16("p", { className: "rs-swapped-tracker-terminal-message", children: terminal.message }),
+            terminal.kind === "cancelled" && onRetry && /* @__PURE__ */ jsx16(
               "button",
               {
                 type: "button",
@@ -2899,7 +3231,7 @@ function SwappedOrderTracker({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx14(PoweredBy, {})
+    /* @__PURE__ */ jsx16(PoweredBy, {})
   ] });
 }
 function formatTrackerAmount(amount) {
@@ -2910,8 +3242,8 @@ function formatTrackerAmount(amount) {
 }
 SwappedOrderTracker.displayName = "SwappedOrderTracker";
 
-// src/components/steps/SwappedIframeStep.tsx
-import { jsx as jsx15, jsxs as jsxs13 } from "react/jsx-runtime";
+// src/components/steps/SwappedProviderStep.tsx
+import { Fragment as Fragment4, jsx as jsx17, jsxs as jsxs15 } from "react/jsx-runtime";
 var STATUS_POLL_INTERVAL_MS = 2e3;
 var DEPOSIT_POLL_INTERVAL_MS = 2e3;
 var DEPOSIT_POLL_FAST_INITIAL_DELAY_MS = 1e3;
@@ -2930,6 +3262,16 @@ var SWAPPED_STATUS_VALUES = /* @__PURE__ */ new Set([
   "order_cancelled"
 ]);
 var SWAPPED_GO_BACK_KEY = "SWAPPED_GO_BACK";
+var OPEN_FAILED_MESSAGE = "We could not open your browser.";
+var OPEN_FAILED_CODE = "SWAPPED_BROWSER_UNAVAILABLE";
+function hostnameOf(url) {
+  if (!url) return "the payment provider";
+  try {
+    return new URL(url).hostname;
+  } catch {
+    return "the payment provider";
+  }
+}
 function parseMaybeJsonString(raw) {
   try {
     return JSON.parse(raw);
@@ -2973,7 +3315,7 @@ function parseSwappedIframeMessage(raw) {
     transactionId: asString2(inner.transaction_id) ?? asString2(obj.transactionId)
   };
 }
-function SwappedIframeStep({
+function SwappedProviderStep({
   smartAccount,
   service,
   variant,
@@ -2987,17 +3329,21 @@ function SwappedIframeStep({
   onClose,
   onGoBack,
   onError,
-  onImmersiveChange
+  onImmersiveChange,
+  openExternally
 }) {
-  const [widgetUrl, setWidgetUrl] = useState7(null);
-  const [iframeSrc, setIframeSrc] = useState7(null);
-  const [loadError, setLoadError] = useState7(null);
-  const [iframeLoaded, setIframeLoaded] = useState7(false);
-  const [retryToken, setRetryToken] = useState7(0);
-  const [orderState, setOrderState] = useState7(null);
-  const [latestEvent, setLatestEvent] = useState7(null);
-  const [phase, setPhase] = useState7("iframe");
+  const [widgetUrl, setWidgetUrl] = useState8(null);
+  const [iframeSrc, setIframeSrc] = useState8(null);
+  const [loadError, setLoadError] = useState8(null);
+  const [iframeLoaded, setIframeLoaded] = useState8(false);
+  const [retryToken, setRetryToken] = useState8(0);
+  const [orderState, setOrderState] = useState8(null);
+  const [latestEvent, setLatestEvent] = useState8(null);
+  const [phase, setPhase] = useState8("provider");
+  const [handoffOpened, setHandoffOpened] = useState8(false);
+  const [opening, setOpening] = useState8(false);
   const iframeRef = useRef6(null);
+  const openedUrlRef = useRef6(null);
   const completeFiredRef = useRef6(false);
   const failedFiredRef = useRef6(false);
   const completeTimeoutRef = useRef6(null);
@@ -3009,6 +3355,9 @@ function SwappedIframeStep({
   const rescheduleDepositPollRef = useRef6(
     null
   );
+  const rescheduleStatusPollRef = useRef6(
+    null
+  );
   const onSwappedCompleteRef = useRef6(onSwappedComplete);
   onSwappedCompleteRef.current = onSwappedComplete;
   const onSwappedFailedRef = useRef6(onSwappedFailed);
@@ -3021,7 +3370,7 @@ function SwappedIframeStep({
   onImmersiveChangeRef.current = onImmersiveChange;
   const loadUrlRef = useRef6(loadUrl);
   loadUrlRef.current = loadUrl;
-  useEffect7(() => {
+  useEffect8(() => {
     let cancelled = false;
     setLoadError(null);
     setIframeLoaded(false);
@@ -3029,7 +3378,10 @@ function SwappedIframeStep({
     setIframeSrc(null);
     setOrderState(null);
     setLatestEvent(null);
-    setPhase("iframe");
+    setPhase("provider");
+    setHandoffOpened(false);
+    setOpening(false);
+    openedUrlRef.current = null;
     if (completeTimeoutRef.current !== null) {
       clearTimeout(completeTimeoutRef.current);
       completeTimeoutRef.current = null;
@@ -3043,6 +3395,11 @@ function SwappedIframeStep({
     fastDepositPollEnabledRef.current = false;
     loadUrlRef.current().then((res) => {
       if (cancelled) return;
+      if (!isTrustedSwappedWidgetUrl(res.url)) {
+        setLoadError(loadErrorFallback);
+        onErrorRef.current?.(loadErrorFallback, loadErrorCode);
+        return;
+      }
       setWidgetUrl(res.url);
       expectedExternalCustomerIdRef.current = res.externalCustomerId;
       const sep = res.externalCustomerId.indexOf(":");
@@ -3061,17 +3418,41 @@ function SwappedIframeStep({
       }
     };
   }, [service, smartAccount, retryToken, loadErrorCode, loadErrorFallback]);
-  useEffect7(() => {
-    if (!widgetUrl || iframeLoaded || loadError) return;
+  useEffect8(() => {
+    if (openExternally || !widgetUrl || iframeLoaded || loadError) return;
     const timer = setTimeout(() => {
       setLoadError("Iframe took too long to load.");
     }, IFRAME_LOAD_TIMEOUT_MS);
     return () => clearTimeout(timer);
-  }, [widgetUrl, iframeLoaded, loadError]);
-  useEffect7(() => {
+  }, [openExternally, widgetUrl, iframeLoaded, loadError]);
+  useEffect8(() => {
+    if (openExternally) return;
     setIframeSrc(widgetUrl && !loadError ? widgetUrl : null);
-  }, [widgetUrl, loadError, retryToken]);
-  useEffect7(() => {
+  }, [openExternally, widgetUrl, loadError, retryToken]);
+  const openPaymentPage = async (url) => {
+    if (!openExternally) return;
+    openedUrlRef.current = url;
+    setOpening(true);
+    try {
+      await openExternally(url);
+      setHandoffOpened(true);
+    } catch (error) {
+      openedUrlRef.current = null;
+      setLoadError(OPEN_FAILED_MESSAGE);
+      onErrorRef.current?.(
+        error instanceof Error && error.message ? error.message : OPEN_FAILED_MESSAGE,
+        OPEN_FAILED_CODE
+      );
+    } finally {
+      setOpening(false);
+    }
+  };
+  useEffect8(() => {
+    if (!openExternally || !widgetUrl || loadError) return;
+    if (openedUrlRef.current === widgetUrl) return;
+    void openPaymentPage(widgetUrl);
+  }, [openExternally, widgetUrl, loadError]);
+  useEffect8(() => {
     let cancelled = false;
     let timeoutId;
     async function poll() {
@@ -3089,13 +3470,30 @@ function SwappedIframeStep({
         timeoutId = setTimeout(poll, STATUS_POLL_INTERVAL_MS);
       }
     }
+    rescheduleStatusPollRef.current = (delayMs) => {
+      if (cancelled) return;
+      clearTimeout(timeoutId);
+      timeoutId = setTimeout(poll, delayMs);
+    };
     poll();
     return () => {
       cancelled = true;
       clearTimeout(timeoutId);
+      rescheduleStatusPollRef.current = null;
     };
   }, [service, smartAccount]);
-  useEffect7(() => {
+  useEffect8(() => {
+    if (!openExternally) return;
+    const doc = globalThis.document;
+    const onVisible = () => {
+      if (doc.visibilityState !== "visible") return;
+      rescheduleStatusPollRef.current?.(0);
+      rescheduleDepositPollRef.current?.(0);
+    };
+    doc.addEventListener("visibilitychange", onVisible);
+    return () => doc.removeEventListener("visibilitychange", onVisible);
+  }, [openExternally]);
+  useEffect8(() => {
     let cancelled = false;
     let timeoutId;
     async function pollDeposit() {
@@ -3130,14 +3528,15 @@ function SwappedIframeStep({
       rescheduleDepositPollRef.current = null;
     };
   }, [service, smartAccount]);
-  useEffect7(() => {
+  useEffect8(() => {
     if (fastDepositPollEnabledRef.current) return;
     const status = orderState?.status;
     if (!status || !SWAPPED_TERMINAL_STATUSES.has(status)) return;
     fastDepositPollEnabledRef.current = true;
     rescheduleDepositPollRef.current?.(DEPOSIT_POLL_FAST_INITIAL_DELAY_MS);
   }, [orderState]);
-  useEffect7(() => {
+  useEffect8(() => {
+    if (openExternally) return;
     function onMessage(e) {
       if (!SWAPPED_IFRAME_ORIGINS.has(e.origin)) return;
       if (e.source !== iframeRef.current?.contentWindow) return;
@@ -3169,10 +3568,10 @@ function SwappedIframeStep({
     }
     window.addEventListener("message", onMessage);
     return () => window.removeEventListener("message", onMessage);
-  }, []);
-  useEffect7(() => {
+  }, [openExternally]);
+  useEffect8(() => {
     const swappedProvesLive = orderState !== null && !(variant === "fiat" && orderState.status === "payment_pending");
-    if (phase === "iframe" && (swappedProvesLive || latestEvent !== null)) {
+    if (phase === "provider" && (swappedProvesLive || latestEvent !== null)) {
       setPhase("tracker");
     }
   }, [phase, orderState, latestEvent, variant]);
@@ -3193,7 +3592,7 @@ function SwappedIframeStep({
     }
     return null;
   }, [latestEvent, orderState, bannerForStatus]);
-  useEffect7(() => {
+  useEffect8(() => {
     if (completeFiredRef.current || failedFiredRef.current) return;
     const t = latestEvent?.type;
     const isSuccess = t === "bridge-complete";
@@ -3216,7 +3615,7 @@ function SwappedIframeStep({
       onSwappedCompleteRef.current(info);
     }, SWAPPED_SUCCESS_HANDOFF_DELAY_MS);
   }, [latestEvent, orderState, smartAccount]);
-  useEffect7(() => {
+  useEffect8(() => {
     if (failedFiredRef.current || completeFiredRef.current) return;
     if (!isFailedEvent(latestEvent ?? void 0)) return;
     const txHash = currentDepositTxHashRef.current;
@@ -3228,24 +3627,27 @@ function SwappedIframeStep({
       failureMessageForEvent(latestEvent ?? void 0)
     );
   }, [latestEvent]);
-  const immersive = variant === "fiat" && phase === "iframe" && !loadError;
-  useEffect7(() => {
+  const immersive = !openExternally && variant === "fiat" && phase === "provider" && !loadError;
+  useEffect8(() => {
     onImmersiveChangeRef.current?.(immersive);
   }, [immersive]);
-  useEffect7(() => () => onImmersiveChangeRef.current?.(false), []);
+  useEffect8(() => () => onImmersiveChangeRef.current?.(false), []);
   const handleRetry = () => {
     setIframeSrc(null);
     setWidgetUrl(null);
     setIframeLoaded(false);
     setLoadError(null);
+    openedUrlRef.current = null;
+    setHandoffOpened(false);
     setRetryToken((n) => n + 1);
   };
+  const providerDomain = hostnameOf(widgetUrl);
   if (phase === "tracker") {
     const paymentReceived = stepStates[0] === "complete";
     if (variant === "connect" && !terminalState && paymentReceived) {
-      return /* @__PURE__ */ jsx15(FinalisingDepositStep, {});
+      return /* @__PURE__ */ jsx17(FinalisingDepositStep, {});
     }
-    return /* @__PURE__ */ jsx15(
+    return /* @__PURE__ */ jsx17(
       SwappedOrderTracker,
       {
         amount: orderState?.orderCryptoAmount ?? null,
@@ -3257,11 +3659,52 @@ function SwappedIframeStep({
       }
     );
   }
-  return /* @__PURE__ */ jsxs13("div", { className: "rs-screen rs-fiat-onramp", "data-variant": variant, children: [
-    /* @__PURE__ */ jsx15("div", { className: "rs-screen-body rs-fiat-onramp-body", children: /* @__PURE__ */ jsxs13("div", { className: "rs-fiat-onramp-iframe-wrap", children: [
-      loadError && /* @__PURE__ */ jsxs13("div", { className: "rs-fiat-onramp-error", children: [
-        /* @__PURE__ */ jsx15("div", { children: loadError }),
-        /* @__PURE__ */ jsx15(
+  if (openExternally) {
+    return /* @__PURE__ */ jsxs15("div", { className: "rs-screen rs-swapped-handoff", "data-variant": variant, children: [
+      /* @__PURE__ */ jsx17("div", { className: "rs-screen-body rs-swapped-handoff-body", children: loadError ? /* @__PURE__ */ jsxs15(Fragment4, { children: [
+        /* @__PURE__ */ jsx17("p", { className: "rs-swapped-handoff-title", children: loadError }),
+        /* @__PURE__ */ jsx17(
+          "button",
+          {
+            type: "button",
+            className: "rs-fiat-onramp-retry",
+            onClick: handleRetry,
+            children: "Retry"
+          }
+        )
+      ] }) : /* @__PURE__ */ jsxs15(Fragment4, { children: [
+        /* @__PURE__ */ jsx17(Spinner, {}),
+        /* @__PURE__ */ jsxs15("div", { className: "rs-swapped-handoff-text", children: [
+          /* @__PURE__ */ jsx17("h2", { className: "rs-swapped-handoff-title", children: handoffOpened ? variant === "fiat" ? "Finish paying in your browser" : "Approve the transfer in your browser" : "Opening your browser\u2026" }),
+          /* @__PURE__ */ jsx17("p", { className: "rs-swapped-handoff-subtitle", children: handoffOpened ? (
+            // The domain is the point of the hand-off, not decoration:
+            // the payment page is worth more when the user can see
+            // whose it is. Safe to render — the URL cleared the
+            // provider allow-list before it was handed over.
+            `We opened ${providerDomain} outside the app. Come back here when you are done \u2014 this screen keeps up on its own.`
+          ) : "This payment opens outside the app, where your card details go straight to the provider." })
+        ] }),
+        handoffOpened && /* @__PURE__ */ jsx17(
+          "button",
+          {
+            type: "button",
+            className: "rs-swapped-handoff-reopen",
+            disabled: opening || !widgetUrl,
+            onClick: () => {
+              if (widgetUrl) void openPaymentPage(widgetUrl);
+            },
+            children: "Open the payment page again"
+          }
+        )
+      ] }) }),
+      /* @__PURE__ */ jsx17(PoweredBy, {})
+    ] });
+  }
+  return /* @__PURE__ */ jsxs15("div", { className: "rs-screen rs-fiat-onramp", "data-variant": variant, children: [
+    /* @__PURE__ */ jsx17("div", { className: "rs-screen-body rs-fiat-onramp-body", children: /* @__PURE__ */ jsxs15("div", { className: "rs-fiat-onramp-iframe-wrap", children: [
+      loadError && /* @__PURE__ */ jsxs15("div", { className: "rs-fiat-onramp-error", children: [
+        /* @__PURE__ */ jsx17("div", { children: loadError }),
+        /* @__PURE__ */ jsx17(
           "button",
           {
             type: "button",
@@ -3271,15 +3714,15 @@ function SwappedIframeStep({
           }
         )
       ] }),
-      !loadError && !iframeLoaded && /* @__PURE__ */ jsx15("div", { className: "rs-fiat-onramp-loading", children: /* @__PURE__ */ jsx15(Spinner, {}) }),
-      widgetUrl && !loadError && /* @__PURE__ */ jsx15(
+      !loadError && !iframeLoaded && /* @__PURE__ */ jsx17("div", { className: "rs-fiat-onramp-loading", children: /* @__PURE__ */ jsx17(Spinner, {}) }),
+      widgetUrl && !loadError && /* @__PURE__ */ jsx17(
         "iframe",
         {
           ref: iframeRef,
           src: iframeSrc ?? void 0,
           title: iframeTitle,
           className: "rs-fiat-onramp-iframe",
-          sandbox: "allow-scripts allow-forms allow-same-origin allow-popups allow-popups-to-escape-sandbox allow-top-navigation-by-user-activation",
+          sandbox: "allow-scripts allow-forms allow-same-origin allow-popups allow-popups-to-escape-sandbox",
           allow: "payment; camera; microphone; clipboard-write; geolocation",
           onLoad: () => {
             try {
@@ -3294,7 +3737,7 @@ function SwappedIframeStep({
         retryToken
       )
     ] }) }),
-    loadError && /* @__PURE__ */ jsx15(PoweredBy, {})
+    loadError && /* @__PURE__ */ jsx17(PoweredBy, {})
   ] });
 }
 function deriveStepStates(swappedStatus, latestEvent) {
@@ -3318,10 +3761,10 @@ function deriveStepStates(swappedStatus, latestEvent) {
   }
   return ["active", "pending", "pending", "pending"];
 }
-SwappedIframeStep.displayName = "SwappedIframeStep";
+SwappedProviderStep.displayName = "SwappedProviderStep";
 
 // src/components/steps/FiatOnrampStep.tsx
-import { jsx as jsx16 } from "react/jsx-runtime";
+import { jsx as jsx18 } from "react/jsx-runtime";
 function fiatBannerForStatus(status, context) {
   if (context.currencyMismatch) {
     return {
@@ -3359,7 +3802,8 @@ function FiatOnrampStep({
   onClose,
   onGoBack,
   onError,
-  onImmersiveChange
+  onImmersiveChange,
+  openExternally
 }) {
   const loadUrl = useCallback3(async () => {
     const prefetched = consumePrefetchedUrl?.(
@@ -3386,8 +3830,8 @@ function FiatOnrampStep({
     methodSelectionSource,
     consumePrefetchedUrl
   ]);
-  return /* @__PURE__ */ jsx16(
-    SwappedIframeStep,
+  return /* @__PURE__ */ jsx18(
+    SwappedProviderStep,
     {
       smartAccount,
       service,
@@ -3402,7 +3846,8 @@ function FiatOnrampStep({
       onClose,
       onGoBack,
       onError,
-      onImmersiveChange
+      onImmersiveChange,
+      openExternally
     }
   );
 }
@@ -3410,7 +3855,7 @@ FiatOnrampStep.displayName = "FiatOnrampStep";
 
 // src/components/steps/ExchangeConnectStep.tsx
 import { useCallback as useCallback4 } from "react";
-import { jsx as jsx17 } from "react/jsx-runtime";
+import { jsx as jsx19 } from "react/jsx-runtime";
 function connectBannerForStatus(status, context) {
   if (context.currencyMismatch) {
     return {
@@ -3450,7 +3895,8 @@ function ExchangeConnectStep({
   onClose,
   onGoBack,
   onError,
-  onImmersiveChange
+  onImmersiveChange,
+  openExternally
 }) {
   const loadUrl = useCallback4(async () => {
     if (loadPreparedUrl) return loadPreparedUrl();
@@ -3460,8 +3906,8 @@ function ExchangeConnectStep({
     });
     return res;
   }, [loadPreparedUrl, service, smartAccount, connection]);
-  return /* @__PURE__ */ jsx17(
-    SwappedIframeStep,
+  return /* @__PURE__ */ jsx19(
+    SwappedProviderStep,
     {
       smartAccount,
       service,
@@ -3476,21 +3922,22 @@ function ExchangeConnectStep({
       onClose,
       onGoBack,
       onError,
-      onImmersiveChange
+      onImmersiveChange,
+      openExternally
     }
   );
 }
 ExchangeConnectStep.displayName = "ExchangeConnectStep";
 
 // src/components/steps/ExchangeSelectStep.tsx
-import { useCallback as useCallback5, useEffect as useEffect8, useState as useState8 } from "react";
-import { jsx as jsx18, jsxs as jsxs14 } from "react/jsx-runtime";
+import { useCallback as useCallback5, useEffect as useEffect9, useState as useState9 } from "react";
+import { jsx as jsx20, jsxs as jsxs16 } from "react/jsx-runtime";
 function ExchangeLogo({ exchange }) {
-  const [failed, setFailed] = useState8(false);
+  const [failed, setFailed] = useState9(false);
   if (!exchange.logoUrl || failed) {
-    return /* @__PURE__ */ jsx18(BankIcon, {});
+    return /* @__PURE__ */ jsx20(BankIcon, {});
   }
-  return /* @__PURE__ */ jsx18(
+  return /* @__PURE__ */ jsx20(
     "img",
     {
       src: exchange.logoUrl,
@@ -3507,19 +3954,19 @@ function ExchangeSelectStep({
   onSelectExchange,
   onError
 }) {
-  const [exchanges, setExchanges] = useState8([]);
-  const [loading, setLoading] = useState8(true);
-  const [error, setError] = useState8(null);
-  const [retryToken, setRetryToken] = useState8(0);
-  const [exchangeFeeBps, setExchangeFeeBps] = useState8(0);
-  const [selectingConnection, setSelectingConnection] = useState8(
+  const [exchanges, setExchanges] = useState9([]);
+  const [loading, setLoading] = useState9(true);
+  const [error, setError] = useState9(null);
+  const [retryToken, setRetryToken] = useState9(0);
+  const [exchangeFeeBps, setExchangeFeeBps] = useState9(0);
+  const [selectingConnection, setSelectingConnection] = useState9(
     null
   );
-  const [selectionNotice, setSelectionNotice] = useState8(null);
+  const [selectionNotice, setSelectionNotice] = useState9(null);
   const retry = useCallback5(() => {
     setRetryToken((n) => n + 1);
   }, []);
-  useEffect8(() => {
+  useEffect9(() => {
     let cancelled = false;
     setLoading(true);
     setError(null);
@@ -3566,20 +4013,20 @@ function ExchangeSelectStep({
     },
     [exchangeFeeBps, onError, onSelectExchange]
   );
-  return /* @__PURE__ */ jsxs14("div", { className: "rs-screen rs-exchange-select", children: [
-    /* @__PURE__ */ jsxs14("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx18(
+  return /* @__PURE__ */ jsxs16("div", { className: "rs-screen rs-exchange-select", children: [
+    /* @__PURE__ */ jsxs16("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx20(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx18(UnplugIcon, {}),
+          icon: /* @__PURE__ */ jsx20(UnplugIcon, {}),
           title: "Connect exchange",
           subtitle: "Select an exchange to connect"
         }
       ),
-      loading && /* @__PURE__ */ jsx18("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: /* @__PURE__ */ jsx18(Spinner, {}) }),
-      !loading && error && /* @__PURE__ */ jsxs14("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: [
-        /* @__PURE__ */ jsx18("div", { className: "rs-exchange-select-state-title", children: "Couldn\u2019t load exchanges" }),
-        /* @__PURE__ */ jsx18(
+      loading && /* @__PURE__ */ jsx20("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: /* @__PURE__ */ jsx20(Spinner, {}) }),
+      !loading && error && /* @__PURE__ */ jsxs16("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: [
+        /* @__PURE__ */ jsx20("div", { className: "rs-exchange-select-state-title", children: "Couldn\u2019t load exchanges" }),
+        /* @__PURE__ */ jsx20(
           "button",
           {
             type: "button",
@@ -3589,9 +4036,9 @@ function ExchangeSelectStep({
           }
         )
       ] }),
-      !loading && !error && exchanges.length === 0 && /* @__PURE__ */ jsxs14("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: [
-        /* @__PURE__ */ jsx18("div", { className: "rs-exchange-select-state-title", children: "No exchanges available" }),
-        /* @__PURE__ */ jsx18(
+      !loading && !error && exchanges.length === 0 && /* @__PURE__ */ jsxs16("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: [
+        /* @__PURE__ */ jsx20("div", { className: "rs-exchange-select-state-title", children: "No exchanges available" }),
+        /* @__PURE__ */ jsx20(
           "button",
           {
             type: "button",
@@ -3601,9 +4048,9 @@ function ExchangeSelectStep({
           }
         )
       ] }),
-      !loading && !error && exchanges.length > 0 && /* @__PURE__ */ jsx18("div", { className: "rs-exchange-grid", children: exchanges.map((exchange) => {
+      !loading && !error && exchanges.length > 0 && /* @__PURE__ */ jsx20("div", { className: "rs-exchange-grid", children: exchanges.map((exchange) => {
         const brand = getExchangeLogo(exchange.name, exchange.connection);
-        return /* @__PURE__ */ jsxs14(
+        return /* @__PURE__ */ jsxs16(
           "button",
           {
             type: "button",
@@ -3613,35 +4060,35 @@ function ExchangeSelectStep({
             "aria-busy": selectingConnection === exchange.connection,
             "aria-label": `Select ${exchange.name}`,
             children: [
-              /* @__PURE__ */ jsx18(
+              /* @__PURE__ */ jsx20(
                 "span",
                 {
                   className: `rs-exchange-card-logo${brand ? " rs-exchange-card-logo--brand" : ""}`,
-                  children: brand ?? /* @__PURE__ */ jsx18(ExchangeLogo, { exchange })
+                  children: brand ?? /* @__PURE__ */ jsx20(ExchangeLogo, { exchange })
                 }
               ),
-              /* @__PURE__ */ jsx18("span", { className: "rs-exchange-card-name", children: exchange.name })
+              /* @__PURE__ */ jsx20("span", { className: "rs-exchange-card-name", children: exchange.name })
             ]
           },
           exchange.connection
         );
       }) })
     ] }),
-    /* @__PURE__ */ jsx18(PoweredBy, {}),
-    exchangeFeeBps > 0 && /* @__PURE__ */ jsxs14("p", { className: "rs-exchange-select-fee-note", children: [
+    /* @__PURE__ */ jsx20(PoweredBy, {}),
+    exchangeFeeBps > 0 && /* @__PURE__ */ jsxs16("p", { className: "rs-exchange-select-fee-note", children: [
       "A ",
       formatFeeRate(exchangeFeeBps),
       " Exchange Fee applies to your deposit."
     ] }),
-    selectionNotice && /* @__PURE__ */ jsx18("p", { className: "rs-exchange-select-fee-note", role: "status", children: selectionNotice })
+    selectionNotice && /* @__PURE__ */ jsx20("p", { className: "rs-exchange-select-fee-note", role: "status", children: selectionNotice })
   ] });
 }
 ExchangeSelectStep.displayName = "ExchangeSelectStep";
 
 // src/components/steps/SolanaTokenSelectStep.tsx
-import { useState as useState9, useEffect as useEffect9, useMemo as useMemo5 } from "react";
-import { formatUnits as formatUnits4 } from "viem";
-import { jsx as jsx19, jsxs as jsxs15 } from "react/jsx-runtime";
+import { useState as useState10, useEffect as useEffect10, useMemo as useMemo5 } from "react";
+import { formatUnits as formatUnits3 } from "viem";
+import { jsx as jsx21, jsxs as jsxs17 } from "react/jsx-runtime";
 function SolanaTokenSelectStep({
   solanaAddress,
   service,
@@ -3650,11 +4097,11 @@ function SolanaTokenSelectStep({
   onDisconnect,
   debug
 }) {
-  const [tokenBalances, setTokenBalances] = useState9([]);
-  const [selectedSymbol, setSelectedSymbol] = useState9(null);
-  const [loading, setLoading] = useState9(true);
-  const [error, setError] = useState9(null);
-  useEffect9(() => {
+  const [tokenBalances, setTokenBalances] = useState10([]);
+  const [selectedSymbol, setSelectedSymbol] = useState10(null);
+  const [loading, setLoading] = useState10(true);
+  const [error, setError] = useState10(null);
+  useEffect10(() => {
     let active = true;
     async function loadBalances() {
       if (!solanaAddress) {
@@ -3737,7 +4184,7 @@ function SolanaTokenSelectStep({
   const selectedEntry = selectedSymbol ? rows.find((r) => r.token.symbol === selectedSymbol) : null;
   const formatBalance = (entry) => {
     try {
-      const raw = formatUnits4(entry.balance, entry.token.decimals);
+      const raw = formatUnits3(entry.balance, entry.token.decimals);
       const numeric = Number(raw);
       if (!Number.isFinite(numeric)) return raw;
       return tokenFormatter.format(numeric);
@@ -3747,30 +4194,30 @@ function SolanaTokenSelectStep({
   };
   const chainIcon = getChainIcon("solana");
   const chainName = getChainName("solana");
-  return /* @__PURE__ */ jsxs15("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs15("div", { className: "rs-screen-body", children: [
-      /* @__PURE__ */ jsx19(
+  return /* @__PURE__ */ jsxs17("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs17("div", { className: "rs-screen-body", children: [
+      /* @__PURE__ */ jsx21(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx19(WalletIcon, {}),
+          icon: /* @__PURE__ */ jsx21(WalletIcon, {}),
           title: "Your assets",
           subtitle: "Select source assets to transfer"
         }
       ),
-      loading && /* @__PURE__ */ jsxs15("div", { className: "rs-loading-state", style: { padding: "40px 12px" }, children: [
-        /* @__PURE__ */ jsx19(Spinner, { className: "rs-text-tertiary" }),
-        /* @__PURE__ */ jsx19("span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
+      loading && /* @__PURE__ */ jsxs17("div", { className: "rs-loading-state", style: { padding: "40px 12px" }, children: [
+        /* @__PURE__ */ jsx21(Spinner, { className: "rs-text-tertiary" }),
+        /* @__PURE__ */ jsx21("span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
       ] }),
-      error && /* @__PURE__ */ jsx19(Callout, { variant: "error", children: error }),
-      !loading && !error && rows.length === 0 && /* @__PURE__ */ jsxs15("div", { className: "rs-empty-state", children: [
-        /* @__PURE__ */ jsx19(WalletIcon, { className: "rs-empty-icon" }),
-        /* @__PURE__ */ jsx19("div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
-        /* @__PURE__ */ jsxs15("div", { className: "rs-empty-address", children: [
+      error && /* @__PURE__ */ jsx21(Callout, { variant: "error", children: error }),
+      !loading && !error && rows.length === 0 && /* @__PURE__ */ jsxs17("div", { className: "rs-empty-state", children: [
+        /* @__PURE__ */ jsx21(WalletIcon, { className: "rs-empty-icon" }),
+        /* @__PURE__ */ jsx21("div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
+        /* @__PURE__ */ jsxs17("div", { className: "rs-empty-address", children: [
           solanaAddress.slice(0, 6),
           "...",
           solanaAddress.slice(-4)
         ] }),
-        onDisconnect && /* @__PURE__ */ jsx19(
+        onDisconnect && /* @__PURE__ */ jsx21(
           "button",
           {
             type: "button",
@@ -3780,10 +4227,10 @@ function SolanaTokenSelectStep({
           }
         )
       ] }),
-      !loading && !error && rows.length > 0 && /* @__PURE__ */ jsx19("div", { className: "rs-asset-list", children: rows.map((entry) => {
+      !loading && !error && rows.length > 0 && /* @__PURE__ */ jsx21("div", { className: "rs-asset-list", children: rows.map((entry) => {
         const isSelected = selectedSymbol === entry.token.symbol;
         const tokenAmount = formatBalance(entry);
-        return /* @__PURE__ */ jsxs15(
+        return /* @__PURE__ */ jsxs17(
           "button",
           {
             type: "button",
@@ -3791,39 +4238,39 @@ function SolanaTokenSelectStep({
             className: `rs-asset-row ${isSelected ? "rs-asset-row--selected" : ""}`,
             "aria-pressed": isSelected,
             children: [
-              /* @__PURE__ */ jsxs15("div", { className: "rs-asset-info", children: [
-                /* @__PURE__ */ jsxs15("div", { className: "rs-asset-icon-wrapper", children: [
-                  /* @__PURE__ */ jsx19("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx19(
+              /* @__PURE__ */ jsxs17("div", { className: "rs-asset-info", children: [
+                /* @__PURE__ */ jsxs17("div", { className: "rs-asset-icon-wrapper", children: [
+                  /* @__PURE__ */ jsx21("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx21(
                     TokenIcon,
                     {
                       symbol: entry.token.symbol,
                       fallback: entry.token.symbol.slice(0, 4)
                     }
                   ) }),
-                  chainIcon && /* @__PURE__ */ jsx19("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx19(CdnIcon, { src: chainIcon, alt: chainName }) })
+                  chainIcon && /* @__PURE__ */ jsx21("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx21(CdnIcon, { src: chainIcon, alt: chainName }) })
                 ] }),
-                /* @__PURE__ */ jsxs15("div", { className: "rs-asset-text", children: [
-                  /* @__PURE__ */ jsxs15("div", { className: "rs-asset-name-row", children: [
-                    /* @__PURE__ */ jsx19("span", { className: "rs-asset-name", children: entry.token.symbol }),
-                    /* @__PURE__ */ jsxs15("span", { className: "rs-asset-chain", children: [
+                /* @__PURE__ */ jsxs17("div", { className: "rs-asset-text", children: [
+                  /* @__PURE__ */ jsxs17("div", { className: "rs-asset-name-row", children: [
+                    /* @__PURE__ */ jsx21("span", { className: "rs-asset-name", children: entry.token.symbol }),
+                    /* @__PURE__ */ jsxs17("span", { className: "rs-asset-chain", children: [
                       "on ",
                       chainName
                     ] })
                   ] }),
-                  /* @__PURE__ */ jsxs15("div", { className: "rs-asset-balance-small", children: [
+                  /* @__PURE__ */ jsxs17("div", { className: "rs-asset-balance-small", children: [
                     tokenAmount,
                     " ",
                     entry.token.symbol
                   ] })
                 ] })
               ] }),
-              /* @__PURE__ */ jsx19("div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? currencyFormatter.format(entry.balanceUsd) : tokenAmount !== "--" ? `${tokenAmount} ${entry.token.symbol}` : "--" })
+              /* @__PURE__ */ jsx21("div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? currencyFormatter.format(entry.balanceUsd) : tokenAmount !== "--" ? `${tokenAmount} ${entry.token.symbol}` : "--" })
             ]
           },
           entry.token.symbol
         );
       }) }),
-      /* @__PURE__ */ jsx19(
+      /* @__PURE__ */ jsx21(
         Button,
         {
           onClick: () => selectedEntry && onContinue(
@@ -3837,14 +4284,14 @@ function SolanaTokenSelectStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx19(PoweredBy, {})
+    /* @__PURE__ */ jsx21(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/SolanaAmountStep.tsx
-import { useCallback as useCallback6, useEffect as useEffect10, useMemo as useMemo6, useRef as useRef7, useState as useState10 } from "react";
-import { formatUnits as formatUnits5, parseUnits as parseUnits3 } from "viem";
-import { Fragment as Fragment4, jsx as jsx20, jsxs as jsxs16 } from "react/jsx-runtime";
+import { useCallback as useCallback6, useEffect as useEffect11, useMemo as useMemo6, useRef as useRef7, useState as useState11 } from "react";
+import { formatUnits as formatUnits4, parseUnits as parseUnits4 } from "viem";
+import { Fragment as Fragment5, jsx as jsx22, jsxs as jsxs18 } from "react/jsx-runtime";
 var SOL_FEE_RESERVE_LAMPORTS = 1000000n;
 var PRESETS2 = [
   { value: 25, label: "25%" },
@@ -3865,15 +4312,15 @@ function SolanaAmountStep({
   onContinue,
   debug
 }) {
-  const [amount, setAmount] = useState10("");
-  const [error, setError] = useState10(null);
+  const [amount, setAmount] = useState11("");
+  const [error, setError] = useState11(null);
   const hasAppliedDefaultRef = useRef7(false);
   const isSourceStablecoin = isStablecoinSymbol(token.symbol);
   const isMaxDefault = defaultAmount?.trim().toLowerCase() === "max";
   const tokenPriceUsd = useMemo6(() => {
     if (isSourceStablecoin) return 1;
     try {
-      const balanceUnits = Number(formatUnits5(balance, token.decimals));
+      const balanceUnits = Number(formatUnits4(balance, token.decimals));
       if (!Number.isFinite(balanceUnits) || balanceUnits <= 0 || balanceUsd <= 0) {
         return null;
       }
@@ -3886,7 +4333,7 @@ function SolanaAmountStep({
   const hasPricing = tokenPriceUsd !== null;
   const formattedBalance = useMemo6(() => {
     try {
-      const raw = formatUnits5(balance, token.decimals);
+      const raw = formatUnits4(balance, token.decimals);
       const numeric = Number(raw);
       if (!Number.isFinite(numeric)) return raw;
       return tokenFormatter.format(numeric);
@@ -3896,7 +4343,7 @@ function SolanaAmountStep({
   }, [balance, token.decimals]);
   const computedBalanceUsd = useMemo6(() => {
     try {
-      const balanceUnits = Number(formatUnits5(balance, token.decimals));
+      const balanceUnits = Number(formatUnits4(balance, token.decimals));
       if (!Number.isFinite(balanceUnits) || balanceUnits < 0) return null;
       if (tokenPriceUsd !== null) return balanceUnits * tokenPriceUsd;
       if (Number.isFinite(balanceUsd) && balanceUsd > 0) return balanceUsd;
@@ -3911,7 +4358,7 @@ function SolanaAmountStep({
   }, [balance, token]);
   const spendableBalanceUsd = useMemo6(() => {
     try {
-      const spendableUnits = Number(formatUnits5(spendableBalance, token.decimals));
+      const spendableUnits = Number(formatUnits4(spendableBalance, token.decimals));
       if (!Number.isFinite(spendableUnits) || spendableUnits < 0) return null;
       if (tokenPriceUsd !== null) return spendableUnits * tokenPriceUsd;
       return null;
@@ -3923,7 +4370,7 @@ function SolanaAmountStep({
     (percentage) => {
       try {
         const spendableUnits = Number(
-          formatUnits5(spendableBalance, token.decimals)
+          formatUnits4(spendableBalance, token.decimals)
         );
         if (!Number.isFinite(spendableUnits) || spendableUnits <= 0) return "";
         const value = isSourceStablecoin || !hasPricing ? spendableUnits * percentage / 100 : (spendableBalanceUsd ?? 0) * percentage / 100;
@@ -3942,7 +4389,7 @@ function SolanaAmountStep({
       spendableBalanceUsd
     ]
   );
-  useEffect10(() => {
+  useEffect11(() => {
     if (hasAppliedDefaultRef.current || !defaultAmount) return;
     if (isMaxDefault) {
       const next = computePresetAmount(100);
@@ -3966,7 +4413,7 @@ function SolanaAmountStep({
     if (numericAmount <= 0) return null;
     const raw = isSourceStablecoin || !hasPricing ? numericAmount : numericAmount / (tokenPriceUsd ?? 1);
     try {
-      return parseUnits3(raw.toString(), token.decimals);
+      return parseUnits4(raw.toString(), token.decimals);
     } catch {
       return null;
     }
@@ -4015,7 +4462,7 @@ function SolanaAmountStep({
     const sourceAmountStr = sourceAmount.toString();
     let amountInUnits;
     try {
-      amountInUnits = parseUnits3(sourceAmountStr, token.decimals);
+      amountInUnits = parseUnits4(sourceAmountStr, token.decimals);
     } catch {
       debugLog(debug, "solana-amount", "amount:invalid", {
         amount,
@@ -4043,12 +4490,12 @@ function SolanaAmountStep({
   };
   const continueLabel = exceedsBalance ? "Insufficient balance" : isAboveMax ? "Continue with max allowed deposit" : isBelowMin ? "Continue with minimum deposit" : "Continue";
   const continueDisabled = exceedsBalance || numericAmount === 0 && !isBelowMin;
-  return /* @__PURE__ */ jsxs16("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs16("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx20(BodyHeader, { icon: /* @__PURE__ */ jsx20(WalletIcon, {}), title: "Wallet deposit" }),
-      /* @__PURE__ */ jsxs16("div", { className: "rs-amount-section", children: [
-        /* @__PURE__ */ jsxs16("div", { className: "rs-amount-display", children: [
-          /* @__PURE__ */ jsx20(
+  return /* @__PURE__ */ jsxs18("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs18("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx22(BodyHeader, { icon: /* @__PURE__ */ jsx22(WalletIcon, {}), title: "Wallet deposit" }),
+      /* @__PURE__ */ jsxs18("div", { className: "rs-amount-section", children: [
+        /* @__PURE__ */ jsxs18("div", { className: "rs-amount-display", children: [
+          /* @__PURE__ */ jsx22(
             AnimatedAmountInput,
             {
               value: amount,
@@ -4057,25 +4504,25 @@ function SolanaAmountStep({
               autoFocus: true
             }
           ),
-          /* @__PURE__ */ jsxs16("div", { className: "rs-amount-meta", children: [
-            /* @__PURE__ */ jsxs16("span", { className: "rs-amount-meta-balance", children: [
+          /* @__PURE__ */ jsxs18("div", { className: "rs-amount-meta", children: [
+            /* @__PURE__ */ jsxs18("span", { className: "rs-amount-meta-balance", children: [
               formattedBalance,
               " ",
               token.symbol,
               " available",
-              computedBalanceUsd !== null && /* @__PURE__ */ jsxs16(Fragment4, { children: [
+              computedBalanceUsd !== null && /* @__PURE__ */ jsxs18(Fragment5, { children: [
                 " (~",
                 currencyFormatter.format(computedBalanceUsd),
                 ")"
               ] })
             ] }),
-            minDepositUsd !== null && /* @__PURE__ */ jsxs16("span", { className: "rs-amount-meta-minimum", children: [
+            minDepositUsd !== null && /* @__PURE__ */ jsxs18("span", { className: "rs-amount-meta-minimum", children: [
               "Min. deposit ",
               currencyFormatter.format(minDepositUsd)
             ] })
           ] })
         ] }),
-        /* @__PURE__ */ jsx20("div", { className: "rs-amount-presets", children: PRESETS2.map((preset) => /* @__PURE__ */ jsx20(
+        /* @__PURE__ */ jsx22("div", { className: "rs-amount-presets", children: PRESETS2.map((preset) => /* @__PURE__ */ jsx22(
           "button",
           {
             type: "button",
@@ -4086,35 +4533,35 @@ function SolanaAmountStep({
           preset.value
         )) })
       ] }),
-      /* @__PURE__ */ jsxs16("div", { className: "rs-amount-details", children: [
-        /* @__PURE__ */ jsxs16("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx20("span", { children: "You send" }),
-          /* @__PURE__ */ jsxs16("span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ jsxs16("span", { children: [
+      /* @__PURE__ */ jsxs18("div", { className: "rs-amount-details", children: [
+        /* @__PURE__ */ jsxs18("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx22("span", { children: "You send" }),
+          /* @__PURE__ */ jsxs18("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsxs18("span", { children: [
               "Solana ",
               token.symbol
             ] }),
-            /* @__PURE__ */ jsx20("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx20(TokenIcon, { symbol: token.symbol }) })
+            /* @__PURE__ */ jsx22("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx22(TokenIcon, { symbol: token.symbol }) })
           ] })
         ] }),
-        targetChainName && targetTokenSymbol && /* @__PURE__ */ jsxs16("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx20("span", { children: "Receive" }),
-          /* @__PURE__ */ jsxs16("span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ jsxs16("span", { children: [
+        targetChainName && targetTokenSymbol && /* @__PURE__ */ jsxs18("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx22("span", { children: "Receive" }),
+          /* @__PURE__ */ jsxs18("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsxs18("span", { children: [
               targetChainName,
               " ",
               targetTokenSymbol
             ] }),
-            /* @__PURE__ */ jsx20("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx20(TokenIcon, { symbol: targetTokenSymbol }) })
+            /* @__PURE__ */ jsx22("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx22(TokenIcon, { symbol: targetTokenSymbol }) })
           ] })
         ] }),
-        balanceAfterUsd !== null && /* @__PURE__ */ jsxs16("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx20("span", { children: "Balance after deposit" }),
-          /* @__PURE__ */ jsx20("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
+        balanceAfterUsd !== null && /* @__PURE__ */ jsxs18("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx22("span", { children: "Balance after deposit" }),
+          /* @__PURE__ */ jsx22("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
         ] })
       ] }),
-      error && /* @__PURE__ */ jsx20(Callout, { variant: "error", children: error }),
-      /* @__PURE__ */ jsx20(
+      error && /* @__PURE__ */ jsx22(Callout, { variant: "error", children: error }),
+      /* @__PURE__ */ jsx22(
         Button,
         {
           onClick: handleContinue,
@@ -4124,13 +4571,13 @@ function SolanaAmountStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx20(PoweredBy, {})
+    /* @__PURE__ */ jsx22(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/SolanaConfirmStep.tsx
-import { useState as useState11 } from "react";
-import { parseUnits as parseUnits4 } from "viem";
+import { useState as useState12 } from "react";
+import { parseUnits as parseUnits5 } from "viem";
 
 // src/core/solana.ts
 import {
@@ -4231,7 +4678,7 @@ async function sendSolanaTransaction(provider, _connection, transaction) {
 }
 
 // src/components/steps/SolanaConfirmStep.tsx
-import { jsx as jsx21, jsxs as jsxs17 } from "react/jsx-runtime";
+import { jsx as jsx23, jsxs as jsxs19 } from "react/jsx-runtime";
 function SolanaConfirmStep({
   smartAccount,
   solanaAddress,
@@ -4253,8 +4700,8 @@ function SolanaConfirmStep({
   debug
 }) {
   const rpcUrls = useRpcUrls();
-  const [isSubmitting, setIsSubmitting] = useState11(false);
-  const [error, setError] = useState11(null);
+  const [isSubmitting, setIsSubmitting] = useState12(false);
+  const [error, setError] = useState12(null);
   const targetChainId = targetChainToChainId(targetChain);
   const targetSymbol = getTargetTokenSymbol(targetToken, targetChainId);
   const sourceChainName = getChainName("solana");
@@ -4321,7 +4768,7 @@ function SolanaConfirmStep({
         );
       }
       const connection = hasConfiguredSolanaRpcUrl(rpcUrls) ? getSolanaConnection(rpcUrls) : solanaConnection ?? getSolanaConnection(rpcUrls);
-      const amountUnits = parseUnits4(sourceAmount, token.decimals);
+      const amountUnits = parseUnits5(sourceAmount, token.decimals);
       debugLog(debug, "solana-confirm", "tx:build:start", {
         token: token.symbol,
         sourceAmount,
@@ -4374,62 +4821,26 @@ function SolanaConfirmStep({
       setIsSubmitting(false);
     }
   };
-  return /* @__PURE__ */ jsxs17("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs17("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx21(BodyHeader, { icon: /* @__PURE__ */ jsx21(WalletIcon, {}), title: "Review deposit" }),
-      /* @__PURE__ */ jsxs17("div", { className: "rs-review-details", children: [
-        /* @__PURE__ */ jsxs17("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx21("span", { children: "Source chain" }),
-          /* @__PURE__ */ jsxs17("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsx21("span", { children: sourceChainName }),
-            sourceChainIcon && /* @__PURE__ */ jsx21("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx21(CdnIcon, { src: sourceChainIcon }) })
-          ] })
-        ] }),
-        /* @__PURE__ */ jsxs17("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx21("span", { children: "Destination chain" }),
-          /* @__PURE__ */ jsxs17("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsx21("span", { children: targetChainName }),
-            targetChainIcon && /* @__PURE__ */ jsx21("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx21(CdnIcon, { src: targetChainIcon }) })
-          ] })
-        ] }),
-        /* @__PURE__ */ jsxs17("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx21("span", { children: "Estimated time" }),
-          /* @__PURE__ */ jsx21("span", { className: "rs-review-detail-value", children: estimatedTime })
-        ] }),
-        /* @__PURE__ */ jsxs17("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx21("span", { children: "You send" }),
-          /* @__PURE__ */ jsxs17("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsxs17("span", { children: [
-              formattedAmount,
-              " ",
-              token.symbol
-            ] }),
-            /* @__PURE__ */ jsx21("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx21(TokenIcon, { symbol: token.symbol }) })
-          ] })
-        ] }),
-        /* @__PURE__ */ jsxs17("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx21("span", { children: "Receive" }),
-          /* @__PURE__ */ jsxs17("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsx21("span", { children: receiveDisplay }),
-            /* @__PURE__ */ jsx21("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx21(TokenIcon, { symbol: targetSymbol }) })
-          ] })
-        ] }),
-        /* @__PURE__ */ jsxs17("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx21("span", { children: "Fees" }),
-          /* @__PURE__ */ jsxs17("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsx21(
-              "span",
-              {
-                style: feeSponsored ? { textDecoration: "line-through" } : void 0,
-                children: "$0.04"
-              }
-            ),
-            /* @__PURE__ */ jsx21(Tooltip, { content: feeTooltip, children: /* @__PURE__ */ jsx21("span", { className: "rs-review-detail-info", "aria-label": "Fee info", children: /* @__PURE__ */ jsx21(InfoIcon, {}) }) })
-          ] })
-        ] })
-      ] }),
-      error && /* @__PURE__ */ jsx21(Callout, { variant: "error", children: error }),
-      /* @__PURE__ */ jsx21(
+  return /* @__PURE__ */ jsxs19("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs19("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx23(BodyHeader, { icon: /* @__PURE__ */ jsx23(WalletIcon, {}), title: "Review deposit" }),
+      /* @__PURE__ */ jsx23(
+        ReviewDetails,
+        {
+          sourceChainName,
+          sourceChainIcon,
+          targetChainName,
+          targetChainIcon,
+          estimatedTime,
+          sendAmount: formattedAmount,
+          sendSymbol: token.symbol,
+          receiveDisplay,
+          receiveSymbol: targetSymbol,
+          fee: { display: "$0.04", struck: feeSponsored, tooltip: feeTooltip }
+        }
+      ),
+      error && /* @__PURE__ */ jsx23(Callout, { variant: "error", children: error }),
+      /* @__PURE__ */ jsx23(
         Button,
         {
           onClick: handleConfirm,
@@ -4441,30 +4852,30 @@ function SolanaConfirmStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx21(PoweredBy, {})
+    /* @__PURE__ */ jsx23(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/DappImportAssetSelectStep.tsx
-import { jsx as jsx22, jsxs as jsxs18 } from "react/jsx-runtime";
+import { jsx as jsx24, jsxs as jsxs20 } from "react/jsx-runtime";
 function DappImportAssetSelectStep({
   sourceLabel,
   assets,
   incompleteSummary,
   onSelect
 }) {
-  return /* @__PURE__ */ jsxs18("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs18("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx22(
+  return /* @__PURE__ */ jsxs20("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs20("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx24(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx22(WalletIcon, {}),
+          icon: /* @__PURE__ */ jsx24(WalletIcon, {}),
           title: `Transfer from ${sourceLabel}`,
           subtitle: "Pick the balance to import"
         }
       ),
-      incompleteSummary && /* @__PURE__ */ jsx22("div", { className: "rs-asset-notice", role: "status", children: incompleteSummary }),
-      /* @__PURE__ */ jsx22("div", { className: "rs-asset-list", children: assets.map((asset) => {
+      incompleteSummary && /* @__PURE__ */ jsx24("div", { className: "rs-asset-notice", role: "status", children: incompleteSummary }),
+      /* @__PURE__ */ jsx24("div", { className: "rs-asset-list", children: assets.map((asset) => {
         const tokenAmount = asset.balance ? tokenFormatter.format(
           Number(asset.balance) / 10 ** asset.decimals
         ) : "0";
@@ -4472,23 +4883,23 @@ function DappImportAssetSelectStep({
         const assetIcon = asset.icon;
         const chainIcon = getChainIcon(asset.chainId);
         const badge = getChainBadge(asset.chainId);
-        return /* @__PURE__ */ jsxs18(
+        return /* @__PURE__ */ jsxs20(
           "button",
           {
             type: "button",
             className: "rs-asset-row",
             onClick: () => onSelect(asset),
             children: [
-              /* @__PURE__ */ jsxs18("div", { className: "rs-asset-info", children: [
-                /* @__PURE__ */ jsxs18("div", { className: "rs-asset-icon-wrapper", children: [
-                  /* @__PURE__ */ jsx22("span", { className: "rs-asset-icon", children: assetIcon ? /* @__PURE__ */ jsx22(CdnIcon, { src: assetIcon, alt: asset.symbol }) : /* @__PURE__ */ jsx22(
+              /* @__PURE__ */ jsxs20("div", { className: "rs-asset-info", children: [
+                /* @__PURE__ */ jsxs20("div", { className: "rs-asset-icon-wrapper", children: [
+                  /* @__PURE__ */ jsx24("span", { className: "rs-asset-icon", children: assetIcon ? /* @__PURE__ */ jsx24(CdnIcon, { src: assetIcon, alt: asset.symbol }) : /* @__PURE__ */ jsx24(
                     TokenIcon,
                     {
                       symbol: asset.symbol,
                       fallback: asset.symbol.slice(0, 4)
                     }
                   ) }),
-                  chainIcon ? /* @__PURE__ */ jsx22("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx22(CdnIcon, { src: chainIcon, alt: getChainName(asset.chainId) }) }) : /* @__PURE__ */ jsx22(
+                  chainIcon ? /* @__PURE__ */ jsx24("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx24(CdnIcon, { src: chainIcon, alt: getChainName(asset.chainId) }) }) : /* @__PURE__ */ jsx24(
                     "span",
                     {
                       className: "rs-asset-chain-badge",
@@ -4497,36 +4908,36 @@ function DappImportAssetSelectStep({
                     }
                   )
                 ] }),
-                /* @__PURE__ */ jsxs18("div", { className: "rs-asset-text", children: [
-                  /* @__PURE__ */ jsxs18("div", { className: "rs-asset-name-row", children: [
-                    /* @__PURE__ */ jsx22("span", { className: "rs-asset-name", children: asset.symbol }),
-                    /* @__PURE__ */ jsxs18("span", { className: "rs-asset-chain", children: [
+                /* @__PURE__ */ jsxs20("div", { className: "rs-asset-text", children: [
+                  /* @__PURE__ */ jsxs20("div", { className: "rs-asset-name-row", children: [
+                    /* @__PURE__ */ jsx24("span", { className: "rs-asset-name", children: asset.symbol }),
+                    /* @__PURE__ */ jsxs20("span", { className: "rs-asset-chain", children: [
                       "on ",
                       asset.sourceLabel,
                       asset.qualifier ? ` \xB7 ${asset.qualifier}` : ""
                     ] })
                   ] }),
-                  /* @__PURE__ */ jsxs18("div", { className: "rs-asset-balance-small", children: [
+                  /* @__PURE__ */ jsxs20("div", { className: "rs-asset-balance-small", children: [
                     tokenAmount,
                     " ",
                     asset.symbol
                   ] })
                 ] })
               ] }),
-              /* @__PURE__ */ jsx22("div", { className: "rs-asset-balance", children: balanceUsd })
+              /* @__PURE__ */ jsx24("div", { className: "rs-asset-balance", children: balanceUsd })
             ]
           },
           asset.id
         );
       }) })
     ] }),
-    /* @__PURE__ */ jsx22(PoweredBy, {})
+    /* @__PURE__ */ jsx24(PoweredBy, {})
   ] });
 }
 DappImportAssetSelectStep.displayName = "DappImportAssetSelectStep";
 
 // src/components/steps/DappImportSelectStep.tsx
-import { jsx as jsx23, jsxs as jsxs19 } from "react/jsx-runtime";
+import { jsx as jsx25, jsxs as jsxs21 } from "react/jsx-runtime";
 function describeRow(status, comingSoon) {
   if (comingSoon) {
     return { subtitle: "Coming soon", disabled: true, busy: false };
@@ -4562,30 +4973,30 @@ function DappImportSelectStep({
   const byId = new Map(rows.map((row) => [row.id, row.status]));
   const enabled = new Set(enabledIds);
   const brands = DAPP_IMPORT_CATALOG.filter((brand) => enabled.has(brand.id));
-  return /* @__PURE__ */ jsxs19("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs19("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx23(
+  return /* @__PURE__ */ jsxs21("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs21("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx25(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx23(MigrateAssetsIcon, {}),
+          icon: /* @__PURE__ */ jsx25(MigrateAssetsIcon, {}),
           title: "Migrate assets",
           subtitle: "Select a position to migrate"
         }
       ),
-      /* @__PURE__ */ jsx23("div", { className: "rs-list", children: brands.map((brand) => {
+      /* @__PURE__ */ jsx25("div", { className: "rs-list", children: brands.map((brand) => {
         const status = byId.get(brand.id);
         const { subtitle, disabled, busy } = describeRow(
           status,
           Boolean(brand.comingSoon)
         );
-        return /* @__PURE__ */ jsx23(
+        return /* @__PURE__ */ jsx25(
           ListRow,
           {
             leadingMedia: brand.iconUrl,
             title: brand.label,
             subtitle,
             disabled,
-            trailing: busy ? /* @__PURE__ */ jsx23(Spinner, { className: "rs-spinner--sm" }) : void 0,
+            trailing: busy ? /* @__PURE__ */ jsx25(Spinner, { className: "rs-spinner--sm" }) : void 0,
             onClick: () => {
               if (status === "needs-connect") {
                 onRequestConnect?.();
@@ -4598,64 +5009,64 @@ function DappImportSelectStep({
         );
       }) })
     ] }),
-    /* @__PURE__ */ jsx23(PoweredBy, {})
+    /* @__PURE__ */ jsx25(PoweredBy, {})
   ] });
 }
 DappImportSelectStep.displayName = "DappImportSelectStep";
 
 // src/components/steps/DappImportAssetSelectSkeleton.tsx
-import { jsx as jsx24, jsxs as jsxs20 } from "react/jsx-runtime";
+import { jsx as jsx26, jsxs as jsxs22 } from "react/jsx-runtime";
 function DappImportAssetSelectSkeleton({
   sourceLabel,
   rowCount = 3,
   error = false,
   onRetry
 }) {
-  return /* @__PURE__ */ jsxs20("div", { className: "rs-screen", "aria-busy": error ? "false" : "true", children: [
-    /* @__PURE__ */ jsx24("span", { className: "rs-sr-only", role: "status", children: error ? "Couldn't load balances" : "Loading balances\u2026" }),
-    /* @__PURE__ */ jsxs20("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx24(
+  return /* @__PURE__ */ jsxs22("div", { className: "rs-screen", "aria-busy": error ? "false" : "true", children: [
+    /* @__PURE__ */ jsx26("span", { className: "rs-sr-only", role: "status", children: error ? "Couldn't load balances" : "Loading balances\u2026" }),
+    /* @__PURE__ */ jsxs22("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx26(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx24(WalletIcon, {}),
+          icon: /* @__PURE__ */ jsx26(WalletIcon, {}),
           title: `Transfer from ${sourceLabel}`,
           subtitle: "Pick the balance to import"
         }
       ),
-      error ? /* @__PURE__ */ jsx24("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsxs20("div", { className: "rs-loading-text", children: [
-        /* @__PURE__ */ jsx24("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t load your balances" }),
-        /* @__PURE__ */ jsx24("div", { className: "rs-loading-subtitle", children: "Check your connection and try again." })
-      ] }) }) : /* @__PURE__ */ jsx24("div", { className: "rs-asset-list", "aria-hidden": "true", children: Array.from({ length: rowCount }, (_, index) => /* @__PURE__ */ jsxs20(
+      error ? /* @__PURE__ */ jsx26("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsxs22("div", { className: "rs-loading-text", children: [
+        /* @__PURE__ */ jsx26("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t load your balances" }),
+        /* @__PURE__ */ jsx26("div", { className: "rs-loading-subtitle", children: "Check your connection and try again." })
+      ] }) }) : /* @__PURE__ */ jsx26("div", { className: "rs-asset-list", "aria-hidden": "true", children: Array.from({ length: rowCount }, (_, index) => /* @__PURE__ */ jsxs22(
         "div",
         {
           className: "rs-asset-row rs-asset-row--skeleton",
           children: [
-            /* @__PURE__ */ jsxs20("div", { className: "rs-asset-info", children: [
-              /* @__PURE__ */ jsxs20("div", { className: "rs-asset-icon-wrapper", children: [
-                /* @__PURE__ */ jsx24("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx24("span", { className: "rs-skeleton rs-skeleton-fill" }) }),
-                /* @__PURE__ */ jsx24("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx24("span", { className: "rs-skeleton rs-skeleton-fill" }) })
+            /* @__PURE__ */ jsxs22("div", { className: "rs-asset-info", children: [
+              /* @__PURE__ */ jsxs22("div", { className: "rs-asset-icon-wrapper", children: [
+                /* @__PURE__ */ jsx26("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx26("span", { className: "rs-skeleton rs-skeleton-fill" }) }),
+                /* @__PURE__ */ jsx26("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx26("span", { className: "rs-skeleton rs-skeleton-fill" }) })
               ] }),
-              /* @__PURE__ */ jsxs20("div", { className: "rs-asset-text", children: [
-                /* @__PURE__ */ jsx24("div", { className: "rs-asset-name-row", children: /* @__PURE__ */ jsx24("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--name" }) }),
-                /* @__PURE__ */ jsx24("div", { className: "rs-asset-balance-small", children: /* @__PURE__ */ jsx24("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--balance" }) })
+              /* @__PURE__ */ jsxs22("div", { className: "rs-asset-text", children: [
+                /* @__PURE__ */ jsx26("div", { className: "rs-asset-name-row", children: /* @__PURE__ */ jsx26("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--name" }) }),
+                /* @__PURE__ */ jsx26("div", { className: "rs-asset-balance-small", children: /* @__PURE__ */ jsx26("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--balance" }) })
               ] })
             ] }),
-            /* @__PURE__ */ jsx24("div", { className: "rs-asset-balance", children: /* @__PURE__ */ jsx24("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--usd" }) })
+            /* @__PURE__ */ jsx26("div", { className: "rs-asset-balance", children: /* @__PURE__ */ jsx26("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--usd" }) })
           ]
         },
         index
       )) })
     ] }),
-    error && onRetry && /* @__PURE__ */ jsx24("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx24(
+    error && onRetry && /* @__PURE__ */ jsx26("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx26(
       "button",
       {
         type: "button",
         className: "rs-button rs-button--default rs-button--full-width",
         onClick: onRetry,
-        children: /* @__PURE__ */ jsx24("span", { children: "Try again" })
+        children: /* @__PURE__ */ jsx26("span", { children: "Try again" })
       }
     ) }),
-    /* @__PURE__ */ jsx24(PoweredBy, {})
+    /* @__PURE__ */ jsx26(PoweredBy, {})
   ] });
 }
 DappImportAssetSelectSkeleton.displayName = "DappImportAssetSelectSkeleton";
@@ -4833,7 +5244,7 @@ function toImportableAssets(positions) {
   for (const position of positions) {
     const chainId = parseEvmChainId(position.chain);
     if (chainId === null) continue;
-    if (!CHAIN_BY_ID[chainId]) continue;
+    if (!SUPPORTED_CHAIN_IDS.includes(chainId)) continue;
     if (BigInt(position.maxWithdrawable) <= 0n) continue;
     if (position.constraints.some((c) => POLICY_REFUSED.includes(c))) continue;
     assets.push(buildAsset(position, chainId));
@@ -4900,7 +5311,7 @@ function withdrawableUsd(position) {
 }
 
 // src/core/dapp-imports/polymarket/index.ts
-import { formatUnits as formatUnits6 } from "viem";
+import { formatUnits as formatUnits5 } from "viem";
 
 // src/core/dapp-imports/polymarket/deposit-wallet.ts
 import {
@@ -4947,6 +5358,7 @@ async function detectPolymarketWalletKind(params) {
   const { publicClient, proxyWallet, eoa } = params;
   const results = await publicClient.multicall({
     allowFailure: true,
+    multicallAddress: MULTICALL3_ADDRESS,
     contracts: [
       {
         address: proxyWallet,
@@ -5158,7 +5570,7 @@ function buildAsset2(params) {
   const isPusd = tokenKind === "pusd";
   const tokenAddress = isPusd ? POLYMARKET_PUSD_ADDRESS : POLYMARKET_USDCE_ADDRESS;
   const symbol = isPusd ? "pUSD" : "USDC.e";
-  const balanceUsd = Number(formatUnits6(balance, 6));
+  const balanceUsd = Number(formatUnits5(balance, 6));
   const metadata = { proxyWallet, tokenKind, walletKind };
   return {
     id: `polymarket:${tokenKind}`,
@@ -5247,9 +5659,6 @@ function bootRetryPlan(params) {
   };
 }
 
-// src/DepositFlow.tsx
-import { base } from "viem/chains";
-
 // src/store/index.ts
 import { createContext, createElement, useContext } from "react";
 import { useStore } from "zustand";
@@ -5289,6 +5698,7 @@ function createInitialState(overrides) {
       sourceSymbol: null,
       sourceDecimals: null,
       selectedAsset: null,
+      qrSource: null,
       selectedSolanaToken: null,
       amount: null,
       targetAmount: null,
@@ -5304,6 +5714,7 @@ function createInitialState(overrides) {
       targetChain: null,
       targetToken: null,
       directTransfer: false,
+      sourceTxHashPending: false,
       swappedContext: null,
       initialEvent: null,
       quote: null
@@ -5340,6 +5751,7 @@ function unreachable(action) {
 }
 var RESET_DEPOSIT_FIELDS = {
   selectedAsset: null,
+  qrSource: null,
   selectedSolanaToken: null,
   amount: null,
   targetAmount: null,
@@ -5391,6 +5803,34 @@ function applyBack(state, hasWalletOptions) {
         },
         flow: { ...state.flow, step: "amount", hasNavigatedBack: true }
       };
+    // The QR detour unwinds to where it started, not into the wallet flow's
+    // asset picker — there is no connected wallet behind it to pick from.
+    case "qr-amount":
+      return {
+        ...state,
+        deposit: {
+          ...state.deposit,
+          amount: null,
+          targetAmount: null,
+          targetTokenPriceUsd: null,
+          inputAmountUsd: null
+        },
+        flow: {
+          ...state.flow,
+          step: "deposit-address",
+          hasNavigatedBack: true
+        }
+      };
+    case "qr-review":
+      return {
+        ...state,
+        deposit: {
+          ...state.deposit,
+          targetAmount: null,
+          targetTokenPriceUsd: null
+        },
+        flow: { ...state.flow, step: "qr-amount", hasNavigatedBack: true }
+      };
     case "solana-amount":
       return {
         ...state,
@@ -5827,6 +6267,51 @@ function applyAction(state, action) {
         },
         flow: { ...state.flow, step: "confirm" }
       };
+    case "qr/review-requested":
+      return {
+        ...state,
+        deposit: {
+          ...state.deposit,
+          selectedAsset: action.asset,
+          qrSource: {
+            chainId: action.asset.chainId,
+            symbol: action.asset.symbol
+          },
+          amount: null,
+          targetAmount: null,
+          targetTokenPriceUsd: null,
+          // No wallet, so no balance to read. Explicitly cleared rather than
+          // carried: a stale figure from an earlier wallet flow would gate the
+          // amount input against a balance this source has nothing to do with.
+          balance: null,
+          inputAmountUsd: null
+        },
+        flow: { ...state.flow, step: "qr-amount" }
+      };
+    case "qr/amount-entered":
+      return {
+        ...state,
+        deposit: {
+          ...state.deposit,
+          amount: action.amount,
+          targetAmount: action.targetAmount,
+          targetTokenPriceUsd: action.targetTokenPriceUsd,
+          inputAmountUsd: action.targetAmount
+        },
+        flow: { ...state.flow, step: "qr-review" }
+      };
+    case "qr/review-closed":
+      return {
+        ...state,
+        deposit: {
+          ...state.deposit,
+          amount: null,
+          targetAmount: null,
+          targetTokenPriceUsd: null,
+          inputAmountUsd: null
+        },
+        flow: { ...state.flow, step: "deposit-address" }
+      };
     case "solana/token-selected":
       return {
         ...state,
@@ -5885,6 +6370,7 @@ function applyAction(state, action) {
           targetChain: action.targetChain ?? state.processing.targetChain ?? state.deposit.targetChain,
           targetToken: action.targetToken ?? state.processing.targetToken ?? state.deposit.targetToken,
           directTransfer: action.directTransfer ?? false,
+          sourceTxHashPending: action.sourceTxHashPending ?? false,
           swappedContext: action.swappedContext ?? null,
           initialEvent: action.initialEvent ?? null,
           quote: action.quote ?? null
@@ -6091,6 +6577,7 @@ function applyAction(state, action) {
           targetChain: null,
           targetToken: null,
           directTransfer: false,
+          sourceTxHashPending: false,
           swappedContext: null,
           initialEvent: null,
           quote: null
@@ -6132,7 +6619,7 @@ function applyAction(state, action) {
           }
         };
       }
-      const nextStep = state.flow.step === "confirm" ? "amount" : state.flow.step;
+      const nextStep = state.flow.step === "confirm" ? "amount" : state.flow.step === "qr-review" ? "qr-amount" : state.flow.step;
       return {
         ...state,
         deposit: {
@@ -6193,7 +6680,7 @@ function useDepositStore(selector) {
 }
 
 // src/DepositFlow.tsx
-import { Fragment as Fragment5, jsx as jsx25, jsxs as jsxs21 } from "react/jsx-runtime";
+import { Fragment as Fragment6, jsx as jsx27, jsxs as jsxs23 } from "react/jsx-runtime";
 function swappedWidgetPrefetchKey(method, methodSelectionSource) {
   return JSON.stringify([methodSelectionSource ?? null, method ?? null]);
 }
@@ -6201,23 +6688,24 @@ function AccountPreparingSkeleton({
   errorMessage,
   onRetry
 }) {
-  return /* @__PURE__ */ jsxs21("div", { className: "rs-step", children: [
-    /* @__PURE__ */ jsx25("div", { className: "rs-step-body", style: { paddingTop: 0 }, children: /* @__PURE__ */ jsx25("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx25("div", { className: "rs-loading-text", children: errorMessage ? /* @__PURE__ */ jsxs21(Fragment5, { children: [
-      /* @__PURE__ */ jsx25("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t prepare account" }),
-      /* @__PURE__ */ jsx25("div", { className: "rs-loading-subtitle", children: errorMessage })
-    ] }) : /* @__PURE__ */ jsx25("div", { className: "rs-loading-title", children: "Preparing\u2026" }) }) }) }),
-    errorMessage && onRetry && /* @__PURE__ */ jsx25("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx25(
+  return /* @__PURE__ */ jsxs23("div", { className: "rs-step", children: [
+    /* @__PURE__ */ jsx27("div", { className: "rs-step-body", style: { paddingTop: 0 }, children: /* @__PURE__ */ jsx27("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx27("div", { className: "rs-loading-text", children: errorMessage ? /* @__PURE__ */ jsxs23(Fragment6, { children: [
+      /* @__PURE__ */ jsx27("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t prepare account" }),
+      /* @__PURE__ */ jsx27("div", { className: "rs-loading-subtitle", children: errorMessage })
+    ] }) : /* @__PURE__ */ jsx27("div", { className: "rs-loading-title", children: "Preparing\u2026" }) }) }) }),
+    errorMessage && onRetry && /* @__PURE__ */ jsx27("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx27(
       "button",
       {
         type: "button",
         className: "rs-button rs-button--default rs-button--full-width",
         onClick: onRetry,
-        children: /* @__PURE__ */ jsx25("span", { children: "Try again" })
+        children: /* @__PURE__ */ jsx27("span", { children: "Try again" })
       }
     ) })
   ] });
 }
 var DAPP_IMPORT_RESOLVE_TIMEOUT_MS = 1e4;
+var DEFAULT_SETUP_CHAIN_ID = 8453;
 var SWAPPED_SOURCE_CHAIN = 8453;
 var SWAPPED_SOURCE_TOKEN = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
 var SWAPPED_SOURCE_DECIMALS = 6;
@@ -6286,7 +6774,8 @@ function deriveStep(flow, d, p, activeEntry, fiat, exchange) {
       return {
         type: "deposit-address",
         smartAccount,
-        solanaDepositAddress: solanaDepositAddress ?? void 0
+        solanaDepositAddress: solanaDepositAddress ?? void 0,
+        qrSource: d.qrSource ?? void 0
       };
     case "fiat-onramp":
       if (!committedAccount) return { type: "setup" };
@@ -6332,6 +6821,26 @@ function deriveStep(flow, d, p, activeEntry, fiat, exchange) {
         targetTokenPriceUsd: d.targetTokenPriceUsd,
         balance: d.balance ?? void 0
       };
+    case "qr-amount":
+      if (!smartAccount || !d.selectedAsset) return { type: "setup" };
+      return {
+        type: "qr-amount",
+        smartAccount,
+        asset: d.selectedAsset,
+        inputAmountUsd: d.inputAmountUsd ?? void 0
+      };
+    case "qr-review":
+      if (!smartAccount || !d.selectedAsset || !d.amount || !d.targetAmount) {
+        return { type: "setup" };
+      }
+      return {
+        type: "qr-review",
+        smartAccount,
+        asset: d.selectedAsset,
+        amount: d.amount,
+        targetAmount: d.targetAmount,
+        targetTokenPriceUsd: d.targetTokenPriceUsd
+      };
     case "solana-token-select":
       if (!smartAccount || !solanaDepositAddress) return { type: "setup" };
       return {
@@ -6398,6 +6907,7 @@ function deriveStep(flow, d, p, activeEntry, fiat, exchange) {
         sourceDecimals: d.sourceDecimals ?? void 0,
         inputAmountUsd: d.inputAmountUsd ?? void 0,
         directTransfer: p.directTransfer,
+        sourceTxHashPending: p.sourceTxHashPending,
         swappedContext: p.swappedContext ?? void 0,
         initialEvent: p.initialEvent ?? void 0,
         quote: p.quote ?? void 0
@@ -6441,9 +6951,10 @@ function DepositFlow({
   enableWallet = true,
   enableFiatOnramp = false,
   enableQrTransfer = true,
+  enableGaslessDeposit = false,
   fiatMethods,
   enableExchangeConnect = false,
-  reownWallet,
+  walletSession,
   onConnect,
   onDisconnect,
   onRequestConnect,
@@ -6452,6 +6963,8 @@ function DepositFlow({
   appFeesResolved,
   onStepChange,
   onSwappedImmersiveChange,
+  openExternally,
+  onSubmittingChange,
   onClose,
   onLifecycle,
   onEvent,
@@ -6474,7 +6987,7 @@ function DepositFlow({
   const flowMode = flowSlice.mode;
   const isConnectSelectionConfirmed = flowSlice.isConnectSelectionConfirmed;
   const selectedWalletId = useDepositStore(selectedWalletIdSelector);
-  const [totalBalanceUsd, setTotalBalanceUsd] = useState12(0);
+  const [totalBalanceUsd, setTotalBalanceUsd] = useState13(0);
   const stableWalletSignerRef = useRef8(null);
   const stableWalletSelectionKeyRef = useRef8(null);
   const logFlow = useCallback7(
@@ -6490,7 +7003,7 @@ function DepositFlow({
     [debug]
   );
   const enableSwappedPreconnect = enableFiatOnramp || enableExchangeConnect;
-  useEffect11(() => {
+  useEffect12(() => {
     if (!enableSwappedPreconnect) return;
     if (typeof document === "undefined") return;
     const links = [];
@@ -6528,27 +7041,27 @@ function DepositFlow({
       });
       seen.add(id);
     }
-    if (reownWallet?.isConnected && reownWallet.isSolana && reownWallet.solanaAddress) {
-      const id = reownWallet.caipAddress ?? `solana:${reownWallet.solanaAddress}`;
+    if (walletSession?.isConnected && walletSession.isSolana && walletSession.solanaAddress) {
+      const id = walletSession.caipAddress ?? `solana:${walletSession.solanaAddress}`;
       if (!seen.has(id)) {
         options.push({
           id,
-          solanaAddress: reownWallet.solanaAddress,
+          solanaAddress: walletSession.solanaAddress,
           label: "Solana Wallet",
           kind: "solana",
-          icon: reownWallet.icon
+          icon: walletSession.icon
         });
         seen.add(id);
       }
-    } else if (reownWallet?.address && reownWallet.isConnected && reownWallet.walletClient && reownWallet.publicClient && !seen.has(`evm:${reownWallet.address.toLowerCase()}`)) {
-      const id = `evm:${reownWallet.address.toLowerCase()}`;
+    } else if (walletSession?.address && walletSession.isConnected && walletSession.canSignEvm && !seen.has(`evm:${walletSession.address.toLowerCase()}`)) {
+      const id = `evm:${walletSession.address.toLowerCase()}`;
       if (!seen.has(id)) {
         options.push({
           id,
-          address: reownWallet.address,
+          address: walletSession.address,
           label: "External Wallet",
           kind: "external",
-          icon: reownWallet.icon
+          icon: walletSession.icon
         });
         seen.add(id);
       }
@@ -6556,14 +7069,13 @@ function DepositFlow({
     return options;
   }, [
     connectedWalletAddress,
-    reownWallet?.address,
-    reownWallet?.isConnected,
-    reownWallet?.walletClient,
-    reownWallet?.publicClient,
-    reownWallet?.icon,
-    reownWallet?.isSolana,
-    reownWallet?.solanaAddress,
-    reownWallet?.caipAddress
+    walletSession?.address,
+    walletSession?.isConnected,
+    walletSession?.canSignEvm,
+    walletSession?.icon,
+    walletSession?.isSolana,
+    walletSession?.solanaAddress,
+    walletSession?.caipAddress
   ]);
   const offeredFiatMethods = useMemo7(
     () => fiatMethods ? FIAT_ONRAMP_METHODS.filter((m) => fiatMethods[m.method]) : FIAT_ONRAMP_METHODS,
@@ -6583,14 +7095,14 @@ function DepositFlow({
     hasEnabledAssetMigration
   ].filter(Boolean).length;
   const canAutoLock = Boolean(
-    enableWallet && walletClientProp?.account && !reownWallet && enabledFeatureCount === 1
+    enableWallet && walletClientProp?.account && !walletSession && enabledFeatureCount === 1
   );
   const hasWalletOptions = enableWallet && walletOptions.length > 0;
   const hasReownSession = Boolean(
-    reownWallet?.isConnected || reownWallet?.address
+    walletSession?.isConnected || walletSession?.address
   );
   const isDappImportWalletHydrating = Boolean(
-    hasWalletClientProp && walletClientProp === void 0 || reownWallet && !hasReownSession && !reownWallet.isReady
+    hasWalletClientProp && walletClientProp === void 0 || walletSession && !hasReownSession && !walletSession.isReady
   );
   const showConnectStep = flowMode === null && !isConnectSelectionConfirmed;
   const walletSelectionKey = useMemo7(() => {
@@ -6607,12 +7119,12 @@ function DepositFlow({
     isConnectSelectionConfirmed,
     selectedWalletId
   ]);
-  const setupChainId = typeof targetChain === "number" && !isVirtualDestination(targetChain) ? targetChain : typeof defaultSourceChain === "number" ? defaultSourceChain : base.id;
+  const setupChainId = typeof targetChain === "number" && !isVirtualDestination(targetChain) ? targetChain : typeof defaultSourceChain === "number" ? defaultSourceChain : DEFAULT_SETUP_CHAIN_ID;
   const targetChainId = targetChainToChainId(targetChain);
   const targetSymbol = getTargetTokenSymbol(targetToken, targetChainId);
   const isTargetStablecoin = isStablecoinSymbol(targetSymbol);
   const targetMarketPriceRef = useRef8(null);
-  useEffect11(() => {
+  useEffect12(() => {
     targetMarketPriceRef.current = null;
     if (isTargetStablecoin || targetSymbol === "Token") {
       return;
@@ -6660,12 +7172,12 @@ function DepositFlow({
         switchChain: dappSwitchChain
       };
     }
-    if (selectedOption.kind === "external" && reownWallet?.address && selectedOption.address && reownWallet.address.toLowerCase() === selectedOption.address.toLowerCase()) {
+    if (selectedOption.kind === "external" && walletSession?.address && selectedOption.address && walletSession.address.toLowerCase() === selectedOption.address.toLowerCase()) {
       return {
-        ownerAddress: reownWallet.address,
-        walletClient: reownWallet.walletClient,
-        publicClient: reownWallet.publicClient ?? getPublicClient(setupChainId, rpcUrls),
-        switchChain: reownWallet.switchChain
+        ownerAddress: walletSession.address,
+        walletClient: walletSession.walletClient,
+        publicClient: walletSession.publicClient ?? getPublicClient(setupChainId, rpcUrls),
+        switchChain: walletSession.switchChain
       };
     }
     return null;
@@ -6677,11 +7189,20 @@ function DepositFlow({
     walletClientProp,
     publicClientProp,
     dappSwitchChain,
-    reownWallet,
+    walletSession,
+    // A viem client is bound to its account and chain at construction, so a new
+    // one IS the signal that the signing target moved — which is why this
+    // stays, even though the picker no longer reads the client's presence as
+    // the capability. A session with a stable identity (the bridged one keeps
+    // one deliberately, and exposes the client through a getter) changes
+    // nothing else here when the host switches chain, and the context would go
+    // on holding a client bound to the old one: `chainMismatch` never clears
+    // and the CTA stays disabled with nothing beside it.
+    walletSession?.walletClient,
     setupChainId,
     rpcUrls
   ]);
-  useEffect11(() => {
+  useEffect12(() => {
     if (flowMode !== "wallet" && flowMode !== "dapp-import") {
       stableWalletSelectionKeyRef.current = null;
       stableWalletSignerRef.current = null;
@@ -6727,15 +7248,15 @@ function DepositFlow({
   }, [selectedWalletId, walletOptions]);
   const dappImportOwner = useMemo7(() => {
     if (selectedEvmWalletOwner) return selectedEvmWalletOwner;
-    if (reownWallet?.address && reownWallet.isConnected) {
-      return reownWallet.address;
+    if (walletSession?.address && walletSession.isConnected) {
+      return walletSession.address;
     }
     if (connectedWalletAddress) return connectedWalletAddress;
     return null;
   }, [
     selectedEvmWalletOwner,
-    reownWallet?.address,
-    reownWallet?.isConnected,
+    walletSession?.address,
+    walletSession?.isConnected,
     connectedWalletAddress
   ]);
   const activeOwner = useMemo7(
@@ -6754,7 +7275,7 @@ function DepositFlow({
   );
   const activeEntry = setupSlice;
   const lastSmartAccountLifecycleKeyRef = useRef8(null);
-  useEffect11(() => {
+  useEffect12(() => {
     if (activeEntry.status !== "ready" || !activeEntry.smartAccount) return;
     const lifecycleKey = [
       activeEntry.smartAccount.toLowerCase(),
@@ -6774,7 +7295,7 @@ function DepositFlow({
     onLifecycleRef
   ]);
   const lastConnectedLifecycleKeyRef = useRef8(null);
-  useEffect11(() => {
+  useEffect12(() => {
     if (!flowMode || !isConnectSelectionConfirmed) {
       lastConnectedLifecycleKeyRef.current = null;
       return;
@@ -6825,21 +7346,44 @@ function DepositFlow({
   const handleBack = useCallback7(() => {
     storeApi.dispatch({
       type: "back/requested",
-      hasWalletOptions: hasWalletOptions || Boolean(reownWallet)
+      hasWalletOptions: hasWalletOptions || Boolean(walletSession)
     });
-  }, [storeApi, hasWalletOptions, reownWallet]);
-  const canGoBackFromHere = effectiveStep.type === "deposit-address" || effectiveStep.type === "solana-token-select" || effectiveStep.type === "solana-amount" || effectiveStep.type === "solana-confirm" || effectiveStep.type === "amount" || effectiveStep.type === "confirm" || // Escape hatch from a slow or stuck pre-routed resolve. Mode-gated so
+  }, [storeApi, hasWalletOptions, walletSession]);
+  const qrSourceAsset = effectiveStep.type === "qr-amount" ? effectiveStep.asset : null;
+  const qrSourceKey = qrSourceAsset ? `${qrSourceAsset.chainId}:${qrSourceAsset.token}` : null;
+  const [qrSourcePrice, setQrSourcePrice] = useState13({ resolved: false, usd: null });
+  useEffect12(() => {
+    setQrSourcePrice({ resolved: false, usd: null });
+    if (!qrSourceAsset) return;
+    let cancelled = false;
+    fetchTokenPriceUsd(service, {
+      chainId: qrSourceAsset.chainId,
+      address: qrSourceAsset.token,
+      symbol: qrSourceAsset.symbol
+    }).then((usd) => {
+      if (!cancelled) setQrSourcePrice({ resolved: true, usd });
+    }).catch(() => {
+      if (!cancelled) setQrSourcePrice({ resolved: true, usd: null });
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [service, qrSourceKey]);
+  const canGoBackFromHere = effectiveStep.type === "deposit-address" || effectiveStep.type === "solana-token-select" || effectiveStep.type === "solana-amount" || effectiveStep.type === "solana-confirm" || effectiveStep.type === "amount" || effectiveStep.type === "confirm" || // Without these the QR detour has no exit but the modal's close button,
+  // which drops the user out of the deposit entirely rather than back to
+  // the address they came from.
+  effectiveStep.type === "qr-amount" || effectiveStep.type === "qr-review" || // Escape hatch from a slow or stuck pre-routed resolve. Mode-gated so
   // the chevron doesn't linger if a disconnect cleared the mode out from
   // under the step.
   effectiveStep.type === "dapp-import-resolving" && flowMode === "dapp-import" || effectiveStep.type === "dapp-import-select" || effectiveStep.type === "dapp-import-asset-select" || effectiveStep.type === "fiat-onramp" || effectiveStep.type === "exchange-select" || effectiveStep.type === "exchange-connect" || effectiveStep.type === "select-asset" && signerContext && !canAutoLock;
   const currentBackHandler = canGoBackFromHere ? handleBack : void 0;
   const currentScreen = showConnectStep ? "connect" : effectiveStep.type;
-  useEffect11(() => {
+  useEffect12(() => {
     onStepChangeRef.current?.(currentBackHandler, currentScreen);
   }, [currentBackHandler, currentScreen, onStepChangeRef]);
   const lastModalHeightRef = useRef8(0);
   const modalContentElRef = useRef8(null);
-  useEffect11(() => {
+  useEffect12(() => {
     const mc = document.querySelector(".rs-modal-content");
     if (!mc) return;
     modalContentElRef.current = mc;
@@ -6876,7 +7420,7 @@ function DepositFlow({
   const stepSendToken = effectiveStep.type === "amount" ? effectiveStep.asset.symbol : null;
   const stepOpenEventKey = effectiveStep.type === "select-asset" ? "select-asset" : effectiveStep.type === "deposit-address" ? "deposit-address" : effectiveStep.type === "amount" && stepSendToken ? `amount:${stepSendToken.toLowerCase()}` : null;
   const lastStepOpenEventKeyRef = useRef8(null);
-  useEffect11(() => {
+  useEffect12(() => {
     if (!stepOpenEventKey) {
       lastStepOpenEventKeyRef.current = null;
       return;
@@ -6918,7 +7462,7 @@ function DepositFlow({
     totalBalanceUsd,
     onEventRef
   ]);
-  useEffect11(() => {
+  useEffect12(() => {
     logFlow("state:changed", {
       step: effectiveStep.type,
       flowMode,
@@ -6934,7 +7478,7 @@ function DepositFlow({
     targetChain,
     targetToken
   ]);
-  useEffect11(() => {
+  useEffect12(() => {
     onLifecycleRef.current?.({
       type: "balance-changed",
       totalUsd: totalBalanceUsd
@@ -6961,7 +7505,7 @@ function DepositFlow({
     [walletOptions, storeApi]
   );
   const isSolanaWalletConnected = Boolean(
-    reownWallet?.isConnected && reownWallet?.isSolana
+    walletSession?.isConnected && walletSession?.isSolana
   );
   const assetMigrationsKey = assetMigrations ? Object.keys(assetMigrations).filter((k) => assetMigrations[k]).sort().join(",") : "";
   const enabledDappImportProviders = useMemo7(
@@ -7003,7 +7547,7 @@ function DepositFlow({
   const dappImportAttemptNonce = useDepositStore(
     (s) => s.dappImport.attemptNonce
   );
-  useEffect11(() => {
+  useEffect12(() => {
     if (!dappImportOwner || enabledDappImportProviders.length === 0) {
       storeApi.dispatch({ type: "dapp-import/availability-cleared" });
       return;
@@ -7125,8 +7669,8 @@ function DepositFlow({
     dappImportOwner
   ]);
   const isBootResolving = isDappImportMode && flowSlice.step === "dapp-import-resolving";
-  const [hasResolveDeadlinePassed, setHasResolveDeadlinePassed] = useState12(false);
-  useEffect11(() => {
+  const [hasResolveDeadlinePassed, setHasResolveDeadlinePassed] = useState13(false);
+  useEffect12(() => {
     setHasResolveDeadlinePassed(false);
     if (!isBootResolving || dappImportBootError) return;
     const timeout = window.setTimeout(() => {
@@ -7134,7 +7678,7 @@ function DepositFlow({
     }, DAPP_IMPORT_RESOLVE_TIMEOUT_MS);
     return () => window.clearTimeout(timeout);
   }, [isBootResolving, dappImportBootError]);
-  useEffect11(() => {
+  useEffect12(() => {
     if (!isBootResolving || dappImportBootError) return;
     const providerId = activeDappImportProviderId;
     if (!providerId) return;
@@ -7350,19 +7894,19 @@ function DepositFlow({
       prefetchSwappedWidgetUrl
     ]
   );
-  useEffect11(() => {
+  useEffect12(() => {
     swappedUrlPrefetchRef.current.clear();
     swappedConnectUrlRef.current.clear();
     acknowledgedConnectFeeRef.current.clear();
   }, [setupSlice.smartAccount]);
   const hasConfiguredFiatMethods = fiatMethods !== void 0;
-  const [regionalMethods, setRegionalMethods] = useState12({
+  const [regionalMethods, setRegionalMethods] = useState13({
     status: "loading",
     country: null,
     methods: [],
     recommendedMethod: null
   });
-  useEffect11(() => {
+  useEffect12(() => {
     if (!fiatEnabled || hasConfiguredFiatMethods) return;
     let cancelled = false;
     setRegionalMethods({
@@ -7417,7 +7961,7 @@ function DepositFlow({
     regionalMethods
   ]);
   const lastFiatMethodsRenderedEventRef = useRef8(null);
-  useEffect11(() => {
+  useEffect12(() => {
     if (cashDisplay.kind !== "list") return;
     const emit = onEventRef.current;
     if (!emit) return;
@@ -7497,7 +8041,7 @@ function DepositFlow({
   );
   const desiredSetupRequestKey = computeRequestKey(setupInput);
   const setupReady = setupSlice.status === "ready" && setupSlice.requestKey === desiredSetupRequestKey;
-  useEffect11(() => {
+  useEffect12(() => {
     void (async () => {
       const requestKey = computeRequestKey(setupInput);
       const cacheKey = computeCacheKey(setupInput);
@@ -7568,7 +8112,7 @@ function DepositFlow({
     // eslint-disable-next-line react-hooks/exhaustive-deps -- keyed on the stable id-join, not the walletOptions array identity
     [walletOptionsKey]
   );
-  useEffect11(() => {
+  useEffect12(() => {
     storeApi.dispatch({
       type: "portfolio/reconciled",
       wallets: desiredPortfolios
@@ -7725,6 +8269,25 @@ function DepositFlow({
     },
     [targetToken, targetChain, storeApi, activeOwner]
   );
+  const handleQrReviewRequested = useCallback7(
+    (asset) => {
+      storeApi.dispatch({ type: "qr/review-requested", asset });
+    },
+    [storeApi]
+  );
+  const handleQrAmountContinue = useCallback7(
+    (amount, targetAmount) => {
+      const targetSym = getTargetTokenSymbol(targetToken, targetChainId);
+      const targetTokenPriceUsd = isStablecoinSymbol(targetSym) ? 1 : targetMarketPriceRef.current;
+      storeApi.dispatch({
+        type: "qr/amount-entered",
+        amount,
+        targetAmount,
+        targetTokenPriceUsd
+      });
+    },
+    [targetToken, targetChainId, storeApi]
+  );
   const handleDepositSubmitted = useCallback7(
     (txHash, chainId, amount, token, quote, routed) => {
       logFlow("evm:submitted", {
@@ -7750,6 +8313,7 @@ function DepositFlow({
         sourceDecimals: asset?.decimals,
         inputAmountUsd: depositAtSubmit.inputAmountUsd ?? void 0,
         directTransfer: routed.directTransfer,
+        sourceTxHashPending: routed.sourceTxHashPending,
         quote
       });
     },
@@ -7855,7 +8419,7 @@ function DepositFlow({
   const handleTotalBalanceComputed = useCallback7((total) => {
     setTotalBalanceUsd(total);
   }, []);
-  useEffect11(() => {
+  useEffect12(() => {
     if (storeApi.getState().flow.mode) {
       return;
     }
@@ -7865,7 +8429,7 @@ function DepositFlow({
       storeApi.dispatch({ type: "flow/step-set", step: "connect" });
     }
   }, [walletOptionsKey]);
-  useEffect11(() => {
+  useEffect12(() => {
     if (!showConnectStep && isConnectSelectionConfirmed && (flowMode === "wallet" || flowMode === "dapp-import") && flowSlice.step !== "dapp-import-resolving" && flowSlice.step !== "dapp-import-select" && !signerContext) {
       storeApi.dispatch({ type: "wallet/cleared" });
     }
@@ -7909,7 +8473,7 @@ function DepositFlow({
     storeApi.dispatch({ type: "setup/retry-requested" });
   }, [storeApi]);
   if (showConnectStep) {
-    return /* @__PURE__ */ jsx25("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx25(
+    return /* @__PURE__ */ jsx27("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx27(
       ConnectStep,
       {
         walletRows,
@@ -7962,20 +8526,20 @@ function DepositFlow({
     ) });
   }
   if (isDepositAddressMode) {
-    return /* @__PURE__ */ jsxs21("div", { className: "rs-modal-body", children: [
-      effectiveStep.type === "setup" && (activeEntry.status === "error" ? /* @__PURE__ */ jsx25(
+    return /* @__PURE__ */ jsxs23("div", { className: "rs-modal-body", children: [
+      effectiveStep.type === "setup" && (activeEntry.status === "error" ? /* @__PURE__ */ jsx27(
         AccountPreparingSkeleton,
         {
           errorMessage: activeEntry.message ?? void 0,
           onRetry: () => handleRetrySetup()
         }
-      ) : /* @__PURE__ */ jsx25(
+      ) : /* @__PURE__ */ jsx27(
         DepositAddressSkeleton,
         {
           uiConfig
         }
       )),
-      effectiveStep.type === "deposit-address" && /* @__PURE__ */ jsx25(
+      effectiveStep.type === "deposit-address" && /* @__PURE__ */ jsx27(
         DepositAddressStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -7984,6 +8548,7 @@ function DepositFlow({
           targetChain,
           targetToken,
           uiConfig,
+          initialSource: effectiveStep.qrSource,
           onDepositSubmitted: handleDepositAddressSubmitted,
           onDepositComplete: handleDepositComplete,
           onDepositFailed: handleDepositFailed,
@@ -7998,28 +8563,59 @@ function DepositFlow({
               cta_name: "copy"
             });
           },
+          onReviewDeposit: handleQrReviewRequested,
           onError: handleError,
           debug
         }
+      ),
+      effectiveStep.type === "qr-amount" && /* @__PURE__ */ jsx27(
+        AmountStep,
+        {
+          asset: effectiveStep.asset,
+          defaultAmount: effectiveStep.inputAmountUsd ?? defaultAmount,
+          targetChain,
+          targetToken,
+          uiConfig,
+          appBalanceUsd,
+          service,
+          tokenPriceUsdOverride: qrSourcePrice.usd ?? void 0,
+          sourcePriceUnavailable: qrSourcePrice.resolved && qrSourcePrice.usd === null,
+          title: "Amount to send",
+          onContinue: handleQrAmountContinue
+        }
+      ),
+      effectiveStep.type === "qr-review" && /* @__PURE__ */ jsx27(
+        QrReviewStep,
+        {
+          smartAccount: effectiveStep.smartAccount,
+          asset: effectiveStep.asset,
+          amount: effectiveStep.amount,
+          targetAmount: effectiveStep.targetAmount,
+          targetTokenPriceUsd: effectiveStep.targetTokenPriceUsd,
+          targetChain,
+          targetToken,
+          service,
+          onClose: () => storeApi.dispatch({ type: "qr/review-closed" })
+        }
       )
     ] });
   }
   if (isFiatOnrampMode) {
-    return /* @__PURE__ */ jsxs21(
+    return /* @__PURE__ */ jsxs23(
       "div",
       {
         className: "rs-modal-body",
         "data-flow-mode": "fiat-onramp",
         "data-step-type": step.type,
         children: [
-          step.type === "setup" && /* @__PURE__ */ jsx25(
+          step.type === "setup" && /* @__PURE__ */ jsx27(
             AccountPreparingSkeleton,
             {
               errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
               onRetry: activeEntry.status === "error" ? () => handleRetrySetup() : void 0
             }
           ),
-          step.type === "fiat-onramp" && /* @__PURE__ */ jsx25(
+          step.type === "fiat-onramp" && /* @__PURE__ */ jsx27(
             FiatOnrampStep,
             {
               smartAccount: step.smartAccount,
@@ -8033,10 +8629,11 @@ function DepositFlow({
               }),
               onGoBack: handleBack,
               onError: handleError,
-              onImmersiveChange: onSwappedImmersiveChange
+              onImmersiveChange: onSwappedImmersiveChange,
+              openExternally
             }
           ),
-          step.type === "processing" && /* @__PURE__ */ jsx25(
+          step.type === "processing" && /* @__PURE__ */ jsx27(
             ProcessingStep,
             {
               smartAccount: step.smartAccount,
@@ -8054,6 +8651,7 @@ function DepositFlow({
               quote: step.quote,
               service,
               directTransfer: step.directTransfer,
+              sourceTxHashPending: step.sourceTxHashPending,
               initialEvent: step.initialEvent,
               isSwappedOrder: true,
               uiConfig,
@@ -8070,21 +8668,21 @@ function DepositFlow({
     );
   }
   if (isExchangeConnectMode) {
-    return /* @__PURE__ */ jsxs21(
+    return /* @__PURE__ */ jsxs23(
       "div",
       {
         className: "rs-modal-body",
         "data-flow-mode": "exchange-connect",
         "data-step-type": step.type,
         children: [
-          step.type === "setup" && /* @__PURE__ */ jsx25(
+          step.type === "setup" && /* @__PURE__ */ jsx27(
             AccountPreparingSkeleton,
             {
               errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
               onRetry: activeEntry.status === "error" ? () => handleRetrySetup() : void 0
             }
           ),
-          step.type === "exchange-select" && /* @__PURE__ */ jsx25(
+          step.type === "exchange-select" && /* @__PURE__ */ jsx27(
             ExchangeSelectStep,
             {
               service,
@@ -8092,7 +8690,7 @@ function DepositFlow({
               onError: handleError
             }
           ),
-          step.type === "exchange-connect" && /* @__PURE__ */ jsx25(
+          step.type === "exchange-connect" && /* @__PURE__ */ jsx27(
             ExchangeConnectStep,
             {
               smartAccount: step.smartAccount,
@@ -8105,10 +8703,11 @@ function DepositFlow({
               }),
               onGoBack: handleBack,
               onError: handleError,
-              onImmersiveChange: onSwappedImmersiveChange
+              onImmersiveChange: onSwappedImmersiveChange,
+              openExternally
             }
           ),
-          step.type === "processing" && /* @__PURE__ */ jsx25(
+          step.type === "processing" && /* @__PURE__ */ jsx27(
             ProcessingStep,
             {
               smartAccount: step.smartAccount,
@@ -8126,6 +8725,7 @@ function DepositFlow({
               quote: step.quote,
               service,
               directTransfer: step.directTransfer,
+              sourceTxHashPending: step.sourceTxHashPending,
               initialEvent: step.initialEvent,
               isSwappedOrder: true,
               uiConfig,
@@ -8142,17 +8742,17 @@ function DepositFlow({
     );
   }
   if (isSolanaWalletMode) {
-    const solanaAddr = reownWallet?.solanaAddress;
-    const solanaProvider = reownWallet?.solanaProvider;
-    return /* @__PURE__ */ jsxs21("div", { className: "rs-modal-body", children: [
-      effectiveStep.type === "setup" && /* @__PURE__ */ jsx25(
+    const solanaAddr = walletSession?.solanaAddress;
+    const solanaProvider = walletSession?.solanaProvider;
+    return /* @__PURE__ */ jsxs23("div", { className: "rs-modal-body", children: [
+      effectiveStep.type === "setup" && /* @__PURE__ */ jsx27(
         AccountPreparingSkeleton,
         {
           errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
           onRetry: activeEntry.status === "error" ? () => handleRetrySetup() : void 0
         }
       ),
-      effectiveStep.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ jsx25(
+      effectiveStep.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ jsx27(
         SolanaTokenSelectStep,
         {
           solanaAddress: solanaAddr,
@@ -8166,7 +8766,7 @@ function DepositFlow({
           debug
         }
       ),
-      effectiveStep.type === "solana-amount" && /* @__PURE__ */ jsx25(
+      effectiveStep.type === "solana-amount" && /* @__PURE__ */ jsx27(
         SolanaAmountStep,
         {
           token: effectiveStep.token,
@@ -8182,7 +8782,7 @@ function DepositFlow({
           debug
         }
       ),
-      effectiveStep.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx25(
+      effectiveStep.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx27(
         SolanaConfirmStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -8197,22 +8797,22 @@ function DepositFlow({
           targetToken,
           service,
           solanaProvider,
-          solanaConnection: reownWallet?.solanaConnection,
+          solanaConnection: walletSession?.solanaConnection,
           uiConfig,
           onConfirm: handleSolanaConfirmed,
           onError: handleError,
           debug
         }
-      ) : effectiveStep.type === "solana-confirm" ? /* @__PURE__ */ jsxs21("div", { className: "rs-step", children: [
-        /* @__PURE__ */ jsxs21("div", { className: "rs-loading-state", children: [
-          /* @__PURE__ */ jsx25("div", { className: "rs-step-icon rs-step-icon--error", children: /* @__PURE__ */ jsx25(
+      ) : effectiveStep.type === "solana-confirm" ? /* @__PURE__ */ jsxs23("div", { className: "rs-step", children: [
+        /* @__PURE__ */ jsxs23("div", { className: "rs-loading-state", children: [
+          /* @__PURE__ */ jsx27("div", { className: "rs-step-icon rs-step-icon--error", children: /* @__PURE__ */ jsx27(
             "svg",
             {
               viewBox: "0 0 24 24",
               fill: "none",
               stroke: "currentColor",
               strokeWidth: "2",
-              children: /* @__PURE__ */ jsx25(
+              children: /* @__PURE__ */ jsx27(
                 "path",
                 {
                   strokeLinecap: "round",
@@ -8222,22 +8822,22 @@ function DepositFlow({
               )
             }
           ) }),
-          /* @__PURE__ */ jsxs21("div", { className: "rs-loading-text", children: [
-            /* @__PURE__ */ jsx25("div", { className: "rs-loading-title rs-text-error", children: "Wallet disconnected" }),
-            /* @__PURE__ */ jsx25("div", { className: "rs-loading-subtitle", children: "Please reconnect your Solana wallet to continue." })
+          /* @__PURE__ */ jsxs23("div", { className: "rs-loading-text", children: [
+            /* @__PURE__ */ jsx27("div", { className: "rs-loading-title rs-text-error", children: "Wallet disconnected" }),
+            /* @__PURE__ */ jsx27("div", { className: "rs-loading-subtitle", children: "Please reconnect your Solana wallet to continue." })
           ] })
         ] }),
-        /* @__PURE__ */ jsx25("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx25(
+        /* @__PURE__ */ jsx27("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx27(
           "button",
           {
             type: "button",
             className: "rs-button rs-button--default rs-button--full-width",
             onClick: handleBack,
-            children: /* @__PURE__ */ jsx25("span", { children: "Go Back" })
+            children: /* @__PURE__ */ jsx27("span", { children: "Go Back" })
           }
         ) })
       ] }) : null,
-      effectiveStep.type === "processing" && /* @__PURE__ */ jsx25(
+      effectiveStep.type === "processing" && /* @__PURE__ */ jsx27(
         ProcessingStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -8253,6 +8853,7 @@ function DepositFlow({
           amountUsd: effectiveStep.inputAmountUsd,
           service,
           directTransfer: effectiveStep.directTransfer,
+          sourceTxHashPending: effectiveStep.sourceTxHashPending,
           initialEvent: effectiveStep.initialEvent,
           quote: effectiveStep.quote,
           onClose,
@@ -8266,13 +8867,13 @@ function DepositFlow({
     ] });
   }
   if (isDappImportMode && effectiveStep.type === "dapp-import-resolving") {
-    return /* @__PURE__ */ jsx25(
+    return /* @__PURE__ */ jsx27(
       "div",
       {
         className: "rs-modal-body",
         "data-flow-mode": "dapp-import",
         "data-step-type": effectiveStep.type,
-        children: /* @__PURE__ */ jsx25(
+        children: /* @__PURE__ */ jsx27(
           DappImportAssetSelectSkeleton,
           {
             sourceLabel: activeDappImportProvider?.sourceLabel ?? "",
@@ -8284,13 +8885,13 @@ function DepositFlow({
     );
   }
   if (effectiveStep.type === "dapp-import-select") {
-    return /* @__PURE__ */ jsx25(
+    return /* @__PURE__ */ jsx27(
       "div",
       {
         className: "rs-modal-body",
         "data-flow-mode": "dapp-import",
         "data-step-type": effectiveStep.type,
-        children: /* @__PURE__ */ jsx25(
+        children: /* @__PURE__ */ jsx27(
           DappImportSelectStep,
           {
             enabledIds: enabledAssetMigrationIds,
@@ -8317,7 +8918,7 @@ function DepositFlow({
     );
   }
   if (!signerContext?.walletClient || !signerContext?.publicClient) {
-    return /* @__PURE__ */ jsx25("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx25("div", { className: "rs-step", children: /* @__PURE__ */ jsx25("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx25("div", { className: "rs-loading-text", children: /* @__PURE__ */ jsx25("div", { className: "rs-loading-title", children: "Connecting wallet\u2026" }) }) }) }) });
+    return /* @__PURE__ */ jsx27("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx27("div", { className: "rs-step", children: /* @__PURE__ */ jsx27("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx27("div", { className: "rs-loading-text", children: /* @__PURE__ */ jsx27("div", { className: "rs-loading-title", children: "Connecting wallet\u2026" }) }) }) }) });
   }
   const ownerAddress = signerContext.ownerAddress;
   const ownerChainId = signerContext.walletClient?.chain?.id ?? signerContext.publicClient.chain?.id ?? setupChainId;
@@ -8327,15 +8928,15 @@ function DepositFlow({
     }
     return getPublicClient(chainId, rpcUrls);
   };
-  return /* @__PURE__ */ jsxs21("div", { className: "rs-modal-body", children: [
-    effectiveStep.type === "setup" && /* @__PURE__ */ jsx25(
+  return /* @__PURE__ */ jsxs23("div", { className: "rs-modal-body", children: [
+    effectiveStep.type === "setup" && /* @__PURE__ */ jsx27(
       AccountPreparingSkeleton,
       {
         errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
         onRetry: activeEntry.status === "error" ? () => handleRetrySetup() : void 0
       }
     ),
-    effectiveStep.type === "select-asset" && /* @__PURE__ */ jsx25(
+    effectiveStep.type === "select-asset" && /* @__PURE__ */ jsx27(
       AssetSelectStep,
       {
         address: ownerAddress,
@@ -8351,7 +8952,7 @@ function DepositFlow({
         } : void 0
       }
     ),
-    effectiveStep.type === "dapp-import-asset-select" && activeDappImportProvider && activeDappImportAvailability && /* @__PURE__ */ jsx25(
+    effectiveStep.type === "dapp-import-asset-select" && activeDappImportProvider && activeDappImportAvailability && /* @__PURE__ */ jsx27(
       DappImportAssetSelectStep,
       {
         sourceLabel: activeDappImportAvailability.assets[0]?.sourceLabel ?? activeDappImportProvider.sourceLabel,
@@ -8360,7 +8961,7 @@ function DepositFlow({
         onSelect: handleDappImportAssetSelected
       }
     ),
-    effectiveStep.type === "amount" && /* @__PURE__ */ jsx25(
+    effectiveStep.type === "amount" && /* @__PURE__ */ jsx27(
       AmountStep,
       {
         walletClient: signerContext.walletClient,
@@ -8388,7 +8989,7 @@ function DepositFlow({
         }
       }
     ),
-    effectiveStep.type === "confirm" && /* @__PURE__ */ jsx25(
+    effectiveStep.type === "confirm" && /* @__PURE__ */ jsx27(
       ConfirmStep,
       {
         walletClient: signerContext.walletClient,
@@ -8409,6 +9010,7 @@ function DepositFlow({
         service,
         setupRequestKey: desiredSetupRequestKey,
         setupReady,
+        enableGaslessDeposit,
         executeTransfer: isDappImportMode && activeDappImportProvider && isDappImportAsset(effectiveStep.asset) ? async (amountUnits) => {
           const result = await activeDappImportProvider.executeTransfer(
             {
@@ -8432,10 +9034,11 @@ function DepositFlow({
         } : void 0,
         onConfirm: handleDepositSubmitted,
         onDepositSubmitted: handleDepositSubmittedCallback,
+        onSubmittingChange,
         onError: handleError
       }
     ),
-    effectiveStep.type === "processing" && /* @__PURE__ */ jsx25(
+    effectiveStep.type === "processing" && /* @__PURE__ */ jsx27(
       ProcessingStep,
       {
         smartAccount: effectiveStep.smartAccount,
@@ -8451,6 +9054,7 @@ function DepositFlow({
         amountUsd: effectiveStep.inputAmountUsd,
         service,
         directTransfer: effectiveStep.directTransfer,
+        sourceTxHashPending: effectiveStep.sourceTxHashPending,
         initialEvent: effectiveStep.initialEvent,
         quote: effectiveStep.quote,
         uiConfig,
@@ -8467,8 +9071,8 @@ function DepositFlow({
 }
 
 // src/components/history/DepositHistoryPanel.tsx
-import { useCallback as useCallback8, useMemo as useMemo8, useState as useState13 } from "react";
-import { jsx as jsx26, jsxs as jsxs22 } from "react/jsx-runtime";
+import { useCallback as useCallback8, useMemo as useMemo8, useState as useState14 } from "react";
+import { jsx as jsx28, jsxs as jsxs24 } from "react/jsx-runtime";
 function shortenHash(hash) {
   if (hash.length <= 14) return hash;
   return `${hash.slice(0, 6)}\u2026${hash.slice(-4)}`;
@@ -8547,12 +9151,6 @@ function formatAmount(rawAmount, token, chainId) {
     return rawAmount;
   }
 }
-function getTxExplorerUrl(txHash, chainId) {
-  if (!chainId) return null;
-  const base2 = getExplorerUrl(chainId);
-  if (!base2) return null;
-  return `${base2}/tx/${txHash}`;
-}
 function normalizeStatus(raw, isSpam) {
   const lower = raw.toLowerCase();
   if (lower === "completed" || lower === "complete" || lower === "bridge-complete" || lower === "processed")
@@ -8598,7 +9196,7 @@ function DepositHistoryPanel({
       (d) => !(d.txHash && sourceHashes.has(d.txHash.toLowerCase()))
     );
   }, [deposits]);
-  return /* @__PURE__ */ jsxs22(
+  return /* @__PURE__ */ jsxs24(
     "div",
     {
       className: "rs-history-panel",
@@ -8606,55 +9204,55 @@ function DepositHistoryPanel({
       "aria-label": "Deposit history",
       onKeyDown: handleKeyDown,
       children: [
-        /* @__PURE__ */ jsxs22("div", { className: "rs-modal-header--redesigned", children: [
-          /* @__PURE__ */ jsx26("div", { className: "rs-modal-header-nav-left", children: /* @__PURE__ */ jsx26(
+        /* @__PURE__ */ jsxs24("div", { className: "rs-modal-header--redesigned", children: [
+          /* @__PURE__ */ jsx28("div", { className: "rs-modal-header-nav-left", children: /* @__PURE__ */ jsx28(
             "button",
             {
               type: "button",
               className: "rs-modal-header-back",
               "aria-label": "Back",
               onClick: onClose,
-              children: /* @__PURE__ */ jsx26(ChevronLeftIcon, {})
+              children: /* @__PURE__ */ jsx28(ChevronLeftIcon, {})
             }
           ) }),
-          /* @__PURE__ */ jsx26("div", { className: "rs-modal-header-nav-right", children: onCloseModal && /* @__PURE__ */ jsx26(
+          /* @__PURE__ */ jsx28("div", { className: "rs-modal-header-nav-right", children: onCloseModal && /* @__PURE__ */ jsx28(
             "button",
             {
               type: "button",
               className: "rs-modal-close",
               "aria-label": "Close",
               onClick: onCloseModal,
-              children: /* @__PURE__ */ jsx26(CloseIcon, {})
+              children: /* @__PURE__ */ jsx28(CloseIcon, {})
             }
           ) })
         ] }),
-        /* @__PURE__ */ jsxs22("div", { className: "rs-history-screen", children: [
-          /* @__PURE__ */ jsxs22("div", { className: "rs-history-screen-body", children: [
-            /* @__PURE__ */ jsx26(BodyHeader, { icon: /* @__PURE__ */ jsx26(HistoryIcon, {}), title: "History" }),
-            isLoading && deposits.length === 0 && /* @__PURE__ */ jsxs22("div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ jsx26("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx26(HistoryIcon, {}) }),
-              /* @__PURE__ */ jsxs22("div", { className: "rs-history-empty-text", children: [
-                /* @__PURE__ */ jsx26(Spinner, { className: "rs-spinner--sm" }),
-                /* @__PURE__ */ jsx26("span", { className: "rs-history-empty-hint", children: "Loading history\u2026" })
+        /* @__PURE__ */ jsxs24("div", { className: "rs-history-screen", children: [
+          /* @__PURE__ */ jsxs24("div", { className: "rs-history-screen-body", children: [
+            /* @__PURE__ */ jsx28(BodyHeader, { icon: /* @__PURE__ */ jsx28(HistoryIcon, {}), title: "History" }),
+            isLoading && deposits.length === 0 && /* @__PURE__ */ jsxs24("div", { className: "rs-history-empty", children: [
+              /* @__PURE__ */ jsx28("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx28(HistoryIcon, {}) }),
+              /* @__PURE__ */ jsxs24("div", { className: "rs-history-empty-text", children: [
+                /* @__PURE__ */ jsx28(Spinner, { className: "rs-spinner--sm" }),
+                /* @__PURE__ */ jsx28("span", { className: "rs-history-empty-hint", children: "Loading history\u2026" })
               ] })
             ] }),
-            error && !isLoading && /* @__PURE__ */ jsxs22("div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ jsx26("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx26(AlertTriangleIcon, {}) }),
-              /* @__PURE__ */ jsxs22("div", { className: "rs-history-empty-text", children: [
-                /* @__PURE__ */ jsx26("span", { className: "rs-history-empty-title", children: "Couldn't load history" }),
-                /* @__PURE__ */ jsx26("span", { className: "rs-history-empty-hint", children: error })
+            error && !isLoading && /* @__PURE__ */ jsxs24("div", { className: "rs-history-empty", children: [
+              /* @__PURE__ */ jsx28("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx28(AlertTriangleIcon, {}) }),
+              /* @__PURE__ */ jsxs24("div", { className: "rs-history-empty-text", children: [
+                /* @__PURE__ */ jsx28("span", { className: "rs-history-empty-title", children: "Couldn't load history" }),
+                /* @__PURE__ */ jsx28("span", { className: "rs-history-empty-hint", children: error })
               ] })
             ] }),
-            !isLoading && !error && visibleDeposits.length === 0 && /* @__PURE__ */ jsxs22("div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ jsx26("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx26(HistoryIcon, {}) }),
-              /* @__PURE__ */ jsxs22("div", { className: "rs-history-empty-text", children: [
-                /* @__PURE__ */ jsx26("span", { className: "rs-history-empty-title", children: "No deposits yet" }),
-                /* @__PURE__ */ jsx26("span", { className: "rs-history-empty-hint", children: "Your deposit history will appear here" })
+            !isLoading && !error && visibleDeposits.length === 0 && /* @__PURE__ */ jsxs24("div", { className: "rs-history-empty", children: [
+              /* @__PURE__ */ jsx28("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx28(HistoryIcon, {}) }),
+              /* @__PURE__ */ jsxs24("div", { className: "rs-history-empty-text", children: [
+                /* @__PURE__ */ jsx28("span", { className: "rs-history-empty-title", children: "No deposits yet" }),
+                /* @__PURE__ */ jsx28("span", { className: "rs-history-empty-hint", children: "Your deposit history will appear here" })
               ] })
             ] }),
-            visibleDeposits.length > 0 && /* @__PURE__ */ jsxs22("div", { className: "rs-history-list", children: [
-              visibleDeposits.map((deposit, i) => /* @__PURE__ */ jsx26(HistoryCard, { deposit }, deposit.txHash || i)),
-              hasMore && /* @__PURE__ */ jsx26(
+            visibleDeposits.length > 0 && /* @__PURE__ */ jsxs24("div", { className: "rs-history-list", children: [
+              visibleDeposits.map((deposit, i) => /* @__PURE__ */ jsx28(HistoryCard, { deposit }, deposit.txHash || i)),
+              hasMore && /* @__PURE__ */ jsx28(
                 "button",
                 {
                   type: "button",
@@ -8666,14 +9264,15 @@ function DepositHistoryPanel({
               )
             ] })
           ] }),
-          /* @__PURE__ */ jsx26(PoweredBy, {})
+          /* @__PURE__ */ jsx28(PoweredBy, {})
         ] })
       ]
     }
   );
 }
 function HistoryCard({ deposit }) {
-  const [expanded, setExpanded] = useState13(false);
+  const explorerTxUrl = useExplorerTxUrl();
+  const [expanded, setExpanded] = useState14(false);
   const status = normalizeStatus(deposit.status, deposit.isSpam);
   const sourceChainId = resolveChainId(deposit.chain);
   const targetChainId = resolveChainId(deposit.targetChain);
@@ -8691,8 +9290,8 @@ function HistoryCard({ deposit }) {
   const date = deposit.createdAt ? formatDate(deposit.createdAt) : null;
   const txTypeLabel = `Deposit${sourceSymbol ? ` ${sourceSymbol}` : ""}`;
   const srcTxHash = sourceChainId === "hypercore" ? deposit.txHash : deposit.sourceTxHash;
-  const srcTxUrl = srcTxHash ? getTxExplorerUrl(srcTxHash, sourceChainId) : null;
-  return /* @__PURE__ */ jsxs22(
+  const srcTxUrl = srcTxHash && sourceChainId ? explorerTxUrl(sourceChainId, srcTxHash) : null;
+  return /* @__PURE__ */ jsxs24(
     "button",
     {
       type: "button",
@@ -8700,38 +9299,38 @@ function HistoryCard({ deposit }) {
       onClick: () => setExpanded((v) => !v),
       "aria-expanded": expanded,
       children: [
-        /* @__PURE__ */ jsxs22("div", { className: "rs-history-card-row", children: [
-          /* @__PURE__ */ jsxs22("div", { className: "rs-history-card-icons", children: [
-            /* @__PURE__ */ jsx26("span", { className: "rs-history-card-token", children: /* @__PURE__ */ jsx26(TokenIcon, { symbol: sourceSymbol, fallback: sourceSymbol.slice(0, 2) }) }),
-            sourceChainIcon && /* @__PURE__ */ jsx26("span", { className: "rs-history-card-chain", children: /* @__PURE__ */ jsx26(CdnIcon, { src: sourceChainIcon }) })
+        /* @__PURE__ */ jsxs24("div", { className: "rs-history-card-row", children: [
+          /* @__PURE__ */ jsxs24("div", { className: "rs-history-card-icons", children: [
+            /* @__PURE__ */ jsx28("span", { className: "rs-history-card-token", children: /* @__PURE__ */ jsx28(TokenIcon, { symbol: sourceSymbol, fallback: sourceSymbol.slice(0, 2) }) }),
+            sourceChainIcon && /* @__PURE__ */ jsx28("span", { className: "rs-history-card-chain", children: /* @__PURE__ */ jsx28(CdnIcon, { src: sourceChainIcon }) })
           ] }),
-          /* @__PURE__ */ jsxs22("div", { className: "rs-history-card-text", children: [
-            /* @__PURE__ */ jsx26("span", { className: "rs-history-card-title", children: txTypeLabel }),
-            date && /* @__PURE__ */ jsx26("span", { className: "rs-history-card-date", children: date })
+          /* @__PURE__ */ jsxs24("div", { className: "rs-history-card-text", children: [
+            /* @__PURE__ */ jsx28("span", { className: "rs-history-card-title", children: txTypeLabel }),
+            date && /* @__PURE__ */ jsx28("span", { className: "rs-history-card-date", children: date })
           ] }),
-          /* @__PURE__ */ jsxs22("div", { className: "rs-history-card-side", children: [
-            /* @__PURE__ */ jsx26("span", { className: "rs-history-card-amount", children: displayAmount }),
-            /* @__PURE__ */ jsx26("span", { className: `rs-history-badge rs-history-badge--${status}`, children: STATUS_LABEL[status] })
+          /* @__PURE__ */ jsxs24("div", { className: "rs-history-card-side", children: [
+            /* @__PURE__ */ jsx28("span", { className: "rs-history-card-amount", children: displayAmount }),
+            /* @__PURE__ */ jsx28("span", { className: `rs-history-badge rs-history-badge--${status}`, children: STATUS_LABEL[status] })
           ] })
         ] }),
-        /* @__PURE__ */ jsx26("div", { className: "rs-history-card-panel", children: /* @__PURE__ */ jsx26("div", { className: "rs-history-card-panel-inner", children: /* @__PURE__ */ jsxs22("div", { className: "rs-history-card-details", children: [
-          sourceChainName && /* @__PURE__ */ jsxs22("div", { className: "rs-amount-detail-row", children: [
-            /* @__PURE__ */ jsx26("span", { children: "Source chain" }),
-            /* @__PURE__ */ jsxs22("span", { className: "rs-amount-detail-value", children: [
-              /* @__PURE__ */ jsx26("span", { children: sourceChainName }),
-              sourceChainIcon && /* @__PURE__ */ jsx26("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx26(CdnIcon, { src: sourceChainIcon }) })
+        /* @__PURE__ */ jsx28("div", { className: "rs-history-card-panel", children: /* @__PURE__ */ jsx28("div", { className: "rs-history-card-panel-inner", children: /* @__PURE__ */ jsxs24("div", { className: "rs-history-card-details", children: [
+          sourceChainName && /* @__PURE__ */ jsxs24("div", { className: "rs-amount-detail-row", children: [
+            /* @__PURE__ */ jsx28("span", { children: "Source chain" }),
+            /* @__PURE__ */ jsxs24("span", { className: "rs-amount-detail-value", children: [
+              /* @__PURE__ */ jsx28("span", { children: sourceChainName }),
+              sourceChainIcon && /* @__PURE__ */ jsx28("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx28(CdnIcon, { src: sourceChainIcon }) })
             ] })
           ] }),
-          targetChainName && /* @__PURE__ */ jsxs22("div", { className: "rs-amount-detail-row", children: [
-            /* @__PURE__ */ jsx26("span", { children: "Destination chain" }),
-            /* @__PURE__ */ jsxs22("span", { className: "rs-amount-detail-value", children: [
-              /* @__PURE__ */ jsx26("span", { children: targetChainName }),
-              targetChainIcon && /* @__PURE__ */ jsx26("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx26(CdnIcon, { src: targetChainIcon }) })
+          targetChainName && /* @__PURE__ */ jsxs24("div", { className: "rs-amount-detail-row", children: [
+            /* @__PURE__ */ jsx28("span", { children: "Destination chain" }),
+            /* @__PURE__ */ jsxs24("span", { className: "rs-amount-detail-value", children: [
+              /* @__PURE__ */ jsx28("span", { children: targetChainName }),
+              targetChainIcon && /* @__PURE__ */ jsx28("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx28(CdnIcon, { src: targetChainIcon }) })
             ] })
           ] }),
-          srcTxUrl && srcTxHash && /* @__PURE__ */ jsxs22("div", { className: "rs-amount-detail-row", children: [
-            /* @__PURE__ */ jsx26("span", { children: "Transaction details" }),
-            /* @__PURE__ */ jsxs22(
+          srcTxUrl && srcTxHash && /* @__PURE__ */ jsxs24("div", { className: "rs-amount-detail-row", children: [
+            /* @__PURE__ */ jsx28("span", { children: "Transaction details" }),
+            /* @__PURE__ */ jsxs24(
               "a",
               {
                 href: srcTxUrl,
@@ -8740,8 +9339,8 @@ function HistoryCard({ deposit }) {
                 className: "rs-history-card-link",
                 onClick: (e) => e.stopPropagation(),
                 children: [
-                  /* @__PURE__ */ jsx26("span", { children: shortenHash(srcTxHash) }),
-                  /* @__PURE__ */ jsx26(ArrowUpRightIcon, {})
+                  /* @__PURE__ */ jsx28("span", { children: shortenHash(srcTxHash) }),
+                  /* @__PURE__ */ jsx28(ArrowUpRightIcon, {})
                 ]
               }
             )
@@ -8754,9 +9353,9 @@ function HistoryCard({ deposit }) {
 DepositHistoryPanel.displayName = "DepositHistoryPanel";
 
 // src/DepositModal.tsx
-import { jsx as jsx27, jsxs as jsxs23 } from "react/jsx-runtime";
+import { jsx as jsx29, jsxs as jsxs25 } from "react/jsx-runtime";
 var ReownDepositInner = lazy2(
-  () => import("./DepositModalReown-TEC3MEZ4.mjs").then((m) => ({ default: m.DepositModalReown }))
+  () => import("./DepositModalReown-3H75G3XQ.mjs").then((m) => ({ default: m.DepositModalReown }))
 );
 function sortByCreatedAtDesc(items) {
   return [...items].sort((a, b) => {
@@ -8775,7 +9374,7 @@ function DepositModal(props) {
   const needsReown = !!props.reownAppId;
   const hasWalletClientProp = hasSuppliedWalletClient(props);
   if (needsReown) {
-    return /* @__PURE__ */ jsx27(Suspense2, { fallback: null, children: /* @__PURE__ */ jsx27(
+    return /* @__PURE__ */ jsx29(Suspense2, { fallback: null, children: /* @__PURE__ */ jsx29(
       ReownDepositInner,
       {
         ...props,
@@ -8783,7 +9382,7 @@ function DepositModal(props) {
       }
     ) });
   }
-  return /* @__PURE__ */ jsx27(
+  return /* @__PURE__ */ jsx29(
     DepositModalInner,
     {
       ...props,
@@ -8814,12 +9413,13 @@ function DepositModalInner({
   initialAssetMigration,
   enableFiatOnramp = false,
   enableQrTransfer = true,
+  enableGaslessDeposit = false,
   fiatMethods,
   enableWallet,
   enableExchangeConnect = false,
   outputTokenRules,
   rejectUnmapped,
-  reownWallet,
+  walletSession,
   onConnect,
   onDisconnect,
   onRequestConnect,
@@ -8830,22 +9430,26 @@ function DepositModalInner({
   onLifecycle,
   onEvent,
   onError,
+  onUiState,
+  openExternally,
   debug
 }) {
   const modalRef = useRef9(null);
   const onReadyRef = useLatestRef(onReady);
-  const [currentScreen, setCurrentScreen] = useState14("connect");
-  const [swappedImmersive, setSwappedImmersive] = useState14(false);
-  const [backHandler, setBackHandler] = useState14(
+  const onUiStateRef = useLatestRef(onUiState);
+  const [currentScreen, setCurrentScreen] = useState15("connect");
+  const [swappedImmersive, setSwappedImmersive] = useState15(false);
+  const [submitting, setSubmitting] = useState15(false);
+  const [backHandler, setBackHandler] = useState15(
     void 0
   );
   const historyButtonVisible = currentScreen === "connect";
-  const [historyOpen, setHistoryOpen] = useState14(false);
-  const [historyDeposits, setHistoryDeposits] = useState14([]);
-  const [hasMoreHistory, setHasMoreHistory] = useState14(false);
-  const [historyLoading, setHistoryLoading] = useState14(false);
-  const [historyLoadingMore, setHistoryLoadingMore] = useState14(false);
-  const [historyError, setHistoryError] = useState14(null);
+  const [historyOpen, setHistoryOpen] = useState15(false);
+  const [historyDeposits, setHistoryDeposits] = useState15([]);
+  const [hasMoreHistory, setHasMoreHistory] = useState15(false);
+  const [historyLoading, setHistoryLoading] = useState15(false);
+  const [historyLoadingMore, setHistoryLoadingMore] = useState15(false);
+  const [historyError, setHistoryError] = useState15(null);
   const cursorRef = useRef9(null);
   const historyStaleRef = useRef9(false);
   const historyLoadedRef = useRef9(false);
@@ -8859,10 +9463,10 @@ function DepositModalInner({
     }),
     [backendUrl, debug]
   );
-  const [clientSetup, setClientSetup] = useState14(
+  const [clientSetup, setClientSetup] = useState15(
     null
   );
-  useEffect12(() => {
+  useEffect13(() => {
     if (!isOpen) return;
     let active = true;
     service.getSetup().then((config) => {
@@ -8872,7 +9476,7 @@ function DepositModalInner({
       active = false;
     };
   }, [isOpen, service]);
-  useEffect12(() => {
+  useEffect13(() => {
     if (debug && clientSetup) {
       console.debug("[deposit] client setup config (not shown yet)", clientSetup);
     }
@@ -8882,19 +9486,25 @@ function DepositModalInner({
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
   );
-  useEffect12(() => {
+  useEffect13(() => {
     store.dispatch({ type: "target/changed", targetChain, targetToken });
   }, [store, targetChain, targetToken]);
-  useEffect12(() => {
-    if (isOpen && modalRef.current) {
-      applyTheme(modalRef.current, theme);
-    }
+  useEffect13(() => {
+    if (!isOpen || !modalRef.current) return;
+    return applyTheme(modalRef.current, theme);
   }, [isOpen, theme]);
-  useEffect12(() => {
+  useEffect13(() => {
     if (isOpen) {
       onReadyRef.current?.();
     }
   }, [isOpen, onReadyRef]);
+  useEffect13(() => {
+    onUiStateRef.current?.({
+      screen: currentScreen,
+      back: backHandler,
+      submitting
+    });
+  }, [currentScreen, backHandler, submitting, onUiStateRef]);
   const handleStepChange = useCallback9(
     (onBack, screen) => {
       setBackHandler(() => onBack);
@@ -8981,7 +9591,7 @@ function DepositModalInner({
     },
     [onLifecycleRef, markHistoryStale]
   );
-  useEffect12(() => {
+  useEffect13(() => {
     if (!isOpen) {
       setHistoryOpen(false);
       setHistoryDeposits([]);
@@ -8993,9 +9603,10 @@ function DepositModalInner({
       setCurrentScreen("connect");
       setBackHandler(void 0);
       setSwappedImmersive(false);
+      setSubmitting(false);
     }
   }, [isOpen]);
-  useEffect12(() => {
+  useEffect13(() => {
     if (!isOpen) {
       store.dispatch({ type: "flow/reset" });
     }
@@ -9004,7 +9615,7 @@ function DepositModalInner({
   const canGoBack = backHandler !== void 0;
   const hideHeaderChrome = swappedImmersive;
   const modalClassName = `rs-modal${hideHeaderChrome ? " rs-modal--swapped-iframe" : ""}`;
-  return /* @__PURE__ */ jsx27(RpcUrlsProvider, { value: rpcUrls, children: /* @__PURE__ */ jsx27(ChainCatalogProvider, { service, rpcUrls, children: /* @__PURE__ */ jsx27(DepositStoreProvider, { store, children: /* @__PURE__ */ jsx27(
+  return /* @__PURE__ */ jsx29(RpcUrlsProvider, { value: rpcUrls, children: /* @__PURE__ */ jsx29(ChainCatalogProvider, { service, rpcUrls, children: /* @__PURE__ */ jsx29(DepositStoreProvider, { store, children: /* @__PURE__ */ jsx29(
     Modal,
     {
       isOpen,
@@ -9012,20 +9623,20 @@ function DepositModalInner({
       className,
       inline,
       closeOnOverlayClick,
-      children: /* @__PURE__ */ jsxs23("div", { ref: modalRef, className: modalClassName, children: [
-        !hideHeaderChrome && /* @__PURE__ */ jsxs23("div", { className: "rs-modal-header--redesigned", children: [
-          /* @__PURE__ */ jsx27("div", { className: "rs-modal-header-nav-left", children: showBackButton && canGoBack && backHandler && /* @__PURE__ */ jsx27(
+      children: /* @__PURE__ */ jsxs25("div", { ref: modalRef, className: modalClassName, children: [
+        !hideHeaderChrome && /* @__PURE__ */ jsxs25("div", { className: "rs-modal-header--redesigned", children: [
+          /* @__PURE__ */ jsx29("div", { className: "rs-modal-header-nav-left", children: showBackButton && canGoBack && backHandler && /* @__PURE__ */ jsx29(
             "button",
             {
               type: "button",
               className: "rs-modal-header-back",
               "aria-label": "Go back",
               onClick: backHandler,
-              children: /* @__PURE__ */ jsx27(ChevronLeftIcon, {})
+              children: /* @__PURE__ */ jsx29(ChevronLeftIcon, {})
             }
           ) }),
-          /* @__PURE__ */ jsxs23("div", { className: "rs-modal-header-nav-right", children: [
-            historyButtonVisible && /* @__PURE__ */ jsx27(
+          /* @__PURE__ */ jsxs25("div", { className: "rs-modal-header-nav-right", children: [
+            historyButtonVisible && /* @__PURE__ */ jsx29(
               "button",
               {
                 type: "button",
@@ -9033,22 +9644,22 @@ function DepositModalInner({
                 "aria-label": "Deposit history",
                 onClick: handleHistoryOpen,
                 disabled: !recipient,
-                children: /* @__PURE__ */ jsx27(HistoryIcon, {})
+                children: /* @__PURE__ */ jsx29(HistoryIcon, {})
               }
             ),
-            /* @__PURE__ */ jsx27(
+            /* @__PURE__ */ jsx29(
               "button",
               {
                 type: "button",
                 onClick: onClose,
                 className: "rs-modal-close",
                 "aria-label": "Close",
-                children: /* @__PURE__ */ jsx27(CloseIcon, {})
+                children: /* @__PURE__ */ jsx29(CloseIcon, {})
               }
             )
           ] })
         ] }),
-        /* @__PURE__ */ jsx27(
+        /* @__PURE__ */ jsx29(
           DepositFlow,
           {
             walletClientProp,
@@ -9069,10 +9680,11 @@ function DepositModalInner({
             initialAssetMigration,
             enableFiatOnramp,
             enableQrTransfer,
+            enableGaslessDeposit,
             fiatMethods,
             enableWallet,
             enableExchangeConnect,
-            reownWallet,
+            walletSession,
             onConnect,
             onDisconnect,
             onRequestConnect,
@@ -9081,6 +9693,8 @@ function DepositModalInner({
             appFeesResolved: clientSetup !== null,
             onStepChange: handleStepChange,
             onSwappedImmersiveChange: setSwappedImmersive,
+            openExternally,
+            onSubmittingChange: setSubmitting,
             onClose,
             onLifecycle: handleLifecycle,
             onEvent,
@@ -9088,7 +9702,7 @@ function DepositModalInner({
             debug
           }
         ),
-        historyOpen && /* @__PURE__ */ jsx27(
+        historyOpen && /* @__PURE__ */ jsx29(
           DepositHistoryPanel,
           {
             deposits: historyDeposits,