@rhinestone/deposit-modal 0.3.0-alpha.2 → 0.3.0-alpha.4

package/dist/{chunk-AHSVY7AE.mjs → chunk-BNY4AL7P.mjs}

@@ -12,13 +12,16 @@ import {
   ConnectStep,
   CopyIcon,
   ExternalLinkIcon,
+  HandCoinsIcon,
   HistoryIcon,
   InfoIcon,
+  ListRow,
   Modal,
   PercentIcon,
   PlusCircleIcon,
   PoweredBy,
   ProcessingStep,
+  SAFE_ABI,
   Spinner,
   Tooltip,
   WalletIcon,
@@ -45,7 +48,7 @@ import {
   tokenFormatter,
   txRefsMatch,
   useLatestRef
-} from "./chunk-XKDZEIB7.mjs";
+} from "./chunk-TFXIQ7YH.mjs";
 import {
   DEFAULT_BACKEND_URL,
   DEFAULT_SIGNER_ADDRESS,
@@ -69,210 +72,22 @@ import {
 // src/DepositModal.tsx
 import {
   useMemo as useMemo7,
-  useEffect as useEffect10,
-  useRef as useRef7,
-  useState as useState12,
-  useCallback as useCallback6,
+  useEffect as useEffect9,
+  useRef as useRef6,
+  useState as useState11,
+  useCallback as useCallback5,
   lazy as lazy2,
   Suspense as Suspense2
 } from "react";
 
 // src/DepositFlow.tsx
-import { useState as useState10, useCallback as useCallback4, useMemo as useMemo6, useEffect as useEffect9, useRef as useRef6 } from "react";
-import { formatUnits as formatUnits6 } from "viem";
-
-// src/components/steps/SetupStep.tsx
-import { useState, useEffect, useRef, useCallback } from "react";
-import { jsx, jsxs } from "react/jsx-runtime";
-async function resolveSessionOwner(eoaAddress) {
-  const localOwner = loadSessionOwnerFromStorage(eoaAddress);
-  if (localOwner) {
-    return {
-      account: accountFromPrivateKey(localOwner.privateKey),
-      address: localOwner.address
-    };
-  }
-  const created = createSessionOwnerKey();
-  saveSessionOwnerToStorage(eoaAddress, created.privateKey, created.address);
-  return {
-    account: created.account,
-    address: created.address
-  };
-}
-function SetupStep({
-  walletClient,
-  address,
-  targetChain,
-  targetToken,
-  signerAddress,
-  sessionChainIds,
-  recipient,
-  postBridgeActions,
-  outputTokenRules,
-  rejectUnmapped,
-  forceRegister,
-  enableSolana = true,
-  service,
-  onSetupComplete,
-  onError,
-  onConnected
-}) {
-  const [state, setState] = useState({ type: "idle" });
-  const setupInitiatedRef = useRef(false);
-  const runSetup = useCallback(async () => {
-    if (!address) {
-      return;
-    }
-    if (walletClient && !walletClient.account) {
-      return;
-    }
-    try {
-      setState({ type: "creating-account" });
-      const sessionOwner = await resolveSessionOwner(address);
-      const setup = await service.setupAccount({
-        ownerAddress: address,
-        sessionOwnerAddress: sessionOwner.address,
-        targetChain: toEvmCaip2(targetChain),
-        targetToken,
-        recipient,
-        postBridgeActions,
-        outputTokenRules,
-        rejectUnmapped,
-        signerAddress,
-        sessionChainIds,
-        forceRegister
-      });
-      const smartAccount = setup.smartAccount;
-      if (!setup.needsRegistration) {
-        setState({ type: "ready", smartAccount });
-        onConnected?.(address, smartAccount);
-        onSetupComplete(
-          smartAccount,
-          enableSolana ? setup.solanaDepositAddress : void 0
-        );
-        return;
-      }
-      setState({ type: "signing-session" });
-      if (!setup.accountParams || !setup.sessionDetailsUnsigned) {
-        throw new Error("Missing registration payload from setup-account");
-      }
-      if (!sessionOwner.account.signTypedData) {
-        throw new Error("Session owner account does not support signTypedData");
-      }
-      const typedData = setup.sessionDetailsUnsigned.data;
-      const signature = await sessionOwner.account.signTypedData({
-        domain: typedData.domain,
-        types: typedData.types,
-        primaryType: typedData.primaryType,
-        message: typedData.message
-      });
-      const sessionDetails = buildSessionDetails(setup.sessionDetailsUnsigned, signature);
-      setState({ type: "registering" });
-      const registerResult = await service.registerAccount({
-        address: smartAccount,
-        accountParams: {
-          factory: setup.accountParams.factory,
-          factoryData: setup.accountParams.factoryData,
-          sessionDetails
-        },
-        eoaAddress: address,
-        sessionOwner: sessionOwner.address,
-        target: {
-          chain: toEvmCaip2(targetChain),
-          token: targetToken,
-          ...recipient && { recipient },
-          ...postBridgeActions?.length && { postBridgeActions },
-          ...outputTokenRules?.length && { outputTokenRules },
-          ...rejectUnmapped != null && { rejectUnmapped }
-        }
-      });
-      setState({ type: "ready", smartAccount });
-      onConnected?.(address, smartAccount);
-      onSetupComplete(
-        smartAccount,
-        enableSolana ? registerResult.solanaDepositAddress : void 0
-      );
-    } catch (error) {
-      const message = error instanceof Error ? error.message : "Setup failed";
-      setState({ type: "error", message });
-      onError?.(message, "SETUP_ERROR");
-    }
-  }, [
-    address,
-    walletClient,
-    targetChain,
-    targetToken,
-    signerAddress,
-    sessionChainIds,
-    recipient,
-    postBridgeActions,
-    outputTokenRules,
-    rejectUnmapped,
-    forceRegister,
-    enableSolana,
-    service,
-    onSetupComplete,
-    onError,
-    onConnected
-  ]);
-  useEffect(() => {
-    const hasWallet = walletClient ? Boolean(walletClient.account) : true;
-    if (address && hasWallet && !setupInitiatedRef.current && state.type === "idle") {
-      setupInitiatedRef.current = true;
-      runSetup();
-    }
-  }, [address, walletClient, state.type, runSetup]);
-  const handleRetry = () => {
-    setupInitiatedRef.current = false;
-    setState({ type: "idle" });
-  };
-  const renderStateMessage = () => {
-    switch (state.type) {
-      case "idle":
-        return "Preparing...";
-      case "creating-account":
-        return "Preparing your deposit account...";
-      case "signing-session":
-        return "Authorizing your deposit session...";
-      case "registering":
-        return "Finalizing setup...";
-      case "ready":
-        return "Account ready!";
-      case "error":
-        return state.message;
-    }
-  };
-  const isLoading = state.type === "idle" || state.type === "creating-account" || state.type === "signing-session" || state.type === "registering";
-  const isError = state.type === "error";
-  return /* @__PURE__ */ jsxs("div", { className: "rs-step", children: [
-    /* @__PURE__ */ jsxs("div", { className: "rs-step-body", style: { paddingTop: 0 }, children: [
-      isLoading && /* @__PURE__ */ jsx(
-        BodyHeader,
-        {
-          icon: /* @__PURE__ */ jsx(Spinner, { className: "rs-spinner--sm" }),
-          title: renderStateMessage(),
-          subtitle: "This may take a moment"
-        }
-      ),
-      isError && /* @__PURE__ */ jsx(
-        BodyHeader,
-        {
-          variant: "error",
-          icon: /* @__PURE__ */ jsx(AlertTriangleIcon, {}),
-          title: "Setup failed",
-          subtitle: state.message
-        }
-      )
-    ] }),
-    isError && /* @__PURE__ */ jsx("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx(Button, { onClick: handleRetry, variant: "default", fullWidth: true, children: "Try Again" }) }),
-    /* @__PURE__ */ jsx(PoweredBy, {})
-  ] });
-}
+import { useState as useState9, useCallback as useCallback3, useMemo as useMemo6, useEffect as useEffect8, useRef as useRef5 } from "react";
+import { formatUnits as formatUnits7 } from "viem";
 
 // src/components/steps/AssetSelectStep.tsx
-import { useEffect as useEffect2, useMemo, useState as useState2 } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { formatUnits } from "viem";
-import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
 function AssetSelectStep({
   address,
   publicClient,
@@ -285,10 +100,10 @@ function AssetSelectStep({
   onAssetsLoaded,
   onDisconnect
 }) {
-  const [assets, setAssets] = useState2([]);
-  const [selectedAssetId, setSelectedAssetId] = useState2(null);
-  const [loading, setLoading] = useState2(true);
-  const [error, setError] = useState2(null);
+  const [assets, setAssets] = useState([]);
+  const [selectedAssetId, setSelectedAssetId] = useState(null);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState(null);
   const defaultAssetId = useMemo(() => {
     if (!defaultSourceChain || !defaultSourceToken) return null;
     return getAssetId({
@@ -296,7 +111,7 @@ function AssetSelectStep({
       token: defaultSourceToken
     });
   }, [defaultSourceChain, defaultSourceToken]);
-  useEffect2(() => {
+  useEffect(() => {
     let active = true;
     async function loadPortfolio() {
       if (!address) {
@@ -338,13 +153,13 @@ function AssetSelectStep({
       active = false;
     };
   }, [address, publicClient, service]);
-  useEffect2(() => {
+  useEffect(() => {
     if (!defaultAssetId || selectedAssetId) return;
     if (assets.some((asset) => asset.id === defaultAssetId)) {
       setSelectedAssetId(defaultAssetId);
     }
   }, [assets, defaultAssetId, selectedAssetId]);
-  useEffect2(() => {
+  useEffect(() => {
     const total = assets.reduce(
       (sum, asset) => sum + (asset.balanceUsd ?? 0),
       0
@@ -394,30 +209,30 @@ function AssetSelectStep({
       return asset.balance;
     }
   };
-  return /* @__PURE__ */ jsxs2("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs2("div", { className: "rs-screen-body", children: [
-      /* @__PURE__ */ jsx2(
+  return /* @__PURE__ */ jsxs("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs("div", { className: "rs-screen-body", children: [
+      /* @__PURE__ */ jsx(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx2(WalletIcon, {}),
+          icon: /* @__PURE__ */ jsx(WalletIcon, {}),
           title: "Your assets",
           subtitle: "Select source assets to transfer"
         }
       ),
-      loading && /* @__PURE__ */ jsxs2("div", { className: "rs-loading-state", style: { padding: "40px 12px" }, children: [
-        /* @__PURE__ */ jsx2(Spinner, { className: "rs-text-tertiary" }),
-        /* @__PURE__ */ jsx2("span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
+      loading && /* @__PURE__ */ jsxs("div", { className: "rs-loading-state", style: { padding: "40px 12px" }, children: [
+        /* @__PURE__ */ jsx(Spinner, { className: "rs-text-tertiary" }),
+        /* @__PURE__ */ jsx("span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
       ] }),
-      error && /* @__PURE__ */ jsx2("div", { className: "rs-alert rs-alert--error", children: /* @__PURE__ */ jsx2("span", { className: "rs-alert-text", children: error }) }),
-      !loading && !error && rows.length === 0 && /* @__PURE__ */ jsxs2("div", { className: "rs-empty-state", children: [
-        /* @__PURE__ */ jsx2(WalletIcon, { className: "rs-empty-icon" }),
-        /* @__PURE__ */ jsx2("div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
-        /* @__PURE__ */ jsxs2("div", { className: "rs-empty-address", children: [
+      error && /* @__PURE__ */ jsx("div", { className: "rs-alert rs-alert--error", children: /* @__PURE__ */ jsx("span", { className: "rs-alert-text", children: error }) }),
+      !loading && !error && rows.length === 0 && /* @__PURE__ */ jsxs("div", { className: "rs-empty-state", children: [
+        /* @__PURE__ */ jsx(WalletIcon, { className: "rs-empty-icon" }),
+        /* @__PURE__ */ jsx("div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
+        /* @__PURE__ */ jsxs("div", { className: "rs-empty-address", children: [
           address.slice(0, 6),
           "...",
           address.slice(-4)
         ] }),
-        onDisconnect && /* @__PURE__ */ jsx2(
+        onDisconnect && /* @__PURE__ */ jsx(
           "button",
           {
             type: "button",
@@ -427,13 +242,13 @@ function AssetSelectStep({
           }
         )
       ] }),
-      !loading && !error && rows.length > 0 && /* @__PURE__ */ jsx2("div", { className: "rs-asset-list", children: rows.map((asset) => {
+      !loading && !error && rows.length > 0 && /* @__PURE__ */ jsx("div", { className: "rs-asset-list", children: rows.map((asset) => {
         const isSelected = selectedAssetId === asset.id;
         const tokenAmount = formatBalance(asset);
         const badge = getChainBadge(asset.chainId);
         const tokenIcon = getTokenIcon(asset.symbol);
         const chainIcon = getChainIcon(asset.chainId);
-        return /* @__PURE__ */ jsxs2(
+        return /* @__PURE__ */ jsxs(
           "button",
           {
             type: "button",
@@ -441,16 +256,16 @@ function AssetSelectStep({
             className: `rs-asset-row ${isSelected ? "rs-asset-row--selected" : ""}`,
             "aria-pressed": isSelected,
             children: [
-              /* @__PURE__ */ jsxs2("div", { className: "rs-asset-info", children: [
-                /* @__PURE__ */ jsxs2("div", { className: "rs-asset-icon-wrapper", children: [
-                  tokenIcon ? /* @__PURE__ */ jsx2("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx2("img", { src: tokenIcon, alt: asset.symbol }) }) : /* @__PURE__ */ jsx2("span", { className: "rs-asset-icon", children: asset.symbol.slice(0, 4) }),
-                  chainIcon ? /* @__PURE__ */ jsx2("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx2(
+              /* @__PURE__ */ jsxs("div", { className: "rs-asset-info", children: [
+                /* @__PURE__ */ jsxs("div", { className: "rs-asset-icon-wrapper", children: [
+                  tokenIcon ? /* @__PURE__ */ jsx("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx("img", { src: tokenIcon, alt: asset.symbol }) }) : /* @__PURE__ */ jsx("span", { className: "rs-asset-icon", children: asset.symbol.slice(0, 4) }),
+                  chainIcon ? /* @__PURE__ */ jsx("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx(
                     "img",
                     {
                       src: chainIcon,
                       alt: getChainName(asset.chainId)
                     }
-                  ) }) : /* @__PURE__ */ jsx2(
+                  ) }) : /* @__PURE__ */ jsx(
                     "span",
                     {
                       className: "rs-asset-chain-badge",
@@ -462,28 +277,28 @@ function AssetSelectStep({
                     }
                   )
                 ] }),
-                /* @__PURE__ */ jsxs2("div", { className: "rs-asset-text", children: [
-                  /* @__PURE__ */ jsxs2("div", { className: "rs-asset-name-row", children: [
-                    /* @__PURE__ */ jsx2("span", { className: "rs-asset-name", children: asset.symbol }),
-                    /* @__PURE__ */ jsxs2("span", { className: "rs-asset-chain", children: [
+                /* @__PURE__ */ jsxs("div", { className: "rs-asset-text", children: [
+                  /* @__PURE__ */ jsxs("div", { className: "rs-asset-name-row", children: [
+                    /* @__PURE__ */ jsx("span", { className: "rs-asset-name", children: asset.symbol }),
+                    /* @__PURE__ */ jsxs("span", { className: "rs-asset-chain", children: [
                       "on ",
                       getChainName(asset.chainId)
                     ] })
                   ] }),
-                  /* @__PURE__ */ jsxs2("div", { className: "rs-asset-balance-small", children: [
+                  /* @__PURE__ */ jsxs("div", { className: "rs-asset-balance-small", children: [
                     tokenAmount,
                     " ",
                     asset.symbol
                   ] })
                 ] })
               ] }),
-              /* @__PURE__ */ jsx2("div", { className: "rs-asset-balance", children: asset.balanceUsd !== void 0 && asset.balanceUsd > 0 ? currencyFormatter.format(asset.balanceUsd) : tokenAmount !== "--" ? `${tokenAmount} ${asset.symbol}` : "--" })
+              /* @__PURE__ */ jsx("div", { className: "rs-asset-balance", children: asset.balanceUsd !== void 0 && asset.balanceUsd > 0 ? currencyFormatter.format(asset.balanceUsd) : tokenAmount !== "--" ? `${tokenAmount} ${asset.symbol}` : "--" })
             ]
           },
           asset.id
         );
       }) }),
-      /* @__PURE__ */ jsx2(
+      /* @__PURE__ */ jsx(
         Button,
         {
           onClick: () => selectedAsset && onContinue(selectedAsset),
@@ -493,7 +308,7 @@ function AssetSelectStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx2(PoweredBy, {})
+    /* @__PURE__ */ jsx(PoweredBy, {})
   ] });
 }
 async function fetchNativeAssets(address, publicClient, existing) {
@@ -536,9 +351,9 @@ function mergeAssets(existing, incoming) {
 }
 
 // src/components/steps/AmountStep.tsx
-import { useEffect as useEffect3, useMemo as useMemo2, useRef as useRef2, useState as useState3 } from "react";
+import { useEffect as useEffect2, useMemo as useMemo2, useRef, useState as useState2 } from "react";
 import { erc20Abi, formatUnits as formatUnits2, parseUnits } from "viem";
-import { Fragment, jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
+import { Fragment, jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 var PRESETS = [
   { value: 25, label: "25%" },
   { value: 50, label: "50%" },
@@ -559,6 +374,7 @@ function AmountStep({
   address,
   balanceAddress,
   asset,
+  liquiditySource,
   defaultAmount,
   switchChain,
   targetChain,
@@ -571,11 +387,11 @@ function AmountStep({
   onCtaClick,
   service
 }) {
-  const [amount, setAmount] = useState3("");
-  const [balance, setBalance] = useState3(null);
-  const [error, setError] = useState3(null);
-  const [isCheckingLiquidity, setIsCheckingLiquidity] = useState3(false);
-  const hasAttemptedSwitch = useRef2(false);
+  const [amount, setAmount] = useState2("");
+  const [balance, setBalance] = useState2(null);
+  const [error, setError] = useState2(null);
+  const [isCheckingLiquidity, setIsCheckingLiquidity] = useState2(false);
+  const hasAttemptedSwitch = useRef(false);
   const chainMismatch = Boolean(
     walletClient?.chain?.id && walletClient.chain.id !== asset.chainId
   );
@@ -598,7 +414,7 @@ function AmountStep({
     }
   }, [tokenPriceUsdOverride, asset.balanceUsd, asset.balance, asset.decimals]);
   const hasPricing = tokenPriceUsd !== null;
-  useEffect3(() => {
+  useEffect2(() => {
     let active = true;
     async function fetchBalance() {
       const balanceTarget = balanceAddress ?? address;
@@ -620,7 +436,7 @@ function AmountStep({
       active = false;
     };
   }, [address, balanceAddress, publicClient, asset]);
-  useEffect3(() => {
+  useEffect2(() => {
     if (chainMismatch && switchChain && !hasAttemptedSwitch.current) {
       hasAttemptedSwitch.current = true;
       switchChain(asset.chainId).catch((err) => {
@@ -629,10 +445,10 @@ function AmountStep({
       });
     }
   }, [chainMismatch, switchChain, asset.chainId]);
-  useEffect3(() => {
+  useEffect2(() => {
     hasAttemptedSwitch.current = false;
   }, [asset.chainId]);
-  useEffect3(() => {
+  useEffect2(() => {
     if (defaultAmount && !amount) {
       const parsed = Number(defaultAmount);
       if (Number.isFinite(parsed) && parsed > 0) {
@@ -650,7 +466,7 @@ function AmountStep({
       return null;
     }
   }, [balance, tokenPriceUsd, asset.decimals]);
-  useEffect3(() => {
+  useEffect2(() => {
     onBalanceUsdChange?.(balanceUsd ?? 0);
   }, [balanceUsd, onBalanceUsdChange]);
   const formattedBalance = useMemo2(() => {
@@ -740,8 +556,8 @@ function AmountStep({
     let liquidityWarning;
     try {
       const liquidity = await service.checkLiquidity({
-        sourceChainId: asset.chainId,
-        sourceToken: asset.token,
+        sourceChainId: liquiditySource?.chainId ?? asset.chainId,
+        sourceToken: liquiditySource?.token ?? asset.token,
         destinationChainId: targetChain,
         destinationToken: targetToken,
         amount: amountInUnits.toString()
@@ -776,14 +592,14 @@ function AmountStep({
   const targetChainName = getChainName(targetChain);
   const sourceTokenIcon = getTokenIcon(asset.symbol);
   const targetTokenIcon = getTokenIcon(targetSymbol);
-  return /* @__PURE__ */ jsxs3("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs3("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx3(BodyHeader, { icon: /* @__PURE__ */ jsx3(WalletIcon, {}), title: "Wallet deposit" }),
-      /* @__PURE__ */ jsxs3("div", { className: "rs-amount-section", children: [
-        /* @__PURE__ */ jsxs3("div", { className: "rs-amount-display", children: [
-          /* @__PURE__ */ jsxs3("div", { className: "rs-amount-input-row", children: [
-            /* @__PURE__ */ jsx3("span", { "aria-hidden": "true", children: "$" }),
-            /* @__PURE__ */ jsx3(
+  return /* @__PURE__ */ jsxs2("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs2("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx2(BodyHeader, { icon: /* @__PURE__ */ jsx2(WalletIcon, {}), title: "Wallet deposit" }),
+      /* @__PURE__ */ jsxs2("div", { className: "rs-amount-section", children: [
+        /* @__PURE__ */ jsxs2("div", { className: "rs-amount-display", children: [
+          /* @__PURE__ */ jsxs2("div", { className: "rs-amount-input-row", children: [
+            /* @__PURE__ */ jsx2("span", { "aria-hidden": "true", children: "$" }),
+            /* @__PURE__ */ jsx2(
               "input",
               {
                 type: "text",
@@ -796,25 +612,25 @@ function AmountStep({
               }
             )
           ] }),
-          /* @__PURE__ */ jsxs3("div", { className: "rs-amount-meta", children: [
-            /* @__PURE__ */ jsxs3("span", { className: "rs-amount-meta-balance", children: [
+          /* @__PURE__ */ jsxs2("div", { className: "rs-amount-meta", children: [
+            /* @__PURE__ */ jsxs2("span", { className: "rs-amount-meta-balance", children: [
               formattedBalance,
               " ",
               asset.symbol,
               " available",
-              balanceUsd !== null && /* @__PURE__ */ jsxs3(Fragment, { children: [
+              balanceUsd !== null && /* @__PURE__ */ jsxs2(Fragment, { children: [
                 " (~",
                 currencyFormatter.format(balanceUsd),
                 ")"
               ] })
             ] }),
-            minDepositUsd !== null && /* @__PURE__ */ jsxs3("span", { className: "rs-amount-meta-minimum", children: [
+            minDepositUsd !== null && /* @__PURE__ */ jsxs2("span", { className: "rs-amount-meta-minimum", children: [
               "Min. deposit ",
               currencyFormatter.format(minDepositUsd)
             ] })
           ] })
         ] }),
-        /* @__PURE__ */ jsx3("div", { className: "rs-amount-presets", children: PRESETS.map((preset) => /* @__PURE__ */ jsx3(
+        /* @__PURE__ */ jsx2("div", { className: "rs-amount-presets", children: PRESETS.map((preset) => /* @__PURE__ */ jsx2(
           "button",
           {
             type: "button",
@@ -826,39 +642,39 @@ function AmountStep({
           preset.value
         )) })
       ] }),
-      /* @__PURE__ */ jsxs3("div", { className: "rs-amount-details", children: [
-        /* @__PURE__ */ jsxs3("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx3("span", { children: "You send" }),
-          /* @__PURE__ */ jsxs3("span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ jsxs3("span", { children: [
+      /* @__PURE__ */ jsxs2("div", { className: "rs-amount-details", children: [
+        /* @__PURE__ */ jsxs2("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx2("span", { children: "You send" }),
+          /* @__PURE__ */ jsxs2("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsxs2("span", { children: [
               sourceChainName,
               " ",
               asset.symbol
             ] }),
-            sourceTokenIcon && /* @__PURE__ */ jsx3("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx3("img", { src: sourceTokenIcon, alt: "" }) })
+            sourceTokenIcon && /* @__PURE__ */ jsx2("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx2("img", { src: sourceTokenIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs3("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx3("span", { children: "Receive" }),
-          /* @__PURE__ */ jsxs3("span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ jsxs3("span", { children: [
+        /* @__PURE__ */ jsxs2("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx2("span", { children: "Receive" }),
+          /* @__PURE__ */ jsxs2("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsxs2("span", { children: [
               targetChainName,
               " ",
               targetSymbol
             ] }),
-            targetTokenIcon && /* @__PURE__ */ jsx3("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx3("img", { src: targetTokenIcon, alt: "" }) })
+            targetTokenIcon && /* @__PURE__ */ jsx2("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx2("img", { src: targetTokenIcon, alt: "" }) })
           ] })
         ] }),
-        balanceAfterUsd !== null && /* @__PURE__ */ jsxs3("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx3("span", { children: "Balance after deposit" }),
-          /* @__PURE__ */ jsx3("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
+        balanceAfterUsd !== null && /* @__PURE__ */ jsxs2("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx2("span", { children: "Balance after deposit" }),
+          /* @__PURE__ */ jsx2("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
         ] })
       ] }),
-      error && /* @__PURE__ */ jsxs3("div", { className: "rs-amount-error", role: "alert", children: [
-        /* @__PURE__ */ jsx3(AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
-        /* @__PURE__ */ jsx3("span", { children: error })
+      error && /* @__PURE__ */ jsxs2("div", { className: "rs-amount-error", role: "alert", children: [
+        /* @__PURE__ */ jsx2(AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
+        /* @__PURE__ */ jsx2("span", { children: error })
       ] }),
-      /* @__PURE__ */ jsx3(
+      /* @__PURE__ */ jsx2(
         Button,
         {
           onClick: handleContinue,
@@ -868,14 +684,21 @@ function AmountStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx3(PoweredBy, {})
+    /* @__PURE__ */ jsx2(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/ConfirmStep.tsx
-import { useEffect as useEffect4, useRef as useRef3, useState as useState4 } from "react";
+import { useEffect as useEffect3, useRef as useRef2, useState as useState3 } from "react";
 import { erc20Abi as erc20Abi2, parseUnits as parseUnits2 } from "viem";
-import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
+
+// src/core/dapp-imports/types.ts
+function isDappImportAsset(asset) {
+  return typeof asset.source === "string" && typeof asset.sourceLabel === "string" && "providerMetadata" in asset;
+}
+
+// src/components/steps/ConfirmStep.tsx
+import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 function ConfirmStep({
   walletClient,
   address,
@@ -896,11 +719,12 @@ function ConfirmStep({
   quotedFeeSymbol,
   onConfirm,
   onError,
-  onDepositSubmitted
+  onDepositSubmitted,
+  executeTransfer
 }) {
-  const [isSubmitting, setIsSubmitting] = useState4(false);
-  const [error, setError] = useState4(null);
-  const hasAttemptedSwitch = useRef3(false);
+  const [isSubmitting, setIsSubmitting] = useState3(false);
+  const [error, setError] = useState3(null);
+  const hasAttemptedSwitch = useRef2(false);
   const chainMismatch = Boolean(
     walletClient?.chain?.id && walletClient.chain.id !== asset.chainId
   );
@@ -925,10 +749,9 @@ function ConfirmStep({
     return formattedSendAmount;
   })();
   const receiveAmount = sameRoute ? formattedReceiveAmount : `~${formattedReceiveAmount}`;
-  const feeSymbol = quotedFeeSymbol ?? asset.symbol;
   const feeSponsored = uiConfig?.feeSponsored ?? false;
   const feeTooltip = uiConfig?.feeTooltip ?? (feeSponsored ? "Network fees are sponsored for this deposit." : "Network fees apply.");
-  useEffect4(() => {
+  useEffect3(() => {
     if (chainMismatch && switchChain && !hasAttemptedSwitch.current) {
       hasAttemptedSwitch.current = true;
       switchChain(asset.chainId).catch((err) => {
@@ -937,7 +760,7 @@ function ConfirmStep({
       });
     }
   }, [chainMismatch, switchChain, asset.chainId]);
-  useEffect4(() => {
+  useEffect3(() => {
     hasAttemptedSwitch.current = false;
   }, [asset.chainId]);
   const handleConfirm = async () => {
@@ -974,21 +797,31 @@ function ConfirmStep({
         throw new Error("Wallet not properly connected");
       }
       const transferTo = sameRoute ? recipient : smartAccount;
-      const hash = isNativeAsset(asset) ? await walletClient.sendTransaction({
-        account,
-        chain,
-        to: transferTo,
-        value: amountUnits
-      }) : await walletClient.writeContract({
-        account,
-        chain,
-        address: asset.token,
-        abi: erc20Abi2,
-        functionName: "transfer",
-        args: [transferTo, amountUnits]
-      });
+      let hash;
+      let resolvedSourceToken = asset.token;
+      if (executeTransfer) {
+        const result = await executeTransfer(amountUnits);
+        hash = result.txHash;
+        resolvedSourceToken = result.sourceToken;
+      } else if (isNativeAsset(asset)) {
+        hash = await walletClient.sendTransaction({
+          account,
+          chain,
+          to: transferTo,
+          value: amountUnits
+        });
+      } else {
+        hash = await walletClient.writeContract({
+          account,
+          chain,
+          address: asset.token,
+          abi: erc20Abi2,
+          functionName: "transfer",
+          args: [transferTo, amountUnits]
+        });
+      }
       onDepositSubmitted?.(hash, asset.chainId, amountUnits.toString());
-      onConfirm(hash, asset.chainId, amountUnits.toString(), asset.token);
+      onConfirm(hash, asset.chainId, amountUnits.toString(), resolvedSourceToken);
     } catch (err) {
       const raw = err instanceof Error ? err.message : "Transfer failed";
       const message = formatUserError(raw);
@@ -998,77 +831,83 @@ function ConfirmStep({
       setIsSubmitting(false);
     }
   };
-  return /* @__PURE__ */ jsxs4("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs4("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx4(BodyHeader, { icon: /* @__PURE__ */ jsx4(WalletIcon, {}), title: "Review deposit" }),
-      /* @__PURE__ */ jsxs4("div", { className: "rs-amount-details", children: [
-        /* @__PURE__ */ jsxs4("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx4("span", { children: "Source chain" }),
-          /* @__PURE__ */ jsxs4("span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ jsx4("span", { children: sourceChainName }),
-            sourceChainIcon && /* @__PURE__ */ jsx4("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx4("img", { src: sourceChainIcon, alt: "" }) })
+  return /* @__PURE__ */ jsxs3("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs3("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx3(BodyHeader, { icon: /* @__PURE__ */ jsx3(WalletIcon, {}), title: "Review deposit" }),
+      /* @__PURE__ */ jsxs3("div", { className: "rs-amount-details", children: [
+        /* @__PURE__ */ jsxs3("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx3("span", { children: "Source chain" }),
+          /* @__PURE__ */ jsxs3("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsx3("span", { children: sourceChainName }),
+            sourceChainIcon && /* @__PURE__ */ jsx3("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx3("img", { src: sourceChainIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs4("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx4("span", { children: "Destination chain" }),
-          /* @__PURE__ */ jsxs4("span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ jsx4("span", { children: targetChainName }),
-            targetChainIcon && /* @__PURE__ */ jsx4("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx4("img", { src: targetChainIcon, alt: "" }) })
+        /* @__PURE__ */ jsxs3("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx3("span", { children: "Destination chain" }),
+          /* @__PURE__ */ jsxs3("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsx3("span", { children: targetChainName }),
+            targetChainIcon && /* @__PURE__ */ jsx3("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx3("img", { src: targetChainIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs4("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx4("span", { children: "Estimated time" }),
-          /* @__PURE__ */ jsx4("span", { className: "rs-amount-detail-value", children: estimatedTime })
+        /* @__PURE__ */ jsxs3("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx3("span", { children: "Estimated time" }),
+          /* @__PURE__ */ jsx3("span", { className: "rs-amount-detail-value", children: estimatedTime })
         ] }),
-        /* @__PURE__ */ jsxs4("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx4("span", { children: "You send" }),
-          /* @__PURE__ */ jsxs4("span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ jsxs4("span", { children: [
+        /* @__PURE__ */ jsxs3("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx3("span", { children: "You send" }),
+          /* @__PURE__ */ jsxs3("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsxs3("span", { children: [
               formattedSendAmount,
               " ",
               asset.symbol
             ] }),
-            sourceTokenIcon && /* @__PURE__ */ jsx4("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx4("img", { src: sourceTokenIcon, alt: "" }) })
+            sourceTokenIcon && /* @__PURE__ */ jsx3("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx3("img", { src: sourceTokenIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs4("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx4("span", { children: "Receive" }),
-          /* @__PURE__ */ jsxs4("span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ jsxs4("span", { children: [
+        /* @__PURE__ */ jsxs3("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx3("span", { children: "Receive" }),
+          /* @__PURE__ */ jsxs3("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsxs3("span", { children: [
               receiveAmount,
               " ",
               targetSymbol
             ] }),
-            targetTokenIcon && /* @__PURE__ */ jsx4("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx4("img", { src: targetTokenIcon, alt: "" }) })
+            targetTokenIcon && /* @__PURE__ */ jsx3("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx3("img", { src: targetTokenIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs4("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx4("span", { children: "Fees" }),
-          /* @__PURE__ */ jsxs4("span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ jsxs4(
+        /* @__PURE__ */ jsxs3("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx3("span", { children: "Fees" }),
+          /* @__PURE__ */ jsxs3("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsx3(
               "span",
               {
                 style: feeSponsored ? { textDecoration: "line-through" } : void 0,
-                children: [
-                  quotedFeeAmount,
-                  " ",
-                  feeSymbol
-                ]
+                children: "$0.05"
               }
             ),
-            /* @__PURE__ */ jsx4(Tooltip, { content: feeTooltip, children: /* @__PURE__ */ jsx4("span", { className: "rs-amount-detail-info", "aria-label": "Fee info", children: /* @__PURE__ */ jsx4(InfoIcon, {}) }) })
+            /* @__PURE__ */ jsx3(Tooltip, { content: feeTooltip, children: /* @__PURE__ */ jsx3("span", { className: "rs-amount-detail-info", "aria-label": "Fee info", children: /* @__PURE__ */ jsx3(InfoIcon, {}) }) })
           ] })
         ] })
       ] }),
-      liquidityWarning && (liquidityWarning.kind === "unavailable" || liquidityWarning.kind === "check-failed") && /* @__PURE__ */ jsxs4("div", { className: "rs-amount-error", role: "status", children: [
-        /* @__PURE__ */ jsx4(AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
-        /* @__PURE__ */ jsx4("span", { children: liquidityWarning.kind === "unavailable" ? "Route may be unavailable" : "Liquidity check failed" })
-      ] }),
-      error && /* @__PURE__ */ jsxs4("div", { className: "rs-amount-error", role: "alert", children: [
-        /* @__PURE__ */ jsx4(AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
-        /* @__PURE__ */ jsx4("span", { children: error })
+      liquidityWarning && (liquidityWarning.kind === "unavailable" || liquidityWarning.kind === "check-failed") && (isDappImportAsset(asset) ? (
+        // Dapp-import sources route through an unwrap before the
+        // orchestrator sees funds; the upstream route check often
+        // returns "unavailable" for the source token even though the
+        // post-unwrap route works. Surface as a soft warning rather
+        // than a red blocker until the orchestrator handles it.
+        /* @__PURE__ */ jsxs3("div", { className: "rs-amount-error rs-amount-error--warning", role: "status", children: [
+          /* @__PURE__ */ jsx3(AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
+          /* @__PURE__ */ jsx3("span", { children: "Low liquidity detected \u2014 deposit may take longer" })
+        ] })
+      ) : /* @__PURE__ */ jsxs3("div", { className: "rs-amount-error", role: "status", children: [
+        /* @__PURE__ */ jsx3(AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
+        /* @__PURE__ */ jsx3("span", { children: liquidityWarning.kind === "unavailable" ? "Route may be unavailable" : "Liquidity check failed" })
+      ] })),
+      error && /* @__PURE__ */ jsxs3("div", { className: "rs-amount-error", role: "alert", children: [
+        /* @__PURE__ */ jsx3(AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
+        /* @__PURE__ */ jsx3("span", { children: error })
       ] }),
-      /* @__PURE__ */ jsx4(
+      /* @__PURE__ */ jsx3(
         Button,
         {
           onClick: handleConfirm,
@@ -1080,16 +919,16 @@ function ConfirmStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx4(PoweredBy, {})
+    /* @__PURE__ */ jsx3(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/DepositAddressStep.tsx
 import {
-  useState as useState6,
-  useEffect as useEffect6,
-  useCallback as useCallback3,
-  useRef as useRef5,
+  useState as useState5,
+  useEffect as useEffect5,
+  useCallback as useCallback2,
+  useRef as useRef4,
   useMemo as useMemo3,
   lazy,
   Suspense
@@ -1097,8 +936,8 @@ import {
 import { formatUnits as formatUnits3 } from "viem";
 
 // src/components/ui/DepositNotification.tsx
-import { useState as useState5, useEffect as useEffect5, useRef as useRef4, useCallback as useCallback2 } from "react";
-import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
+import { useState as useState4, useEffect as useEffect4, useRef as useRef3, useCallback } from "react";
+import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
 var INITIAL_POLL_INTERVAL = 3e3;
 var MAX_POLL_INTERVAL = 3e4;
 var BACKOFF_MULTIPLIER = 1.5;
@@ -1155,7 +994,7 @@ function formatBridgeFailedMessage(event) {
   }
   return "Bridge failed";
 }
-var txLinkIcon = /* @__PURE__ */ jsx5(ExternalLinkIcon, { className: "rs-deposit-notification-link-icon" });
+var txLinkIcon = /* @__PURE__ */ jsx4(ExternalLinkIcon, { className: "rs-deposit-notification-link-icon" });
 function DepositNotification({
   deposit,
   smartAccount,
@@ -1170,19 +1009,19 @@ function DepositNotification({
   onDismiss
 }) {
   const { txHash, sourceChain, amount, token, detectedAt, directTransfer } = deposit;
-  const [status, setStatus] = useState5(
+  const [status, setStatus] = useState4(
     directTransfer ? "complete" : "processing"
   );
-  const [expanded, setExpanded] = useState5(false);
-  const [completedAt, setCompletedAt] = useState5(
+  const [expanded, setExpanded] = useState4(false);
+  const [completedAt, setCompletedAt] = useState4(
     directTransfer ? detectedAt : null
   );
-  const [destinationTxHash, setDestinationTxHash] = useState5(
+  const [destinationTxHash, setDestinationTxHash] = useState4(
     null
   );
-  const pollIntervalRef = useRef4(INITIAL_POLL_INTERVAL);
-  const pollTimeoutRef = useRef4(null);
-  const completedRef = useRef4(directTransfer ?? false);
+  const pollIntervalRef = useRef3(INITIAL_POLL_INTERVAL);
+  const pollTimeoutRef = useRef3(null);
+  const completedRef = useRef3(directTransfer ?? false);
   const depositContextRef = useLatestRef({
     amount,
     sourceChain,
@@ -1194,7 +1033,7 @@ function DepositNotification({
   });
   const onCompleteRef = useLatestRef(onComplete);
   const onFailedRef = useLatestRef(onFailed);
-  const handleComplete = useCallback2(
+  const handleComplete = useCallback(
     (destTxHash) => {
       if (completedRef.current) return;
       completedRef.current = true;
@@ -1212,7 +1051,7 @@ function DepositNotification({
     },
     [depositContextRef, onCompleteRef, txHash]
   );
-  const handleFailed = useCallback2(
+  const handleFailed = useCallback(
     (error) => {
       if (completedRef.current) return;
       completedRef.current = true;
@@ -1221,7 +1060,7 @@ function DepositNotification({
     },
     [onFailedRef, txHash]
   );
-  useEffect5(() => {
+  useEffect4(() => {
     if (directTransfer) {
       handleComplete(void 0);
       return;
@@ -1301,33 +1140,33 @@ 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, {}) });
-  return /* @__PURE__ */ jsxs5(
+  const statusIcon = status === "complete" ? /* @__PURE__ */ jsx4("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--complete", children: /* @__PURE__ */ jsx4(CheckIcon, {}) }) : status === "failed" ? /* @__PURE__ */ jsx4("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--failed", children: /* @__PURE__ */ jsx4(CloseIcon, {}) }) : /* @__PURE__ */ jsx4("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--processing", children: /* @__PURE__ */ jsx4(Spinner, {}) });
+  return /* @__PURE__ */ jsxs4(
     "div",
     {
       className: `rs-deposit-notification rs-deposit-notification--${status}`,
       children: [
-        /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-header", children: [
-          /* @__PURE__ */ jsx5("div", { className: "rs-deposit-notification-icon", children: statusIcon }),
-          /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-content", children: [
-            /* @__PURE__ */ jsx5("div", { className: "rs-deposit-notification-title", children: title }),
-            /* @__PURE__ */ jsx5("div", { className: "rs-deposit-notification-subtitle", children: subtitle })
+        /* @__PURE__ */ jsxs4("div", { className: "rs-deposit-notification-header", children: [
+          /* @__PURE__ */ jsx4("div", { className: "rs-deposit-notification-icon", children: statusIcon }),
+          /* @__PURE__ */ jsxs4("div", { className: "rs-deposit-notification-content", children: [
+            /* @__PURE__ */ jsx4("div", { className: "rs-deposit-notification-title", children: title }),
+            /* @__PURE__ */ jsx4("div", { className: "rs-deposit-notification-subtitle", children: subtitle })
           ] }),
-          /* @__PURE__ */ jsx5(
+          /* @__PURE__ */ jsx4(
             "button",
             {
               type: "button",
               className: "rs-deposit-notification-close",
               onClick: () => onDismiss(deposit.id),
               "aria-label": "Dismiss",
-              children: /* @__PURE__ */ jsx5(CloseIcon, {})
+              children: /* @__PURE__ */ jsx4(CloseIcon, {})
             }
           )
         ] }),
-        expanded && /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-details", children: [
-          /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-row", children: [
-            /* @__PURE__ */ jsx5("span", { className: "rs-deposit-notification-label", children: "Deposit tx" }),
-            /* @__PURE__ */ jsx5("span", { className: "rs-deposit-notification-value", children: sourceExplorerUrl ? /* @__PURE__ */ jsxs5(
+        expanded && /* @__PURE__ */ jsxs4("div", { className: "rs-deposit-notification-details", children: [
+          /* @__PURE__ */ jsxs4("div", { className: "rs-deposit-notification-row", children: [
+            /* @__PURE__ */ jsx4("span", { className: "rs-deposit-notification-label", children: "Deposit tx" }),
+            /* @__PURE__ */ jsx4("span", { className: "rs-deposit-notification-value", children: sourceExplorerUrl ? /* @__PURE__ */ jsxs4(
               "a",
               {
                 href: sourceExplorerUrl,
@@ -1341,9 +1180,9 @@ function DepositNotification({
               }
             ) : truncateHash(txHash) })
           ] }),
-          destinationTxHash && /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-row", children: [
-            /* @__PURE__ */ jsx5("span", { className: "rs-deposit-notification-label", children: "Completion tx" }),
-            /* @__PURE__ */ jsx5("span", { className: "rs-deposit-notification-value", children: destExplorerUrl ? /* @__PURE__ */ jsxs5(
+          destinationTxHash && /* @__PURE__ */ jsxs4("div", { className: "rs-deposit-notification-row", children: [
+            /* @__PURE__ */ jsx4("span", { className: "rs-deposit-notification-label", children: "Completion tx" }),
+            /* @__PURE__ */ jsx4("span", { className: "rs-deposit-notification-value", children: destExplorerUrl ? /* @__PURE__ */ jsxs4(
               "a",
               {
                 href: destExplorerUrl,
@@ -1357,16 +1196,16 @@ function DepositNotification({
               }
             ) : truncateHash(destinationTxHash) })
           ] }),
-          /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-row", children: [
-            /* @__PURE__ */ jsx5("span", { className: "rs-deposit-notification-label", children: "Order submitted" }),
-            /* @__PURE__ */ jsx5("span", { className: "rs-deposit-notification-value", children: formatTimestamp(detectedAt) })
+          /* @__PURE__ */ jsxs4("div", { className: "rs-deposit-notification-row", children: [
+            /* @__PURE__ */ jsx4("span", { className: "rs-deposit-notification-label", children: "Order submitted" }),
+            /* @__PURE__ */ jsx4("span", { className: "rs-deposit-notification-value", children: formatTimestamp(detectedAt) })
           ] }),
-          completedAt && /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-row", children: [
-            /* @__PURE__ */ jsx5("span", { className: "rs-deposit-notification-label", children: "Order filled" }),
-            /* @__PURE__ */ jsx5("span", { className: "rs-deposit-notification-value", children: formatTimestamp(completedAt) })
+          completedAt && /* @__PURE__ */ jsxs4("div", { className: "rs-deposit-notification-row", children: [
+            /* @__PURE__ */ jsx4("span", { className: "rs-deposit-notification-label", children: "Order filled" }),
+            /* @__PURE__ */ jsx4("span", { className: "rs-deposit-notification-value", children: formatTimestamp(completedAt) })
           ] })
         ] }),
-        /* @__PURE__ */ jsx5(
+        /* @__PURE__ */ jsx4(
           "button",
           {
             type: "button",
@@ -1498,7 +1337,7 @@ async function sendSolanaTransaction(provider, _connection, transaction) {
 }
 
 // src/components/steps/DepositAddressStep.tsx
-import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
+import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
 var QRCode = lazy(
   () => import("./QRCode-YMQTKSSK.mjs").then((m) => ({ default: m.QRCode }))
 );
@@ -1590,6 +1429,7 @@ function DepositAddressStep({
   onDepositComplete,
   onDepositFailed,
   onCopyAddress,
+  onRequestWalletPicker,
   onError
 }) {
   const hasSolana = Boolean(solanaDepositAddress);
@@ -1613,37 +1453,37 @@ function DepositAddressStep({
   }, [evmChainIds, hasSolana]);
   const BASE_CHAIN_ID = 8453;
   const defaultChainId = evmChainIds.includes(BASE_CHAIN_ID) ? BASE_CHAIN_ID : evmChainIds[0];
-  const [sourceChainId, setSourceChainId] = useState6(defaultChainId);
+  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 [sourceTokenSymbol, setSourceTokenSymbol] = useState6(defaultToken);
-  useEffect6(() => {
+  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] = useState6(false);
-  const [pollingError, setPollingError] = useState6(null);
-  const [chainDropdownOpen, setChainDropdownOpen] = useState6(false);
-  const [tokenDropdownOpen, setTokenDropdownOpen] = useState6(false);
-  const [priceImpactExpanded, setPriceImpactExpanded] = useState6(false);
-  const chainDropdownRef = useRef5(null);
-  const tokenDropdownRef = useRef5(null);
-  const [notifications, setNotifications] = useState6([]);
-  const isTrackingRef = useRef5(false);
-  const baselineTxHashRef = useRef5(void 0);
-  const notificationIdRef = useRef5(0);
-  const sourceSelectionRef = useRef5({
+  const [copied, setCopied] = useState5(false);
+  const [pollingError, setPollingError] = useState5(null);
+  const [chainDropdownOpen, setChainDropdownOpen] = useState5(false);
+  const [tokenDropdownOpen, setTokenDropdownOpen] = useState5(false);
+  const [priceImpactExpanded, setPriceImpactExpanded] = useState5(false);
+  const chainDropdownRef = useRef4(null);
+  const tokenDropdownRef = useRef4(null);
+  const [notifications, setNotifications] = useState5([]);
+  const isTrackingRef = useRef4(false);
+  const baselineTxHashRef = useRef4(void 0);
+  const notificationIdRef = useRef4(0);
+  const sourceSelectionRef = useRef4({
     chainId: defaultChainId,
     token: typeof defaultChainId === "number" ? getTokenAddress(defaultToken, defaultChainId) : void 0,
     sourceSymbol: defaultToken
   });
-  useEffect6(() => {
+  useEffect5(() => {
     if (isSolana) {
       const matched = SOLANA_TOKENS.find((t) => t.symbol === sourceTokenSymbol) ?? SOLANA_TOKENS[0];
       sourceSelectionRef.current = {
@@ -1660,10 +1500,10 @@ function DepositAddressStep({
       sourceSymbol: sourceTokenSymbol
     };
   }, [sourceChainId, sourceTokenSymbol, isSolana]);
-  const [liquidityHelper, setLiquidityHelper] = useState6({
+  const [liquidityHelper, setLiquidityHelper] = useState5({
     kind: "idle"
   });
-  useEffect6(() => {
+  useEffect5(() => {
     if (isSolana) {
       setLiquidityHelper({ kind: "idle" });
       return;
@@ -1714,7 +1554,7 @@ function DepositAddressStep({
     service
   ]);
   const displayAddress = isSolana && solanaDepositAddress ? solanaDepositAddress : smartAccount;
-  useEffect6(() => {
+  useEffect5(() => {
     if (!chainDropdownOpen && !tokenDropdownOpen) return;
     function handlePointerDown(event) {
       const target = event.target;
@@ -1732,7 +1572,7 @@ function DepositAddressStep({
       document.removeEventListener("touchstart", handlePointerDown);
     };
   }, [chainDropdownOpen, tokenDropdownOpen]);
-  const handleCopy = useCallback3(async () => {
+  const handleCopy = useCallback2(async () => {
     onCopyAddress?.();
     try {
       await navigator.clipboard.writeText(displayAddress);
@@ -1751,24 +1591,24 @@ function DepositAddressStep({
       setTimeout(() => setCopied(false), 2e3);
     }
   }, [displayAddress, onCopyAddress]);
-  useEffect6(() => {
+  useEffect5(() => {
     setCopied(false);
     setChainDropdownOpen(false);
     setTokenDropdownOpen(false);
   }, [sourceChainId]);
-  const onDepositSubmittedRef = useRef5(onDepositSubmitted);
+  const onDepositSubmittedRef = useRef4(onDepositSubmitted);
   onDepositSubmittedRef.current = onDepositSubmitted;
-  const onDepositCompleteRef = useRef5(onDepositComplete);
+  const onDepositCompleteRef = useRef4(onDepositComplete);
   onDepositCompleteRef.current = onDepositComplete;
-  const onDepositFailedRef = useRef5(onDepositFailed);
+  const onDepositFailedRef = useRef4(onDepositFailed);
   onDepositFailedRef.current = onDepositFailed;
-  const onErrorRef = useRef5(onError);
+  const onErrorRef = useRef4(onError);
   onErrorRef.current = onError;
-  const targetChainRef = useRef5(targetChain);
+  const targetChainRef = useRef4(targetChain);
   targetChainRef.current = targetChain;
-  const targetTokenRef = useRef5(targetToken);
+  const targetTokenRef = useRef4(targetToken);
   targetTokenRef.current = targetToken;
-  useEffect6(() => {
+  useEffect5(() => {
     baselineTxHashRef.current = void 0;
     isTrackingRef.current = false;
     setPollingError(null);
@@ -1863,31 +1703,31 @@ function DepositAddressStep({
       clearTimeout(timeoutId);
     };
   }, [smartAccount, solanaDepositAddress, service]);
-  const handleNotificationComplete = useCallback3(
+  const handleNotificationComplete = useCallback2(
     (txHash, destinationTxHash, context) => {
       isTrackingRef.current = false;
       onDepositCompleteRef.current?.(txHash, destinationTxHash, context);
     },
     []
   );
-  const handleNotificationFailed = useCallback3(
+  const handleNotificationFailed = useCallback2(
     (txHash, error) => {
       isTrackingRef.current = false;
       onDepositFailedRef.current?.(txHash, error);
     },
     []
   );
-  const handleNotificationDismiss = useCallback3((id) => {
+  const handleNotificationDismiss = useCallback2((id) => {
     setNotifications((prev) => prev.filter((n) => n.id !== id));
   }, []);
   const qrIconSrc = getChainIcon(sourceChainId);
-  return /* @__PURE__ */ jsxs6("div", { className: "rs-screen rs-step--with-notifications", children: [
-    /* @__PURE__ */ jsxs6("div", { className: "rs-screen-body", children: [
-      /* @__PURE__ */ jsx6(BodyHeader, { icon: /* @__PURE__ */ jsx6(CoinsIcon, {}), title: "Transfer crypto" }),
-      /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-selectors", children: [
-        /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-dropdown", ref: chainDropdownRef, children: [
-          /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-dropdown-label", children: "Supported chain" }),
-          /* @__PURE__ */ jsxs6(
+  return /* @__PURE__ */ jsxs5("div", { className: "rs-screen rs-step--with-notifications", children: [
+    /* @__PURE__ */ jsxs5("div", { className: "rs-screen-body", children: [
+      /* @__PURE__ */ jsx5(BodyHeader, { icon: /* @__PURE__ */ jsx5(CoinsIcon, {}), title: "Transfer crypto" }),
+      /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-address-selectors", children: [
+        /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-address-dropdown", ref: chainDropdownRef, children: [
+          /* @__PURE__ */ jsx5("div", { className: "rs-deposit-address-dropdown-label", children: "Supported chain" }),
+          /* @__PURE__ */ jsxs5(
             "button",
             {
               type: "button",
@@ -1897,7 +1737,7 @@ function DepositAddressStep({
                 setTokenDropdownOpen(false);
               },
               children: [
-                getChainIcon(sourceChainId) && /* @__PURE__ */ jsx6(
+                getChainIcon(sourceChainId) && /* @__PURE__ */ jsx5(
                   "img",
                   {
                     src: getChainIcon(sourceChainId),
@@ -1905,12 +1745,12 @@ function DepositAddressStep({
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx6("span", { children: getChainName(sourceChainId) }),
-                /* @__PURE__ */ jsx6(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
+                /* @__PURE__ */ jsx5("span", { children: getChainName(sourceChainId) }),
+                /* @__PURE__ */ jsx5(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
               ]
             }
           ),
-          chainDropdownOpen && /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-dropdown-menu", children: chainOptions.map((chainId) => /* @__PURE__ */ jsxs6(
+          chainDropdownOpen && /* @__PURE__ */ jsx5("div", { className: "rs-deposit-address-dropdown-menu", children: chainOptions.map((chainId) => /* @__PURE__ */ jsxs5(
             "button",
             {
               type: "button",
@@ -1920,7 +1760,7 @@ function DepositAddressStep({
                 setChainDropdownOpen(false);
               },
               children: [
-                getChainIcon(chainId) && /* @__PURE__ */ jsx6(
+                getChainIcon(chainId) && /* @__PURE__ */ jsx5(
                   "img",
                   {
                     src: getChainIcon(chainId),
@@ -1928,19 +1768,19 @@ function DepositAddressStep({
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx6("span", { children: getChainName(chainId) })
+                /* @__PURE__ */ jsx5("span", { children: getChainName(chainId) })
               ]
             },
             String(chainId)
           )) })
         ] }),
-        /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-dropdown", ref: tokenDropdownRef, children: [
-          /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-dropdown-label rs-deposit-address-dropdown-label--with-min", children: [
-            /* @__PURE__ */ jsx6("span", { children: "Supported token" }),
-            /* @__PURE__ */ jsxs6("span", { className: "rs-deposit-address-min", children: [
+        /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-address-dropdown", ref: tokenDropdownRef, children: [
+          /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-address-dropdown-label rs-deposit-address-dropdown-label--with-min", children: [
+            /* @__PURE__ */ jsx5("span", { children: "Supported token" }),
+            /* @__PURE__ */ jsxs5("span", { className: "rs-deposit-address-min", children: [
               "Min.$",
               uiConfig?.minDepositUsd ?? 0.1,
-              /* @__PURE__ */ jsx6(Tooltip, { content: "Minimum deposit amount required for the selected chain.", children: /* @__PURE__ */ jsx6(
+              /* @__PURE__ */ jsx5(Tooltip, { content: "Minimum deposit amount required for the selected chain.", children: /* @__PURE__ */ jsx5(
                 InfoIcon,
                 {
                   className: "rs-deposit-address-min-icon",
@@ -1949,7 +1789,7 @@ function DepositAddressStep({
               ) })
             ] })
           ] }),
-          /* @__PURE__ */ jsxs6(
+          /* @__PURE__ */ jsxs5(
             "button",
             {
               type: "button",
@@ -1959,7 +1799,7 @@ function DepositAddressStep({
                 setChainDropdownOpen(false);
               },
               children: [
-                getTokenIcon(sourceTokenSymbol) && /* @__PURE__ */ jsx6(
+                getTokenIcon(sourceTokenSymbol) && /* @__PURE__ */ jsx5(
                   "img",
                   {
                     src: getTokenIcon(sourceTokenSymbol),
@@ -1967,12 +1807,12 @@ function DepositAddressStep({
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx6("span", { children: sourceTokenSymbol }),
-                /* @__PURE__ */ jsx6(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
+                /* @__PURE__ */ jsx5("span", { children: sourceTokenSymbol }),
+                /* @__PURE__ */ jsx5(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
               ]
             }
           ),
-          tokenDropdownOpen && /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-dropdown-menu", children: tokensForChain.map((symbol) => /* @__PURE__ */ jsxs6(
+          tokenDropdownOpen && /* @__PURE__ */ jsx5("div", { className: "rs-deposit-address-dropdown-menu", children: tokensForChain.map((symbol) => /* @__PURE__ */ jsxs5(
             "button",
             {
               type: "button",
@@ -1982,7 +1822,7 @@ function DepositAddressStep({
                 setTokenDropdownOpen(false);
               },
               children: [
-                getTokenIcon(symbol) && /* @__PURE__ */ jsx6(
+                getTokenIcon(symbol) && /* @__PURE__ */ jsx5(
                   "img",
                   {
                     src: getTokenIcon(symbol),
@@ -1990,23 +1830,23 @@ function DepositAddressStep({
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx6("span", { children: symbol })
+                /* @__PURE__ */ jsx5("span", { children: symbol })
               ]
             },
             symbol
           )) })
         ] })
       ] }),
-      /* @__PURE__ */ jsxs6(
+      /* @__PURE__ */ jsxs5(
         "div",
         {
           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(
+            /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-address-well", children: [
+              /* @__PURE__ */ jsx5("div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ jsx5(
                 Suspense,
                 {
-                  fallback: /* @__PURE__ */ jsx6(
+                  fallback: /* @__PURE__ */ jsx5(
                     "div",
                     {
                       style: {
@@ -2016,22 +1856,22 @@ function DepositAddressStep({
                         alignItems: "center",
                         justifyContent: "center"
                       },
-                      children: /* @__PURE__ */ jsx6(Spinner, {})
+                      children: /* @__PURE__ */ jsx5(Spinner, {})
                     }
                   ),
-                  children: /* @__PURE__ */ jsx6(QRCode, { value: displayAddress, size: 220, iconSrc: qrIconSrc })
+                  children: /* @__PURE__ */ jsx5(QRCode, { value: displayAddress, size: 220, iconSrc: qrIconSrc })
                 }
               ) }),
-              /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-value", children: displayAddress })
+              /* @__PURE__ */ jsx5("div", { className: "rs-deposit-address-value", children: displayAddress })
             ] }),
-            /* @__PURE__ */ jsxs6(
+            /* @__PURE__ */ jsxs5(
               "button",
               {
                 type: "button",
                 className: "rs-deposit-address-copy",
                 onClick: handleCopy,
                 children: [
-                  copied ? /* @__PURE__ */ jsx6(CheckIcon, {}) : /* @__PURE__ */ jsx6(CopyIcon, {}),
+                  copied ? /* @__PURE__ */ jsx5(CheckIcon, {}) : /* @__PURE__ */ jsx5(CopyIcon, {}),
                   copied ? "Copied!" : "Copy address"
                 ]
               }
@@ -2039,12 +1879,12 @@ function DepositAddressStep({
           ]
         }
       ),
-      /* @__PURE__ */ jsxs6(
+      /* @__PURE__ */ jsxs5(
         "div",
         {
           className: `rs-price-impact ${priceImpactExpanded ? "rs-price-impact--open" : ""}`,
           children: [
-            /* @__PURE__ */ jsxs6(
+            /* @__PURE__ */ jsxs5(
               "button",
               {
                 type: "button",
@@ -2052,19 +1892,19 @@ function DepositAddressStep({
                 onClick: () => setPriceImpactExpanded((v) => !v),
                 "aria-expanded": priceImpactExpanded,
                 children: [
-                  /* @__PURE__ */ jsxs6("span", { className: "rs-price-impact-header-left", children: [
-                    /* @__PURE__ */ jsx6("span", { className: "rs-price-impact-label", children: "Price impact" }),
-                    /* @__PURE__ */ jsx6("span", { className: "rs-price-impact-label", children: /* @__PURE__ */ jsx6("strong", { children: "0.00%" }) }),
-                    /* @__PURE__ */ jsx6(
+                  /* @__PURE__ */ jsxs5("span", { className: "rs-price-impact-header-left", children: [
+                    /* @__PURE__ */ jsx5("span", { className: "rs-price-impact-label", children: "Price impact" }),
+                    /* @__PURE__ */ jsx5("span", { className: "rs-price-impact-label", children: /* @__PURE__ */ jsx5("strong", { children: "0.00%" }) }),
+                    /* @__PURE__ */ jsx5(
                       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__ */ jsx6(InfoIcon, { "aria-hidden": "true" })
+                        children: /* @__PURE__ */ jsx5(InfoIcon, { "aria-hidden": "true" })
                       }
                     )
                   ] }),
-                  /* @__PURE__ */ jsx6(
+                  /* @__PURE__ */ jsx5(
                     ChevronDownIcon,
                     {
                       className: "rs-price-impact-chevron",
@@ -2074,35 +1914,35 @@ function DepositAddressStep({
                 ]
               }
             ),
-            /* @__PURE__ */ jsx6("div", { className: "rs-price-impact-panel", children: /* @__PURE__ */ jsxs6("div", { className: "rs-price-impact-panel-inner", children: [
-              /* @__PURE__ */ jsxs6("div", { className: "rs-price-impact-row", children: [
-                /* @__PURE__ */ jsx6("span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx6(PercentIcon, {}) }),
-                /* @__PURE__ */ jsxs6("span", { className: "rs-price-impact-label", children: [
+            /* @__PURE__ */ jsx5("div", { className: "rs-price-impact-panel", children: /* @__PURE__ */ jsxs5("div", { className: "rs-price-impact-panel-inner", children: [
+              /* @__PURE__ */ jsxs5("div", { className: "rs-price-impact-row", children: [
+                /* @__PURE__ */ jsx5("span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx5(PercentIcon, {}) }),
+                /* @__PURE__ */ jsxs5("span", { className: "rs-price-impact-label", children: [
                   "Max slippage: ",
-                  /* @__PURE__ */ jsx6("strong", { children: "0.2%" })
+                  /* @__PURE__ */ jsx5("strong", { children: "0.2%" })
                 ] }),
-                /* @__PURE__ */ jsx6(
+                /* @__PURE__ */ jsx5(
                   Tooltip,
                   {
                     className: "rs-price-impact-info",
                     content: "Slippage accounts for price changes during execution. Slippage is adjusted per pair to ensure reliable execution.",
-                    children: /* @__PURE__ */ jsx6(InfoIcon, { "aria-hidden": "true" })
+                    children: /* @__PURE__ */ jsx5(InfoIcon, { "aria-hidden": "true" })
                   }
                 )
               ] }),
-              /* @__PURE__ */ jsxs6("div", { className: "rs-price-impact-row", children: [
-                /* @__PURE__ */ jsx6("span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx6(ClockIcon, {}) }),
-                /* @__PURE__ */ jsxs6("span", { className: "rs-price-impact-label", children: [
+              /* @__PURE__ */ jsxs5("div", { className: "rs-price-impact-row", children: [
+                /* @__PURE__ */ jsx5("span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx5(ClockIcon, {}) }),
+                /* @__PURE__ */ jsxs5("span", { className: "rs-price-impact-label", children: [
                   "Processing time: ",
-                  /* @__PURE__ */ jsx6("strong", { children: "< 1 min" })
+                  /* @__PURE__ */ jsx5("strong", { children: "< 1 min" })
                 ] })
               ] }),
-              /* @__PURE__ */ jsxs6("div", { className: "rs-price-impact-row", children: [
-                /* @__PURE__ */ jsx6("span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx6(PlusCircleIcon, {}) }),
-                /* @__PURE__ */ jsxs6("span", { className: "rs-price-impact-label", children: [
+              /* @__PURE__ */ jsxs5("div", { className: "rs-price-impact-row", children: [
+                /* @__PURE__ */ jsx5("span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx5(PlusCircleIcon, {}) }),
+                /* @__PURE__ */ jsxs5("span", { className: "rs-price-impact-label", children: [
                   "Max deposit:",
                   " ",
-                  /* @__PURE__ */ jsx6("strong", { children: liquidityHelper.kind === "max" ? `${formatUnits3(
+                  /* @__PURE__ */ jsx5("strong", { children: liquidityHelper.kind === "max" ? `${formatUnits3(
                     BigInt(liquidityHelper.maxAmount),
                     liquidityHelper.decimals
                   )} ${liquidityHelper.symbol}` : liquidityHelper.kind === "unlimited" ? "Unlimited" : liquidityHelper.kind === "unavailable" ? "Unavailable" : liquidityHelper.kind === "error" ? "\u2014" : "\u2026" })
@@ -2112,9 +1952,18 @@ function DepositAddressStep({
           ]
         }
       ),
-      pollingError && /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-error", children: pollingError })
+      pollingError && /* @__PURE__ */ jsx5("div", { className: "rs-deposit-address-error", children: pollingError }),
+      onRequestWalletPicker && /* @__PURE__ */ jsx5(
+        "button",
+        {
+          type: "button",
+          className: "rs-connect-wallet-manage",
+          onClick: onRequestWalletPicker,
+          children: "Use a wallet to deposit instead"
+        }
+      )
     ] }),
-    notifications.length > 0 && /* @__PURE__ */ jsx6("div", { className: "rs-deposit-notifications", children: notifications.map((deposit) => /* @__PURE__ */ jsx6(
+    notifications.length > 0 && /* @__PURE__ */ jsx5("div", { className: "rs-deposit-notifications", children: notifications.map((deposit) => /* @__PURE__ */ jsx5(
       DepositNotification,
       {
         deposit,
@@ -2131,15 +1980,15 @@ function DepositAddressStep({
       },
       deposit.id
     )) }),
-    /* @__PURE__ */ jsx6(PoweredBy, {})
+    /* @__PURE__ */ jsx5(PoweredBy, {})
   ] });
 }
 DepositAddressStep.displayName = "DepositAddressStep";
 
 // src/components/steps/SolanaTokenSelectStep.tsx
-import { useState as useState7, useEffect as useEffect7, useMemo as useMemo4 } from "react";
+import { useState as useState6, useEffect as useEffect6, useMemo as useMemo4 } from "react";
 import { formatUnits as formatUnits4 } from "viem";
-import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
+import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
 function SolanaTokenSelectStep({
   solanaAddress,
   service,
@@ -2147,11 +1996,11 @@ function SolanaTokenSelectStep({
   onTotalBalanceComputed,
   debug
 }) {
-  const [tokenBalances, setTokenBalances] = useState7([]);
-  const [selectedSymbol, setSelectedSymbol] = useState7(null);
-  const [loading, setLoading] = useState7(true);
-  const [error, setError] = useState7(null);
-  useEffect7(() => {
+  const [tokenBalances, setTokenBalances] = useState6([]);
+  const [selectedSymbol, setSelectedSymbol] = useState6(null);
+  const [loading, setLoading] = useState6(true);
+  const [error, setError] = useState6(null);
+  useEffect6(() => {
     let active = true;
     async function loadBalances() {
       if (!solanaAddress) {
@@ -2233,37 +2082,37 @@ function SolanaTokenSelectStep({
   );
   const selectedEntry = selectedSymbol ? rows.find((r) => r.token.symbol === selectedSymbol) : null;
   if (error) {
-    return /* @__PURE__ */ jsx7("div", { className: "rs-step", children: /* @__PURE__ */ jsx7("div", { className: "rs-step-body", children: /* @__PURE__ */ jsx7("div", { className: "rs-alert rs-alert--error", children: /* @__PURE__ */ jsx7("span", { className: "rs-alert-text", children: error }) }) }) });
+    return /* @__PURE__ */ jsx6("div", { className: "rs-step", children: /* @__PURE__ */ jsx6("div", { className: "rs-step-body", children: /* @__PURE__ */ jsx6("div", { className: "rs-alert rs-alert--error", children: /* @__PURE__ */ jsx6("span", { className: "rs-alert-text", children: error }) }) }) });
   }
-  return /* @__PURE__ */ jsxs7("div", { className: "rs-step", children: [
-    /* @__PURE__ */ jsx7("div", { style: { padding: "0 12px 12px" }, children: /* @__PURE__ */ jsx7(
+  return /* @__PURE__ */ jsxs6("div", { className: "rs-step", children: [
+    /* @__PURE__ */ jsx6("div", { style: { padding: "0 12px 12px" }, children: /* @__PURE__ */ jsx6(
       BodyHeader,
       {
-        icon: /* @__PURE__ */ jsx7(CoinsIcon, {}),
+        icon: /* @__PURE__ */ jsx6(CoinsIcon, {}),
         title: "Select asset",
         subtitle: "Pick a Solana token to deposit"
       }
     ) }),
-    /* @__PURE__ */ jsxs7(
+    /* @__PURE__ */ jsxs6(
       "div",
       {
         className: "rs-step-body",
         style: { paddingTop: 4, overflow: "auto", maxHeight: 340 },
         children: [
-          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__ */ jsxs6("div", { className: "rs-loading-state", style: { padding: "40px 12px" }, children: [
+            /* @__PURE__ */ jsx6(Spinner, { className: "rs-text-tertiary" }),
+            /* @__PURE__ */ jsx6("span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
           ] }),
-          !loading && 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: [
+          !loading && rows.length === 0 && /* @__PURE__ */ jsxs6("div", { className: "rs-empty-state", children: [
+            /* @__PURE__ */ jsx6(WalletIcon, { className: "rs-empty-icon" }),
+            /* @__PURE__ */ jsx6("div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
+            /* @__PURE__ */ jsxs6("div", { className: "rs-empty-address", children: [
               solanaAddress.slice(0, 6),
               "...",
               solanaAddress.slice(-4)
             ] })
           ] }),
-          !loading && rows.length > 0 && /* @__PURE__ */ jsx7("div", { className: "rs-asset-list", children: rows.map((entry) => {
+          !loading && rows.length > 0 && /* @__PURE__ */ jsx6("div", { className: "rs-asset-list", children: rows.map((entry) => {
             const isSelected = selectedSymbol === entry.token.symbol;
             const tokenIcon = getTokenIcon(entry.token.symbol);
             const chainIcon = getChainIcon("solana");
@@ -2275,7 +2124,7 @@ function SolanaTokenSelectStep({
             } catch {
               formattedBalance = "...";
             }
-            return /* @__PURE__ */ jsxs7(
+            return /* @__PURE__ */ jsxs6(
               "button",
               {
                 type: "button",
@@ -2283,9 +2132,9 @@ function SolanaTokenSelectStep({
                 className: `rs-asset-row ${isSelected ? "rs-asset-row--selected" : ""}`,
                 style: { textAlign: "left" },
                 children: [
-                  /* @__PURE__ */ jsxs7("div", { className: "rs-asset-info", children: [
-                    /* @__PURE__ */ jsxs7("div", { className: "rs-asset-icon-wrapper", children: [
-                      tokenIcon ? /* @__PURE__ */ jsx7(
+                  /* @__PURE__ */ jsxs6("div", { className: "rs-asset-info", children: [
+                    /* @__PURE__ */ jsxs6("div", { className: "rs-asset-icon-wrapper", children: [
+                      tokenIcon ? /* @__PURE__ */ jsx6(
                         "img",
                         {
                           src: tokenIcon,
@@ -2293,8 +2142,8 @@ function SolanaTokenSelectStep({
                           className: "rs-asset-icon",
                           style: { background: "transparent" }
                         }
-                      ) : /* @__PURE__ */ jsx7("div", { className: "rs-asset-icon", children: entry.token.symbol.slice(0, 4) }),
-                      chainIcon && /* @__PURE__ */ jsx7(
+                      ) : /* @__PURE__ */ jsx6("div", { className: "rs-asset-icon", children: entry.token.symbol.slice(0, 4) }),
+                      chainIcon && /* @__PURE__ */ jsx6(
                         "img",
                         {
                           src: chainIcon,
@@ -2303,19 +2152,19 @@ function SolanaTokenSelectStep({
                         }
                       )
                     ] }),
-                    /* @__PURE__ */ jsxs7("div", { children: [
-                      /* @__PURE__ */ jsxs7("div", { className: "rs-asset-name", children: [
+                    /* @__PURE__ */ jsxs6("div", { children: [
+                      /* @__PURE__ */ jsxs6("div", { className: "rs-asset-name", children: [
                         entry.token.symbol,
-                        /* @__PURE__ */ jsx7("span", { className: "rs-asset-chain", children: " on Solana" })
+                        /* @__PURE__ */ jsx6("span", { className: "rs-asset-chain", children: " on Solana" })
                       ] }),
-                      /* @__PURE__ */ jsxs7("div", { className: "rs-asset-balance-small", children: [
+                      /* @__PURE__ */ jsxs6("div", { className: "rs-asset-balance-small", children: [
                         formattedBalance,
                         " ",
                         entry.token.symbol
                       ] })
                     ] })
                   ] }),
-                  /* @__PURE__ */ jsx7("div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? currencyFormatter.format(entry.balanceUsd) : `${formattedBalance} ${entry.token.symbol}` })
+                  /* @__PURE__ */ jsx6("div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? currencyFormatter.format(entry.balanceUsd) : `${formattedBalance} ${entry.token.symbol}` })
                 ]
               },
               entry.token.symbol
@@ -2324,7 +2173,7 @@ function SolanaTokenSelectStep({
         ]
       }
     ),
-    /* @__PURE__ */ jsx7("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx7(
+    /* @__PURE__ */ jsx6("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx6(
       Button,
       {
         onClick: () => selectedEntry && onContinue(
@@ -2337,14 +2186,14 @@ function SolanaTokenSelectStep({
         children: "Continue"
       }
     ) }),
-    /* @__PURE__ */ jsx7(PoweredBy, {})
+    /* @__PURE__ */ jsx6(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/SolanaAmountStep.tsx
-import { useEffect as useEffect8, useMemo as useMemo5, useState as useState8 } from "react";
+import { useEffect as useEffect7, useMemo as useMemo5, useState as useState7 } 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 jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
 var SOL_FEE_RESERVE_LAMPORTS = 1000000n;
 var PRESETS2 = [
   { value: 25, label: "25%" },
@@ -2365,8 +2214,8 @@ function SolanaAmountStep({
   onContinue,
   debug
 }) {
-  const [amount, setAmount] = useState8("");
-  const [error, setError] = useState8(null);
+  const [amount, setAmount] = useState7("");
+  const [error, setError] = useState7(null);
   const isSourceStablecoin = isStablecoinSymbol(token.symbol);
   const tokenPriceUsd = useMemo5(() => {
     if (isSourceStablecoin) return 1;
@@ -2382,7 +2231,7 @@ function SolanaAmountStep({
     }
   }, [isSourceStablecoin, balance, token.decimals, balanceUsd]);
   const hasPricing = tokenPriceUsd !== null;
-  useEffect8(() => {
+  useEffect7(() => {
     if (defaultAmount && !amount) {
       const parsed = Number(defaultAmount);
       if (Number.isFinite(parsed) && parsed > 0) {
@@ -2519,14 +2368,14 @@ 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__ */ jsxs8("div", { className: "rs-amount-input-row", children: [
-            /* @__PURE__ */ jsx8("span", { "aria-hidden": "true", children: "$" }),
-            /* @__PURE__ */ jsx8(
+  return /* @__PURE__ */ jsxs7("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs7("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx7(BodyHeader, { icon: /* @__PURE__ */ jsx7(WalletIcon, {}), title: "Wallet deposit" }),
+      /* @__PURE__ */ jsxs7("div", { className: "rs-amount-section", children: [
+        /* @__PURE__ */ jsxs7("div", { className: "rs-amount-display", children: [
+          /* @__PURE__ */ jsxs7("div", { className: "rs-amount-input-row", children: [
+            /* @__PURE__ */ jsx7("span", { "aria-hidden": "true", children: "$" }),
+            /* @__PURE__ */ jsx7(
               "input",
               {
                 type: "text",
@@ -2539,25 +2388,25 @@ function SolanaAmountStep({
               }
             )
           ] }),
-          /* @__PURE__ */ jsxs8("div", { className: "rs-amount-meta", children: [
-            /* @__PURE__ */ jsxs8("span", { className: "rs-amount-meta-balance", children: [
+          /* @__PURE__ */ jsxs7("div", { className: "rs-amount-meta", children: [
+            /* @__PURE__ */ jsxs7("span", { className: "rs-amount-meta-balance", children: [
               formattedBalance,
               " ",
               token.symbol,
               " available",
-              computedBalanceUsd !== null && /* @__PURE__ */ jsxs8(Fragment2, { children: [
+              computedBalanceUsd !== null && /* @__PURE__ */ jsxs7(Fragment2, { children: [
                 " (~",
                 currencyFormatter.format(computedBalanceUsd),
                 ")"
               ] })
             ] }),
-            minDepositUsd !== null && /* @__PURE__ */ jsxs8("span", { className: "rs-amount-meta-minimum", children: [
+            minDepositUsd !== null && /* @__PURE__ */ jsxs7("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__ */ jsx7("div", { className: "rs-amount-presets", children: PRESETS2.map((preset) => /* @__PURE__ */ jsx7(
           "button",
           {
             type: "button",
@@ -2568,38 +2417,38 @@ 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__ */ jsxs7("div", { className: "rs-amount-details", children: [
+        /* @__PURE__ */ jsxs7("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx7("span", { children: "You send" }),
+          /* @__PURE__ */ jsxs7("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsxs7("span", { children: [
               "Solana ",
               token.symbol
             ] }),
-            sourceTokenIcon && /* @__PURE__ */ jsx8("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx8("img", { src: sourceTokenIcon, alt: "" }) })
+            sourceTokenIcon && /* @__PURE__ */ jsx7("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx7("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__ */ jsxs7("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx7("span", { children: "Receive" }),
+          /* @__PURE__ */ jsxs7("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsxs7("span", { children: [
               targetChainName,
               " ",
               targetTokenSymbol
             ] }),
-            targetTokenIcon && /* @__PURE__ */ jsx8("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx8("img", { src: targetTokenIcon, alt: "" }) })
+            targetTokenIcon && /* @__PURE__ */ jsx7("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx7("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__ */ jsxs7("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx7("span", { children: "Balance after deposit" }),
+          /* @__PURE__ */ jsx7("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
         ] })
       ] }),
-      error && /* @__PURE__ */ jsxs8("div", { className: "rs-amount-error", role: "alert", children: [
-        /* @__PURE__ */ jsx8(AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
-        /* @__PURE__ */ jsx8("span", { children: error })
+      error && /* @__PURE__ */ jsxs7("div", { className: "rs-amount-error", role: "alert", children: [
+        /* @__PURE__ */ jsx7(AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
+        /* @__PURE__ */ jsx7("span", { children: error })
       ] }),
-      /* @__PURE__ */ jsx8(
+      /* @__PURE__ */ jsx7(
         Button,
         {
           onClick: handleContinue,
@@ -2609,14 +2458,14 @@ function SolanaAmountStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx8(PoweredBy, {})
+    /* @__PURE__ */ jsx7(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/SolanaConfirmStep.tsx
-import { useState as useState9 } from "react";
+import { useState as useState8 } from "react";
 import { parseUnits as parseUnits4 } from "viem";
-import { jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
+import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
 function SolanaConfirmStep({
   smartAccount,
   solanaAddress,
@@ -2634,8 +2483,8 @@ function SolanaConfirmStep({
   onError,
   debug
 }) {
-  const [isSubmitting, setIsSubmitting] = useState9(false);
-  const [error, setError] = useState9(null);
+  const [isSubmitting, setIsSubmitting] = useState8(false);
+  const [error, setError] = useState8(null);
   const targetSymbol = getTokenSymbol(targetToken, targetChain);
   const isSameToken = token.symbol.toUpperCase() === targetSymbol.toUpperCase();
   const formattedAmount = sourceAmount && !Number.isNaN(Number(sourceAmount)) ? Number(sourceAmount).toLocaleString("en-US", { maximumFractionDigits: 6 }) : "0";
@@ -2740,19 +2589,19 @@ function SolanaConfirmStep({
       setIsSubmitting(false);
     }
   };
-  return /* @__PURE__ */ jsxs9("div", { className: "rs-step", children: [
-    /* @__PURE__ */ jsx9("div", { style: { padding: "0 12px 12px" }, children: /* @__PURE__ */ jsx9(BodyHeader, { icon: /* @__PURE__ */ jsx9(WalletIcon, {}), title: "Review deposit" }) }),
-    /* @__PURE__ */ jsxs9("div", { className: "rs-step-body rs-space-y-3", style: { paddingTop: 0 }, children: [
-      /* @__PURE__ */ jsxs9("div", { className: "rs-card", children: [
-        /* @__PURE__ */ jsxs9("div", { className: "rs-card-row", children: [
-          /* @__PURE__ */ jsx9("span", { className: "rs-card-label", children: "Source" }),
-          /* @__PURE__ */ jsxs9(
+  return /* @__PURE__ */ jsxs8("div", { className: "rs-step", children: [
+    /* @__PURE__ */ jsx8("div", { style: { padding: "0 12px 12px" }, children: /* @__PURE__ */ jsx8(BodyHeader, { icon: /* @__PURE__ */ jsx8(WalletIcon, {}), title: "Review deposit" }) }),
+    /* @__PURE__ */ jsxs8("div", { className: "rs-step-body rs-space-y-3", style: { paddingTop: 0 }, children: [
+      /* @__PURE__ */ jsxs8("div", { className: "rs-card", children: [
+        /* @__PURE__ */ jsxs8("div", { className: "rs-card-row", children: [
+          /* @__PURE__ */ jsx8("span", { className: "rs-card-label", children: "Source" }),
+          /* @__PURE__ */ jsxs8(
             "span",
             {
               className: "rs-card-value",
               style: { display: "flex", alignItems: "center", gap: 8 },
               children: [
-                getChainIcon("solana") && /* @__PURE__ */ jsx9(
+                getChainIcon("solana") && /* @__PURE__ */ jsx8(
                   "img",
                   {
                     src: getChainIcon("solana"),
@@ -2765,15 +2614,15 @@ function SolanaConfirmStep({
             }
           )
         ] }),
-        /* @__PURE__ */ jsxs9("div", { className: "rs-card-row", children: [
-          /* @__PURE__ */ jsx9("span", { className: "rs-card-label", children: "Destination" }),
-          /* @__PURE__ */ jsxs9(
+        /* @__PURE__ */ jsxs8("div", { className: "rs-card-row", children: [
+          /* @__PURE__ */ jsx8("span", { className: "rs-card-label", children: "Destination" }),
+          /* @__PURE__ */ jsxs8(
             "span",
             {
               className: "rs-card-value",
               style: { display: "flex", alignItems: "center", gap: 8 },
               children: [
-                getChainIcon(targetChain) && /* @__PURE__ */ jsx9(
+                getChainIcon(targetChain) && /* @__PURE__ */ jsx8(
                   "img",
                   {
                     src: getChainIcon(targetChain),
@@ -2786,21 +2635,21 @@ function SolanaConfirmStep({
             }
           )
         ] }),
-        /* @__PURE__ */ jsxs9("div", { className: "rs-card-row", children: [
-          /* @__PURE__ */ jsx9("span", { className: "rs-card-label", children: "Estimated time" }),
-          /* @__PURE__ */ jsx9("span", { className: "rs-card-value", children: "< 1 min" })
+        /* @__PURE__ */ jsxs8("div", { className: "rs-card-row", children: [
+          /* @__PURE__ */ jsx8("span", { className: "rs-card-label", children: "Estimated time" }),
+          /* @__PURE__ */ jsx8("span", { className: "rs-card-value", children: "< 1 min" })
         ] })
       ] }),
-      /* @__PURE__ */ jsxs9("div", { className: "rs-card", children: [
-        /* @__PURE__ */ jsxs9("div", { className: "rs-card-row", children: [
-          /* @__PURE__ */ jsx9("span", { className: "rs-card-label", children: "You send" }),
-          /* @__PURE__ */ jsxs9(
+      /* @__PURE__ */ jsxs8("div", { className: "rs-card", children: [
+        /* @__PURE__ */ jsxs8("div", { className: "rs-card-row", children: [
+          /* @__PURE__ */ jsx8("span", { className: "rs-card-label", children: "You send" }),
+          /* @__PURE__ */ jsxs8(
             "span",
             {
               className: "rs-card-value",
               style: { display: "flex", alignItems: "center", gap: 6 },
               children: [
-                getTokenIcon(token.symbol) && /* @__PURE__ */ jsx9(
+                getTokenIcon(token.symbol) && /* @__PURE__ */ jsx8(
                   "img",
                   {
                     src: getTokenIcon(token.symbol),
@@ -2815,15 +2664,15 @@ function SolanaConfirmStep({
             }
           )
         ] }),
-        /* @__PURE__ */ jsxs9("div", { className: "rs-card-row", children: [
-          /* @__PURE__ */ jsx9("span", { className: "rs-card-label", children: "You receive" }),
-          /* @__PURE__ */ jsxs9(
+        /* @__PURE__ */ jsxs8("div", { className: "rs-card-row", children: [
+          /* @__PURE__ */ jsx8("span", { className: "rs-card-label", children: "You receive" }),
+          /* @__PURE__ */ jsxs8(
             "span",
             {
               className: "rs-card-value",
               style: { display: "flex", alignItems: "center", gap: 6 },
               children: [
-                getTokenIcon(targetSymbol) && /* @__PURE__ */ jsx9(
+                getTokenIcon(targetSymbol) && /* @__PURE__ */ jsx8(
                   "img",
                   {
                     src: getTokenIcon(targetSymbol),
@@ -2839,12 +2688,12 @@ function SolanaConfirmStep({
           )
         ] })
       ] }),
-      error && /* @__PURE__ */ jsxs9("div", { className: "rs-alert rs-alert--error", children: [
-        /* @__PURE__ */ jsx9(AlertTriangleIcon, { className: "rs-alert-icon" }),
-        /* @__PURE__ */ jsx9("span", { className: "rs-alert-text", children: error })
+      error && /* @__PURE__ */ jsxs8("div", { className: "rs-alert rs-alert--error", children: [
+        /* @__PURE__ */ jsx8(AlertTriangleIcon, { className: "rs-alert-icon" }),
+        /* @__PURE__ */ jsx8("span", { className: "rs-alert-text", children: error })
       ] })
     ] }),
-    /* @__PURE__ */ jsx9("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx9(
+    /* @__PURE__ */ jsx8("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx8(
       Button,
       {
         onClick: handleConfirm,
@@ -2854,36 +2703,394 @@ function SolanaConfirmStep({
         children: "Continue"
       }
     ) }),
+    /* @__PURE__ */ jsx8(PoweredBy, {})
+  ] });
+}
+
+// src/components/steps/DappImportAssetSelectStep.tsx
+import { jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
+function DappImportAssetSelectStep({
+  sourceLabel,
+  assets,
+  onSelect
+}) {
+  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(HandCoinsIcon, {}),
+          title: `Transfer from ${sourceLabel}`,
+          subtitle: "Pick the balance to import"
+        }
+      ),
+      /* @__PURE__ */ jsx9("div", { className: "rs-list", children: assets.map((asset) => {
+        const balanceTokens = asset.balance ? tokenFormatter.format(
+          Number(asset.balance) / 10 ** asset.decimals
+        ) : "0";
+        const balanceUsd = asset.balanceUsd && asset.balanceUsd > 0 ? currencyFormatter.format(asset.balanceUsd) : `${balanceTokens} ${asset.symbol}`;
+        const iconSrc = getTokenIcon(asset.symbol);
+        return /* @__PURE__ */ jsx9(
+          ListRow,
+          {
+            leadingMedia: iconSrc || void 0,
+            leading: iconSrc ? void 0 : /* @__PURE__ */ jsx9(HandCoinsIcon, {}),
+            title: asset.symbol,
+            subtitle: `${balanceTokens} on ${getChainName(asset.chainId)}`,
+            meta: balanceUsd,
+            onClick: () => onSelect(asset)
+          },
+          asset.id
+        );
+      }) })
+    ] }),
     /* @__PURE__ */ jsx9(PoweredBy, {})
   ] });
 }
+DappImportAssetSelectStep.displayName = "DappImportAssetSelectStep";
 
-// src/store/index.ts
-import { createContext, createElement, useContext } from "react";
-import { useStore } from "zustand";
-import { createStore } from "zustand/vanilla";
+// src/core/dapp-imports/polymarket/index.ts
+import { createElement } from "react";
+import { formatUnits as formatUnits6 } from "viem";
 
-// src/store/transitions.ts
-function unreachable(action) {
-  throw new Error(
-    `[deposit-modal/store] Unhandled action: ${JSON.stringify(action)}`
-  );
+// 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/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;
 }
-var RESET_DEPOSIT_FIELDS = {
-  selectedAsset: null,
-  selectedSolanaToken: null,
-  amount: null,
-  targetAmount: null,
-  targetTokenPriceUsd: null,
-  balance: null,
-  balanceUsd: null,
-  inputAmountUsd: null,
-  liquidityWarning: null,
-  sourceChain: null,
-  sourceToken: null,
+
+// src/core/dapp-imports/polymarket/safe.ts
+import {
+  concat,
+  encodeFunctionData,
+  encodePacked,
+  erc20Abi as erc20Abi3,
+  pad,
+  parseAbi,
+  parseEventLogs,
+  toHex,
+  zeroAddress as zeroAddress2
+} from "viem";
+var COLLATERAL_OFFRAMP_ABI = parseAbi([
+  "function unwrap(address _asset, address _to, uint256 _amount)"
+]);
+var MULTI_SEND_ABI = parseAbi(["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: erc20Abi3,
+          functionName: "balanceOf",
+          args: [proxyWallet]
+        },
+        {
+          address: POLYMARKET_USDCE_ADDRESS,
+          abi: erc20Abi3,
+          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: encodeFunctionData({
+      abi: erc20Abi3,
+      functionName: "transfer",
+      args: [recipient, amount]
+    }),
+    operation: 0
+  };
+}
+function buildPusdUnwrapSafeTx(recipient, amount) {
+  const approveData = encodeFunctionData({
+    abi: erc20Abi3,
+    functionName: "approve",
+    args: [POLYMARKET_COLLATERAL_OFFRAMP_ADDRESS, amount]
+  });
+  const unwrapData = encodeFunctionData({
+    abi: COLLATERAL_OFFRAMP_ABI,
+    functionName: "unwrap",
+    args: [POLYMARKET_USDCE_ADDRESS, recipient, amount]
+  });
+  return {
+    to: SAFE_MULTI_SEND_CALL_ONLY_ADDRESS,
+    data: encodeFunctionData({
+      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",
+  icon: createElement("img", {
+    src: POLYMARKET_ICON_URL,
+    alt: "Polymarket",
+    style: { width: 24, height: 24, borderRadius: 6 }
+  }),
+  chainId: POLYMARKET_POLYGON_CHAIN_ID,
+  async fetchAvailability({ eoa, getPublicClient: getPublicClient2, signal }) {
+    const proxyWallet = await fetchPolymarketProxyWallet(eoa, signal);
+    if (!proxyWallet) return null;
+    if (signal?.aborted) return null;
+    const polygonClient = getPublicClient2(POLYMARKET_POLYGON_CHAIN_ID);
+    if (!polygonClient) return null;
+    const balances = await readPolymarketBalances({
+      publicClient: polygonClient,
+      proxyWallet
+    });
+    if (signal?.aborted) return null;
+    if (balances.pusd === 0n && balances.usdce === 0n) return null;
+    const assets = [];
+    if (balances.pusd > 0n) {
+      assets.push(buildAsset({ tokenKind: "pusd", proxyWallet, balance: balances.pusd }));
+    }
+    if (balances.usdce > 0n) {
+      assets.push(buildAsset({ tokenKind: "usdce", proxyWallet, balance: balances.usdce }));
+    }
+    const totalUsd = assets.reduce((sum, a) => sum + (a.balanceUsd ?? 0), 0);
+    const availability = {
+      providerId: PROVIDER_ID,
+      totalUsd,
+      assets
+    };
+    return availability;
+  },
+  async executeTransfer({ walletClient, publicClient, recipient, asset, amount }) {
+    const metadata = asset.providerMetadata;
+    const result = await executePolymarketSafeTransfer({
+      walletClient,
+      publicClient,
+      safeAddress: metadata.proxyWallet,
+      recipient,
+      amount,
+      tokenKind: metadata.tokenKind
+    });
+    return {
+      txHash: result.txHash,
+      sourceToken: result.sourceToken,
+      sourceSymbol: result.sourceSymbol,
+      sourceDecimals: 6
+    };
+  }
+};
+function buildAsset(params) {
+  const { tokenKind, proxyWallet, balance } = params;
+  const isPusd = tokenKind === "pusd";
+  const tokenAddress = isPusd ? POLYMARKET_PUSD_ADDRESS : POLYMARKET_USDCE_ADDRESS;
+  const symbol = isPusd ? "pUSD" : "USDC.e";
+  const balanceUsd = Number(formatUnits6(balance, 6));
+  const metadata = { proxyWallet, tokenKind };
+  return {
+    id: `polymarket:${tokenKind}`,
+    chainId: POLYMARKET_POLYGON_CHAIN_ID,
+    token: tokenAddress,
+    symbol,
+    name: isPusd ? "Polymarket USD" : "Polygon USDC.e",
+    decimals: 6,
+    balance: balance.toString(),
+    balanceUsd: Number.isFinite(balanceUsd) ? balanceUsd : 0,
+    source: PROVIDER_ID,
+    sourceLabel: "Polymarket",
+    reviewLabel: isPusd ? "You send pUSD from Polymarket" : "You send USDC.e from Polymarket",
+    // pUSD unwraps to USDC.e via the offramp; USDC.e is what actually
+    // arrives at the smart account, so it's also what the orchestrator
+    // bridges from.
+    depositToken: POLYMARKET_USDCE_ADDRESS,
+    depositChainId: POLYMARKET_POLYGON_CHAIN_ID,
+    providerMetadata: metadata
+  };
+}
+
+// src/core/dapp-imports/registry.ts
+var DAPP_IMPORT_PROVIDERS = [polymarketProvider];
+function getEnabledProviders(config) {
+  if (!config) return [];
+  return DAPP_IMPORT_PROVIDERS.filter(
+    (p) => config[p.id] === true
+  );
+}
+
+// src/store/index.ts
+import { createContext, createElement as createElement2, useContext } from "react";
+import { useStore } from "zustand";
+import { createStore } from "zustand/vanilla";
+
+// src/store/transitions.ts
+function unreachable(action) {
+  throw new Error(
+    `[deposit-modal/store] Unhandled action: ${JSON.stringify(action)}`
+  );
+}
+var RESET_DEPOSIT_FIELDS = {
+  selectedAsset: null,
+  selectedSolanaToken: null,
+  amount: null,
+  targetAmount: null,
+  targetTokenPriceUsd: null,
+  balance: null,
+  balanceUsd: null,
+  inputAmountUsd: null,
+  liquidityWarning: null,
+  sourceChain: null,
+  sourceToken: null,
   sourceSymbol: null,
   sourceDecimals: null
 };
+function ownerKey(owner) {
+  return owner.toString().toLowerCase();
+}
+function idleEntry(owner) {
+  return {
+    owner,
+    requestKey: null,
+    cacheKey: null,
+    status: "idle",
+    smartAccount: null,
+    sessionOwnerAddress: null,
+    solanaDepositAddress: null,
+    message: null,
+    cacheable: true,
+    attemptNonce: 0
+  };
+}
 function applyBack(state, hasWalletOptions) {
   const { step, mode } = state.flow;
   switch (step) {
@@ -2898,7 +3105,11 @@ function applyBack(state, hasWalletOptions) {
           balance: null,
           liquidityWarning: null
         },
-        flow: { ...state.flow, step: "select-asset", hasNavigatedBack: true }
+        flow: {
+          ...state.flow,
+          step: mode === "dapp-import" ? "dapp-import-asset-select" : "select-asset",
+          hasNavigatedBack: true
+        }
       };
     case "confirm":
       return {
@@ -2940,37 +3151,70 @@ function applyBack(state, hasWalletOptions) {
     case "select-asset":
     case "deposit-address":
     case "solana-token-select":
+    case "dapp-import-asset-select":
       return {
         ...state,
         flow: {
           ...state.flow,
-          step: "setup",
+          step: "connect",
           mode: null,
           isConnectSelectionConfirmed: false,
-          hasNavigatedBack: hasWalletOptions ? true : state.flow.hasNavigatedBack
+          hasNavigatedBack: true
         },
-        deposit: { ...state.deposit, ...RESET_DEPOSIT_FIELDS }
+        deposit: { ...state.deposit, ...RESET_DEPOSIT_FIELDS },
+        dappImport: {
+          ...state.dappImport,
+          activeProviderId: null,
+          selectedAsset: null
+        }
       };
+    case "connect":
     case "setup":
-      if (mode !== null && hasWalletOptions) {
+      if (mode !== null) {
         return {
           ...state,
           flow: {
             ...state.flow,
+            step: "connect",
             mode: null,
             isConnectSelectionConfirmed: false,
-            hasNavigatedBack: true
+            hasNavigatedBack: hasWalletOptions || state.flow.hasNavigatedBack
           }
         };
       }
       return state;
-    case "connect":
     case "processing":
       return state;
     default:
       return unreachable(step);
   }
 }
+function modeEntryStep(mode) {
+  switch (mode) {
+    case "wallet":
+      return "select-asset";
+    case "deposit-address":
+      return "deposit-address";
+    case "solana-wallet":
+      return "solana-token-select";
+    case "dapp-import":
+      return "dapp-import-asset-select";
+  }
+}
+function updateSetupEntry(state, owner, update) {
+  const key = ownerKey(owner);
+  const existing = state.setup.byOwner[key] ?? idleEntry(owner);
+  return {
+    ...state,
+    setup: {
+      ...state.setup,
+      byOwner: {
+        ...state.setup.byOwner,
+        [key]: update(existing)
+      }
+    }
+  };
+}
 function applyAction(state, action) {
   switch (action.type) {
     case "flow/mode-set":
@@ -2995,16 +3239,22 @@ function applyAction(state, action) {
           mode: null,
           isConnectSelectionConfirmed: false
         },
-        wallet: { ...state.wallet, selectedWalletId: null }
+        wallet: { ...state.wallet, selectedWalletId: null },
+        dappImport: {
+          ...state.dappImport,
+          activeProviderId: null,
+          selectedAsset: null
+        }
       };
     case "connect/wallet-confirmed":
+      if (!action.mode) return state;
       return {
         ...state,
         flow: {
           ...state.flow,
           mode: action.mode,
           isConnectSelectionConfirmed: true,
-          step: "setup"
+          step: modeEntryStep(action.mode)
         },
         wallet: { ...state.wallet, selectedWalletId: action.walletId }
       };
@@ -3015,7 +3265,7 @@ function applyAction(state, action) {
           ...state.flow,
           mode: "deposit-address",
           isConnectSelectionConfirmed: true,
-          step: "setup"
+          step: "deposit-address"
         }
       };
     case "connect/auto-locked":
@@ -3025,23 +3275,81 @@ function applyAction(state, action) {
           ...state.flow,
           mode: "wallet",
           isConnectSelectionConfirmed: true,
-          step: "setup"
+          step: "select-asset"
         }
       };
-    case "setup/complete":
+    case "connect/wallet-picker-requested":
       return {
         ...state,
-        deposit: {
-          ...state.deposit,
-          smartAccount: action.smartAccount,
-          smartAccountOwner: action.smartAccountOwner,
-          solanaDepositAddress: action.solanaDepositAddress ?? null
-        },
         flow: {
           ...state.flow,
-          step: state.flow.mode === "deposit-address" ? "deposit-address" : state.flow.mode === "solana-wallet" ? "solana-token-select" : "select-asset"
+          step: "connect",
+          mode: null,
+          isConnectSelectionConfirmed: false,
+          hasNavigatedBack: true
+        },
+        deposit: { ...state.deposit, ...RESET_DEPOSIT_FIELDS },
+        dappImport: {
+          ...state.dappImport,
+          activeProviderId: null,
+          selectedAsset: null
         }
       };
+    case "setup/started": {
+      const existing = state.setup.byOwner[ownerKey(action.owner)];
+      return updateSetupEntry(state, action.owner, () => ({
+        owner: action.owner,
+        requestKey: action.requestKey,
+        cacheKey: action.cacheKey,
+        status: "loading",
+        smartAccount: existing?.smartAccount ?? null,
+        sessionOwnerAddress: existing?.sessionOwnerAddress ?? null,
+        solanaDepositAddress: existing?.solanaDepositAddress ?? null,
+        message: null,
+        cacheable: action.cacheable,
+        attemptNonce: existing?.attemptNonce ?? 0
+      }));
+    }
+    case "setup/ready": {
+      const key = ownerKey(action.owner);
+      const existing = state.setup.byOwner[key];
+      if (!existing || existing.requestKey !== action.requestKey) {
+        return state;
+      }
+      return updateSetupEntry(state, action.owner, (entry) => ({
+        ...entry,
+        status: "ready",
+        smartAccount: action.result.smartAccount,
+        sessionOwnerAddress: action.result.sessionOwnerAddress,
+        solanaDepositAddress: action.result.solanaDepositAddress ?? null,
+        cacheKey: action.result.cacheKey,
+        message: null
+      }));
+    }
+    case "setup/failed": {
+      const key = ownerKey(action.owner);
+      const existing = state.setup.byOwner[key];
+      if (!existing || existing.requestKey !== action.requestKey) {
+        return state;
+      }
+      return updateSetupEntry(state, action.owner, (entry) => ({
+        ...entry,
+        status: "error",
+        message: action.message
+      }));
+    }
+    case "setup/retry-requested":
+      return updateSetupEntry(state, action.owner, (entry) => ({
+        ...entry,
+        status: "idle",
+        // Clear requestKey/cacheKey so the BG effect's
+        // "entry.requestKey !== currentRequestKey" check passes even when
+        // inputs haven't changed.
+        requestKey: null,
+        cacheKey: null,
+        message: null,
+        attemptNonce: entry.attemptNonce + 1
+      }));
     case "asset/selected":
       return {
         ...state,
@@ -3112,13 +3420,86 @@ function applyAction(state, action) {
         },
         flow: { ...state.flow, step: "processing" }
       };
+    case "dapp-import/availability-loading":
+      return {
+        ...state,
+        dappImport: {
+          ...state.dappImport,
+          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.availability,
+            [action.providerId]: action.availability
+          }
+        }
+      };
+    case "dapp-import/availability-cleared":
+      return {
+        ...state,
+        dappImport: {
+          ...state.dappImport,
+          availabilityOwner: null,
+          availability: {},
+          activeProviderId: null,
+          selectedAsset: null
+        }
+      };
+    case "dapp-import/provider-selected":
+      return {
+        ...state,
+        flow: {
+          ...state.flow,
+          mode: "dapp-import",
+          isConnectSelectionConfirmed: true,
+          step: "dapp-import-asset-select"
+        },
+        dappImport: {
+          ...state.dappImport,
+          activeProviderId: action.providerId,
+          selectedAsset: null
+        }
+      };
+    case "dapp-import/asset-selected":
+      return {
+        ...state,
+        deposit: {
+          ...state.deposit,
+          selectedAsset: action.asset
+        },
+        dappImport: {
+          ...state.dappImport,
+          selectedAsset: action.asset
+        },
+        flow: { ...state.flow, step: "amount" }
+      };
     case "back/requested":
       return applyBack(state, action.hasWalletOptions);
-    case "flow/reset":
+    case "flow/reset": {
+      const preservedByOwner = {};
+      for (const [key, entry] of Object.entries(state.setup.byOwner)) {
+        if (entry.status === "ready" && entry.smartAccount && entry.cacheKey && entry.cacheable) {
+          preservedByOwner[key] = { ...entry, message: null };
+        } else {
+          preservedByOwner[key] = idleEntry(entry.owner);
+        }
+      }
       return {
         ...state,
         flow: {
-          step: "setup",
+          step: "connect",
           mode: null,
           isConnectSelectionConfirmed: false,
           hasNavigatedBack: false
@@ -3130,9 +3511,18 @@ function applyAction(state, action) {
         processing: {
           txHash: null,
           directTransfer: false
-        }
+        },
+        // Preserve fetched availability for its recorded EOA — refetching on
+        // every modal close burns a request. Just clear active selection.
+        dappImport: {
+          ...state.dappImport,
+          activeProviderId: null,
+          selectedAsset: null
+        },
+        setup: { byOwner: preservedByOwner }
       };
-    case "target/changed":
+    }
+    case "target/changed": {
       if (state.flow.step === "processing") {
         return {
           ...state,
@@ -3143,18 +3533,20 @@ function applyAction(state, action) {
           }
         };
       }
+      const nextStep = state.flow.step === "confirm" ? "amount" : state.flow.step;
       return {
         ...state,
         deposit: {
           ...state.deposit,
           targetChain: action.targetChain,
           targetToken: action.targetToken,
-          smartAccount: null,
-          smartAccountOwner: null,
-          solanaDepositAddress: null
+          targetAmount: null,
+          targetTokenPriceUsd: null,
+          liquidityWarning: null
         },
-        flow: { ...state.flow, step: "setup" }
+        flow: { ...state.flow, step: nextStep }
       };
+    }
     default:
       return unreachable(action);
   }
@@ -3173,9 +3565,6 @@ function createInitialState(overrides) {
       selectedWalletId: null
     },
     deposit: {
-      smartAccount: null,
-      smartAccountOwner: null,
-      solanaDepositAddress: null,
       targetChain: overrides.targetChain,
       targetToken: overrides.targetToken,
       sourceChain: null,
@@ -3195,12 +3584,38 @@ function createInitialState(overrides) {
     processing: {
       txHash: null,
       directTransfer: false
+    },
+    dappImport: {
+      activeProviderId: null,
+      availabilityOwner: null,
+      availability: {},
+      selectedAsset: null
+    },
+    setup: {
+      byOwner: {}
     }
   };
 }
 
 // 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) {
@@ -3217,7 +3632,7 @@ function DepositStoreProvider({
   store,
   children
 }) {
-  return createElement(
+  return createElement2(
     DepositStoreContext.Provider,
     { value: store },
     children
@@ -3237,8 +3652,275 @@ function useDepositStore(selector) {
   return useStore(store, selector);
 }
 
+// src/core/account-setup.ts
+var SetupError = class extends Error {
+  constructor(message, category) {
+    super(message);
+    this.category = category;
+    this.name = "SetupError";
+  }
+};
+async function resolveSessionOwner(eoaAddress) {
+  const local = loadSessionOwnerFromStorage(eoaAddress);
+  if (local) {
+    return {
+      account: accountFromPrivateKey(local.privateKey),
+      address: local.address
+    };
+  }
+  const created = createSessionOwnerKey();
+  saveSessionOwnerToStorage(eoaAddress, created.privateKey, created.address);
+  return { account: created.account, address: created.address };
+}
+function stableStringify(value) {
+  if (value === null || typeof value !== "object") {
+    return JSON.stringify(value);
+  }
+  if (Array.isArray(value)) {
+    return `[${value.map(stableStringify).join(",")}]`;
+  }
+  const obj = value;
+  const keys = Object.keys(obj).sort();
+  const entries = keys.filter((k) => obj[k] !== void 0).map((k) => `${JSON.stringify(k)}:${stableStringify(obj[k])}`);
+  return `{${entries.join(",")}}`;
+}
+function computeRequestKey(input, sessionOwnerAddress) {
+  return stableStringify({
+    ownerAddress: input.ownerAddress.toLowerCase(),
+    sessionOwnerAddress: sessionOwnerAddress.toLowerCase(),
+    targetChain: input.targetChain,
+    targetToken: input.targetToken.toLowerCase(),
+    recipient: input.recipient?.toLowerCase(),
+    outputTokenRules: input.outputTokenRules ?? null,
+    rejectUnmapped: input.rejectUnmapped ?? null,
+    signerAddress: input.signerAddress.toLowerCase(),
+    sessionChainIds: input.sessionChainIds ?? null,
+    enableSolana: input.enableSolana ?? true,
+    forceRegister: input.forceRegister ?? false,
+    postBridgeActions: input.postBridgeActions ?? null
+  });
+}
+function computeCacheKey(input, sessionOwnerAddress) {
+  return stableStringify({
+    ownerAddress: input.ownerAddress.toLowerCase(),
+    sessionOwnerAddress: sessionOwnerAddress.toLowerCase(),
+    targetChain: input.targetChain,
+    targetToken: input.targetToken.toLowerCase(),
+    recipient: input.recipient?.toLowerCase(),
+    outputTokenRules: input.outputTokenRules ?? null,
+    rejectUnmapped: input.rejectUnmapped ?? null,
+    signerAddress: input.signerAddress.toLowerCase(),
+    sessionChainIds: input.sessionChainIds ?? null,
+    enableSolana: input.enableSolana ?? true
+  });
+}
+function computeIsCacheable(input) {
+  return !input.forceRegister && !(input.postBridgeActions?.length ?? 0);
+}
+var SETUP_REQUEST_DEDUPE_TTL_MS = 3e4;
+var setupRequestDedupe = /* @__PURE__ */ new Map();
+function readDedupedAccountSetupResult(requestKey) {
+  const now = Date.now();
+  const existing = setupRequestDedupe.get(requestKey);
+  if (existing?.settled && existing.expiresAt > now && existing.result) {
+    return existing.result;
+  }
+  return null;
+}
+async function runAccountSetup(input, deps) {
+  const { service, debug } = deps;
+  const enableSolana = input.enableSolana ?? true;
+  try {
+    const sessionOwner = await resolveSessionOwner(input.ownerAddress);
+    const cacheKey = computeCacheKey(input, sessionOwner.address);
+    debugLog(debug, "account-setup", "setup:start", {
+      owner: input.ownerAddress,
+      sessionOwner: sessionOwner.address,
+      hasPostBridgeActions: Boolean(input.postBridgeActions?.length),
+      forceRegister: input.forceRegister ?? false
+    });
+    const setup = await service.setupAccount({
+      ownerAddress: input.ownerAddress,
+      sessionOwnerAddress: sessionOwner.address,
+      targetChain: toEvmCaip2(input.targetChain),
+      targetToken: input.targetToken,
+      recipient: input.recipient,
+      postBridgeActions: input.postBridgeActions,
+      outputTokenRules: input.outputTokenRules,
+      rejectUnmapped: input.rejectUnmapped,
+      signerAddress: input.signerAddress,
+      sessionChainIds: input.sessionChainIds,
+      forceRegister: input.forceRegister
+    });
+    const smartAccount = setup.smartAccount;
+    if (!setup.needsRegistration) {
+      return {
+        smartAccount,
+        sessionOwnerAddress: sessionOwner.address,
+        solanaDepositAddress: enableSolana ? setup.solanaDepositAddress : void 0,
+        cacheKey,
+        isRegistered: true
+      };
+    }
+    if (!setup.accountParams || !setup.sessionDetailsUnsigned) {
+      throw new SetupError(
+        "Couldn't prepare account.",
+        "server"
+      );
+    }
+    if (!sessionOwner.account.signTypedData) {
+      throw new SetupError(
+        "Couldn't prepare account.",
+        "client"
+      );
+    }
+    const typedData = setup.sessionDetailsUnsigned.data;
+    const signature = await sessionOwner.account.signTypedData({
+      domain: typedData.domain,
+      types: typedData.types,
+      primaryType: typedData.primaryType,
+      message: typedData.message
+    });
+    const sessionDetails = buildSessionDetails(
+      setup.sessionDetailsUnsigned,
+      signature
+    );
+    const registerResult = await service.registerAccount({
+      address: smartAccount,
+      accountParams: {
+        factory: setup.accountParams.factory,
+        factoryData: setup.accountParams.factoryData,
+        sessionDetails
+      },
+      eoaAddress: input.ownerAddress,
+      sessionOwner: sessionOwner.address,
+      target: {
+        chain: toEvmCaip2(input.targetChain),
+        token: input.targetToken,
+        ...input.recipient && { recipient: input.recipient },
+        ...input.postBridgeActions?.length && {
+          postBridgeActions: input.postBridgeActions
+        },
+        ...input.outputTokenRules?.length && {
+          outputTokenRules: input.outputTokenRules
+        },
+        ...input.rejectUnmapped != null && {
+          rejectUnmapped: input.rejectUnmapped
+        }
+      }
+    });
+    return {
+      smartAccount,
+      sessionOwnerAddress: sessionOwner.address,
+      solanaDepositAddress: enableSolana ? registerResult.solanaDepositAddress : void 0,
+      cacheKey,
+      isRegistered: true
+    };
+  } catch (error) {
+    debugError(debug, "account-setup", "setup:failed", error, {
+      owner: input.ownerAddress
+    });
+    if (error instanceof SetupError) throw error;
+    throw mapError(error);
+  }
+}
+function runAccountSetupDeduped(input, deps, requestKey) {
+  const now = Date.now();
+  const existing = setupRequestDedupe.get(requestKey);
+  if (existing && (!existing.settled || existing.expiresAt > now)) {
+    debugLog(deps.debug, "account-setup", "setup:dedupe-hit", {
+      owner: input.ownerAddress,
+      forceRegister: input.forceRegister ?? false
+    });
+    return existing.promise;
+  }
+  const entry = {
+    promise: runAccountSetup(input, deps),
+    settled: false,
+    expiresAt: Number.POSITIVE_INFINITY,
+    result: null
+  };
+  setupRequestDedupe.set(requestKey, entry);
+  entry.promise.then((result) => {
+    entry.settled = true;
+    entry.result = result;
+    entry.expiresAt = Date.now() + SETUP_REQUEST_DEDUPE_TTL_MS;
+    const cleanupTimer = setTimeout(() => {
+      if (setupRequestDedupe.get(requestKey) === entry) {
+        setupRequestDedupe.delete(requestKey);
+      }
+    }, SETUP_REQUEST_DEDUPE_TTL_MS);
+    if (typeof cleanupTimer === "object" && cleanupTimer && "unref" in cleanupTimer && typeof cleanupTimer.unref === "function") {
+      cleanupTimer.unref();
+    }
+  }).catch(() => {
+    if (setupRequestDedupe.get(requestKey) === entry) {
+      setupRequestDedupe.delete(requestKey);
+    }
+  });
+  return entry.promise;
+}
+function mapError(error) {
+  if (error instanceof TypeError) {
+    return new SetupError(
+      "Couldn't reach the deposit service. Please check your connection.",
+      "network"
+    );
+  }
+  if (error instanceof Error) {
+    const statusMatch = error.message.match(/\b(4\d{2}|5\d{2})\b/);
+    if (statusMatch) {
+      const status = Number(statusMatch[1]);
+      if (status >= 500) {
+        return new SetupError(
+          "Deposit service is temporarily unavailable. Please try again shortly.",
+          "server"
+        );
+      }
+      return new SetupError("Couldn't prepare account.", "client");
+    }
+    return new SetupError(
+      "Deposit service is temporarily unavailable. Please try again shortly.",
+      "unknown"
+    );
+  }
+  return new SetupError(
+    "Deposit service is temporarily unavailable. Please try again shortly.",
+    "unknown"
+  );
+}
+
 // src/DepositFlow.tsx
-import { jsx as jsx10, jsxs as jsxs10 } from "react/jsx-runtime";
+import { Fragment as Fragment3, jsx as jsx10, jsxs as jsxs10 } from "react/jsx-runtime";
+function AccountPreparingSkeleton({
+  errorMessage,
+  onRetry
+}) {
+  return /* @__PURE__ */ jsxs10("div", { className: "rs-step", children: [
+    /* @__PURE__ */ jsx10("div", { className: "rs-step-body", style: { paddingTop: 0 }, children: /* @__PURE__ */ jsx10("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx10("div", { className: "rs-loading-text", children: errorMessage ? /* @__PURE__ */ jsxs10(Fragment3, { children: [
+      /* @__PURE__ */ jsx10("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t prepare account" }),
+      /* @__PURE__ */ jsx10("div", { className: "rs-loading-subtitle", children: errorMessage })
+    ] }) : /* @__PURE__ */ jsx10("div", { className: "rs-loading-title", children: "Preparing\u2026" }) }) }) }),
+    errorMessage && onRetry && /* @__PURE__ */ jsx10("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx10(
+      "button",
+      {
+        type: "button",
+        className: "rs-button rs-button--default rs-button--full-width",
+        onClick: onRetry,
+        children: /* @__PURE__ */ jsx10("span", { children: "Try again" })
+      }
+    ) })
+  ] });
+}
+function SetupUpdatingBanner({
+  status,
+  message
+}) {
+  if (status === "error") {
+    return /* @__PURE__ */ jsx10("div", { className: "rs-deposit-address-error", role: "alert", children: message ?? "Couldn't update deposit details \u2014 please retry." });
+  }
+  return /* @__PURE__ */ jsx10("div", { className: "rs-loading-state", style: { padding: "8px 16px" }, children: /* @__PURE__ */ jsx10("div", { className: "rs-loading-text", children: /* @__PURE__ */ jsx10("div", { className: "rs-loading-subtitle", children: "Updating deposit details\u2026" }) }) });
+}
 var QR_AUTO_ADVANCE_HYDRATION_GRACE_MS = 1e3;
 function isSameRoute2(sourceChain, sourceToken, targetChain, targetToken) {
   return sourceChain === targetChain && sourceToken.toLowerCase() === targetToken.toLowerCase();
@@ -3246,37 +3928,39 @@ function isSameRoute2(sourceChain, sourceToken, targetChain, targetToken) {
 function getAddressKey(address) {
   return address ? address.toLowerCase() : null;
 }
-function deriveStep(flow, d, p) {
+function deriveStep(flow, d, p, activeEntry) {
   const flowStep = flow.step;
+  const smartAccount = activeEntry.smartAccount;
+  const solanaDepositAddress = activeEntry.solanaDepositAddress;
   switch (flowStep) {
     case "connect":
     case "setup":
       return { type: "setup" };
     case "deposit-address":
-      if (!d.smartAccount) return { type: "setup" };
+      if (!smartAccount) return { type: "setup" };
       return {
         type: "deposit-address",
-        smartAccount: d.smartAccount,
-        solanaDepositAddress: d.solanaDepositAddress ?? void 0
+        smartAccount,
+        solanaDepositAddress: solanaDepositAddress ?? void 0
       };
     case "select-asset":
-      if (!d.smartAccount) return { type: "setup" };
-      return { type: "select-asset", smartAccount: d.smartAccount };
+      if (!smartAccount) return { type: "setup" };
+      return { type: "select-asset", smartAccount };
     case "amount":
-      if (!d.smartAccount || !d.selectedAsset) return { type: "setup" };
+      if (!smartAccount || !d.selectedAsset) return { type: "setup" };
       return {
         type: "amount",
-        smartAccount: d.smartAccount,
+        smartAccount,
         asset: d.selectedAsset,
         amount: d.amount ?? void 0
       };
     case "confirm":
-      if (!d.smartAccount || !d.selectedAsset || !d.amount || !d.targetAmount) {
+      if (!smartAccount || !d.selectedAsset || !d.amount || !d.targetAmount) {
         return { type: "setup" };
       }
       return {
         type: "confirm",
-        smartAccount: d.smartAccount,
+        smartAccount,
         asset: d.selectedAsset,
         amount: d.amount,
         targetAmount: d.targetAmount,
@@ -3285,33 +3969,36 @@ function deriveStep(flow, d, p) {
         liquidityWarning: d.liquidityWarning ?? void 0
       };
     case "solana-token-select":
-      if (!d.smartAccount || !d.solanaDepositAddress) return { type: "setup" };
+      if (!smartAccount || !solanaDepositAddress) return { type: "setup" };
       return {
         type: "solana-token-select",
-        smartAccount: d.smartAccount,
-        solanaDepositAddress: d.solanaDepositAddress
+        smartAccount,
+        solanaDepositAddress
       };
     case "solana-amount":
-      if (!d.smartAccount || !d.solanaDepositAddress || !d.selectedSolanaToken || d.balance === null || d.balanceUsd === null) {
+      if (!smartAccount || !solanaDepositAddress || !d.selectedSolanaToken || d.balance === null || d.balanceUsd === null) {
         return { type: "setup" };
       }
       return {
         type: "solana-amount",
-        smartAccount: d.smartAccount,
-        solanaDepositAddress: d.solanaDepositAddress,
+        smartAccount,
+        solanaDepositAddress,
         token: d.selectedSolanaToken,
         balance: d.balance,
         balanceUsd: d.balanceUsd,
         inputAmountUsd: d.inputAmountUsd ?? void 0
       };
+    case "dapp-import-asset-select":
+      if (!smartAccount) return { type: "setup" };
+      return { type: "dapp-import-asset-select", smartAccount };
     case "solana-confirm":
-      if (!d.smartAccount || !d.solanaDepositAddress || !d.selectedSolanaToken || !d.amount || !d.inputAmountUsd || !d.targetAmount || d.balance === null || d.balanceUsd === null) {
+      if (!smartAccount || !solanaDepositAddress || !d.selectedSolanaToken || !d.amount || !d.inputAmountUsd || !d.targetAmount || d.balance === null || d.balanceUsd === null) {
         return { type: "setup" };
       }
       return {
         type: "solana-confirm",
-        smartAccount: d.smartAccount,
-        solanaDepositAddress: d.solanaDepositAddress,
+        smartAccount,
+        solanaDepositAddress,
         token: d.selectedSolanaToken,
         sourceAmount: d.amount,
         inputAmountUsd: d.inputAmountUsd,
@@ -3321,13 +4008,13 @@ function deriveStep(flow, d, p) {
         balanceUsd: d.balanceUsd
       };
     case "processing":
-      if (!d.smartAccount || !p.txHash || !d.amount || d.sourceChain === null || d.sourceChain === "unknown" || !d.sourceToken) {
+      if (!smartAccount || !p.txHash || !d.amount || d.sourceChain === null || d.sourceChain === "unknown" || !d.sourceToken) {
         return { type: "setup" };
       }
       return {
         type: "processing",
-        smartAccount: d.smartAccount,
-        solanaDepositAddress: d.solanaDepositAddress ?? void 0,
+        smartAccount,
+        solanaDepositAddress: solanaDepositAddress ?? void 0,
         txHash: p.txHash,
         sourceChain: d.sourceChain,
         sourceToken: d.sourceToken,
@@ -3338,6 +4025,19 @@ function deriveStep(flow, d, p) {
       };
   }
 }
+function resolveOwnerForMode(mode, ctx) {
+  switch (mode) {
+    case "deposit-address":
+    case "solana-wallet":
+      return ctx.dappAddress ?? null;
+    case "wallet":
+      return ctx.walletOwner ?? null;
+    case "dapp-import":
+      return ctx.dappImportOwner ?? null;
+    default:
+      return null;
+  }
+}
 function DepositFlow({
   dappWalletClient,
   dappPublicClient,
@@ -3358,6 +4058,7 @@ function DepositFlow({
   forceRegister = false,
   waitForFinalTx = true,
   enableSolana = true,
+  dappImports,
   reownWallet,
   onConnect,
   onDisconnect,
@@ -3385,53 +4086,38 @@ function DepositFlow({
   const flowSlice = useDepositStore((s) => s.flow);
   const depositSlice = useDepositStore((s) => s.deposit);
   const processingSlice = useDepositStore((s) => s.processing);
-  const step = useMemo6(
-    () => deriveStep(flowSlice, depositSlice, processingSlice),
-    [flowSlice, depositSlice, processingSlice]
-  );
+  const setupSlice = useDepositStore((s) => s.setup);
   const flowMode = flowSlice.mode;
   const isConnectSelectionConfirmed = flowSlice.isConnectSelectionConfirmed;
   const hasNavigatedBack = flowSlice.hasNavigatedBack;
   const selectedWalletId = useDepositStore(selectedWalletIdSelector);
-  const setFlowMode = useCallback4(
-    (mode) => storeApi.dispatch({ type: "flow/mode-set", mode }),
-    [storeApi]
-  );
-  const setIsConnectSelectionConfirmed = useCallback4(
-    (value) => storeApi.dispatch({ type: "flow/connect-confirmed-set", value }),
-    [storeApi]
-  );
-  const setSelectedWalletId = useCallback4(
-    (walletId) => storeApi.dispatch({ type: "wallet/id-selected", walletId }),
-    [storeApi]
-  );
-  const [totalBalanceUsd, setTotalBalanceUsd] = useState10(0);
-  const [hasQrAutoAdvanceGraceElapsed, setHasQrAutoAdvanceGraceElapsed] = useState10(() => !hasInitialWalletHydrationPending);
-  const portfolioAssetsRef = useRef6([]);
-  const stableWalletSignerRef = useRef6(null);
-  const stableWalletSelectionKeyRef = useRef6(null);
-  const logFlow = useCallback4(
+  const [totalBalanceUsd, setTotalBalanceUsd] = useState9(0);
+  const [hasQrAutoAdvanceGraceElapsed, setHasQrAutoAdvanceGraceElapsed] = useState9(() => !hasInitialWalletHydrationPending);
+  const portfolioAssetsRef = useRef5([]);
+  const stableWalletSignerRef = useRef5(null);
+  const stableWalletSelectionKeyRef = useRef5(null);
+  const logFlow = useCallback3(
     (message, data) => {
       debugLog(debug, "deposit-flow", message, data);
     },
     [debug]
   );
-  const logFlowError = useCallback4(
+  const logFlowError = useCallback3(
     (message, error, data) => {
       debugError(debug, "deposit-flow", message, error, data);
     },
     [debug]
   );
-  const handleAssetsLoaded = useCallback4((assets) => {
+  const handleAssetsLoaded = useCallback3((assets) => {
     portfolioAssetsRef.current = assets;
   }, []);
-  const getTokenPriceUsd = useCallback4((symbol) => {
+  const getTokenPriceUsd = useCallback3((symbol) => {
     const sym = symbol.toLowerCase();
     for (const asset of portfolioAssetsRef.current) {
       if (asset.symbol.toLowerCase() === sym && asset.balanceUsd && asset.balance) {
         try {
           const balanceUnits = Number(
-            formatUnits6(BigInt(asset.balance), asset.decimals)
+            formatUnits7(BigInt(asset.balance), asset.decimals)
           );
           if (balanceUnits > 0) return asset.balanceUsd / balanceUnits;
         } catch {
@@ -3507,8 +4193,8 @@ function DepositFlow({
   const isWalletHydrationPending = Boolean(
     dappAddress && !hasWalletOptions && (hasDappWalletClientProp && dappWalletClient === void 0 || reownWallet && !hasReownSession && !reownWallet.isReady)
   );
-  const showConnectStep = flowMode === null && !canAutoLock && !isConnectSelectionConfirmed;
-  useEffect9(() => {
+  const showConnectStep = flowMode === null && !isConnectSelectionConfirmed;
+  useEffect8(() => {
     if (!isWalletHydrationPending) {
       setHasQrAutoAdvanceGraceElapsed(true);
       return;
@@ -3520,7 +4206,7 @@ function DepositFlow({
     return () => window.clearTimeout(timeout);
   }, [isWalletHydrationPending]);
   const walletSelectionKey = useMemo6(() => {
-    if (flowMode !== "wallet") return null;
+    if (flowMode !== "wallet" && flowMode !== "dapp-import") return null;
     if (canAutoLock) {
       return getAddressKey(connectedWalletAddress);
     }
@@ -3599,8 +4285,8 @@ function DepositFlow({
     reownWallet,
     targetChain
   ]);
-  useEffect9(() => {
-    if (flowMode !== "wallet") {
+  useEffect8(() => {
+    if (flowMode !== "wallet" && flowMode !== "dapp-import") {
       stableWalletSelectionKeyRef.current = null;
       stableWalletSignerRef.current = null;
       return;
@@ -3624,7 +4310,7 @@ function DepositFlow({
         switchChain: void 0
       };
     }
-    if (flowMode !== "wallet") {
+    if (flowMode !== "wallet" && flowMode !== "dapp-import") {
       return null;
     }
     if (walletSignerContext) {
@@ -3642,8 +4328,93 @@ function DepositFlow({
     walletSignerContext,
     walletSelectionKey
   ]);
-  const sessionKeyAddress = dappAddress ?? signerContext?.ownerAddress ?? null;
-  const handleBack = useCallback4(() => {
+  const selectedEvmWalletOwner = useMemo6(() => {
+    if (!selectedWalletId) return null;
+    const opt = walletOptions.find((o) => o.id === selectedWalletId);
+    if (opt?.kind === "external" && opt.address) {
+      return opt.address;
+    }
+    if (opt?.kind === "connected" && opt.address) {
+      return opt.address;
+    }
+    return null;
+  }, [selectedWalletId, walletOptions]);
+  const dappImportOwner = useMemo6(() => {
+    if (selectedEvmWalletOwner) return selectedEvmWalletOwner;
+    if (reownWallet?.address && reownWallet.isConnected) {
+      return reownWallet.address;
+    }
+    if (connectedWalletAddress) return connectedWalletAddress;
+    return null;
+  }, [
+    selectedEvmWalletOwner,
+    reownWallet?.address,
+    reownWallet?.isConnected,
+    connectedWalletAddress
+  ]);
+  const activeOwner = useMemo6(
+    () => resolveOwnerForMode(flowMode, {
+      dappAddress,
+      walletOwner: signerContext?.ownerAddress ?? (canAutoLock ? connectedWalletAddress : selectedEvmWalletOwner),
+      dappImportOwner
+    }),
+    [
+      flowMode,
+      dappAddress,
+      signerContext?.ownerAddress,
+      canAutoLock,
+      connectedWalletAddress,
+      selectedEvmWalletOwner,
+      dappImportOwner
+    ]
+  );
+  const activeEntry = useMemo6(
+    () => readSetupForOwner(setupSlice, activeOwner),
+    [setupSlice, activeOwner]
+  );
+  const lastActiveSetupLifecycleKeyRef = useRef5(null);
+  useEffect8(() => {
+    if (!flowMode || !isConnectSelectionConfirmed) {
+      lastActiveSetupLifecycleKeyRef.current = null;
+      return;
+    }
+    if (!activeOwner || activeEntry.status !== "ready" || !activeEntry.smartAccount) {
+      return;
+    }
+    const lifecycleKey = [
+      activeOwner.toLowerCase(),
+      activeEntry.smartAccount.toLowerCase(),
+      activeEntry.solanaDepositAddress ?? ""
+    ].join(":");
+    if (lastActiveSetupLifecycleKeyRef.current === lifecycleKey) {
+      return;
+    }
+    lastActiveSetupLifecycleKeyRef.current = lifecycleKey;
+    onLifecycleRef.current?.({
+      type: "smart-account-changed",
+      evm: activeEntry.smartAccount,
+      solana: activeEntry.solanaDepositAddress ?? null
+    });
+    onLifecycleRef.current?.({
+      type: "connected",
+      address: activeOwner,
+      smartAccount: activeEntry.smartAccount
+    });
+  }, [
+    flowMode,
+    isConnectSelectionConfirmed,
+    activeOwner,
+    activeEntry.status,
+    activeEntry.smartAccount,
+    activeEntry.solanaDepositAddress,
+    onLifecycleRef
+  ]);
+  const effectiveStep = useMemo6(
+    () => deriveStep(flowSlice, depositSlice, processingSlice, activeEntry),
+    [flowSlice, depositSlice, processingSlice, activeEntry]
+  );
+  const step = effectiveStep;
+  const handleBack = useCallback3(() => {
     const stepBeforeBack = storeApi.getState().flow.step;
     storeApi.dispatch({
       type: "back/requested",
@@ -3653,16 +4424,16 @@ function DepositFlow({
       portfolioAssetsRef.current = [];
     }
   }, [storeApi, hasWalletOptions, reownWallet]);
-  const canGoBackFromHere = step.type === "deposit-address" || step.type === "solana-token-select" || step.type === "solana-amount" || step.type === "solana-confirm" || step.type === "amount" || step.type === "confirm" || step.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" || effectiveStep.type === "dapp-import-asset-select" || effectiveStep.type === "select-asset" && signerContext && !canAutoLock;
   const currentBackHandler = canGoBackFromHere ? handleBack : void 0;
-  const currentScreen = showConnectStep ? "connect" : step.type;
-  useEffect9(() => {
+  const currentScreen = showConnectStep ? "connect" : effectiveStep.type;
+  useEffect8(() => {
     onStepChangeRef.current?.(currentBackHandler, currentScreen);
   }, [currentBackHandler, currentScreen, onStepChangeRef]);
-  const stepSendToken = step.type === "amount" ? step.asset.symbol : null;
-  const stepOpenEventKey = step.type === "select-asset" ? "select-asset" : step.type === "deposit-address" ? "deposit-address" : step.type === "amount" && stepSendToken ? `amount:${stepSendToken.toLowerCase()}` : null;
-  const lastStepOpenEventKeyRef = useRef6(null);
-  useEffect9(() => {
+  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 = useRef5(null);
+  useEffect8(() => {
     if (!stepOpenEventKey) {
       lastStepOpenEventKeyRef.current = null;
       return;
@@ -3671,13 +4442,13 @@ function DepositFlow({
       return;
     }
     lastStepOpenEventKeyRef.current = stepOpenEventKey;
-    if (step.type === "select-asset") {
+    if (effectiveStep.type === "select-asset") {
       onEventRef.current?.({
         type: "deposit_modal_connected_wallet_select_source_open",
         total_balance_in_external_wallet: totalBalanceUsd,
         pred_balance: totalBalanceUsd
       });
-    } else if (step.type === "deposit-address") {
+    } else if (effectiveStep.type === "deposit-address") {
       const chainName = getChainName(targetChain);
       const tokenSymbol = getTokenSymbol(targetToken, targetChain);
       onEventRef.current?.({
@@ -3686,7 +4457,7 @@ function DepositFlow({
         default_token: tokenSymbol,
         pred_balance: totalBalanceUsd
       });
-    } else if (step.type === "amount" && stepSendToken) {
+    } else if (effectiveStep.type === "amount" && stepSendToken) {
       const receiveSymbol = getTokenSymbol(targetToken, targetChain);
       onEventRef.current?.({
         type: "deposit_modal_connected_wallet_enter_value_open",
@@ -3696,7 +4467,7 @@ function DepositFlow({
       });
     }
   }, [
-    step.type,
+    effectiveStep.type,
     stepOpenEventKey,
     stepSendToken,
     targetChain,
@@ -3704,9 +4475,9 @@ function DepositFlow({
     totalBalanceUsd,
     onEventRef
   ]);
-  useEffect9(() => {
+  useEffect8(() => {
     logFlow("state:changed", {
-      step: step.type,
+      step: effectiveStep.type,
       flowMode,
       targetChain,
       targetToken,
@@ -3716,11 +4487,11 @@ function DepositFlow({
     flowMode,
     logFlow,
     selectedWalletId,
-    step.type,
+    effectiveStep.type,
     targetChain,
     targetToken
   ]);
-  useEffect9(() => {
+  useEffect8(() => {
     onLifecycleRef.current?.({
       type: "balance-changed",
       totalUsd: totalBalanceUsd
@@ -3728,16 +4499,170 @@ function DepositFlow({
   }, [totalBalanceUsd, onLifecycleRef]);
   const isDepositAddressMode = flowMode === "deposit-address";
   const isSolanaWalletMode = flowMode === "solana-wallet";
-  const handleSelectProvider = useCallback4(() => {
-    setFlowMode("wallet");
-  }, [setFlowMode]);
-  const handleSelectSolanaWallet = useCallback4(() => {
-    setFlowMode("solana-wallet");
-  }, [setFlowMode]);
-  const handleSelectTransferCrypto = useCallback4(() => {
-    setFlowMode("deposit-address");
-  }, [setFlowMode]);
-  const handleNewDeposit = useCallback4(() => {
+  const isDappImportMode = flowMode === "dapp-import";
+  const handleSelectTransferCrypto = useCallback3(() => {
+    storeApi.dispatch({ type: "connect/transfer-crypto-selected" });
+  }, [storeApi]);
+  const handleConfirmWallet = useCallback3(
+    (walletId) => {
+      const selectedOption = walletOptions.find((o) => o.id === walletId);
+      const mode = enableSolana && selectedOption?.kind === "solana" ? "solana-wallet" : "wallet";
+      storeApi.dispatch({
+        type: "connect/wallet-confirmed",
+        walletId,
+        mode
+      });
+    },
+    [walletOptions, enableSolana, storeApi]
+  );
+  const enabledDappImportProviders = useMemo6(
+    () => getEnabledProviders(dappImports),
+    [dappImports]
+  );
+  const handleSelectDappImport = useCallback3(
+    (providerId) => {
+      const owner = dappImportOwner;
+      if (owner) {
+        const wallet = walletOptions.find(
+          (o) => (o.address ?? null)?.toLowerCase() === owner.toLowerCase()
+        );
+        if (wallet) {
+          storeApi.dispatch({
+            type: "wallet/id-selected",
+            walletId: wallet.id
+          });
+        }
+      }
+      storeApi.dispatch({
+        type: "dapp-import/provider-selected",
+        providerId
+      });
+    },
+    [storeApi, walletOptions, dappImportOwner]
+  );
+  const handleDappImportAssetSelected = useCallback3(
+    (asset) => {
+      storeApi.dispatch({ type: "dapp-import/asset-selected", asset });
+    },
+    [storeApi]
+  );
+  useEffect8(() => {
+    if (!dappImportOwner || enabledDappImportProviders.length === 0) {
+      storeApi.dispatch({ type: "dapp-import/availability-cleared" });
+      return;
+    }
+    const controller = new AbortController();
+    for (const provider of enabledDappImportProviders) {
+      storeApi.dispatch({
+        type: "dapp-import/availability-loading",
+        providerId: provider.id,
+        owner: dappImportOwner
+      });
+      provider.fetchAvailability({
+        eoa: dappImportOwner,
+        getPublicClient: (chainId) => {
+          try {
+            return getPublicClient(chainId);
+          } catch {
+            return null;
+          }
+        },
+        signal: controller.signal
+      }).then((availability) => {
+        if (controller.signal.aborted) return;
+        storeApi.dispatch({
+          type: "dapp-import/availability-loaded",
+          providerId: provider.id,
+          owner: dappImportOwner,
+          availability
+        });
+      }).catch(() => {
+        if (controller.signal.aborted) return;
+        storeApi.dispatch({
+          type: "dapp-import/availability-loaded",
+          providerId: provider.id,
+          owner: dappImportOwner,
+          availability: null
+        });
+      });
+    }
+    return () => controller.abort();
+  }, [dappImportOwner, enabledDappImportProviders, storeApi]);
+  const dappImportAvailability = useDepositStore((s) => s.dappImport.availability);
+  const dappImportAvailabilityOwner = useDepositStore(
+    (s) => s.dappImport.availabilityOwner
+  );
+  const activeDappImportProviderId = useDepositStore(
+    (s) => s.dappImport.activeProviderId
+  );
+  const connectStepDappImports = useMemo6(
+    () => enabledDappImportProviders.map((provider) => {
+      const availabilityEntry = dappImportOwner && dappImportAvailabilityOwner?.toLowerCase() === dappImportOwner.toLowerCase() ? dappImportAvailability[provider.id] : void 0;
+      const dappImportSetup = readSetupForOwner(setupSlice, dappImportOwner);
+      const baseRow = {
+        id: provider.id,
+        label: provider.label,
+        icon: provider.icon
+      };
+      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
+        }
+      };
+    }),
+    [
+      enabledDappImportProviders,
+      dappImportAvailability,
+      dappImportAvailabilityOwner,
+      setupSlice,
+      dappImportOwner
+    ]
+  );
+  const activeDappImportProvider = useMemo6(() => {
+    if (!activeDappImportProviderId) return null;
+    return enabledDappImportProviders.find(
+      (p) => p.id === activeDappImportProviderId
+    ) ?? null;
+  }, [activeDappImportProviderId, enabledDappImportProviders]);
+  const activeDappImportAvailability = useMemo6(() => {
+    if (!activeDappImportProviderId) return null;
+    if (!dappImportOwner || dappImportAvailabilityOwner?.toLowerCase() !== dappImportOwner.toLowerCase()) {
+      return null;
+    }
+    const entry = dappImportAvailability[activeDappImportProviderId];
+    if (!entry || entry === "loading") return null;
+    return entry;
+  }, [
+    activeDappImportProviderId,
+    dappImportAvailability,
+    dappImportAvailabilityOwner,
+    dappImportOwner
+  ]);
+  const handleNewDeposit = useCallback3(() => {
     onLifecycleRef.current?.({
       type: "smart-account-changed",
       evm: null,
@@ -3748,64 +4673,149 @@ function DepositFlow({
     stableWalletSignerRef.current = null;
     stableWalletSelectionKeyRef.current = null;
   }, [onLifecycleRef, storeApi]);
-  const handleSetupComplete = useCallback4(
-    (smartAccount, solanaDepositAddress) => {
-      logFlow("setup:complete", {
-        smartAccount,
-        hasSolanaDepositAddress: Boolean(solanaDepositAddress),
-        flowMode: isDepositAddressMode ? "deposit-address" : isSolanaWalletMode ? "solana-wallet" : "wallet"
-      });
-      onLifecycleRef.current?.({
-        type: "smart-account-changed",
-        evm: smartAccount,
-        solana: solanaDepositAddress ?? null
-      });
-      if (isSolanaWalletMode && !solanaDepositAddress) {
-        onErrorRef.current?.({
-          message: "Solana deposit address not available. Please try again.",
-          code: "SOLANA_SETUP_FAILED"
-        });
-        return;
-      }
-      if (!sessionKeyAddress) return;
-      storeApi.dispatch({
-        type: "setup/complete",
-        smartAccount,
-        smartAccountOwner: sessionKeyAddress,
-        solanaDepositAddress
-      });
-    },
+  const setupInputBase = useMemo6(
+    () => ({
+      targetChain,
+      targetToken,
+      signerAddress,
+      sessionChainIds,
+      recipient,
+      postBridgeActions,
+      outputTokenRules,
+      rejectUnmapped,
+      forceRegister,
+      enableSolana
+    }),
     [
-      isDepositAddressMode,
-      isSolanaWalletMode,
-      logFlow,
-      onErrorRef,
-      onLifecycleRef,
-      sessionKeyAddress,
-      storeApi
+      targetChain,
+      targetToken,
+      signerAddress,
+      sessionChainIds,
+      recipient,
+      postBridgeActions,
+      outputTokenRules,
+      rejectUnmapped,
+      forceRegister,
+      enableSolana
     ]
   );
-  const cachedSetupCompatible = Boolean(
-    flowMode && depositSlice.smartAccount && depositSlice.smartAccountOwner && sessionKeyAddress && depositSlice.smartAccountOwner.toLowerCase() === sessionKeyAddress.toLowerCase() && (flowMode !== "solana-wallet" || depositSlice.solanaDepositAddress)
-  );
-  useEffect9(() => {
-    if (flowSlice.step === "setup" && cachedSetupCompatible && depositSlice.smartAccount && sessionKeyAddress) {
-      storeApi.dispatch({
-        type: "setup/complete",
-        smartAccount: depositSlice.smartAccount,
-        smartAccountOwner: sessionKeyAddress,
-        solanaDepositAddress: depositSlice.solanaDepositAddress ?? void 0
-      });
-    }
+  const desiredOwnersKey = useMemo6(() => {
+    const owners = [];
+    const seen = /* @__PURE__ */ new Set();
+    const push = (addr) => {
+      if (!addr) return;
+      const key = addr.toLowerCase();
+      if (seen.has(key)) return;
+      seen.add(key);
+      owners.push(addr);
+    };
+    push(dappAddress);
+    push(connectedWalletAddress);
+    push(reownWallet?.address);
+    push(dappImportOwner);
+    return owners;
   }, [
-    flowSlice.step,
-    cachedSetupCompatible,
-    depositSlice.smartAccount,
-    depositSlice.solanaDepositAddress,
-    sessionKeyAddress,
-    storeApi
+    dappAddress,
+    connectedWalletAddress,
+    reownWallet?.address,
+    dappImportOwner
   ]);
-  const handleDepositAddressSubmitted = useCallback4(
+  useEffect8(() => {
+    desiredOwnersKey.forEach((owner) => {
+      void (async () => {
+        const input = {
+          ownerAddress: owner,
+          ...setupInputBase
+        };
+        let sessionOwner;
+        try {
+          sessionOwner = await resolveSessionOwner(owner);
+        } catch (error) {
+          debugError(
+            debug,
+            "deposit-flow",
+            "session-owner:resolve-failed",
+            error,
+            { owner }
+          );
+          return;
+        }
+        const requestKey = computeRequestKey(input, sessionOwner.address);
+        const cacheKey = computeCacheKey(input, sessionOwner.address);
+        const cacheable = computeIsCacheable(input);
+        const current = readSetupForOwner(
+          storeApi.getState().setup,
+          owner
+        );
+        if (current.requestKey === requestKey) {
+          return;
+        }
+        const dedupedResult = readDedupedAccountSetupResult(requestKey);
+        if (dedupedResult) {
+          storeApi.dispatch({
+            type: "setup/started",
+            owner,
+            requestKey,
+            cacheKey,
+            cacheable
+          });
+          storeApi.dispatch({
+            type: "setup/ready",
+            owner,
+            requestKey,
+            result: {
+              smartAccount: dedupedResult.smartAccount,
+              sessionOwnerAddress: dedupedResult.sessionOwnerAddress,
+              solanaDepositAddress: dedupedResult.solanaDepositAddress,
+              cacheKey: dedupedResult.cacheKey
+            }
+          });
+          return;
+        }
+        storeApi.dispatch({
+          type: "setup/started",
+          owner,
+          requestKey,
+          cacheKey,
+          cacheable
+        });
+        try {
+          const result = await runAccountSetupDeduped(
+            input,
+            { service, debug },
+            requestKey
+          );
+          storeApi.dispatch({
+            type: "setup/ready",
+            owner,
+            requestKey,
+            result: {
+              smartAccount: result.smartAccount,
+              sessionOwnerAddress: result.sessionOwnerAddress,
+              solanaDepositAddress: result.solanaDepositAddress,
+              cacheKey: result.cacheKey
+            }
+          });
+        } catch (error) {
+          const message = error instanceof SetupError ? error.message : "Deposit service is temporarily unavailable. Please try again shortly.";
+          storeApi.dispatch({
+            type: "setup/failed",
+            owner,
+            requestKey,
+            message
+          });
+        }
+      })();
+    });
+  }, [
+    desiredOwnersKey,
+    setupInputBase,
+    service,
+    debug,
+    storeApi,
+    setupSlice.byOwner
+  ]);
+  const handleDepositAddressSubmitted = useCallback3(
     (data) => {
       logFlow("deposit-address:detected", {
         txHash: data.txHash,
@@ -3816,7 +4826,7 @@ function DepositFlow({
     },
     [logFlow, onLifecycleRef]
   );
-  const handleSolanaTokenContinue = useCallback4(
+  const handleSolanaTokenContinue = useCallback3(
     (token, balance, balanceUsd) => {
       logFlow("solana:token:continue", { token: token.symbol });
       storeApi.dispatch({
@@ -3829,7 +4839,7 @@ function DepositFlow({
     },
     [defaultAmount, logFlow, storeApi]
   );
-  const handleSolanaAmountContinue = useCallback4(
+  const handleSolanaAmountContinue = useCallback3(
     (token, sourceAmount, inputAmountUsd) => {
       const targetSym = getTokenSymbol(targetToken, targetChain);
       const isTargetStable = isStablecoinSymbol(targetSym);
@@ -3851,7 +4861,7 @@ function DepositFlow({
     },
     [targetToken, targetChain, getTokenPriceUsd, logFlow, storeApi]
   );
-  const handleSolanaConfirmed = useCallback4(
+  const handleSolanaConfirmed = useCallback3(
     (txHash, amountUnits) => {
       const tokenAtSubmit = storeApi.getState().deposit.selectedSolanaToken;
       if (!tokenAtSubmit) return;
@@ -3878,17 +4888,7 @@ function DepositFlow({
     },
     [logFlow, onLifecycleRef, storeApi]
   );
-  const handleConnected = useCallback4(
-    (addr, smartAccount) => {
-      onLifecycleRef.current?.({
-        type: "connected",
-        address: addr,
-        smartAccount
-      });
-    },
-    [onLifecycleRef]
-  );
-  const handleAssetContinue = useCallback4(
+  const handleAssetContinue = useCallback3(
     (asset) => {
       onEventRef.current?.({
         type: "deposit_modal_connected_wallet_select_source_cta_click",
@@ -3906,8 +4906,13 @@ function DepositFlow({
     },
     [defaultAmount, onEventRef, totalBalanceUsd, storeApi]
   );
-  const handleAmountContinue = useCallback4(
+  const handleAmountContinue = useCallback3(
     (amount, targetAmount, balance, liquidityWarning) => {
+      const entry = readSetupForOwner(
+        storeApi.getState().setup,
+        activeOwner
+      );
+      if (entry.status !== "ready") return;
       const targetSym = getTokenSymbol(targetToken, targetChain);
       const isTargetStable = isStablecoinSymbol(targetSym);
       const targetTokenPriceUsd = isTargetStable ? 1 : getTokenPriceUsd(targetSym);
@@ -3920,9 +4925,9 @@ function DepositFlow({
         liquidityWarning
       });
     },
-    [targetToken, targetChain, getTokenPriceUsd, storeApi]
+    [targetToken, targetChain, getTokenPriceUsd, storeApi, activeOwner]
   );
-  const handleDepositSubmitted = useCallback4(
+  const handleDepositSubmitted = useCallback3(
     (txHash, chainId, amount, token) => {
       logFlow("evm:submitted", {
         txHash,
@@ -3930,18 +4935,22 @@ function DepositFlow({
         sourceToken: token,
         amount
       });
+      const asset = storeApi.getState().deposit.selectedAsset;
+      const dappImport = asset && isDappImportAsset(asset) ? asset : null;
       storeApi.dispatch({
         type: "deposit/submitted",
         txHash,
         sourceChain: chainId,
         sourceToken: token,
         amount,
-        directTransfer: isSameRoute2(chainId, token, targetChain, targetToken)
+        sourceSymbol: dappImport?.symbol,
+        sourceDecimals: dappImport?.decimals,
+        directTransfer: !dappImport && isSameRoute2(chainId, token, targetChain, targetToken)
       });
     },
     [logFlow, storeApi, targetChain, targetToken]
   );
-  const handleDepositSubmittedCallback = useCallback4(
+  const handleDepositSubmittedCallback = useCallback3(
     (txHash, sourceChain, amount) => {
       onLifecycleRef.current?.({
         type: "submitted",
@@ -3952,7 +4961,7 @@ function DepositFlow({
     },
     [onLifecycleRef]
   );
-  const handleDepositComplete = useCallback4(
+  const handleDepositComplete = useCallback3(
     (txHash, destinationTxHash, context) => {
       logFlow("deposit:complete", { txHash, destinationTxHash, ...context });
       onLifecycleRef.current?.({
@@ -3964,153 +4973,166 @@ function DepositFlow({
     },
     [logFlow, onLifecycleRef]
   );
-  const handleDepositFailed = useCallback4(
+  const handleDepositFailed = useCallback3(
     (txHash, error) => {
       logFlowError("deposit:failed", error, { txHash });
       onLifecycleRef.current?.({ type: "failed", txHash, error });
     },
     [logFlowError, onLifecycleRef]
   );
-  const handleError = useCallback4(
+  const handleError = useCallback3(
     (message, code) => {
       logFlowError("flow:error", message, { code });
       onErrorRef.current?.({ message, code });
     },
     [logFlowError, onErrorRef]
   );
-  const handleTotalBalanceComputed = useCallback4((total) => {
+  const handleTotalBalanceComputed = useCallback3((total) => {
     setTotalBalanceUsd(total);
   }, []);
-  const selectedWalletIdEffective = useMemo6(() => {
-    if (selectedWalletId) return selectedWalletId;
-    if (walletOptions.length === 1) {
-      return walletOptions[0].id;
-    }
-    return null;
-  }, [selectedWalletId, walletOptions]);
   const walletOptionsKey = useMemo6(
     () => walletOptions.map((option) => option.id).join(","),
     [walletOptions]
   );
-  useEffect9(() => {
+  useEffect8(() => {
     if (storeApi.getState().flow.mode) {
       return;
     }
     storeApi.dispatch({ type: "wallet/cleared" });
     const currentStep = storeApi.getState().flow.step;
     if (currentStep !== "processing" && currentStep !== "confirm" && currentStep !== "solana-confirm" && currentStep !== "amount" && currentStep !== "solana-amount") {
-      storeApi.dispatch({ type: "flow/step-set", step: "setup" });
+      storeApi.dispatch({ type: "flow/step-set", step: "connect" });
     }
   }, [walletOptionsKey]);
-  useEffect9(() => {
-    if (!showConnectStep && isConnectSelectionConfirmed && flowMode === "wallet" && !signerContext) {
+  useEffect8(() => {
+    if (!showConnectStep && isConnectSelectionConfirmed && (flowMode === "wallet" || flowMode === "dapp-import") && !signerContext) {
       storeApi.dispatch({ type: "wallet/cleared" });
     }
   }, [showConnectStep, isConnectSelectionConfirmed, flowMode, signerContext, storeApi]);
-  useEffect9(() => {
+  useEffect8(() => {
     if (enableSolana || flowMode !== "solana-wallet") {
       return;
     }
     storeApi.dispatch({ type: "wallet/cleared" });
     if (storeApi.getState().flow.step !== "processing") {
-      storeApi.dispatch({ type: "flow/step-set", step: "setup" });
+      storeApi.dispatch({ type: "flow/step-set", step: "connect" });
     }
   }, [enableSolana, flowMode, storeApi]);
-  useEffect9(() => {
+  useEffect8(() => {
     if (hasNavigatedBack || isConnectSelectionConfirmed || flowMode) {
       return;
     }
-    if (hasWalletOptions) {
-      const walletId = selectedWalletIdEffective;
-      if (walletId) {
-        const selectedOption = walletOptions.find((o) => o.id === walletId);
-        setSelectedWalletId(walletId);
-        if (enableSolana && selectedOption?.kind === "solana") {
-          handleSelectSolanaWallet();
-        } else {
-          handleSelectProvider();
-        }
-        setIsConnectSelectionConfirmed(true);
-        return;
-      }
-    }
     if (!hasWalletOptions && dappAddress && !hasReownSession && !dappWalletClient && hasQrAutoAdvanceGraceElapsed) {
       handleSelectTransferCrypto();
-      setIsConnectSelectionConfirmed(true);
     }
   }, [
     hasWalletOptions,
     hasReownSession,
     hasQrAutoAdvanceGraceElapsed,
-    enableSolana,
     isConnectSelectionConfirmed,
     flowMode,
     hasNavigatedBack,
-    selectedWalletIdEffective,
     dappAddress,
     dappWalletClient,
-    walletOptions,
-    handleSelectProvider,
-    handleSelectSolanaWallet,
-    handleSelectTransferCrypto,
-    setSelectedWalletId,
-    setIsConnectSelectionConfirmed
+    handleSelectTransferCrypto
   ]);
+  const walletRows = useMemo6(() => {
+    return walletOptions.map((option) => {
+      const ownerForRow = option.kind === "solana" ? dappAddress : option.address ?? null;
+      const entry = readSetupForOwner(setupSlice, ownerForRow ?? null);
+      const state = entry.status === "ready" ? "ready" : entry.status === "error" ? "error" : "loading";
+      return {
+        id: option.id,
+        kind: option.kind,
+        label: option.label,
+        icon: option.icon,
+        address: option.address ?? option.solanaAddress ?? option.id,
+        state,
+        errorReason: entry.message ?? void 0
+      };
+    });
+  }, [walletOptions, setupSlice, dappAddress]);
+  const transferCryptoEntry = useMemo6(
+    () => readSetupForOwner(setupSlice, dappAddress),
+    [setupSlice, dappAddress]
+  );
+  const transferCryptoState = transferCryptoEntry.status === "ready" ? "ready" : transferCryptoEntry.status === "error" ? "error" : "loading";
+  const handleRetrySetup = useCallback3(
+    (owner) => {
+      storeApi.dispatch({ type: "setup/retry-requested", owner });
+    },
+    [storeApi]
+  );
   if (showConnectStep) {
     return /* @__PURE__ */ jsx10("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx10(
       ConnectStep,
       {
-        walletOptions,
+        walletRows,
+        transferCryptoState: dappAddress ? transferCryptoState : void 0,
+        transferCryptoErrorReason: dappAddress ? transferCryptoEntry.message ?? void 0 : void 0,
         onSelectTransferCrypto: dappAddress ? () => {
+          if (transferCryptoState === "error") {
+            handleRetrySetup(dappAddress);
+            return;
+          }
+          if (transferCryptoState !== "ready") return;
           handleSelectTransferCrypto();
-          setIsConnectSelectionConfirmed(true);
         } : void 0,
         onRequestConnect,
         onConnect,
         onDisconnect,
         onConfirmWallet: (walletId) => {
-          setSelectedWalletId(walletId);
-          const selectedOption = walletOptions.find(
-            (o) => o.id === walletId
+          const row = walletRows.find((r) => r.id === walletId);
+          const option = walletOptions.find((o) => o.id === walletId);
+          if (!row || !option) return;
+          if (row.state === "error") {
+            const owner = option.kind === "solana" ? dappAddress : option.address ?? null;
+            if (owner) handleRetrySetup(owner);
+            return;
+          }
+          if (row.state !== "ready") return;
+          handleConfirmWallet(walletId);
+        },
+        dappImports: connectStepDappImports,
+        onSelectDappImport: (providerId) => {
+          const dappImportEntry = readSetupForOwner(
+            setupSlice,
+            dappImportOwner
           );
-          if (enableSolana && selectedOption?.kind === "solana") {
-            handleSelectSolanaWallet();
-          } else {
-            handleSelectProvider();
+          if (dappImportEntry.status === "error" && dappImportOwner) {
+            handleRetrySetup(dappImportOwner);
+            return;
           }
-          setIsConnectSelectionConfirmed(true);
+          if (dappImportEntry.status !== "ready") return;
+          handleSelectDappImport(providerId);
         }
       }
     ) });
   }
   if (isDepositAddressMode) {
-    if (!dappAddress || !sessionKeyAddress) return null;
+    if (!dappAddress) return null;
+    const isWalletPickerReachable = walletOptions.length > 0 || Boolean(reownWallet) || Boolean(onConnect);
+    const showBanner = effectiveStep.type !== "setup" && (activeEntry.status === "loading" || activeEntry.status === "error");
     return /* @__PURE__ */ jsxs10("div", { className: "rs-modal-body", children: [
-      step.type === "setup" && !cachedSetupCompatible && /* @__PURE__ */ jsx10(
-        SetupStep,
+      showBanner && /* @__PURE__ */ jsx10(
+        SetupUpdatingBanner,
         {
-          address: sessionKeyAddress,
-          targetChain,
-          targetToken,
-          signerAddress,
-          sessionChainIds,
-          recipient,
-          postBridgeActions,
-          outputTokenRules,
-          rejectUnmapped,
-          forceRegister,
-          enableSolana,
-          service,
-          onSetupComplete: handleSetupComplete,
-          onConnected: handleConnected,
-          onError: handleError
+          status: activeEntry.status,
+          message: activeEntry.message ?? void 0
         }
       ),
-      step.type === "deposit-address" && /* @__PURE__ */ jsx10(
+      effectiveStep.type === "setup" && /* @__PURE__ */ jsx10(
+        AccountPreparingSkeleton,
+        {
+          errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
+          onRetry: activeEntry.status === "error" ? () => handleRetrySetup(dappAddress) : void 0
+        }
+      ),
+      effectiveStep.type === "deposit-address" && /* @__PURE__ */ jsx10(
         DepositAddressStep,
         {
-          smartAccount: step.smartAccount,
-          solanaDepositAddress: enableSolana ? step.solanaDepositAddress : void 0,
+          smartAccount: effectiveStep.smartAccount,
+          solanaDepositAddress: enableSolana ? effectiveStep.solanaDepositAddress : void 0,
           service,
           allowedRoutes,
           targetChain,
@@ -4132,6 +5154,9 @@ function DepositFlow({
               cta_name: "copy"
             });
           },
+          onRequestWalletPicker: isWalletPickerReachable ? () => storeApi.dispatch({
+            type: "connect/wallet-picker-requested"
+          }) : void 0,
           onError: handleError,
           debug
         }
@@ -4139,31 +5164,26 @@ function DepositFlow({
     ] });
   }
   if (isSolanaWalletMode) {
-    if (!sessionKeyAddress) return null;
+    if (!dappAddress) return null;
     const solanaAddr = reownWallet?.solanaAddress;
     const solanaProvider = reownWallet?.solanaProvider;
+    const solanaShowBanner = effectiveStep.type !== "setup" && effectiveStep.type !== "processing" && (activeEntry.status === "loading" || activeEntry.status === "error");
     return /* @__PURE__ */ jsxs10("div", { className: "rs-modal-body", children: [
-      step.type === "setup" && !cachedSetupCompatible && /* @__PURE__ */ jsx10(
-        SetupStep,
+      solanaShowBanner && /* @__PURE__ */ jsx10(
+        SetupUpdatingBanner,
         {
-          address: sessionKeyAddress,
-          targetChain,
-          targetToken,
-          signerAddress,
-          sessionChainIds,
-          recipient,
-          postBridgeActions,
-          outputTokenRules,
-          rejectUnmapped,
-          forceRegister,
-          enableSolana,
-          service,
-          onSetupComplete: handleSetupComplete,
-          onConnected: handleConnected,
-          onError: handleError
+          status: activeEntry.status,
+          message: activeEntry.message ?? void 0
+        }
+      ),
+      effectiveStep.type === "setup" && /* @__PURE__ */ jsx10(
+        AccountPreparingSkeleton,
+        {
+          errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
+          onRetry: activeEntry.status === "error" ? () => handleRetrySetup(dappAddress) : void 0
         }
       ),
-      step.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ jsx10(
+      effectiveStep.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ jsx10(
         SolanaTokenSelectStep,
         {
           solanaAddress: solanaAddr,
@@ -4173,13 +5193,13 @@ function DepositFlow({
           debug
         }
       ),
-      step.type === "solana-amount" && /* @__PURE__ */ jsx10(
+      effectiveStep.type === "solana-amount" && /* @__PURE__ */ jsx10(
         SolanaAmountStep,
         {
-          token: step.token,
-          balance: step.balance,
-          balanceUsd: step.balanceUsd,
-          defaultAmount: step.inputAmountUsd,
+          token: effectiveStep.token,
+          balance: effectiveStep.balance,
+          balanceUsd: effectiveStep.balanceUsd,
+          defaultAmount: effectiveStep.inputAmountUsd,
           uiConfig,
           targetChainName: getChainName(targetChain),
           targetTokenSymbol: getTokenSymbol(targetToken, targetChain),
@@ -4190,17 +5210,17 @@ function DepositFlow({
           debug
         }
       ),
-      step.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx10(
+      effectiveStep.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx10(
         SolanaConfirmStep,
         {
-          smartAccount: step.smartAccount,
+          smartAccount: effectiveStep.smartAccount,
           solanaAddress: solanaAddr,
-          solanaDepositAddress: step.solanaDepositAddress,
-          token: step.token,
-          sourceAmount: step.sourceAmount,
-          inputAmountUsd: step.inputAmountUsd,
-          targetAmount: step.targetAmount,
-          targetTokenPriceUsd: step.targetTokenPriceUsd,
+          solanaDepositAddress: effectiveStep.solanaDepositAddress,
+          token: effectiveStep.token,
+          sourceAmount: effectiveStep.sourceAmount,
+          inputAmountUsd: effectiveStep.inputAmountUsd,
+          targetAmount: effectiveStep.targetAmount,
+          targetTokenPriceUsd: effectiveStep.targetTokenPriceUsd,
           targetChain,
           targetToken,
           service,
@@ -4209,7 +5229,7 @@ function DepositFlow({
           onError: handleError,
           debug
         }
-      ) : step.type === "solana-confirm" ? /* @__PURE__ */ jsxs10("div", { className: "rs-step", children: [
+      ) : effectiveStep.type === "solana-confirm" ? /* @__PURE__ */ jsxs10("div", { className: "rs-step", children: [
         /* @__PURE__ */ jsxs10("div", { className: "rs-loading-state", children: [
           /* @__PURE__ */ jsx10("div", { className: "rs-step-icon rs-step-icon--error", children: /* @__PURE__ */ jsx10(
             "svg",
@@ -4243,23 +5263,23 @@ function DepositFlow({
           }
         ) })
       ] }) : null,
-      step.type === "processing" && /* @__PURE__ */ jsx10(
+      effectiveStep.type === "processing" && /* @__PURE__ */ jsx10(
         ProcessingStep,
         {
-          smartAccount: step.smartAccount,
-          solanaDepositAddress: step.solanaDepositAddress,
-          txHash: step.txHash,
-          sourceChain: step.sourceChain,
-          sourceToken: step.sourceToken,
+          smartAccount: effectiveStep.smartAccount,
+          solanaDepositAddress: effectiveStep.solanaDepositAddress,
+          txHash: effectiveStep.txHash,
+          sourceChain: effectiveStep.sourceChain,
+          sourceToken: effectiveStep.sourceToken,
           targetChain,
           targetToken,
-          amount: step.amount,
-          sourceSymbol: step.sourceSymbol,
-          sourceDecimals: step.sourceDecimals,
+          amount: effectiveStep.amount,
+          sourceSymbol: effectiveStep.sourceSymbol,
+          sourceDecimals: effectiveStep.sourceDecimals,
           waitForFinalTx,
           hasPostBridgeActions: Boolean(postBridgeActions?.length),
           service,
-          directTransfer: step.directTransfer,
+          directTransfer: effectiveStep.directTransfer,
           onClose,
           onNewDeposit: handleNewDeposit,
           onDepositComplete: handleDepositComplete,
@@ -4281,29 +5301,23 @@ function DepositFlow({
     }
     return getPublicClient(chainId);
   };
+  const walletShowBanner = effectiveStep.type !== "setup" && effectiveStep.type !== "processing" && (activeEntry.status === "loading" || activeEntry.status === "error");
   return /* @__PURE__ */ jsxs10("div", { className: "rs-modal-body", children: [
-    step.type === "setup" && !cachedSetupCompatible && /* @__PURE__ */ jsx10(
-      SetupStep,
+    walletShowBanner && /* @__PURE__ */ jsx10(
+      SetupUpdatingBanner,
       {
-        walletClient: signerContext.walletClient,
-        address: ownerAddress,
-        targetChain,
-        targetToken,
-        signerAddress,
-        sessionChainIds,
-        recipient,
-        postBridgeActions,
-        outputTokenRules,
-        rejectUnmapped,
-        forceRegister,
-        enableSolana,
-        service,
-        onSetupComplete: handleSetupComplete,
-        onConnected: handleConnected,
-        onError: handleError
+        status: activeEntry.status,
+        message: activeEntry.message ?? void 0
+      }
+    ),
+    effectiveStep.type === "setup" && /* @__PURE__ */ jsx10(
+      AccountPreparingSkeleton,
+      {
+        errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
+        onRetry: activeEntry.status === "error" ? () => handleRetrySetup(ownerAddress) : void 0
       }
     ),
-    step.type === "select-asset" && /* @__PURE__ */ jsx10(
+    effectiveStep.type === "select-asset" && /* @__PURE__ */ jsx10(
       AssetSelectStep,
       {
         address: ownerAddress,
@@ -4321,14 +5335,27 @@ function DepositFlow({
         } : void 0
       }
     ),
-    step.type === "amount" && /* @__PURE__ */ jsx10(
+    effectiveStep.type === "dapp-import-asset-select" && activeDappImportProvider && activeDappImportAvailability && /* @__PURE__ */ jsx10(
+      DappImportAssetSelectStep,
+      {
+        sourceLabel: activeDappImportAvailability.assets[0]?.sourceLabel ?? activeDappImportProvider.label,
+        assets: activeDappImportAvailability.assets,
+        onSelect: handleDappImportAssetSelected
+      }
+    ),
+    effectiveStep.type === "amount" && /* @__PURE__ */ jsx10(
       AmountStep,
       {
         walletClient: signerContext.walletClient,
-        publicClient: getReadClientForChain(step.asset.chainId),
+        publicClient: getReadClientForChain(effectiveStep.asset.chainId),
         address: ownerAddress,
-        asset: step.asset,
-        defaultAmount: step.amount ?? defaultAmount,
+        balanceAddress: isDappImportAsset(effectiveStep.asset) ? effectiveStep.asset.providerMetadata.proxyWallet : void 0,
+        asset: effectiveStep.asset,
+        liquiditySource: isDappImportAsset(effectiveStep.asset) ? {
+          chainId: effectiveStep.asset.depositChainId,
+          token: effectiveStep.asset.depositToken
+        } : void 0,
+        defaultAmount: effectiveStep.amount ?? defaultAmount,
         switchChain: signerContext.switchChain,
         targetChain,
         targetToken,
@@ -4339,7 +5366,7 @@ function DepositFlow({
           const receiveSymbol = getTokenSymbol(targetToken, targetChain);
           onEvent?.({
             type: "deposit_modal_connected_wallet_enter_value_cta_click",
-            send_token: step.asset.symbol,
+            send_token: effectiveStep.asset.symbol,
             receive_token: receiveSymbol,
             pred_balance: totalBalanceUsd,
             cta_name: ctaName
@@ -4347,45 +5374,62 @@ function DepositFlow({
         }
       }
     ),
-    step.type === "confirm" && /* @__PURE__ */ jsx10(
+    effectiveStep.type === "confirm" && /* @__PURE__ */ jsx10(
       ConfirmStep,
       {
         walletClient: signerContext.walletClient,
         address: ownerAddress,
-        smartAccount: step.smartAccount,
+        smartAccount: effectiveStep.smartAccount,
         recipient,
-        asset: step.asset,
-        amount: step.amount,
-        targetAmount: step.targetAmount,
-        targetTokenPriceUsd: step.targetTokenPriceUsd,
-        balance: step.balance,
+        asset: effectiveStep.asset,
+        amount: effectiveStep.amount,
+        targetAmount: effectiveStep.targetAmount,
+        targetTokenPriceUsd: effectiveStep.targetTokenPriceUsd,
+        balance: effectiveStep.balance,
         targetChain,
         targetToken,
         switchChain: signerContext.switchChain,
-        liquidityWarning: step.liquidityWarning,
+        liquidityWarning: effectiveStep.liquidityWarning,
         uiConfig,
+        executeTransfer: isDappImportMode && activeDappImportProvider && isDappImportAsset(effectiveStep.asset) ? async (amountUnits) => {
+          const result = await activeDappImportProvider.executeTransfer(
+            {
+              walletClient: signerContext.walletClient,
+              publicClient: getReadClientForChain(
+                activeDappImportProvider.chainId
+              ),
+              recipient: effectiveStep.smartAccount,
+              asset: effectiveStep.asset,
+              amount: amountUnits
+            }
+          );
+          return {
+            txHash: result.txHash,
+            sourceToken: result.sourceToken
+          };
+        } : void 0,
         onConfirm: handleDepositSubmitted,
         onDepositSubmitted: handleDepositSubmittedCallback,
         onError: handleError
       }
     ),
-    step.type === "processing" && /* @__PURE__ */ jsx10(
+    effectiveStep.type === "processing" && /* @__PURE__ */ jsx10(
       ProcessingStep,
       {
-        smartAccount: step.smartAccount,
-        solanaDepositAddress: step.solanaDepositAddress,
-        txHash: step.txHash,
-        sourceChain: step.sourceChain,
-        sourceToken: step.sourceToken,
+        smartAccount: effectiveStep.smartAccount,
+        solanaDepositAddress: effectiveStep.solanaDepositAddress,
+        txHash: effectiveStep.txHash,
+        sourceChain: effectiveStep.sourceChain,
+        sourceToken: effectiveStep.sourceToken,
         targetChain,
         targetToken,
-        amount: step.amount,
-        sourceSymbol: step.sourceSymbol,
-        sourceDecimals: step.sourceDecimals,
+        amount: effectiveStep.amount,
+        sourceSymbol: effectiveStep.sourceSymbol,
+        sourceDecimals: effectiveStep.sourceDecimals,
         waitForFinalTx,
         hasPostBridgeActions: Boolean(postBridgeActions?.length),
         service,
-        directTransfer: step.directTransfer,
+        directTransfer: effectiveStep.directTransfer,
         uiConfig,
         onClose,
         onNewDeposit: handleNewDeposit,
@@ -4400,7 +5444,7 @@ function DepositFlow({
 }
 
 // src/components/history/DepositHistoryPanel.tsx
-import { useCallback as useCallback5, useState as useState11 } from "react";
+import { useCallback as useCallback4, useState as useState10 } from "react";
 import { jsx as jsx11, jsxs as jsxs11 } from "react/jsx-runtime";
 function shortenHash(hash) {
   if (hash.length <= 14) return hash;
@@ -4512,7 +5556,7 @@ function DepositHistoryPanel({
   onClose,
   onCloseModal
 }) {
-  const handleKeyDown = useCallback5(
+  const handleKeyDown = useCallback4(
     (e) => {
       if (e.key === "Escape") {
         e.stopPropagation();
@@ -4597,7 +5641,7 @@ function DepositHistoryPanel({
   );
 }
 function HistoryCard({ deposit }) {
-  const [expanded, setExpanded] = useState11(false);
+  const [expanded, setExpanded] = useState10(false);
   const status = normalizeStatus(deposit.status, deposit.isSpam);
   const sourceChainId = resolveChainId(deposit.chain);
   const targetChainId = resolveChainId(deposit.targetChain);
@@ -4679,7 +5723,7 @@ DepositHistoryPanel.displayName = "DepositHistoryPanel";
 // src/DepositModal.tsx
 import { jsx as jsx12, jsxs as jsxs12 } from "react/jsx-runtime";
 var ReownDepositInner = lazy2(
-  () => import("./DepositModalReown-VFTXYG2B.mjs").then((m) => ({ default: m.DepositModalReown }))
+  () => import("./DepositModalReown-A2E4QTSF.mjs").then((m) => ({ default: m.DepositModalReown }))
 );
 function sortByCreatedAtDesc(items) {
   return [...items].sort((a, b) => {
@@ -4734,6 +5778,7 @@ function DepositModalInner({
   forceRegister = false,
   waitForFinalTx = true,
   enableSolana = true,
+  dappImports,
   postBridgeActions,
   outputTokenRules,
   rejectUnmapped,
@@ -4751,23 +5796,23 @@ function DepositModalInner({
   onError,
   debug
 }) {
-  const modalRef = useRef7(null);
+  const modalRef = useRef6(null);
   const onReadyRef = useLatestRef(onReady);
-  const [currentScreen, setCurrentScreen] = useState12("connect");
-  const [backHandler, setBackHandler] = useState12(
+  const [currentScreen, setCurrentScreen] = useState11("connect");
+  const [backHandler, setBackHandler] = useState11(
     void 0
   );
   const showHistoryButton = uiConfig?.showHistoryButton ?? false;
   const historyButtonVisible = showHistoryButton && (currentScreen === "select-asset" || currentScreen === "deposit-address");
-  const [historyOpen, setHistoryOpen] = useState12(false);
-  const [historyDeposits, setHistoryDeposits] = useState12([]);
-  const [hasMoreHistory, setHasMoreHistory] = useState12(false);
-  const [historyLoading, setHistoryLoading] = useState12(false);
-  const [historyLoadingMore, setHistoryLoadingMore] = useState12(false);
-  const [historyError, setHistoryError] = useState12(null);
-  const cursorRef = useRef7(null);
-  const historyStaleRef = useRef7(false);
-  const historyLoadedRef = useRef7(false);
+  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 = useRef6(null);
+  const historyStaleRef = useRef6(false);
+  const historyLoadedRef = useRef6(false);
   const targetChain = getChainId(targetChainProp);
   const sourceChain = sourceChainProp ? getChainId(sourceChainProp) : void 0;
   const service = useMemo7(
@@ -4782,30 +5827,30 @@ function DepositModalInner({
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
   );
-  useEffect10(() => {
+  useEffect9(() => {
     store.dispatch({ type: "target/changed", targetChain, targetToken });
   }, [store, targetChain, targetToken]);
-  useEffect10(() => {
+  useEffect9(() => {
     if (isOpen && modalRef.current) {
       applyTheme(modalRef.current, theme);
     }
   }, [isOpen, theme]);
-  useEffect10(() => {
+  useEffect9(() => {
     configureSolanaRpcUrl(solanaRpcUrl);
   }, [solanaRpcUrl]);
-  useEffect10(() => {
+  useEffect9(() => {
     if (isOpen) {
       onReadyRef.current?.();
     }
   }, [isOpen, onReadyRef]);
-  const handleStepChange = useCallback6(
+  const handleStepChange = useCallback5(
     (onBack, screen) => {
       setBackHandler(() => onBack);
       if (screen) setCurrentScreen(screen);
     },
     []
   );
-  const fetchHistory = useCallback6(
+  const fetchHistory = useCallback5(
     async (mode = "initial") => {
       if (!recipient) return;
       const isInitial = mode === "initial";
@@ -4853,26 +5898,26 @@ function DepositModalInner({
     },
     [recipient, service]
   );
-  const handleHistoryOpen = useCallback6(() => {
+  const handleHistoryOpen = useCallback5(() => {
     setHistoryOpen(true);
     if (!historyLoadedRef.current || historyStaleRef.current) {
       fetchHistory("initial");
     }
   }, [fetchHistory]);
-  const handleHistoryClose = useCallback6(() => {
+  const handleHistoryClose = useCallback5(() => {
     setHistoryOpen(false);
   }, []);
-  const handleHistoryLoadMore = useCallback6(() => {
+  const handleHistoryLoadMore = useCallback5(() => {
     fetchHistory("more");
   }, [fetchHistory]);
-  const markHistoryStale = useCallback6(() => {
+  const markHistoryStale = useCallback5(() => {
     historyStaleRef.current = true;
     if (historyOpen) {
       fetchHistory("initial");
     }
   }, [historyOpen, fetchHistory]);
   const onLifecycleRef = useLatestRef(onLifecycle);
-  const handleLifecycle = useCallback6(
+  const handleLifecycle = useCallback5(
     (event) => {
       onLifecycleRef.current?.(event);
       if (event.type === "smart-account-changed" && !event.evm && !event.solana) {
@@ -4884,7 +5929,7 @@ function DepositModalInner({
     },
     [onLifecycleRef, showHistoryButton, markHistoryStale]
   );
-  useEffect10(() => {
+  useEffect9(() => {
     if (!isOpen) {
       setHistoryOpen(false);
       setHistoryDeposits([]);
@@ -4895,7 +5940,7 @@ function DepositModalInner({
       historyLoadedRef.current = false;
     }
   }, [isOpen]);
-  useEffect10(() => {
+  useEffect9(() => {
     if (!isOpen) {
       store.dispatch({ type: "flow/reset" });
     }
@@ -4968,6 +6013,7 @@ function DepositModalInner({
             forceRegister,
             waitForFinalTx,
             enableSolana,
+            dappImports,
             reownWallet,
             onConnect,
             onDisconnect,