@rhinestone/deposit-modal 0.3.0-alpha.1 → 0.3.0-alpha.3

package/dist/{chunk-C6JK3IO6.cjs → chunk-IATY2C5R.cjs}

@@ -45,7 +45,10 @@
 
 
 
-var _chunkDCAANLEPcjs = require('./chunk-DCAANLEP.cjs');
+
+
+
+var _chunkV6NJIPSScjs = require('./chunk-V6NJIPSS.cjs');
 
 
 
@@ -81,198 +84,10 @@ var _react = require('react');
 
 var _viem = require('viem');
 
-// src/components/steps/SetupStep.tsx
-
-var _jsxruntime = require('react/jsx-runtime');
-async function resolveSessionOwner(eoaAddress) {
-  const localOwner = _chunkDCAANLEPcjs.loadSessionOwnerFromStorage.call(void 0, eoaAddress);
-  if (localOwner) {
-    return {
-      account: _chunkDCAANLEPcjs.accountFromPrivateKey.call(void 0, localOwner.privateKey),
-      address: localOwner.address
-    };
-  }
-  const created = _chunkDCAANLEPcjs.createSessionOwnerKey.call(void 0, );
-  _chunkDCAANLEPcjs.saveSessionOwnerToStorage.call(void 0, 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] = _react.useState.call(void 0, { type: "idle" });
-  const setupInitiatedRef = _react.useRef.call(void 0, false);
-  const runSetup = _react.useCallback.call(void 0, 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: _chunkDCAANLEPcjs.toEvmCaip2.call(void 0, targetChain),
-        targetToken,
-        recipient,
-        postBridgeActions,
-        outputTokenRules,
-        rejectUnmapped,
-        signerAddress,
-        sessionChainIds,
-        forceRegister
-      });
-      const smartAccount = setup.smartAccount;
-      if (!setup.needsRegistration) {
-        setState({ type: "ready", smartAccount });
-        _optionalChain([onConnected, 'optionalCall', _ => _(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 = _chunkDCAANLEPcjs.buildSessionDetails.call(void 0, 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: _chunkDCAANLEPcjs.toEvmCaip2.call(void 0, targetChain),
-          token: targetToken,
-          ...recipient && { recipient },
-          ..._optionalChain([postBridgeActions, 'optionalAccess', _2 => _2.length]) && { postBridgeActions },
-          ..._optionalChain([outputTokenRules, 'optionalAccess', _3 => _3.length]) && { outputTokenRules },
-          ...rejectUnmapped != null && { rejectUnmapped }
-        }
-      });
-      setState({ type: "ready", smartAccount });
-      _optionalChain([onConnected, 'optionalCall', _4 => _4(address, smartAccount)]);
-      onSetupComplete(
-        smartAccount,
-        enableSolana ? registerResult.solanaDepositAddress : void 0
-      );
-    } catch (error) {
-      const message = error instanceof Error ? error.message : "Setup failed";
-      setState({ type: "error", message });
-      _optionalChain([onError, 'optionalCall', _5 => _5(message, "SETUP_ERROR")]);
-    }
-  }, [
-    address,
-    walletClient,
-    targetChain,
-    targetToken,
-    signerAddress,
-    sessionChainIds,
-    recipient,
-    postBridgeActions,
-    outputTokenRules,
-    rejectUnmapped,
-    forceRegister,
-    enableSolana,
-    service,
-    onSetupComplete,
-    onError,
-    onConnected
-  ]);
-  _react.useEffect.call(void 0, () => {
-    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__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-step", children: [
-    /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-step-body", style: { paddingTop: 0 }, children: [
-      isLoading && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-        _chunkDCAANLEPcjs.BodyHeader,
-        {
-          icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.Spinner, { className: "rs-spinner--sm" }),
-          title: renderStateMessage(),
-          subtitle: "This may take a moment"
-        }
-      ),
-      isError && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-        _chunkDCAANLEPcjs.BodyHeader,
-        {
-          variant: "error",
-          icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.AlertTriangleIcon, {}),
-          title: "Setup failed",
-          subtitle: state.message
-        }
-      )
-    ] }),
-    isError && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step-footer", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.Button, { onClick: handleRetry, variant: "default", fullWidth: true, children: "Try Again" }) }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.PoweredBy, {})
-  ] });
-}
-
 // src/components/steps/AssetSelectStep.tsx
 
 
-
+var _jsxruntime = require('react/jsx-runtime');
 function AssetSelectStep({
   address,
   publicClient,
@@ -291,7 +106,7 @@ function AssetSelectStep({
   const [error, setError] = _react.useState.call(void 0, null);
   const defaultAssetId = _react.useMemo.call(void 0, () => {
     if (!defaultSourceChain || !defaultSourceToken) return null;
-    return _chunkDCAANLEPcjs.getAssetId.call(void 0, {
+    return _chunkV6NJIPSScjs.getAssetId.call(void 0, {
       chainId: defaultSourceChain,
       token: defaultSourceToken
     });
@@ -308,7 +123,7 @@ function AssetSelectStep({
       try {
         const portfolio = await service.fetchPortfolio(address);
         if (!active) return;
-        const portfolioAssets = _chunkDCAANLEPcjs.portfolioToAssets.call(void 0, portfolio.tokens);
+        const portfolioAssets = _chunkV6NJIPSScjs.portfolioToAssets.call(void 0, portfolio.tokens);
         setAssets(portfolioAssets);
         const hasNative = portfolioAssets.some(
           (asset) => asset.token.toLowerCase() === _chunkIVTXEYB2cjs.NATIVE_TOKEN_ADDRESS
@@ -349,16 +164,16 @@ function AssetSelectStep({
       (sum, asset) => sum + (_nullishCoalesce(asset.balanceUsd, () => ( 0))),
       0
     );
-    _optionalChain([onTotalBalanceComputed, 'optionalCall', _6 => _6(total)]);
-    if (assets.length > 0) _optionalChain([onAssetsLoaded, 'optionalCall', _7 => _7(assets)]);
+    _optionalChain([onTotalBalanceComputed, 'optionalCall', _ => _(total)]);
+    if (assets.length > 0) _optionalChain([onAssetsLoaded, 'optionalCall', _2 => _2(assets)]);
   }, [assets, onTotalBalanceComputed, onAssetsLoaded]);
   const allowedChainSet = _react.useMemo.call(void 0, 
-    () => _optionalChain([allowedRoutes, 'optionalAccess', _8 => _8.sourceChains]) ? new Set(allowedRoutes.sourceChains) : null,
-    [_optionalChain([allowedRoutes, 'optionalAccess', _9 => _9.sourceChains])]
+    () => _optionalChain([allowedRoutes, 'optionalAccess', _3 => _3.sourceChains]) ? new Set(allowedRoutes.sourceChains) : null,
+    [_optionalChain([allowedRoutes, 'optionalAccess', _4 => _4.sourceChains])]
   );
   const allowedTokenSet = _react.useMemo.call(void 0, 
-    () => _optionalChain([allowedRoutes, 'optionalAccess', _10 => _10.sourceTokens]) ? new Set(allowedRoutes.sourceTokens.map((s) => s.toUpperCase())) : null,
-    [_optionalChain([allowedRoutes, 'optionalAccess', _11 => _11.sourceTokens])]
+    () => _optionalChain([allowedRoutes, 'optionalAccess', _5 => _5.sourceTokens]) ? new Set(allowedRoutes.sourceTokens.map((s) => s.toUpperCase())) : null,
+    [_optionalChain([allowedRoutes, 'optionalAccess', _6 => _6.sourceTokens])]
   );
   const rows = _react.useMemo.call(void 0, () => {
     return assets.filter((a) => {
@@ -389,7 +204,7 @@ function AssetSelectStep({
       const raw = _viem.formatUnits.call(void 0, BigInt(asset.balance), asset.decimals);
       const numeric = Number(raw);
       if (!Number.isFinite(numeric)) return raw;
-      return _chunkDCAANLEPcjs.tokenFormatter.format(numeric);
+      return _chunkV6NJIPSScjs.tokenFormatter.format(numeric);
     } catch (e3) {
       return asset.balance;
     }
@@ -397,20 +212,20 @@ function AssetSelectStep({
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen", children: [
     /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen-body", children: [
       /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-        _chunkDCAANLEPcjs.BodyHeader,
+        _chunkV6NJIPSScjs.BodyHeader,
         {
-          icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.WalletIcon, {}),
+          icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.WalletIcon, {}),
           title: "Your assets",
           subtitle: "Select source assets to transfer"
         }
       ),
       loading && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-loading-state", style: { padding: "40px 12px" }, children: [
-        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.Spinner, { className: "rs-text-tertiary" }),
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.Spinner, { className: "rs-text-tertiary" }),
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
       ] }),
       error && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-alert rs-alert--error", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-alert-text", children: error }) }),
       !loading && !error && rows.length === 0 && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-empty-state", children: [
-        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.WalletIcon, { className: "rs-empty-icon" }),
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.WalletIcon, { className: "rs-empty-icon" }),
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
         /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-empty-address", children: [
           address.slice(0, 6),
@@ -477,14 +292,14 @@ function AssetSelectStep({
                   ] })
                 ] })
               ] }),
-              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-asset-balance", children: asset.balanceUsd !== void 0 && asset.balanceUsd > 0 ? _chunkDCAANLEPcjs.currencyFormatter.format(asset.balanceUsd) : tokenAmount !== "--" ? `${tokenAmount} ${asset.symbol}` : "--" })
+              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-asset-balance", children: asset.balanceUsd !== void 0 && asset.balanceUsd > 0 ? _chunkV6NJIPSScjs.currencyFormatter.format(asset.balanceUsd) : tokenAmount !== "--" ? `${tokenAmount} ${asset.symbol}` : "--" })
             ]
           },
           asset.id
         );
       }) }),
       /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-        _chunkDCAANLEPcjs.Button,
+        _chunkV6NJIPSScjs.Button,
         {
           onClick: () => selectedAsset && onContinue(selectedAsset),
           disabled: !selectedAsset,
@@ -493,15 +308,15 @@ function AssetSelectStep({
         }
       )
     ] }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.PoweredBy, {})
   ] });
 }
 async function fetchNativeAssets(address, publicClient, existing) {
   const existingIds = new Set(existing.map((asset) => asset.id));
-  const connectedChainId = _optionalChain([publicClient, 'access', _12 => _12.chain, 'optionalAccess', _13 => _13.id]);
+  const connectedChainId = _optionalChain([publicClient, 'access', _7 => _7.chain, 'optionalAccess', _8 => _8.id]);
   if (!connectedChainId) return [];
   if (!_chunkIVTXEYB2cjs.SOURCE_CHAINS.some((chain) => chain.id === connectedChainId)) return [];
-  const id = _chunkDCAANLEPcjs.getAssetId.call(void 0, {
+  const id = _chunkV6NJIPSScjs.getAssetId.call(void 0, {
     chainId: connectedChainId,
     token: _chunkIVTXEYB2cjs.NATIVE_TOKEN_ADDRESS
   });
@@ -559,6 +374,7 @@ function AmountStep({
   address,
   balanceAddress,
   asset,
+  liquiditySource,
   defaultAmount,
   switchChain,
   targetChain,
@@ -577,7 +393,7 @@ function AmountStep({
   const [isCheckingLiquidity, setIsCheckingLiquidity] = _react.useState.call(void 0, false);
   const hasAttemptedSwitch = _react.useRef.call(void 0, false);
   const chainMismatch = Boolean(
-    _optionalChain([walletClient, 'optionalAccess', _14 => _14.chain, 'optionalAccess', _15 => _15.id]) && walletClient.chain.id !== asset.chainId
+    _optionalChain([walletClient, 'optionalAccess', _9 => _9.chain, 'optionalAccess', _10 => _10.id]) && walletClient.chain.id !== asset.chainId
   );
   const targetSymbol = _chunkIVTXEYB2cjs.getTokenSymbol.call(void 0, targetToken, targetChain);
   const isSourceStablecoin = _chunkIVTXEYB2cjs.isStablecoinSymbol.call(void 0, asset.symbol);
@@ -604,7 +420,7 @@ function AmountStep({
       const balanceTarget = _nullishCoalesce(balanceAddress, () => ( address));
       if (!balanceTarget || !publicClient) return;
       try {
-        const bal = _chunkDCAANLEPcjs.isNativeAsset.call(void 0, asset) ? await publicClient.getBalance({ address: balanceTarget }) : await publicClient.readContract({
+        const bal = _chunkV6NJIPSScjs.isNativeAsset.call(void 0, asset) ? await publicClient.getBalance({ address: balanceTarget }) : await publicClient.readContract({
           address: asset.token,
           abi: _viem.erc20Abi,
           functionName: "balanceOf",
@@ -625,7 +441,7 @@ function AmountStep({
       hasAttemptedSwitch.current = true;
       switchChain(asset.chainId).catch((err) => {
         const raw = err instanceof Error ? err.message : "Failed to switch chain";
-        setError(_chunkDCAANLEPcjs.formatUserError.call(void 0, raw));
+        setError(_chunkV6NJIPSScjs.formatUserError.call(void 0, raw));
       });
     }
   }, [chainMismatch, switchChain, asset.chainId]);
@@ -651,7 +467,7 @@ function AmountStep({
     }
   }, [balance, tokenPriceUsd, asset.decimals]);
   _react.useEffect.call(void 0, () => {
-    _optionalChain([onBalanceUsdChange, 'optionalCall', _16 => _16(_nullishCoalesce(balanceUsd, () => ( 0)))]);
+    _optionalChain([onBalanceUsdChange, 'optionalCall', _11 => _11(_nullishCoalesce(balanceUsd, () => ( 0)))]);
   }, [balanceUsd, onBalanceUsdChange]);
   const formattedBalance = _react.useMemo.call(void 0, () => {
     if (balance === null) return "\u2026";
@@ -659,7 +475,7 @@ function AmountStep({
       const raw = _viem.formatUnits.call(void 0, balance, asset.decimals);
       const numeric = Number(raw);
       if (!Number.isFinite(numeric)) return raw;
-      return _chunkDCAANLEPcjs.tokenFormatter.format(numeric);
+      return _chunkV6NJIPSScjs.tokenFormatter.format(numeric);
     } catch (e8) {
       return "\u2026";
     }
@@ -678,8 +494,8 @@ function AmountStep({
       return null;
     }
   }, [numericAmount, isSourceStablecoin, hasPricing, tokenPriceUsd, asset.decimals]);
-  const minDepositUsd = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _17 => _17.minDepositUsd]), () => ( null));
-  const maxDepositUsd = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _18 => _18.maxDepositUsd]), () => ( null));
+  const minDepositUsd = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _12 => _12.minDepositUsd]), () => ( null));
+  const maxDepositUsd = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _13 => _13.maxDepositUsd]), () => ( null));
   const isBelowMin = minDepositUsd !== null && numericAmount > 0 && amountUsd < minDepositUsd;
   const isAboveMax = maxDepositUsd !== null && amountUsd > maxDepositUsd;
   const exceedsBalance = Boolean(
@@ -688,7 +504,7 @@ function AmountStep({
   const balanceAfterUsd = targetBalanceUsd !== void 0 ? targetBalanceUsd + numericAmount : null;
   const handlePresetClick = (percentage) => {
     if (balance === null) return;
-    _optionalChain([onCtaClick, 'optionalCall', _19 => _19(percentage === 100 ? "Max" : `${percentage}%`)]);
+    _optionalChain([onCtaClick, 'optionalCall', _14 => _14(percentage === 100 ? "Max" : `${percentage}%`)]);
     const next = formatAmountFromBalance(
       balance,
       asset.decimals,
@@ -735,13 +551,13 @@ function AmountStep({
       return;
     }
     setError(null);
-    _optionalChain([onCtaClick, 'optionalCall', _20 => _20("continue")]);
+    _optionalChain([onCtaClick, 'optionalCall', _15 => _15("continue")]);
     setIsCheckingLiquidity(true);
     let liquidityWarning;
     try {
       const liquidity = await service.checkLiquidity({
-        sourceChainId: asset.chainId,
-        sourceToken: asset.token,
+        sourceChainId: _nullishCoalesce(_optionalChain([liquiditySource, 'optionalAccess', _16 => _16.chainId]), () => ( asset.chainId)),
+        sourceToken: _nullishCoalesce(_optionalChain([liquiditySource, 'optionalAccess', _17 => _17.token]), () => ( asset.token)),
         destinationChainId: targetChain,
         destinationToken: targetToken,
         amount: amountInUnits.toString()
@@ -778,7 +594,7 @@ function AmountStep({
   const targetTokenIcon = _chunkIVTXEYB2cjs.getTokenIcon.call(void 0, targetSymbol);
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen", children: [
     /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.BodyHeader, { icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.WalletIcon, {}), title: "Wallet deposit" }),
+      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.BodyHeader, { icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.WalletIcon, {}), title: "Wallet deposit" }),
       /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-section", children: [
         /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-display", children: [
           /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-input-row", children: [
@@ -804,13 +620,13 @@ function AmountStep({
               " available",
               balanceUsd !== null && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, _jsxruntime.Fragment, { children: [
                 " (~",
-                _chunkDCAANLEPcjs.currencyFormatter.format(balanceUsd),
+                _chunkV6NJIPSScjs.currencyFormatter.format(balanceUsd),
                 ")"
               ] })
             ] }),
             minDepositUsd !== null && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "rs-amount-meta-minimum", children: [
               "Min. deposit ",
-              _chunkDCAANLEPcjs.currencyFormatter.format(minDepositUsd)
+              _chunkV6NJIPSScjs.currencyFormatter.format(minDepositUsd)
             ] })
           ] })
         ] }),
@@ -851,15 +667,15 @@ function AmountStep({
         ] }),
         balanceAfterUsd !== null && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-detail-row", children: [
           /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: "Balance after deposit" }),
