@rhinestone/deposit-modal 0.6.0 → 0.7.0

package/dist/{chunk-NSAODZSS.mjs → chunk-UZENNYHS.mjs}

@@ -7,7 +7,7 @@ import {
   executePolymarketSafeTransfer,
   fetchPolymarketProxyWallet,
   readPolymarketBalances
-} from "./chunk-FJWLC4AM.mjs";
+} from "./chunk-4JLYWRQA.mjs";
 import {
   AlertTriangleIcon,
   ArrowUpRightIcon,
@@ -68,10 +68,10 @@ import {
   useLatestRef,
   useRpcUrls,
   useStableRpcUrls
-} from "./chunk-GQDVHMOT.mjs";
+} from "./chunk-OYPFPEIT.mjs";
 import {
   SAFE_ABI
-} from "./chunk-F7P4MV72.mjs";
+} from "./chunk-K6J3RDDK.mjs";
 import {
   DEFAULT_BACKEND_URL,
   DEFAULT_SIGNER_ADDRESS,
@@ -87,6 +87,7 @@ import {
   getChainName,
   getExplorerTxUrl,
   getExplorerUrl,
+  getNativeSymbol,
   getSupportedChainIds,
   getTargetTokenSymbol,
   getTargetTokenSymbolsForChain,
@@ -98,10 +99,11 @@ import {
   isNativeSol,
   isSolanaCaip2,
   isStablecoinSymbol,
+  isSupportedTokenAddressForChain,
   isVirtualDestination,
   parseEvmChainId,
   targetChainToCaip2
-} from "./chunk-WJX3TJFK.mjs";
+} from "./chunk-CPMHRMPH.mjs";
 
 // src/DepositModal.tsx
 import {
@@ -204,12 +206,6 @@ function AssetSelectStep({
       active = false;
     };
   }, [address, publicClient, service, onTotalBalanceComputedRef]);
-  useEffect(() => {
-    if (!defaultAssetId || selectedAssetId) return;
-    if (assets.some((asset) => asset.id === defaultAssetId)) {
-      setSelectedAssetId(defaultAssetId);
-    }
-  }, [assets, defaultAssetId, selectedAssetId]);
   const allowedChainSet = useMemo(
     () => allowedRoutes?.sourceChains ? new Set(allowedRoutes.sourceChains) : null,
     [allowedRoutes?.sourceChains]
@@ -226,7 +222,12 @@ function AssetSelectStep({
         return false;
       }
       if (allowedChainSet && !allowedChainSet.has(a.chainId)) return false;
-      if (allowedTokenSet && !allowedTokenSet.has(a.symbol.toUpperCase()))
+      if (allowedTokenSet) {
+        if (!allowedTokenSet.has(a.symbol.toUpperCase())) return false;
+        if (!isSupportedTokenAddressForChain(a.token, a.chainId)) return false;
+      }
+      const isNativeToken = a.token.toLowerCase() === NATIVE_TOKEN_ADDRESS;
+      if (!isNativeToken && !(typeof a.balanceUsd === "number" && a.balanceUsd >= 0.01))
         return false;
       return true;
     }).sort((a, b) => {
@@ -240,7 +241,13 @@ function AssetSelectStep({
       return 0;
     });
   }, [assets, allowedChainSet, allowedTokenSet]);
-  const selectedAsset = selectedAssetId && assets.find((asset) => asset.id === selectedAssetId);
+  useEffect(() => {
+    if (!defaultAssetId || selectedAssetId) return;
+    if (rows.some((asset) => asset.id === defaultAssetId)) {
+      setSelectedAssetId(defaultAssetId);
+    }
+  }, [rows, defaultAssetId, selectedAssetId]);
+  const selectedAsset = selectedAssetId && rows.find((asset) => asset.id === selectedAssetId);
   const formatBalance = (asset) => {
     if (!asset.balance) return "--";
     try {
@@ -366,13 +373,14 @@ async function fetchNativeAssets(address, publicClient, existing) {
   if (existingIds.has(id)) return [];
   try {
     const balance = await publicClient.getBalance({ address });
+    const nativeSymbol = getNativeSymbol(connectedChainId);
     return [
       {
         id,
         chainId: connectedChainId,
         token: NATIVE_TOKEN_ADDRESS,
-        symbol: "ETH",
-        name: "Ethereum",
+        symbol: nativeSymbol,
+        name: nativeSymbol,
         decimals: 18,
         balance: balance.toString()
       }
@@ -1008,7 +1016,13 @@ function ConfirmStep({
         });
       }
       onDepositSubmitted?.(hash, asset.chainId, amountUnits.toString());
-      onConfirm(hash, asset.chainId, amountUnits.toString(), resolvedSourceToken);
+      onConfirm(
+        hash,
+        asset.chainId,
+        amountUnits.toString(),
+        resolvedSourceToken,
+        quote?.fees?.breakdown
+      );
     } catch (err) {
       const raw = err instanceof Error ? err.message : "Transfer failed";
       const message = formatUserError(raw);
@@ -1502,14 +1516,26 @@ function getDepositEventDetails(event) {
 function isSameRoute(sourceChain, sourceToken, targetChain, targetToken) {
   return sourceChain === targetChain && sourceToken.toLowerCase() === targetToken.toLowerCase();
 }
-function computeTokensForChain(chainId, allowedTokenSet) {
-  const all = chainId === "solana" ? SOLANA_TOKENS.map((t) => t.symbol) : getTargetTokenSymbolsForChain(chainId);
+function chainLabel(chainId) {
+  return getChainName(chainId).replace(/\s+(One|Mainnet|Smart Chain)$/i, "");
+}
+function computeTokensForChain(chainId, allowedTokenSet, topTokens) {
+  const fromBackend = topTokens?.[String(chainId)]?.map((t) => t.symbol);
+  const all = fromBackend ?? (chainId === "solana" ? SOLANA_TOKENS.map((t) => t.symbol) : getTargetTokenSymbolsForChain(chainId));
   return allowedTokenSet ? all.filter((s) => allowedTokenSet.has(s.toUpperCase())) : all;
 }
+function resolveSourceTokenAddress(symbol, chainId, topTokens) {
+  const top = topTokens?.[String(chainId)]?.find((t) => t.symbol === symbol);
+  return top?.address ?? getTokenAddress(symbol, chainId);
+}
+function TokenGlyph({ symbol }) {
+  const icon = getTokenIcon(symbol);
+  return icon ? /* @__PURE__ */ jsx6("img", { src: icon, alt: "", className: "rs-deposit-address-dropdown-icon" }) : /* @__PURE__ */ jsx6("span", { className: "rs-deposit-address-dropdown-icon rs-deposit-address-dropdown-icon--fallback", children: symbol.slice(0, 3) });
+}
 function pickFallbackToken(tokens, current) {
   if (tokens.includes(current)) return current;
   if (tokens.includes("USDC")) return "USDC";
-  return tokens[0] ?? "USDC";
+  return tokens[0] ?? "";
 }
 function DepositAddressStep({
   smartAccount,
@@ -1545,15 +1571,33 @@ function DepositAddressStep({
     return options;
   }, [evmChainIds, hasSolana]);
   const BASE_CHAIN_ID2 = 8453;
-  const defaultChainId = evmChainIds.includes(BASE_CHAIN_ID2) ? BASE_CHAIN_ID2 : evmChainIds[0];
+  const chainHasAllowedToken = (id) => !allowedTokenSet || getTargetTokenSymbolsForChain(id).some(
+    (s) => allowedTokenSet.has(s.toUpperCase())
+  );
+  const defaultChainId = evmChainIds.includes(BASE_CHAIN_ID2) && chainHasAllowedToken(BASE_CHAIN_ID2) ? BASE_CHAIN_ID2 : evmChainIds.find(chainHasAllowedToken) ?? evmChainIds[0];
   const [sourceChainId, setSourceChainId] = useState5(defaultChainId);
   const isSolana = sourceChainId === "solana";
+  const [topTokens, setTopTokens] = useState5(null);
+  useEffect5(() => {
+    let active = true;
+    service.getTopTokens().then((t) => {
+      if (active) setTopTokens(t);
+    });
+    return () => {
+      active = false;
+    };
+  }, [service]);
   const tokensForChain = useMemo3(
-    () => computeTokensForChain(sourceChainId, allowedTokenSet),
-    [sourceChainId, allowedTokenSet]
+    () => computeTokensForChain(sourceChainId, allowedTokenSet, topTokens),
+    [sourceChainId, allowedTokenSet, topTokens]
   );
   const defaultToken = pickFallbackToken(tokensForChain, "USDC");
   const [sourceTokenSymbol, setSourceTokenSymbol] = useState5(defaultToken);
+  useEffect5(() => {
+    if (!tokensForChain.includes(sourceTokenSymbol)) {
+      setSourceTokenSymbol(pickFallbackToken(tokensForChain, sourceTokenSymbol));
+    }
+  }, [tokensForChain, sourceTokenSymbol]);
   const [copied, setCopied] = useState5(false);
   const [pollingError, setPollingError] = useState5(null);
   const [chainDropdownOpen, setChainDropdownOpen] = useState5(false);
@@ -1573,9 +1617,10 @@ function DepositAddressStep({
       setLiquidityHelper({ kind: "idle" });
       return;
     }
-    const sourceTokenAddress = getTokenAddress(
+    const sourceTokenAddress = resolveSourceTokenAddress(
       sourceTokenSymbol,
-      sourceChainId
+      sourceChainId,
+      topTokens
     );
     if (!sourceTokenAddress) {
       setLiquidityHelper({ kind: "idle" });
@@ -1616,7 +1661,8 @@ function DepositAddressStep({
     sourceTokenSymbol,
     targetChain,
     targetToken,
-    service
+    service,
+    topTokens
   ]);
   const displayAddress = isSolana && solanaDepositAddress ? solanaDepositAddress : smartAccount;
   useEffect5(() => {
@@ -1658,14 +1704,18 @@ function DepositAddressStep({
   }, [displayAddress, onCopyAddress]);
   const handleSelectChain = useCallback2(
     (nextChain) => {
-      const nextTokens = computeTokensForChain(nextChain, allowedTokenSet);
+      const nextTokens = computeTokensForChain(
+        nextChain,
+        allowedTokenSet,
+        topTokens
+      );
       setSourceChainId(nextChain);
       setSourceTokenSymbol(pickFallbackToken(nextTokens, sourceTokenSymbol));
       setChainDropdownOpen(false);
       setTokenDropdownOpen(false);
       setCopied(false);
     },
-    [allowedTokenSet, sourceTokenSymbol]
+    [allowedTokenSet, sourceTokenSymbol, topTokens]
   );
   const onDepositSubmittedRef = useRef5(onDepositSubmitted);
   onDepositSubmittedRef.current = onDepositSubmitted;
@@ -1820,7 +1870,7 @@ function DepositAddressStep({
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx6("span", { children: getChainName(sourceChainId) }),
+                /* @__PURE__ */ jsx6("span", { children: chainLabel(sourceChainId) }),
                 /* @__PURE__ */ jsx6(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
               ]
             }
@@ -1840,7 +1890,7 @@ function DepositAddressStep({
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx6("span", { children: getChainName(chainId) })
+                /* @__PURE__ */ jsx6("span", { children: chainLabel(chainId) })
               ]
             },
             String(chainId)
@@ -1872,14 +1922,7 @@ function DepositAddressStep({
                 setChainDropdownOpen(false);
               },
               children: [
-                getTokenIcon(sourceTokenSymbol) && /* @__PURE__ */ jsx6(
-                  "img",
-                  {
-                    src: getTokenIcon(sourceTokenSymbol),
-                    alt: "",
-                    className: "rs-deposit-address-dropdown-icon"
-                  }
-                ),
+                /* @__PURE__ */ jsx6(TokenGlyph, { symbol: sourceTokenSymbol }),
                 /* @__PURE__ */ jsx6("span", { children: sourceTokenSymbol }),
                 /* @__PURE__ */ jsx6(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
               ]
@@ -1895,14 +1938,7 @@ function DepositAddressStep({
                 setTokenDropdownOpen(false);
               },
               children: [
-                getTokenIcon(symbol) && /* @__PURE__ */ jsx6(
-                  "img",
-                  {
-                    src: getTokenIcon(symbol),
-                    alt: "",
-                    className: "rs-deposit-address-dropdown-icon"
-                  }
-                ),
+                /* @__PURE__ */ jsx6(TokenGlyph, { symbol }),
                 /* @__PURE__ */ jsx6("span", { children: symbol })
               ]
             },
@@ -2176,6 +2212,7 @@ var DEPOSIT_POLL_INTERVAL_MS = 2e3;
 var DEPOSIT_POLL_FAST_INITIAL_DELAY_MS = 1e3;
 var DEPOSIT_POLL_FAST_INTERVAL_MS = 500;
 var IFRAME_LOAD_TIMEOUT_MS = 15e3;
+var SWAPPED_SUCCESS_HANDOFF_DELAY_MS = 1400;
 var SWAPPED_IFRAME_ORIGINS = new Set(SWAPPED_ORIGINS);
 var SWAPPED_TERMINAL_STATUSES = /* @__PURE__ */ new Set([
   "order_completed",
@@ -2244,7 +2281,8 @@ function SwappedIframeStep({
   onSwappedFailed,
   onClose,
   onGoBack,
-  onError
+  onError,
+  onImmersiveChange
 }) {
   const [widgetUrl, setWidgetUrl] = useState6(null);
   const [loadError, setLoadError] = useState6(null);
@@ -2256,6 +2294,7 @@ function SwappedIframeStep({
   const iframeRef = useRef6(null);
   const completeFiredRef = useRef6(false);
   const failedFiredRef = useRef6(false);
+  const completeTimeoutRef = useRef6(null);
   const expectedOrderUuidRef = useRef6(null);
   const expectedExternalCustomerIdRef = useRef6(null);
   const baselineDepositTxHashRef = useRef6(void 0);
@@ -2272,6 +2311,8 @@ function SwappedIframeStep({
   onErrorRef.current = onError;
   const onGoBackRef = useRef6(onGoBack);
   onGoBackRef.current = onGoBack;
+  const onImmersiveChangeRef = useRef6(onImmersiveChange);
+  onImmersiveChangeRef.current = onImmersiveChange;
   const loadUrlRef = useRef6(loadUrl);
   loadUrlRef.current = loadUrl;
   useEffect6(() => {
@@ -2282,6 +2323,10 @@ function SwappedIframeStep({
     setOrderState(null);
     setLatestEvent(null);
     setPhase("iframe");
+    if (completeTimeoutRef.current !== null) {
+      clearTimeout(completeTimeoutRef.current);
+      completeTimeoutRef.current = null;
+    }
     expectedOrderUuidRef.current = null;
     expectedExternalCustomerIdRef.current = null;
     completeFiredRef.current = false;
@@ -2303,6 +2348,10 @@ function SwappedIframeStep({
     });
     return () => {
       cancelled = true;
+      if (completeTimeoutRef.current !== null) {
+        clearTimeout(completeTimeoutRef.current);
+        completeTimeoutRef.current = null;
+      }
     };
   }, [service, smartAccount, retryToken, loadErrorCode, loadErrorFallback]);
   useEffect6(() => {
@@ -2412,10 +2461,11 @@ function SwappedIframeStep({
     return () => window.removeEventListener("message", onMessage);
   }, []);
   useEffect6(() => {
-    if (phase === "iframe" && orderState !== null) {
+    const swappedProvesLive = orderState !== null && !(variant === "fiat" && orderState.status === "payment_pending");
+    if (phase === "iframe" && (swappedProvesLive || latestEvent !== null)) {
       setPhase("tracker");
     }
-  }, [phase, orderState]);
+  }, [phase, orderState, latestEvent, variant]);
   const stepStates = useMemo4(
     () => deriveStepStates(orderState?.status ?? null, latestEvent),
     [orderState, latestEvent]
@@ -2441,14 +2491,21 @@ function SwappedIframeStep({
     const txHash = currentDepositTxHashRef.current;
     if (!txHash) return;
     completeFiredRef.current = true;
-    onSwappedCompleteRef.current({
+    const info = {
+      smartAccount,
       txHash,
       orderCrypto: orderState?.orderCrypto ?? null,
       // Base-unit source amount from the deposit row/event, consistent with the
       // wallet/QR path. ProcessingStep + onLifecycle expect base units.
-      amount: getEventSourceDetails(latestEvent ?? void 0).amount ?? null
-    });
-  }, [latestEvent, orderState]);
+      amount: getEventSourceDetails(latestEvent ?? void 0).amount ?? null,
+      expectedOrderUuid: expectedOrderUuidRef.current,
+      initialEvent: latestEvent ?? void 0
+    };
+    completeTimeoutRef.current = setTimeout(() => {
+      completeTimeoutRef.current = null;
+      onSwappedCompleteRef.current(info);
+    }, SWAPPED_SUCCESS_HANDOFF_DELAY_MS);
+  }, [latestEvent, orderState, smartAccount]);
   useEffect6(() => {
     if (failedFiredRef.current || completeFiredRef.current) return;
     if (!isFailedEvent(latestEvent ?? void 0)) return;
@@ -2461,6 +2518,11 @@ function SwappedIframeStep({
       failureMessageForEvent(latestEvent ?? void 0)
     );
   }, [latestEvent]);
+  const immersive = variant === "fiat" && phase === "iframe" && !loadError;
+  useEffect6(() => {
+    onImmersiveChangeRef.current?.(immersive);
+  }, [immersive]);
+  useEffect6(() => () => onImmersiveChangeRef.current?.(false), []);
   if (phase === "tracker") {
     const paymentReceived = stepStates[0] === "complete";
     if (variant === "connect" && !terminalState && paymentReceived) {
@@ -2507,7 +2569,7 @@ function SwappedIframeStep({
         retryToken
       )
     ] }) }),
-    /* @__PURE__ */ jsx9(PoweredBy, {})
+    loadError && /* @__PURE__ */ jsx9(PoweredBy, {})
   ] });
 }
 function deriveStepStates(swappedStatus, latestEvent) {
@@ -2518,10 +2580,10 @@ function deriveStepStates(swappedStatus, latestEvent) {
     return ["failed", "pending", "pending", "pending"];
   }
   const step1Complete = swappedStatus === "order_completed" || swappedStatus === "order_broadcasted";
-  const step2Complete = latestEvent !== null;
+  const step2Complete = latestEvent !== null || swappedStatus === "order_broadcasted";
   const step3Complete = latestEvent?.type === "bridge-complete";
   if (step3Complete) {
-    return ["complete", "complete", "complete", "pending"];
+    return ["complete", "complete", "complete", "complete"];
   }
   if (step2Complete) {
     return ["complete", "complete", "active", "pending"];
@@ -2570,7 +2632,8 @@ function FiatOnrampStep({
   onSwappedFailed,
   onClose,
   onGoBack,
-  onError
+  onError,
+  onImmersiveChange
 }) {
   const loadUrl = useCallback3(async () => {
     const prefetched = consumePrefetchedUrl?.(smartAccount, paymentMethod);
@@ -2601,7 +2664,8 @@ function FiatOnrampStep({
       onSwappedFailed,
       onClose,
       onGoBack,
-      onError
+      onError,
+      onImmersiveChange
     }
   );
 }
@@ -2647,7 +2711,8 @@ function ExchangeConnectStep({
   onSwappedFailed,
   onClose,
   onGoBack,
-  onError
+  onError,
+  onImmersiveChange
 }) {
   const loadUrl = useCallback4(async () => {
     const res = await service.getSwappedConnectUrl({
@@ -2671,7 +2736,8 @@ function ExchangeConnectStep({
       onSwappedFailed,
       onClose,
       onGoBack,
-      onError
+      onError,
+      onImmersiveChange
     }
   );
 }
@@ -4180,7 +4246,9 @@ function createInitialState(overrides) {
     processing: {
       txHash: null,
       directTransfer: false,
-      swappedContext: null
+      swappedContext: null,
+      initialEvent: null,
+      quoteFeeBreakdown: null
     },
     dappImport: {
       activeProviderId: null,
@@ -4789,10 +4857,23 @@ function applyAction(state, action) {
           ...state.processing,
           txHash: action.txHash,
           directTransfer: action.directTransfer ?? false,
-          swappedContext: action.swappedContext ?? null
+          swappedContext: action.swappedContext ?? null,
+          initialEvent: action.initialEvent ?? null,
+          quoteFeeBreakdown: action.quoteFeeBreakdown ?? null
         },
         flow: { ...state.flow, step: "processing" }
       };
+    case "processing/quote-fee-breakdown-loaded":
+      if (state.flow.step !== "processing" || state.processing.txHash?.toLowerCase() !== action.txHash.toLowerCase()) {
+        return state;
+      }
+      return {
+        ...state,
+        processing: {
+          ...state.processing,
+          quoteFeeBreakdown: action.quoteFeeBreakdown
+        }
+      };
     case "dapp-import/availability-loading":
       return {
         ...state,
@@ -4959,7 +5040,9 @@ function applyAction(state, action) {
         processing: {
           txHash: null,
           directTransfer: false,
-          swappedContext: null
+          swappedContext: null,
+          initialEvent: null,
+          quoteFeeBreakdown: null
         },
         // Drop fetched availability wholesale. The fetch effect refetches
         // unconditionally on remount (so keeping the map saves nothing),
@@ -5316,6 +5399,33 @@ function isSameRoute2(sourceChain, sourceToken, targetChain, targetToken) {
 var SWAPPED_SOURCE_CHAIN = 8453;
 var SWAPPED_SOURCE_TOKEN = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
 var SWAPPED_SOURCE_DECIMALS = 6;
+var SWAPPED_QUOTE_FEE_TIMEOUT_MS = 2500;
+async function fetchQuoteFeeBreakdown(params) {
+  try {
+    if (BigInt(params.amount) <= 0n) return void 0;
+  } catch {
+    return void 0;
+  }
+  let timeoutId;
+  try {
+    const quote = await Promise.race([
+      params.service.getQuotePreview({
+        account: params.account,
+        sourceChainId: params.sourceChainId,
+        sourceToken: params.sourceToken,
+        amount: params.amount
+      }),
+      new Promise((resolve) => {
+        timeoutId = setTimeout(resolve, SWAPPED_QUOTE_FEE_TIMEOUT_MS, null);
+      })
+    ]);
+    return quote?.fees?.breakdown;
+  } catch {
+    return void 0;
+  } finally {
+    if (timeoutId !== void 0) clearTimeout(timeoutId);
+  }
+}
 var DEFAULT_FIAT_ONRAMP_METHODS = [
   {
     method: "creditcard",
@@ -5455,7 +5565,9 @@ function deriveStep(flow, d, p, activeEntry, fiat, exchange) {
         sourceDecimals: d.sourceDecimals ?? void 0,
         inputAmountUsd: d.inputAmountUsd ?? void 0,
         directTransfer: p.directTransfer,
-        swappedContext: p.swappedContext ?? void 0
+        swappedContext: p.swappedContext ?? void 0,
+        initialEvent: p.initialEvent ?? void 0,
+        quoteFeeBreakdown: p.quoteFeeBreakdown ?? void 0
       };
   }
 }
@@ -5506,6 +5618,7 @@ function DepositFlow({
   uiConfig,
   allowedRoutes,
   onStepChange,
+  onSwappedImmersiveChange,
   onClose,
   onLifecycle,
   onEvent,
@@ -6631,7 +6744,7 @@ function DepositFlow({
     [targetToken, targetChain, storeApi, activeOwner]
   );
   const handleDepositSubmitted = useCallback7(
-    (txHash, chainId, amount, token) => {
+    (txHash, chainId, amount, token, quoteFeeBreakdown) => {
       logFlow("evm:submitted", {
         txHash,
         sourceChain: chainId,
@@ -6650,7 +6763,8 @@ function DepositFlow({
         sourceSymbol: asset?.symbol,
         sourceDecimals: asset?.decimals,
         inputAmountUsd: depositAtSubmit.inputAmountUsd ?? void 0,
-        directTransfer: !dappImport && isSameRoute2(chainId, token, targetChain, targetToken)
+        directTransfer: !dappImport && isSameRoute2(chainId, token, targetChain, targetToken),
+        quoteFeeBreakdown
       });
     },
     [logFlow, storeApi, targetChain, targetToken]
@@ -6665,10 +6779,12 @@ function DepositFlow({
       const stateAtComplete = storeApi.getState();
       const swappedContext = stateAtComplete.flow.mode === "exchange-connect" ? {
         variant: "connect",
-        method: stateAtComplete.exchange.selectedConnection
+        method: stateAtComplete.exchange.selectedConnection,
+        expectedOrderUuid: info.expectedOrderUuid
       } : stateAtComplete.flow.mode === "fiat-onramp" ? {
         variant: "fiat",
-        method: stateAtComplete.fiat.selectedMethod
+        method: stateAtComplete.fiat.selectedMethod,
+        expectedOrderUuid: info.expectedOrderUuid
       } : void 0;
       storeApi.dispatch({
         type: "deposit/submitted",
@@ -6678,7 +6794,8 @@ function DepositFlow({
         amount,
         sourceSymbol: info.orderCrypto ?? "USDC",
         sourceDecimals: SWAPPED_SOURCE_DECIMALS,
-        swappedContext
+        swappedContext,
+        initialEvent: info.initialEvent
       });
       onLifecycleRef.current?.({
         type: "submitted",
@@ -6687,8 +6804,23 @@ function DepositFlow({
         amount,
         sourceDecimals: SWAPPED_SOURCE_DECIMALS
       });
+      void (async () => {
+        const quoteFeeBreakdown = await fetchQuoteFeeBreakdown({
+          service,
+          account: info.smartAccount,
+          sourceChainId: SWAPPED_SOURCE_CHAIN,
+          sourceToken: SWAPPED_SOURCE_TOKEN,
+          amount
+        });
+        if (!quoteFeeBreakdown) return;
+        storeApi.dispatch({
+          type: "processing/quote-fee-breakdown-loaded",
+          txHash: info.txHash,
+          quoteFeeBreakdown
+        });
+      })();
     },
-    [logFlow, storeApi, onLifecycleRef]
+    [logFlow, onLifecycleRef, service, storeApi]
   );
   const handleDepositSubmittedCallback = useCallback7(
     (txHash, sourceChain, amount) => {
@@ -6930,7 +7062,8 @@ function DepositFlow({
               onClose: onClose ?? (() => {
               }),
               onGoBack: handleBack,
-              onError: handleError
+              onError: handleError,
+              onImmersiveChange: onSwappedImmersiveChange
             }
           ),
           step.type === "processing" && /* @__PURE__ */ jsx19(
@@ -6948,9 +7081,12 @@ function DepositFlow({
               sourceDecimals: step.sourceDecimals,
               amountUsd: step.inputAmountUsd,
               swappedContext: step.swappedContext,
+              quoteFeeBreakdown: step.quoteFeeBreakdown,
               service,
               directTransfer: step.directTransfer,
+              initialEvent: step.initialEvent,
               isSwappedOrder: true,
+              uiConfig,
               onClose,
               onNewDeposit: handleNewDeposit,
               onDepositComplete: handleDepositComplete,
@@ -6998,7 +7134,8 @@ function DepositFlow({
               onClose: onClose ?? (() => {
               }),
               onGoBack: handleBack,
-              onError: handleError
+              onError: handleError,
+              onImmersiveChange: onSwappedImmersiveChange
             }
           ),
           step.type === "processing" && /* @__PURE__ */ jsx19(
@@ -7016,9 +7153,12 @@ function DepositFlow({
               sourceDecimals: step.sourceDecimals,
               amountUsd: step.inputAmountUsd,
               swappedContext: step.swappedContext,
+              quoteFeeBreakdown: step.quoteFeeBreakdown,
               service,
               directTransfer: step.directTransfer,
+              initialEvent: step.initialEvent,
               isSwappedOrder: true,
+              uiConfig,
               onClose,
               onNewDeposit: handleNewDeposit,
               onDepositComplete: handleDepositComplete,
@@ -7147,6 +7287,8 @@ function DepositFlow({
           amountUsd: effectiveStep.inputAmountUsd,
           service,
           directTransfer: effectiveStep.directTransfer,
+          initialEvent: effectiveStep.initialEvent,
+          quoteFeeBreakdown: effectiveStep.quoteFeeBreakdown,
           onClose,
           onNewDeposit: handleNewDeposit,
           onDepositComplete: handleDepositComplete,
@@ -7308,6 +7450,8 @@ function DepositFlow({
         amountUsd: effectiveStep.inputAmountUsd,
         service,
         directTransfer: effectiveStep.directTransfer,
+        initialEvent: effectiveStep.initialEvent,
+        quoteFeeBreakdown: effectiveStep.quoteFeeBreakdown,
         uiConfig,
         onClose,
         onNewDeposit: handleNewDeposit,
@@ -7608,7 +7752,7 @@ DepositHistoryPanel.displayName = "DepositHistoryPanel";
 // src/DepositModal.tsx
 import { jsx as jsx21, jsxs as jsxs19 } from "react/jsx-runtime";
 var ReownDepositInner = lazy2(
-  () => import("./DepositModalReown-YD7TLEAA.mjs").then((m) => ({ default: m.DepositModalReown }))
+  () => import("./DepositModalReown-T4RRW5FM.mjs").then((m) => ({ default: m.DepositModalReown }))
 );
 function sortByCreatedAtDesc(items) {
   return [...items].sort((a, b) => {
@@ -7688,6 +7832,7 @@ function DepositModalInner({
   const modalRef = useRef9(null);
   const onReadyRef = useLatestRef(onReady);
   const [currentScreen, setCurrentScreen] = useState13("connect");
+  const [swappedImmersive, setSwappedImmersive] = useState13(false);
   const [backHandler, setBackHandler] = useState13(
     void 0
   );
@@ -7737,6 +7882,24 @@ function DepositModalInner({
     }),
     [backendUrl, debug]
   );
+  const [clientSetup, setClientSetup] = useState13(
+    null
+  );
+  useEffect11(() => {
+    if (!isOpen) return;
+    let active = true;
+    service.getSetup().then((config) => {
+      if (active) setClientSetup(config);
+    });
+    return () => {
+      active = false;
+    };
+  }, [isOpen, service]);
+  useEffect11(() => {
+    if (debug && clientSetup) {
+      console.debug("[deposit] client setup config (not shown yet)", clientSetup);
+    }
+  }, [debug, clientSetup]);
   const store = useMemo9(
     () => createDepositStore({ targetChain, targetToken }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -7850,6 +8013,9 @@ function DepositModalInner({
       cursorRef.current = null;
       historyStaleRef.current = false;
       historyLoadedRef.current = false;
+      setCurrentScreen("connect");
+      setBackHandler(void 0);
+      setSwappedImmersive(false);
     }
   }, [isOpen]);
   useEffect11(() => {
@@ -7859,6 +8025,8 @@ function DepositModalInner({
   }, [isOpen, store]);
   const showBackButton = uiConfig?.showBackButton ?? true;
   const canGoBack = backHandler !== void 0;
+  const hideHeaderChrome = swappedImmersive;
+  const modalClassName = `rs-modal${hideHeaderChrome ? " rs-modal--swapped-iframe" : ""}`;
   return /* @__PURE__ */ jsx21(RpcUrlsProvider, { value: rpcUrls, children: /* @__PURE__ */ jsx21(DepositStoreProvider, { store, children: /* @__PURE__ */ jsx21(
     Modal,
     {
@@ -7867,8 +8035,8 @@ function DepositModalInner({
       className,
       inline,
       closeOnOverlayClick,
-      children: /* @__PURE__ */ jsxs19("div", { ref: modalRef, className: "rs-modal", children: [
-        /* @__PURE__ */ jsxs19("div", { className: "rs-modal-header--redesigned", children: [
+      children: /* @__PURE__ */ jsxs19("div", { ref: modalRef, className: modalClassName, children: [
+        !hideHeaderChrome && /* @__PURE__ */ jsxs19("div", { className: "rs-modal-header--redesigned", children: [
           /* @__PURE__ */ jsx21("div", { className: "rs-modal-header-nav-left", children: showBackButton && canGoBack && backHandler && /* @__PURE__ */ jsx21(
             "button",
             {
@@ -7937,6 +8105,7 @@ function DepositModalInner({
             uiConfig,
             allowedRoutes,
             onStepChange: handleStepChange,
+            onSwappedImmersiveChange: setSwappedImmersive,
             onClose,
             onLifecycle: handleLifecycle,
             onEvent,