@rhinestone/deposit-modal 0.3.0-alpha.9 → 0.3.1

package/dist/{chunk-4BUMVXPS.mjs → chunk-QYSCCX4K.mjs}

@@ -1,6 +1,17 @@
+import {
+  POLYMARKET_COLLATERAL_OFFRAMP_ADDRESS,
+  POLYMARKET_ICON_URL,
+  POLYMARKET_POLYGON_CHAIN_ID,
+  POLYMARKET_PUSD_ADDRESS,
+  POLYMARKET_USDCE_ADDRESS,
+  executePolymarketSafeTransfer,
+  fetchPolymarketProxyWallet,
+  readPolymarketBalances
+} from "./chunk-BAEB5AFZ.mjs";
 import {
   AlertTriangleIcon,
   ArrowUpRightIcon,
+  BankIcon,
   BodyHeader,
   Button,
   Callout,
@@ -12,6 +23,7 @@ import {
   ConnectStep,
   CopyIcon,
   ExternalLinkIcon,
+  HandCoinsIcon,
   HistoryIcon,
   InfoIcon,
   Modal,
@@ -19,7 +31,6 @@ import {
   PlusCircleIcon,
   PoweredBy,
   ProcessingStep,
-  SAFE_ABI,
   Spinner,
   Tooltip,
   TransferCryptoIcon,
@@ -32,28 +43,35 @@ import {
   currencyFormatter,
   debugError,
   debugLog,
+  failureMessageForEvent,
   formatUserError,
   getAssetId,
+  getEventSourceDetails,
   getEventTxHash,
+  getHyperEvmReadClient,
   getPublicClient,
   isDepositEvent,
+  isFailedEvent,
   isNativeAsset,
-  isSolanaCaip2,
   loadSessionOwnerFromStorage,
-  parseEvmChainId,
   portfolioToAssets,
   saveSessionOwnerToStorage,
-  targetChainToCaip2,
   tokenFormatter,
   txRefsMatch,
   useLatestRef
-} from "./chunk-TJG2AFPS.mjs";
+} from "./chunk-3C35DVPE.mjs";
+import {
+  SAFE_ABI
+} from "./chunk-TQ2AYMWS.mjs";
 import {
   DEFAULT_BACKEND_URL,
   DEFAULT_SIGNER_ADDRESS,
+  HYPERCORE_CHAIN_ID,
+  HYPERCORE_MIN_DEPOSIT_USD,
   NATIVE_TOKEN_ADDRESS,
   SOLANA_TOKENS,
   SOURCE_CHAINS,
+  findTokenDecimals,
   getChainBadge,
   getChainIcon,
   getChainId,
@@ -67,23 +85,36 @@ import {
   getTokenDecimalsByAddress,
   getTokenIcon,
   getTokenSymbol,
+  isContractBytecode,
   isNativeSol,
-  isStablecoinSymbol
-} from "./chunk-SZIYS42B.mjs";
+  isSolanaCaip2,
+  isStablecoinSymbol,
+  isVirtualDestination,
+  parseEvmChainId,
+  targetChainToCaip2
+} from "./chunk-6YRDD462.mjs";
 
 // src/DepositModal.tsx
 import {
-  useMemo as useMemo8,
-  useEffect as useEffect9,
-  useRef as useRef8,
-  useState as useState11,
-  useCallback as useCallback6,
+  useMemo as useMemo9,
+  useEffect as useEffect11,
+  useRef as useRef9,
+  useState as useState13,
+  useCallback as useCallback9,
   lazy as lazy2,
   Suspense as Suspense2
 } from "react";
+import { isAddress } from "viem";
 
 // src/DepositFlow.tsx
-import { useState as useState9, useCallback as useCallback4, useMemo as useMemo6, useEffect as useEffect8, useRef as useRef7 } from "react";
+import {
+  useState as useState11,
+  useCallback as useCallback7,
+  useMemo as useMemo7,
+  useEffect as useEffect10,
+  useLayoutEffect as useLayoutEffect2,
+  useRef as useRef8
+} from "react";
 import { formatUnits as formatUnits7 } from "viem";
 
 // src/components/steps/AssetSelectStep.tsx
@@ -113,8 +144,18 @@ function AssetSelectStep({
       token: defaultSourceToken
     });
   }, [defaultSourceChain, defaultSourceToken]);