-          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-amount-detail-value", children: _chunkDCAANLEPcjs.currencyFormatter.format(balanceAfterUsd) })
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-amount-detail-value", children: _chunkV6NJIPSScjs.currencyFormatter.format(balanceAfterUsd) })
         ] })
       ] }),
       error && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-error", role: "alert", children: [
-        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: error })
       ] }),
       /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-        _chunkDCAANLEPcjs.Button,
+        _chunkV6NJIPSScjs.Button,
         {
           onClick: handleContinue,
           fullWidth: true,
@@ -868,7 +684,7 @@ function AmountStep({
         }
       )
     ] }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.PoweredBy, {})
   ] });
 }
 
@@ -876,6 +692,13 @@ function AmountStep({
 
 
 
+// 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
+
 function ConfirmStep({
   walletClient,
   address,
@@ -896,13 +719,14 @@ function ConfirmStep({
   quotedFeeSymbol,
   onConfirm,
   onError,
-  onDepositSubmitted
+  onDepositSubmitted,
+  executeTransfer
 }) {
   const [isSubmitting, setIsSubmitting] = _react.useState.call(void 0, false);
   const [error, setError] = _react.useState.call(void 0, null);
   const hasAttemptedSwitch = _react.useRef.call(void 0, false);
   const chainMismatch = Boolean(
-    _optionalChain([walletClient, 'optionalAccess', _21 => _21.chain, 'optionalAccess', _22 => _22.id]) && walletClient.chain.id !== asset.chainId
+    _optionalChain([walletClient, 'optionalAccess', _18 => _18.chain, 'optionalAccess', _19 => _19.id]) && walletClient.chain.id !== asset.chainId
   );
   const sameRoute = targetChain === asset.chainId && targetToken.toLowerCase() === asset.token.toLowerCase();
   const targetSymbol = sameRoute ? asset.symbol : _chunkIVTXEYB2cjs.getTokenSymbol.call(void 0, targetToken, targetChain);
@@ -925,15 +749,14 @@ function ConfirmStep({
     return formattedSendAmount;
   })();
   const receiveAmount = sameRoute ? formattedReceiveAmount : `~${formattedReceiveAmount}`;
-  const feeSymbol = _nullishCoalesce(quotedFeeSymbol, () => ( asset.symbol));
-  const feeSponsored = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _23 => _23.feeSponsored]), () => ( false));
-  const feeTooltip = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _24 => _24.feeTooltip]), () => ( (feeSponsored ? "Network fees are sponsored for this deposit." : "Network fees apply.")));
+  const feeSponsored = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _20 => _20.feeSponsored]), () => ( false));
+  const feeTooltip = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _21 => _21.feeTooltip]), () => ( (feeSponsored ? "Network fees are sponsored for this deposit." : "Network fees apply.")));
   _react.useEffect.call(void 0, () => {
     if (chainMismatch && switchChain && !hasAttemptedSwitch.current) {
       hasAttemptedSwitch.current = true;
       switchChain(asset.chainId).catch((err) => {
         const raw = err instanceof Error ? err.message : "Failed to switch chain";
-        setError(_chunkDCAANLEPcjs.formatUserError.call(void 0, raw));
+        setError(_chunkV6NJIPSScjs.formatUserError.call(void 0, raw));
       });
     }
   }, [chainMismatch, switchChain, asset.chainId]);
@@ -974,33 +797,43 @@ function ConfirmStep({
         throw new Error("Wallet not properly connected");
       }
       const transferTo = sameRoute ? recipient : smartAccount;
-      const hash = _chunkDCAANLEPcjs.isNativeAsset.call(void 0, asset) ? await walletClient.sendTransaction({
-        account,
-        chain,
-        to: transferTo,
-        value: amountUnits
-      }) : await walletClient.writeContract({
-        account,
-        chain,
-        address: asset.token,
-        abi: _viem.erc20Abi,
-        functionName: "transfer",
-        args: [transferTo, amountUnits]
-      });
-      _optionalChain([onDepositSubmitted, 'optionalCall', _25 => _25(hash, asset.chainId, amountUnits.toString())]);
-      onConfirm(hash, asset.chainId, amountUnits.toString(), asset.token);
+      let hash;
+      let resolvedSourceToken = asset.token;
+      if (executeTransfer) {
+        const result = await executeTransfer(amountUnits);
+        hash = result.txHash;
+        resolvedSourceToken = result.sourceToken;
+      } else if (_chunkV6NJIPSScjs.isNativeAsset.call(void 0, asset)) {
+        hash = await walletClient.sendTransaction({
+          account,
+          chain,
+          to: transferTo,
+          value: amountUnits
+        });
+      } else {
+        hash = await walletClient.writeContract({
+          account,
+          chain,
+          address: asset.token,
+          abi: _viem.erc20Abi,
+          functionName: "transfer",
+          args: [transferTo, amountUnits]
+        });
+      }
+      _optionalChain([onDepositSubmitted, 'optionalCall', _22 => _22(hash, asset.chainId, amountUnits.toString())]);
+      onConfirm(hash, asset.chainId, amountUnits.toString(), resolvedSourceToken);
     } catch (err) {
       const raw = err instanceof Error ? err.message : "Transfer failed";
-      const message = _chunkDCAANLEPcjs.formatUserError.call(void 0, raw);
+      const message = _chunkV6NJIPSScjs.formatUserError.call(void 0, raw);
       setError(message);
-      _optionalChain([onError, 'optionalCall', _26 => _26(message, "TRANSFER_ERROR")]);
+      _optionalChain([onError, 'optionalCall', _23 => _23(message, "TRANSFER_ERROR")]);
     } finally {
       setIsSubmitting(false);
     }
   };
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen", children: [
     /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.BodyHeader, { icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.WalletIcon, {}), title: "Review deposit" }),
+      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.BodyHeader, { icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.WalletIcon, {}), title: "Review deposit" }),
       /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-details", children: [
         /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-detail-row", children: [
           /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: "Source chain" }),
@@ -1045,31 +878,37 @@ function ConfirmStep({
         /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-detail-row", children: [
           /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: "Fees" }),
           /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, 
+            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
               "span",
               {
                 style: feeSponsored ? { textDecoration: "line-through" } : void 0,
-                children: [
-                  quotedFeeAmount,
-                  " ",
-                  feeSymbol
-                ]
+                children: "$0.05"
               }
             ),
-            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.Tooltip, { content: feeTooltip, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-amount-detail-info", "aria-label": "Fee info", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.InfoIcon, {}) }) })
+            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.Tooltip, { content: feeTooltip, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-amount-detail-info", "aria-label": "Fee info", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.InfoIcon, {}) }) })
           ] })
         ] })
       ] }),
-      liquidityWarning && (liquidityWarning.kind === "unavailable" || liquidityWarning.kind === "check-failed") && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-error", role: "status", children: [
-        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
+      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__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-error rs-amount-error--warning", role: "status", children: [
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: "Low liquidity detected \u2014 deposit may take longer" })
+        ] })
+      ) : /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-error", role: "status", children: [
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: liquidityWarning.kind === "unavailable" ? "Route may be unavailable" : "Liquidity check failed" })
-      ] }),
+      ] })),
       error && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-error", role: "alert", children: [
-        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: error })
       ] }),
       /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-        _chunkDCAANLEPcjs.Button,
+        _chunkV6NJIPSScjs.Button,
         {
           onClick: handleConfirm,
           loading: isSubmitting,
@@ -1080,7 +919,7 @@ function ConfirmStep({
         }
       )
     ] }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.PoweredBy, {})
   ] });
 }
 
