@rhinestone/deposit-modal 0.1.14 → 0.1.15

package/dist/index.mjs

@@ -3479,17 +3479,39 @@ var init_DepositAddressStep = __esm({
   }
 });
 
+// src/core/public-client.ts
+import { createPublicClient, http } from "viem";
+function getPublicClient(chainId) {
+  let client = clientCache.get(chainId);
+  if (!client) {
+    const chain = CHAIN_BY_ID[chainId];
+    client = createPublicClient({
+      chain,
+      transport: http()
+    });
+    clientCache.set(chainId, client);
+  }
+  return client;
+}
+var clientCache;
+var init_public_client = __esm({
+  "src/core/public-client.ts"() {
+    "use strict";
+    init_constants();
+    clientCache = /* @__PURE__ */ new Map();
+  }
+});
+
 // src/DepositFlow.tsx
 import { useState as useState7, useCallback as useCallback4, useMemo as useMemo6, useEffect as useEffect7, useRef as useRef6 } from "react";
 import { jsx as jsx14, jsxs as jsxs13 } from "react/jsx-runtime";
 function DepositFlow({
-  walletClient,
-  publicClient,
-  address,
+  dappWalletClient,
+  dappPublicClient,
+  dappAddress,
   targetChain,
   targetToken,
   service,
-  switchChain,
   sourceChain: defaultSourceChain,
   sourceToken: defaultSourceToken,
   amount: defaultAmount,
@@ -3498,9 +3520,7 @@ function DepositFlow({
   sessionChainIds,
   forceRegister = false,
   waitForFinalTx = true,
-  connectWalletOptions,
-  selectedConnectAddress,
-  onSelectConnectAddress,
+  reownWallet,
   onConnect,
   onRequestConnect,
   connectButtonLabel,
@@ -3518,9 +3538,93 @@ function DepositFlow({
   const [flowMode, setFlowMode] = useState7(null);
   const [totalBalanceUsd, setTotalBalanceUsd] = useState7(0);
   const [isConnectSelectionConfirmed, setIsConnectSelectionConfirmed] = useState7(false);
-  const hasConnectWalletOptions = (connectWalletOptions?.length ?? 0) > 0;
-  const hasConnectedWallet = Boolean(walletClient && publicClient && address);
+  const [selectedConnectAddress, setSelectedConnectAddress] = useState7(null);
   const targetChainObj = useMemo6(() => CHAIN_BY_ID[targetChain], [targetChain]);
+  const dappSwitchChain = useMemo6(() => {
+    if (!dappWalletClient?.switchChain) return void 0;
+    return async (chainId) => {
+      await dappWalletClient.switchChain?.({ id: chainId });
+    };
+  }, [dappWalletClient]);
+  const walletOptions = useMemo6(() => {
+    const options = [];
+    const seen = /* @__PURE__ */ new Set();
+    if (dappWalletClient?.account && dappAddress) {
+      options.push({
+        address: dappWalletClient.account.address,
+        label: "Connected Wallet",
+        kind: "connected"
+      });
+      seen.add(dappWalletClient.account.address.toLowerCase());
+    }
+    if (reownWallet?.address && reownWallet.isConnected && !seen.has(reownWallet.address.toLowerCase())) {
+      options.push({
+        address: reownWallet.address,
+        label: "External Wallet",
+        kind: "external"
+      });
+    }
+    return options;
+  }, [
+    dappWalletClient,
+    dappAddress,
+    reownWallet?.address,
+    reownWallet?.isConnected
+  ]);
+  const canAutoLock = dappWalletClient?.account && dappAddress && !reownWallet;
+  const hasWalletOptions = walletOptions.length > 0;
+  const showConnectStep = !canAutoLock && !isConnectSelectionConfirmed;
+  const signerContext = useMemo6(() => {
+    if (flowMode === "deposit-address") {
+      if (!dappAddress) return null;
+      return {
+        ownerAddress: dappAddress,
+        walletClient: void 0,
+        publicClient: dappPublicClient ?? getPublicClient(targetChain),
+        switchChain: void 0
+      };
+    }
+    if (canAutoLock) {
+      const fallbackChainId = dappWalletClient?.chain?.id ?? targetChain;
+      return {
+        ownerAddress: dappWalletClient.account.address,
+        walletClient: dappWalletClient,
+        publicClient: dappPublicClient ?? getPublicClient(fallbackChainId),
+        switchChain: dappSwitchChain
+      };
+    }
+    if (!isConnectSelectionConfirmed || !selectedConnectAddress) return null;
+    if (dappWalletClient?.account && dappWalletClient.account.address.toLowerCase() === selectedConnectAddress.toLowerCase()) {
+      const fallbackChainId = dappWalletClient?.chain?.id ?? targetChain;
+      return {
+        ownerAddress: dappWalletClient.account.address,
+        walletClient: dappWalletClient,
+        publicClient: dappPublicClient ?? getPublicClient(fallbackChainId),
+        switchChain: dappSwitchChain
+      };
+    }
+    if (reownWallet?.address?.toLowerCase() === selectedConnectAddress.toLowerCase() && reownWallet.walletClient && reownWallet.publicClient) {
+      return {
+        ownerAddress: reownWallet.address,
+        walletClient: reownWallet.walletClient,
+        publicClient: reownWallet.publicClient,
+        switchChain: reownWallet.switchChain
+      };
+    }
+    return null;
+  }, [
+    flowMode,
+    canAutoLock,
+    isConnectSelectionConfirmed,
+    selectedConnectAddress,
+    dappWalletClient,
+    dappPublicClient,
+    dappSwitchChain,
+    dappAddress,
+    reownWallet,
+    targetChain
+  ]);
+  const sessionKeyAddress = dappAddress ?? signerContext?.ownerAddress ?? null;
   const lastTargetRef = useRef6(null);
   useEffect7(() => {
     const prev = lastTargetRef.current;
@@ -3538,17 +3642,17 @@ function DepositFlow({
     });
   }, []);
   const handleBackFromSelectAsset = useCallback4(() => {
-    if (hasConnectWalletOptions) {
+    if (hasWalletOptions || reownWallet) {
       setIsConnectSelectionConfirmed(false);
     }
-  }, [hasConnectWalletOptions]);
+  }, [hasWalletOptions, reownWallet]);
   const handleBackFromDepositAddress = useCallback4(() => {
     setFlowMode(null);
     setStep({ type: "setup" });
-    if (hasConnectWalletOptions) {
+    if (hasWalletOptions || reownWallet) {
       setIsConnectSelectionConfirmed(false);
     }
-  }, [hasConnectWalletOptions]);
+  }, [hasWalletOptions, reownWallet]);
   const handleBackFromConfirm = useCallback4(() => {
     setStep((prev) => {
       if (prev.type !== "confirm") return prev;
@@ -3561,7 +3665,7 @@ function DepositFlow({
     });
   }, []);
   const stepIndex = step.type === "setup" ? 0 : step.type === "deposit-address" ? 1 : step.type === "select-asset" ? 1 : step.type === "amount" ? 2 : step.type === "confirm" ? 3 : 4;
-  const currentBackHandler = step.type === "deposit-address" ? handleBackFromDepositAddress : step.type === "select-asset" && hasConnectedWallet && hasConnectWalletOptions && isConnectSelectionConfirmed ? handleBackFromSelectAsset : step.type === "amount" ? handleBackFromAmount : step.type === "confirm" ? handleBackFromConfirm : void 0;
+  const currentBackHandler = step.type === "deposit-address" ? handleBackFromDepositAddress : step.type === "select-asset" && signerContext && !canAutoLock ? handleBackFromSelectAsset : step.type === "amount" ? handleBackFromAmount : step.type === "confirm" ? handleBackFromConfirm : void 0;
   useEffect7(() => {
     onStepChange?.(stepIndex, currentBackHandler);
   }, [stepIndex, currentBackHandler, onStepChange]);
@@ -3686,33 +3790,35 @@ function DepositFlow({
   }, []);
   const selectedConnectAddressEffective = useMemo6(() => {
     if (selectedConnectAddress) return selectedConnectAddress;
-    if ((connectWalletOptions?.length ?? 0) === 1) {
-      return connectWalletOptions?.[0]?.address ?? null;
+    if (walletOptions.length === 1) {
+      return walletOptions[0].address;
     }
     return null;
-  }, [selectedConnectAddress, connectWalletOptions]);
-  const connectWalletOptionsKey = useMemo6(
-    () => (connectWalletOptions ?? []).map((option) => option.address.toLowerCase()).join(","),
-    [connectWalletOptions]
+  }, [selectedConnectAddress, walletOptions]);
+  const walletOptionsKey = useMemo6(
+    () => walletOptions.map((option) => option.address.toLowerCase()).join(","),
+    [walletOptions]
   );
-  const showConnectStep = !hasConnectedWallet || hasConnectWalletOptions && !isConnectSelectionConfirmed;
   useEffect7(() => {
     setIsConnectSelectionConfirmed(false);
-  }, [connectWalletOptionsKey, selectedConnectAddressEffective]);
+  }, [walletOptionsKey, selectedConnectAddressEffective]);
   if (showConnectStep) {
     return /* @__PURE__ */ jsx14("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx14(
       ConnectStep,
       {
-        walletOptions: connectWalletOptions,
+        walletOptions,
         selectedAddress: selectedConnectAddressEffective,
-        onSelectAddress: onSelectConnectAddress,
-        onSelectTransferCrypto: () => {
+        onSelectAddress: setSelectedConnectAddress,
+        onSelectTransferCrypto: dappAddress ? () => {
           handleSelectTransferCrypto();
           setIsConnectSelectionConfirmed(true);
-        },
+        } : void 0,
         onRequestConnect,
         onConnect,
         onContinue: () => {
+          if (selectedConnectAddressEffective) {
+            setSelectedConnectAddress(selectedConnectAddressEffective);
+          }
           handleSelectProvider();
           setIsConnectSelectionConfirmed(true);
         },
@@ -3720,16 +3826,13 @@ function DepositFlow({
       }
     ) });
   }
-  if (!walletClient || !publicClient || !address) {
-    return null;
-  }
   if (isDepositAddressMode) {
+    if (!dappAddress || !sessionKeyAddress) return null;
     return /* @__PURE__ */ jsxs13("div", { className: "rs-modal-body", children: [
       step.type === "setup" && targetChainObj && /* @__PURE__ */ jsx14(
         SetupStep,
         {
-          walletClient,
-          address,
+          address: sessionKeyAddress,
           targetChain,
           targetChainObj,
           targetToken,
@@ -3773,12 +3876,23 @@ function DepositFlow({
       )
     ] });
   }
+  if (!signerContext?.walletClient || !signerContext?.publicClient) {
+    return null;
+  }
+  const ownerAddress = signerContext.ownerAddress;
+  const ownerChainId = signerContext.walletClient?.chain?.id ?? signerContext.publicClient.chain?.id ?? targetChain;
+  const getReadClientForChain = (chainId) => {
+    if (signerContext.publicClient.chain?.id === chainId) {
+      return signerContext.publicClient;
+    }
+    return getPublicClient(chainId);
+  };
   return /* @__PURE__ */ jsxs13("div", { className: "rs-modal-body", children: [
     step.type === "setup" && targetChainObj && /* @__PURE__ */ jsx14(
       SetupStep,
       {
-        walletClient,
-        address,
+        walletClient: signerContext.walletClient,
+        address: ownerAddress,
         targetChain,
         targetChainObj,
         targetToken,
@@ -3795,8 +3909,8 @@ function DepositFlow({
     step.type === "select-asset" && /* @__PURE__ */ jsx14(
       AssetSelectStep,
       {
-        address,
-        publicClient,
+        address: ownerAddress,
+        publicClient: getReadClientForChain(ownerChainId),
         defaultSourceChain,
         defaultSourceToken,
         service,
@@ -3807,12 +3921,12 @@ function DepositFlow({
     step.type === "amount" && /* @__PURE__ */ jsx14(
       AmountStep,
       {
-        walletClient,
-        publicClient,
-        address,
+        walletClient: signerContext.walletClient,
+        publicClient: getReadClientForChain(step.asset.chainId),
+        address: ownerAddress,
         asset: step.asset,
         defaultAmount: step.amount ?? defaultAmount,
-        switchChain,
+        switchChain: signerContext.switchChain,
         targetChain,
         targetToken,
         uiConfig,
@@ -3822,15 +3936,15 @@ function DepositFlow({
     step.type === "confirm" && /* @__PURE__ */ jsx14(
       ConfirmStep,
       {
-        walletClient,
-        address,
+        walletClient: signerContext.walletClient,
+        address: ownerAddress,
         smartAccount: step.smartAccount,
         asset: step.asset,
         amount: step.amount,
         balance: step.balance,
         targetChain,
         targetToken,
-        switchChain,
+        switchChain: signerContext.switchChain,
         onConfirm: handleDepositSubmitted,
         onDepositSubmitted: handleDepositSubmittedCallback,
         onError: handleError
@@ -3868,6 +3982,7 @@ var init_DepositFlow = __esm({
     init_ProcessingStep();
     init_DepositAddressStep();
     init_constants();
+    init_public_client();
   }
 });
 
@@ -3918,15 +4033,11 @@ var init_theme = __esm({
 });
 
 // src/core/reown.tsx
-import { useState as useState8, useCallback as useCallback5, useMemo as useMemo7 } from "react";
+import { useState as useState8 } from "react";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { WagmiAdapter } from "@reown/appkit-adapter-wagmi";
 import { WagmiProvider } from "wagmi";
-import {
-  createAppKit,
-  useAppKit,
-  useAppKitAccount
-} from "@reown/appkit/react";
+import { createAppKit, useAppKit, useAppKitAccount } from "@reown/appkit/react";
 import {
   mainnet as mainnet2,
   base as base2,
@@ -3935,11 +4046,7 @@ import {
   polygon as polygon2,
   bsc as bsc2
 } from "@reown/appkit/networks";
-import {
-  useWalletClient,
-  usePublicClient,
-  useSwitchChain
-} from "wagmi";
+import { useWalletClient, usePublicClient, useSwitchChain } from "wagmi";
 import { jsx as jsx15 } from "react/jsx-runtime";
 function mapTheme(theme) {
   const themeMode = theme?.mode === "light" ? "light" : "dark";
@@ -4000,72 +4107,6 @@ function useReownWallet() {
     }
   };
 }
-function useResolvedWallet(host, reown) {
-  const [selectedAddress, setSelectedAddress] = useState8(null);
-  const walletOptions = useMemo7(() => {
-    const options = [];
-    const seen = /* @__PURE__ */ new Set();
-    if (host.address) {
-      options.push({
-        address: host.address,
-        label: "Connected Wallet",
-        kind: "connected"
-      });
-      seen.add(host.address.toLowerCase());
-    }
-    if (reown.address && !seen.has(reown.address.toLowerCase())) {
-      options.push({
-        address: reown.address,
-        label: "External Wallet",
-        kind: "external"
-      });
-    }
-    return options;
-  }, [host.address, reown.address]);
-  const effectiveAddress = useMemo7(() => {
-    if (walletOptions.length === 0) return null;
-    if (walletOptions.length === 1) return walletOptions[0].address;
-    if (selectedAddress) {
-      const valid = walletOptions.some(
-        (opt) => opt.address.toLowerCase() === selectedAddress.toLowerCase()
-      );
-      if (valid) return selectedAddress;
-    }
-    return null;
-  }, [walletOptions, selectedAddress]);
-  let walletClient;
-  let publicClient;
-  if (effectiveAddress) {
-    const key = effectiveAddress.toLowerCase();
-    if (host.address?.toLowerCase() === key && host.walletClient && host.publicClient) {
-      walletClient = host.walletClient;
-      publicClient = host.publicClient;
-    } else if (reown.address?.toLowerCase() === key && reown.walletClient && reown.publicClient) {
-      walletClient = reown.walletClient;
-      publicClient = reown.publicClient;
-    }
-  }
-  const handleSwitchChain = useCallback5(
-    async (chainId) => {
-      if (host.switchChain && effectiveAddress?.toLowerCase() === host.address?.toLowerCase()) {
-        await host.switchChain(chainId);
-      } else {
-        await reown.switchChain(chainId);
-      }
-    },
-    [host.switchChain, host.address, reown.switchChain, effectiveAddress]
-  );
-  return {
-    walletClient,
-    publicClient,
-    address: effectiveAddress ?? void 0,
-    walletOptions,
-    selectedAddress: effectiveAddress,
-    onSelectAddress: setSelectedAddress,
-    openConnect: reown.openConnect,
-    switchChain: handleSwitchChain
-  };
-}
 var NETWORKS, cachedAdapter, cachedProjectId;
 var init_reown = __esm({
   "src/core/reown.tsx"() {
@@ -4088,35 +4129,19 @@ var DepositModalReown_exports = {};
 __export(DepositModalReown_exports, {
   DepositModalReown: () => DepositModalReown
 });
-import { useCallback as useCallback6 } from "react";
+import { useCallback as useCallback5 } from "react";
 import { jsx as jsx16 } from "react/jsx-runtime";
 function DepositModalWithReown(props) {
   const reown = useReownWallet();
-  const resolved = useResolvedWallet(
-    {
-      walletClient: props.walletClient,
-      publicClient: props.publicClient,
-      address: props.address,
-      switchChain: props.switchChain
-    },
-    reown
-  );
-  const handleConnect = useCallback6(() => {
+  const handleConnect = useCallback5(() => {
     reown.openConnect();
   }, [reown.openConnect]);
   return /* @__PURE__ */ jsx16(
     DepositModalInner,
     {
       ...props,
-      walletClient: resolved.walletClient,
-      publicClient: resolved.publicClient,
-      address: resolved.address,
-      switchChain: resolved.switchChain,
-      connectWalletOptions: resolved.walletOptions,
-      selectedConnectAddress: resolved.selectedAddress,
-      onSelectConnectAddress: resolved.onSelectAddress,
-      onConnect: handleConnect,
-      onRequestConnect: props.onRequestConnect
+      reownWallet: reown,
+      onConnect: handleConnect
     }
   );
 }
@@ -4133,11 +4158,11 @@ var init_DepositModalReown = __esm({
 
 // src/DepositModal.tsx
 import {
-  useMemo as useMemo8,
+  useMemo as useMemo7,
   useEffect as useEffect8,
   useRef as useRef7,
   useState as useState9,
-  useCallback as useCallback7,
+  useCallback as useCallback6,
   lazy,
   Suspense
 } from "react";
@@ -4150,15 +4175,14 @@ function DepositModal(props) {
   return /* @__PURE__ */ jsx17(DepositModalInner, { ...props });
 }
 function DepositModalInner({
-  walletClient,
-  publicClient,
-  address,
+  dappWalletClient,
+  dappPublicClient,
+  dappAddress,
   targetChain: targetChainProp,
   targetToken,
   isOpen,
   onClose,
   inline,
-  switchChain,
   sourceChain: sourceChainProp,
   sourceToken,
   defaultAmount,
@@ -4168,9 +4192,7 @@ function DepositModalInner({
   sessionChainIds,
   forceRegister = false,
   waitForFinalTx = true,
-  connectWalletOptions,
-  selectedConnectAddress,
-  onSelectConnectAddress,
+  reownWallet,
   onConnect,
   onRequestConnect,
   connectButtonLabel,
@@ -4191,7 +4213,7 @@ function DepositModalInner({
   const backHandlerRef = useRef7(void 0);
   const targetChain = getChainId(targetChainProp);
   const sourceChain = sourceChainProp ? getChainId(sourceChainProp) : void 0;
-  const service = useMemo8(() => createDepositService(backendUrl), [backendUrl]);
+  const service = useMemo7(() => createDepositService(backendUrl), [backendUrl]);
   useEffect8(() => {
     if (isOpen && modalRef.current) {
       applyTheme(modalRef.current, theme);
@@ -4209,17 +4231,17 @@ function DepositModalInner({
       setCurrentStepIndex(0);
     }
   }, [isOpen]);
-  const handleStepChange = useCallback7(
+  const handleStepChange = useCallback6(
     (stepIndex, onBack) => {
       setCurrentStepIndex(stepIndex);
       backHandlerRef.current = onBack;
     },
     []
   );
-  const handleTotalBalanceChange = useCallback7((balance) => {
+  const handleTotalBalanceChange = useCallback6((balance) => {
     setTotalBalanceUsd(balance);
   }, []);
-  const handleBack = useCallback7(() => {
+  const handleBack = useCallback6(() => {
     backHandlerRef.current?.();
   }, []);
   const showLogo = uiConfig?.showLogo ?? false;
@@ -4324,13 +4346,12 @@ function DepositModalInner({
         /* @__PURE__ */ jsx17(
           DepositFlow,
           {
-            walletClient,
-            publicClient,
-            address,
+            dappWalletClient,
+            dappPublicClient,
+            dappAddress,
             targetChain,
             targetToken,
             service,
-            switchChain,
             sourceChain,
             sourceToken,
             amount: defaultAmount,
@@ -4339,9 +4360,7 @@ function DepositModalInner({
             sessionChainIds,
             forceRegister,
             waitForFinalTx,
-            connectWalletOptions,
-            selectedConnectAddress,
-            onSelectConnectAddress,
+            reownWallet,
             onConnect,
             onRequestConnect,
             connectButtonLabel,
@@ -4378,7 +4397,7 @@ var init_DepositModal = __esm({
 });
 
 // src/components/steps/WithdrawFormStep.tsx
-import { useCallback as useCallback8, useEffect as useEffect9, useMemo as useMemo9, useRef as useRef8, useState as useState10 } from "react";
+import { useCallback as useCallback7, useEffect as useEffect9, useMemo as useMemo8, useRef as useRef8, useState as useState10 } from "react";
 import { erc20Abi as erc20Abi3, formatUnits as formatUnits5, parseUnits as parseUnits3 } from "viem";
 import { jsx as jsx18, jsxs as jsxs15 } from "react/jsx-runtime";
 function useClickOutside(ref, onClose) {
@@ -4486,7 +4505,7 @@ function WithdrawFormStep({
       unwatch();
     };
   }, [safeAddress, publicClient, publicClientChainId, asset]);
-  const formattedBalance = useMemo9(() => {
+  const formattedBalance = useMemo8(() => {
     if (balance === null) return "...";
     try {
       const raw = formatUnits5(balance, asset.decimals);
@@ -4512,7 +4531,7 @@ function WithdrawFormStep({
       return;
     }
   }, [balance, asset.decimals, asset.symbol, onBalanceUsdChange]);
-  const amountUsd = useMemo9(() => {
+  const amountUsd = useMemo8(() => {
     if (!amount) return null;
     const parsed = Number(amount);
     if (!Number.isFinite(parsed) || parsed <= 0) return null;
@@ -4522,18 +4541,18 @@ function WithdrawFormStep({
     }
     return null;
   }, [amount, asset.symbol]);
-  const handleMaxClick = useCallback8(() => {
+  const handleMaxClick = useCallback7(() => {
     if (balance === null) return;
     const maxAmount = formatUnits5(balance, asset.decimals);
     setAmount(maxAmount);
     setError(null);
   }, [balance, asset.decimals]);
-  const handleUseConnected = useCallback8(() => {
+  const handleUseConnected = useCallback7(() => {
     if (!address) return;
     setRecipient(address);
     setError(null);
   }, [address]);
-  const handleWithdraw = useCallback8(async () => {
+  const handleWithdraw = useCallback7(async () => {
     if (!recipient || !/^0x[a-fA-F0-9]{40}$/.test(recipient)) {
       setError("Enter a valid recipient address");
       return;
@@ -5130,15 +5149,14 @@ var init_safe = __esm({
 });
 
 // src/WithdrawFlow.tsx
-import { useCallback as useCallback9, useEffect as useEffect10, useMemo as useMemo10, useState as useState11 } from "react";
-import { createPublicClient, http } from "viem";
+import { useCallback as useCallback8, useEffect as useEffect10, useMemo as useMemo9, useState as useState11 } from "react";
 import { walletClientToAccount as walletClientToAccount2 } from "@rhinestone/sdk";
 import { parseUnits as parseUnits4 } from "viem";
 import { jsx as jsx19, jsxs as jsxs16 } from "react/jsx-runtime";
 function WithdrawFlow({
-  walletClient,
-  publicClient,
-  address,
+  dappWalletClient,
+  dappPublicClient,
+  dappAddress,
   safeAddress,
   sourceChain,
   sourceToken,
@@ -5147,14 +5165,11 @@ function WithdrawFlow({
   recipient: defaultRecipient,
   amount: defaultAmount,
   service,
-  switchChain,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
   waitForFinalTx = true,
-  connectWalletOptions,
-  selectedConnectAddress,
-  onSelectConnectAddress,
+  reownWallet,
   onConnect,
   onWithdrawSign,
   onRequestConnect,
@@ -5178,14 +5193,89 @@ function WithdrawFlow({
     setTargetChain(targetChainProp);
     setTargetToken(targetTokenProp);
   }, [targetChainProp, targetTokenProp]);
-  const targetChainObj = useMemo10(() => CHAIN_BY_ID[targetChain], [targetChain]);
-  const hasCustomSigner = Boolean(address && onWithdrawSign);
-  const sourceChainObj = useMemo10(() => CHAIN_BY_ID[sourceChain], [sourceChain]);
-  const effectivePublicClient = useMemo10(
-    () => publicClient ?? (sourceChainObj ? createPublicClient({ chain: sourceChainObj, transport: http() }) : null),
-    [publicClient, sourceChainObj]
-  );
-  const asset = useMemo10(() => {
+  const targetChainObj = useMemo9(() => CHAIN_BY_ID[targetChain], [targetChain]);
+  const hasCustomSigner = Boolean(dappAddress && onWithdrawSign);
+  const dappSwitchChain = useMemo9(() => {
+    if (!dappWalletClient?.switchChain) return void 0;
+    return async (chainId) => {
+      await dappWalletClient.switchChain?.({ id: chainId });
+    };
+  }, [dappWalletClient]);
+  const walletOptions = useMemo9(() => {
+    const options = [];
+    const seen = /* @__PURE__ */ new Set();
+    if (dappWalletClient?.account && dappAddress) {
+      options.push({
+        address: dappWalletClient.account.address,
+        label: "Connected Wallet",
+        kind: "connected"
+      });
+      seen.add(dappWalletClient.account.address.toLowerCase());
+    }
+    if (reownWallet?.address && reownWallet.isConnected && !seen.has(reownWallet.address.toLowerCase())) {
+      options.push({
+        address: reownWallet.address,
+        label: "External Wallet",
+        kind: "external"
+      });
+    }
+    return options;
+  }, [
+    dappWalletClient,
+    dappAddress,
+    reownWallet?.address,
+    reownWallet?.isConnected
+  ]);
+  const canAutoLock = (dappWalletClient?.account && dappAddress || hasCustomSigner) && !reownWallet;
+  const [selectedConnectAddress, setSelectedConnectAddress] = useState11(null);
+  const signerContext = useMemo9(() => {
+    if (canAutoLock) {
+      if (hasCustomSigner) {
+        return {
+          ownerAddress: dappAddress,
+          walletClient: dappWalletClient ?? void 0,
+          publicClient: dappPublicClient ?? getPublicClient(sourceChain),
+          switchChain: dappSwitchChain
+        };
+      }
+      return {
+        ownerAddress: dappWalletClient.account.address,
+        walletClient: dappWalletClient,
+        publicClient: dappPublicClient ?? getPublicClient(sourceChain),
+        switchChain: dappSwitchChain
+      };
+    }
+    if (!isConnectSelectionConfirmed || !selectedConnectAddress) return null;
+    if (dappWalletClient?.account && dappWalletClient.account.address.toLowerCase() === selectedConnectAddress.toLowerCase()) {
+      return {
+        ownerAddress: dappWalletClient.account.address,
+        walletClient: dappWalletClient,
+        publicClient: dappPublicClient ?? getPublicClient(sourceChain),
+        switchChain: dappSwitchChain
+      };
+    }
+    if (reownWallet?.address?.toLowerCase() === selectedConnectAddress.toLowerCase() && reownWallet.walletClient && reownWallet.publicClient) {
+      return {
+        ownerAddress: reownWallet.address,
+        walletClient: reownWallet.walletClient,
+        publicClient: reownWallet.publicClient,
+        switchChain: reownWallet.switchChain
+      };
+    }
+    return null;
+  }, [
+    canAutoLock,
+    hasCustomSigner,
+    isConnectSelectionConfirmed,
+    selectedConnectAddress,
+    dappWalletClient,
+    dappPublicClient,
+    dappSwitchChain,
+    dappAddress,
+    reownWallet,
+    sourceChain
+  ]);
+  const asset = useMemo9(() => {
     const symbol = getTokenSymbol(sourceToken, sourceChain);
     const decimals = getTokenDecimalsByAddress(sourceToken, sourceChain);
     return {
@@ -5206,19 +5296,19 @@ function WithdrawFlow({
   useEffect10(() => {
     onTotalBalanceChange?.(totalBalanceUsd);
   }, [totalBalanceUsd, onTotalBalanceChange]);
-  const handleConnected = useCallback9(
+  const handleConnected = useCallback8(
     (addr, smartAccount) => {
       onConnected?.({ address: addr, smartAccount });
     },
     [onConnected]
   );
-  const handleError = useCallback9(
+  const handleError = useCallback8(
     (message, code) => {
       onError?.({ message, code });
     },
     [onError]
   );
-  const resolveSessionOwner2 = useCallback9(async (eoaAddress) => {
+  const resolveSessionOwner2 = useCallback8(async (eoaAddress) => {
     const localOwner = loadSessionOwnerFromStorage(eoaAddress);
     if (localOwner) {
       return {
@@ -5233,12 +5323,13 @@ function WithdrawFlow({
       address: created.address
     };
   }, []);
-  const handleFormSubmit = useCallback9(
+  const handleFormSubmit = useCallback8(
     async (recipient, amountValue) => {
-      if (!address) {
+      const ownerAddress2 = signerContext?.ownerAddress;
+      if (!ownerAddress2) {
         throw new Error("Wallet not connected");
       }
-      if (!onWithdrawSign && (!walletClient || !publicClient)) {
+      if (!onWithdrawSign && !signerContext?.walletClient) {
         throw new Error("Wallet not connected");
       }
       if (!targetChainObj) {
@@ -5246,8 +5337,8 @@ function WithdrawFlow({
       }
       setIsSubmitting(true);
       try {
-        const signerAccount = walletClient ? walletClientToAccount2(walletClient) : createViewOnlyAccount(address);
-        const sessionOwner = await resolveSessionOwner2(address);
+        const signerAccount = signerContext?.walletClient ? walletClientToAccount2(signerContext.walletClient) : createViewOnlyAccount(ownerAddress2);
+        const sessionOwner = await resolveSessionOwner2(ownerAddress2);
         const account = await createSmartAccount(
           signerAccount,
           sessionOwner.account
@@ -5272,7 +5363,7 @@ function WithdrawFlow({
               factoryData: initData.factoryData,
               sessionDetails
             },
-            eoaAddress: address,
+            eoaAddress: ownerAddress2,
             sessionOwner: sessionOwner.address,
             target: {
               chain: targetChain,
@@ -5281,8 +5372,9 @@ function WithdrawFlow({
             }
           });
         }
-        handleConnected(address, smartAccount);
+        handleConnected(ownerAddress2, smartAccount);
         const amountUnits = parseUnits4(amountValue, asset.decimals);
+        const pc = signerContext?.publicClient ?? getPublicClient(sourceChain);
         const result = onWithdrawSign ? await onWithdrawSign({
           safeAddress,
           recipient: smartAccount,
@@ -5291,15 +5383,15 @@ function WithdrawFlow({
           chainId: sourceChain,
           isNative: isSourceNative
         }) : isSourceNative ? await executeSafeEthTransfer({
-          walletClient,
-          publicClient,
+          walletClient: signerContext.walletClient,
+          publicClient: pc,
           safeAddress,
           recipient: smartAccount,
           amount: amountUnits,
           chainId: sourceChain
         }) : await executeSafeErc20Transfer({
-          walletClient,
-          publicClient,
+          walletClient: signerContext.walletClient,
+          publicClient: pc,
           safeAddress,
           tokenAddress: sourceToken,
           recipient: smartAccount,
@@ -5329,9 +5421,7 @@ function WithdrawFlow({
       }
     },
     [
-      walletClient,
-      publicClient,
-      address,
+      signerContext,
       targetChainObj,
       resolveSessionOwner2,
       signerAddress,
@@ -5351,24 +5441,24 @@ function WithdrawFlow({
       handleError
     ]
   );
-  const handleWithdrawComplete = useCallback9(
+  const handleWithdrawComplete = useCallback8(
     (txHash, destinationTxHash) => {
       onWithdrawComplete?.({ txHash, destinationTxHash });
     },
     [onWithdrawComplete]
   );
-  const handleWithdrawFailed = useCallback9(
+  const handleWithdrawFailed = useCallback8(
     (txHash, error) => {
       onWithdrawFailed?.({ txHash, error });
     },
     [onWithdrawFailed]
   );
-  const targetChainOptions = useMemo10(() => {
+  const targetChainOptions = useMemo9(() => {
     return SOURCE_CHAINS.filter(
       (chain) => getSupportedTargetTokens(chain.id).length > 0
     );
   }, []);
-  const targetTokenOptions = useMemo10(
+  const targetTokenOptions = useMemo9(
     () => getSupportedTargetTokens(targetChain),
     [targetChain]
   );
@@ -5381,7 +5471,7 @@ function WithdrawFlow({
       setTargetToken(targetTokenOptions[0].address);
     }
   }, [targetToken, targetTokenOptions]);
-  const handleTargetChainChange = useCallback9(
+  const handleTargetChainChange = useCallback8(
     (chainId) => {
       setTargetChain(chainId);
       const options = getSupportedTargetTokens(chainId);
@@ -5397,55 +5487,57 @@ function WithdrawFlow({
     },
     [targetToken]
   );
-  const handleTargetTokenChange = useCallback9((token) => {
+  const handleTargetTokenChange = useCallback8((token) => {
     setTargetToken(token);
   }, []);
-  const hasConnectWalletOptions = (connectWalletOptions?.length ?? 0) > 0;
-  const selectedConnectAddressEffective = useMemo10(() => {
+  const selectedConnectAddressEffective = useMemo9(() => {
     if (selectedConnectAddress) return selectedConnectAddress;
-    if ((connectWalletOptions?.length ?? 0) === 1) {
-      return connectWalletOptions?.[0]?.address ?? null;
+    if (walletOptions.length === 1) {
+      return walletOptions[0].address;
     }
     return null;
-  }, [selectedConnectAddress, connectWalletOptions]);
-  const connectWalletOptionsKey = useMemo10(
-    () => (connectWalletOptions ?? []).map((option) => option.address.toLowerCase()).join(","),
-    [connectWalletOptions]
-  );
-  const hasConnectedWallet = Boolean(
-    walletClient && publicClient && address || hasCustomSigner
+  }, [selectedConnectAddress, walletOptions]);
+  const walletOptionsKey = useMemo9(
+    () => walletOptions.map((option) => option.address.toLowerCase()).join(","),
+    [walletOptions]
   );
-  const showConnectStep = !hasConnectedWallet || !hasCustomSigner && hasConnectWalletOptions && !isConnectSelectionConfirmed;
+  const showConnectStep = !canAutoLock && !isConnectSelectionConfirmed;
   useEffect10(() => {
     setIsConnectSelectionConfirmed(false);
-  }, [connectWalletOptionsKey, selectedConnectAddressEffective]);
+  }, [walletOptionsKey, selectedConnectAddressEffective]);
   if (showConnectStep) {
     return /* @__PURE__ */ jsx19("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx19(
       ConnectStep,
       {
-        walletOptions: connectWalletOptions,
+        walletOptions,
         selectedAddress: selectedConnectAddressEffective,
-        onSelectAddress: onSelectConnectAddress,
+        onSelectAddress: setSelectedConnectAddress,
         onRequestConnect,
         onConnect,
-        onContinue: () => setIsConnectSelectionConfirmed(true),
+        onContinue: () => {
+          if (selectedConnectAddressEffective) {
+            setSelectedConnectAddress(selectedConnectAddressEffective);
+          }
+          setIsConnectSelectionConfirmed(true);
+        },
         connectButtonLabel
       }
     ) });
   }
-  if (!address || !effectivePublicClient) {
-    return null;
-  }
+  if (!signerContext) return null;
+  if (!onWithdrawSign && !signerContext.walletClient) return null;
+  const ownerAddress = signerContext.ownerAddress;
+  const formPublicClient = signerContext.publicClient ?? getPublicClient(sourceChain);
   return /* @__PURE__ */ jsxs16("div", { className: "rs-modal-body", children: [
     step.type === "form" && /* @__PURE__ */ jsx19(
       WithdrawFormStep,
       {
-        walletClient,
-        publicClient: effectivePublicClient,
-        address,
+        walletClient: signerContext.walletClient,
+        publicClient: formPublicClient,
+        address: ownerAddress,
         safeAddress,
         asset,
-        defaultRecipient: defaultRecipient ?? address,
+        defaultRecipient: defaultRecipient ?? ownerAddress,
         defaultAmount,
         targetChain,
         targetToken,
@@ -5453,7 +5545,7 @@ function WithdrawFlow({
         targetTokenOptions,
         onTargetChainChange: handleTargetChainChange,
         onTargetTokenChange: handleTargetTokenChange,
-        switchChain,
+        switchChain: signerContext.switchChain,
         submitting: isSubmitting,
         onSubmit: handleFormSubmit,
         onBalanceUsdChange: setTotalBalanceUsd
@@ -5485,6 +5577,7 @@ var init_WithdrawFlow = __esm({
   "src/WithdrawFlow.tsx"() {
     "use strict";
     init_ConnectStep();
+    init_public_client();
     init_WithdrawFormStep();
     init_ProcessingStep();
     init_constants();
@@ -5500,35 +5593,19 @@ var WithdrawModalReown_exports = {};
 __export(WithdrawModalReown_exports, {
   WithdrawModalReown: () => WithdrawModalReown
 });
-import { useCallback as useCallback10 } from "react";
+import { useCallback as useCallback9 } from "react";
 import { jsx as jsx20 } from "react/jsx-runtime";
 function WithdrawModalWithReown(props) {
   const reown = useReownWallet();
-  const resolved = useResolvedWallet(
-    {
-      walletClient: props.walletClient,
-      publicClient: props.publicClient,
-      address: props.address,
-      switchChain: props.switchChain
-    },
-    reown
-  );
-  const handleConnect = useCallback10(() => {
+  const handleConnect = useCallback9(() => {
     reown.openConnect();
   }, [reown.openConnect]);
   return /* @__PURE__ */ jsx20(
     WithdrawModalInner,
     {
       ...props,
-      walletClient: resolved.walletClient,
-      publicClient: resolved.publicClient,
-      address: resolved.address,
-      switchChain: resolved.switchChain,
-      connectWalletOptions: resolved.walletOptions,
-      selectedConnectAddress: resolved.selectedAddress,
-      onSelectConnectAddress: resolved.onSelectAddress,
-      onConnect: handleConnect,
-      onRequestConnect: props.onRequestConnect
+      reownWallet: reown,
+      onConnect: handleConnect
     }
   );
 }
@@ -5545,9 +5622,9 @@ var init_WithdrawModalReown = __esm({
 
 // src/WithdrawModal.tsx
 import {
-  useCallback as useCallback11,
+  useCallback as useCallback10,
   useEffect as useEffect11,
-  useMemo as useMemo11,
+  useMemo as useMemo10,
   useRef as useRef9,
   useState as useState12,
   lazy as lazy2,
@@ -5562,9 +5639,9 @@ function WithdrawModal(props) {
   return /* @__PURE__ */ jsx21(WithdrawModalInner, { ...props });
 }
 function WithdrawModalInner({
-  walletClient,
-  publicClient,
-  address,
+  dappWalletClient,
+  dappPublicClient,
+  dappAddress,
   safeAddress,
   sourceChain: sourceChainProp,
   sourceToken,
@@ -5575,15 +5652,12 @@ function WithdrawModalInner({
   isOpen,
   onClose,
   inline,
-  switchChain,
   backendUrl = DEFAULT_BACKEND_URL,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
   waitForFinalTx = true,
-  connectWalletOptions,
-  selectedConnectAddress,
-  onSelectConnectAddress,
+  reownWallet,
   onConnect,
   onWithdrawSign,
   onRequestConnect,
@@ -5605,7 +5679,7 @@ function WithdrawModalInner({
   const backHandlerRef = useRef9(void 0);
   const targetChain = getChainId(targetChainProp);
   const sourceChain = getChainId(sourceChainProp);
-  const service = useMemo11(() => createDepositService(backendUrl), [backendUrl]);
+  const service = useMemo10(() => createDepositService(backendUrl), [backendUrl]);
   useEffect11(() => {
     if (isOpen && modalRef.current) {
       applyTheme(modalRef.current, theme);
@@ -5623,17 +5697,17 @@ function WithdrawModalInner({
       setCurrentStepIndex(0);
     }
   }, [isOpen]);
-  const handleStepChange = useCallback11(
+  const handleStepChange = useCallback10(
     (stepIndex, onBack) => {
       setCurrentStepIndex(stepIndex);
       backHandlerRef.current = onBack;
     },
     []
   );
-  const handleTotalBalanceChange = useCallback11((balance) => {
+  const handleTotalBalanceChange = useCallback10((balance) => {
     setTotalBalanceUsd(balance);
   }, []);
-  const handleBack = useCallback11(() => {
+  const handleBack = useCallback10(() => {
     backHandlerRef.current?.();
   }, []);
   const showLogo = uiConfig?.showLogo ?? false;
@@ -5735,9 +5809,9 @@ function WithdrawModalInner({
         /* @__PURE__ */ jsx21(
           WithdrawFlow,
           {
-            walletClient,
-            publicClient,
-            address,
+            dappWalletClient,
+            dappPublicClient,
+            dappAddress,
             safeAddress,
             sourceChain,
             sourceToken,
@@ -5746,14 +5820,11 @@ function WithdrawModalInner({
             recipient,
             amount: defaultAmount,
             service,
-            switchChain,
             signerAddress,
             sessionChainIds,
             forceRegister,
             waitForFinalTx,
-            connectWalletOptions,
-            selectedConnectAddress,
-            onSelectConnectAddress,
+            reownWallet,
             onConnect,
             onWithdrawSign,
             onRequestConnect,