+  const onTotalBalanceComputedRef = useLatestRef(onTotalBalanceComputed);
+  const onAssetsLoadedRef = useLatestRef(onAssetsLoaded);
   useEffect(() => {
     let active = true;
+    function emitAssetsUpdate(currentAssets) {
+      const total = currentAssets.reduce(
+        (sum, asset) => sum + (asset.balanceUsd ?? 0),
+        0
+      );
+      onTotalBalanceComputedRef.current?.(total);
+      if (currentAssets.length > 0) onAssetsLoadedRef.current?.(currentAssets);
+    }
     async function loadPortfolio() {
       if (!address) {
         setLoading(false);
@@ -127,6 +168,7 @@ function AssetSelectStep({
         if (!active) return;
         const portfolioAssets = portfolioToAssets(portfolio.tokens);
         setAssets(portfolioAssets);
+        emitAssetsUpdate(portfolioAssets);
         const hasNative = portfolioAssets.some(
           (asset) => asset.token.toLowerCase() === NATIVE_TOKEN_ADDRESS
         );
@@ -138,7 +180,9 @@ function AssetSelectStep({
           );
           if (!active) return;
           if (nativeAssets.length > 0) {
-            setAssets((prev) => mergeAssets(prev, nativeAssets));
+            const merged = mergeAssets(portfolioAssets, nativeAssets);
+            setAssets(merged);
+            emitAssetsUpdate(merged);
           }
         }
       } catch (err) {
@@ -154,21 +198,13 @@ function AssetSelectStep({
     return () => {
       active = false;
     };
-  }, [address, publicClient, service]);
+  }, [address, publicClient, service, onTotalBalanceComputedRef, onAssetsLoadedRef]);
   useEffect(() => {
     if (!defaultAssetId || selectedAssetId) return;
     if (assets.some((asset) => asset.id === defaultAssetId)) {
       setSelectedAssetId(defaultAssetId);
     }
   }, [assets, defaultAssetId, selectedAssetId]);
-  useEffect(() => {
-    const total = assets.reduce(
-      (sum, asset) => sum + (asset.balanceUsd ?? 0),
-      0
-    );
-    onTotalBalanceComputed?.(total);
-    if (assets.length > 0) onAssetsLoaded?.(assets);
-  }, [assets, onTotalBalanceComputed, onAssetsLoaded]);
   const allowedChainSet = useMemo(
     () => allowedRoutes?.sourceChains ? new Set(allowedRoutes.sourceChains) : null,
     [allowedRoutes?.sourceChains]
@@ -476,7 +512,6 @@ function AmountStep({
   uiConfig,
   tokenPriceUsdOverride,
   appBalanceUsd,
-  onBalanceUsdChange,
   onContinue,
   onCtaClick,
   service
@@ -554,9 +589,6 @@ function AmountStep({
       return null;
     }
   }, [balance, tokenPriceUsd, asset.decimals]);
-  useEffect2(() => {
-    onBalanceUsdChange?.(balanceUsd ?? 0);
-  }, [balanceUsd, onBalanceUsdChange]);
   useEffect2(() => {
     if (hasAppliedDefaultRef.current || !defaultAmount) return;
     if (isMaxDefault) {
@@ -612,7 +644,7 @@ function AmountStep({
       return null;
     }
   }, [numericAmount, isSourceStablecoin, hasPricing, tokenPriceUsd, asset.decimals]);
-  const minDepositUsd = uiConfig?.minDepositUsd ?? null;
+  const minDepositUsd = targetChain === HYPERCORE_CHAIN_ID ? Math.max(HYPERCORE_MIN_DEPOSIT_USD, uiConfig?.minDepositUsd ?? 0) : uiConfig?.minDepositUsd ?? null;
   const maxDepositUsd = uiConfig?.maxDepositUsd ?? null;
   const isBelowMin = minDepositUsd !== null && numericAmount > 0 && amountUsd < minDepositUsd;
   const isAboveMax = maxDepositUsd !== null && amountUsd > maxDepositUsd;
@@ -782,6 +814,7 @@ function AmountStep({
           /* @__PURE__ */ jsx3("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
         ] })
       ] }),
+      targetChain === HYPERCORE_CHAIN_ID && /* @__PURE__ */ jsx3(Callout, { variant: "warning", children: "First deposit to a new HyperCore account includes a ~1 USDC activation fee." }),
       error && /* @__PURE__ */ jsx3(Callout, { variant: "error", children: error }),
       /* @__PURE__ */ jsx3(
         Button,
@@ -821,6 +854,7 @@ function ConfirmStep({
   estimatedTime = "< 1 min",
   quotedFeeAmount = "0.1",
   quotedFeeSymbol,
+  service,
   onConfirm,
   onError,
   onDepositSubmitted,
@@ -828,6 +862,7 @@ function ConfirmStep({
 }) {
   const [isSubmitting, setIsSubmitting] = useState3(false);
   const [error, setError] = useState3(null);
+  const [quote, setQuote] = useState3(null);
   const hasAttemptedSwitch = useRef3(false);
   const chainMismatch = Boolean(
     walletClient?.chain?.id && walletClient.chain.id !== asset.chainId
@@ -840,7 +875,10 @@ function ConfirmStep({
   const targetChainIcon = getChainIcon(targetChain);
   const sourceTokenIcon = getTokenIcon(asset.symbol);
   const targetTokenIcon = getTokenIcon(targetSymbol);
-  const formattedSendAmount = amount && !Number.isNaN(Number(amount)) ? Number(amount).toLocaleString("en-US", { maximumFractionDigits: 6 }) : "0";
+  const formattedSendAmount = amount && !Number.isNaN(Number(amount)) ? Number(amount).toLocaleString("en-US", {
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 6
+  }) : "0";
   const formattedReceiveAmount = (() => {
     if (sameRoute) return formattedSendAmount;
     const dollarValue = Number(targetAmount);
@@ -848,13 +886,18 @@ function ConfirmStep({
       return formattedSendAmount;
     if (targetTokenPriceUsd !== null && targetTokenPriceUsd > 0) {
       const tokenAmount = dollarValue / targetTokenPriceUsd;
-      return tokenAmount.toLocaleString("en-US", { maximumFractionDigits: 6 });
+      return tokenAmount.toLocaleString("en-US", {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 6
+      });
     }
     return formattedSendAmount;
   })();
   const receiveAmount = sameRoute ? formattedReceiveAmount : `~${formattedReceiveAmount}`;
   const feeSponsored = uiConfig?.feeSponsored ?? false;
   const feeTooltip = uiConfig?.feeTooltip ?? (feeSponsored ? "Network fees are sponsored for this deposit." : "Network fees apply.");
+  const feeDisplay = quote ? `$${quote.fees.totalUsd.toFixed(2)}` : null;
+  const estimatedTimeDisplay = quote ? quote.estimatedFillTimeSeconds < 60 ? "< 1 min" : `~${Math.round(quote.estimatedFillTimeSeconds / 60)} min` : estimatedTime;
   useEffect3(() => {
     if (chainMismatch && switchChain && !hasAttemptedSwitch.current) {
       hasAttemptedSwitch.current = true;
@@ -867,6 +910,39 @@ function ConfirmStep({
   useEffect3(() => {
     hasAttemptedSwitch.current = false;
   }, [asset.chainId]);
+  useEffect3(() => {
+    if (targetChain === "solana" && asset.chainId === void 0) return;
+    let cancelled = false;
+    let units;
+    try {
+      units = parseUnits2(amount, asset.decimals);
+    } catch {
+      return;
+    }
+    if (units <= 0n) return;
+    setQuote(null);
+    service.getQuotePreview({
+      account: smartAccount,
+      sourceChainId: asset.chainId,
+      sourceToken: asset.token,
+      amount: units.toString()
+    }).then((result) => {
+      if (!cancelled) setQuote(result);
+    }).catch(() => {
+      if (!cancelled) setQuote(null);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [
+    service,
+    smartAccount,
+    asset.chainId,
+    asset.token,
+    asset.decimals,
+    amount,
+    targetChain
+  ]);
   const handleConfirm = async () => {
     if (!address || !walletClient) {
       setError("Wallet not connected");
@@ -955,7 +1031,7 @@ function ConfirmStep({
         ] }),
         /* @__PURE__ */ jsxs4("div", { className: "rs-review-detail-row", children: [
           /* @__PURE__ */ jsx4("span", { children: "Estimated time" }),
-          /* @__PURE__ */ jsx4("span", { className: "rs-review-detail-value", children: estimatedTime })
+          /* @__PURE__ */ jsx4("span", { className: "rs-review-detail-value", children: estimatedTimeDisplay })
         ] }),
         /* @__PURE__ */ jsxs4("div", { className: "rs-review-detail-row", children: [
           /* @__PURE__ */ jsx4("span", { children: "You send" }),
@@ -982,17 +1058,24 @@ function ConfirmStep({
         /* @__PURE__ */ jsxs4("div", { className: "rs-review-detail-row", children: [
           /* @__PURE__ */ jsx4("span", { children: "Fees" }),
           /* @__PURE__ */ jsxs4("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsx4(
+            feeDisplay === null ? /* @__PURE__ */ jsx4(
+              "span",
+              {
+                className: "rs-skeleton rs-skeleton-fee",
+                "aria-hidden": "true"
+              }
+            ) : /* @__PURE__ */ jsx4(
               "span",
               {
                 style: feeSponsored ? { textDecoration: "line-through" } : void 0,
-                children: "$0.04"
+                children: feeDisplay
               }
             ),
             /* @__PURE__ */ jsx4(Tooltip, { content: feeTooltip, children: /* @__PURE__ */ jsx4("span", { className: "rs-review-detail-info", "aria-label": "Fee info", children: /* @__PURE__ */ jsx4(InfoIcon, {}) }) })
           ] })
         ] })
       ] }),
+      targetChain === HYPERCORE_CHAIN_ID && /* @__PURE__ */ jsx4(Callout, { variant: "warning", children: "First deposit to a new HyperCore account includes a ~1 USDC activation fee." }),
       error && /* @__PURE__ */ jsx4(Callout, { variant: "error", children: error }),
       /* @__PURE__ */ jsx4(
         Button,
@@ -1088,14 +1171,21 @@ function DepositNotification({
   solanaDepositAddress,
   targetChain,
   targetToken,
-  waitForFinalTx,
   hasPostBridgeActions,
   service,
   onComplete,
   onFailed,
   onDismiss
 }) {
-  const { txHash, sourceChain, amount, token, detectedAt, directTransfer } = deposit;
+  const {
+    txHash,
+    sourceChain,
+    amount,
+    token,
+    sourceDecimals,
+    detectedAt,
+    directTransfer
+  } = deposit;
   const [status, setStatus] = useState4(
     directTransfer ? "complete" : "processing"
   );
@@ -1113,9 +1203,9 @@ function DepositNotification({
     amount,
     sourceChain,
     sourceToken: token,
+    sourceDecimals,
     targetChain,
     targetToken,
-    waitForFinalTx,
     hasPostBridgeActions
   });
   const onCompleteRef = useLatestRef(onComplete);
@@ -1132,6 +1222,7 @@ function DepositNotification({
         amount: context.amount,
         sourceChain: context.sourceChain,
         sourceToken: context.sourceToken,
+        sourceDecimals: context.sourceDecimals,
         targetChain: context.targetChain,
         targetToken: context.targetToken
       });
@@ -1161,7 +1252,7 @@ function DepositNotification({
         if (!isMounted) return;
         const lastEvent = data.lastEvent;
         const eventForTx = isEventForTx(lastEvent, txHash) ? lastEvent : void 0;
-        const awaitingPostBridgeSwap = depositContextRef.current.waitForFinalTx && depositContextRef.current.hasPostBridgeActions;
+        const awaitingPostBridgeSwap = depositContextRef.current.hasPostBridgeActions;
         if (eventForTx?.type === "post-bridge-swap-complete") {
           const swapTxHash = eventForTx.data?.swap?.transactionHash;
           handleComplete(swapTxHash);
@@ -1176,10 +1267,6 @@ function DepositNotification({
           handleComplete(destTx);
           return;
         }
-        if (!waitForFinalTx && eventForTx?.type === "bridge-started") {
-          handleComplete(void 0);
-          return;
-        }
         if (eventForTx?.type === "bridge-failed") {
           handleFailed(formatBridgeFailedMessage(eventForTx));
           return;
@@ -1227,7 +1314,38 @@ function DepositNotification({
   const destExplorerUrl = destinationTxHash ? getExplorerTxUrl(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__ */ jsx5("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--complete", children: /* @__PURE__ */ jsx5(CheckIcon, {}) }) : status === "failed" ? /* @__PURE__ */ jsx5("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--failed", children: /* @__PURE__ */ jsx5(CloseIcon, {}) }) : /* @__PURE__ */ jsx5("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--processing", children: /* @__PURE__ */ jsx5(Spinner, {}) });
+  const statusIcon = status === "complete" ? /* @__PURE__ */ jsx5("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--complete", children: /* @__PURE__ */ jsx5(CheckIcon, {}) }) : status === "failed" ? /* @__PURE__ */ jsx5("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--failed", children: /* @__PURE__ */ jsx5(CloseIcon, {}) }) : /* @__PURE__ */ jsx5("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--processing", children: /* @__PURE__ */ jsxs5(
+    "svg",
+    {
+      className: "rs-deposit-notification-spinner",
+      viewBox: "0 0 44 44",
+      fill: "none",
+      xmlns: "http://www.w3.org/2000/svg",
+      "aria-hidden": "true",
+      children: [
+        /* @__PURE__ */ jsx5(
+          "path",
+          {
+            className: "rs-deposit-notification-spinner-track",
+            d: "M21.5882 42.1765C32.9588 42.1765 42.1765 32.9588 42.1765 21.5882C42.1765 10.2177 32.9588 1 21.5882 1C10.2177 1 1 10.2177 1 21.5882C1 32.9588 10.2177 42.1765 21.5882 42.1765Z",
+            stroke: "#D4D4D8",
+            strokeWidth: "2",
+            strokeLinecap: "round"
+          }
+        ),
+        /* @__PURE__ */ jsx5(
+          "path",
+          {
+            className: "rs-deposit-notification-spinner-head",
+            d: "M28.0422 2.03186C31.4239 3.1515 34.458 5.1279 36.8489 7.76854C39.2398 10.4092 40.906 13.624 41.6852 17.1",
+            stroke: "#52525C",
+            strokeWidth: "2",
+            strokeLinecap: "round"
+          }
+        )
+      ]
+    }
+  ) });
   const showClose = status !== "processing";
   return /* @__PURE__ */ jsxs5(
     "div",
@@ -1316,7 +1434,7 @@ function DepositNotification({
 // src/components/steps/DepositAddressStep.tsx
 import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
 var QRCode = lazy(
-  () => import("./QRCode-YJ3EGWQS.mjs").then((m) => ({ default: m.QRCode }))
+  () => import("./QRCode-WUC652SH.mjs").then((m) => ({ default: m.QRCode }))
 );
 var POLL_INTERVAL_MS = 4e3;
 function isRecord(value) {
@@ -1375,14 +1493,15 @@ function getDepositEventDetails(event) {
       ...solanaMeta
     };
   }
-  if (event.type === "bridge-started") {
-    const source = isRecord(event.data.source) ? event.data.source : void 0;
-    const chainId = asChainId(source?.chain);
-    const token = asString(source?.asset);
+  const source = isRecord(event.data.source) ? event.data.source : void 0;
+  const deposit = isRecord(event.data.deposit) ? event.data.deposit : void 0;
+  if (source || deposit) {
+    const chainId = asChainId(source?.chain) ?? asChainId(deposit?.chain);
+    const token = asString(source?.asset) ?? asString(deposit?.asset) ?? asString(deposit?.token);
     const solanaMeta = chainId === "solana" ? resolveSolanaTokenMeta(token) : {};
     return {
       chainId,
-      amount: asAmount(source?.amount),
+      amount: asAmount(source?.amount) ?? asAmount(deposit?.amount),
       token,
       ...solanaMeta
     };
@@ -1392,15 +1511,22 @@ 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);
+  return allowedTokenSet ? all.filter((s) => allowedTokenSet.has(s.toUpperCase())) : all;
+}
+function pickFallbackToken(tokens, current) {
+  if (tokens.includes(current)) return current;
+  if (tokens.includes("USDC")) return "USDC";
+  return tokens[0] ?? "USDC";
+}
 function DepositAddressStep({
   smartAccount,
   solanaDepositAddress,
-  isUpdating = false,
   service,
   allowedRoutes,
   targetChain,
   targetToken,
-  waitForFinalTx,
   hasPostBridgeActions,
   uiConfig,
   onDepositSubmitted,
@@ -1428,22 +1554,16 @@ function DepositAddressStep({
     options.splice(1, 0, "solana");
     return options;
   }, [evmChainIds, hasSolana]);
-  const BASE_CHAIN_ID = 8453;
-  const defaultChainId = evmChainIds.includes(BASE_CHAIN_ID) ? BASE_CHAIN_ID : evmChainIds[0];
+  const BASE_CHAIN_ID2 = 8453;
+  const defaultChainId = evmChainIds.includes(BASE_CHAIN_ID2) ? BASE_CHAIN_ID2 : evmChainIds[0];
   const [sourceChainId, setSourceChainId] = useState5(defaultChainId);
   const isSolana = sourceChainId === "solana";
-  const tokensForChain = useMemo3(() => {
-    const all = isSolana ? SOLANA_TOKENS.map((t) => t.symbol) : getTargetTokenSymbolsForChain(sourceChainId);
-    return allowedTokenSet ? all.filter((s) => allowedTokenSet.has(s.toUpperCase())) : all;
-  }, [sourceChainId, isSolana, allowedTokenSet]);
-  const defaultToken = tokensForChain.includes("USDC") ? "USDC" : tokensForChain[0] ?? "USDC";
+  const tokensForChain = useMemo3(
+    () => computeTokensForChain(sourceChainId, allowedTokenSet),
+    [sourceChainId, allowedTokenSet]
+  );
+  const defaultToken = pickFallbackToken(tokensForChain, "USDC");
   const [sourceTokenSymbol, setSourceTokenSymbol] = useState5(defaultToken);
-  useEffect5(() => {
-    if (!tokensForChain.includes(sourceTokenSymbol)) {
-      const fallback = tokensForChain.includes("USDC") ? "USDC" : tokensForChain[0] ?? "USDC";
-      setSourceTokenSymbol(fallback);
-    }
-  }, [tokensForChain, sourceTokenSymbol]);
   const [copied, setCopied] = useState5(false);
   const [pollingError, setPollingError] = useState5(null);
   const [chainDropdownOpen, setChainDropdownOpen] = useState5(false);
@@ -1455,28 +1575,6 @@ function DepositAddressStep({
   const isTrackingRef = useRef5(false);
   const baselineTxHashRef = useRef5(void 0);
   const notificationIdRef = useRef5(0);
-  const sourceSelectionRef = useRef5({
-    chainId: defaultChainId,
-    token: typeof defaultChainId === "number" ? getTokenAddress(defaultToken, defaultChainId) : void 0,
-    sourceSymbol: defaultToken
-  });
-  useEffect5(() => {
-    if (isSolana) {
-      const matched = SOLANA_TOKENS.find((t) => t.symbol === sourceTokenSymbol) ?? SOLANA_TOKENS[0];
-      sourceSelectionRef.current = {
-        chainId: "solana",
-        token: matched?.mint,
-        sourceSymbol: matched?.symbol,
-        sourceDecimals: matched?.decimals
-      };
-      return;
-    }
-    sourceSelectionRef.current = {
-      chainId: sourceChainId,
-      token: getTokenAddress(sourceTokenSymbol, sourceChainId),
-      sourceSymbol: sourceTokenSymbol
-    };
-  }, [sourceChainId, sourceTokenSymbol, isSolana]);
   const [liquidityHelper, setLiquidityHelper] = useState5({
     kind: "idle"
   });
@@ -1543,14 +1641,13 @@ function DepositAddressStep({
       setTokenDropdownOpen(false);
     }
     document.addEventListener("mousedown", handlePointerDown);
-    document.addEventListener("touchstart", handlePointerDown);
+    document.addEventListener("touchstart", handlePointerDown, { passive: true });
     return () => {
       document.removeEventListener("mousedown", handlePointerDown);
       document.removeEventListener("touchstart", handlePointerDown);
     };
   }, [chainDropdownOpen, tokenDropdownOpen]);
   const handleCopy = useCallback2(async () => {
-    if (isUpdating) return;
     onCopyAddress?.();
     try {
       await navigator.clipboard.writeText(displayAddress);
@@ -1568,12 +1665,18 @@ function DepositAddressStep({
       setCopied(true);
       setTimeout(() => setCopied(false), 2e3);
     }
-  }, [displayAddress, onCopyAddress, isUpdating]);
-  useEffect5(() => {
-    setCopied(false);
-    setChainDropdownOpen(false);
-    setTokenDropdownOpen(false);
-  }, [sourceChainId]);
+  }, [displayAddress, onCopyAddress]);
+  const handleSelectChain = useCallback2(
+    (nextChain) => {
+      const nextTokens = computeTokensForChain(nextChain, allowedTokenSet);
+      setSourceChainId(nextChain);
+      setSourceTokenSymbol(pickFallbackToken(nextTokens, sourceTokenSymbol));
+      setChainDropdownOpen(false);
+      setTokenDropdownOpen(false);
+      setCopied(false);
+    },
+    [allowedTokenSet, sourceTokenSymbol]
+  );
   const onDepositSubmittedRef = useRef5(onDepositSubmitted);
   onDepositSubmittedRef.current = onDepositSubmitted;
   const onDepositCompleteRef = useRef5(onDepositComplete);
@@ -1589,7 +1692,6 @@ function DepositAddressStep({
   useEffect5(() => {
     baselineTxHashRef.current = void 0;
     isTrackingRef.current = false;
-    setPollingError(null);
     let timeoutId;
     let cancelled = false;
     async function poll() {
@@ -1634,10 +1736,13 @@ function DepositAddressStep({
           const amount = details.amount ?? "0";
           const token = details.token;
           const sourceSymbol = details.sourceSymbol;
-          const sourceDecimals = details.sourceDecimals;
           baselineTxHashRef.current = eventTxHash;
           isTrackingRef.current = true;
           const isEvmToken = token ? /^0x[a-fA-F0-9]{40}$/.test(token) : false;
+          const sourceDecimals = details.sourceDecimals ?? (isEvmToken ? findTokenDecimals(
+            token,
+            typeof chainId === "number" ? chainId : void 0
+          ) : void 0);
           const directTransfer = typeof chainId === "number" && isEvmToken && isSameRoute(
             chainId,
             token,
@@ -1660,7 +1765,8 @@ function DepositAddressStep({
           onDepositSubmittedRef.current?.({
             txHash: eventTxHash,
             sourceChain: chainId,
-            amount
+            amount,
+            sourceDecimals
           });
         }
         setPollingError(null);
@@ -1734,10 +1840,7 @@ function DepositAddressStep({
             {
               type: "button",
               className: `rs-deposit-address-dropdown-item ${chainId === sourceChainId ? "rs-deposit-address-dropdown-item--active" : ""}`,
-              onClick: () => {
-                setSourceChainId(chainId);
-                setChainDropdownOpen(false);
-              },
+              onClick: () => handleSelectChain(chainId),
               children: [
                 getChainIcon(chainId) && /* @__PURE__ */ jsx6(
                   "img",
@@ -1758,7 +1861,7 @@ function DepositAddressStep({
             /* @__PURE__ */ jsx6("span", { children: "Supported token" }),
             /* @__PURE__ */ jsxs6("span", { className: "rs-deposit-address-min", children: [
               "Min.$",
-              (uiConfig?.minDepositUsd ?? 0.1).toFixed(2),
+              (targetChain === HYPERCORE_CHAIN_ID ? Math.max(HYPERCORE_MIN_DEPOSIT_USD, uiConfig?.minDepositUsd ?? 0) : uiConfig?.minDepositUsd ?? 0.1).toFixed(2),
               /* @__PURE__ */ jsx6(Tooltip, { content: "Minimum deposit amount required for the selected chain.", children: /* @__PURE__ */ jsx6(
                 InfoIcon,
                 {
@@ -1822,38 +1925,17 @@ function DepositAddressStep({
         {
           style: { display: "flex", flexDirection: "column", gap: 4, width: "100%" },
           children: [
+            /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-well", children: [
+              /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ jsx6(
+                Suspense,
+                {
+                  fallback: /* @__PURE__ */ jsx6("div", { className: "rs-skeleton rs-skeleton-qr", "aria-hidden": "true" }),
+                  children: /* @__PURE__ */ jsx6(QRCode, { value: displayAddress, size: 190, iconSrc: qrIconSrc })
+                }
+              ) }),
+              /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-value", children: displayAddress })
+            ] }),
             /* @__PURE__ */ jsxs6(
-              "div",
-              {
-                className: `rs-deposit-address-well ${isUpdating ? "rs-deposit-address-well--updating" : ""}`,
-                children: [
-                  /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ jsx6(
-                    Suspense,
-                    {
-                      fallback: /* @__PURE__ */ jsx6(
-                        "div",
-                        {
-                          style: {
-                            width: 200,
-                            height: 200,
-                            display: "flex",
-                            alignItems: "center",
-                            justifyContent: "center"
-                          },
-                          children: /* @__PURE__ */ jsx6(Spinner, {})
-                        }
-                      ),
-                      children: /* @__PURE__ */ jsx6(QRCode, { value: displayAddress, size: 200, iconSrc: qrIconSrc })
-                    }
-                  ) }),
-                  /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-value", children: displayAddress })
-                ]
-              }
-            ),
-            isUpdating ? /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-updating", role: "status", children: [
-              /* @__PURE__ */ jsx6(Spinner, { className: "rs-spinner--sm" }),
-              "Updating deposit details\u2026"
-            ] }) : /* @__PURE__ */ jsxs6(
               "button",
               {
                 type: "button",
@@ -1868,6 +1950,7 @@ function DepositAddressStep({
           ]
         }
       ),
+      targetChain === HYPERCORE_CHAIN_ID && /* @__PURE__ */ jsx6(Callout, { variant: "warning", children: "HyperCore's first deposit to a new account includes a ~1 USDC activation fee \u2014 send at least 1 USDC or it will fail." }),
       /* @__PURE__ */ jsxs6(
         "div",
         {
@@ -1951,7 +2034,6 @@ function DepositAddressStep({
         solanaDepositAddress,
         targetChain,
         targetToken,
-        waitForFinalTx,
         hasPostBridgeActions,
         service,
         onComplete: handleNotificationComplete,
@@ -1965,97 +2047,884 @@ function DepositAddressStep({
 }
 DepositAddressStep.displayName = "DepositAddressStep";
 
-// src/components/steps/SolanaTokenSelectStep.tsx
-import { useState as useState6, useEffect as useEffect6, useMemo as useMemo4 } from "react";
-import { formatUnits as formatUnits4 } from "viem";
+// src/components/steps/FiatOnrampStep.tsx
+import { useCallback as useCallback3 } from "react";
+
+// src/components/steps/SwappedIframeStep.tsx
+import { useState as useState6, useEffect as useEffect6, useRef as useRef6, useMemo as useMemo4 } from "react";
+
+// src/components/steps/SwappedOrderTracker.tsx
 import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
-function SolanaTokenSelectStep({
-  solanaAddress,
+var STEP_LABELS = [
+  "Payment received",
+  null,
+  "Processing App deposit",
+  "Deposit successful"
+];
+function SwappedOrderTracker({
+  amount,
+  currency = "USDC",
+  chainLabel = "Base",
+  stepStates,
+  terminal = null,
+  onRetry
+}) {
+  const formattedAmount = formatTrackerAmount(amount);
+  const title = terminal ? terminal.kind === "cancelled" ? "Order cancelled" : "Deposit failed" : formattedAmount ? `Depositing ${formattedAmount} ${currency}` : `Depositing ${currency}`;
+  const labels = [
+    STEP_LABELS[0],
+    `${currency} received on ${chainLabel}`,
+    STEP_LABELS[2],
+    STEP_LABELS[3]
+  ];
+  return /* @__PURE__ */ jsxs7("div", { className: "rs-screen rs-swapped-tracker", children: [
+    /* @__PURE__ */ jsxs7("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx7(BodyHeader, { icon: /* @__PURE__ */ jsx7(HandCoinsIcon, {}), title }),
+      /* @__PURE__ */ jsx7("ol", { className: "rs-swapped-tracker-steps", children: labels.map((label, idx) => {
+        const status = stepStates[idx];
+        return /* @__PURE__ */ jsxs7(
+          "li",
+          {
+            className: `rs-swapped-tracker-step rs-swapped-tracker-step--${status}`,
+            children: [
+              /* @__PURE__ */ jsx7("span", { className: "rs-swapped-tracker-step-label", children: label }),
+              /* @__PURE__ */ jsx7(
+                "span",
+                {
+                  className: "rs-swapped-tracker-step-marker",
+                  "aria-hidden": "true",
+                  children: status === "complete" ? /* @__PURE__ */ jsx7(CheckIcon, {}) : status === "failed" ? /* @__PURE__ */ jsx7(CloseIcon, {}) : status === "active" ? /* @__PURE__ */ jsx7(Spinner, {}) : null
+                }
+              )
+            ]
+          },
+          label
+        );
+      }) }),
+      terminal && /* @__PURE__ */ jsxs7(
+        "div",
+        {
+          className: `rs-swapped-tracker-terminal rs-swapped-tracker-terminal--${terminal.kind}`,
+          children: [
+            /* @__PURE__ */ jsx7("p", { className: "rs-swapped-tracker-terminal-message", children: terminal.message }),
+            terminal.kind === "cancelled" && onRetry && /* @__PURE__ */ jsx7(
+              "button",
+              {
+                type: "button",
+                className: "rs-swapped-tracker-retry",
+                onClick: onRetry,
+                children: "Try again"
+              }
+            )
+          ]
+        }
+      )
+    ] }),
+    /* @__PURE__ */ jsx7(PoweredBy, {})
+  ] });
+}
+function formatTrackerAmount(amount) {
+  if (!amount) return null;
+  const num = Number(amount);
+  if (!Number.isFinite(num)) return amount;
+  return num.toFixed(2);
+}
+SwappedOrderTracker.displayName = "SwappedOrderTracker";
+
+// src/components/steps/SwappedIframeStep.tsx
+import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
+var STATUS_POLL_INTERVAL_MS = 2e3;
+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_IFRAME_ORIGINS = /* @__PURE__ */ new Set([
+  "https://sandbox.swapped.com",
+  "https://widget.swapped.com"
+]);
+var SWAPPED_TERMINAL_STATUSES = /* @__PURE__ */ new Set([
+  "order_completed",
+  "order_broadcasted"
+]);
+var SWAPPED_STATUS_VALUES = /* @__PURE__ */ new Set([
+  "payment_pending",
+  "order_completed",
+  "order_broadcasted",
+  "order_cancelled"
+]);
+function parseSwappedIframeMessage(raw) {
+  let data = raw;
+  if (typeof data === "string") {
+    try {
+      data = JSON.parse(data);
+    } catch {
+      return null;
+    }
+  }
+  if (!data || typeof data !== "object") return null;
+  const obj = data;
+  const inner = obj.data && typeof obj.data === "object" ? obj.data : obj;
+  const rawStatus = inner.order_status ?? inner.status ?? obj.status;
+  if (typeof rawStatus !== "string" || !SWAPPED_STATUS_VALUES.has(rawStatus)) {
+    return null;
+  }
+  const asString2 = (v) => typeof v === "string" && v.length > 0 ? v : void 0;
+  return {
+    status: rawStatus,
+    orderId: asString2(inner.order_id) ?? asString2(obj.orderId),
+    orderCrypto: asString2(inner.order_crypto) ?? asString2(obj.orderCrypto),
+    orderCryptoAmount: asString2(inner.order_crypto_amount) ?? asString2(obj.orderCryptoAmount),
+    transactionId: asString2(inner.transaction_id) ?? asString2(obj.transactionId)
+  };
+}
+function SwappedIframeStep({
+  smartAccount,
   service,
-  onContinue,
-  onTotalBalanceComputed,
-  onDisconnect,
-  debug
+  variant,
+  loadUrl,
+  iframeTitle,
+  loadErrorCode,
+  loadErrorFallback,
+  bannerForStatus,
+  onSwappedComplete,
+  onSwappedFailed,
+  onClose,
+  onError
 }) {
-  const [tokenBalances, setTokenBalances] = useState6([]);
-  const [selectedSymbol, setSelectedSymbol] = useState6(null);
-  const [loading, setLoading] = useState6(true);
-  const [error, setError] = useState6(null);
+  const [widgetUrl, setWidgetUrl] = useState6(null);
+  const [loadError, setLoadError] = useState6(null);
+  const [iframeLoaded, setIframeLoaded] = useState6(false);
+  const [retryToken, setRetryToken] = useState6(0);
+  const [orderState, setOrderState] = useState6(null);
+  const [latestEvent, setLatestEvent] = useState6(null);
+  const [phase, setPhase] = useState6("iframe");
+  const completeFiredRef = useRef6(false);
+  const failedFiredRef = useRef6(false);
+  const expectedOrderUuidRef = useRef6(null);
+  const baselineDepositTxHashRef = useRef6(void 0);
+  const currentDepositTxHashRef = useRef6(null);
+  const fastDepositPollEnabledRef = useRef6(false);
+  const rescheduleDepositPollRef = useRef6(
+    null
+  );
+  const onSwappedCompleteRef = useRef6(onSwappedComplete);
+  onSwappedCompleteRef.current = onSwappedComplete;
+  const onSwappedFailedRef = useRef6(onSwappedFailed);
+  onSwappedFailedRef.current = onSwappedFailed;
+  const onErrorRef = useRef6(onError);
+  onErrorRef.current = onError;
+  const loadUrlRef = useRef6(loadUrl);
+  loadUrlRef.current = loadUrl;
   useEffect6(() => {
-    let active = true;
-    async function loadBalances() {
-      if (!solanaAddress) {
-        setLoading(false);
-        return;
-      }
-      setLoading(true);
-      setError(null);
-      const portfolioBySymbol = {};
+    let cancelled = false;
+    setLoadError(null);
+    setIframeLoaded(false);
+    setWidgetUrl(null);
+    setOrderState(null);
+    setLatestEvent(null);
+    setPhase("iframe");
+    expectedOrderUuidRef.current = null;
+    completeFiredRef.current = false;
+    failedFiredRef.current = false;
+    baselineDepositTxHashRef.current = void 0;
+    currentDepositTxHashRef.current = null;
+    fastDepositPollEnabledRef.current = false;
+    loadUrlRef.current().then((res) => {
+      if (cancelled) return;
+      setWidgetUrl(res.url);
+      const sep = res.externalCustomerId.indexOf(":");
+      expectedOrderUuidRef.current = sep >= 0 ? res.externalCustomerId.slice(sep + 1) : null;
+    }).catch((err) => {
+      if (cancelled) return;
+      const message = err instanceof Error ? err.message : loadErrorFallback;
+      setLoadError(message);
+      onErrorRef.current?.(message, loadErrorCode);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [service, smartAccount, retryToken, loadErrorCode, loadErrorFallback]);
+  useEffect6(() => {
+    if (!widgetUrl || iframeLoaded || loadError) return;
+    const timer = setTimeout(() => {
+      setLoadError("Iframe took too long to load.");
+    }, IFRAME_LOAD_TIMEOUT_MS);
+    return () => clearTimeout(timer);
+  }, [widgetUrl, iframeLoaded, loadError]);
+  useEffect6(() => {
+    let cancelled = false;
+    let timeoutId;
+    async function poll() {
+      if (cancelled) return;
       try {
-        debugLog(debug, "solana-token-select", "portfolio:request", {
-          solanaAddress
-        });
-        const portfolio = await service.fetchSolanaPortfolio(solanaAddress);
-        if (!active) return;
-        for (const t of portfolio.tokens) {
-          const symbol = t.symbol.toUpperCase();
-          if (!SOLANA_TOKENS.some((st) => st.symbol === symbol)) continue;
-          let parsed = 0n;
-          try {
-            parsed = BigInt(t.balance || "0");
-          } catch {
-            parsed = 0n;
-          }
-          if (parsed <= 0n) continue;
-          const existing = portfolioBySymbol[symbol];
-          if (!existing || (t.balanceUsd ?? 0) > existing.balanceUsd) {
-            portfolioBySymbol[symbol] = {
-              balance: parsed,
-              balanceUsd: t.balanceUsd ?? 0
-            };
-          }
+        const res = await service.fetchSwappedOrderStatus(smartAccount);
+        if (cancelled) return;
+        const isCurrentOrder = res !== null && expectedOrderUuidRef.current !== null && res.orderId === expectedOrderUuidRef.current;
+        if (isCurrentOrder) {
+          setOrderState(res);
         }
-        debugLog(debug, "solana-token-select", "portfolio:success", {
-          symbols: Object.keys(portfolioBySymbol)
-        });
-      } catch (err) {
-        if (!active) return;
-        debugError(debug, "solana-token-select", "portfolio:failure", err, {
-          solanaAddress
-        });
-        setError(
-          err instanceof Error ? err.message : "Failed to load balances"
-        );
-        setTokenBalances([]);
-        setLoading(false);
-        return;
+      } catch {
       }
-      const results = [];
-      for (const token of SOLANA_TOKENS) {
-        const fromPortfolio = portfolioBySymbol[token.symbol];
-        if (fromPortfolio && fromPortfolio.balance > 0n) {
-          results.push({
-            token,
-            balance: fromPortfolio.balance,
-            balanceUsd: fromPortfolio.balanceUsd
-          });
+      if (!cancelled) {
+        timeoutId = setTimeout(poll, STATUS_POLL_INTERVAL_MS);
+      }
+    }
+    poll();
+    return () => {
+      cancelled = true;
+      clearTimeout(timeoutId);
+    };
+  }, [service, smartAccount]);
+  useEffect6(() => {
+    let cancelled = false;
+    let timeoutId;
+    async function pollDeposit() {
+      if (cancelled) return;
+      try {
+        const status = await service.fetchLatestStatus(smartAccount);
+        if (cancelled) return;
+        const event = status.lastEvent;
+        const eventTxHash = isDepositEvent(event) ? getEventTxHash(event) ?? null : null;
+        if (baselineDepositTxHashRef.current === void 0) {
+          baselineDepositTxHashRef.current = eventTxHash;
+        } else if (eventTxHash && (!baselineDepositTxHashRef.current || !txRefsMatch(eventTxHash, baselineDepositTxHashRef.current))) {
+          currentDepositTxHashRef.current = eventTxHash;
+          setLatestEvent(event ?? null);
         }
+      } catch {
+      }
+      if (!cancelled) {
+        const nextInterval = fastDepositPollEnabledRef.current ? DEPOSIT_POLL_FAST_INTERVAL_MS : DEPOSIT_POLL_INTERVAL_MS;
+        timeoutId = setTimeout(pollDeposit, nextInterval);
       }
-      if (!active) return;
-      setTokenBalances(results);
-      setLoading(false);
-      const totalUsd = results.reduce((sum, r) => sum + r.balanceUsd, 0);
-      onTotalBalanceComputed?.(totalUsd);
     }
-    void loadBalances();
+    rescheduleDepositPollRef.current = (delayMs) => {
+      if (cancelled) return;
+      if (timeoutId !== void 0) clearTimeout(timeoutId);
+      timeoutId = setTimeout(pollDeposit, delayMs);
+    };
+    pollDeposit();
     return () => {
-      active = false;
+      cancelled = true;
+      if (timeoutId !== void 0) clearTimeout(timeoutId);
+      rescheduleDepositPollRef.current = null;
     };
-  }, [debug, solanaAddress, service, onTotalBalanceComputed]);
-  const rows = useMemo4(
-    () => [...tokenBalances].sort((a, b) => {
-      if (a.balanceUsd !== b.balanceUsd) return b.balanceUsd - a.balanceUsd;
-      if (b.balance > a.balance) return 1;
+  }, [service, smartAccount]);
+  useEffect6(() => {
+    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]);
+  useEffect6(() => {
+    function onMessage(e) {
+      if (!SWAPPED_IFRAME_ORIGINS.has(e.origin)) return;
+      const parsed = parseSwappedIframeMessage(e.data);
+      if (!parsed) return;
+      setOrderState((prev) => ({
+        orderId: parsed.orderId ?? prev?.orderId ?? "",
+        status: parsed.status,
+        orderCrypto: parsed.orderCrypto ?? prev?.orderCrypto ?? null,
+        orderCryptoAmount: parsed.orderCryptoAmount ?? prev?.orderCryptoAmount ?? null,
+        transactionId: parsed.transactionId ?? prev?.transactionId ?? null,
+        receivedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        paidAmountUsd: prev?.paidAmountUsd ?? null,
+        paidAmountEur: prev?.paidAmountEur ?? null,
+        onrampFeeUsd: prev?.onrampFeeUsd ?? null,
+        paymentMethod: prev?.paymentMethod ?? null
+      }));
+    }
+    window.addEventListener("message", onMessage);
+    return () => window.removeEventListener("message", onMessage);
+  }, []);
+  useEffect6(() => {
+    if (phase === "iframe" && orderState !== null) {
+      setPhase("tracker");
+    }
+  }, [phase, orderState]);
+  const stepStates = useMemo4(
+    () => deriveStepStates(orderState?.status ?? null, latestEvent),
+    [orderState, latestEvent]
+  );
+  const terminalState = useMemo4(() => {
+    if (isFailedEvent(latestEvent ?? void 0)) {
+      return {
+        kind: "failed",
+        message: failureMessageForEvent(latestEvent ?? void 0)
+      };
+    }
+    if (orderState?.status === "order_cancelled") {
+      const banner = bannerForStatus("order_cancelled", {});
+      return { kind: "cancelled", message: banner.detail ?? banner.title };
+    }
+    return null;
+  }, [latestEvent, orderState, bannerForStatus]);
+  useEffect6(() => {
+    if (completeFiredRef.current || failedFiredRef.current) return;
+    const t = latestEvent?.type;
+    const isSuccess = t === "bridge-complete" || t === "post-bridge-swap-complete";
+    if (!isSuccess) return;
+    const txHash = currentDepositTxHashRef.current;
+    if (!txHash) return;
+    completeFiredRef.current = true;
+    onSwappedCompleteRef.current({
+      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]);
+  useEffect6(() => {
+    if (failedFiredRef.current || completeFiredRef.current) return;
+    if (!isFailedEvent(latestEvent ?? void 0)) return;
+    const txHash = currentDepositTxHashRef.current;
+    if (!txHash) return;
+    failedFiredRef.current = true;
+    setPhase("tracker");
+    onSwappedFailedRef.current?.(
+      txHash,
+      failureMessageForEvent(latestEvent ?? void 0)
+    );
+  }, [latestEvent]);
+  if (phase === "tracker") {
+    return /* @__PURE__ */ jsx8(
+      SwappedOrderTracker,
+      {
+        amount: orderState?.orderCryptoAmount ?? null,
+        currency: orderState?.orderCrypto ?? "USDC",
+        stepStates,
+        terminal: terminalState,
+        onRetry: () => setRetryToken((n) => n + 1),
+        onClose
+      }
+    );
+  }
+  return /* @__PURE__ */ jsxs8("div", { className: "rs-screen rs-fiat-onramp", "data-variant": variant, children: [
+    /* @__PURE__ */ jsxs8("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx8(
+        BodyHeader,
+        {
+          icon: /* @__PURE__ */ jsx8(HandCoinsIcon, {}),
+          title: "Deposit",
+          subtitle: "Add money to your balance"
+        }
+      ),
+      /* @__PURE__ */ jsxs8("div", { className: "rs-fiat-onramp-iframe-wrap", children: [
+        loadError && /* @__PURE__ */ jsxs8("div", { className: "rs-fiat-onramp-error", children: [
+          /* @__PURE__ */ jsx8("div", { children: loadError }),
+          /* @__PURE__ */ jsx8(
+            "button",
+            {
+              type: "button",
+              className: "rs-fiat-onramp-retry",
+              onClick: () => setRetryToken((n) => n + 1),
+              children: "Retry"
+            }
+          )
+        ] }),
+        !loadError && !iframeLoaded && /* @__PURE__ */ jsx8("div", { className: "rs-fiat-onramp-loading", children: /* @__PURE__ */ jsx8(Spinner, {}) }),
+        widgetUrl && !loadError && /* @__PURE__ */ jsx8(
+          "iframe",
+          {
+            src: widgetUrl,
+            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",
+            allow: "payment; camera; microphone; clipboard-write; geolocation",
+            onLoad: () => setIframeLoaded(true)
+          },
+          retryToken
+        )
+      ] })
+    ] }),
+    /* @__PURE__ */ jsx8(PoweredBy, {})
+  ] });
+}
+function deriveStepStates(swappedStatus, latestEvent) {
+  if (isFailedEvent(latestEvent ?? void 0)) {
+    return ["complete", "complete", "failed", "pending"];
+  }
+  if (swappedStatus === "order_cancelled") {
+    return ["failed", "pending", "pending", "pending"];
+  }
+  const step1Complete = swappedStatus === "order_completed" || swappedStatus === "order_broadcasted";
+  const step2Complete = latestEvent !== null;
+  const step3Complete = latestEvent?.type === "bridge-complete" || latestEvent?.type === "post-bridge-swap-complete";
+  if (step3Complete) {
+    return ["complete", "complete", "complete", "pending"];
+  }
+  if (step2Complete) {
+    return ["complete", "complete", "active", "pending"];
+  }
+  if (step1Complete) {
+    return ["complete", "active", "pending", "pending"];
+  }
+  return ["active", "pending", "pending", "pending"];
+}
+SwappedIframeStep.displayName = "SwappedIframeStep";
+
+// src/components/steps/FiatOnrampStep.tsx
+import { jsx as jsx9 } from "react/jsx-runtime";
+function fiatBannerForStatus(status, context) {
+  if (context.currencyMismatch) {
+    return {
+      level: "warning",
+      title: "Currency mismatch",
+      detail: "Funds may not bridge automatically. Contact support if your balance does not arrive."
+    };
+  }
+  switch (status) {
+    case "payment_pending":
+      return { level: "info", title: "Verifying payment\u2026" };
+    case "order_completed":
+      return { level: "success", title: "Payment received \u2014 sending crypto" };
+    case "order_broadcasted":
+      return {
+        level: "success",
+        title: "Crypto sent \u2014 confirming on-chain"
+      };
+    case "order_cancelled":
+      return {
+        level: "warning",
+        title: "Order cancelled",
+        detail: "If you were charged, Swapped will refund within 5 business days."
+      };
+  }
+}
+function FiatOnrampStep({
+  smartAccount,
+  service,
+  paymentMethod,
+  onSwappedComplete,
+  onSwappedFailed,
+  onClose,
+  onError
+}) {
+  const loadUrl = useCallback3(async () => {
+    const res = await service.getSwappedWidgetUrl({
+      smartAccount,
+      method: paymentMethod
+    });
+    if (res.currencyCode !== "USDC_BASE") {
+      console.warn(
+        `[FiatOnrampStep] Expected backend to return currencyCode=USDC_BASE, got ${res.currencyCode}. Swapped purchases may not bridge as expected.`
+      );
+    }
+    return res;
+  }, [service, smartAccount, paymentMethod]);
+  return /* @__PURE__ */ jsx9(
+    SwappedIframeStep,
+    {
+      smartAccount,
+      service,
+      variant: "fiat",
+      loadUrl,
+      iframeTitle: "Buy crypto with Swapped",
+      loadErrorCode: "SWAPPED_URL_FAILED",
+      loadErrorFallback: "Failed to load on-ramp",
+      bannerForStatus: fiatBannerForStatus,
+      onSwappedComplete,
+      onSwappedFailed,
+      onClose,
+      onError
+    }
+  );
+}
+FiatOnrampStep.displayName = "FiatOnrampStep";
+
+// src/components/steps/ExchangeConnectStep.tsx
+import { useCallback as useCallback4 } from "react";
+import { jsx as jsx10 } from "react/jsx-runtime";
+function connectBannerForStatus(status, context) {
+  if (context.currencyMismatch) {
+    return {
+      level: "warning",
+      title: "Currency mismatch",
+      detail: "Funds may not bridge automatically. Contact support if your balance does not arrive."
+    };
+  }
+  switch (status) {
+    case "payment_pending":
+      return { level: "info", title: "Waiting for exchange transfer\u2026" };
+    case "order_completed":
+      return {
+        level: "success",
+        title: "Exchange transfer received \u2014 sending crypto"
+      };
+    case "order_broadcasted":
+      return {
+        level: "success",
+        title: "Crypto sent \u2014 confirming on-chain"
+      };
+    case "order_cancelled":
+      return {
+        level: "warning",
+        title: "Order cancelled",
+        detail: "If your exchange already debited the funds, Swapped will refund within 5 business days."
+      };
+  }
+}
+function ExchangeConnectStep({
+  smartAccount,
+  service,
+  connection,
+  onSwappedComplete,
+  onSwappedFailed,
+  onClose,
+  onError
+}) {
+  const loadUrl = useCallback4(async () => {
+    const res = await service.getSwappedConnectUrl({
+      smartAccount,
+      connection
+    });
+    if (res.currencyCode !== "USDC_BASE") {
+      console.warn(
+        `[ExchangeConnectStep] Expected backend to return currencyCode=USDC_BASE, got ${res.currencyCode}. Swapped Connect pulls may not bridge as expected.`
+      );
+    }
+    return res;
+  }, [service, smartAccount, connection]);
+  return /* @__PURE__ */ jsx10(
+    SwappedIframeStep,
+    {
+      smartAccount,
+      service,
+      variant: "connect",
+      loadUrl,
+      iframeTitle: "Fund from exchange via Swapped",
+      loadErrorCode: "SWAPPED_CONNECT_URL_FAILED",
+      loadErrorFallback: "Failed to load Connect",
+      bannerForStatus: connectBannerForStatus,
+      onSwappedComplete,
+      onSwappedFailed,
+      onClose,
+      onError
+    }
+  );
+}
+ExchangeConnectStep.displayName = "ExchangeConnectStep";
+
+// src/components/steps/ExchangeSelectStep.tsx
+import { useCallback as useCallback5, useEffect as useEffect7, useState as useState7 } from "react";
+import { jsx as jsx11, jsxs as jsxs9 } from "react/jsx-runtime";
+function ExchangeLogo({ exchange }) {
+  const [failed, setFailed] = useState7(false);
+  if (!exchange.logoUrl || failed) {
+    return /* @__PURE__ */ jsx11(BankIcon, {});
+  }
+  return /* @__PURE__ */ jsx11(
+    "img",
+    {
+      src: exchange.logoUrl,
+      alt: "",
+      onError: () => setFailed(true)
+    }
+  );
+}
+function ExchangeSelectStep({
+  service,
+  onSelectExchange,
+  onError
+}) {
+  const [exchanges, setExchanges] = useState7([]);
+  const [loading, setLoading] = useState7(true);
+  const [error, setError] = useState7(null);
+  const [retryToken, setRetryToken] = useState7(0);
+  const retry = useCallback5(() => {
+    setRetryToken((n) => n + 1);
+  }, []);
+  useEffect7(() => {
+    let cancelled = false;
+    setLoading(true);
+    setError(null);
+    service.getSwappedConnectExchanges().then((res) => {
+      if (cancelled) return;
+      setExchanges(res.exchanges);
+    }).catch((err) => {
+      if (cancelled) return;
+      const message = err instanceof Error ? err.message : "Failed to load exchanges";
+      setExchanges([]);
+      setError(message);
+      onError?.(message, "SWAPPED_CONNECT_EXCHANGES_FAILED");
+    }).finally(() => {
+      if (!cancelled) setLoading(false);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [service, retryToken, onError]);
+  return /* @__PURE__ */ jsxs9("div", { className: "rs-screen rs-exchange-select", children: [
+    /* @__PURE__ */ jsxs9("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx11(
+        BodyHeader,
+        {
+          icon: /* @__PURE__ */ jsx11(BankIcon, {}),
+          title: "Fund from Exchange",
+          subtitle: "Choose your exchange"
+        }
+      ),
+      loading && /* @__PURE__ */ jsx11("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: /* @__PURE__ */ jsx11(Spinner, {}) }),
+      !loading && error && /* @__PURE__ */ jsxs9("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: [
+        /* @__PURE__ */ jsx11("div", { className: "rs-exchange-select-state-title", children: "Couldn\u2019t load exchanges" }),
+        /* @__PURE__ */ jsx11(
+          "button",
+          {
+            type: "button",
+            className: "rs-fiat-onramp-retry",
+            onClick: retry,
+            children: "Retry"
+          }
+        )
+      ] }),
+      !loading && !error && exchanges.length === 0 && /* @__PURE__ */ jsxs9("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: [
+        /* @__PURE__ */ jsx11("div", { className: "rs-exchange-select-state-title", children: "No exchanges available" }),
+        /* @__PURE__ */ jsx11(
+          "button",
+          {
+            type: "button",
+            className: "rs-fiat-onramp-retry",
+            onClick: retry,
+            children: "Retry"
+          }
+        )
+      ] }),
+      !loading && !error && exchanges.length > 0 && /* @__PURE__ */ jsx11("div", { className: "rs-exchange-grid", children: exchanges.map((exchange) => /* @__PURE__ */ jsxs9(
+        "button",
+        {
+          type: "button",
+          className: "rs-exchange-card",
+          onClick: () => onSelectExchange(exchange.connection),
+          "aria-label": `Select ${exchange.name}`,
+          children: [
+            /* @__PURE__ */ jsx11("span", { className: "rs-exchange-card-logo", children: /* @__PURE__ */ jsx11(ExchangeLogo, { exchange }) }),
+            /* @__PURE__ */ jsx11("span", { className: "rs-exchange-card-name", children: exchange.name })
+          ]
+        },
+        exchange.connection
+      )) })
+    ] }),
+    /* @__PURE__ */ jsx11(PoweredBy, {})
+  ] });
+}
+ExchangeSelectStep.displayName = "ExchangeSelectStep";
+
+// src/components/steps/DepositAddressSkeleton.tsx
+import { jsx as jsx12, jsxs as jsxs10 } from "react/jsx-runtime";
+var BASE_CHAIN_ID = 8453;
+function DepositAddressSkeleton({
+  uiConfig,
+  allowedRoutes
+}) {
+  const allowedChainSet = allowedRoutes?.sourceChains ? new Set(allowedRoutes.sourceChains) : null;
+  const allowedTokenSet = allowedRoutes?.sourceTokens ? new Set(allowedRoutes.sourceTokens.map((s) => s.toUpperCase())) : null;
+  const evmChainIds = (() => {
+    const all = getSupportedChainIds();
+    return allowedChainSet ? all.filter((id) => allowedChainSet.has(id)) : all;
+  })();
+  const defaultChainId = evmChainIds.includes(BASE_CHAIN_ID) ? BASE_CHAIN_ID : evmChainIds[0];
+  const tokensForChain = (() => {
+    const all = getTargetTokenSymbolsForChain(defaultChainId);
+    return allowedTokenSet ? all.filter((s) => allowedTokenSet.has(s.toUpperCase())) : all;
+  })();
+  const defaultToken = tokensForChain.includes("USDC") ? "USDC" : tokensForChain[0] ?? "USDC";
+  const chainName = getChainName(defaultChainId);
+  const chainIcon = getChainIcon(defaultChainId);
+  const tokenIcon = getTokenIcon(defaultToken);
+  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: [
+            chainIcon && /* @__PURE__ */ jsx12(
+              "img",
+              {
+                src: chainIcon,
+                alt: "",
+                className: "rs-deposit-address-dropdown-icon"
+              }
+            ),
+            /* @__PURE__ */ jsx12("span", { children: chainName }),
+            /* @__PURE__ */ jsx12(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
+          ] })
+        ] }),
+        /* @__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__ */ jsx12(Tooltip, { content: "Minimum deposit amount required for the selected chain.", children: /* @__PURE__ */ jsx12(
+                InfoIcon,
+                {
+                  className: "rs-deposit-address-min-icon",
+                  "aria-hidden": "true"
+                }
+              ) })
+            ] })
+          ] }),
+          /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-dropdown-trigger", children: [
+            tokenIcon && /* @__PURE__ */ jsx12(
+              "img",
+              {
+                src: tokenIcon,
+                alt: "",
+                className: "rs-deposit-address-dropdown-icon"
+              }
+            ),
+            /* @__PURE__ */ jsx12("span", { children: defaultToken }),
+            /* @__PURE__ */ jsx12(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
+          ] })
+        ] })
+      ] }),
+      /* @__PURE__ */ jsxs10(
+        "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("div", { className: "rs-skeleton rs-skeleton-qr", "aria-hidden": "true" }) }),
+              /* @__PURE__ */ jsx12("div", { className: "rs-skeleton rs-skeleton-address", "aria-hidden": "true" })
+            ] }),
+            /* @__PURE__ */ jsxs10(
+              "button",
+              {
+                type: "button",
+                className: "rs-deposit-address-copy",
+                disabled: true,
+                "aria-hidden": "true",
+                children: [
+                  /* @__PURE__ */ jsx12(CopyIcon, {}),
+                  "Copy address"
+                ]
+              }
+            )
+          ]
+        }
+      ),
+      /* @__PURE__ */ jsx12("div", { className: "rs-price-impact", "aria-hidden": "true", children: /* @__PURE__ */ jsxs10("div", { className: "rs-price-impact-header", 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(PoweredBy, {})
+  ] });
+}
+DepositAddressSkeleton.displayName = "DepositAddressSkeleton";
+
+// src/components/steps/SolanaTokenSelectStep.tsx
+import { useState as useState8, useEffect as useEffect8, useMemo as useMemo5 } from "react";
+import { formatUnits as formatUnits4 } from "viem";
+import { jsx as jsx13, jsxs as jsxs11 } from "react/jsx-runtime";
+function SolanaTokenSelectStep({
+  solanaAddress,
+  service,
+  onContinue,
+  onTotalBalanceComputed,
+  onDisconnect,
+  debug
+}) {
+  const [tokenBalances, setTokenBalances] = useState8([]);
+  const [selectedSymbol, setSelectedSymbol] = useState8(null);
+  const [loading, setLoading] = useState8(true);
+  const [error, setError] = useState8(null);
+  useEffect8(() => {
+    let active = true;
+    async function loadBalances() {
+      if (!solanaAddress) {
+        setLoading(false);
+        return;
+      }
+      setLoading(true);
+      setError(null);
+      const portfolioBySymbol = {};
+      try {
+        debugLog(debug, "solana-token-select", "portfolio:request", {
+          solanaAddress
+        });
+        const portfolio = await service.fetchSolanaPortfolio(solanaAddress);
+        if (!active) return;
+        for (const t of portfolio.tokens) {
+          const symbol = t.symbol.toUpperCase();
+          if (!SOLANA_TOKENS.some((st) => st.symbol === symbol)) continue;
+          let parsed = 0n;
+          try {
+            parsed = BigInt(t.balance || "0");
+          } catch {
+            parsed = 0n;
+          }
+          if (parsed <= 0n) continue;
+          const existing = portfolioBySymbol[symbol];
+          if (!existing || (t.balanceUsd ?? 0) > existing.balanceUsd) {
+            portfolioBySymbol[symbol] = {
+              balance: parsed,
+              balanceUsd: t.balanceUsd ?? 0
+            };
+          }
+        }
+        debugLog(debug, "solana-token-select", "portfolio:success", {
+          symbols: Object.keys(portfolioBySymbol)
+        });
+      } catch (err) {
+        if (!active) return;
+        debugError(debug, "solana-token-select", "portfolio:failure", err, {
+          solanaAddress
+        });
+        setError(
+          err instanceof Error ? err.message : "Failed to load balances"
+        );
+        setTokenBalances([]);
+        setLoading(false);
+        return;
+      }
+      const results = [];
+      for (const token of SOLANA_TOKENS) {
+        const fromPortfolio = portfolioBySymbol[token.symbol];
+        if (fromPortfolio && fromPortfolio.balance > 0n) {
+          results.push({
+            token,
+            balance: fromPortfolio.balance,
+            balanceUsd: fromPortfolio.balanceUsd
+          });
+        }
+      }
+      if (!active) return;
+      setTokenBalances(results);
+      setLoading(false);
+      const totalUsd = results.reduce((sum, r) => sum + r.balanceUsd, 0);
+      onTotalBalanceComputed?.(totalUsd);
+    }
+    void loadBalances();
+    return () => {
+      active = false;
+    };
+  }, [debug, solanaAddress, service, onTotalBalanceComputed]);
+  const rows = useMemo5(
+    () => [...tokenBalances].sort((a, b) => {
+      if (a.balanceUsd !== b.balanceUsd) return b.balanceUsd - a.balanceUsd;
+      if (b.balance > a.balance) return 1;
       if (b.balance < a.balance) return -1;
       return 0;
     }),
@@ -2074,30 +2943,30 @@ function SolanaTokenSelectStep({
   };
   const chainIcon = getChainIcon("solana");
   const chainName = getChainName("solana");
-  return /* @__PURE__ */ jsxs7("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs7("div", { className: "rs-screen-body", children: [
-      /* @__PURE__ */ jsx7(
+  return /* @__PURE__ */ jsxs11("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs11("div", { className: "rs-screen-body", children: [
+      /* @__PURE__ */ jsx13(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx7(WalletIcon, {}),
+          icon: /* @__PURE__ */ jsx13(WalletIcon, {}),
           title: "Your assets",
           subtitle: "Select source assets to transfer"
         }
       ),
-      loading && /* @__PURE__ */ jsxs7("div", { className: "rs-loading-state", style: { padding: "40px 12px" }, children: [
-        /* @__PURE__ */ jsx7(Spinner, { className: "rs-text-tertiary" }),
-        /* @__PURE__ */ jsx7("span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
+      loading && /* @__PURE__ */ jsxs11("div", { className: "rs-loading-state", style: { padding: "40px 12px" }, children: [
+        /* @__PURE__ */ jsx13(Spinner, { className: "rs-text-tertiary" }),
+        /* @__PURE__ */ jsx13("span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
       ] }),
-      error && /* @__PURE__ */ jsx7(Callout, { variant: "error", children: error }),
-      !loading && !error && rows.length === 0 && /* @__PURE__ */ jsxs7("div", { className: "rs-empty-state", children: [
-        /* @__PURE__ */ jsx7(WalletIcon, { className: "rs-empty-icon" }),
-        /* @__PURE__ */ jsx7("div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
-        /* @__PURE__ */ jsxs7("div", { className: "rs-empty-address", children: [
+      error && /* @__PURE__ */ jsx13(Callout, { variant: "error", children: error }),
+      !loading && !error && rows.length === 0 && /* @__PURE__ */ jsxs11("div", { className: "rs-empty-state", children: [
+        /* @__PURE__ */ jsx13(WalletIcon, { className: "rs-empty-icon" }),
+        /* @__PURE__ */ jsx13("div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
+        /* @__PURE__ */ jsxs11("div", { className: "rs-empty-address", children: [
           solanaAddress.slice(0, 6),
           "...",
           solanaAddress.slice(-4)
         ] }),
-        onDisconnect && /* @__PURE__ */ jsx7(
+        onDisconnect && /* @__PURE__ */ jsx13(
           "button",
           {
             type: "button",
@@ -2107,11 +2976,11 @@ function SolanaTokenSelectStep({
           }
         )
       ] }),
-      !loading && !error && rows.length > 0 && /* @__PURE__ */ jsx7("div", { className: "rs-asset-list", children: rows.map((entry) => {
+      !loading && !error && rows.length > 0 && /* @__PURE__ */ jsx13("div", { className: "rs-asset-list", children: rows.map((entry) => {
         const isSelected = selectedSymbol === entry.token.symbol;
         const tokenAmount = formatBalance(entry);
         const tokenIcon = getTokenIcon(entry.token.symbol);
-        return /* @__PURE__ */ jsxs7(
+        return /* @__PURE__ */ jsxs11(
           "button",
           {
             type: "button",
@@ -2119,33 +2988,33 @@ function SolanaTokenSelectStep({
             className: `rs-asset-row ${isSelected ? "rs-asset-row--selected" : ""}`,
             "aria-pressed": isSelected,
             children: [
-              /* @__PURE__ */ jsxs7("div", { className: "rs-asset-info", children: [
-                /* @__PURE__ */ jsxs7("div", { className: "rs-asset-icon-wrapper", children: [
-                  tokenIcon ? /* @__PURE__ */ jsx7("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx7("img", { src: tokenIcon, alt: entry.token.symbol }) }) : /* @__PURE__ */ jsx7("span", { className: "rs-asset-icon", children: entry.token.symbol.slice(0, 4) }),
-                  chainIcon && /* @__PURE__ */ jsx7("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx7("img", { src: chainIcon, alt: chainName }) })
+              /* @__PURE__ */ jsxs11("div", { className: "rs-asset-info", children: [
+                /* @__PURE__ */ jsxs11("div", { className: "rs-asset-icon-wrapper", children: [
+                  tokenIcon ? /* @__PURE__ */ jsx13("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx13("img", { src: tokenIcon, alt: entry.token.symbol }) }) : /* @__PURE__ */ jsx13("span", { className: "rs-asset-icon", children: entry.token.symbol.slice(0, 4) }),
+                  chainIcon && /* @__PURE__ */ jsx13("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx13("img", { src: chainIcon, alt: chainName }) })
                 ] }),
-                /* @__PURE__ */ jsxs7("div", { className: "rs-asset-text", children: [
-                  /* @__PURE__ */ jsxs7("div", { className: "rs-asset-name-row", children: [
-                    /* @__PURE__ */ jsx7("span", { className: "rs-asset-name", children: entry.token.symbol }),
-                    /* @__PURE__ */ jsxs7("span", { className: "rs-asset-chain", children: [
+                /* @__PURE__ */ jsxs11("div", { className: "rs-asset-text", children: [
+                  /* @__PURE__ */ jsxs11("div", { className: "rs-asset-name-row", children: [
+                    /* @__PURE__ */ jsx13("span", { className: "rs-asset-name", children: entry.token.symbol }),
+                    /* @__PURE__ */ jsxs11("span", { className: "rs-asset-chain", children: [
                       "on ",
                       chainName
                     ] })
                   ] }),
-                  /* @__PURE__ */ jsxs7("div", { className: "rs-asset-balance-small", children: [
+                  /* @__PURE__ */ jsxs11("div", { className: "rs-asset-balance-small", children: [
                     tokenAmount,
                     " ",
                     entry.token.symbol
                   ] })
                 ] })
               ] }),
-              /* @__PURE__ */ jsx7("div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? currencyFormatter.format(entry.balanceUsd) : tokenAmount !== "--" ? `${tokenAmount} ${entry.token.symbol}` : "--" })
+              /* @__PURE__ */ jsx13("div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? currencyFormatter.format(entry.balanceUsd) : tokenAmount !== "--" ? `${tokenAmount} ${entry.token.symbol}` : "--" })
             ]
           },
           entry.token.symbol
         );
       }) }),
-      /* @__PURE__ */ jsx7(
+      /* @__PURE__ */ jsx13(
         Button,
         {
           onClick: () => selectedEntry && onContinue(
@@ -2159,14 +3028,14 @@ function SolanaTokenSelectStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx7(PoweredBy, {})
+    /* @__PURE__ */ jsx13(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/SolanaAmountStep.tsx
-import { useCallback as useCallback3, useEffect as useEffect7, useMemo as useMemo5, useRef as useRef6, useState as useState7 } from "react";
+import { useCallback as useCallback6, useEffect as useEffect9, useMemo as useMemo6, useRef as useRef7, useState as useState9 } from "react";
 import { formatUnits as formatUnits5, parseUnits as parseUnits3 } from "viem";
-import { Fragment as Fragment2, jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx14, jsxs as jsxs12 } from "react/jsx-runtime";
 var SOL_FEE_RESERVE_LAMPORTS = 1000000n;
 var PRESETS2 = [
   { value: 25, label: "25%" },
@@ -2180,6 +3049,7 @@ function SolanaAmountStep({
   balanceUsd,
   defaultAmount,
   uiConfig,
+  targetChain,
   targetChainName,
   targetTokenSymbol,
   targetTokenIcon,
@@ -2187,12 +3057,12 @@ function SolanaAmountStep({
   onContinue,
   debug
 }) {
-  const [amount, setAmount] = useState7("");
-  const [error, setError] = useState7(null);
-  const hasAppliedDefaultRef = useRef6(false);
+  const [amount, setAmount] = useState9("");
+  const [error, setError] = useState9(null);
+  const hasAppliedDefaultRef = useRef7(false);
   const isSourceStablecoin = isStablecoinSymbol(token.symbol);
   const isMaxDefault = defaultAmount?.trim().toLowerCase() === "max";
-  const tokenPriceUsd = useMemo5(() => {
+  const tokenPriceUsd = useMemo6(() => {
     if (isSourceStablecoin) return 1;
     try {
       const balanceUnits = Number(formatUnits5(balance, token.decimals));
@@ -2206,7 +3076,7 @@ function SolanaAmountStep({
     }
   }, [isSourceStablecoin, balance, token.decimals, balanceUsd]);
   const hasPricing = tokenPriceUsd !== null;
-  const formattedBalance = useMemo5(() => {
+  const formattedBalance = useMemo6(() => {
     try {
       const raw = formatUnits5(balance, token.decimals);
       const numeric = Number(raw);
@@ -2216,7 +3086,7 @@ function SolanaAmountStep({
       return "\u2026";
     }
   }, [balance, token.decimals]);
-  const computedBalanceUsd = useMemo5(() => {
+  const computedBalanceUsd = useMemo6(() => {
     try {
       const balanceUnits = Number(formatUnits5(balance, token.decimals));
       if (!Number.isFinite(balanceUnits) || balanceUnits < 0) return null;
@@ -2227,11 +3097,11 @@ function SolanaAmountStep({
       return null;
     }
   }, [balance, token.decimals, tokenPriceUsd, balanceUsd]);
-  const spendableBalance = useMemo5(() => {
+  const spendableBalance = useMemo6(() => {
     if (!isNativeSol(token)) return balance;
     return balance > SOL_FEE_RESERVE_LAMPORTS ? balance - SOL_FEE_RESERVE_LAMPORTS : 0n;
   }, [balance, token]);
-  const spendableBalanceUsd = useMemo5(() => {
+  const spendableBalanceUsd = useMemo6(() => {
     try {
       const spendableUnits = Number(formatUnits5(spendableBalance, token.decimals));
       if (!Number.isFinite(spendableUnits) || spendableUnits < 0) return null;
@@ -2241,7 +3111,7 @@ function SolanaAmountStep({
       return null;
     }
   }, [spendableBalance, token.decimals, tokenPriceUsd]);
-  const computePresetAmount = useCallback3(
+  const computePresetAmount = useCallback6(
     (percentage) => {
       try {
         const spendableUnits = Number(
@@ -2264,7 +3134,7 @@ function SolanaAmountStep({
       spendableBalanceUsd
     ]
   );
-  useEffect7(() => {
+  useEffect9(() => {
     if (hasAppliedDefaultRef.current || !defaultAmount) return;
     if (isMaxDefault) {
       const next = computePresetAmount(100);
@@ -2280,11 +3150,11 @@ function SolanaAmountStep({
       hasAppliedDefaultRef.current = true;
     }
   }, [defaultAmount, isMaxDefault, computePresetAmount]);
-  const numericAmount = useMemo5(() => {
+  const numericAmount = useMemo6(() => {
     const parsed = parseFloat(amount);
     return Number.isFinite(parsed) && parsed > 0 ? parsed : 0;
   }, [amount]);
-  const sourceAmountUnits = useMemo5(() => {
+  const sourceAmountUnits = useMemo6(() => {
     if (numericAmount <= 0) return null;
     const raw = isSourceStablecoin || !hasPricing ? numericAmount : numericAmount / (tokenPriceUsd ?? 1);
     try {
@@ -2293,7 +3163,7 @@ function SolanaAmountStep({
       return null;
     }
   }, [numericAmount, isSourceStablecoin, hasPricing, tokenPriceUsd, token.decimals]);
-  const minDepositUsd = uiConfig?.minDepositUsd ?? null;
+  const minDepositUsd = targetChain === HYPERCORE_CHAIN_ID ? Math.max(HYPERCORE_MIN_DEPOSIT_USD, uiConfig?.minDepositUsd ?? 0) : uiConfig?.minDepositUsd ?? null;
   const maxDepositUsd = uiConfig?.maxDepositUsd ?? null;
   const isBelowMin = minDepositUsd !== null && numericAmount > 0 && numericAmount < minDepositUsd;
   const isAboveMax = maxDepositUsd !== null && numericAmount > maxDepositUsd;
@@ -2366,12 +3236,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;
   const sourceTokenIcon = getTokenIcon(token.symbol);
-  return /* @__PURE__ */ jsxs8("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs8("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx8(BodyHeader, { icon: /* @__PURE__ */ jsx8(WalletIcon, {}), title: "Wallet deposit" }),
-      /* @__PURE__ */ jsxs8("div", { className: "rs-amount-section", children: [
-        /* @__PURE__ */ jsxs8("div", { className: "rs-amount-display", children: [
-          /* @__PURE__ */ jsx8(
+  return /* @__PURE__ */ jsxs12("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs12("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx14(BodyHeader, { icon: /* @__PURE__ */ jsx14(WalletIcon, {}), title: "Wallet deposit" }),
+      /* @__PURE__ */ jsxs12("div", { className: "rs-amount-section", children: [
+        /* @__PURE__ */ jsxs12("div", { className: "rs-amount-display", children: [
+          /* @__PURE__ */ jsx14(
             AnimatedAmountInput,
             {
               value: amount,
@@ -2380,25 +3250,25 @@ function SolanaAmountStep({
               autoFocus: true
             }
           ),
-          /* @__PURE__ */ jsxs8("div", { className: "rs-amount-meta", children: [
-            /* @__PURE__ */ jsxs8("span", { className: "rs-amount-meta-balance", children: [
+          /* @__PURE__ */ jsxs12("div", { className: "rs-amount-meta", children: [
+            /* @__PURE__ */ jsxs12("span", { className: "rs-amount-meta-balance", children: [
               formattedBalance,
               " ",
               token.symbol,
               " available",
-              computedBalanceUsd !== null && /* @__PURE__ */ jsxs8(Fragment2, { children: [
+              computedBalanceUsd !== null && /* @__PURE__ */ jsxs12(Fragment2, { children: [
                 " (~",
                 currencyFormatter.format(computedBalanceUsd),
                 ")"
               ] })
             ] }),
-            minDepositUsd !== null && /* @__PURE__ */ jsxs8("span", { className: "rs-amount-meta-minimum", children: [
+            minDepositUsd !== null && /* @__PURE__ */ jsxs12("span", { className: "rs-amount-meta-minimum", children: [
               "Min. deposit ",
               currencyFormatter.format(minDepositUsd)
             ] })
           ] })
         ] }),
-        /* @__PURE__ */ jsx8("div", { className: "rs-amount-presets", children: PRESETS2.map((preset) => /* @__PURE__ */ jsx8(
+        /* @__PURE__ */ jsx14("div", { className: "rs-amount-presets", children: PRESETS2.map((preset) => /* @__PURE__ */ jsx14(
           "button",
           {
             type: "button",
@@ -2409,35 +3279,36 @@ function SolanaAmountStep({
           preset.value
         )) })
       ] }),
-      /* @__PURE__ */ jsxs8("div", { className: "rs-amount-details", children: [
-        /* @__PURE__ */ jsxs8("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx8("span", { children: "You send" }),
-          /* @__PURE__ */ jsxs8("span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ jsxs8("span", { children: [
+      /* @__PURE__ */ jsxs12("div", { className: "rs-amount-details", children: [
+        /* @__PURE__ */ jsxs12("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx14("span", { children: "You send" }),
+          /* @__PURE__ */ jsxs12("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsxs12("span", { children: [
               "Solana ",
               token.symbol
             ] }),
-            sourceTokenIcon && /* @__PURE__ */ jsx8("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx8("img", { src: sourceTokenIcon, alt: "" }) })
+            sourceTokenIcon && /* @__PURE__ */ jsx14("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx14("img", { src: sourceTokenIcon, alt: "" }) })
           ] })
         ] }),
-        targetChainName && targetTokenSymbol && /* @__PURE__ */ jsxs8("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx8("span", { children: "Receive" }),
-          /* @__PURE__ */ jsxs8("span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ jsxs8("span", { children: [
+        targetChainName && targetTokenSymbol && /* @__PURE__ */ jsxs12("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx14("span", { children: "Receive" }),
+          /* @__PURE__ */ jsxs12("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsxs12("span", { children: [
               targetChainName,
               " ",
               targetTokenSymbol
             ] }),
-            targetTokenIcon && /* @__PURE__ */ jsx8("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx8("img", { src: targetTokenIcon, alt: "" }) })
+            targetTokenIcon && /* @__PURE__ */ jsx14("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx14("img", { src: targetTokenIcon, alt: "" }) })
           ] })
         ] }),
-        balanceAfterUsd !== null && /* @__PURE__ */ jsxs8("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx8("span", { children: "Balance after deposit" }),
-          /* @__PURE__ */ jsx8("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
+        balanceAfterUsd !== null && /* @__PURE__ */ jsxs12("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx14("span", { children: "Balance after deposit" }),
+          /* @__PURE__ */ jsx14("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
         ] })
       ] }),
-      error && /* @__PURE__ */ jsx8(Callout, { variant: "error", children: error }),
-      /* @__PURE__ */ jsx8(
+      targetChain === HYPERCORE_CHAIN_ID && /* @__PURE__ */ jsx14(Callout, { variant: "warning", children: "First deposit to a new HyperCore account includes a ~1 USDC activation fee." }),
+      error && /* @__PURE__ */ jsx14(Callout, { variant: "error", children: error }),
+      /* @__PURE__ */ jsx14(
         Button,
         {
           onClick: handleContinue,
@@ -2447,12 +3318,12 @@ function SolanaAmountStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx8(PoweredBy, {})
+    /* @__PURE__ */ jsx14(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/SolanaConfirmStep.tsx
-import { useState as useState8 } from "react";
+import { useState as useState10 } from "react";
 import { parseUnits as parseUnits4 } from "viem";
 
 // src/core/solana.ts
@@ -2560,7 +3431,7 @@ async function sendSolanaTransaction(provider, _connection, transaction) {
 }
 
 // src/components/steps/SolanaConfirmStep.tsx
-import { jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
+import { jsx as jsx15, jsxs as jsxs13 } from "react/jsx-runtime";
 function SolanaConfirmStep({
   smartAccount,
   solanaAddress,
@@ -2581,8 +3452,8 @@ function SolanaConfirmStep({
   onError,
   debug
 }) {
-  const [isSubmitting, setIsSubmitting] = useState8(false);
-  const [error, setError] = useState8(null);
+  const [isSubmitting, setIsSubmitting] = useState10(false);
+  const [error, setError] = useState10(null);
   const targetSymbol = getTargetTokenSymbol(targetToken, targetChain);
   const isSameToken = token.symbol.toUpperCase() === targetSymbol.toUpperCase();
   const sourceChainName = getChainName("solana");
@@ -2593,7 +3464,10 @@ function SolanaConfirmStep({
   const targetTokenIcon = getTokenIcon(targetSymbol);
   const feeSponsored = uiConfig?.feeSponsored ?? false;
   const feeTooltip = uiConfig?.feeTooltip ?? (feeSponsored ? "Network fees are sponsored for this deposit." : "Network fees apply.");
-  const formattedAmount = sourceAmount && !Number.isNaN(Number(sourceAmount)) ? Number(sourceAmount).toLocaleString("en-US", { maximumFractionDigits: 6 }) : "0";
+  const formattedAmount = sourceAmount && !Number.isNaN(Number(sourceAmount)) ? Number(sourceAmount).toLocaleString("en-US", {
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 6
+  }) : "0";
   const formattedReceiveAmount = (() => {
     if (isSameToken) return formattedAmount;
     const dollarValue = Number(targetAmount);
@@ -2601,7 +3475,10 @@ function SolanaConfirmStep({
       return formattedAmount;
     if (targetTokenPriceUsd !== null && targetTokenPriceUsd > 0) {
       const tokenAmount = dollarValue / targetTokenPriceUsd;
-      return tokenAmount.toLocaleString("en-US", { maximumFractionDigits: 6 });
+      return tokenAmount.toLocaleString("en-US", {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 6
+      });
     }
     return formattedAmount;
   })();
@@ -2695,66 +3572,66 @@ function SolanaConfirmStep({
       setIsSubmitting(false);
     }
   };
-  return /* @__PURE__ */ jsxs9("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs9("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx9(BodyHeader, { icon: /* @__PURE__ */ jsx9(WalletIcon, {}), title: "Review deposit" }),
-      /* @__PURE__ */ jsxs9("div", { className: "rs-review-details", children: [
-        /* @__PURE__ */ jsxs9("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx9("span", { children: "Source chain" }),
-          /* @__PURE__ */ jsxs9("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsx9("span", { children: sourceChainName }),
-            sourceChainIcon && /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9("img", { src: sourceChainIcon, alt: "" }) })
+  return /* @__PURE__ */ jsxs13("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs13("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx15(BodyHeader, { icon: /* @__PURE__ */ jsx15(WalletIcon, {}), title: "Review deposit" }),
+      /* @__PURE__ */ jsxs13("div", { className: "rs-review-details", children: [
+        /* @__PURE__ */ jsxs13("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx15("span", { children: "Source chain" }),
+          /* @__PURE__ */ jsxs13("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsx15("span", { children: sourceChainName }),
+            sourceChainIcon && /* @__PURE__ */ jsx15("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx15("img", { src: sourceChainIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs9("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx9("span", { children: "Destination chain" }),
-          /* @__PURE__ */ jsxs9("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsx9("span", { children: targetChainName }),
-            targetChainIcon && /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9("img", { src: targetChainIcon, alt: "" }) })
+        /* @__PURE__ */ jsxs13("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx15("span", { children: "Destination chain" }),
+          /* @__PURE__ */ jsxs13("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsx15("span", { children: targetChainName }),
+            targetChainIcon && /* @__PURE__ */ jsx15("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx15("img", { src: targetChainIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs9("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx9("span", { children: "Estimated time" }),
-          /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-value", children: estimatedTime })
+        /* @__PURE__ */ jsxs13("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx15("span", { children: "Estimated time" }),
+          /* @__PURE__ */ jsx15("span", { className: "rs-review-detail-value", children: estimatedTime })
         ] }),
-        /* @__PURE__ */ jsxs9("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx9("span", { children: "You send" }),
-          /* @__PURE__ */ jsxs9("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsxs9("span", { children: [
+        /* @__PURE__ */ jsxs13("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx15("span", { children: "You send" }),
+          /* @__PURE__ */ jsxs13("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsxs13("span", { children: [
               formattedAmount,
               " ",
               token.symbol
             ] }),
-            sourceTokenIcon && /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9("img", { src: sourceTokenIcon, alt: "" }) })
+            sourceTokenIcon && /* @__PURE__ */ jsx15("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx15("img", { src: sourceTokenIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs9("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx9("span", { children: "Receive" }),
-          /* @__PURE__ */ jsxs9("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsxs9("span", { children: [
+        /* @__PURE__ */ jsxs13("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx15("span", { children: "Receive" }),
+          /* @__PURE__ */ jsxs13("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsxs13("span", { children: [
               receiveAmount,
               " ",
               targetSymbol
             ] }),
-            targetTokenIcon && /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9("img", { src: targetTokenIcon, alt: "" }) })
+            targetTokenIcon && /* @__PURE__ */ jsx15("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx15("img", { src: targetTokenIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs9("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx9("span", { children: "Fees" }),
-          /* @__PURE__ */ jsxs9("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsx9(
+        /* @__PURE__ */ jsxs13("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx15("span", { children: "Fees" }),
+          /* @__PURE__ */ jsxs13("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsx15(
               "span",
               {
                 style: feeSponsored ? { textDecoration: "line-through" } : void 0,
                 children: "$0.04"
               }
             ),
-            /* @__PURE__ */ jsx9(Tooltip, { content: feeTooltip, children: /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-info", "aria-label": "Fee info", children: /* @__PURE__ */ jsx9(InfoIcon, {}) }) })
+            /* @__PURE__ */ jsx15(Tooltip, { content: feeTooltip, children: /* @__PURE__ */ jsx15("span", { className: "rs-review-detail-info", "aria-label": "Fee info", children: /* @__PURE__ */ jsx15(InfoIcon, {}) }) })
           ] })
         ] })
       ] }),
-      error && /* @__PURE__ */ jsx9(Callout, { variant: "error", children: error }),
-      /* @__PURE__ */ jsx9(
+      error && /* @__PURE__ */ jsx15(Callout, { variant: "error", children: error }),
+      /* @__PURE__ */ jsx15(
         Button,
         {
           onClick: handleConfirm,
@@ -2766,28 +3643,28 @@ function SolanaConfirmStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx9(PoweredBy, {})
+    /* @__PURE__ */ jsx15(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/DappImportAssetSelectStep.tsx
-import { jsx as jsx10, jsxs as jsxs10 } from "react/jsx-runtime";
+import { jsx as jsx16, jsxs as jsxs14 } from "react/jsx-runtime";
 function DappImportAssetSelectStep({
   sourceLabel,
   assets,
   onSelect
 }) {
-  return /* @__PURE__ */ jsxs10("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs10("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx10(
+  return /* @__PURE__ */ jsxs14("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs14("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx16(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx10(WalletIcon, {}),
+          icon: /* @__PURE__ */ jsx16(WalletIcon, {}),
           title: `Transfer from ${sourceLabel}`,
           subtitle: "Pick the balance to import"
         }
       ),
-      /* @__PURE__ */ jsx10("div", { className: "rs-asset-list", children: assets.map((asset) => {
+      /* @__PURE__ */ jsx16("div", { className: "rs-asset-list", children: assets.map((asset) => {
         const tokenAmount = asset.balance ? tokenFormatter.format(
           Number(asset.balance) / 10 ** asset.decimals
         ) : "0";
@@ -2795,23 +3672,23 @@ function DappImportAssetSelectStep({
         const tokenIcon = asset.icon ?? getTokenIcon(asset.symbol);
         const chainIcon = getChainIcon(asset.chainId);
         const badge = getChainBadge(asset.chainId);
-        return /* @__PURE__ */ jsxs10(
+        return /* @__PURE__ */ jsxs14(
           "button",
           {
             type: "button",
             className: "rs-asset-row",
             onClick: () => onSelect(asset),
             children: [
-              /* @__PURE__ */ jsxs10("div", { className: "rs-asset-info", children: [
-                /* @__PURE__ */ jsxs10("div", { className: "rs-asset-icon-wrapper", children: [
-                  /* @__PURE__ */ jsx10("span", { className: "rs-asset-icon", children: tokenIcon ? /* @__PURE__ */ jsx10("img", { src: tokenIcon, alt: asset.symbol }) : asset.symbol.slice(0, 4) }),
-                  chainIcon ? /* @__PURE__ */ jsx10("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx10(
+              /* @__PURE__ */ jsxs14("div", { className: "rs-asset-info", children: [
+                /* @__PURE__ */ jsxs14("div", { className: "rs-asset-icon-wrapper", children: [
+                  /* @__PURE__ */ jsx16("span", { className: "rs-asset-icon", children: tokenIcon ? /* @__PURE__ */ jsx16("img", { src: tokenIcon, alt: asset.symbol }) : asset.symbol.slice(0, 4) }),
+                  chainIcon ? /* @__PURE__ */ jsx16("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx16(
                     "img",
                     {
                       src: chainIcon,
                       alt: getChainName(asset.chainId)
                     }
-                  ) }) : /* @__PURE__ */ jsx10(
+                  ) }) : /* @__PURE__ */ jsx16(
                     "span",
                     {
                       className: "rs-asset-chain-badge",
@@ -2820,46 +3697,94 @@ function DappImportAssetSelectStep({
                     }
                   )
                 ] }),
-                /* @__PURE__ */ jsxs10("div", { className: "rs-asset-text", children: [
-                  /* @__PURE__ */ jsxs10("div", { className: "rs-asset-name-row", children: [
-                    /* @__PURE__ */ jsx10("span", { className: "rs-asset-name", children: asset.symbol }),
-                    /* @__PURE__ */ jsxs10("span", { className: "rs-asset-chain", children: [
+                /* @__PURE__ */ jsxs14("div", { className: "rs-asset-text", children: [
+                  /* @__PURE__ */ jsxs14("div", { className: "rs-asset-name-row", children: [
+                    /* @__PURE__ */ jsx16("span", { className: "rs-asset-name", children: asset.symbol }),
+                    /* @__PURE__ */ jsxs14("span", { className: "rs-asset-chain", children: [
                       "on ",
                       asset.sourceLabel
                     ] })
                   ] }),
-                  /* @__PURE__ */ jsxs10("div", { className: "rs-asset-balance-small", children: [
+                  /* @__PURE__ */ jsxs14("div", { className: "rs-asset-balance-small", children: [
                     tokenAmount,
                     " ",
                     asset.symbol
                   ] })
                 ] })
               ] }),
-              /* @__PURE__ */ jsx10("div", { className: "rs-asset-balance", children: balanceUsd })
+              /* @__PURE__ */ jsx16("div", { className: "rs-asset-balance", children: balanceUsd })
             ]
           },
           asset.id
         );
       }) })
     ] }),
-    /* @__PURE__ */ jsx10(PoweredBy, {})
+    /* @__PURE__ */ jsx16(PoweredBy, {})
   ] });
 }
 DappImportAssetSelectStep.displayName = "DappImportAssetSelectStep";
 
+// src/components/steps/DappImportAssetSelectSkeleton.tsx
+import { jsx as jsx17, jsxs as jsxs15 } from "react/jsx-runtime";
+function DappImportAssetSelectSkeleton({
+  sourceLabel,
+  rowCount = 3,
+  error = false,
+  onRetry
+}) {
+  return /* @__PURE__ */ jsxs15("div", { className: "rs-screen", "aria-busy": error ? "false" : "true", children: [
+    /* @__PURE__ */ jsx17("span", { className: "rs-sr-only", role: "status", children: error ? "Couldn't load balances" : "Loading balances\u2026" }),
+    /* @__PURE__ */ jsxs15("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx17(
+        BodyHeader,
+        {
+          icon: /* @__PURE__ */ jsx17(WalletIcon, {}),
+          title: `Transfer from ${sourceLabel}`,
+          subtitle: "Pick the balance to import"
+        }
+      ),
+      error ? /* @__PURE__ */ jsx17("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsxs15("div", { className: "rs-loading-text", children: [
+        /* @__PURE__ */ jsx17("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t load your balances" }),
+        /* @__PURE__ */ jsx17("div", { className: "rs-loading-subtitle", children: "Check your connection and try again." })
+      ] }) }) : /* @__PURE__ */ jsx17("div", { className: "rs-asset-list", "aria-hidden": "true", children: Array.from({ length: rowCount }, (_, index) => /* @__PURE__ */ jsxs15(
+        "div",
+        {
+          className: "rs-asset-row rs-asset-row--skeleton",
+          children: [
+            /* @__PURE__ */ jsxs15("div", { className: "rs-asset-info", children: [
+              /* @__PURE__ */ jsxs15("div", { className: "rs-asset-icon-wrapper", children: [
+                /* @__PURE__ */ jsx17("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx17("span", { className: "rs-skeleton rs-skeleton-fill" }) }),
+                /* @__PURE__ */ jsx17("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx17("span", { className: "rs-skeleton rs-skeleton-fill" }) })
+              ] }),
+              /* @__PURE__ */ jsxs15("div", { className: "rs-asset-text", children: [
+                /* @__PURE__ */ jsx17("div", { className: "rs-asset-name-row", children: /* @__PURE__ */ jsx17("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--name" }) }),
+                /* @__PURE__ */ jsx17("div", { className: "rs-asset-balance-small", children: /* @__PURE__ */ jsx17("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--balance" }) })
+              ] })
+            ] }),
+            /* @__PURE__ */ jsx17("div", { className: "rs-asset-balance", children: /* @__PURE__ */ jsx17("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--usd" }) })
+          ]
+        },
+        index
+      )) })
+    ] }),
+    error && onRetry && /* @__PURE__ */ jsx17("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx17(
+      "button",
+      {
+        type: "button",
+        className: "rs-button rs-button--default rs-button--full-width",
+        onClick: onRetry,
+        children: /* @__PURE__ */ jsx17("span", { children: "Try again" })
+      }
+    ) }),
+    /* @__PURE__ */ jsx17(PoweredBy, {})
+  ] });
+}
+DappImportAssetSelectSkeleton.displayName = "DappImportAssetSelectSkeleton";
+
 // src/core/dapp-imports/polymarket/index.ts
 import { createElement } from "react";
 import { formatUnits as formatUnits6 } from "viem";
 
-// src/core/dapp-imports/polymarket/constants.ts
-var POLYMARKET_POLYGON_CHAIN_ID = 137;
-var POLYMARKET_PUSD_ADDRESS = "0xC011a7E12a19f7B1f670d46F03B03f3342E82DFB";
-var POLYMARKET_USDCE_ADDRESS = "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174";
-var POLYMARKET_COLLATERAL_OFFRAMP_ADDRESS = "0x2957922Eb93258b93368531d39fAcCA3B4dC5854";
-var SAFE_MULTI_SEND_CALL_ONLY_ADDRESS = "0x40A2aCCbd92BCA938b02010E17A5b8929b49130D";
-var GAMMA_API_PUBLIC_PROFILE = "https://gamma-api.polymarket.com/public-profile";
-var POLYMARKET_ICON_URL = "data:image/svg+xml,%3Csvg width='512' height='512' viewBox='0 0 512 512' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Crect width='512' height='512' fill='%232E5CFF'/%3E%3Cpath d='M375.84 389.422C375.84 403.572 375.84 410.647 371.212 414.154C366.585 417.662 359.773 415.75 346.15 411.927L127.22 350.493C119.012 348.19 114.907 347.038 112.534 343.907C110.161 340.776 110.161 336.513 110.161 327.988V184.012C110.161 175.487 110.161 171.224 112.534 168.093C114.907 164.962 119.012 163.81 127.22 161.507L346.15 100.072C359.773 96.2495 366.585 94.338 371.212 97.8455C375.84 101.353 375.84 108.428 375.84 122.578V389.422ZM164.761 330.463L346.035 381.337V279.595L164.761 330.463ZM139.963 306.862L321.201 256L139.963 205.138V306.862ZM164.759 181.537L346.035 232.406V130.663L164.759 181.537Z' fill='white'/%3E%3C/svg%3E";
-
 // src/core/dapp-imports/polymarket/deposit-wallet.ts
 import {
   encodeFunctionData,
@@ -3026,204 +3951,12 @@ function buildPusdUnwrapCalls(recipient, amount) {
   ];
 }
 
-// src/core/dapp-imports/polymarket/gamma-api.ts
-import { getAddress, isAddress, zeroAddress } from "viem";
-async function fetchPolymarketProxyWallet(eoa, signal) {
-  const url = `${GAMMA_API_PUBLIC_PROFILE}?address=${eoa}`;
-  let response;
-  try {
-    response = await fetch(url, { signal });
-  } catch {
-    return null;
-  }
-  if (!response.ok) {
-    return null;
-  }
-  let payload;
-  try {
-    payload = await response.json();
-  } catch {
-    return null;
-  }
-  const raw = payload.proxyWallet;
-  if (!raw || !isAddress(raw)) {
-    return null;
-  }
-  const checksummed = getAddress(raw);
-  if (checksummed === zeroAddress) {
-    return null;
-  }
-  return checksummed;
-}
-
-// src/core/dapp-imports/polymarket/safe.ts
-import {
-  concat,
-  encodeFunctionData as encodeFunctionData2,
-  encodePacked,
-  erc20Abi as erc20Abi4,
-  pad,
-  parseAbi as parseAbi2,
-  parseEventLogs,
-  toHex,
-  zeroAddress as zeroAddress2
-} from "viem";
-var COLLATERAL_OFFRAMP_ABI2 = parseAbi2([
-  "function unwrap(address _asset, address _to, uint256 _amount)"
-]);
-var MULTI_SEND_ABI = parseAbi2(["function multiSend(bytes transactions)"]);
-async function readPolymarketBalances(params) {
-  const { publicClient, proxyWallet } = params;
-  try {
-    const results = await publicClient.multicall({
-      allowFailure: true,
-      contracts: [
-        {
-          address: POLYMARKET_PUSD_ADDRESS,
-          abi: erc20Abi4,
-          functionName: "balanceOf",
-          args: [proxyWallet]
-        },
-        {
-          address: POLYMARKET_USDCE_ADDRESS,
-          abi: erc20Abi4,
-          functionName: "balanceOf",
-          args: [proxyWallet]
-        }
-      ]
-    });
-    return {
-      pusd: results[0].status === "success" ? results[0].result : 0n,
-      usdce: results[1].status === "success" ? results[1].result : 0n
-    };
-  } catch {
-    return { pusd: 0n, usdce: 0n };
-  }
-}
-async function executePolymarketSafeTransfer(params) {
-  const {
-    walletClient,
-    publicClient,
-    safeAddress,
-    recipient,
-    amount,
-    tokenKind
-  } = params;
-  const account = walletClient.account;
-  const chain = walletClient.chain;
-  if (!account || !chain) {
-    throw new Error("Wallet not connected");
-  }
-  if (chain.id !== POLYMARKET_POLYGON_CHAIN_ID) {
-    throw new Error("Switch to Polygon to sign");
-  }
-  const isOwner = await publicClient.readContract({
-    address: safeAddress,
-    abi: SAFE_ABI,
-    functionName: "isOwner",
-    args: [account.address]
-  });
-  if (!isOwner) {
-    throw new Error("Connected wallet is not a Polymarket Safe owner");
-  }
-  const safeTx = tokenKind === "pusd" ? buildPusdUnwrapSafeTx(recipient, amount) : buildUsdceTransferSafeTx(recipient, amount);
-  const signature = concat([
-    pad(account.address, { size: 32 }),
-    pad(toHex(0), { size: 32 }),
-    toHex(1, { size: 1 })
-  ]);
-  const txHash = await walletClient.writeContract({
-    account,
-    chain,
-    address: safeAddress,
-    abi: SAFE_ABI,
-    functionName: "execTransaction",
-    args: [
-      safeTx.to,
-      0n,
-      safeTx.data,
-      safeTx.operation,
-      0n,
-      0n,
-      0n,
-      zeroAddress2,
-      zeroAddress2,
-      signature
-    ]
-  });
-  const receipt = await publicClient.waitForTransactionReceipt({
-    hash: txHash
-  });
-  const parsed = parseEventLogs({
-    abi: SAFE_ABI,
-    logs: receipt.logs.filter(
-      (log) => log.address.toLowerCase() === safeAddress.toLowerCase()
-    ),
-    strict: false
-  });
-  if (parsed.some((log) => log.eventName === "ExecutionFailure")) {
-    throw new Error("Polymarket Safe transaction failed");
-  }
-  if (!parsed.some((log) => log.eventName === "ExecutionSuccess")) {
-    throw new Error("Polymarket Safe transaction status unavailable");
-  }
-  return {
-    txHash,
-    // The smart account always receives USDC.e — pUSD is unwrapped to USDC.e
-    // before it lands at `recipient`.
-    sourceToken: POLYMARKET_USDCE_ADDRESS,
-    sourceSymbol: tokenKind === "pusd" ? "pUSD" : "USDC.e"
-  };
-}
-function buildUsdceTransferSafeTx(recipient, amount) {
-  return {
-    to: POLYMARKET_USDCE_ADDRESS,
-    data: encodeFunctionData2({
-      abi: erc20Abi4,
-      functionName: "transfer",
-      args: [recipient, amount]
-    }),
-    operation: 0
-  };
-}
-function buildPusdUnwrapSafeTx(recipient, amount) {
-  const approveData = encodeFunctionData2({
-    abi: erc20Abi4,
-    functionName: "approve",
-    args: [POLYMARKET_COLLATERAL_OFFRAMP_ADDRESS, amount]
-  });
-  const unwrapData = encodeFunctionData2({
-    abi: COLLATERAL_OFFRAMP_ABI2,
-    functionName: "unwrap",
-    args: [POLYMARKET_USDCE_ADDRESS, recipient, amount]
-  });
-  return {
-    to: SAFE_MULTI_SEND_CALL_ONLY_ADDRESS,
-    data: encodeFunctionData2({
-      abi: MULTI_SEND_ABI,
-      functionName: "multiSend",
-      args: [
-        concat([
-          encodeMultiSendCall(POLYMARKET_PUSD_ADDRESS, approveData),
-          encodeMultiSendCall(POLYMARKET_COLLATERAL_OFFRAMP_ADDRESS, unwrapData)
-        ])
-      ]
-    }),
-    operation: 1
-  };
-}
-function encodeMultiSendCall(to, data) {
-  return encodePacked(
-    ["uint8", "address", "uint256", "uint256", "bytes"],
-    [0, to, 0n, BigInt((data.length - 2) / 2), data]
-  );
-}
-
 // src/core/dapp-imports/polymarket/index.ts
 var PROVIDER_ID = "polymarket";
 var polymarketProvider = {
   id: PROVIDER_ID,
   label: "Transfer from Polymarket",
+  sourceLabel: "Polymarket",
   icon: createElement("img", {
     src: POLYMARKET_ICON_URL,
     alt: "Polymarket",
@@ -3348,6 +4081,77 @@ function getEnabledProviders(config) {
   );
 }
 
+// src/store/selectors.ts
+var selectedWalletIdSelector = (state) => state.wallet.selectedWalletId;
+var IDLE_SETUP_ENTRY = {
+  owner: null,
+  requestKey: null,
+  cacheKey: null,
+  status: "idle",
+  smartAccount: null,
+  sessionOwnerAddress: null,
+  solanaDepositAddress: null,
+  message: null,
+  cacheable: true,
+  attemptNonce: 0
+};
+function readSetupForOwner(setup, owner) {
+  if (!owner) return IDLE_SETUP_ENTRY;
+  const entry = setup.byOwner[owner.toLowerCase()];
+  return entry ?? { ...IDLE_SETUP_ENTRY, owner };
+}
+
+// src/core/dapp-imports/status.ts
+function computeDappImportStatus(providerId, inputs) {
+  const { owner, availability, availabilityOwner, setup } = inputs;
+  if (!owner) return "needs-connect";
+  const entry = availabilityOwner?.toLowerCase() === owner.toLowerCase() ? availability[providerId] : void 0;
+  if (entry === "loading" || entry === void 0) return "loading";
+  if (entry === "error") {
+    return {
+      enabled: false,
+      reason: "Couldn't load balance \u2014 tap to retry",
+      retryable: true
+    };
+  }
+  if (entry === null) return { enabled: false, reason: "No balance" };
+  const setupEntry = readSetupForOwner(setup, owner);
+  if (setupEntry.status === "loading") return "loading";
+  if (setupEntry.status === "error") {
+    return {
+      enabled: false,
+      reason: "Couldn't prepare account \u2014 tap to retry",
+      retryable: true
+    };
+  }
+  return { enabled: true, balanceUsd: entry.totalUsd };
+}
+function resolveBootOutcome(params) {
+  const { status, setupStatus, timedOut, walletHydrating, signerAvailable } = params;
+  if (status === "needs-connect") {
+    return walletHydrating && !timedOut ? "wait" : "unavailable";
+  }
+  if (status === "loading") return timedOut ? "error" : "wait";
+  if (!status.enabled) {
+    return status.retryable ? "error" : "unavailable";
+  }
+  if (setupStatus === "ready") {
+    if (!signerAvailable) return timedOut ? "error" : "wait";
+    return "ready";
+  }
+  if (setupStatus === "error") return "error";
+  return timedOut ? "error" : "wait";
+}
+function bootRetryPlan(params) {
+  const { setupStatus, availabilityEntry } = params;
+  return {
+    restartSetup: setupStatus !== "ready",
+    // `null` is a delivered "no account" — only refetch when nothing
+    // usable came back ("error", still "loading", or never recorded).
+    refetchAvailability: availabilityEntry === "error" || availabilityEntry === "loading" || availabilityEntry === void 0
+  };
+}
+
 // src/core/dapp-imports/types.ts
 function isDappImportAsset(asset) {
   return typeof asset.source === "string" && typeof asset.sourceLabel === "string" && "providerMetadata" in asset;
@@ -3411,6 +4215,7 @@ function applyBack(state, hasWalletOptions) {
           targetAmount: null,
           targetTokenPriceUsd: null,
           balance: null,
+          inputAmountUsd: null,
           liquidityWarning: null
         },
         flow: {
@@ -3456,9 +4261,21 @@ function applyBack(state, hasWalletOptions) {
         },
         flow: { ...state.flow, step: "solana-amount", hasNavigatedBack: true }
       };
+    case "exchange-connect":
+      return {
+        ...state,
+        flow: {
+          ...state.flow,
+          step: "exchange-select",
+          hasNavigatedBack: true
+        }
+      };
     case "select-asset":
     case "deposit-address":
+    case "fiat-onramp":
+    case "exchange-select":
     case "solana-token-select":
+    case "dapp-import-resolving":
     case "dapp-import-asset-select":
       return {
         ...state,
@@ -3473,8 +4290,10 @@ function applyBack(state, hasWalletOptions) {
         dappImport: {
           ...state.dappImport,
           activeProviderId: null,
-          selectedAsset: null
-        }
+          selectedAsset: null,
+          bootError: false
+        },
+        exchange: { selectedConnection: null }
       };
     case "connect":
     case "setup":
@@ -3487,7 +4306,8 @@ function applyBack(state, hasWalletOptions) {
             mode: null,
             isConnectSelectionConfirmed: false,
             hasNavigatedBack: hasWalletOptions || state.flow.hasNavigatedBack
-          }
+          },
+          exchange: { selectedConnection: null }
         };
       }
       return state;
@@ -3507,6 +4327,10 @@ function modeEntryStep(mode) {
       return "solana-token-select";
     case "dapp-import":
       return "dapp-import-asset-select";
+    case "fiat-onramp":
+      return "fiat-onramp";
+    case "exchange-connect":
+      return "exchange-select";
   }
 }
 function updateSetupEntry(state, owner, update) {
@@ -3552,7 +4376,8 @@ function applyAction(state, action) {
           ...state.dappImport,
           activeProviderId: null,
           selectedAsset: null
-        }
+        },
+        exchange: { selectedConnection: null }
       };
     case "connect/wallet-confirmed":
       if (!action.mode) return state;
@@ -3576,15 +4401,38 @@ function applyAction(state, action) {
           step: "deposit-address"
         }
       };
-    case "connect/auto-locked":
+    case "connect/fiat-onramp-selected":
       return {
         ...state,
         flow: {
           ...state.flow,
-          mode: "wallet",
+          mode: "fiat-onramp",
           isConnectSelectionConfirmed: true,
-          step: "select-asset"
-        }
+          step: modeEntryStep("fiat-onramp")
+        },
+        fiat: { ...state.fiat, selectedMethod: action.paymentMethod ?? null }
+      };
+    case "connect/exchange-selected":
+      return {
+        ...state,
+        flow: {
+          ...state.flow,
+          mode: "exchange-connect",
+          isConnectSelectionConfirmed: true,
+          step: modeEntryStep("exchange-connect")
+        },
+        exchange: { selectedConnection: null }
+      };
+    case "exchange/connection-selected":
+      return {
+        ...state,
+        flow: {
+          ...state.flow,
+          mode: "exchange-connect",
+          isConnectSelectionConfirmed: true,
+          step: "exchange-connect"
+        },
+        exchange: { selectedConnection: action.connection }
       };
     case "connect/wallet-picker-requested":
       return {
@@ -3601,7 +4449,8 @@ function applyAction(state, action) {
           ...state.dappImport,
           activeProviderId: null,
           selectedAsset: null
-        }
+        },
+        exchange: { selectedConnection: null }
       };
     case "setup/started": {
       const existing = state.setup.byOwner[ownerKey(action.owner)];
@@ -3666,7 +4515,11 @@ function applyAction(state, action) {
           selectedAsset: action.asset,
           // Seed the user-facing amount input with the modal's defaultAmount
           // on first visit. Subsequent visits override via amount/entered.
-          amount: action.seedAmount ?? state.deposit.amount
+          // `inputAmountUsd` is the USD-style value the input shows; it (not
+          // the native `amount`) is what re-seeds the input on back, so seed
+          // it here too and reset it on a fresh pick.
+          amount: action.seedAmount ?? state.deposit.amount,
+          inputAmountUsd: action.seedAmount ?? null
         },
         flow: { ...state.flow, step: "amount" }
       };
@@ -3679,6 +4532,11 @@ function applyAction(state, action) {
           targetAmount: action.targetAmount,
           targetTokenPriceUsd: action.targetTokenPriceUsd,
           balance: action.balance ?? null,
+          // `targetAmount` is the USD-style value the user typed. Preserve it
+          // as `inputAmountUsd` so back-from-confirm re-seeds the input with
+          // the typed USD value rather than the converted native `amount`
+          // (which corrupts the input for non-stablecoin priced tokens).
+          inputAmountUsd: action.targetAmount,
           liquidityWarning: action.liquidityWarning ?? null
         },
         flow: { ...state.flow, step: "confirm" }
@@ -3719,7 +4577,11 @@ function applyAction(state, action) {
           sourceChain: action.sourceChain,
           sourceToken: action.sourceToken ?? null,
           sourceSymbol: action.sourceSymbol ?? null,
-          sourceDecimals: action.sourceDecimals ?? null
+          sourceDecimals: action.sourceDecimals ?? null,
+          // The submit site's declared USD value, not the lingering typed
+          // input — a submit that doesn't know it (fiat onramp) must not
+          // inherit one from an abandoned wallet attempt.
+          inputAmountUsd: action.inputAmountUsd ?? null
         },
         processing: {
           ...state.processing,
@@ -3733,14 +4595,28 @@ function applyAction(state, action) {
         ...state,
         dappImport: {
           ...state.dappImport,
-          availabilityOwner: action.owner,
+          availabilityOwner: action.owner,
+          availability: {
+            ...state.dappImport.availabilityOwner && ownerKey(state.dappImport.availabilityOwner) === ownerKey(action.owner) ? state.dappImport.availability : {},
+            [action.providerId]: "loading"
+          }
+        }
+      };
+    case "dapp-import/availability-loaded":
+      if (!state.dappImport.availabilityOwner || ownerKey(state.dappImport.availabilityOwner) !== ownerKey(action.owner)) {
+        return state;
+      }
+      return {
+        ...state,
+        dappImport: {
+          ...state.dappImport,
           availability: {
-            ...state.dappImport.availabilityOwner && ownerKey(state.dappImport.availabilityOwner) === ownerKey(action.owner) ? state.dappImport.availability : {},
-            [action.providerId]: "loading"
+            ...state.dappImport.availability,
+            [action.providerId]: action.availability
           }
         }
       };
-    case "dapp-import/availability-loaded":
+    case "dapp-import/availability-failed":
       if (!state.dappImport.availabilityOwner || ownerKey(state.dappImport.availabilityOwner) !== ownerKey(action.owner)) {
         return state;
       }
@@ -3750,21 +4626,31 @@ function applyAction(state, action) {
           ...state.dappImport,
           availability: {
             ...state.dappImport.availability,
-            [action.providerId]: action.availability
+            [action.providerId]: "error"
           }
         }
       };
-    case "dapp-import/availability-cleared":
+    case "dapp-import/availability-retry-requested":
+      return {
+        ...state,
+        dappImport: {
+          ...state.dappImport,
+          attemptNonce: state.dappImport.attemptNonce + 1
+        }
+      };
+    case "dapp-import/availability-cleared": {
+      const isBootResolving = state.flow.step === "dapp-import-resolving";
       return {
         ...state,
         dappImport: {
           ...state.dappImport,
           availabilityOwner: null,
           availability: {},
-          activeProviderId: null,
-          selectedAsset: null
+          activeProviderId: isBootResolving ? state.dappImport.activeProviderId : null,
+          selectedAsset: isBootResolving ? state.dappImport.selectedAsset : null
         }
       };
+    }
     case "dapp-import/provider-selected":
       return {
         ...state,
@@ -3793,6 +4679,57 @@ function applyAction(state, action) {
         },
         flow: { ...state.flow, step: "amount" }
       };
+    case "dapp-import/boot-requested":
+      return {
+        ...state,
+        flow: {
+          ...state.flow,
+          mode: "dapp-import",
+          isConnectSelectionConfirmed: true,
+          step: "dapp-import-resolving"
+        },
+        dappImport: {
+          ...state.dappImport,
+          activeProviderId: action.providerId,
+          selectedAsset: null,
+          bootError: false
+        }
+      };
+    case "dapp-import/boot-resolved": {
+      if (state.flow.step !== "dapp-import-resolving" || state.dappImport.activeProviderId !== action.providerId) {
+        return state;
+      }
+      switch (action.outcome) {
+        case "ready":
+          return {
+            ...state,
+            flow: { ...state.flow, step: "dapp-import-asset-select" },
+            dappImport: { ...state.dappImport, bootError: false }
+          };
+        case "unavailable":
+          return {
+            ...state,
+            flow: {
+              ...state.flow,
+              step: "connect",
+              mode: null,
+              isConnectSelectionConfirmed: false,
+              hasNavigatedBack: true
+            },
+            dappImport: {
+              ...state.dappImport,
+              activeProviderId: null,
+              selectedAsset: null,
+              bootError: false
+            }
+          };
+        case "error":
+          return {
+            ...state,
+            dappImport: { ...state.dappImport, bootError: true }
+          };
+      }
+    }
     case "back/requested":
       return applyBack(state, action.hasWalletOptions);
     case "flow/reset": {
@@ -3820,14 +4757,22 @@ function applyAction(state, action) {
           txHash: null,
           directTransfer: false
         },
-        // Preserve fetched availability for its recorded EOA — refetching on
-        // every modal close burns a request. Just clear active selection.
+        // Drop fetched availability wholesale. The fetch effect refetches
+        // unconditionally on remount (so keeping the map saves nothing),
+        // and a preserved terminal entry (null / "error") could be consumed
+        // by a fresh pre-routed boot before the refetch's loading update
+        // lands — routing a now-funded account home off stale data.
         dappImport: {
-          ...state.dappImport,
           activeProviderId: null,
-          selectedAsset: null
+          availabilityOwner: null,
+          availability: {},
+          selectedAsset: null,
+          bootError: false,
+          attemptNonce: 0
         },
-        setup: { byOwner: preservedByOwner }
+        setup: { byOwner: preservedByOwner },
+        fiat: { selectedMethod: null },
+        exchange: { selectedConnection: null }
       };
     }
     case "target/changed": {
@@ -3897,34 +4842,22 @@ function createInitialState(overrides) {
       activeProviderId: null,
       availabilityOwner: null,
       availability: {},
-      selectedAsset: null
+      selectedAsset: null,
+      bootError: false,
+      attemptNonce: 0
     },
     setup: {
       byOwner: {}
+    },
+    fiat: {
+      selectedMethod: null
+    },
+    exchange: {
+      selectedConnection: null
     }
   };
 }
 
-// src/store/selectors.ts
-var selectedWalletIdSelector = (state) => state.wallet.selectedWalletId;
-var IDLE_SETUP_ENTRY = {
-  owner: null,
-  requestKey: null,
-  cacheKey: null,
-  status: "idle",
-  smartAccount: null,
-  sessionOwnerAddress: null,
-  solanaDepositAddress: null,
-  message: null,
-  cacheable: true,
-  attemptNonce: 0
-};
-function readSetupForOwner(setup, owner) {
-  if (!owner) return IDLE_SETUP_ENTRY;
-  const entry = setup.byOwner[owner.toLowerCase()];
-  return entry ?? { ...IDLE_SETUP_ENTRY, owner };
-}
-
 // src/store/index.ts
 function createDepositStore(overrides) {
   const store = createStore(() => createInitialState(overrides));
@@ -4203,35 +5136,39 @@ function mapError(error) {
 }
 
 // src/DepositFlow.tsx
-import { Fragment as Fragment3, jsx as jsx11, jsxs as jsxs11 } from "react/jsx-runtime";
+import { Fragment as Fragment3, jsx as jsx18, jsxs as jsxs16 } from "react/jsx-runtime";
 function AccountPreparingSkeleton({
   errorMessage,
   onRetry
 }) {
-  return /* @__PURE__ */ jsxs11("div", { className: "rs-step", children: [
-    /* @__PURE__ */ jsx11("div", { className: "rs-step-body", style: { paddingTop: 0 }, children: /* @__PURE__ */ jsx11("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx11("div", { className: "rs-loading-text", children: errorMessage ? /* @__PURE__ */ jsxs11(Fragment3, { children: [
-      /* @__PURE__ */ jsx11("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t prepare account" }),
-      /* @__PURE__ */ jsx11("div", { className: "rs-loading-subtitle", children: errorMessage })
-    ] }) : /* @__PURE__ */ jsx11("div", { className: "rs-loading-title", children: "Preparing\u2026" }) }) }) }),
-    errorMessage && onRetry && /* @__PURE__ */ jsx11("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx11(
+  return /* @__PURE__ */ jsxs16("div", { className: "rs-step", children: [
+    /* @__PURE__ */ jsx18("div", { className: "rs-step-body", style: { paddingTop: 0 }, children: /* @__PURE__ */ jsx18("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx18("div", { className: "rs-loading-text", children: errorMessage ? /* @__PURE__ */ jsxs16(Fragment3, { children: [
+      /* @__PURE__ */ jsx18("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t prepare account" }),
+      /* @__PURE__ */ jsx18("div", { className: "rs-loading-subtitle", children: errorMessage })
+    ] }) : /* @__PURE__ */ jsx18("div", { className: "rs-loading-title", children: "Preparing\u2026" }) }) }) }),
+    errorMessage && onRetry && /* @__PURE__ */ jsx18("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx18(
       "button",
       {
         type: "button",
         className: "rs-button rs-button--default rs-button--full-width",
         onClick: onRetry,
-        children: /* @__PURE__ */ jsx11("span", { children: "Try again" })
+        children: /* @__PURE__ */ jsx18("span", { children: "Try again" })
       }
     ) })
   ] });
 }
 var QR_AUTO_ADVANCE_HYDRATION_GRACE_MS = 1e3;
+var DAPP_IMPORT_RESOLVE_TIMEOUT_MS = 1e4;
 function isSameRoute2(sourceChain, sourceToken, targetChain, targetToken) {
   return sourceChain === targetChain && sourceToken.toLowerCase() === targetToken.toLowerCase();
 }
+var SWAPPED_SOURCE_CHAIN = 8453;
+var SWAPPED_SOURCE_TOKEN = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
+var SWAPPED_SOURCE_DECIMALS = 6;
 function getAddressKey(address) {
   return address ? address.toLowerCase() : null;
 }
-function deriveStep(flow, d, p, activeEntry) {
+function deriveStep(flow, d, p, activeEntry, fiat, exchange) {
   const flowStep = flow.step;
   const smartAccount = activeEntry.smartAccount;
   const solanaDepositAddress = activeEntry.solanaDepositAddress;
@@ -4246,6 +5183,23 @@ function deriveStep(flow, d, p, activeEntry) {
         smartAccount,
         solanaDepositAddress: solanaDepositAddress ?? void 0
       };
+    case "fiat-onramp":
+      if (!smartAccount) return { type: "setup" };
+      return {
+        type: "fiat-onramp",
+        smartAccount,
+        paymentMethod: fiat.selectedMethod ?? void 0
+      };
+    case "exchange-select":
+      return { type: "exchange-select" };
+    case "exchange-connect":
+      if (!exchange.selectedConnection) return { type: "exchange-select" };
+      if (!smartAccount) return { type: "setup" };
+      return {
+        type: "exchange-connect",
+        smartAccount,
+        connection: exchange.selectedConnection
+      };
     case "select-asset":
       if (!smartAccount) return { type: "setup" };
       return { type: "select-asset", smartAccount };
@@ -4255,7 +5209,9 @@ function deriveStep(flow, d, p, activeEntry) {
         type: "amount",
         smartAccount,
         asset: d.selectedAsset,
-        amount: d.amount ?? void 0
+        // Seed the input from the USD-style value the user typed, not the
+        // native source `amount` (which would corrupt the input on back).
+        inputAmountUsd: d.inputAmountUsd ?? void 0
       };
     case "confirm":
       if (!smartAccount || !d.selectedAsset || !d.amount || !d.targetAmount) {
@@ -4291,6 +5247,8 @@ function deriveStep(flow, d, p, activeEntry) {
         balanceUsd: d.balanceUsd,
         inputAmountUsd: d.inputAmountUsd ?? void 0
       };
+    case "dapp-import-resolving":
+      return { type: "dapp-import-resolving" };
     case "dapp-import-asset-select":
       if (!smartAccount) return { type: "setup" };
       return { type: "dapp-import-asset-select", smartAccount };
@@ -4324,6 +5282,7 @@ function deriveStep(flow, d, p, activeEntry) {
         amount: d.amount,
         sourceSymbol: d.sourceSymbol ?? void 0,
         sourceDecimals: d.sourceDecimals ?? void 0,
+        inputAmountUsd: d.inputAmountUsd ?? void 0,
         directTransfer: p.directTransfer
       };
   }
@@ -4332,6 +5291,8 @@ function resolveOwnerForMode(mode, ctx) {
   switch (mode) {
     case "deposit-address":
     case "solana-wallet":
+    case "fiat-onramp":
+    case "exchange-connect":
       return ctx.dappAddress ?? null;
     case "wallet":
       return ctx.walletOwner ?? null;
@@ -4360,9 +5321,13 @@ function DepositFlow({
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
-  waitForFinalTx = true,
   enableSolana = true,
   dappImports,
+  initialDappImport,
+  enableFiatOnramp = false,
+  enableQrTransfer = true,
+  fiatOnrampMethods,
+  enableExchangeConnect = false,
   reownWallet,
   onConnect,
   onDisconnect,
@@ -4391,31 +5356,33 @@ function DepositFlow({
   const depositSlice = useDepositStore((s) => s.deposit);
   const processingSlice = useDepositStore((s) => s.processing);
   const setupSlice = useDepositStore((s) => s.setup);
+  const fiatSlice = useDepositStore((s) => s.fiat);
+  const exchangeSlice = useDepositStore((s) => s.exchange);
   const flowMode = flowSlice.mode;
   const isConnectSelectionConfirmed = flowSlice.isConnectSelectionConfirmed;
   const hasNavigatedBack = flowSlice.hasNavigatedBack;
   const selectedWalletId = useDepositStore(selectedWalletIdSelector);
-  const [totalBalanceUsd, setTotalBalanceUsd] = useState9(0);
-  const [hasQrAutoAdvanceGraceElapsed, setHasQrAutoAdvanceGraceElapsed] = useState9(() => !hasInitialWalletHydrationPending);
-  const portfolioAssetsRef = useRef7([]);
-  const stableWalletSignerRef = useRef7(null);
-  const stableWalletSelectionKeyRef = useRef7(null);
-  const logFlow = useCallback4(
+  const [totalBalanceUsd, setTotalBalanceUsd] = useState11(0);
+  const [hasQrAutoAdvanceGraceElapsed, setHasQrAutoAdvanceGraceElapsed] = useState11(() => !hasInitialWalletHydrationPending);
+  const portfolioAssetsRef = useRef8([]);
+  const stableWalletSignerRef = useRef8(null);
+  const stableWalletSelectionKeyRef = useRef8(null);
+  const logFlow = useCallback7(
     (message, data) => {
       debugLog(debug, "deposit-flow", message, data);
     },
     [debug]
   );
-  const logFlowError = useCallback4(
+  const logFlowError = useCallback7(
     (message, error, data) => {
       debugError(debug, "deposit-flow", message, error, data);
     },
     [debug]
   );
-  const handleAssetsLoaded = useCallback4((assets) => {
+  const handleAssetsLoaded = useCallback7((assets) => {
     portfolioAssetsRef.current = assets;
   }, []);
-  const getTokenPriceUsd = useCallback4((symbol) => {
+  const getTokenPriceUsd = useCallback7((symbol) => {
     const sym = symbol.toLowerCase();
     for (const asset of portfolioAssetsRef.current) {
       if (asset.symbol.toLowerCase() === sym && asset.balanceUsd && asset.balance) {
@@ -4430,14 +5397,14 @@ function DepositFlow({
     }
     return null;
   }, []);
-  const dappSwitchChain = useMemo6(() => {
+  const dappSwitchChain = useMemo7(() => {
     if (!dappWalletClient?.switchChain) return void 0;
     return async (chainId) => {
       await dappWalletClient.switchChain?.({ id: chainId });
     };
   }, [dappWalletClient]);
   const connectedWalletAddress = dappWalletClient?.account?.address ?? null;
-  const walletOptions = useMemo6(() => {
+  const walletOptions = useMemo7(() => {
     const options = [];
     const seen = /* @__PURE__ */ new Set();
     if (connectedWalletAddress && dappAddress) {
@@ -4489,7 +5456,7 @@ function DepositFlow({
     reownWallet?.solanaAddress,
     reownWallet?.caipAddress
   ]);
-  const canAutoLock = dappWalletClient?.account && dappAddress && !reownWallet;
+  const canAutoLock = dappWalletClient?.account && dappAddress && !reownWallet && !enableFiatOnramp && !enableExchangeConnect;
   const hasWalletOptions = walletOptions.length > 0;
   const hasReownSession = Boolean(
     enableSolana ? reownWallet?.isConnected || reownWallet?.address : reownWallet?.address
@@ -4497,8 +5464,11 @@ function DepositFlow({
   const isWalletHydrationPending = Boolean(
     dappAddress && !hasWalletOptions && (hasDappWalletClientProp && dappWalletClient === void 0 || reownWallet && !hasReownSession && !reownWallet.isReady)
   );
+  const isDappImportWalletHydrating = Boolean(
+    hasDappWalletClientProp && dappWalletClient === void 0 || reownWallet && !hasReownSession && !reownWallet.isReady
+  );
   const showConnectStep = flowMode === null && !isConnectSelectionConfirmed;
-  useEffect8(() => {
+  useEffect10(() => {
     if (!isWalletHydrationPending) {
       setHasQrAutoAdvanceGraceElapsed(true);
       return;
@@ -4509,7 +5479,7 @@ function DepositFlow({
     }, QR_AUTO_ADVANCE_HYDRATION_GRACE_MS);
     return () => window.clearTimeout(timeout);
   }, [isWalletHydrationPending]);
-  const walletSelectionKey = useMemo6(() => {
+  const walletSelectionKey = useMemo7(() => {
     if (flowMode !== "wallet" && flowMode !== "dapp-import") return null;
     if (canAutoLock) {
       return getAddressKey(connectedWalletAddress);
@@ -4523,11 +5493,11 @@ function DepositFlow({
     isConnectSelectionConfirmed,
     selectedWalletId
   ]);
-  const setupChainId = typeof targetChain === "number" ? targetChain : typeof defaultSourceChain === "number" ? defaultSourceChain : base.id;
+  const setupChainId = typeof targetChain === "number" && !isVirtualDestination(targetChain) ? targetChain : typeof defaultSourceChain === "number" ? defaultSourceChain : base.id;
   const targetSymbol = getTargetTokenSymbol(targetToken, targetChain);
   const isTargetStablecoin = isStablecoinSymbol(targetSymbol);
-  const targetMarketPriceRef = useRef7(null);
-  useEffect8(() => {
+  const targetMarketPriceRef = useRef8(null);
+  useEffect10(() => {
     targetMarketPriceRef.current = null;
     if (isTargetStablecoin || targetSymbol === "Token") {
       return;
@@ -4542,7 +5512,7 @@ function DepositFlow({
       cancelled = true;
     };
   }, [service, targetSymbol, isTargetStablecoin]);
-  const walletSignerContext = useMemo6(() => {
+  const walletSignerContext = useMemo7(() => {
     if (flowMode === "deposit-address") {
       return null;
     }
@@ -4608,7 +5578,7 @@ function DepositFlow({
     reownWallet,
     setupChainId
   ]);
-  useEffect8(() => {
+  useEffect10(() => {
     if (flowMode !== "wallet" && flowMode !== "dapp-import") {
       stableWalletSelectionKeyRef.current = null;
       stableWalletSignerRef.current = null;
@@ -4623,7 +5593,7 @@ function DepositFlow({
       stableWalletSignerRef.current = walletSignerContext;
     }
   }, [flowMode, walletSelectionKey, walletSignerContext]);
-  const signerContext = useMemo6(() => {
+  const signerContext = useMemo7(() => {
     if (flowMode === "deposit-address") {
       if (!dappAddress) return null;
       return {
@@ -4651,7 +5621,7 @@ function DepositFlow({
     walletSignerContext,
     walletSelectionKey
   ]);
-  const selectedEvmWalletOwner = useMemo6(() => {
+  const selectedEvmWalletOwner = useMemo7(() => {
     if (!selectedWalletId) return null;
     const opt = walletOptions.find((o) => o.id === selectedWalletId);
     if (opt?.kind === "external" && opt.address) {
@@ -4662,7 +5632,7 @@ function DepositFlow({
     }
     return null;
   }, [selectedWalletId, walletOptions]);
-  const dappImportOwner = useMemo6(() => {
+  const dappImportOwner = useMemo7(() => {
     if (selectedEvmWalletOwner) return selectedEvmWalletOwner;
     if (reownWallet?.address && reownWallet.isConnected) {
       return reownWallet.address;
@@ -4675,7 +5645,7 @@ function DepositFlow({
     reownWallet?.isConnected,
     connectedWalletAddress
   ]);
-  const activeOwner = useMemo6(
+  const activeOwner = useMemo7(
     () => resolveOwnerForMode(flowMode, {
       dappAddress,
       walletOwner: signerContext?.ownerAddress ?? (canAutoLock ? connectedWalletAddress : selectedEvmWalletOwner),
@@ -4691,12 +5661,12 @@ function DepositFlow({
       dappImportOwner
     ]
   );
-  const activeEntry = useMemo6(
+  const activeEntry = useMemo7(
     () => readSetupForOwner(setupSlice, activeOwner),
     [setupSlice, activeOwner]
   );
-  const lastActiveSetupLifecycleKeyRef = useRef7(null);
-  useEffect8(() => {
+  const lastActiveSetupLifecycleKeyRef = useRef8(null);
+  useEffect10(() => {
     if (!flowMode || !isConnectSelectionConfirmed) {
       lastActiveSetupLifecycleKeyRef.current = null;
       return;
@@ -4732,12 +5702,26 @@ function DepositFlow({
     activeEntry.solanaDepositAddress,
     onLifecycleRef
   ]);
-  const effectiveStep = useMemo6(
-    () => deriveStep(flowSlice, depositSlice, processingSlice, activeEntry),
-    [flowSlice, depositSlice, processingSlice, activeEntry]
+  const effectiveStep = useMemo7(
+    () => deriveStep(
+      flowSlice,
+      depositSlice,
+      processingSlice,
+      activeEntry,
+      fiatSlice,
+      exchangeSlice
+    ),
+    [
+      flowSlice,
+      depositSlice,
+      processingSlice,
+      activeEntry,
+      fiatSlice,
+      exchangeSlice
+    ]
   );
   const step = effectiveStep;
-  const handleBack = useCallback4(() => {
+  const handleBack = useCallback7(() => {
     const stepBeforeBack = storeApi.getState().flow.step;
     storeApi.dispatch({
       type: "back/requested",
@@ -4747,16 +5731,55 @@ function DepositFlow({
       portfolioAssetsRef.current = [];
     }
   }, [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" || effectiveStep.type === "dapp-import-asset-select" || effectiveStep.type === "select-asset" && signerContext && !canAutoLock;
+  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
+  // 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-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;
-  useEffect8(() => {
+  useEffect10(() => {
     onStepChangeRef.current?.(currentBackHandler, currentScreen);
   }, [currentBackHandler, currentScreen, onStepChangeRef]);
+  const lastModalHeightRef = useRef8(0);
+  const modalContentElRef = useRef8(null);
+  useEffect10(() => {
+    const mc = document.querySelector(".rs-modal-content");
+    if (!mc) return;
+    modalContentElRef.current = mc;
+    const ro = new ResizeObserver((entries) => {
+      for (const entry of entries) {
+        const border = entry.borderBoxSize?.[0]?.blockSize;
+        lastModalHeightRef.current = typeof border === "number" ? border : entry.contentRect.height;
+      }
+    });
+    ro.observe(mc);
+    return () => {
+      ro.disconnect();
+      modalContentElRef.current = null;
+    };
+  }, []);
+  const stepPinKey = `${flowMode ?? "none"}:${step.type}`;
+  const prevStepPinKeyRef = useRef8(stepPinKey);
+  useLayoutEffect2(() => {
+    if (prevStepPinKeyRef.current === stepPinKey) return;
+    prevStepPinKeyRef.current = stepPinKey;
+    const mc = document.querySelector(".rs-modal-content");
+    const lastHeight = lastModalHeightRef.current;
+    if (!mc || lastHeight <= 0) return;
+    const prevTransition = mc.style.transition;
+    mc.style.transition = "none";
+    mc.style.setProperty("min-height", `${lastHeight}px`, "important");
+    void mc.offsetHeight;
+    const rafId = requestAnimationFrame(() => {
+      mc.style.transition = prevTransition;
+      mc.style.removeProperty("min-height");
+    });
+    return () => cancelAnimationFrame(rafId);
+  }, [stepPinKey]);
   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 = useRef7(null);
-  useEffect8(() => {
+  const lastStepOpenEventKeyRef = useRef8(null);
+  useEffect10(() => {
     if (!stepOpenEventKey) {
       lastStepOpenEventKeyRef.current = null;
       return;
@@ -4798,7 +5821,7 @@ function DepositFlow({
     totalBalanceUsd,
     onEventRef
   ]);
-  useEffect8(() => {
+  useEffect10(() => {
     logFlow("state:changed", {
       step: effectiveStep.type,
       flowMode,
@@ -4814,7 +5837,7 @@ function DepositFlow({
     targetChain,
     targetToken
   ]);
-  useEffect8(() => {
+  useEffect10(() => {
     onLifecycleRef.current?.({
       type: "balance-changed",
       totalUsd: totalBalanceUsd
@@ -4823,10 +5846,12 @@ function DepositFlow({
   const isDepositAddressMode = flowMode === "deposit-address";
   const isSolanaWalletMode = flowMode === "solana-wallet";
   const isDappImportMode = flowMode === "dapp-import";
-  const handleSelectTransferCrypto = useCallback4(() => {
+  const isFiatOnrampMode = flowMode === "fiat-onramp";
+  const isExchangeConnectMode = flowMode === "exchange-connect";
+  const handleSelectTransferCrypto = useCallback7(() => {
     storeApi.dispatch({ type: "connect/transfer-crypto-selected" });
   }, [storeApi]);
-  const handleConfirmWallet = useCallback4(
+  const handleConfirmWallet = useCallback7(
     (walletId) => {
       const selectedOption = walletOptions.find((o) => o.id === walletId);
       const mode = enableSolana && selectedOption?.kind === "solana" ? "solana-wallet" : "wallet";
@@ -4842,12 +5867,16 @@ function DepositFlow({
     enableSolana && reownWallet?.isConnected && reownWallet?.isSolana
   );
   const dappImportsKey = dappImports ? Object.keys(dappImports).filter((k) => dappImports[k]).sort().join(",") : "";
-  const enabledDappImportProviders = useMemo6(
+  const enabledDappImportProviders = useMemo7(
     () => isSolanaWalletConnected ? [] : getEnabledProviders(dappImports),
     // eslint-disable-next-line react-hooks/exhaustive-deps -- intentional: keyed on dappImportsKey, not the dappImports object identity
     [dappImportsKey, isSolanaWalletConnected]
   );
-  const handleSelectDappImport = useCallback4(
+  const initialDappImportProvider = useMemo7(
+    () => initialDappImport ? enabledDappImportProviders.find((p) => p.id === initialDappImport) ?? null : null,
+    [initialDappImport, enabledDappImportProviders]
+  );
+  const handleSelectDappImport = useCallback7(
     (providerId) => {
       const owner = dappImportOwner;
       if (owner) {
@@ -4868,13 +5897,16 @@ function DepositFlow({
     },
     [storeApi, walletOptions, dappImportOwner]
   );
-  const handleDappImportAssetSelected = useCallback4(
+  const handleDappImportAssetSelected = useCallback7(
     (asset) => {
       storeApi.dispatch({ type: "dapp-import/asset-selected", asset });
     },
     [storeApi]
   );
-  useEffect8(() => {
+  const dappImportAttemptNonce = useDepositStore(
+    (s) => s.dappImport.attemptNonce
+  );
+  useEffect10(() => {
     if (!dappImportOwner || enabledDappImportProviders.length === 0) {
       storeApi.dispatch({ type: "dapp-import/availability-cleared" });
       return;
@@ -4907,15 +5939,29 @@ function DepositFlow({
       }).catch(() => {
         if (controller.signal.aborted) return;
         storeApi.dispatch({
-          type: "dapp-import/availability-loaded",
+          type: "dapp-import/availability-failed",
           providerId: provider.id,
-          owner: dappImportOwner,
-          availability: null
+          owner: dappImportOwner
         });
       });
     }
     return () => controller.abort();
-  }, [dappImportOwner, enabledDappImportProviders, storeApi]);
+  }, [
+    dappImportOwner,
+    enabledDappImportProviders,
+    dappImportAttemptNonce,
+    storeApi
+  ]);
+  useLayoutEffect2(() => {
+    if (!initialDappImportProvider) return;
+    if (flowSlice.step !== "connect" || flowSlice.mode !== null || flowSlice.isConnectSelectionConfirmed || flowSlice.hasNavigatedBack) {
+      return;
+    }
+    storeApi.dispatch({
+      type: "dapp-import/boot-requested",
+      providerId: initialDappImportProvider.id
+    });
+  }, [initialDappImportProvider, flowSlice, storeApi]);
   const dappImportAvailability = useDepositStore((s) => s.dappImport.availability);
   const dappImportAvailabilityOwner = useDepositStore(
     (s) => s.dappImport.availabilityOwner
@@ -4923,48 +5969,19 @@ function DepositFlow({
   const activeDappImportProviderId = useDepositStore(
     (s) => s.dappImport.activeProviderId
   );
-  const connectStepDappImports = useMemo6(
-    () => enabledDappImportProviders.map((provider) => {
-      const baseRow = {
-        id: provider.id,
-        label: provider.label,
-        icon: provider.icon
-      };
-      if (!dappImportOwner) {
-        return { ...baseRow, status: "needs-connect" };
-      }
-      const availabilityEntry = dappImportAvailabilityOwner?.toLowerCase() === dappImportOwner.toLowerCase() ? dappImportAvailability[provider.id] : void 0;
-      const dappImportSetup = readSetupForOwner(setupSlice, dappImportOwner);
-      if (availabilityEntry === "loading" || availabilityEntry === void 0) {
-        return { ...baseRow, status: "loading" };
-      }
-      if (availabilityEntry === null) {
-        return {
-          ...baseRow,
-          status: { enabled: false, reason: "No balance" }
-        };
-      }
-      if (dappImportSetup.status === "loading" || !dappImportOwner) {
-        return { ...baseRow, status: "loading" };
-      }
-      if (dappImportSetup.status === "error") {
-        return {
-          ...baseRow,
-          status: {
-            enabled: false,
-            reason: "Couldn't prepare account \u2014 tap to retry",
-            retryable: true
-          }
-        };
-      }
-      return {
-        ...baseRow,
-        status: {
-          enabled: true,
-          balanceUsd: availabilityEntry.totalUsd
-        }
-      };
-    }),
+  const dappImportBootError = useDepositStore((s) => s.dappImport.bootError);
+  const connectStepDappImports = useMemo7(
+    () => enabledDappImportProviders.map((provider) => ({
+      id: provider.id,
+      label: provider.label,
+      icon: provider.icon,
+      status: computeDappImportStatus(provider.id, {
+        owner: dappImportOwner,
+        availability: dappImportAvailability,
+        availabilityOwner: dappImportAvailabilityOwner,
+        setup: setupSlice
+      })
+    })),
     [
       enabledDappImportProviders,
       dappImportAvailability,
@@ -4973,19 +5990,19 @@ function DepositFlow({
       dappImportOwner
     ]
   );
-  const activeDappImportProvider = useMemo6(() => {
+  const activeDappImportProvider = useMemo7(() => {
     if (!activeDappImportProviderId) return null;
     return enabledDappImportProviders.find(
       (p) => p.id === activeDappImportProviderId
     ) ?? null;
   }, [activeDappImportProviderId, enabledDappImportProviders]);
-  const activeDappImportAvailability = useMemo6(() => {
+  const activeDappImportAvailability = useMemo7(() => {
     if (!activeDappImportProviderId) return null;
     if (!dappImportOwner || dappImportAvailabilityOwner?.toLowerCase() !== dappImportOwner.toLowerCase()) {
       return null;
     }
     const entry = dappImportAvailability[activeDappImportProviderId];
-    if (!entry || entry === "loading") return null;
+    if (!entry || entry === "loading" || entry === "error") return null;
     return entry;
   }, [
     activeDappImportProviderId,
@@ -4993,7 +6010,118 @@ function DepositFlow({
     dappImportAvailabilityOwner,
     dappImportOwner
   ]);
-  const handleNewDeposit = useCallback4(() => {
+  const isBootResolving = isDappImportMode && flowSlice.step === "dapp-import-resolving";
+  const [hasResolveDeadlinePassed, setHasResolveDeadlinePassed] = useState11(false);
+  useEffect10(() => {
+    setHasResolveDeadlinePassed(false);
+    if (!isBootResolving || dappImportBootError) return;
+    const timeout = window.setTimeout(() => {
+      setHasResolveDeadlinePassed(true);
+    }, DAPP_IMPORT_RESOLVE_TIMEOUT_MS);
+    return () => window.clearTimeout(timeout);
+  }, [isBootResolving, dappImportBootError]);
+  useEffect10(() => {
+    if (!isBootResolving || dappImportBootError) return;
+    const providerId = activeDappImportProviderId;
+    if (!providerId) return;
+    if (!enabledDappImportProviders.some((p) => p.id === providerId)) {
+      storeApi.dispatch({
+        type: "dapp-import/boot-resolved",
+        providerId,
+        outcome: "unavailable"
+      });
+      return;
+    }
+    const status = computeDappImportStatus(providerId, {
+      owner: dappImportOwner,
+      availability: dappImportAvailability,
+      availabilityOwner: dappImportAvailabilityOwner,
+      setup: setupSlice
+    });
+    const pinnableWallet = dappImportOwner ? walletOptions.find(
+      (o) => (o.address ?? null)?.toLowerCase() === dappImportOwner.toLowerCase()
+    ) ?? null : null;
+    const outcome = resolveBootOutcome({
+      status,
+      setupStatus: readSetupForOwner(setupSlice, dappImportOwner).status,
+      timedOut: hasResolveDeadlinePassed,
+      walletHydrating: isDappImportWalletHydrating,
+      signerAvailable: pinnableWallet !== null
+    });
+    if (outcome === "wait") return;
+    if (outcome === "ready" && pinnableWallet) {
+      storeApi.dispatch({
+        type: "wallet/id-selected",
+        walletId: pinnableWallet.id
+      });
+    }
+    storeApi.dispatch({
+      type: "dapp-import/boot-resolved",
+      providerId,
+      outcome
+    });
+  }, [
+    isBootResolving,
+    dappImportBootError,
+    activeDappImportProviderId,
+    enabledDappImportProviders,
+    dappImportOwner,
+    dappImportAvailability,
+    dappImportAvailabilityOwner,
+    setupSlice,
+    hasResolveDeadlinePassed,
+    isDappImportWalletHydrating,
+    walletOptions,
+    storeApi
+  ]);
+  const handleBootRetry = useCallback7(() => {
+    const snapshot = storeApi.getState();
+    const providerId = snapshot.dappImport.activeProviderId;
+    if (!providerId) return;
+    if (dappImportOwner) {
+      const plan = bootRetryPlan({
+        setupStatus: readSetupForOwner(snapshot.setup, dappImportOwner).status,
+        availabilityEntry: snapshot.dappImport.availabilityOwner?.toLowerCase() === dappImportOwner.toLowerCase() ? snapshot.dappImport.availability[providerId] : void 0
+      });
+      if (plan.restartSetup) {
+        storeApi.dispatch({
+          type: "setup/retry-requested",
+          owner: dappImportOwner
+        });
+      }
+      if (plan.refetchAvailability) {
+        storeApi.dispatch({
+          type: "dapp-import/availability-retry-requested"
+        });
+      }
+    }
+    storeApi.dispatch({
+      type: "dapp-import/boot-requested",
+      providerId
+    });
+  }, [storeApi, dappImportOwner]);
+  const handleSelectFiatMethod = useCallback7(
+    (paymentMethod) => {
+      storeApi.dispatch({
+        type: "connect/fiat-onramp-selected",
+        paymentMethod
+      });
+    },
+    [storeApi]
+  );
+  const handleSelectExchange = useCallback7(() => {
+    storeApi.dispatch({ type: "connect/exchange-selected" });
+  }, [storeApi]);
+  const handleSelectExchangeConnection = useCallback7(
+    (connection) => {
+      storeApi.dispatch({
+        type: "exchange/connection-selected",
+        connection
+      });
+    },
+    [storeApi]
+  );
+  const handleNewDeposit = useCallback7(() => {
     onLifecycleRef.current?.({
       type: "smart-account-changed",
       evm: null,
@@ -5004,7 +6132,7 @@ function DepositFlow({
     stableWalletSignerRef.current = null;
     stableWalletSelectionKeyRef.current = null;
   }, [onLifecycleRef, storeApi]);
-  const setupInputBase = useMemo6(
+  const setupInputBase = useMemo7(
     () => ({
       targetChain,
       targetToken,
@@ -5030,7 +6158,7 @@ function DepositFlow({
       enableSolana
     ]
   );
-  const desiredOwnersKey = useMemo6(() => {
+  const desiredOwnersKey = useMemo7(() => {
     const owners = [];
     const seen = /* @__PURE__ */ new Set();
     const push = (addr) => {
@@ -5051,7 +6179,7 @@ function DepositFlow({
     reownWallet?.address,
     dappImportOwner
   ]);
-  useEffect8(() => {
+  useEffect10(() => {
     desiredOwnersKey.forEach((owner) => {
       void (async () => {
         const input = {
@@ -5146,7 +6274,7 @@ function DepositFlow({
     storeApi,
     setupSlice.byOwner
   ]);
-  const handleDepositAddressSubmitted = useCallback4(
+  const handleDepositAddressSubmitted = useCallback7(
     (data) => {
       logFlow("deposit-address:detected", {
         txHash: data.txHash,
@@ -5157,7 +6285,7 @@ function DepositFlow({
     },
     [logFlow, onLifecycleRef]
   );
-  const handleSolanaTokenContinue = useCallback4(
+  const handleSolanaTokenContinue = useCallback7(
     (token, balance, balanceUsd) => {
       logFlow("solana:token:continue", { token: token.symbol });
       storeApi.dispatch({
@@ -5170,7 +6298,7 @@ function DepositFlow({
     },
     [defaultAmount, logFlow, storeApi]
   );
-  const handleSolanaAmountContinue = useCallback4(
+  const handleSolanaAmountContinue = useCallback7(
     (token, sourceAmount, inputAmountUsd) => {
       const targetSym = getTargetTokenSymbol(targetToken, targetChain);
       const isTargetStable = isStablecoinSymbol(targetSym);
@@ -5192,10 +6320,12 @@ function DepositFlow({
     },
     [targetToken, targetChain, getTokenPriceUsd, logFlow, storeApi]
   );
-  const handleSolanaConfirmed = useCallback4(
+  const handleSolanaConfirmed = useCallback7(
     (txHash, amountUnits) => {
-      const tokenAtSubmit = storeApi.getState().deposit.selectedSolanaToken;
+      const depositAtSubmit = storeApi.getState().deposit;
+      const tokenAtSubmit = depositAtSubmit.selectedSolanaToken;
       if (!tokenAtSubmit) return;
+      const amountUsd = depositAtSubmit.inputAmountUsd ?? void 0;
       logFlow("solana:submitted", {
         txHash,
         amountUnits,
@@ -5208,18 +6338,21 @@ function DepositFlow({
         sourceToken: tokenAtSubmit.mint,
         amount: amountUnits,
         sourceSymbol: tokenAtSubmit.symbol,
-        sourceDecimals: tokenAtSubmit.decimals
+        sourceDecimals: tokenAtSubmit.decimals,
+        inputAmountUsd: amountUsd
       });
       onLifecycleRef.current?.({
         type: "submitted",
         txHash,
         sourceChain: "solana",
-        amount: amountUnits
+        amount: amountUnits,
+        sourceDecimals: tokenAtSubmit.decimals,
+        amountUsd
       });
     },
     [logFlow, onLifecycleRef, storeApi]
   );
-  const handleAssetContinue = useCallback4(
+  const handleAssetContinue = useCallback7(
     (asset) => {
       onEventRef.current?.({
         type: "deposit_modal_connected_wallet_select_source_cta_click",
@@ -5237,7 +6370,7 @@ function DepositFlow({
     },
     [defaultAmount, onEventRef, totalBalanceUsd, storeApi]
   );
-  const handleAmountContinue = useCallback4(
+  const handleAmountContinue = useCallback7(
     (amount, targetAmount, balance, liquidityWarning) => {
       const entry = readSetupForOwner(
         storeApi.getState().setup,
@@ -5258,7 +6391,7 @@ function DepositFlow({
     },
     [targetToken, targetChain, getTokenPriceUsd, storeApi, activeOwner]
   );
-  const handleDepositSubmitted = useCallback4(
+  const handleDepositSubmitted = useCallback7(
     (txHash, chainId, amount, token) => {
       logFlow("evm:submitted", {
         txHash,
@@ -5266,7 +6399,8 @@ function DepositFlow({
         sourceToken: token,
         amount
       });
-      const asset = storeApi.getState().deposit.selectedAsset;
+      const depositAtSubmit = storeApi.getState().deposit;
+      const asset = depositAtSubmit.selectedAsset;
       const dappImport = asset && isDappImportAsset(asset) ? asset : null;
       storeApi.dispatch({
         type: "deposit/submitted",
@@ -5274,25 +6408,55 @@ function DepositFlow({
         sourceChain: chainId,
         sourceToken: token,
         amount,
-        sourceSymbol: dappImport?.symbol,
-        sourceDecimals: dappImport?.decimals,
+        sourceSymbol: asset?.symbol,
+        sourceDecimals: asset?.decimals,
+        inputAmountUsd: depositAtSubmit.inputAmountUsd ?? void 0,
         directTransfer: !dappImport && isSameRoute2(chainId, token, targetChain, targetToken)
       });
     },
     [logFlow, storeApi, targetChain, targetToken]
   );
-  const handleDepositSubmittedCallback = useCallback4(
+  const handleSwappedComplete = useCallback7(
+    (info) => {
+      logFlow("swapped:complete", {
+        txHash: info.txHash,
+        orderCrypto: info.orderCrypto
+      });
+      const amount = info.amount ?? "0";
+      storeApi.dispatch({
+        type: "deposit/submitted",
+        txHash: info.txHash,
+        sourceChain: SWAPPED_SOURCE_CHAIN,
+        sourceToken: SWAPPED_SOURCE_TOKEN,
+        amount,
+        sourceSymbol: info.orderCrypto ?? "USDC",
+        sourceDecimals: SWAPPED_SOURCE_DECIMALS
+      });
+      onLifecycleRef.current?.({
+        type: "submitted",
+        txHash: info.txHash,
+        sourceChain: SWAPPED_SOURCE_CHAIN,
+        amount,
+        sourceDecimals: SWAPPED_SOURCE_DECIMALS
+      });
+    },
+    [logFlow, storeApi, onLifecycleRef]
+  );
+  const handleDepositSubmittedCallback = useCallback7(
     (txHash, sourceChain, amount) => {
+      const depositAtSubmit = storeApi.getState().deposit;
       onLifecycleRef.current?.({
         type: "submitted",
         txHash,
         sourceChain,
-        amount
+        amount,
+        sourceDecimals: depositAtSubmit.selectedAsset?.decimals,
+        amountUsd: depositAtSubmit.inputAmountUsd ?? void 0
       });
     },
-    [onLifecycleRef]
+    [onLifecycleRef, storeApi]
   );
-  const handleDepositComplete = useCallback4(
+  const handleDepositComplete = useCallback7(
     (txHash, destinationTxHash, context) => {
       logFlow("deposit:complete", { txHash, destinationTxHash, ...context });
       onLifecycleRef.current?.({
@@ -5304,28 +6468,28 @@ function DepositFlow({
     },
     [logFlow, onLifecycleRef]
   );
-  const handleDepositFailed = useCallback4(
+  const handleDepositFailed = useCallback7(
     (txHash, error) => {
       logFlowError("deposit:failed", error, { txHash });
       onLifecycleRef.current?.({ type: "failed", txHash, error });
     },
     [logFlowError, onLifecycleRef]
   );
-  const handleError = useCallback4(
+  const handleError = useCallback7(
     (message, code) => {
       logFlowError("flow:error", message, { code });
       onErrorRef.current?.({ message, code });
     },
     [logFlowError, onErrorRef]
   );
-  const handleTotalBalanceComputed = useCallback4((total) => {
+  const handleTotalBalanceComputed = useCallback7((total) => {
     setTotalBalanceUsd(total);
   }, []);
-  const walletOptionsKey = useMemo6(
+  const walletOptionsKey = useMemo7(
     () => walletOptions.map((option) => option.id).join(","),
     [walletOptions]
   );
-  useEffect8(() => {
+  useEffect10(() => {
     if (storeApi.getState().flow.mode) {
       return;
     }
@@ -5335,12 +6499,19 @@ function DepositFlow({
       storeApi.dispatch({ type: "flow/step-set", step: "connect" });
     }
   }, [walletOptionsKey]);
-  useEffect8(() => {
-    if (!showConnectStep && isConnectSelectionConfirmed && (flowMode === "wallet" || flowMode === "dapp-import") && !signerContext) {
+  useEffect10(() => {
+    if (!showConnectStep && isConnectSelectionConfirmed && (flowMode === "wallet" || flowMode === "dapp-import") && flowSlice.step !== "dapp-import-resolving" && !signerContext) {
       storeApi.dispatch({ type: "wallet/cleared" });
     }
-  }, [showConnectStep, isConnectSelectionConfirmed, flowMode, signerContext, storeApi]);
-  useEffect8(() => {
+  }, [
+    showConnectStep,
+    isConnectSelectionConfirmed,
+    flowMode,
+    flowSlice.step,
+    signerContext,
+    storeApi
+  ]);
+  useEffect10(() => {
     if (enableSolana || flowMode !== "solana-wallet") {
       return;
     }
@@ -5349,14 +6520,15 @@ function DepositFlow({
       storeApi.dispatch({ type: "flow/step-set", step: "connect" });
     }
   }, [enableSolana, flowMode, storeApi]);
-  useEffect8(() => {
-    if (hasNavigatedBack || isConnectSelectionConfirmed || flowMode) {
+  useEffect10(() => {
+    if (hasNavigatedBack || isConnectSelectionConfirmed || flowMode || enableFiatOnramp || enableExchangeConnect || initialDappImportProvider) {
       return;
     }
-    if (!hasWalletOptions && dappAddress && !hasReownSession && !dappWalletClient && hasQrAutoAdvanceGraceElapsed) {
+    if (enableQrTransfer && !hasWalletOptions && dappAddress && !hasReownSession && !dappWalletClient && hasQrAutoAdvanceGraceElapsed) {
       handleSelectTransferCrypto();
     }
   }, [
+    enableQrTransfer,
     hasWalletOptions,
     hasReownSession,
     hasQrAutoAdvanceGraceElapsed,
@@ -5365,9 +6537,10 @@ function DepositFlow({
     hasNavigatedBack,
     dappAddress,
     dappWalletClient,
+    initialDappImportProvider,
     handleSelectTransferCrypto
   ]);
-  const walletRows = useMemo6(() => {
+  const walletRows = useMemo7(() => {
     return walletOptions.map((option) => {
       const ownerForRow = option.kind === "solana" ? dappAddress : option.address ?? null;
       const entry = readSetupForOwner(setupSlice, ownerForRow ?? null);
@@ -5383,32 +6556,35 @@ function DepositFlow({
       };
     });
   }, [walletOptions, setupSlice, dappAddress]);
-  const transferCryptoEntry = useMemo6(
+  const transferCryptoEntry = useMemo7(
     () => readSetupForOwner(setupSlice, dappAddress),
     [setupSlice, dappAddress]
   );
   const transferCryptoState = transferCryptoEntry.status === "ready" ? "ready" : transferCryptoEntry.status === "error" ? "error" : "loading";
-  const handleRetrySetup = useCallback4(
+  const handleRetrySetup = useCallback7(
     (owner) => {
       storeApi.dispatch({ type: "setup/retry-requested", owner });
     },
     [storeApi]
   );
   if (showConnectStep) {
-    return /* @__PURE__ */ jsx11("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx11(
+    return /* @__PURE__ */ jsx18("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx18(
       ConnectStep,
       {
         walletRows,
         transferCryptoState: dappAddress ? transferCryptoState : void 0,
         transferCryptoErrorReason: dappAddress ? transferCryptoEntry.message ?? void 0 : void 0,
-        onSelectTransferCrypto: dappAddress ? () => {
+        onSelectTransferCrypto: enableQrTransfer && dappAddress ? () => {
           if (transferCryptoState === "error") {
             handleRetrySetup(dappAddress);
             return;
           }
-          if (transferCryptoState !== "ready") return;
           handleSelectTransferCrypto();
         } : void 0,
+        onSelectPayWithCard: enableFiatOnramp && dappAddress && (!fiatOnrampMethods || fiatOnrampMethods.length === 0) ? () => handleSelectFiatMethod() : void 0,
+        fiatPaymentMethods: enableFiatOnramp && dappAddress ? fiatOnrampMethods : void 0,
+        onSelectFiatMethod: enableFiatOnramp && dappAddress ? (method) => handleSelectFiatMethod(method) : void 0,
+        onSelectFundFromExchange: enableExchangeConnect && dappAddress ? () => handleSelectExchange() : void 0,
         onRequestConnect,
         onConnect,
         onDisconnect,
@@ -5426,6 +6602,13 @@ function DepositFlow({
         },
         dappImports: connectStepDappImports,
         onSelectDappImport: (providerId) => {
+          const availabilityEntry = dappImportOwner && dappImportAvailabilityOwner?.toLowerCase() === dappImportOwner.toLowerCase() ? dappImportAvailability[providerId] : void 0;
+          if (availabilityEntry === "error") {
+            storeApi.dispatch({
+              type: "dapp-import/availability-retry-requested"
+            });
+            return;
+          }
           const dappImportEntry = readSetupForOwner(
             setupSlice,
             dappImportOwner
@@ -5442,25 +6625,29 @@ function DepositFlow({
   }
   if (isDepositAddressMode) {
     if (!dappAddress) return null;
-    return /* @__PURE__ */ jsxs11("div", { className: "rs-modal-body", children: [
-      effectiveStep.type === "setup" && /* @__PURE__ */ jsx11(
+    return /* @__PURE__ */ jsxs16("div", { className: "rs-modal-body", children: [
+      effectiveStep.type === "setup" && (activeEntry.status === "error" ? /* @__PURE__ */ jsx18(
         AccountPreparingSkeleton,
         {
-          errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
-          onRetry: activeEntry.status === "error" ? () => handleRetrySetup(dappAddress) : void 0
+          errorMessage: activeEntry.message ?? void 0,
+          onRetry: () => handleRetrySetup(dappAddress)
         }
-      ),
-      effectiveStep.type === "deposit-address" && /* @__PURE__ */ jsx11(
+      ) : /* @__PURE__ */ jsx18(
+        DepositAddressSkeleton,
+        {
+          uiConfig,
+          allowedRoutes
+        }
+      )),
+      effectiveStep.type === "deposit-address" && /* @__PURE__ */ jsx18(
         DepositAddressStep,
         {
           smartAccount: effectiveStep.smartAccount,
           solanaDepositAddress: enableSolana ? effectiveStep.solanaDepositAddress : void 0,
-          isUpdating: activeEntry.status !== "ready",
           service,
           allowedRoutes,
           targetChain,
           targetToken,
-          waitForFinalTx,
           hasPostBridgeActions: Boolean(postBridgeActions?.length),
           uiConfig,
           onDepositSubmitted: handleDepositAddressSubmitted,
@@ -5483,19 +6670,145 @@ function DepositFlow({
       )
     ] });
   }
+  if (isFiatOnrampMode) {
+    if (!dappAddress) return null;
+    return /* @__PURE__ */ jsxs16(
+      "div",
+      {
+        className: "rs-modal-body",
+        "data-flow-mode": "fiat-onramp",
+        "data-step-type": step.type,
+        children: [
+          step.type === "setup" && /* @__PURE__ */ jsx18(
+            AccountPreparingSkeleton,
+            {
+              errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
+              onRetry: activeEntry.status === "error" ? () => handleRetrySetup(dappAddress) : void 0
+            }
+          ),
+          step.type === "fiat-onramp" && /* @__PURE__ */ jsx18(
+            FiatOnrampStep,
+            {
+              smartAccount: step.smartAccount,
+              service,
+              paymentMethod: step.paymentMethod,
+              onSwappedComplete: handleSwappedComplete,
+              onSwappedFailed: handleDepositFailed,
+              onClose: onClose ?? (() => {
+              }),
+              onError: handleError
+            }
+          ),
+          step.type === "processing" && /* @__PURE__ */ jsx18(
+            ProcessingStep,
+            {
+              smartAccount: step.smartAccount,
+              solanaDepositAddress: step.solanaDepositAddress,
+              txHash: step.txHash,
+              sourceChain: step.sourceChain,
+              sourceToken: step.sourceToken,
+              targetChain,
+              targetToken,
+              amount: step.amount,
+              sourceSymbol: step.sourceSymbol,
+              sourceDecimals: step.sourceDecimals,
+              amountUsd: step.inputAmountUsd,
+              hasPostBridgeActions: Boolean(postBridgeActions?.length),
+              service,
+              directTransfer: step.directTransfer,
+              isSwappedOrder: true,
+              onClose,
+              onNewDeposit: handleNewDeposit,
+              onDepositComplete: handleDepositComplete,
+              onDepositFailed: handleDepositFailed,
+              onError: handleError,
+              debug
+            }
+          )
+        ]
+      }
+    );
+  }
+  if (isExchangeConnectMode) {
+    if (!dappAddress) return null;
+    return /* @__PURE__ */ jsxs16(
+      "div",
+      {
+        className: "rs-modal-body",
+        "data-flow-mode": "exchange-connect",
+        "data-step-type": step.type,
+        children: [
+          step.type === "setup" && /* @__PURE__ */ jsx18(
+            AccountPreparingSkeleton,
+            {
+              errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
+              onRetry: activeEntry.status === "error" ? () => handleRetrySetup(dappAddress) : void 0
+            }
+          ),
+          step.type === "exchange-select" && /* @__PURE__ */ jsx18(
+            ExchangeSelectStep,
+            {
+              service,
+              onSelectExchange: handleSelectExchangeConnection,
+              onError: handleError
+            }
+          ),
+          step.type === "exchange-connect" && /* @__PURE__ */ jsx18(
+            ExchangeConnectStep,
+            {
+              smartAccount: step.smartAccount,
+              service,
+              connection: step.connection,
+              onSwappedComplete: handleSwappedComplete,
+              onSwappedFailed: handleDepositFailed,
+              onClose: onClose ?? (() => {
+              }),
+              onError: handleError
+            }
+          ),
+          step.type === "processing" && /* @__PURE__ */ jsx18(
+            ProcessingStep,
+            {
+              smartAccount: step.smartAccount,
+              solanaDepositAddress: step.solanaDepositAddress,
+              txHash: step.txHash,
+              sourceChain: step.sourceChain,
+              sourceToken: step.sourceToken,
+              targetChain,
+              targetToken,
+              amount: step.amount,
+              sourceSymbol: step.sourceSymbol,
+              sourceDecimals: step.sourceDecimals,
+              amountUsd: step.inputAmountUsd,
+              hasPostBridgeActions: Boolean(postBridgeActions?.length),
+              service,
+              directTransfer: step.directTransfer,
+              isSwappedOrder: true,
+              onClose,
+              onNewDeposit: handleNewDeposit,
+              onDepositComplete: handleDepositComplete,
+              onDepositFailed: handleDepositFailed,
+              onError: handleError,
+              debug
+            }
+          )
+        ]
+      }
+    );
+  }
   if (isSolanaWalletMode) {
     if (!dappAddress) return null;
     const solanaAddr = reownWallet?.solanaAddress;
     const solanaProvider = reownWallet?.solanaProvider;
-    return /* @__PURE__ */ jsxs11("div", { className: "rs-modal-body", children: [
-      effectiveStep.type === "setup" && /* @__PURE__ */ jsx11(
+    return /* @__PURE__ */ jsxs16("div", { className: "rs-modal-body", children: [
+      effectiveStep.type === "setup" && /* @__PURE__ */ jsx18(
         AccountPreparingSkeleton,
         {
           errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
           onRetry: activeEntry.status === "error" ? () => handleRetrySetup(dappAddress) : void 0
         }
       ),
-      effectiveStep.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ jsx11(
+      effectiveStep.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ jsx18(
         SolanaTokenSelectStep,
         {
           solanaAddress: solanaAddr,
@@ -5509,7 +6822,7 @@ function DepositFlow({
           debug
         }
       ),
-      effectiveStep.type === "solana-amount" && /* @__PURE__ */ jsx11(
+      effectiveStep.type === "solana-amount" && /* @__PURE__ */ jsx18(
         SolanaAmountStep,
         {
           token: effectiveStep.token,
@@ -5517,6 +6830,7 @@ function DepositFlow({
           balanceUsd: effectiveStep.balanceUsd,
           defaultAmount: effectiveStep.inputAmountUsd,
           uiConfig,
+          targetChain,
           targetChainName: getChainName(targetChain),
           targetTokenSymbol: getTargetTokenSymbol(targetToken, targetChain),
           targetTokenIcon: getTokenIcon(
@@ -5527,7 +6841,7 @@ function DepositFlow({
           debug
         }
       ),
-      effectiveStep.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx11(
+      effectiveStep.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx18(
         SolanaConfirmStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -5548,16 +6862,16 @@ function DepositFlow({
           onError: handleError,
           debug
         }
-      ) : effectiveStep.type === "solana-confirm" ? /* @__PURE__ */ jsxs11("div", { className: "rs-step", children: [
-        /* @__PURE__ */ jsxs11("div", { className: "rs-loading-state", children: [
-          /* @__PURE__ */ jsx11("div", { className: "rs-step-icon rs-step-icon--error", children: /* @__PURE__ */ jsx11(
+      ) : effectiveStep.type === "solana-confirm" ? /* @__PURE__ */ jsxs16("div", { className: "rs-step", children: [
+        /* @__PURE__ */ jsxs16("div", { className: "rs-loading-state", children: [
+          /* @__PURE__ */ jsx18("div", { className: "rs-step-icon rs-step-icon--error", children: /* @__PURE__ */ jsx18(
             "svg",
             {
               viewBox: "0 0 24 24",
               fill: "none",
               stroke: "currentColor",
               strokeWidth: "2",
-              children: /* @__PURE__ */ jsx11(
+              children: /* @__PURE__ */ jsx18(
                 "path",
                 {
                   strokeLinecap: "round",
@@ -5567,22 +6881,22 @@ function DepositFlow({
               )
             }
           ) }),
-          /* @__PURE__ */ jsxs11("div", { className: "rs-loading-text", children: [
-            /* @__PURE__ */ jsx11("div", { className: "rs-loading-title rs-text-error", children: "Wallet disconnected" }),
-            /* @__PURE__ */ jsx11("div", { className: "rs-loading-subtitle", children: "Please reconnect your Solana wallet to continue." })
+          /* @__PURE__ */ jsxs16("div", { className: "rs-loading-text", children: [
+            /* @__PURE__ */ jsx18("div", { className: "rs-loading-title rs-text-error", children: "Wallet disconnected" }),
+            /* @__PURE__ */ jsx18("div", { className: "rs-loading-subtitle", children: "Please reconnect your Solana wallet to continue." })
           ] })
         ] }),
-        /* @__PURE__ */ jsx11("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx11(
+        /* @__PURE__ */ jsx18("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx18(
           "button",
           {
             type: "button",
             className: "rs-button rs-button--default rs-button--full-width",
             onClick: handleBack,
-            children: /* @__PURE__ */ jsx11("span", { children: "Go Back" })
+            children: /* @__PURE__ */ jsx18("span", { children: "Go Back" })
           }
         ) })
       ] }) : null,
-      effectiveStep.type === "processing" && /* @__PURE__ */ jsx11(
+      effectiveStep.type === "processing" && /* @__PURE__ */ jsx18(
         ProcessingStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -5595,7 +6909,7 @@ function DepositFlow({
           amount: effectiveStep.amount,
           sourceSymbol: effectiveStep.sourceSymbol,
           sourceDecimals: effectiveStep.sourceDecimals,
-          waitForFinalTx,
+          amountUsd: effectiveStep.inputAmountUsd,
           hasPostBridgeActions: Boolean(postBridgeActions?.length),
           service,
           directTransfer: effectiveStep.directTransfer,
@@ -5609,8 +6923,26 @@ function DepositFlow({
       )
     ] });
   }
+  if (isDappImportMode && effectiveStep.type === "dapp-import-resolving") {
+    return /* @__PURE__ */ jsx18(
+      "div",
+      {
+        className: "rs-modal-body",
+        "data-flow-mode": "dapp-import",
+        "data-step-type": effectiveStep.type,
+        children: /* @__PURE__ */ jsx18(
+          DappImportAssetSelectSkeleton,
+          {
+            sourceLabel: activeDappImportProvider?.sourceLabel ?? "",
+            error: dappImportBootError,
+            onRetry: handleBootRetry
+          }
+        )
+      }
+    );
+  }
   if (!signerContext?.walletClient || !signerContext?.publicClient) {
-    return /* @__PURE__ */ jsx11("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx11("div", { className: "rs-step", children: /* @__PURE__ */ jsx11("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx11("div", { className: "rs-loading-text", children: /* @__PURE__ */ jsx11("div", { className: "rs-loading-title", children: "Connecting wallet..." }) }) }) }) });
+    return /* @__PURE__ */ jsx18("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx18("div", { className: "rs-step", children: /* @__PURE__ */ jsx18("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx18("div", { className: "rs-loading-text", children: /* @__PURE__ */ jsx18("div", { className: "rs-loading-title", children: "Connecting wallet\u2026" }) }) }) }) });
   }
   const ownerAddress = signerContext.ownerAddress;
   const ownerChainId = signerContext.walletClient?.chain?.id ?? signerContext.publicClient.chain?.id ?? setupChainId;
@@ -5620,15 +6952,15 @@ function DepositFlow({
     }
     return getPublicClient(chainId);
   };
-  return /* @__PURE__ */ jsxs11("div", { className: "rs-modal-body", children: [
-    effectiveStep.type === "setup" && /* @__PURE__ */ jsx11(
+  return /* @__PURE__ */ jsxs16("div", { className: "rs-modal-body", children: [
+    effectiveStep.type === "setup" && /* @__PURE__ */ jsx18(
       AccountPreparingSkeleton,
       {
         errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
         onRetry: activeEntry.status === "error" ? () => handleRetrySetup(ownerAddress) : void 0
       }
     ),
-    effectiveStep.type === "select-asset" && /* @__PURE__ */ jsx11(
+    effectiveStep.type === "select-asset" && /* @__PURE__ */ jsx18(
       AssetSelectStep,
       {
         address: ownerAddress,
@@ -5646,15 +6978,15 @@ function DepositFlow({
         } : void 0
       }
     ),
-    effectiveStep.type === "dapp-import-asset-select" && activeDappImportProvider && activeDappImportAvailability && /* @__PURE__ */ jsx11(
+    effectiveStep.type === "dapp-import-asset-select" && activeDappImportProvider && activeDappImportAvailability && /* @__PURE__ */ jsx18(
       DappImportAssetSelectStep,
       {
-        sourceLabel: activeDappImportAvailability.assets[0]?.sourceLabel ?? activeDappImportProvider.label,
+        sourceLabel: activeDappImportAvailability.assets[0]?.sourceLabel ?? activeDappImportProvider.sourceLabel,
         assets: activeDappImportAvailability.assets,
         onSelect: handleDappImportAssetSelected
       }
     ),
-    effectiveStep.type === "amount" && /* @__PURE__ */ jsx11(
+    effectiveStep.type === "amount" && /* @__PURE__ */ jsx18(
       AmountStep,
       {
         walletClient: signerContext.walletClient,
@@ -5666,7 +6998,7 @@ function DepositFlow({
           chainId: effectiveStep.asset.depositChainId,
           token: effectiveStep.asset.depositToken
         } : void 0,
-        defaultAmount: effectiveStep.amount ?? defaultAmount,
+        defaultAmount: effectiveStep.inputAmountUsd ?? defaultAmount,
         switchChain: signerContext.switchChain,
         targetChain,
         targetToken,
@@ -5686,7 +7018,7 @@ function DepositFlow({
         }
       }
     ),
-    effectiveStep.type === "confirm" && /* @__PURE__ */ jsx11(
+    effectiveStep.type === "confirm" && /* @__PURE__ */ jsx18(
       ConfirmStep,
       {
         walletClient: signerContext.walletClient,
@@ -5703,6 +7035,7 @@ function DepositFlow({
         switchChain: signerContext.switchChain,
         liquidityWarning: effectiveStep.liquidityWarning,
         uiConfig,
+        service,
         executeTransfer: isDappImportMode && activeDappImportProvider && isDappImportAsset(effectiveStep.asset) ? async (amountUnits) => {
           const result = await activeDappImportProvider.executeTransfer(
             {
@@ -5726,7 +7059,7 @@ function DepositFlow({
         onError: handleError
       }
     ),
-    effectiveStep.type === "processing" && /* @__PURE__ */ jsx11(
+    effectiveStep.type === "processing" && /* @__PURE__ */ jsx18(
       ProcessingStep,
       {
         smartAccount: effectiveStep.smartAccount,
@@ -5739,7 +7072,7 @@ function DepositFlow({
         amount: effectiveStep.amount,
         sourceSymbol: effectiveStep.sourceSymbol,
         sourceDecimals: effectiveStep.sourceDecimals,
-        waitForFinalTx,
+        amountUsd: effectiveStep.inputAmountUsd,
         hasPostBridgeActions: Boolean(postBridgeActions?.length),
         service,
         directTransfer: effectiveStep.directTransfer,
@@ -5757,8 +7090,8 @@ function DepositFlow({
 }
 
 // src/components/history/DepositHistoryPanel.tsx
-import { useCallback as useCallback5, useMemo as useMemo7, useState as useState10 } from "react";
-import { jsx as jsx12, jsxs as jsxs12 } from "react/jsx-runtime";
+import { useCallback as useCallback8, useMemo as useMemo8, useState as useState12 } from "react";
+import { jsx as jsx19, jsxs as jsxs17 } from "react/jsx-runtime";
 function shortenHash(hash) {
   if (hash.length <= 14) return hash;
   return `${hash.slice(0, 6)}\u2026${hash.slice(-4)}`;
@@ -5868,7 +7201,7 @@ function DepositHistoryPanel({
   onClose,
   onCloseModal
 }) {
-  const handleKeyDown = useCallback5(
+  const handleKeyDown = useCallback8(
     (e) => {
       if (e.key === "Escape") {
         e.stopPropagation();
@@ -5877,7 +7210,7 @@ function DepositHistoryPanel({
     },
     [onClose]
   );
-  const visibleDeposits = useMemo7(() => {
+  const visibleDeposits = useMemo8(() => {
     const sourceHashes = new Set(
       deposits.map((d) => d.sourceTxHash?.toLowerCase()).filter((h) => Boolean(h))
     );
@@ -5885,7 +7218,7 @@ function DepositHistoryPanel({
       (d) => !(d.txHash && sourceHashes.has(d.txHash.toLowerCase()))
     );
   }, [deposits]);
-  return /* @__PURE__ */ jsxs12(
+  return /* @__PURE__ */ jsxs17(
     "div",
     {
       className: "rs-history-panel",
@@ -5893,55 +7226,55 @@ function DepositHistoryPanel({
       "aria-label": "Deposit history",
       onKeyDown: handleKeyDown,
       children: [
-        /* @__PURE__ */ jsxs12("div", { className: "rs-modal-header--redesigned", children: [
-          /* @__PURE__ */ jsx12("div", { className: "rs-modal-header-nav-left", children: /* @__PURE__ */ jsx12(
+        /* @__PURE__ */ jsxs17("div", { className: "rs-modal-header--redesigned", children: [
+          /* @__PURE__ */ jsx19("div", { className: "rs-modal-header-nav-left", children: /* @__PURE__ */ jsx19(
             "button",
             {
               type: "button",
               className: "rs-modal-header-back",
               "aria-label": "Back",
               onClick: onClose,
-              children: /* @__PURE__ */ jsx12(ChevronLeftIcon, {})
+              children: /* @__PURE__ */ jsx19(ChevronLeftIcon, {})
             }
           ) }),
-          /* @__PURE__ */ jsx12("div", { className: "rs-modal-header-nav-right", children: onCloseModal && /* @__PURE__ */ jsx12(
+          /* @__PURE__ */ jsx19("div", { className: "rs-modal-header-nav-right", children: onCloseModal && /* @__PURE__ */ jsx19(
             "button",
             {
               type: "button",
               className: "rs-modal-close",
               "aria-label": "Close",
               onClick: onCloseModal,
-              children: /* @__PURE__ */ jsx12(CloseIcon, {})
+              children: /* @__PURE__ */ jsx19(CloseIcon, {})
             }
           ) })
         ] }),
-        /* @__PURE__ */ jsxs12("div", { className: "rs-history-screen", children: [
-          /* @__PURE__ */ jsxs12("div", { className: "rs-history-screen-body", children: [
-            /* @__PURE__ */ jsx12(BodyHeader, { icon: /* @__PURE__ */ jsx12(HistoryIcon, {}), title: "History" }),
-            isLoading && deposits.length === 0 && /* @__PURE__ */ jsxs12("div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ jsx12("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx12(HistoryIcon, {}) }),
-              /* @__PURE__ */ jsxs12("div", { className: "rs-history-empty-text", children: [
-                /* @__PURE__ */ jsx12(Spinner, { className: "rs-spinner--sm" }),
-                /* @__PURE__ */ jsx12("span", { className: "rs-history-empty-hint", children: "Loading history\u2026" })
+        /* @__PURE__ */ jsxs17("div", { className: "rs-history-screen", children: [
+          /* @__PURE__ */ jsxs17("div", { className: "rs-history-screen-body", children: [
+            /* @__PURE__ */ jsx19(BodyHeader, { icon: /* @__PURE__ */ jsx19(HistoryIcon, {}), title: "History" }),
+            isLoading && deposits.length === 0 && /* @__PURE__ */ jsxs17("div", { className: "rs-history-empty", children: [
+              /* @__PURE__ */ jsx19("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx19(HistoryIcon, {}) }),
+              /* @__PURE__ */ jsxs17("div", { className: "rs-history-empty-text", children: [
+                /* @__PURE__ */ jsx19(Spinner, { className: "rs-spinner--sm" }),
+                /* @__PURE__ */ jsx19("span", { className: "rs-history-empty-hint", children: "Loading history\u2026" })
               ] })
             ] }),
-            error && !isLoading && /* @__PURE__ */ jsxs12("div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ jsx12("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx12(AlertTriangleIcon, {}) }),
-              /* @__PURE__ */ jsxs12("div", { className: "rs-history-empty-text", children: [
-                /* @__PURE__ */ jsx12("span", { className: "rs-history-empty-title", children: "Couldn't load history" }),
-                /* @__PURE__ */ jsx12("span", { className: "rs-history-empty-hint", children: error })
+            error && !isLoading && /* @__PURE__ */ jsxs17("div", { className: "rs-history-empty", children: [
+              /* @__PURE__ */ jsx19("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx19(AlertTriangleIcon, {}) }),
+              /* @__PURE__ */ jsxs17("div", { className: "rs-history-empty-text", children: [
+                /* @__PURE__ */ jsx19("span", { className: "rs-history-empty-title", children: "Couldn't load history" }),
+                /* @__PURE__ */ jsx19("span", { className: "rs-history-empty-hint", children: error })
               ] })
             ] }),
-            !isLoading && !error && visibleDeposits.length === 0 && /* @__PURE__ */ jsxs12("div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ jsx12("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx12(HistoryIcon, {}) }),
-              /* @__PURE__ */ jsxs12("div", { className: "rs-history-empty-text", children: [
-                /* @__PURE__ */ jsx12("span", { className: "rs-history-empty-title", children: "No deposits yet" }),
-                /* @__PURE__ */ jsx12("span", { className: "rs-history-empty-hint", children: "Your deposit history will appear here" })
+            !isLoading && !error && visibleDeposits.length === 0 && /* @__PURE__ */ jsxs17("div", { className: "rs-history-empty", children: [
+              /* @__PURE__ */ jsx19("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx19(HistoryIcon, {}) }),
+              /* @__PURE__ */ jsxs17("div", { className: "rs-history-empty-text", children: [
+                /* @__PURE__ */ jsx19("span", { className: "rs-history-empty-title", children: "No deposits yet" }),
+                /* @__PURE__ */ jsx19("span", { className: "rs-history-empty-hint", children: "Your deposit history will appear here" })
               ] })
             ] }),
-            visibleDeposits.length > 0 && /* @__PURE__ */ jsxs12("div", { className: "rs-history-list", children: [
-              visibleDeposits.map((deposit, i) => /* @__PURE__ */ jsx12(HistoryCard, { deposit }, deposit.txHash || i)),
-              hasMore && /* @__PURE__ */ jsx12(
+            visibleDeposits.length > 0 && /* @__PURE__ */ jsxs17("div", { className: "rs-history-list", children: [
+              visibleDeposits.map((deposit, i) => /* @__PURE__ */ jsx19(HistoryCard, { deposit }, deposit.txHash || i)),
+              hasMore && /* @__PURE__ */ jsx19(
                 "button",
                 {
                   type: "button",
@@ -5953,14 +7286,14 @@ function DepositHistoryPanel({
               )
             ] })
           ] }),
-          /* @__PURE__ */ jsx12(PoweredBy, {})
+          /* @__PURE__ */ jsx19(PoweredBy, {})
         ] })
       ]
     }
   );
 }
 function HistoryCard({ deposit }) {
-  const [expanded, setExpanded] = useState10(false);
+  const [expanded, setExpanded] = useState12(false);
   const status = normalizeStatus(deposit.status, deposit.isSpam);
   const sourceChainId = resolveChainId(deposit.chain);
   const targetChainId = resolveChainId(deposit.targetChain);
@@ -5979,7 +7312,7 @@ function HistoryCard({ deposit }) {
   const date = deposit.createdAt ? formatDate(deposit.createdAt) : null;
   const txTypeLabel = `Deposit${sourceSymbol ? ` ${sourceSymbol}` : ""}`;
   const srcTxUrl = deposit.sourceTxHash ? getTxExplorerUrl(deposit.sourceTxHash, sourceChainId) : null;
-  return /* @__PURE__ */ jsxs12(
+  return /* @__PURE__ */ jsxs17(
     "button",
     {
       type: "button",
@@ -5987,38 +7320,38 @@ function HistoryCard({ deposit }) {
       onClick: () => setExpanded((v) => !v),
       "aria-expanded": expanded,
       children: [
-        /* @__PURE__ */ jsxs12("div", { className: "rs-history-card-row", children: [
-          /* @__PURE__ */ jsxs12("div", { className: "rs-history-card-icons", children: [
-            /* @__PURE__ */ jsx12("span", { className: "rs-history-card-token", children: sourceTokenIcon ? /* @__PURE__ */ jsx12("img", { src: sourceTokenIcon, alt: "" }) : sourceSymbol.slice(0, 2) }),
-            sourceChainIcon && /* @__PURE__ */ jsx12("span", { className: "rs-history-card-chain", children: /* @__PURE__ */ jsx12("img", { src: sourceChainIcon, alt: "" }) })
+        /* @__PURE__ */ jsxs17("div", { className: "rs-history-card-row", children: [
+          /* @__PURE__ */ jsxs17("div", { className: "rs-history-card-icons", children: [
+            /* @__PURE__ */ jsx19("span", { className: "rs-history-card-token", children: sourceTokenIcon ? /* @__PURE__ */ jsx19("img", { src: sourceTokenIcon, alt: "" }) : sourceSymbol.slice(0, 2) }),
+            sourceChainIcon && /* @__PURE__ */ jsx19("span", { className: "rs-history-card-chain", children: /* @__PURE__ */ jsx19("img", { src: sourceChainIcon, alt: "" }) })
           ] }),
-          /* @__PURE__ */ jsxs12("div", { className: "rs-history-card-text", children: [
-            /* @__PURE__ */ jsx12("span", { className: "rs-history-card-title", children: txTypeLabel }),
-            date && /* @__PURE__ */ jsx12("span", { className: "rs-history-card-date", children: date })
+          /* @__PURE__ */ jsxs17("div", { className: "rs-history-card-text", children: [
+            /* @__PURE__ */ jsx19("span", { className: "rs-history-card-title", children: txTypeLabel }),
+            date && /* @__PURE__ */ jsx19("span", { className: "rs-history-card-date", children: date })
           ] }),
-          /* @__PURE__ */ jsxs12("div", { className: "rs-history-card-side", children: [
-            /* @__PURE__ */ jsx12("span", { className: "rs-history-card-amount", children: displayAmount }),
-            /* @__PURE__ */ jsx12("span", { className: `rs-history-badge rs-history-badge--${status}`, children: STATUS_LABEL[status] })
+          /* @__PURE__ */ jsxs17("div", { className: "rs-history-card-side", children: [
+            /* @__PURE__ */ jsx19("span", { className: "rs-history-card-amount", children: displayAmount }),
+            /* @__PURE__ */ jsx19("span", { className: `rs-history-badge rs-history-badge--${status}`, children: STATUS_LABEL[status] })
           ] })
         ] }),
-        expanded && /* @__PURE__ */ jsxs12("div", { className: "rs-history-card-details", children: [
-          sourceChainName && /* @__PURE__ */ jsxs12("div", { className: "rs-amount-detail-row", children: [
-            /* @__PURE__ */ jsx12("span", { children: "Source chain" }),
-            /* @__PURE__ */ jsxs12("span", { className: "rs-amount-detail-value", children: [
-              /* @__PURE__ */ jsx12("span", { children: sourceChainName }),
-              sourceChainIcon && /* @__PURE__ */ jsx12("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx12("img", { src: sourceChainIcon, alt: "" }) })
+        /* @__PURE__ */ jsx19("div", { className: "rs-history-card-panel", children: /* @__PURE__ */ jsx19("div", { className: "rs-history-card-panel-inner", children: /* @__PURE__ */ jsxs17("div", { className: "rs-history-card-details", children: [
+          sourceChainName && /* @__PURE__ */ jsxs17("div", { className: "rs-amount-detail-row", children: [
+            /* @__PURE__ */ jsx19("span", { children: "Source chain" }),
+            /* @__PURE__ */ jsxs17("span", { className: "rs-amount-detail-value", children: [
+              /* @__PURE__ */ jsx19("span", { children: sourceChainName }),
+              sourceChainIcon && /* @__PURE__ */ jsx19("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx19("img", { src: sourceChainIcon, alt: "" }) })
             ] })
           ] }),
-          targetChainName && /* @__PURE__ */ jsxs12("div", { className: "rs-amount-detail-row", children: [
-            /* @__PURE__ */ jsx12("span", { children: "Destination chain" }),
-            /* @__PURE__ */ jsxs12("span", { className: "rs-amount-detail-value", children: [
-              /* @__PURE__ */ jsx12("span", { children: targetChainName }),
-              targetChainIcon && /* @__PURE__ */ jsx12("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx12("img", { src: targetChainIcon, alt: "" }) })
+          targetChainName && /* @__PURE__ */ jsxs17("div", { className: "rs-amount-detail-row", children: [
+            /* @__PURE__ */ jsx19("span", { children: "Destination chain" }),
+            /* @__PURE__ */ jsxs17("span", { className: "rs-amount-detail-value", children: [
+              /* @__PURE__ */ jsx19("span", { children: targetChainName }),
+              targetChainIcon && /* @__PURE__ */ jsx19("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx19("img", { src: targetChainIcon, alt: "" }) })
             ] })
           ] }),
-          srcTxUrl && deposit.sourceTxHash && /* @__PURE__ */ jsxs12("div", { className: "rs-amount-detail-row", children: [
-            /* @__PURE__ */ jsx12("span", { children: "Transaction details" }),
-            /* @__PURE__ */ jsxs12(
+          srcTxUrl && deposit.sourceTxHash && /* @__PURE__ */ jsxs17("div", { className: "rs-amount-detail-row", children: [
+            /* @__PURE__ */ jsx19("span", { children: "Transaction details" }),
+            /* @__PURE__ */ jsxs17(
               "a",
               {
                 href: srcTxUrl,
@@ -6027,13 +7360,13 @@ function HistoryCard({ deposit }) {
                 className: "rs-history-card-link",
                 onClick: (e) => e.stopPropagation(),
                 children: [
-                  /* @__PURE__ */ jsx12("span", { children: shortenHash(deposit.sourceTxHash) }),
-                  /* @__PURE__ */ jsx12(ArrowUpRightIcon, {})
+                  /* @__PURE__ */ jsx19("span", { children: shortenHash(deposit.sourceTxHash) }),
+                  /* @__PURE__ */ jsx19(ArrowUpRightIcon, {})
                 ]
               }
             )
           ] })
-        ] })
+        ] }) }) })
       ]
     }
   );
@@ -6041,9 +7374,9 @@ function HistoryCard({ deposit }) {
 DepositHistoryPanel.displayName = "DepositHistoryPanel";
 
 // src/DepositModal.tsx
-import { jsx as jsx13, jsxs as jsxs13 } from "react/jsx-runtime";
+import { jsx as jsx20, jsxs as jsxs18 } from "react/jsx-runtime";
 var ReownDepositInner = lazy2(
-  () => import("./DepositModalReown-I7I3KLD2.mjs").then((m) => ({ default: m.DepositModalReown }))
+  () => import("./DepositModalReown-G7UX4IBZ.mjs").then((m) => ({ default: m.DepositModalReown }))
 );
 function sortByCreatedAtDesc(items) {
   return [...items].sort((a, b) => {
@@ -6059,7 +7392,7 @@ function DepositModal(props) {
     "dappWalletClient"
   );
   if (needsReown) {
-    return /* @__PURE__ */ jsx13(Suspense2, { fallback: null, children: /* @__PURE__ */ jsx13(
+    return /* @__PURE__ */ jsx20(Suspense2, { fallback: null, children: /* @__PURE__ */ jsx20(
       ReownDepositInner,
       {
         ...props,
@@ -6067,7 +7400,7 @@ function DepositModal(props) {
       }
     ) });
   }
-  return /* @__PURE__ */ jsx13(
+  return /* @__PURE__ */ jsx20(
     DepositModalInner,
     {
       ...props,
@@ -6097,9 +7430,13 @@ function DepositModalInner({
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
-  waitForFinalTx = true,
   enableSolana = true,
   dappImports,
+  initialDappImport,
+  enableFiatOnramp = false,
+  enableQrTransfer = true,
+  fiatOnrampMethods,
+  enableExchangeConnect = false,
   postBridgeActions,
   outputTokenRules,
   rejectUnmapped,
@@ -6117,61 +7454,86 @@ function DepositModalInner({
   onError,
   debug
 }) {
-  const modalRef = useRef8(null);
+  const modalRef = useRef9(null);
   const onReadyRef = useLatestRef(onReady);
-  const [currentScreen, setCurrentScreen] = useState11("connect");
-  const [backHandler, setBackHandler] = useState11(
+  const [currentScreen, setCurrentScreen] = useState13("connect");
+  const [backHandler, setBackHandler] = useState13(
     void 0
   );
   const showHistoryButton = uiConfig?.showHistoryButton ?? false;
   const historyButtonVisible = showHistoryButton && (currentScreen === "select-asset" || currentScreen === "deposit-address");
-  const [historyOpen, setHistoryOpen] = useState11(false);
-  const [historyDeposits, setHistoryDeposits] = useState11([]);
-  const [hasMoreHistory, setHasMoreHistory] = useState11(false);
-  const [historyLoading, setHistoryLoading] = useState11(false);
-  const [historyLoadingMore, setHistoryLoadingMore] = useState11(false);
-  const [historyError, setHistoryError] = useState11(null);
-  const cursorRef = useRef8(null);
-  const historyStaleRef = useRef8(false);
-  const historyLoadedRef = useRef8(false);
+  const [historyOpen, setHistoryOpen] = useState13(false);
+  const [historyDeposits, setHistoryDeposits] = useState13([]);
+  const [hasMoreHistory, setHasMoreHistory] = useState13(false);
+  const [historyLoading, setHistoryLoading] = useState13(false);
+  const [historyLoadingMore, setHistoryLoadingMore] = useState13(false);
+  const [historyError, setHistoryError] = useState13(null);
+  const cursorRef = useRef9(null);
+  const historyStaleRef = useRef9(false);
+  const historyLoadedRef = useRef9(false);
   const targetChain = targetChainProp === "solana" ? "solana" : getChainId(targetChainProp);
   const sourceChain = sourceChainProp ? getChainId(sourceChainProp) : void 0;
-  const service = useMemo8(
+  const [recipientIsContract, setRecipientIsContract] = useState13(false);
+  const onErrorRef = useLatestRef(onError);
+  useEffect11(() => {
+    if (targetChain !== HYPERCORE_CHAIN_ID || !isAddress(recipient, { strict: false })) {
+      setRecipientIsContract(false);
+      return;
+    }
+    let cancelled = false;
+    getHyperEvmReadClient().getCode({ address: recipient }).then((code) => {
+      if (cancelled) return;
+      const isContract = isContractBytecode(code);
+      setRecipientIsContract(isContract);
+      if (isContract) {
+        onErrorRef.current?.({
+          message: "HyperCore deposits require an EOA recipient; the configured recipient is a smart contract.",
+          code: "HYPERCORE_RECIPIENT_NOT_EOA"
+        });
+      }
+    }).catch(() => {
+      if (!cancelled) setRecipientIsContract(false);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [targetChain, recipient, onErrorRef]);
+  const service = useMemo9(
     () => createDepositService(backendUrl, {
       debug,
       debugScope: "service:deposit"
     }),
     [backendUrl, debug]
   );
-  const store = useMemo8(
+  const store = useMemo9(
     () => createDepositStore({ targetChain, targetToken }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
   );
-  useEffect9(() => {
+  useEffect11(() => {
     store.dispatch({ type: "target/changed", targetChain, targetToken });
   }, [store, targetChain, targetToken]);
-  useEffect9(() => {
+  useEffect11(() => {
     if (isOpen && modalRef.current) {
       applyTheme(modalRef.current, theme);
     }
   }, [isOpen, theme]);
-  useEffect9(() => {
+  useEffect11(() => {
     configureSolanaRpcUrl(solanaRpcUrl);
   }, [solanaRpcUrl]);
-  useEffect9(() => {
+  useEffect11(() => {
     if (isOpen) {
       onReadyRef.current?.();
     }
   }, [isOpen, onReadyRef]);
-  const handleStepChange = useCallback6(
+  const handleStepChange = useCallback9(
     (onBack, screen) => {
       setBackHandler(() => onBack);
       if (screen) setCurrentScreen(screen);
     },
     []
   );
-  const fetchHistory = useCallback6(
+  const fetchHistory = useCallback9(
     async (mode = "initial") => {
       if (!recipient) return;
       const isInitial = mode === "initial";
@@ -6219,26 +7581,26 @@ function DepositModalInner({
     },
     [recipient, service]
   );
-  const handleHistoryOpen = useCallback6(() => {
+  const handleHistoryOpen = useCallback9(() => {
     setHistoryOpen(true);
     if (!historyLoadedRef.current || historyStaleRef.current) {
       fetchHistory("initial");
     }
   }, [fetchHistory]);
-  const handleHistoryClose = useCallback6(() => {
+  const handleHistoryClose = useCallback9(() => {
     setHistoryOpen(false);
   }, []);
-  const handleHistoryLoadMore = useCallback6(() => {
+  const handleHistoryLoadMore = useCallback9(() => {
     fetchHistory("more");
   }, [fetchHistory]);
-  const markHistoryStale = useCallback6(() => {
+  const markHistoryStale = useCallback9(() => {
     historyStaleRef.current = true;
     if (historyOpen) {
       fetchHistory("initial");
     }
   }, [historyOpen, fetchHistory]);
   const onLifecycleRef = useLatestRef(onLifecycle);
-  const handleLifecycle = useCallback6(
+  const handleLifecycle = useCallback9(
     (event) => {
       onLifecycleRef.current?.(event);
       if (event.type === "smart-account-changed" && !event.evm && !event.solana) {
@@ -6250,7 +7612,7 @@ function DepositModalInner({
     },
     [onLifecycleRef, showHistoryButton, markHistoryStale]
   );
-  useEffect9(() => {
+  useEffect11(() => {
     if (!isOpen) {
       setHistoryOpen(false);
       setHistoryDeposits([]);
@@ -6261,14 +7623,14 @@ function DepositModalInner({
       historyLoadedRef.current = false;
     }
   }, [isOpen]);
-  useEffect9(() => {
+  useEffect11(() => {
     if (!isOpen) {
       store.dispatch({ type: "flow/reset" });
     }
   }, [isOpen, store]);
   const showBackButton = uiConfig?.showBackButton ?? true;
   const canGoBack = backHandler !== void 0;
-  return /* @__PURE__ */ jsx13(DepositStoreProvider, { store, children: /* @__PURE__ */ jsx13(
+  return /* @__PURE__ */ jsx20(DepositStoreProvider, { store, children: /* @__PURE__ */ jsx20(
     Modal,
     {
       isOpen,
@@ -6276,20 +7638,20 @@ function DepositModalInner({
       className,
       inline,
       closeOnOverlayClick,
-      children: /* @__PURE__ */ jsxs13("div", { ref: modalRef, className: "rs-modal", children: [
-        /* @__PURE__ */ jsxs13("div", { className: "rs-modal-header--redesigned", children: [
-          /* @__PURE__ */ jsx13("div", { className: "rs-modal-header-nav-left", children: showBackButton && canGoBack && backHandler && /* @__PURE__ */ jsx13(
+      children: /* @__PURE__ */ jsxs18("div", { ref: modalRef, className: "rs-modal", children: [
+        /* @__PURE__ */ jsxs18("div", { className: "rs-modal-header--redesigned", children: [
+          /* @__PURE__ */ jsx20("div", { className: "rs-modal-header-nav-left", children: showBackButton && canGoBack && backHandler && /* @__PURE__ */ jsx20(
             "button",
             {
               type: "button",
               className: "rs-modal-header-back",
               "aria-label": "Go back",
               onClick: backHandler,
-              children: /* @__PURE__ */ jsx13(ChevronLeftIcon, {})
+              children: /* @__PURE__ */ jsx20(ChevronLeftIcon, {})
             }
           ) }),
-          /* @__PURE__ */ jsxs13("div", { className: "rs-modal-header-nav-right", children: [
-            historyButtonVisible && /* @__PURE__ */ jsx13(
+          /* @__PURE__ */ jsxs18("div", { className: "rs-modal-header-nav-right", children: [
+            historyButtonVisible && /* @__PURE__ */ jsx20(
               "button",
               {
                 type: "button",
@@ -6297,22 +7659,22 @@ function DepositModalInner({
                 "aria-label": "Deposit history",
                 onClick: handleHistoryOpen,
                 disabled: !recipient,
-                children: /* @__PURE__ */ jsx13(HistoryIcon, {})
+                children: /* @__PURE__ */ jsx20(HistoryIcon, {})
               }
             ),
-            /* @__PURE__ */ jsx13(
+            /* @__PURE__ */ jsx20(
               "button",
               {
                 type: "button",
                 onClick: onClose,
                 className: "rs-modal-close",
                 "aria-label": "Close",
-                children: /* @__PURE__ */ jsx13(CloseIcon, {})
+                children: /* @__PURE__ */ jsx20(CloseIcon, {})
               }
             )
           ] })
         ] }),
-        /* @__PURE__ */ jsx13(
+        recipientIsContract ? /* @__PURE__ */ jsx20("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx20(Callout, { variant: "error", children: "HyperCore deposits require an EOA recipient. The configured recipient is a smart contract, which is not supported." }) }) : /* @__PURE__ */ jsx20(
           DepositFlow,
           {
             dappWalletClient,
@@ -6333,9 +7695,13 @@ function DepositModalInner({
             signerAddress,
             sessionChainIds,
             forceRegister,
-            waitForFinalTx,
             enableSolana,
             dappImports,
+            initialDappImport,
+            enableFiatOnramp,
+            enableQrTransfer,
+            fiatOnrampMethods,
+            enableExchangeConnect,
             reownWallet,
             onConnect,
             onDisconnect,
@@ -6350,7 +7716,7 @@ function DepositModalInner({
             debug
           }
         ),
-        showHistoryButton && historyOpen && /* @__PURE__ */ jsx13(
+        showHistoryButton && historyOpen && /* @__PURE__ */ jsx20(
           DepositHistoryPanel,
           {
             deposits: historyDeposits,