@@ -1103,9 +942,9 @@ var INITIAL_POLL_INTERVAL = 3e3;
 var MAX_POLL_INTERVAL = 3e4;
 var BACKOFF_MULTIPLIER = 1.5;
 function isEventForTx(event, txHash) {
-  const eventTxHash = _chunkDCAANLEPcjs.getEventTxHash.call(void 0, event);
+  const eventTxHash = _chunkV6NJIPSScjs.getEventTxHash.call(void 0, event);
   if (!eventTxHash) return false;
-  return _chunkDCAANLEPcjs.txRefsMatch.call(void 0, eventTxHash, txHash);
+  return _chunkV6NJIPSScjs.txRefsMatch.call(void 0, eventTxHash, txHash);
 }
 function truncateHash(hash) {
   return `${hash.slice(0, 4)}\u2026${hash.slice(-4)}`;
@@ -1135,7 +974,7 @@ function formatTimestamp(ms) {
   return `${month} ${day}${suffix} \xB7 ${hours}:${minutes}:${seconds}`;
 }
 function formatBridgeFailedMessage(event) {
-  const eventData = _nullishCoalesce(_optionalChain([event, 'optionalAccess', _27 => _27.data]), () => ( {}));
+  const eventData = _nullishCoalesce(_optionalChain([event, 'optionalAccess', _24 => _24.data]), () => ( {}));
   const backendMessage = typeof eventData.message === "string" ? eventData.message.trim() : "";
   if (backendMessage.length > 0) {
     const lower = backendMessage.toLowerCase();
@@ -1155,7 +994,7 @@ function formatBridgeFailedMessage(event) {
   }
   return "Bridge failed";
 }
-var txLinkIcon = /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.ExternalLinkIcon, { className: "rs-deposit-notification-link-icon" });
+var txLinkIcon = /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.ExternalLinkIcon, { className: "rs-deposit-notification-link-icon" });
 function DepositNotification({
   deposit,
   smartAccount,
@@ -1183,7 +1022,7 @@ function DepositNotification({
   const pollIntervalRef = _react.useRef.call(void 0, INITIAL_POLL_INTERVAL);
   const pollTimeoutRef = _react.useRef.call(void 0, null);
   const completedRef = _react.useRef.call(void 0, _nullishCoalesce(directTransfer, () => ( false)));
-  const depositContextRef = _chunkDCAANLEPcjs.useLatestRef.call(void 0, {
+  const depositContextRef = _chunkV6NJIPSScjs.useLatestRef.call(void 0, {
     amount,
     sourceChain,
     sourceToken: token,
@@ -1192,8 +1031,8 @@ function DepositNotification({
     waitForFinalTx,
     hasPostBridgeActions
   });
-  const onCompleteRef = _chunkDCAANLEPcjs.useLatestRef.call(void 0, onComplete);
-  const onFailedRef = _chunkDCAANLEPcjs.useLatestRef.call(void 0, onFailed);
+  const onCompleteRef = _chunkV6NJIPSScjs.useLatestRef.call(void 0, onComplete);
+  const onFailedRef = _chunkV6NJIPSScjs.useLatestRef.call(void 0, onFailed);
   const handleComplete = _react.useCallback.call(void 0, 
     (destTxHash) => {
       if (completedRef.current) return;
@@ -1202,7 +1041,7 @@ function DepositNotification({
       setCompletedAt(Date.now());
       setStatus("complete");
       const context = depositContextRef.current;
-      _optionalChain([onCompleteRef, 'access', _28 => _28.current, 'optionalCall', _29 => _29(txHash, destTxHash, {
+      _optionalChain([onCompleteRef, 'access', _25 => _25.current, 'optionalCall', _26 => _26(txHash, destTxHash, {
         amount: context.amount,
         sourceChain: context.sourceChain,
         sourceToken: context.sourceToken,
@@ -1217,7 +1056,7 @@ function DepositNotification({
       if (completedRef.current) return;
       completedRef.current = true;
       setStatus("failed");
-      _optionalChain([onFailedRef, 'access', _30 => _30.current, 'optionalCall', _31 => _31(txHash, error)]);
+      _optionalChain([onFailedRef, 'access', _27 => _27.current, 'optionalCall', _28 => _28(txHash, error)]);
     },
     [onFailedRef, txHash]
   );
@@ -1236,30 +1075,30 @@ function DepositNotification({
         const lastEvent = data.lastEvent;
         const eventForTx = isEventForTx(lastEvent, txHash) ? lastEvent : void 0;
         const awaitingPostBridgeSwap = depositContextRef.current.waitForFinalTx && depositContextRef.current.hasPostBridgeActions;
-        if (_optionalChain([eventForTx, 'optionalAccess', _32 => _32.type]) === "post-bridge-swap-complete") {
-          const swapTxHash = _optionalChain([eventForTx, 'access', _33 => _33.data, 'optionalAccess', _34 => _34.swap, 'optionalAccess', _35 => _35.transactionHash]);
+        if (_optionalChain([eventForTx, 'optionalAccess', _29 => _29.type]) === "post-bridge-swap-complete") {
+          const swapTxHash = _optionalChain([eventForTx, 'access', _30 => _30.data, 'optionalAccess', _31 => _31.swap, 'optionalAccess', _32 => _32.transactionHash]);
           handleComplete(swapTxHash);
           return;
         }
-        if (_optionalChain([eventForTx, 'optionalAccess', _36 => _36.type]) === "post-bridge-swap-failed") {
+        if (_optionalChain([eventForTx, 'optionalAccess', _33 => _33.type]) === "post-bridge-swap-failed") {
           handleFailed(formatBridgeFailedMessage(eventForTx));
           return;
         }
-        if (_optionalChain([eventForTx, 'optionalAccess', _37 => _37.type]) === "bridge-complete" && !awaitingPostBridgeSwap) {
-          const destTx = _optionalChain([eventForTx, 'access', _38 => _38.data, 'optionalAccess', _39 => _39.destination, 'optionalAccess', _40 => _40.transactionHash]);
+        if (_optionalChain([eventForTx, 'optionalAccess', _34 => _34.type]) === "bridge-complete" && !awaitingPostBridgeSwap) {
+          const destTx = _optionalChain([eventForTx, 'access', _35 => _35.data, 'optionalAccess', _36 => _36.destination, 'optionalAccess', _37 => _37.transactionHash]);
           handleComplete(destTx);
           return;
         }
-        if (!waitForFinalTx && _optionalChain([eventForTx, 'optionalAccess', _41 => _41.type]) === "bridge-started") {
+        if (!waitForFinalTx && _optionalChain([eventForTx, 'optionalAccess', _38 => _38.type]) === "bridge-started") {
           handleComplete(void 0);
           return;
         }
-        if (_optionalChain([eventForTx, 'optionalAccess', _42 => _42.type]) === "bridge-failed") {
+        if (_optionalChain([eventForTx, 'optionalAccess', _39 => _39.type]) === "bridge-failed") {
           handleFailed(formatBridgeFailedMessage(eventForTx));
           return;
         }
-        if (_optionalChain([eventForTx, 'optionalAccess', _43 => _43.type]) === "error") {
-          const errorMessage = _nullishCoalesce(_optionalChain([eventForTx, 'access', _44 => _44.data, 'optionalAccess', _45 => _45.message]), () => ( "Unknown error"));
+        if (_optionalChain([eventForTx, 'optionalAccess', _40 => _40.type]) === "error") {
+          const errorMessage = _nullishCoalesce(_optionalChain([eventForTx, 'access', _41 => _41.data, 'optionalAccess', _42 => _42.message]), () => ( "Unknown error"));
           handleFailed(errorMessage);
           return;
         }
@@ -1301,7 +1140,7 @@ function DepositNotification({
   const destExplorerUrl = destinationTxHash ? _chunkIVTXEYB2cjs.getExplorerTxUrl.call(void 0, 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__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--complete", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.CheckIcon, {}) }) : status === "failed" ? /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--failed", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.CloseIcon, {}) }) : /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--processing", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.Spinner, {}) });
+  const statusIcon = status === "complete" ? /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--complete", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.CheckIcon, {}) }) : status === "failed" ? /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--failed", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.CloseIcon, {}) }) : /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--processing", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.Spinner, {}) });
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, 
     "div",
     {
@@ -1320,7 +1159,7 @@ function DepositNotification({
               className: "rs-deposit-notification-close",
               onClick: () => onDismiss(deposit.id),
               "aria-label": "Dismiss",
-              children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.CloseIcon, {})
+              children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.CloseIcon, {})
             }
           )
         ] }),
@@ -1409,7 +1248,7 @@ var DEFAULT_SOLANA_RPC_URL = "https://api.mainnet.solana.com";
 var configuredSolanaRpcUrl = null;
 var cachedConnections = /* @__PURE__ */ new Map();
 function configureSolanaRpcUrl(rpcUrl) {
-  const normalized = _optionalChain([rpcUrl, 'optionalAccess', _46 => _46.trim, 'call', _47 => _47()]);
+  const normalized = _optionalChain([rpcUrl, 'optionalAccess', _43 => _43.trim, 'call', _44 => _44()]);
   configuredSolanaRpcUrl = normalized ? normalized : null;
   cachedConnections.clear();
 }
@@ -1547,7 +1386,7 @@ function resolveSolanaTokenMeta(token) {
   return {};
 }
 function getDepositEventDetails(event) {
-  if (!_optionalChain([event, 'optionalAccess', _48 => _48.type]) || !isRecord(event.data)) return {};
+  if (!_optionalChain([event, 'optionalAccess', _45 => _45.type]) || !isRecord(event.data)) return {};
   if (event.type === "deposit-received") {
     const chainId = asChainId(event.data.chain);
     const token = asString(event.data.token);
@@ -1561,12 +1400,12 @@ function getDepositEventDetails(event) {
   }
   if (event.type === "bridge-started") {
     const source = isRecord(event.data.source) ? event.data.source : void 0;
-    const chainId = asChainId(_optionalChain([source, 'optionalAccess', _49 => _49.chain]));
-    const token = asString(_optionalChain([source, 'optionalAccess', _50 => _50.asset]));
+    const chainId = asChainId(_optionalChain([source, 'optionalAccess', _46 => _46.chain]));
+    const token = asString(_optionalChain([source, 'optionalAccess', _47 => _47.asset]));
     const solanaMeta = chainId === "solana" ? resolveSolanaTokenMeta(token) : {};
     return {
       chainId,
-      amount: asAmount(_optionalChain([source, 'optionalAccess', _51 => _51.amount])),
+      amount: asAmount(_optionalChain([source, 'optionalAccess', _48 => _48.amount])),
       token,
       ...solanaMeta
     };
@@ -1590,16 +1429,17 @@ function DepositAddressStep({
   onDepositComplete,
   onDepositFailed,
   onCopyAddress,
+  onRequestWalletPicker,
   onError
 }) {
   const hasSolana = Boolean(solanaDepositAddress);
   const allowedChainSet = _react.useMemo.call(void 0, 
-    () => _optionalChain([allowedRoutes, 'optionalAccess', _52 => _52.sourceChains]) ? new Set(allowedRoutes.sourceChains) : null,
-    [_optionalChain([allowedRoutes, 'optionalAccess', _53 => _53.sourceChains])]
+    () => _optionalChain([allowedRoutes, 'optionalAccess', _49 => _49.sourceChains]) ? new Set(allowedRoutes.sourceChains) : null,
+    [_optionalChain([allowedRoutes, 'optionalAccess', _50 => _50.sourceChains])]
   );
   const allowedTokenSet = _react.useMemo.call(void 0, 
-    () => _optionalChain([allowedRoutes, 'optionalAccess', _54 => _54.sourceTokens]) ? new Set(allowedRoutes.sourceTokens.map((s) => s.toUpperCase())) : null,
-    [_optionalChain([allowedRoutes, 'optionalAccess', _55 => _55.sourceTokens])]
+    () => _optionalChain([allowedRoutes, 'optionalAccess', _51 => _51.sourceTokens]) ? new Set(allowedRoutes.sourceTokens.map((s) => s.toUpperCase())) : null,
+    [_optionalChain([allowedRoutes, 'optionalAccess', _52 => _52.sourceTokens])]
   );
   const evmChainIds = _react.useMemo.call(void 0, () => {
     const all = _chunkIVTXEYB2cjs.getSupportedChainIds.call(void 0, );
@@ -1648,9 +1488,9 @@ function DepositAddressStep({
       const matched = _nullishCoalesce(SOLANA_TOKENS.find((t) => t.symbol === sourceTokenSymbol), () => ( SOLANA_TOKENS[0]));
       sourceSelectionRef.current = {
         chainId: "solana",
-        token: _optionalChain([matched, 'optionalAccess', _56 => _56.mint]),
-        sourceSymbol: _optionalChain([matched, 'optionalAccess', _57 => _57.symbol]),
-        sourceDecimals: _optionalChain([matched, 'optionalAccess', _58 => _58.decimals])
+        token: _optionalChain([matched, 'optionalAccess', _53 => _53.mint]),
+        sourceSymbol: _optionalChain([matched, 'optionalAccess', _54 => _54.symbol]),
+        sourceDecimals: _optionalChain([matched, 'optionalAccess', _55 => _55.decimals])
       };
       return;
     }
@@ -1719,8 +1559,8 @@ function DepositAddressStep({
     function handlePointerDown(event) {
       const target = event.target;
       if (!target) return;
-      const clickedChainDropdown = _optionalChain([chainDropdownRef, 'access', _59 => _59.current, 'optionalAccess', _60 => _60.contains, 'call', _61 => _61(target)]);
-      const clickedTokenDropdown = _optionalChain([tokenDropdownRef, 'access', _62 => _62.current, 'optionalAccess', _63 => _63.contains, 'call', _64 => _64(target)]);
+      const clickedChainDropdown = _optionalChain([chainDropdownRef, 'access', _56 => _56.current, 'optionalAccess', _57 => _57.contains, 'call', _58 => _58(target)]);
+      const clickedTokenDropdown = _optionalChain([tokenDropdownRef, 'access', _59 => _59.current, 'optionalAccess', _60 => _60.contains, 'call', _61 => _61(target)]);
       if (clickedChainDropdown || clickedTokenDropdown) return;
       setChainDropdownOpen(false);
       setTokenDropdownOpen(false);
@@ -1733,7 +1573,7 @@ function DepositAddressStep({
     };
   }, [chainDropdownOpen, tokenDropdownOpen]);
   const handleCopy = _react.useCallback.call(void 0, async () => {
-    _optionalChain([onCopyAddress, 'optionalCall', _65 => _65()]);
+    _optionalChain([onCopyAddress, 'optionalCall', _62 => _62()]);
     try {
       await navigator.clipboard.writeText(displayAddress);
       setCopied(true);
@@ -1807,10 +1647,10 @@ function DepositAddressStep({
           return;
         }
         const event = status.lastEvent;
-        const eventTxHash = _chunkDCAANLEPcjs.isDepositEvent.call(void 0, event) ? _nullishCoalesce(_chunkDCAANLEPcjs.getEventTxHash.call(void 0, event), () => ( null)) : null;
+        const eventTxHash = _chunkV6NJIPSScjs.isDepositEvent.call(void 0, event) ? _nullishCoalesce(_chunkV6NJIPSScjs.getEventTxHash.call(void 0, event), () => ( null)) : null;
         if (baselineTxHashRef.current === void 0) {
           baselineTxHashRef.current = eventTxHash;
-        } else if (eventTxHash && (!baselineTxHashRef.current || !_chunkDCAANLEPcjs.txRefsMatch.call(void 0, eventTxHash, baselineTxHashRef.current))) {
+        } else if (eventTxHash && (!baselineTxHashRef.current || !_chunkV6NJIPSScjs.txRefsMatch.call(void 0, eventTxHash, baselineTxHashRef.current))) {
           const details = getDepositEventDetails(event);
           const chainId = _nullishCoalesce(details.chainId, () => ( "unknown"));
           const amount = _nullishCoalesce(details.amount, () => ( "0"));
@@ -1839,7 +1679,7 @@ function DepositAddressStep({
             directTransfer
           };
           setNotifications((prev) => [notification, ...prev]);
-          _optionalChain([onDepositSubmittedRef, 'access', _66 => _66.current, 'optionalCall', _67 => _67({
+          _optionalChain([onDepositSubmittedRef, 'access', _63 => _63.current, 'optionalCall', _64 => _64({
             txHash: eventTxHash,
             sourceChain: chainId,
             amount
@@ -1850,7 +1690,7 @@ function DepositAddressStep({
         if (!cancelled) {
           const msg = err instanceof Error ? err.message : "Failed to check status";
           setPollingError(msg);
-          _optionalChain([onErrorRef, 'access', _68 => _68.current, 'optionalCall', _69 => _69(msg, "STATUS_POLL_ERROR")]);
+          _optionalChain([onErrorRef, 'access', _65 => _65.current, 'optionalCall', _66 => _66(msg, "STATUS_POLL_ERROR")]);
         }
       }
       if (!cancelled) {
@@ -1866,14 +1706,14 @@ function DepositAddressStep({
   const handleNotificationComplete = _react.useCallback.call(void 0, 
     (txHash, destinationTxHash, context) => {
       isTrackingRef.current = false;
-      _optionalChain([onDepositCompleteRef, 'access', _70 => _70.current, 'optionalCall', _71 => _71(txHash, destinationTxHash, context)]);
+      _optionalChain([onDepositCompleteRef, 'access', _67 => _67.current, 'optionalCall', _68 => _68(txHash, destinationTxHash, context)]);
     },
     []
   );
   const handleNotificationFailed = _react.useCallback.call(void 0, 
     (txHash, error) => {
       isTrackingRef.current = false;
-      _optionalChain([onDepositFailedRef, 'access', _72 => _72.current, 'optionalCall', _73 => _73(txHash, error)]);
+      _optionalChain([onDepositFailedRef, 'access', _69 => _69.current, 'optionalCall', _70 => _70(txHash, error)]);
     },
     []
   );
@@ -1883,7 +1723,7 @@ function DepositAddressStep({
   const qrIconSrc = _chunkIVTXEYB2cjs.getChainIcon.call(void 0, sourceChainId);
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen rs-step--with-notifications", children: [
     /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen-body", children: [
-      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.BodyHeader, { icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.CoinsIcon, {}), title: "Transfer crypto" }),
+      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.BodyHeader, { icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.CoinsIcon, {}), title: "Transfer crypto" }),
       /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-deposit-address-selectors", children: [
         /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-deposit-address-dropdown", ref: chainDropdownRef, children: [
           /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-deposit-address-dropdown-label", children: "Supported chain" }),
@@ -1906,7 +1746,7 @@ function DepositAddressStep({
                   }
                 ),
                 /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: _chunkIVTXEYB2cjs.getChainName.call(void 0, sourceChainId) }),
-                /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
+                /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
               ]
             }
           ),
@@ -1939,9 +1779,9 @@ function DepositAddressStep({
             /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: "Supported token" }),
             /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "rs-deposit-address-min", children: [
               "Min.$",
-              _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _74 => _74.minDepositUsd]), () => ( 0.1)),
-              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.Tooltip, { content: "Minimum deposit amount required for the selected chain.", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-                _chunkDCAANLEPcjs.InfoIcon,
+              _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _71 => _71.minDepositUsd]), () => ( 0.1)),
+              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.Tooltip, { content: "Minimum deposit amount required for the selected chain.", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+                _chunkV6NJIPSScjs.InfoIcon,
                 {
                   className: "rs-deposit-address-min-icon",
                   "aria-hidden": "true"
@@ -1968,7 +1808,7 @@ function DepositAddressStep({
                   }
                 ),
                 /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: sourceTokenSymbol }),
-                /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
+                /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
               ]
             }
           ),
@@ -2016,7 +1856,7 @@ function DepositAddressStep({
                         alignItems: "center",
                         justifyContent: "center"
                       },
-                      children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.Spinner, {})
+                      children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.Spinner, {})
                     }
                   ),
                   children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, QRCode, { value: displayAddress, size: 220, iconSrc: qrIconSrc })
@@ -2031,7 +1871,7 @@ function DepositAddressStep({
                 className: "rs-deposit-address-copy",
                 onClick: handleCopy,
                 children: [
-                  copied ? /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.CheckIcon, {}) : /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.CopyIcon, {}),
+                  copied ? /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.CheckIcon, {}) : /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.CopyIcon, {}),
                   copied ? "Copied!" : "Copy address"
                 ]
               }
@@ -2056,16 +1896,16 @@ function DepositAddressStep({
                     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-price-impact-label", children: "Price impact" }),
                     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-price-impact-label", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "strong", { children: "0.00%" }) }),
                     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-                      _chunkDCAANLEPcjs.Tooltip,
+                      _chunkV6NJIPSScjs.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__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.InfoIcon, { "aria-hidden": "true" })
+                        children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.InfoIcon, { "aria-hidden": "true" })
                       }
                     )
                   ] }),
                   /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-                    _chunkDCAANLEPcjs.ChevronDownIcon,
+                    _chunkV6NJIPSScjs.ChevronDownIcon,
                     {
                       className: "rs-price-impact-chevron",
                       "aria-hidden": "true"
@@ -2076,29 +1916,29 @@ function DepositAddressStep({
             ),
             /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-price-impact-panel", children: /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-price-impact-panel-inner", children: [
               /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-price-impact-row", children: [
-                /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.PercentIcon, {}) }),
+                /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.PercentIcon, {}) }),
                 /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "rs-price-impact-label", children: [
                   "Max slippage: ",
                   /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "strong", { children: "0.2%" })
                 ] }),
                 /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-                  _chunkDCAANLEPcjs.Tooltip,
+                  _chunkV6NJIPSScjs.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__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.InfoIcon, { "aria-hidden": "true" })
+                    children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.InfoIcon, { "aria-hidden": "true" })
                   }
                 )
               ] }),
               /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-price-impact-row", children: [
-                /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.ClockIcon, {}) }),
+                /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.ClockIcon, {}) }),
                 /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "rs-price-impact-label", children: [
                   "Processing time: ",
                   /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "strong", { children: "< 1 min" })
                 ] })
               ] }),
               /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-price-impact-row", children: [
-                /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.PlusCircleIcon, {}) }),
+                /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.PlusCircleIcon, {}) }),
                 /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "rs-price-impact-label", children: [
                   "Max deposit:",
                   " ",
@@ -2112,7 +1952,16 @@ function DepositAddressStep({
           ]
         }
       ),
-      pollingError && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-deposit-address-error", children: pollingError })
+      pollingError && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-deposit-address-error", children: pollingError }),
+      onRequestWalletPicker && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+        "button",
+        {
+          type: "button",
+          className: "rs-connect-wallet-manage",
+          onClick: onRequestWalletPicker,
+          children: "Use a wallet to deposit instead"
+        }
+      )
     ] }),
     notifications.length > 0 && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-deposit-notifications", children: notifications.map((deposit) => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
       DepositNotification,
@@ -2131,7 +1980,7 @@ function DepositAddressStep({
       },
       deposit.id
     )) }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.PoweredBy, {})
   ] });
 }
 DepositAddressStep.displayName = "DepositAddressStep";
@@ -2162,7 +2011,7 @@ function SolanaTokenSelectStep({
       setError(null);
       const portfolioBySymbol = {};
       try {
-        _chunkDCAANLEPcjs.debugLog.call(void 0, debug, "solana-token-select", "portfolio:request", {
+        _chunkV6NJIPSScjs.debugLog.call(void 0, debug, "solana-token-select", "portfolio:request", {
           solanaAddress
         });
         const portfolio = await service.fetchSolanaPortfolio(solanaAddress);
@@ -2185,12 +2034,12 @@ function SolanaTokenSelectStep({
             };
           }
         }
-        _chunkDCAANLEPcjs.debugLog.call(void 0, debug, "solana-token-select", "portfolio:success", {
+        _chunkV6NJIPSScjs.debugLog.call(void 0, debug, "solana-token-select", "portfolio:success", {
           symbols: Object.keys(portfolioBySymbol)
         });
       } catch (err) {
         if (!active) return;
-        _chunkDCAANLEPcjs.debugError.call(void 0, debug, "solana-token-select", "portfolio:failure", err, {
+        _chunkV6NJIPSScjs.debugError.call(void 0, debug, "solana-token-select", "portfolio:failure", err, {
           solanaAddress
         });
         setError(
@@ -2215,7 +2064,7 @@ function SolanaTokenSelectStep({
       setTokenBalances(results);
       setLoading(false);
       const totalUsd = results.reduce((sum, r) => sum + r.balanceUsd, 0);
-      _optionalChain([onTotalBalanceComputed, 'optionalCall', _75 => _75(totalUsd)]);
+      _optionalChain([onTotalBalanceComputed, 'optionalCall', _72 => _72(totalUsd)]);
     }
     void loadBalances();
     return () => {
@@ -2237,9 +2086,9 @@ function SolanaTokenSelectStep({
   }
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-step", children: [
     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { style: { padding: "0 12px 12px" }, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkDCAANLEPcjs.BodyHeader,
+      _chunkV6NJIPSScjs.BodyHeader,
       {
-        icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.CoinsIcon, {}),
+        icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.CoinsIcon, {}),
         title: "Select asset",
         subtitle: "Pick a Solana token to deposit"
       }
@@ -2251,11 +2100,11 @@ function SolanaTokenSelectStep({
         style: { paddingTop: 4, overflow: "auto", maxHeight: 340 },
         children: [
           loading && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-loading-state", style: { padding: "40px 12px" }, children: [
-            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.Spinner, { className: "rs-text-tertiary" }),
+            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.Spinner, { className: "rs-text-tertiary" }),
             /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
           ] }),
           !loading && rows.length === 0 && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-empty-state", children: [
-            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.WalletIcon, { className: "rs-empty-icon" }),
+            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.WalletIcon, { className: "rs-empty-icon" }),
             /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
             /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-empty-address", children: [
               solanaAddress.slice(0, 6),
@@ -2271,7 +2120,7 @@ function SolanaTokenSelectStep({
             try {
               const raw = _viem.formatUnits.call(void 0, entry.balance, entry.token.decimals);
               const numeric = Number(raw);
-              formattedBalance = Number.isFinite(numeric) ? _chunkDCAANLEPcjs.tokenFormatter.format(numeric) : raw;
+              formattedBalance = Number.isFinite(numeric) ? _chunkV6NJIPSScjs.tokenFormatter.format(numeric) : raw;
             } catch (e16) {
               formattedBalance = "...";
             }
@@ -2315,7 +2164,7 @@ function SolanaTokenSelectStep({
                       ] })
                     ] })
                   ] }),
-                  /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? _chunkDCAANLEPcjs.currencyFormatter.format(entry.balanceUsd) : `${formattedBalance} ${entry.token.symbol}` })
+                  /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? _chunkV6NJIPSScjs.currencyFormatter.format(entry.balanceUsd) : `${formattedBalance} ${entry.token.symbol}` })
                 ]
               },
               entry.token.symbol
@@ -2325,7 +2174,7 @@ function SolanaTokenSelectStep({
       }
     ),
     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step-footer", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkDCAANLEPcjs.Button,
+      _chunkV6NJIPSScjs.Button,
       {
         onClick: () => selectedEntry && onContinue(
           selectedEntry.token,
@@ -2337,7 +2186,7 @@ function SolanaTokenSelectStep({
         children: "Continue"
       }
     ) }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.PoweredBy, {})
   ] });
 }
 
@@ -2395,7 +2244,7 @@ function SolanaAmountStep({
       const raw = _viem.formatUnits.call(void 0, balance, token.decimals);
       const numeric = Number(raw);
       if (!Number.isFinite(numeric)) return raw;
-      return _chunkDCAANLEPcjs.tokenFormatter.format(numeric);
+      return _chunkV6NJIPSScjs.tokenFormatter.format(numeric);
     } catch (e18) {
       return "\u2026";
     }
@@ -2438,8 +2287,8 @@ function SolanaAmountStep({
       return null;
     }
   }, [numericAmount, isSourceStablecoin, hasPricing, tokenPriceUsd, token.decimals]);
-  const minDepositUsd = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _76 => _76.minDepositUsd]), () => ( null));
-  const maxDepositUsd = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _77 => _77.maxDepositUsd]), () => ( null));
+  const minDepositUsd = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _73 => _73.minDepositUsd]), () => ( null));
+  const maxDepositUsd = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _74 => _74.maxDepositUsd]), () => ( null));
   const isBelowMin = minDepositUsd !== null && numericAmount > 0 && numericAmount < minDepositUsd;
   const isAboveMax = maxDepositUsd !== null && numericAmount > maxDepositUsd;
   const exceedsBalance = Boolean(
@@ -2454,7 +2303,7 @@ function SolanaAmountStep({
       const factor = 1e3;
       const truncated = Math.floor(value * factor) / factor;
       const formatted = truncated.toFixed(3).replace(/\.?0+$/, "");
-      _chunkDCAANLEPcjs.debugLog.call(void 0, debug, "solana-amount", "amount:preset", {
+      _chunkV6NJIPSScjs.debugLog.call(void 0, debug, "solana-amount", "amount:preset", {
         percentage,
         symbol: token.symbol,
         formatted
@@ -2492,7 +2341,7 @@ function SolanaAmountStep({
     try {
       amountInUnits = _viem.parseUnits.call(void 0, sourceAmountStr, token.decimals);
     } catch (e23) {
-      _chunkDCAANLEPcjs.debugLog.call(void 0, debug, "solana-amount", "amount:invalid", {
+      _chunkV6NJIPSScjs.debugLog.call(void 0, debug, "solana-amount", "amount:invalid", {
         amount,
         sourceAmount: sourceAmountStr,
         reason: "parse-units-failed"
@@ -2507,7 +2356,7 @@ function SolanaAmountStep({
       );
       return;
     }
-    _chunkDCAANLEPcjs.debugLog.call(void 0, debug, "solana-amount", "amount:continue", {
+    _chunkV6NJIPSScjs.debugLog.call(void 0, debug, "solana-amount", "amount:continue", {
       symbol: token.symbol,
       inputAmountUsd: amount,
       sourceAmount: sourceAmountStr,
@@ -2521,7 +2370,7 @@ function SolanaAmountStep({
   const sourceTokenIcon = _chunkIVTXEYB2cjs.getTokenIcon.call(void 0, token.symbol);
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen", children: [
     /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.BodyHeader, { icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.WalletIcon, {}), title: "Wallet deposit" }),
+      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.BodyHeader, { icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.WalletIcon, {}), title: "Wallet deposit" }),
       /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-section", children: [
         /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-display", children: [
           /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-input-row", children: [
@@ -2547,13 +2396,13 @@ function SolanaAmountStep({
               " available",
               computedBalanceUsd !== null && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, _jsxruntime.Fragment, { children: [
                 " (~",
-                _chunkDCAANLEPcjs.currencyFormatter.format(computedBalanceUsd),
+                _chunkV6NJIPSScjs.currencyFormatter.format(computedBalanceUsd),
                 ")"
               ] })
             ] }),
             minDepositUsd !== null && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "rs-amount-meta-minimum", children: [
               "Min. deposit ",
-              _chunkDCAANLEPcjs.currencyFormatter.format(minDepositUsd)
+              _chunkV6NJIPSScjs.currencyFormatter.format(minDepositUsd)
             ] })
           ] })
         ] }),
@@ -2592,15 +2441,15 @@ function SolanaAmountStep({
         ] }),
         balanceAfterUsd !== null && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-detail-row", children: [
           /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: "Balance after deposit" }),
-          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-amount-detail-value", children: _chunkDCAANLEPcjs.currencyFormatter.format(balanceAfterUsd) })
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-amount-detail-value", children: _chunkV6NJIPSScjs.currencyFormatter.format(balanceAfterUsd) })
         ] })
       ] }),
       error && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-error", role: "alert", children: [
-        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: error })
       ] }),
       /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-        _chunkDCAANLEPcjs.Button,
+        _chunkV6NJIPSScjs.Button,
         {
           onClick: handleContinue,
           fullWidth: true,
@@ -2609,7 +2458,7 @@ function SolanaAmountStep({
         }
       )
     ] }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.PoweredBy, {})
   ] });
 }
 
@@ -2653,7 +2502,7 @@ function SolanaConfirmStep({
   const receiveAmount = isSameToken ? formattedReceiveAmount : `~ ${formattedReceiveAmount}`;
   const handleConfirm = async () => {
     if (!solanaProvider) {
-      _chunkDCAANLEPcjs.debugLog.call(void 0, debug, "solana-confirm", "submit:blocked", {
+      _chunkV6NJIPSScjs.debugLog.call(void 0, debug, "solana-confirm", "submit:blocked", {
         reason: "missing-provider"
       });
       setError("Solana wallet not connected");
@@ -2661,7 +2510,7 @@ function SolanaConfirmStep({
     }
     const parsedAmount = parseFloat(sourceAmount);
     if (isNaN(parsedAmount) || parsedAmount <= 0) {
-      _chunkDCAANLEPcjs.debugLog.call(void 0, debug, "solana-confirm", "submit:blocked", {
+      _chunkV6NJIPSScjs.debugLog.call(void 0, debug, "solana-confirm", "submit:blocked", {
         reason: "invalid-amount",
         sourceAmount
       });
@@ -2670,7 +2519,7 @@ function SolanaConfirmStep({
     }
     setError(null);
     setIsSubmitting(true);
-    _chunkDCAANLEPcjs.debugLog.call(void 0, debug, "solana-confirm", "submit:start", {
+    _chunkV6NJIPSScjs.debugLog.call(void 0, debug, "solana-confirm", "submit:start", {
       smartAccount,
       solanaAddress,
       solanaDepositAddress,
@@ -2680,7 +2529,7 @@ function SolanaConfirmStep({
     });
     try {
       const check = await service.checkAccount(smartAccount);
-      _chunkDCAANLEPcjs.debugLog.call(void 0, debug, "solana-confirm", "check:success", {
+      _chunkV6NJIPSScjs.debugLog.call(void 0, debug, "solana-confirm", "check:success", {
         smartAccount,
         isRegistered: check.isRegistered,
         targetChain: check.targetChain,
@@ -2693,7 +2542,7 @@ function SolanaConfirmStep({
       }
       const connection = getSolanaConnection();
       const amountUnits = _viem.parseUnits.call(void 0, sourceAmount, token.decimals);
-      _chunkDCAANLEPcjs.debugLog.call(void 0, debug, "solana-confirm", "tx:build:start", {
+      _chunkV6NJIPSScjs.debugLog.call(void 0, debug, "solana-confirm", "tx:build:start", {
         token: token.symbol,
         sourceAmount,
         amountUnits: amountUnits.toString()
@@ -2710,10 +2559,10 @@ function SolanaConfirmStep({
         token.mint,
         amountUnits
       );
-      _chunkDCAANLEPcjs.debugLog.call(void 0, debug, "solana-confirm", "tx:build:success", {
+      _chunkV6NJIPSScjs.debugLog.call(void 0, debug, "solana-confirm", "tx:build:success", {
         token: token.symbol,
         instructionCount: transaction.instructions.length,
-        feePayer: _optionalChain([transaction, 'access', _78 => _78.feePayer, 'optionalAccess', _79 => _79.toBase58, 'call', _80 => _80()]),
+        feePayer: _optionalChain([transaction, 'access', _75 => _75.feePayer, 'optionalAccess', _76 => _76.toBase58, 'call', _77 => _77()]),
         recentBlockhash: transaction.recentBlockhash
       });
       const txHash = await sendSolanaTransaction(
@@ -2721,27 +2570,27 @@ function SolanaConfirmStep({
         connection,
         transaction
       );
-      _chunkDCAANLEPcjs.debugLog.call(void 0, debug, "solana-confirm", "tx:sent", {
+      _chunkV6NJIPSScjs.debugLog.call(void 0, debug, "solana-confirm", "tx:sent", {
         txHash,
         amountUnits: amountUnits.toString()
       });
       onConfirm(txHash, amountUnits.toString());
     } catch (err) {
       const raw = err instanceof Error ? err.message : "Transfer failed";
-      const message = _chunkDCAANLEPcjs.formatUserError.call(void 0, raw);
-      _chunkDCAANLEPcjs.debugError.call(void 0, debug, "solana-confirm", "submit:failure", err, {
+      const message = _chunkV6NJIPSScjs.formatUserError.call(void 0, raw);
+      _chunkV6NJIPSScjs.debugError.call(void 0, debug, "solana-confirm", "submit:failure", err, {
         smartAccount,
         token: token.symbol,
         sourceAmount
       });
       setError(message);
-      _optionalChain([onError, 'optionalCall', _81 => _81(message, "SOLANA_TRANSFER_ERROR")]);
+      _optionalChain([onError, 'optionalCall', _78 => _78(message, "SOLANA_TRANSFER_ERROR")]);
     } finally {
       setIsSubmitting(false);
     }
   };
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-step", children: [
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { style: { padding: "0 12px 12px" }, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.BodyHeader, { icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.WalletIcon, {}), title: "Review deposit" }) }),
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { style: { padding: "0 12px 12px" }, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.BodyHeader, { icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.WalletIcon, {}), title: "Review deposit" }) }),
     /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-step-body rs-space-y-3", style: { paddingTop: 0 }, children: [
       /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-card", children: [
         /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-card-row", children: [
@@ -2840,12 +2689,12 @@ function SolanaConfirmStep({
         ] })
       ] }),
       error && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-alert rs-alert--error", children: [
-        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.AlertTriangleIcon, { className: "rs-alert-icon" }),
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.AlertTriangleIcon, { className: "rs-alert-icon" }),
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-alert-text", children: error })
       ] })
     ] }),
     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step-footer", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkDCAANLEPcjs.Button,
+      _chunkV6NJIPSScjs.Button,
       {
         onClick: handleConfirm,
         loading: isSubmitting,
@@ -2854,9 +2703,350 @@ function SolanaConfirmStep({
         children: "Continue"
       }
     ) }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.PoweredBy, {})
+  ] });
+}
+
+// src/components/steps/DappImportAssetSelectStep.tsx
+
+function DappImportAssetSelectStep({
+  sourceLabel,
+  assets,
+  onSelect
+}) {
+  return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen", children: [
+    /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+        _chunkV6NJIPSScjs.BodyHeader,
+        {
+          icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.HandCoinsIcon, {}),
+          title: `Transfer from ${sourceLabel}`,
+          subtitle: "Pick the balance to import"
+        }
+      ),
+      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-list", children: assets.map((asset) => {
+        const balanceTokens = asset.balance ? _chunkV6NJIPSScjs.tokenFormatter.format(
+          Number(asset.balance) / 10 ** asset.decimals
+        ) : "0";
+        const balanceUsd = asset.balanceUsd && asset.balanceUsd > 0 ? _chunkV6NJIPSScjs.currencyFormatter.format(asset.balanceUsd) : `${balanceTokens} ${asset.symbol}`;
+        const iconSrc = _chunkIVTXEYB2cjs.getTokenIcon.call(void 0, asset.symbol);
+        return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+          _chunkV6NJIPSScjs.ListRow,
+          {
+            leadingMedia: iconSrc || void 0,
+            leading: iconSrc ? void 0 : /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.HandCoinsIcon, {}),
+            title: asset.symbol,
+            subtitle: `${balanceTokens} on ${_chunkIVTXEYB2cjs.getChainName.call(void 0, asset.chainId)}`,
+            meta: balanceUsd,
+            onClick: () => onSelect(asset)
+          },
+          asset.id
+        );
+      }) })
+    ] }),
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.PoweredBy, {})
   ] });
 }
+DappImportAssetSelectStep.displayName = "DappImportAssetSelectStep";
+
+// src/core/dapp-imports/polymarket/index.ts
+
+
+
+// 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
+
+async function fetchPolymarketProxyWallet(eoa, signal) {
+  const url = `${GAMMA_API_PUBLIC_PROFILE}?address=${eoa}`;
+  let response;
+  try {
+    response = await fetch(url, { signal });
+  } catch (e24) {
+    return null;
+  }
+  if (!response.ok) {
+    return null;
+  }
+  let payload;
+  try {
+    payload = await response.json();
+  } catch (e25) {
+    return null;
+  }
+  const raw = payload.proxyWallet;
+  if (!raw || !_viem.isAddress.call(void 0, raw)) {
+    return null;
+  }
+  const checksummed = _viem.getAddress.call(void 0, raw);
+  if (checksummed === _viem.zeroAddress) {
+    return null;
+  }
+  return checksummed;
+}
+
+// src/core/dapp-imports/polymarket/safe.ts
+
+
+
+
+
+
+
+
+
+
+
+var COLLATERAL_OFFRAMP_ABI = _viem.parseAbi.call(void 0, [
+  "function unwrap(address _asset, address _to, uint256 _amount)"
+]);
+var MULTI_SEND_ABI = _viem.parseAbi.call(void 0, ["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: _viem.erc20Abi,
+          functionName: "balanceOf",
+          args: [proxyWallet]
+        },
+        {
+          address: POLYMARKET_USDCE_ADDRESS,
+          abi: _viem.erc20Abi,
+          functionName: "balanceOf",
+          args: [proxyWallet]
+        }
+      ]
+    });
+    return {
+      pusd: results[0].status === "success" ? results[0].result : 0n,
+      usdce: results[1].status === "success" ? results[1].result : 0n
+    };
+  } catch (e26) {
+    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: _chunkV6NJIPSScjs.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 = _viem.concat.call(void 0, [
+    _viem.pad.call(void 0, account.address, { size: 32 }),
+    _viem.pad.call(void 0, _viem.toHex.call(void 0, 0), { size: 32 }),
+    _viem.toHex.call(void 0, 1, { size: 1 })
+  ]);
+  const txHash = await walletClient.writeContract({
+    account,
+    chain,
+    address: safeAddress,
+    abi: _chunkV6NJIPSScjs.SAFE_ABI,
+    functionName: "execTransaction",
+    args: [
+      safeTx.to,
+      0n,
+      safeTx.data,
+      safeTx.operation,
+      0n,
+      0n,
+      0n,
+      _viem.zeroAddress,
+      _viem.zeroAddress,
+      signature
+    ]
+  });
+  const receipt = await publicClient.waitForTransactionReceipt({
+    hash: txHash
+  });
+  const parsed = _viem.parseEventLogs.call(void 0, {
+    abi: _chunkV6NJIPSScjs.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: _viem.encodeFunctionData.call(void 0, {
+      abi: _viem.erc20Abi,
+      functionName: "transfer",
+      args: [recipient, amount]
+    }),
+    operation: 0
+  };
+}
+function buildPusdUnwrapSafeTx(recipient, amount) {
+  const approveData = _viem.encodeFunctionData.call(void 0, {
+    abi: _viem.erc20Abi,
+    functionName: "approve",
+    args: [POLYMARKET_COLLATERAL_OFFRAMP_ADDRESS, amount]
+  });
+  const unwrapData = _viem.encodeFunctionData.call(void 0, {
+    abi: COLLATERAL_OFFRAMP_ABI,
+    functionName: "unwrap",
+    args: [POLYMARKET_USDCE_ADDRESS, recipient, amount]
+  });
+  return {
+    to: SAFE_MULTI_SEND_CALL_ONLY_ADDRESS,
+    data: _viem.encodeFunctionData.call(void 0, {
+      abi: MULTI_SEND_ABI,
+      functionName: "multiSend",
+      args: [
+        _viem.concat.call(void 0, [
+          encodeMultiSendCall(POLYMARKET_PUSD_ADDRESS, approveData),
+          encodeMultiSendCall(POLYMARKET_COLLATERAL_OFFRAMP_ADDRESS, unwrapData)
+        ])
+      ]
+    }),
+    operation: 1
+  };
+}
+function encodeMultiSendCall(to, data) {
+  return _viem.encodePacked.call(void 0, 
+    ["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: _react.createElement.call(void 0, "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 (_optionalChain([signal, 'optionalAccess', _79 => _79.aborted])) return null;
+    const polygonClient = getPublicClient2(POLYMARKET_POLYGON_CHAIN_ID);
+    if (!polygonClient) return null;
+    const balances = await readPolymarketBalances({
+      publicClient: polygonClient,
+      proxyWallet
+    });
+    if (_optionalChain([signal, 'optionalAccess', _80 => _80.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 + (_nullishCoalesce(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(_viem.formatUnits.call(void 0, 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
 
@@ -2884,6 +3074,23 @@ var RESET_DEPOSIT_FIELDS = {
   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 = _nullishCoalesce(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: _nullishCoalesce(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: _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _81 => _81.smartAccount]), () => ( null)),
+        sessionOwnerAddress: _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _82 => _82.sessionOwnerAddress]), () => ( null)),
+        solanaDepositAddress: _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _83 => _83.solanaDepositAddress]), () => ( null)),
+        message: null,
+        cacheable: action.cacheable,
+        attemptNonce: _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _84 => _84.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: _nullishCoalesce(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,27 +3420,109 @@ function applyAction(state, action) {
         },
         flow: { ...state.flow, step: "processing" }
       };
-    case "back/requested":
-      return applyBack(state, action.hasWalletOptions);
-    case "flow/reset":
+    case "dapp-import/availability-loading":
       return {
         ...state,
-        flow: {
-          step: "setup",
-          mode: null,
-          isConnectSelectionConfirmed: false,
-          hasNavigatedBack: false
-        },
-        wallet: {
-          selectedWalletId: null
-        },
-        deposit: { ...state.deposit, ...RESET_DEPOSIT_FIELDS },
-        processing: {
-          txHash: null,
-          directTransfer: false
+        dappImport: {
+          ...state.dappImport,
+          availabilityOwner: action.owner,
+          availability: {
+            ...state.dappImport.availabilityOwner && ownerKey(state.dappImport.availabilityOwner) === ownerKey(action.owner) ? state.dappImport.availability : {},
+            [action.providerId]: "loading"
+          }
         }
       };
-    case "target/changed":
+    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": {
+      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: "connect",
+          mode: null,
+          isConnectSelectionConfirmed: false,
+          hasNavigatedBack: false
+        },
+        wallet: {
+          selectedWalletId: null
+        },
+        deposit: { ...state.deposit, ...RESET_DEPOSIT_FIELDS },
+        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": {
       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 _nullishCoalesce(entry, () => ( { ...IDLE_SETUP_ENTRY, owner }));
+}
 
 // src/store/index.ts
 function createDepositStore(overrides) {
@@ -3237,8 +3652,229 @@ function useDepositStore(selector) {
   return _zustand.useStore.call(void 0, 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 = _chunkV6NJIPSScjs.loadSessionOwnerFromStorage.call(void 0, eoaAddress);
+  if (local) {
+    return {
+      account: _chunkV6NJIPSScjs.accountFromPrivateKey.call(void 0, local.privateKey),
+      address: local.address
+    };
+  }
+  const created = _chunkV6NJIPSScjs.createSessionOwnerKey.call(void 0, );
+  _chunkV6NJIPSScjs.saveSessionOwnerToStorage.call(void 0, 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: _optionalChain([input, 'access', _85 => _85.recipient, 'optionalAccess', _86 => _86.toLowerCase, 'call', _87 => _87()]),
+    outputTokenRules: _nullishCoalesce(input.outputTokenRules, () => ( null)),
+    rejectUnmapped: _nullishCoalesce(input.rejectUnmapped, () => ( null)),
+    signerAddress: input.signerAddress.toLowerCase(),
+    sessionChainIds: _nullishCoalesce(input.sessionChainIds, () => ( null)),
+    enableSolana: _nullishCoalesce(input.enableSolana, () => ( true)),
+    forceRegister: _nullishCoalesce(input.forceRegister, () => ( false)),
+    postBridgeActions: _nullishCoalesce(input.postBridgeActions, () => ( null))
+  });
+}
+function computeCacheKey(input, sessionOwnerAddress) {
+  return stableStringify({
+    ownerAddress: input.ownerAddress.toLowerCase(),
+    sessionOwnerAddress: sessionOwnerAddress.toLowerCase(),
+    targetChain: input.targetChain,
+    targetToken: input.targetToken.toLowerCase(),
+    recipient: _optionalChain([input, 'access', _88 => _88.recipient, 'optionalAccess', _89 => _89.toLowerCase, 'call', _90 => _90()]),
+    outputTokenRules: _nullishCoalesce(input.outputTokenRules, () => ( null)),
+    rejectUnmapped: _nullishCoalesce(input.rejectUnmapped, () => ( null)),
+    signerAddress: input.signerAddress.toLowerCase(),
+    sessionChainIds: _nullishCoalesce(input.sessionChainIds, () => ( null)),
+    enableSolana: _nullishCoalesce(input.enableSolana, () => ( true))
+  });
+}
+function computeIsCacheable(input) {
+  return !input.forceRegister && !(_nullishCoalesce(_optionalChain([input, 'access', _91 => _91.postBridgeActions, 'optionalAccess', _92 => _92.length]), () => ( 0)));
+}
+async function runAccountSetup(input, deps) {
+  const { service, debug } = deps;
+  const enableSolana = _nullishCoalesce(input.enableSolana, () => ( true));
+  try {
+    const sessionOwner = await resolveSessionOwner(input.ownerAddress);
+    const cacheKey = computeCacheKey(input, sessionOwner.address);
+    _chunkV6NJIPSScjs.debugLog.call(void 0, debug, "account-setup", "setup:start", {
+      owner: input.ownerAddress,
+      sessionOwner: sessionOwner.address,
+      hasPostBridgeActions: Boolean(_optionalChain([input, 'access', _93 => _93.postBridgeActions, 'optionalAccess', _94 => _94.length])),
+      forceRegister: _nullishCoalesce(input.forceRegister, () => ( false))
+    });
+    const setup = await service.setupAccount({
+      ownerAddress: input.ownerAddress,
+      sessionOwnerAddress: sessionOwner.address,
+      targetChain: _chunkV6NJIPSScjs.toEvmCaip2.call(void 0, 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 = _chunkV6NJIPSScjs.buildSessionDetails.call(void 0, 
+      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: _chunkV6NJIPSScjs.toEvmCaip2.call(void 0, input.targetChain),
+        token: input.targetToken,
+        ...input.recipient && { recipient: input.recipient },
+        ..._optionalChain([input, 'access', _95 => _95.postBridgeActions, 'optionalAccess', _96 => _96.length]) && {
+          postBridgeActions: input.postBridgeActions
+        },
+        ..._optionalChain([input, 'access', _97 => _97.outputTokenRules, 'optionalAccess', _98 => _98.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) {
+    _chunkV6NJIPSScjs.debugError.call(void 0, debug, "account-setup", "setup:failed", error, {
+      owner: input.ownerAddress
+    });
+    if (error instanceof SetupError) throw error;
+    throw mapError(error);
+  }
+}
+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
 
+function AccountPreparingSkeleton({
+  errorMessage,
+  onRetry
+}) {
+  return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-step", children: [
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step-body", style: { paddingTop: 0 }, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-loading-state", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-loading-text", children: errorMessage ? /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, _jsxruntime.Fragment, { children: [
+      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t prepare account" }),
+      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-loading-subtitle", children: errorMessage })
+    ] }) : /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-loading-title", children: "Preparing\u2026" }) }) }) }),
+    errorMessage && onRetry && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step-footer", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+      "button",
+      {
+        type: "button",
+        className: "rs-button rs-button--default rs-button--full-width",
+        onClick: onRetry,
+        children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: "Try again" })
+      }
+    ) })
+  ] });
+}
+function SetupUpdatingBanner({
+  status,
+  message
+}) {
+  if (status === "error") {
+    return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-deposit-address-error", role: "alert", children: _nullishCoalesce(message, () => ( "Couldn't update deposit details \u2014 please retry.")) });
+  }
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-loading-state", style: { padding: "8px 16px" }, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-loading-text", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "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 +3882,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: _nullishCoalesce(d.solanaDepositAddress, () => ( void 0))
+        smartAccount,
+        solanaDepositAddress: _nullishCoalesce(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: _nullishCoalesce(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 +3923,36 @@ function deriveStep(flow, d, p) {
         liquidityWarning: _nullishCoalesce(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: _nullishCoalesce(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 +3962,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: _nullishCoalesce(d.solanaDepositAddress, () => ( void 0)),
+        smartAccount,
+        solanaDepositAddress: _nullishCoalesce(solanaDepositAddress, () => ( void 0)),
         txHash: p.txHash,
         sourceChain: d.sourceChain,
         sourceToken: d.sourceToken,
@@ -3338,6 +3979,19 @@ function deriveStep(flow, d, p) {
       };
   }
 }
+function resolveOwnerForMode(mode, ctx) {
+  switch (mode) {
+    case "deposit-address":
+    case "solana-wallet":
+      return _nullishCoalesce(ctx.dappAddress, () => ( null));
+    case "wallet":
+      return _nullishCoalesce(ctx.walletOwner, () => ( null));
+    case "dapp-import":
+      return _nullishCoalesce(ctx.dappImportOwner, () => ( null));
+    default:
+      return null;
+  }
+}
 function DepositFlow({
   dappWalletClient,
   dappPublicClient,
@@ -3358,6 +4012,7 @@ function DepositFlow({
   forceRegister = false,
   waitForFinalTx = true,
   enableSolana = true,
+  dappImports,
   reownWallet,
   onConnect,
   onDisconnect,
@@ -3371,12 +4026,12 @@ function DepositFlow({
   onError,
   debug
 }) {
-  const onStepChangeRef = _chunkDCAANLEPcjs.useLatestRef.call(void 0, onStepChange);
-  const onEventRef = _chunkDCAANLEPcjs.useLatestRef.call(void 0, onEvent);
-  const onLifecycleRef = _chunkDCAANLEPcjs.useLatestRef.call(void 0, onLifecycle);
-  const onErrorRef = _chunkDCAANLEPcjs.useLatestRef.call(void 0, onError);
+  const onStepChangeRef = _chunkV6NJIPSScjs.useLatestRef.call(void 0, onStepChange);
+  const onEventRef = _chunkV6NJIPSScjs.useLatestRef.call(void 0, onEvent);
+  const onLifecycleRef = _chunkV6NJIPSScjs.useLatestRef.call(void 0, onLifecycle);
+  const onErrorRef = _chunkV6NJIPSScjs.useLatestRef.call(void 0, onError);
   const hasInitialReownSession = Boolean(
-    enableSolana ? _optionalChain([reownWallet, 'optionalAccess', _82 => _82.isConnected]) || _optionalChain([reownWallet, 'optionalAccess', _83 => _83.address]) : _optionalChain([reownWallet, 'optionalAccess', _84 => _84.address])
+    enableSolana ? _optionalChain([reownWallet, 'optionalAccess', _99 => _99.isConnected]) || _optionalChain([reownWallet, 'optionalAccess', _100 => _100.address]) : _optionalChain([reownWallet, 'optionalAccess', _101 => _101.address])
   );
   const hasInitialWalletHydrationPending = Boolean(
     dappAddress && (hasDappWalletClientProp && dappWalletClient === void 0 || reownWallet && !hasInitialReownSession && !reownWallet.isReady)
@@ -3385,26 +4040,11 @@ function DepositFlow({
   const flowSlice = useDepositStore((s) => s.flow);
   const depositSlice = useDepositStore((s) => s.deposit);
   const processingSlice = useDepositStore((s) => s.processing);
-  const step = _react.useMemo.call(void 0, 
-    () => 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 = _react.useCallback.call(void 0, 
-    (mode) => storeApi.dispatch({ type: "flow/mode-set", mode }),
-    [storeApi]
-  );
-  const setIsConnectSelectionConfirmed = _react.useCallback.call(void 0, 
-    (value) => storeApi.dispatch({ type: "flow/connect-confirmed-set", value }),
-    [storeApi]
-  );
-  const setSelectedWalletId = _react.useCallback.call(void 0, 
-    (walletId) => storeApi.dispatch({ type: "wallet/id-selected", walletId }),
-    [storeApi]
-  );
   const [totalBalanceUsd, setTotalBalanceUsd] = _react.useState.call(void 0, 0);
   const [hasQrAutoAdvanceGraceElapsed, setHasQrAutoAdvanceGraceElapsed] = _react.useState.call(void 0, () => !hasInitialWalletHydrationPending);
   const portfolioAssetsRef = _react.useRef.call(void 0, []);
@@ -3412,13 +4052,13 @@ function DepositFlow({
   const stableWalletSelectionKeyRef = _react.useRef.call(void 0, null);
   const logFlow = _react.useCallback.call(void 0, 
     (message, data) => {
-      _chunkDCAANLEPcjs.debugLog.call(void 0, debug, "deposit-flow", message, data);
+      _chunkV6NJIPSScjs.debugLog.call(void 0, debug, "deposit-flow", message, data);
     },
     [debug]
   );
   const logFlowError = _react.useCallback.call(void 0, 
     (message, error, data) => {
-      _chunkDCAANLEPcjs.debugError.call(void 0, debug, "deposit-flow", message, error, data);
+      _chunkV6NJIPSScjs.debugError.call(void 0, debug, "deposit-flow", message, error, data);
     },
     [debug]
   );
@@ -3434,19 +4074,19 @@ function DepositFlow({
             _viem.formatUnits.call(void 0, BigInt(asset.balance), asset.decimals)
           );
           if (balanceUnits > 0) return asset.balanceUsd / balanceUnits;
-        } catch (e24) {
+        } catch (e27) {
         }
       }
     }
     return null;
   }, []);
   const dappSwitchChain = _react.useMemo.call(void 0, () => {
-    if (!_optionalChain([dappWalletClient, 'optionalAccess', _85 => _85.switchChain])) return void 0;
+    if (!_optionalChain([dappWalletClient, 'optionalAccess', _102 => _102.switchChain])) return void 0;
     return async (chainId) => {
-      await _optionalChain([dappWalletClient, 'access', _86 => _86.switchChain, 'optionalCall', _87 => _87({ id: chainId })]);
+      await _optionalChain([dappWalletClient, 'access', _103 => _103.switchChain, 'optionalCall', _104 => _104({ id: chainId })]);
     };
   }, [dappWalletClient]);
-  const connectedWalletAddress = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _88 => _88.account, 'optionalAccess', _89 => _89.address]), () => ( null));
+  const connectedWalletAddress = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _105 => _105.account, 'optionalAccess', _106 => _106.address]), () => ( null));
   const walletOptions = _react.useMemo.call(void 0, () => {
     const options = [];
     const seen = /* @__PURE__ */ new Set();
@@ -3460,7 +4100,7 @@ function DepositFlow({
       });
       seen.add(id);
     }
-    if (enableSolana && _optionalChain([reownWallet, 'optionalAccess', _90 => _90.isConnected]) && reownWallet.isSolana && reownWallet.solanaAddress && dappAddress) {
+    if (enableSolana && _optionalChain([reownWallet, 'optionalAccess', _107 => _107.isConnected]) && reownWallet.isSolana && reownWallet.solanaAddress && dappAddress) {
       const id = _nullishCoalesce(reownWallet.caipAddress, () => ( `solana:${reownWallet.solanaAddress}`));
       if (!seen.has(id)) {
         options.push({
@@ -3472,7 +4112,7 @@ function DepositFlow({
         });
         seen.add(id);
       }
-    } else if (_optionalChain([reownWallet, 'optionalAccess', _91 => _91.address]) && reownWallet.isConnected && reownWallet.walletClient && reownWallet.publicClient && !seen.has(`evm:${reownWallet.address.toLowerCase()}`)) {
+    } else if (_optionalChain([reownWallet, 'optionalAccess', _108 => _108.address]) && reownWallet.isConnected && reownWallet.walletClient && reownWallet.publicClient && !seen.has(`evm:${reownWallet.address.toLowerCase()}`)) {
       const id = `evm:${reownWallet.address.toLowerCase()}`;
       if (!seen.has(id)) {
         options.push({
@@ -3489,25 +4129,25 @@ function DepositFlow({
   }, [
     connectedWalletAddress,
     dappAddress,
-    _optionalChain([reownWallet, 'optionalAccess', _92 => _92.address]),
-    _optionalChain([reownWallet, 'optionalAccess', _93 => _93.isConnected]),
-    _optionalChain([reownWallet, 'optionalAccess', _94 => _94.walletClient]),
-    _optionalChain([reownWallet, 'optionalAccess', _95 => _95.publicClient]),
-    _optionalChain([reownWallet, 'optionalAccess', _96 => _96.icon]),
+    _optionalChain([reownWallet, 'optionalAccess', _109 => _109.address]),
+    _optionalChain([reownWallet, 'optionalAccess', _110 => _110.isConnected]),
+    _optionalChain([reownWallet, 'optionalAccess', _111 => _111.walletClient]),
+    _optionalChain([reownWallet, 'optionalAccess', _112 => _112.publicClient]),
+    _optionalChain([reownWallet, 'optionalAccess', _113 => _113.icon]),
     enableSolana,
-    _optionalChain([reownWallet, 'optionalAccess', _97 => _97.isSolana]),
-    _optionalChain([reownWallet, 'optionalAccess', _98 => _98.solanaAddress]),
-    _optionalChain([reownWallet, 'optionalAccess', _99 => _99.caipAddress])
+    _optionalChain([reownWallet, 'optionalAccess', _114 => _114.isSolana]),
+    _optionalChain([reownWallet, 'optionalAccess', _115 => _115.solanaAddress]),
+    _optionalChain([reownWallet, 'optionalAccess', _116 => _116.caipAddress])
   ]);
-  const canAutoLock = _optionalChain([dappWalletClient, 'optionalAccess', _100 => _100.account]) && dappAddress && !reownWallet;
+  const canAutoLock = _optionalChain([dappWalletClient, 'optionalAccess', _117 => _117.account]) && dappAddress && !reownWallet;
   const hasWalletOptions = walletOptions.length > 0;
   const hasReownSession = Boolean(
-    enableSolana ? _optionalChain([reownWallet, 'optionalAccess', _101 => _101.isConnected]) || _optionalChain([reownWallet, 'optionalAccess', _102 => _102.address]) : _optionalChain([reownWallet, 'optionalAccess', _103 => _103.address])
+    enableSolana ? _optionalChain([reownWallet, 'optionalAccess', _118 => _118.isConnected]) || _optionalChain([reownWallet, 'optionalAccess', _119 => _119.address]) : _optionalChain([reownWallet, 'optionalAccess', _120 => _120.address])
   );
   const isWalletHydrationPending = Boolean(
     dappAddress && !hasWalletOptions && (hasDappWalletClientProp && dappWalletClient === void 0 || reownWallet && !hasReownSession && !reownWallet.isReady)
   );
-  const showConnectStep = flowMode === null && !canAutoLock && !isConnectSelectionConfirmed;
+  const showConnectStep = flowMode === null && !isConnectSelectionConfirmed;
   _react.useEffect.call(void 0, () => {
     if (!isWalletHydrationPending) {
       setHasQrAutoAdvanceGraceElapsed(true);
@@ -3520,7 +4160,7 @@ function DepositFlow({
     return () => window.clearTimeout(timeout);
   }, [isWalletHydrationPending]);
   const walletSelectionKey = _react.useMemo.call(void 0, () => {
-    if (flowMode !== "wallet") return null;
+    if (flowMode !== "wallet" && flowMode !== "dapp-import") return null;
     if (canAutoLock) {
       return getAddressKey(connectedWalletAddress);
     }
@@ -3542,16 +4182,16 @@ function DepositFlow({
       return {
         ownerAddress: dappAddress,
         walletClient: void 0,
-        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkDCAANLEPcjs.getPublicClient.call(void 0, targetChain))),
+        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkV6NJIPSScjs.getPublicClient.call(void 0, targetChain))),
         switchChain: void 0
       };
     }
     if (canAutoLock) {
-      const fallbackChainId = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _104 => _104.chain, 'optionalAccess', _105 => _105.id]), () => ( targetChain));
+      const fallbackChainId = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _121 => _121.chain, 'optionalAccess', _122 => _122.id]), () => ( targetChain));
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
-        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkDCAANLEPcjs.getPublicClient.call(void 0, fallbackChainId))),
+        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkV6NJIPSScjs.getPublicClient.call(void 0, fallbackChainId))),
         switchChain: dappSwitchChain
       };
     }
@@ -3565,24 +4205,24 @@ function DepositFlow({
       return {
         ownerAddress: dappAddress,
         walletClient: void 0,
-        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkDCAANLEPcjs.getPublicClient.call(void 0, targetChain))),
+        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkV6NJIPSScjs.getPublicClient.call(void 0, targetChain))),
         switchChain: void 0
       };
     }
-    if (selectedOption.kind === "connected" && _optionalChain([dappWalletClient, 'optionalAccess', _106 => _106.account]) && selectedOption.address && dappWalletClient.account.address.toLowerCase() === selectedOption.address.toLowerCase()) {
-      const fallbackChainId = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _107 => _107.chain, 'optionalAccess', _108 => _108.id]), () => ( targetChain));
+    if (selectedOption.kind === "connected" && _optionalChain([dappWalletClient, 'optionalAccess', _123 => _123.account]) && selectedOption.address && dappWalletClient.account.address.toLowerCase() === selectedOption.address.toLowerCase()) {
+      const fallbackChainId = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _124 => _124.chain, 'optionalAccess', _125 => _125.id]), () => ( targetChain));
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
-        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkDCAANLEPcjs.getPublicClient.call(void 0, fallbackChainId))),
+        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkV6NJIPSScjs.getPublicClient.call(void 0, fallbackChainId))),
         switchChain: dappSwitchChain
       };
     }
-    if (selectedOption.kind === "external" && _optionalChain([reownWallet, 'optionalAccess', _109 => _109.address]) && selectedOption.address && reownWallet.address.toLowerCase() === selectedOption.address.toLowerCase()) {
+    if (selectedOption.kind === "external" && _optionalChain([reownWallet, 'optionalAccess', _126 => _126.address]) && selectedOption.address && reownWallet.address.toLowerCase() === selectedOption.address.toLowerCase()) {
       return {
         ownerAddress: reownWallet.address,
         walletClient: reownWallet.walletClient,
-        publicClient: _nullishCoalesce(reownWallet.publicClient, () => ( _chunkDCAANLEPcjs.getPublicClient.call(void 0, targetChain))),
+        publicClient: _nullishCoalesce(reownWallet.publicClient, () => ( _chunkV6NJIPSScjs.getPublicClient.call(void 0, targetChain))),
         switchChain: reownWallet.switchChain
       };
     }
@@ -3600,7 +4240,7 @@ function DepositFlow({
     targetChain
   ]);
   _react.useEffect.call(void 0, () => {
-    if (flowMode !== "wallet") {
+    if (flowMode !== "wallet" && flowMode !== "dapp-import") {
       stableWalletSelectionKeyRef.current = null;
       stableWalletSignerRef.current = null;
       return;
@@ -3620,11 +4260,11 @@ function DepositFlow({
       return {
         ownerAddress: dappAddress,
         walletClient: void 0,
-        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkDCAANLEPcjs.getPublicClient.call(void 0, targetChain))),
+        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkV6NJIPSScjs.getPublicClient.call(void 0, targetChain))),
         switchChain: void 0
       };
     }
-    if (flowMode !== "wallet") {
+    if (flowMode !== "wallet" && flowMode !== "dapp-import") {
       return null;
     }
     if (walletSignerContext) {
@@ -3642,7 +4282,92 @@ function DepositFlow({
     walletSignerContext,
     walletSelectionKey
   ]);
-  const sessionKeyAddress = _nullishCoalesce(_nullishCoalesce(dappAddress, () => ( _optionalChain([signerContext, 'optionalAccess', _110 => _110.ownerAddress]))), () => ( null));
+  const selectedEvmWalletOwner = _react.useMemo.call(void 0, () => {
+    if (!selectedWalletId) return null;
+    const opt = walletOptions.find((o) => o.id === selectedWalletId);
+    if (_optionalChain([opt, 'optionalAccess', _127 => _127.kind]) === "external" && opt.address) {
+      return opt.address;
+    }
+    if (_optionalChain([opt, 'optionalAccess', _128 => _128.kind]) === "connected" && opt.address) {
+      return opt.address;
+    }
+    return null;
+  }, [selectedWalletId, walletOptions]);
+  const dappImportOwner = _react.useMemo.call(void 0, () => {
+    if (selectedEvmWalletOwner) return selectedEvmWalletOwner;
+    if (_optionalChain([reownWallet, 'optionalAccess', _129 => _129.address]) && reownWallet.isConnected) {
+      return reownWallet.address;
+    }
+    if (connectedWalletAddress) return connectedWalletAddress;
+    return null;
+  }, [
+    selectedEvmWalletOwner,
+    _optionalChain([reownWallet, 'optionalAccess', _130 => _130.address]),
+    _optionalChain([reownWallet, 'optionalAccess', _131 => _131.isConnected]),
+    connectedWalletAddress
+  ]);
+  const activeOwner = _react.useMemo.call(void 0, 
+    () => resolveOwnerForMode(flowMode, {
+      dappAddress,
+      walletOwner: _nullishCoalesce(_optionalChain([signerContext, 'optionalAccess', _132 => _132.ownerAddress]), () => ( (canAutoLock ? connectedWalletAddress : selectedEvmWalletOwner))),
+      dappImportOwner
+    }),
+    [
+      flowMode,
+      dappAddress,
+      _optionalChain([signerContext, 'optionalAccess', _133 => _133.ownerAddress]),
+      canAutoLock,
+      connectedWalletAddress,
+      selectedEvmWalletOwner,
+      dappImportOwner
+    ]
+  );
+  const activeEntry = _react.useMemo.call(void 0, 
+    () => readSetupForOwner(setupSlice, activeOwner),
+    [setupSlice, activeOwner]
+  );
+  const lastActiveSetupLifecycleKeyRef = _react.useRef.call(void 0, null);
+  _react.useEffect.call(void 0, () => {
+    if (!flowMode || !isConnectSelectionConfirmed) {
+      lastActiveSetupLifecycleKeyRef.current = null;
+      return;
+    }
+    if (!activeOwner || activeEntry.status !== "ready" || !activeEntry.smartAccount) {
+      return;
+    }
+    const lifecycleKey = [
+      activeOwner.toLowerCase(),
+      activeEntry.smartAccount.toLowerCase(),
+      _nullishCoalesce(activeEntry.solanaDepositAddress, () => ( ""))
+    ].join(":");
+    if (lastActiveSetupLifecycleKeyRef.current === lifecycleKey) {
+      return;
+    }
+    lastActiveSetupLifecycleKeyRef.current = lifecycleKey;
+    _optionalChain([onLifecycleRef, 'access', _134 => _134.current, 'optionalCall', _135 => _135({
+      type: "smart-account-changed",
+      evm: activeEntry.smartAccount,
+      solana: _nullishCoalesce(activeEntry.solanaDepositAddress, () => ( null))
+    })]);
+    _optionalChain([onLifecycleRef, 'access', _136 => _136.current, 'optionalCall', _137 => _137({
+      type: "connected",
+      address: activeOwner,
+      smartAccount: activeEntry.smartAccount
+    })]);
+  }, [
+    flowMode,
+    isConnectSelectionConfirmed,
+    activeOwner,
+    activeEntry.status,
+    activeEntry.smartAccount,
+    activeEntry.solanaDepositAddress,
+    onLifecycleRef
+  ]);
+  const effectiveStep = _react.useMemo.call(void 0, 
+    () => deriveStep(flowSlice, depositSlice, processingSlice, activeEntry),
+    [flowSlice, depositSlice, processingSlice, activeEntry]
+  );
+  const step = effectiveStep;
   const handleBack = _react.useCallback.call(void 0, () => {
     const stepBeforeBack = storeApi.getState().flow.step;
     storeApi.dispatch({
@@ -3653,14 +4378,14 @@ 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;
+  const currentScreen = showConnectStep ? "connect" : effectiveStep.type;
   _react.useEffect.call(void 0, () => {
-    _optionalChain([onStepChangeRef, 'access', _111 => _111.current, 'optionalCall', _112 => _112(currentBackHandler, currentScreen)]);
+    _optionalChain([onStepChangeRef, 'access', _138 => _138.current, 'optionalCall', _139 => _139(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 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 = _react.useRef.call(void 0, null);
   _react.useEffect.call(void 0, () => {
     if (!stepOpenEventKey) {
@@ -3671,24 +4396,24 @@ function DepositFlow({
       return;
     }
     lastStepOpenEventKeyRef.current = stepOpenEventKey;
-    if (step.type === "select-asset") {
-      _optionalChain([onEventRef, 'access', _113 => _113.current, 'optionalCall', _114 => _114({
+    if (effectiveStep.type === "select-asset") {
+      _optionalChain([onEventRef, 'access', _140 => _140.current, 'optionalCall', _141 => _141({
         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 = _chunkIVTXEYB2cjs.getChainName.call(void 0, targetChain);
       const tokenSymbol = _chunkIVTXEYB2cjs.getTokenSymbol.call(void 0, targetToken, targetChain);
-      _optionalChain([onEventRef, 'access', _115 => _115.current, 'optionalCall', _116 => _116({
+      _optionalChain([onEventRef, 'access', _142 => _142.current, 'optionalCall', _143 => _143({
         type: "deposit_modal_transfer_crypto_open",
         default_chain: chainName,
         default_token: tokenSymbol,
         pred_balance: totalBalanceUsd
       })]);
-    } else if (step.type === "amount" && stepSendToken) {
+    } else if (effectiveStep.type === "amount" && stepSendToken) {
       const receiveSymbol = _chunkIVTXEYB2cjs.getTokenSymbol.call(void 0, targetToken, targetChain);
-      _optionalChain([onEventRef, 'access', _117 => _117.current, 'optionalCall', _118 => _118({
+      _optionalChain([onEventRef, 'access', _144 => _144.current, 'optionalCall', _145 => _145({
         type: "deposit_modal_connected_wallet_enter_value_open",
         send_token: stepSendToken,
         receive_token: receiveSymbol,
@@ -3696,7 +4421,7 @@ function DepositFlow({
       })]);
     }
   }, [
-    step.type,
+    effectiveStep.type,
     stepOpenEventKey,
     stepSendToken,
     targetChain,
@@ -3706,7 +4431,7 @@ function DepositFlow({
   ]);
   _react.useEffect.call(void 0, () => {
     logFlow("state:changed", {
-      step: step.type,
+      step: effectiveStep.type,
       flowMode,
       targetChain,
       targetToken,
@@ -3716,29 +4441,183 @@ function DepositFlow({
     flowMode,
     logFlow,
     selectedWalletId,
-    step.type,
+    effectiveStep.type,
     targetChain,
     targetToken
   ]);
   _react.useEffect.call(void 0, () => {
-    _optionalChain([onLifecycleRef, 'access', _119 => _119.current, 'optionalCall', _120 => _120({
+    _optionalChain([onLifecycleRef, 'access', _146 => _146.current, 'optionalCall', _147 => _147({
       type: "balance-changed",
       totalUsd: totalBalanceUsd
     })]);
   }, [totalBalanceUsd, onLifecycleRef]);
   const isDepositAddressMode = flowMode === "deposit-address";
   const isSolanaWalletMode = flowMode === "solana-wallet";
-  const handleSelectProvider = _react.useCallback.call(void 0, () => {
-    setFlowMode("wallet");
-  }, [setFlowMode]);
-  const handleSelectSolanaWallet = _react.useCallback.call(void 0, () => {
-    setFlowMode("solana-wallet");
-  }, [setFlowMode]);
+  const isDappImportMode = flowMode === "dapp-import";
   const handleSelectTransferCrypto = _react.useCallback.call(void 0, () => {
-    setFlowMode("deposit-address");
-  }, [setFlowMode]);
+    storeApi.dispatch({ type: "connect/transfer-crypto-selected" });
+  }, [storeApi]);
+  const handleConfirmWallet = _react.useCallback.call(void 0, 
+    (walletId) => {
+      const selectedOption = walletOptions.find((o) => o.id === walletId);
+      const mode = enableSolana && _optionalChain([selectedOption, 'optionalAccess', _148 => _148.kind]) === "solana" ? "solana-wallet" : "wallet";
+      storeApi.dispatch({
+        type: "connect/wallet-confirmed",
+        walletId,
+        mode
+      });
+    },
+    [walletOptions, enableSolana, storeApi]
+  );
+  const enabledDappImportProviders = _react.useMemo.call(void 0, 
+    () => getEnabledProviders(dappImports),
+    [dappImports]
+  );
+  const handleSelectDappImport = _react.useCallback.call(void 0, 
+    (providerId) => {
+      const owner = dappImportOwner;
+      if (owner) {
+        const wallet = walletOptions.find(
+          (o) => _optionalChain([(_nullishCoalesce(o.address, () => ( null))), 'optionalAccess', _149 => _149.toLowerCase, 'call', _150 => _150()]) === 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 = _react.useCallback.call(void 0, 
+    (asset) => {
+      storeApi.dispatch({ type: "dapp-import/asset-selected", asset });
+    },
+    [storeApi]
+  );
+  _react.useEffect.call(void 0, () => {
+    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 _chunkV6NJIPSScjs.getPublicClient.call(void 0, chainId);
+          } catch (e28) {
+            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 = _react.useMemo.call(void 0, 
+    () => enabledDappImportProviders.map((provider) => {
+      const availabilityEntry = dappImportOwner && _optionalChain([dappImportAvailabilityOwner, 'optionalAccess', _151 => _151.toLowerCase, 'call', _152 => _152()]) === 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 = _react.useMemo.call(void 0, () => {
+    if (!activeDappImportProviderId) return null;
+    return _nullishCoalesce(enabledDappImportProviders.find(
+      (p) => p.id === activeDappImportProviderId
+    ), () => ( null));
+  }, [activeDappImportProviderId, enabledDappImportProviders]);
+  const activeDappImportAvailability = _react.useMemo.call(void 0, () => {
+    if (!activeDappImportProviderId) return null;
+    if (!dappImportOwner || _optionalChain([dappImportAvailabilityOwner, 'optionalAccess', _153 => _153.toLowerCase, 'call', _154 => _154()]) !== dappImportOwner.toLowerCase()) {
+      return null;
+    }
+    const entry = dappImportAvailability[activeDappImportProviderId];
+    if (!entry || entry === "loading") return null;
+    return entry;
+  }, [
+    activeDappImportProviderId,
+    dappImportAvailability,
+    dappImportAvailabilityOwner,
+    dappImportOwner
+  ]);
   const handleNewDeposit = _react.useCallback.call(void 0, () => {
-    _optionalChain([onLifecycleRef, 'access', _121 => _121.current, 'optionalCall', _122 => _122({
+    _optionalChain([onLifecycleRef, 'access', _155 => _155.current, 'optionalCall', _156 => _156({
       type: "smart-account-changed",
       evm: null,
       solana: null
@@ -3748,62 +4627,121 @@ function DepositFlow({
     stableWalletSignerRef.current = null;
     stableWalletSelectionKeyRef.current = null;
   }, [onLifecycleRef, storeApi]);
-  const handleSetupComplete = _react.useCallback.call(void 0, 
-    (smartAccount, solanaDepositAddress) => {
-      logFlow("setup:complete", {
-        smartAccount,
-        hasSolanaDepositAddress: Boolean(solanaDepositAddress),
-        flowMode: isDepositAddressMode ? "deposit-address" : isSolanaWalletMode ? "solana-wallet" : "wallet"
-      });
-      _optionalChain([onLifecycleRef, 'access', _123 => _123.current, 'optionalCall', _124 => _124({
-        type: "smart-account-changed",
-        evm: smartAccount,
-        solana: _nullishCoalesce(solanaDepositAddress, () => ( null))
-      })]);
-      if (isSolanaWalletMode && !solanaDepositAddress) {
-        _optionalChain([onErrorRef, 'access', _125 => _125.current, 'optionalCall', _126 => _126({
-          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 = _react.useMemo.call(void 0, 
+    () => ({
+      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)
-  );
+  const desiredOwnersKey = _react.useMemo.call(void 0, () => {
+    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(_optionalChain([reownWallet, 'optionalAccess', _157 => _157.address]));
+    push(dappImportOwner);
+    return owners;
+  }, [
+    dappAddress,
+    connectedWalletAddress,
+    _optionalChain([reownWallet, 'optionalAccess', _158 => _158.address]),
+    dappImportOwner
+  ]);
   _react.useEffect.call(void 0, () => {
-    if (flowSlice.step === "setup" && cachedSetupCompatible && depositSlice.smartAccount && sessionKeyAddress) {
-      storeApi.dispatch({
-        type: "setup/complete",
-        smartAccount: depositSlice.smartAccount,
-        smartAccountOwner: sessionKeyAddress,
-        solanaDepositAddress: _nullishCoalesce(depositSlice.solanaDepositAddress, () => ( void 0))
-      });
-    }
+    desiredOwnersKey.forEach((owner) => {
+      void (async () => {
+        const input = {
+          ownerAddress: owner,
+          ...setupInputBase
+        };
+        let sessionOwner;
+        try {
+          sessionOwner = await resolveSessionOwner(owner);
+        } catch (error) {
+          _chunkV6NJIPSScjs.debugError.call(void 0, 
+            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;
+        }
+        storeApi.dispatch({
+          type: "setup/started",
+          owner,
+          requestKey,
+          cacheKey,
+          cacheable
+        });
+        try {
+          const result = await runAccountSetup(input, { service, debug });
+          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
+          });
+        }
+      })();
+    });
   }, [
-    flowSlice.step,
-    cachedSetupCompatible,
-    depositSlice.smartAccount,
-    depositSlice.solanaDepositAddress,
-    sessionKeyAddress,
-    storeApi
+    desiredOwnersKey,
+    setupInputBase,
+    service,
+    debug,
+    storeApi,
+    setupSlice.byOwner
   ]);
   const handleDepositAddressSubmitted = _react.useCallback.call(void 0, 
     (data) => {
@@ -3812,7 +4750,7 @@ function DepositFlow({
         sourceChain: data.sourceChain,
         amount: data.amount
       });
-      _optionalChain([onLifecycleRef, 'access', _127 => _127.current, 'optionalCall', _128 => _128({ type: "submitted", ...data })]);
+      _optionalChain([onLifecycleRef, 'access', _159 => _159.current, 'optionalCall', _160 => _160({ type: "submitted", ...data })]);
     },
     [logFlow, onLifecycleRef]
   );
@@ -3869,7 +4807,7 @@ function DepositFlow({
         sourceSymbol: tokenAtSubmit.symbol,
         sourceDecimals: tokenAtSubmit.decimals
       });
-      _optionalChain([onLifecycleRef, 'access', _129 => _129.current, 'optionalCall', _130 => _130({
+      _optionalChain([onLifecycleRef, 'access', _161 => _161.current, 'optionalCall', _162 => _162({
         type: "submitted",
         txHash,
         sourceChain: "solana",
@@ -3878,19 +4816,9 @@ function DepositFlow({
     },
     [logFlow, onLifecycleRef, storeApi]
   );
-  const handleConnected = _react.useCallback.call(void 0, 
-    (addr, smartAccount) => {
-      _optionalChain([onLifecycleRef, 'access', _131 => _131.current, 'optionalCall', _132 => _132({
-        type: "connected",
-        address: addr,
-        smartAccount
-      })]);
-    },
-    [onLifecycleRef]
-  );
   const handleAssetContinue = _react.useCallback.call(void 0, 
     (asset) => {
-      _optionalChain([onEventRef, 'access', _133 => _133.current, 'optionalCall', _134 => _134({
+      _optionalChain([onEventRef, 'access', _163 => _163.current, 'optionalCall', _164 => _164({
         type: "deposit_modal_connected_wallet_select_source_cta_click",
         total_balance_in_external_wallet: totalBalanceUsd,
         pred_balance: totalBalanceUsd,
@@ -3908,6 +4836,11 @@ function DepositFlow({
   );
   const handleAmountContinue = _react.useCallback.call(void 0, 
     (amount, targetAmount, balance, liquidityWarning) => {
+      const entry = readSetupForOwner(
+        storeApi.getState().setup,
+        activeOwner
+      );
+      if (entry.status !== "ready") return;
       const targetSym = _chunkIVTXEYB2cjs.getTokenSymbol.call(void 0, targetToken, targetChain);
       const isTargetStable = _chunkIVTXEYB2cjs.isStablecoinSymbol.call(void 0, targetSym);
       const targetTokenPriceUsd = isTargetStable ? 1 : getTokenPriceUsd(targetSym);
@@ -3920,7 +4853,7 @@ function DepositFlow({
         liquidityWarning
       });
     },
-    [targetToken, targetChain, getTokenPriceUsd, storeApi]
+    [targetToken, targetChain, getTokenPriceUsd, storeApi, activeOwner]
   );
   const handleDepositSubmitted = _react.useCallback.call(void 0, 
     (txHash, chainId, amount, token) => {
@@ -3930,20 +4863,24 @@ 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: _optionalChain([dappImport, 'optionalAccess', _165 => _165.symbol]),
+        sourceDecimals: _optionalChain([dappImport, 'optionalAccess', _166 => _166.decimals]),
+        directTransfer: !dappImport && isSameRoute2(chainId, token, targetChain, targetToken)
       });
     },
     [logFlow, storeApi, targetChain, targetToken]
   );
   const handleDepositSubmittedCallback = _react.useCallback.call(void 0, 
     (txHash, sourceChain, amount) => {
-      _optionalChain([onLifecycleRef, 'access', _135 => _135.current, 'optionalCall', _136 => _136({
+      _optionalChain([onLifecycleRef, 'access', _167 => _167.current, 'optionalCall', _168 => _168({
         type: "submitted",
         txHash,
         sourceChain,
@@ -3955,7 +4892,7 @@ function DepositFlow({
   const handleDepositComplete = _react.useCallback.call(void 0, 
     (txHash, destinationTxHash, context) => {
       logFlow("deposit:complete", { txHash, destinationTxHash, ...context });
-      _optionalChain([onLifecycleRef, 'access', _137 => _137.current, 'optionalCall', _138 => _138({
+      _optionalChain([onLifecycleRef, 'access', _169 => _169.current, 'optionalCall', _170 => _170({
         type: "complete",
         txHash,
         destinationTxHash,
@@ -3967,27 +4904,20 @@ function DepositFlow({
   const handleDepositFailed = _react.useCallback.call(void 0, 
     (txHash, error) => {
       logFlowError("deposit:failed", error, { txHash });
-      _optionalChain([onLifecycleRef, 'access', _139 => _139.current, 'optionalCall', _140 => _140({ type: "failed", txHash, error })]);
+      _optionalChain([onLifecycleRef, 'access', _171 => _171.current, 'optionalCall', _172 => _172({ type: "failed", txHash, error })]);
     },
     [logFlowError, onLifecycleRef]
   );
   const handleError = _react.useCallback.call(void 0, 
     (message, code) => {
       logFlowError("flow:error", message, { code });
-      _optionalChain([onErrorRef, 'access', _141 => _141.current, 'optionalCall', _142 => _142({ message, code })]);
+      _optionalChain([onErrorRef, 'access', _173 => _173.current, 'optionalCall', _174 => _174({ message, code })]);
     },
     [logFlowError, onErrorRef]
   );
   const handleTotalBalanceComputed = _react.useCallback.call(void 0, (total) => {
     setTotalBalanceUsd(total);
   }, []);
-  const selectedWalletIdEffective = _react.useMemo.call(void 0, () => {
-    if (selectedWalletId) return selectedWalletId;
-    if (walletOptions.length === 1) {
-      return walletOptions[0].id;
-    }
-    return null;
-  }, [selectedWalletId, walletOptions]);
   const walletOptionsKey = _react.useMemo.call(void 0, 
     () => walletOptions.map((option) => option.id).join(","),
     [walletOptions]
@@ -3999,11 +4929,11 @@ function DepositFlow({
     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]);
   _react.useEffect.call(void 0, () => {
-    if (!showConnectStep && isConnectSelectionConfirmed && flowMode === "wallet" && !signerContext) {
+    if (!showConnectStep && isConnectSelectionConfirmed && (flowMode === "wallet" || flowMode === "dapp-import") && !signerContext) {
       storeApi.dispatch({ type: "wallet/cleared" });
     }
   }, [showConnectStep, isConnectSelectionConfirmed, flowMode, signerContext, storeApi]);
@@ -4013,110 +4943,130 @@ function DepositFlow({
     }
     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]);
   _react.useEffect.call(void 0, () => {
     if (hasNavigatedBack || isConnectSelectionConfirmed || flowMode) {
       return;
     }
-    if (hasWalletOptions) {
-      const walletId = selectedWalletIdEffective;
-      if (walletId) {
-        const selectedOption = walletOptions.find((o) => o.id === walletId);
-        setSelectedWalletId(walletId);
-        if (enableSolana && _optionalChain([selectedOption, 'optionalAccess', _143 => _143.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 = _react.useMemo.call(void 0, () => {
+    return walletOptions.map((option) => {
+      const ownerForRow = option.kind === "solana" ? dappAddress : _nullishCoalesce(option.address, () => ( null));
+      const entry = readSetupForOwner(setupSlice, _nullishCoalesce(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: _nullishCoalesce(_nullishCoalesce(option.address, () => ( option.solanaAddress)), () => ( option.id)),
+        state,
+        errorReason: _nullishCoalesce(entry.message, () => ( void 0))
+      };
+    });
+  }, [walletOptions, setupSlice, dappAddress]);
+  const transferCryptoEntry = _react.useMemo.call(void 0, 
+    () => readSetupForOwner(setupSlice, dappAddress),
+    [setupSlice, dappAddress]
+  );
+  const transferCryptoState = transferCryptoEntry.status === "ready" ? "ready" : transferCryptoEntry.status === "error" ? "error" : "loading";
+  const handleRetrySetup = _react.useCallback.call(void 0, 
+    (owner) => {
+      storeApi.dispatch({ type: "setup/retry-requested", owner });
+    },
+    [storeApi]
+  );
   if (showConnectStep) {
     return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-modal-body", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkDCAANLEPcjs.ConnectStep,
+      _chunkV6NJIPSScjs.ConnectStep,
       {
-        walletOptions,
+        walletRows,
+        transferCryptoState: dappAddress ? transferCryptoState : void 0,
+        transferCryptoErrorReason: dappAddress ? _nullishCoalesce(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 : _nullishCoalesce(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 && _optionalChain([selectedOption, 'optionalAccess', _144 => _144.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__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-modal-body", children: [
-      step.type === "setup" && !cachedSetupCompatible && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-        SetupStep,
+      showBanner && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+        SetupUpdatingBanner,
         {
-          address: sessionKeyAddress,
-          targetChain,
-          targetToken,
-          signerAddress,
-          sessionChainIds,
-          recipient,
-          postBridgeActions,
-          outputTokenRules,
-          rejectUnmapped,
-          forceRegister,
-          enableSolana,
-          service,
-          onSetupComplete: handleSetupComplete,
-          onConnected: handleConnected,
-          onError: handleError
+          status: activeEntry.status,
+          message: _nullishCoalesce(activeEntry.message, () => ( void 0))
         }
       ),
-      step.type === "deposit-address" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+      effectiveStep.type === "setup" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+        AccountPreparingSkeleton,
+        {
+          errorMessage: activeEntry.status === "error" ? _nullishCoalesce(activeEntry.message, () => ( void 0)) : void 0,
+          onRetry: activeEntry.status === "error" ? () => handleRetrySetup(dappAddress) : void 0
+        }
+      ),
+      effectiveStep.type === "deposit-address" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
         DepositAddressStep,
         {
-          smartAccount: step.smartAccount,
-          solanaDepositAddress: enableSolana ? step.solanaDepositAddress : void 0,
+          smartAccount: effectiveStep.smartAccount,
+          solanaDepositAddress: enableSolana ? effectiveStep.solanaDepositAddress : void 0,
           service,
           allowedRoutes,
           targetChain,
           targetToken,
           waitForFinalTx,
-          hasPostBridgeActions: Boolean(_optionalChain([postBridgeActions, 'optionalAccess', _145 => _145.length])),
+          hasPostBridgeActions: Boolean(_optionalChain([postBridgeActions, 'optionalAccess', _175 => _175.length])),
           uiConfig,
           onDepositSubmitted: handleDepositAddressSubmitted,
           onDepositComplete: handleDepositComplete,
@@ -4124,7 +5074,7 @@ function DepositFlow({
           onCopyAddress: () => {
             const chainName = _chunkIVTXEYB2cjs.getChainName.call(void 0, targetChain);
             const tokenSymbol = _chunkIVTXEYB2cjs.getTokenSymbol.call(void 0, targetToken, targetChain);
-            _optionalChain([onEvent, 'optionalCall', _146 => _146({
+            _optionalChain([onEvent, 'optionalCall', _176 => _176({
               type: "deposit_modal_transfer_crypto_cta_click",
               default_chain: chainName,
               default_token: tokenSymbol,
@@ -4132,6 +5082,9 @@ function DepositFlow({
               cta_name: "copy"
             })]);
           },
+          onRequestWalletPicker: isWalletPickerReachable ? () => storeApi.dispatch({
+            type: "connect/wallet-picker-requested"
+          }) : void 0,
           onError: handleError,
           debug
         }
@@ -4139,31 +5092,26 @@ function DepositFlow({
     ] });
   }
   if (isSolanaWalletMode) {
-    if (!sessionKeyAddress) return null;
-    const solanaAddr = _optionalChain([reownWallet, 'optionalAccess', _147 => _147.solanaAddress]);
-    const solanaProvider = _optionalChain([reownWallet, 'optionalAccess', _148 => _148.solanaProvider]);
+    if (!dappAddress) return null;
+    const solanaAddr = _optionalChain([reownWallet, 'optionalAccess', _177 => _177.solanaAddress]);
+    const solanaProvider = _optionalChain([reownWallet, 'optionalAccess', _178 => _178.solanaProvider]);
+    const solanaShowBanner = effectiveStep.type !== "setup" && effectiveStep.type !== "processing" && (activeEntry.status === "loading" || activeEntry.status === "error");
     return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-modal-body", children: [
-      step.type === "setup" && !cachedSetupCompatible && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-        SetupStep,
+      solanaShowBanner && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+        SetupUpdatingBanner,
         {
-          address: sessionKeyAddress,
-          targetChain,
-          targetToken,
-          signerAddress,
-          sessionChainIds,
-          recipient,
-          postBridgeActions,
-          outputTokenRules,
-          rejectUnmapped,
-          forceRegister,
-          enableSolana,
-          service,
-          onSetupComplete: handleSetupComplete,
-          onConnected: handleConnected,
-          onError: handleError
+          status: activeEntry.status,
+          message: _nullishCoalesce(activeEntry.message, () => ( void 0))
         }
       ),
-      step.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+      effectiveStep.type === "setup" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+        AccountPreparingSkeleton,
+        {
+          errorMessage: activeEntry.status === "error" ? _nullishCoalesce(activeEntry.message, () => ( void 0)) : void 0,
+          onRetry: activeEntry.status === "error" ? () => handleRetrySetup(dappAddress) : void 0
+        }
+      ),
+      effectiveStep.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
         SolanaTokenSelectStep,
         {
           solanaAddress: solanaAddr,
@@ -4173,13 +5121,13 @@ function DepositFlow({
           debug
         }
       ),
-      step.type === "solana-amount" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+      effectiveStep.type === "solana-amount" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
         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: _chunkIVTXEYB2cjs.getChainName.call(void 0, targetChain),
           targetTokenSymbol: _chunkIVTXEYB2cjs.getTokenSymbol.call(void 0, targetToken, targetChain),
@@ -4190,17 +5138,17 @@ function DepositFlow({
           debug
         }
       ),
-      step.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+      effectiveStep.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
         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 +5157,7 @@ function DepositFlow({
           onError: handleError,
           debug
         }
-      ) : step.type === "solana-confirm" ? /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-step", children: [
+      ) : effectiveStep.type === "solana-confirm" ? /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-step", children: [
         /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-loading-state", children: [
           /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step-icon rs-step-icon--error", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
             "svg",
@@ -4243,23 +5191,23 @@ function DepositFlow({
           }
         ) })
       ] }) : null,
-      step.type === "processing" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-        _chunkDCAANLEPcjs.ProcessingStep,
+      effectiveStep.type === "processing" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+        _chunkV6NJIPSScjs.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(_optionalChain([postBridgeActions, 'optionalAccess', _149 => _149.length])),
+          hasPostBridgeActions: Boolean(_optionalChain([postBridgeActions, 'optionalAccess', _179 => _179.length])),
           service,
-          directTransfer: step.directTransfer,
+          directTransfer: effectiveStep.directTransfer,
           onClose,
           onNewDeposit: handleNewDeposit,
           onDepositComplete: handleDepositComplete,
@@ -4270,40 +5218,34 @@ function DepositFlow({
       )
     ] });
   }
-  if (!_optionalChain([signerContext, 'optionalAccess', _150 => _150.walletClient]) || !_optionalChain([signerContext, 'optionalAccess', _151 => _151.publicClient])) {
+  if (!_optionalChain([signerContext, 'optionalAccess', _180 => _180.walletClient]) || !_optionalChain([signerContext, 'optionalAccess', _181 => _181.publicClient])) {
     return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-modal-body", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-loading-state", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-loading-text", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-loading-title", children: "Connecting wallet..." }) }) }) }) });
   }
   const ownerAddress = signerContext.ownerAddress;
-  const ownerChainId = _nullishCoalesce(_nullishCoalesce(_optionalChain([signerContext, 'access', _152 => _152.walletClient, 'optionalAccess', _153 => _153.chain, 'optionalAccess', _154 => _154.id]), () => ( _optionalChain([signerContext, 'access', _155 => _155.publicClient, 'access', _156 => _156.chain, 'optionalAccess', _157 => _157.id]))), () => ( targetChain));
+  const ownerChainId = _nullishCoalesce(_nullishCoalesce(_optionalChain([signerContext, 'access', _182 => _182.walletClient, 'optionalAccess', _183 => _183.chain, 'optionalAccess', _184 => _184.id]), () => ( _optionalChain([signerContext, 'access', _185 => _185.publicClient, 'access', _186 => _186.chain, 'optionalAccess', _187 => _187.id]))), () => ( targetChain));
   const getReadClientForChain = (chainId) => {
-    if (_optionalChain([signerContext, 'access', _158 => _158.publicClient, 'access', _159 => _159.chain, 'optionalAccess', _160 => _160.id]) === chainId) {
+    if (_optionalChain([signerContext, 'access', _188 => _188.publicClient, 'access', _189 => _189.chain, 'optionalAccess', _190 => _190.id]) === chainId) {
       return signerContext.publicClient;
     }
-    return _chunkDCAANLEPcjs.getPublicClient.call(void 0, chainId);
+    return _chunkV6NJIPSScjs.getPublicClient.call(void 0, chainId);
   };
+  const walletShowBanner = effectiveStep.type !== "setup" && effectiveStep.type !== "processing" && (activeEntry.status === "loading" || activeEntry.status === "error");
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-modal-body", children: [
-    step.type === "setup" && !cachedSetupCompatible && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      SetupStep,
+    walletShowBanner && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+      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: _nullishCoalesce(activeEntry.message, () => ( void 0))
       }
     ),
-    step.type === "select-asset" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+    effectiveStep.type === "setup" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+      AccountPreparingSkeleton,
+      {
+        errorMessage: activeEntry.status === "error" ? _nullishCoalesce(activeEntry.message, () => ( void 0)) : void 0,
+        onRetry: activeEntry.status === "error" ? () => handleRetrySetup(ownerAddress) : void 0
+      }
+    ),
+    effectiveStep.type === "select-asset" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
       AssetSelectStep,
       {
         address: ownerAddress,
@@ -4321,14 +5263,27 @@ function DepositFlow({
         } : void 0
       }
     ),
-    step.type === "amount" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+    effectiveStep.type === "dapp-import-asset-select" && activeDappImportProvider && activeDappImportAvailability && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+      DappImportAssetSelectStep,
+      {
+        sourceLabel: _nullishCoalesce(_optionalChain([activeDappImportAvailability, 'access', _191 => _191.assets, 'access', _192 => _192[0], 'optionalAccess', _193 => _193.sourceLabel]), () => ( activeDappImportProvider.label)),
+        assets: activeDappImportAvailability.assets,
+        onSelect: handleDappImportAssetSelected
+      }
+    ),
+    effectiveStep.type === "amount" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
       AmountStep,
       {
         walletClient: signerContext.walletClient,
-        publicClient: getReadClientForChain(step.asset.chainId),
+        publicClient: getReadClientForChain(effectiveStep.asset.chainId),
         address: ownerAddress,
-        asset: step.asset,
-        defaultAmount: _nullishCoalesce(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: _nullishCoalesce(effectiveStep.amount, () => ( defaultAmount)),
         switchChain: signerContext.switchChain,
         targetChain,
         targetToken,
@@ -4337,9 +5292,9 @@ function DepositFlow({
         onContinue: handleAmountContinue,
         onCtaClick: (ctaName) => {
           const receiveSymbol = _chunkIVTXEYB2cjs.getTokenSymbol.call(void 0, targetToken, targetChain);
-          _optionalChain([onEvent, 'optionalCall', _161 => _161({
+          _optionalChain([onEvent, 'optionalCall', _194 => _194({
             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 +5302,62 @@ function DepositFlow({
         }
       }
     ),
-    step.type === "confirm" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+    effectiveStep.type === "confirm" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
       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__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkDCAANLEPcjs.ProcessingStep,
+    effectiveStep.type === "processing" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+      _chunkV6NJIPSScjs.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(_optionalChain([postBridgeActions, 'optionalAccess', _162 => _162.length])),
+        hasPostBridgeActions: Boolean(_optionalChain([postBridgeActions, 'optionalAccess', _195 => _195.length])),
         service,
-        directTransfer: step.directTransfer,
+        directTransfer: effectiveStep.directTransfer,
         uiConfig,
         onClose,
         onNewDeposit: handleNewDeposit,
@@ -4415,15 +5387,15 @@ function formatDate(iso) {
       month: "short",
       year: "numeric"
     });
-  } catch (e25) {
+  } catch (e29) {
     return iso;
   }
 }
 function resolveChainId(value) {
   if (value === void 0 || value === null) return null;
   if (typeof value === "number") return value;
-  if (_chunkDCAANLEPcjs.isSolanaCaip2.call(void 0, value) || value === "solana") return "solana";
-  const parsed = _chunkDCAANLEPcjs.parseEvmChainId.call(void 0, value);
+  if (_chunkV6NJIPSScjs.isSolanaCaip2.call(void 0, value) || value === "solana") return "solana";
+  const parsed = _chunkV6NJIPSScjs.parseEvmChainId.call(void 0, value);
   if (parsed !== null) return parsed;
   const num = Number(value);
   return Number.isFinite(num) ? num : null;
@@ -4474,7 +5446,7 @@ function formatAmount(rawAmount, token, chainId) {
     const trimmed = fracStr.slice(0, 6).replace(/0+$/, "");
     if (!trimmed) return whole.toString();
     return `${whole}.${trimmed}`;
-  } catch (e26) {
+  } catch (e30) {
     return rawAmount;
   }
 }
@@ -4537,7 +5509,7 @@ function DepositHistoryPanel({
               className: "rs-modal-header-back",
               "aria-label": "Back",
               onClick: onClose,
-              children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.ChevronLeftIcon, {})
+              children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.ChevronLeftIcon, {})
             }
           ) }),
           /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-modal-header-nav-center" }),
@@ -4548,29 +5520,29 @@ function DepositHistoryPanel({
               className: "rs-modal-close",
               "aria-label": "Close",
               onClick: onCloseModal,
-              children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.CloseIcon, {})
+              children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.CloseIcon, {})
             }
           ) })
         ] }),
         /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-history-screen", children: [
           /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-history-screen-body", children: [
-            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.BodyHeader, { icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.HistoryIcon, {}), title: "History" }),
+            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.BodyHeader, { icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.HistoryIcon, {}), title: "History" }),
             isLoading && deposits.length === 0 && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.HistoryIcon, {}) }),
+              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.HistoryIcon, {}) }),
               /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-history-empty-text", children: [
-                /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.Spinner, { className: "rs-spinner--sm" }),
+                /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.Spinner, { className: "rs-spinner--sm" }),
                 /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-history-empty-hint", children: "Loading history\u2026" })
               ] })
             ] }),
             error && !isLoading && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.AlertTriangleIcon, {}) }),
+              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.AlertTriangleIcon, {}) }),
               /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-history-empty-text", children: [
                 /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-history-empty-title", children: "Couldn't load history" }),
                 /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-history-empty-hint", children: error })
               ] })
             ] }),
             !isLoading && !error && deposits.length === 0 && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.HistoryIcon, {}) }),
+              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.HistoryIcon, {}) }),
               /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-history-empty-text", children: [
                 /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-history-empty-title", children: "No deposits yet" }),
                 /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-history-empty-hint", children: "Your deposit history will appear here" })
@@ -4590,7 +5562,7 @@ function DepositHistoryPanel({
               )
             ] })
           ] }),
-          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.PoweredBy, {})
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.PoweredBy, {})
         ] })
       ]
     }
@@ -4664,7 +5636,7 @@ function HistoryCard({ deposit }) {
                 onClick: (e) => e.stopPropagation(),
                 children: [
                   /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: shortenHash(deposit.sourceTxHash) }),
-                  /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.ArrowRightIcon, {})
+                  /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.ArrowRightIcon, {})
                 ]
               }
             )
@@ -4679,7 +5651,7 @@ DepositHistoryPanel.displayName = "DepositHistoryPanel";
 // src/DepositModal.tsx
 
 var ReownDepositInner = _react.lazy.call(void 0, 
-  () => Promise.resolve().then(() => _interopRequireWildcard(require("./DepositModalReown-VV3H2WWC.cjs"))).then((m) => ({ default: m.DepositModalReown }))
+  () => Promise.resolve().then(() => _interopRequireWildcard(require("./DepositModalReown-DVRWDPYV.cjs"))).then((m) => ({ default: m.DepositModalReown }))
 );
 function sortByCreatedAtDesc(items) {
   return [...items].sort((a, b) => {
@@ -4734,6 +5706,7 @@ function DepositModalInner({
   forceRegister = false,
   waitForFinalTx = true,
   enableSolana = true,
+  dappImports,
   postBridgeActions,
   outputTokenRules,
   rejectUnmapped,
@@ -4752,31 +5725,26 @@ function DepositModalInner({
   debug
 }) {
   const modalRef = _react.useRef.call(void 0, null);
-  const onReadyRef = _chunkDCAANLEPcjs.useLatestRef.call(void 0, onReady);
+  const onReadyRef = _chunkV6NJIPSScjs.useLatestRef.call(void 0, onReady);
   const [currentScreen, setCurrentScreen] = _react.useState.call(void 0, "connect");
   const [backHandler, setBackHandler] = _react.useState.call(void 0, 
     void 0
   );
-  const showHistoryButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _163 => _163.showHistoryButton]), () => ( false));
-  const historyButtonVisible = showHistoryButton && (currentScreen === "connect" || currentScreen === "select-asset" || currentScreen === "deposit-address");
-  const [activeEvmAccount, setActiveEvmAccount] = _react.useState.call(void 0, null);
-  const [activeSolanaAccount, setActiveSolanaAccount] = _react.useState.call(void 0, 
-    null
-  );
+  const showHistoryButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _196 => _196.showHistoryButton]), () => ( false));
+  const historyButtonVisible = showHistoryButton && (currentScreen === "select-asset" || currentScreen === "deposit-address");
   const [historyOpen, setHistoryOpen] = _react.useState.call(void 0, false);
   const [historyDeposits, setHistoryDeposits] = _react.useState.call(void 0, []);
   const [hasMoreHistory, setHasMoreHistory] = _react.useState.call(void 0, false);
   const [historyLoading, setHistoryLoading] = _react.useState.call(void 0, false);
   const [historyLoadingMore, setHistoryLoadingMore] = _react.useState.call(void 0, false);
   const [historyError, setHistoryError] = _react.useState.call(void 0, null);
-  const evmCursorRef = _react.useRef.call(void 0, null);
-  const solanaCursorRef = _react.useRef.call(void 0, null);
+  const cursorRef = _react.useRef.call(void 0, null);
   const historyStaleRef = _react.useRef.call(void 0, false);
   const historyLoadedRef = _react.useRef.call(void 0, false);
   const targetChain = _chunkIVTXEYB2cjs.getChainId.call(void 0, targetChainProp);
   const sourceChain = sourceChainProp ? _chunkIVTXEYB2cjs.getChainId.call(void 0, sourceChainProp) : void 0;
   const service = _react.useMemo.call(void 0, 
-    () => _chunkDCAANLEPcjs.createDepositService.call(void 0, backendUrl, {
+    () => _chunkV6NJIPSScjs.createDepositService.call(void 0, backendUrl, {
       debug,
       debugScope: "service:deposit"
     }),
@@ -4792,7 +5760,7 @@ function DepositModalInner({
   }, [store, targetChain, targetToken]);
   _react.useEffect.call(void 0, () => {
     if (isOpen && modalRef.current) {
-      _chunkDCAANLEPcjs.applyTheme.call(void 0, modalRef.current, theme);
+      _chunkV6NJIPSScjs.applyTheme.call(void 0, modalRef.current, theme);
     }
   }, [isOpen, theme]);
   _react.useEffect.call(void 0, () => {
@@ -4800,7 +5768,7 @@ function DepositModalInner({
   }, [solanaRpcUrl]);
   _react.useEffect.call(void 0, () => {
     if (isOpen) {
-      _optionalChain([onReadyRef, 'access', _164 => _164.current, 'optionalCall', _165 => _165()]);
+      _optionalChain([onReadyRef, 'access', _197 => _197.current, 'optionalCall', _198 => _198()]);
     }
   }, [isOpen, onReadyRef]);
   const handleStepChange = _react.useCallback.call(void 0, 
@@ -4812,7 +5780,7 @@ function DepositModalInner({
   );
   const fetchHistory = _react.useCallback.call(void 0, 
     async (mode = "initial") => {
-      if (!activeEvmAccount && !activeSolanaAccount) return;
+      if (!recipient) return;
       const isInitial = mode === "initial";
       if (isInitial) {
         setHistoryLoading(true);
@@ -4821,44 +5789,18 @@ function DepositModalInner({
       }
       setHistoryError(null);
       try {
-        const evmCursor = isInitial ? null : evmCursorRef.current;
-        const solanaCursor = isInitial ? null : solanaCursorRef.current;
-        const requests = [];
-        if (activeEvmAccount && (isInitial || evmCursor)) {
-          requests.push(
-            service.fetchDepositHistory({
-              account: activeEvmAccount,
-              limit: 20,
-              cursor: _nullishCoalesce(evmCursor, () => ( void 0))
-            }).then((r) => ({
-              deposits: r.deposits,
-              nextCursor: _nullishCoalesce(r.nextCursor, () => ( null)),
-              source: "evm"
-            }))
-          );
-        }
-        if (activeSolanaAccount && (isInitial || solanaCursor)) {
-          requests.push(
-            service.fetchDepositHistory({
-              account: activeSolanaAccount,
-              limit: 20,
-              cursor: _nullishCoalesce(solanaCursor, () => ( void 0))
-            }).then((r) => ({
-              deposits: r.deposits,
-              nextCursor: _nullishCoalesce(r.nextCursor, () => ( null)),
-              source: "solana"
-            }))
-          );
-        }
-        const results = await Promise.all(requests);
-        let nextEvm = isInitial ? null : evmCursor;
-        let nextSolana = isInitial ? null : solanaCursor;
-        const incoming = [];
-        for (const r of results) {
-          incoming.push(...r.deposits);
-          if (r.source === "evm") nextEvm = r.nextCursor;
-          else nextSolana = r.nextCursor;
+        const cursor = isInitial ? null : cursorRef.current;
+        if (!isInitial && !cursor) {
+          setHasMoreHistory(false);
+          return;
         }
+        const result = await service.fetchDepositHistory({
+          recipient,
+          limit: 20,
+          cursor: _nullishCoalesce(cursor, () => ( void 0))
+        });
+        const incoming = result.deposits;
+        const nextCursor = _nullishCoalesce(result.nextCursor, () => ( null));
         if (isInitial) {
           setHistoryDeposits(sortByCreatedAtDesc(incoming));
         } else {
@@ -4866,9 +5808,8 @@ function DepositModalInner({
             (prev) => sortByCreatedAtDesc([...prev, ...incoming])
           );
         }
-        evmCursorRef.current = nextEvm;
-        solanaCursorRef.current = nextSolana;
-        setHasMoreHistory(Boolean(nextEvm || nextSolana));
+        cursorRef.current = nextCursor;
+        setHasMoreHistory(Boolean(nextCursor));
         historyStaleRef.current = false;
         historyLoadedRef.current = true;
       } catch (err) {
@@ -4883,7 +5824,7 @@ function DepositModalInner({
         }
       }
     },
-    [activeEvmAccount, activeSolanaAccount, service]
+    [recipient, service]
   );
   const handleHistoryOpen = _react.useCallback.call(void 0, () => {
     setHistoryOpen(true);
@@ -4903,16 +5844,12 @@ function DepositModalInner({
       fetchHistory("initial");
     }
   }, [historyOpen, fetchHistory]);
-  const onLifecycleRef = _chunkDCAANLEPcjs.useLatestRef.call(void 0, onLifecycle);
+  const onLifecycleRef = _chunkV6NJIPSScjs.useLatestRef.call(void 0, onLifecycle);
   const handleLifecycle = _react.useCallback.call(void 0, 
     (event) => {
-      _optionalChain([onLifecycleRef, 'access', _166 => _166.current, 'optionalCall', _167 => _167(event)]);
-      if (event.type === "smart-account-changed") {
-        setActiveEvmAccount(event.evm);
-        setActiveSolanaAccount(event.solana);
-        if (!event.evm && !event.solana) {
-          historyStaleRef.current = true;
-        }
+      _optionalChain([onLifecycleRef, 'access', _199 => _199.current, 'optionalCall', _200 => _200(event)]);
+      if (event.type === "smart-account-changed" && !event.evm && !event.solana) {
+        historyStaleRef.current = true;
       }
       if (showHistoryButton && (event.type === "submitted" || event.type === "complete" || event.type === "failed")) {
         markHistoryStale();
@@ -4926,10 +5863,7 @@ function DepositModalInner({
       setHistoryDeposits([]);
       setHasMoreHistory(false);
       setHistoryError(null);
-      setActiveEvmAccount(null);
-      setActiveSolanaAccount(null);
-      evmCursorRef.current = null;
-      solanaCursorRef.current = null;
+      cursorRef.current = null;
       historyStaleRef.current = false;
       historyLoadedRef.current = false;
     }
@@ -4939,10 +5873,10 @@ function DepositModalInner({
       store.dispatch({ type: "flow/reset" });
     }
   }, [isOpen, store]);
-  const showBackButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _168 => _168.showBackButton]), () => ( true));
+  const showBackButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _201 => _201.showBackButton]), () => ( true));
   const canGoBack = backHandler !== void 0;
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, DepositStoreProvider, { store, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-    _chunkDCAANLEPcjs.Modal,
+    _chunkV6NJIPSScjs.Modal,
     {
       isOpen,
       onClose,
@@ -4958,7 +5892,7 @@ function DepositModalInner({
               className: "rs-modal-header-back",
               "aria-label": "Go back",
               onClick: backHandler,
-              children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.ChevronLeftIcon, {})
+              children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.ChevronLeftIcon, {})
             }
           ) }),
           /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-modal-header-nav-right", children: [
@@ -4969,8 +5903,8 @@ function DepositModalInner({
                 className: "rs-modal-header-history",
                 "aria-label": "Deposit history",
                 onClick: handleHistoryOpen,
-                disabled: !activeEvmAccount && !activeSolanaAccount,
-                children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.HistoryIcon, {})
+                disabled: !recipient,
+                children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.HistoryIcon, {})
               }
             ),
             /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
@@ -4980,7 +5914,7 @@ function DepositModalInner({
                 onClick: onClose,
                 className: "rs-modal-close",
                 "aria-label": "Close",
-                children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkDCAANLEPcjs.CloseIcon, {})
+                children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkV6NJIPSScjs.CloseIcon, {})
               }
             )
           ] })
@@ -5007,6 +5941,7 @@ function DepositModalInner({
             forceRegister,
             waitForFinalTx,
             enableSolana,
+            dappImports,
             reownWallet,
             onConnect,
             onDisconnect,