@rhinestone/deposit-modal 0.1.14 → 0.1.16

package/dist/index.cjs

@@ -816,8 +816,10 @@ function buildSession(chain, signerAddress) {
     chain
   };
 }
-async function createSmartAccount(userSigner, sessionSigner) {
-  const rhinestone = new import_sdk.RhinestoneSDK();
+async function createSmartAccount(userSigner, sessionSigner, sdkApiKey) {
+  const rhinestone = new import_sdk.RhinestoneSDK({
+    apiKey: sdkApiKey ?? ""
+  });
   const ownerAccounts = sessionSigner ? [userSigner, sessionSigner] : [userSigner];
   const config = {
     account: {
@@ -886,7 +888,10 @@ async function getSessionDetails(rhinestoneAccount, targetChain, signerAddress,
     }
   }
   if (targetToken) {
-    const targetSymbol = getTokenSymbol(targetToken, targetChain.id).toUpperCase();
+    const targetSymbol = getTokenSymbol(
+      targetToken,
+      targetChain.id
+    ).toUpperCase();
     if (targetSymbol && targetSymbol !== "TOKEN") {
       const chainsForToken = selectedChains.filter(
         (chain) => getSupportedTokenSymbolsForChain(chain.id).includes(targetSymbol)
@@ -1004,6 +1009,7 @@ function SetupStep({
   targetChain,
   targetChainObj,
   targetToken,
+  rhinestoneApiKey,
   signerAddress,
   sessionChainIds,
   recipient,
@@ -1028,7 +1034,8 @@ function SetupStep({
       const sessionOwner = await resolveSessionOwner(address);
       const account = await createSmartAccount(
         signerAccount,
-        sessionOwner.account
+        sessionOwner.account,
+        rhinestoneApiKey
       );
       const smartAccount = getAccountAddress(account);
       setState({ type: "checking" });
@@ -1082,6 +1089,7 @@ function SetupStep({
     targetChainObj,
     targetChain,
     targetToken,
+    rhinestoneApiKey,
     signerAddress,
     sessionChainIds,
     recipient,
@@ -3496,26 +3504,47 @@ var init_DepositAddressStep = __esm({
   }
 });
 
+// src/core/public-client.ts
+function getPublicClient(chainId) {
+  let client = clientCache.get(chainId);
+  if (!client) {
+    const chain = CHAIN_BY_ID[chainId];
+    client = (0, import_viem7.createPublicClient)({
+      chain,
+      transport: (0, import_viem7.http)()
+    });
+    clientCache.set(chainId, client);
+  }
+  return client;
+}
+var import_viem7, clientCache;
+var init_public_client = __esm({
+  "src/core/public-client.ts"() {
+    "use strict";
+    import_viem7 = require("viem");
+    init_constants();
+    clientCache = /* @__PURE__ */ new Map();
+  }
+});
+
 // src/DepositFlow.tsx
 function DepositFlow({
-  walletClient,
-  publicClient,
-  address,
+  dappWalletClient,
+  dappPublicClient,
+  dappAddress,
   targetChain,
   targetToken,
   service,
-  switchChain,
   sourceChain: defaultSourceChain,
   sourceToken: defaultSourceToken,
   amount: defaultAmount,
   recipient,
+  rhinestoneApiKey,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
   waitForFinalTx = true,
-  connectWalletOptions,
-  selectedConnectAddress,
-  onSelectConnectAddress,
+  reownWallet,
   onConnect,
   onRequestConnect,
   connectButtonLabel,
@@ -3533,9 +3562,93 @@ function DepositFlow({
   const [flowMode, setFlowMode] = (0, import_react9.useState)(null);
   const [totalBalanceUsd, setTotalBalanceUsd] = (0, import_react9.useState)(0);
   const [isConnectSelectionConfirmed, setIsConnectSelectionConfirmed] = (0, import_react9.useState)(false);
-  const hasConnectWalletOptions = (connectWalletOptions?.length ?? 0) > 0;
-  const hasConnectedWallet = Boolean(walletClient && publicClient && address);
+  const [selectedConnectAddress, setSelectedConnectAddress] = (0, import_react9.useState)(null);
   const targetChainObj = (0, import_react9.useMemo)(() => CHAIN_BY_ID[targetChain], [targetChain]);
+  const dappSwitchChain = (0, import_react9.useMemo)(() => {
+    if (!dappWalletClient?.switchChain) return void 0;
+    return async (chainId) => {
+      await dappWalletClient.switchChain?.({ id: chainId });
+    };
+  }, [dappWalletClient]);
+  const walletOptions = (0, import_react9.useMemo)(() => {
+    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 = (0, import_react9.useMemo)(() => {
+    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 = (0, import_react9.useRef)(null);
   (0, import_react9.useEffect)(() => {
     const prev = lastTargetRef.current;
@@ -3553,17 +3666,17 @@ function DepositFlow({
     });
   }, []);
   const handleBackFromSelectAsset = (0, import_react9.useCallback)(() => {
-    if (hasConnectWalletOptions) {
+    if (hasWalletOptions || reownWallet) {
       setIsConnectSelectionConfirmed(false);
     }
-  }, [hasConnectWalletOptions]);
+  }, [hasWalletOptions, reownWallet]);
   const handleBackFromDepositAddress = (0, import_react9.useCallback)(() => {
     setFlowMode(null);
     setStep({ type: "setup" });
-    if (hasConnectWalletOptions) {
+    if (hasWalletOptions || reownWallet) {
       setIsConnectSelectionConfirmed(false);
     }
-  }, [hasConnectWalletOptions]);
+  }, [hasWalletOptions, reownWallet]);
   const handleBackFromConfirm = (0, import_react9.useCallback)(() => {
     setStep((prev) => {
       if (prev.type !== "confirm") return prev;
@@ -3576,7 +3689,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;
   (0, import_react9.useEffect)(() => {
     onStepChange?.(stepIndex, currentBackHandler);
   }, [stepIndex, currentBackHandler, onStepChange]);
@@ -3701,33 +3814,35 @@ function DepositFlow({
   }, []);
   const selectedConnectAddressEffective = (0, import_react9.useMemo)(() => {
     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 = (0, import_react9.useMemo)(
-    () => (connectWalletOptions ?? []).map((option) => option.address.toLowerCase()).join(","),
-    [connectWalletOptions]
+  }, [selectedConnectAddress, walletOptions]);
+  const walletOptionsKey = (0, import_react9.useMemo)(
+    () => walletOptions.map((option) => option.address.toLowerCase()).join(","),
+    [walletOptions]
   );
-  const showConnectStep = !hasConnectedWallet || hasConnectWalletOptions && !isConnectSelectionConfirmed;
   (0, import_react9.useEffect)(() => {
     setIsConnectSelectionConfirmed(false);
-  }, [connectWalletOptionsKey, selectedConnectAddressEffective]);
+  }, [walletOptionsKey, selectedConnectAddressEffective]);
   if (showConnectStep) {
     return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", { className: "rs-modal-body", children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
       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);
         },
@@ -3735,19 +3850,17 @@ function DepositFlow({
       }
     ) });
   }
-  if (!walletClient || !publicClient || !address) {
-    return null;
-  }
   if (isDepositAddressMode) {
+    if (!dappAddress || !sessionKeyAddress) return null;
     return /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)("div", { className: "rs-modal-body", children: [
       step.type === "setup" && targetChainObj && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
         SetupStep,
         {
-          walletClient,
-          address,
+          address: sessionKeyAddress,
           targetChain,
           targetChainObj,
           targetToken,
+          rhinestoneApiKey,
           signerAddress,
           sessionChainIds,
           recipient,
@@ -3788,15 +3901,27 @@ 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__ */ (0, import_jsx_runtime14.jsxs)("div", { className: "rs-modal-body", children: [
     step.type === "setup" && targetChainObj && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
       SetupStep,
       {
-        walletClient,
-        address,
+        walletClient: signerContext.walletClient,
+        address: ownerAddress,
         targetChain,
         targetChainObj,
         targetToken,
+        rhinestoneApiKey,
         signerAddress,
         sessionChainIds,
         recipient,
@@ -3810,8 +3935,8 @@ function DepositFlow({
     step.type === "select-asset" && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
       AssetSelectStep,
       {
-        address,
-        publicClient,
+        address: ownerAddress,
+        publicClient: getReadClientForChain(ownerChainId),
         defaultSourceChain,
         defaultSourceToken,
         service,
@@ -3822,12 +3947,12 @@ function DepositFlow({
     step.type === "amount" && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
       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,
@@ -3837,15 +3962,15 @@ function DepositFlow({
     step.type === "confirm" && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
       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
@@ -3885,6 +4010,7 @@ var init_DepositFlow = __esm({
     init_ProcessingStep();
     init_DepositAddressStep();
     init_constants();
+    init_public_client();
     import_jsx_runtime14 = require("react/jsx-runtime");
   }
 });
@@ -3995,72 +4121,6 @@ function useReownWallet() {
     }
   };
 }
-function useResolvedWallet(host, reown) {
-  const [selectedAddress, setSelectedAddress] = (0, import_react10.useState)(null);
-  const walletOptions = (0, import_react10.useMemo)(() => {
-    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 = (0, import_react10.useMemo)(() => {
-    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 = (0, import_react10.useCallback)(
-    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 import_react10, import_react_query, import_appkit_adapter_wagmi, import_wagmi, import_react11, import_networks, import_wagmi2, import_jsx_runtime15, NETWORKS, cachedAdapter, cachedProjectId;
 var init_reown = __esm({
   "src/core/reown.tsx"() {
@@ -4093,15 +4153,6 @@ __export(DepositModalReown_exports, {
 });
 function DepositModalWithReown(props) {
   const reown = useReownWallet();
-  const resolved = useResolvedWallet(
-    {
-      walletClient: props.walletClient,
-      publicClient: props.publicClient,
-      address: props.address,
-      switchChain: props.switchChain
-    },
-    reown
-  );
   const handleConnect = (0, import_react12.useCallback)(() => {
     reown.openConnect();
   }, [reown.openConnect]);
@@ -4109,15 +4160,8 @@ function DepositModalWithReown(props) {
     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
     }
   );
 }
@@ -4144,27 +4188,25 @@ function DepositModal(props) {
   return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(DepositModalInner, { ...props });
 }
 function DepositModalInner({
-  walletClient,
-  publicClient,
-  address,
+  dappWalletClient,
+  dappPublicClient,
+  dappAddress,
   targetChain: targetChainProp,
   targetToken,
   isOpen,
   onClose,
   inline,
-  switchChain,
   sourceChain: sourceChainProp,
   sourceToken,
   defaultAmount,
   recipient,
   backendUrl = DEFAULT_BACKEND_URL,
+  rhinestoneApiKey,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
   waitForFinalTx = true,
-  connectWalletOptions,
-  selectedConnectAddress,
-  onSelectConnectAddress,
+  reownWallet,
   onConnect,
   onRequestConnect,
   connectButtonLabel,
@@ -4318,24 +4360,22 @@ function DepositModalInner({
         /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
           DepositFlow,
           {
-            walletClient,
-            publicClient,
-            address,
+            dappWalletClient,
+            dappPublicClient,
+            dappAddress,
             targetChain,
             targetToken,
             service,
-            switchChain,
             sourceChain,
             sourceToken,
             amount: defaultAmount,
             recipient,
+            rhinestoneApiKey,
             signerAddress,
             sessionChainIds,
             forceRegister,
             waitForFinalTx,
-            connectWalletOptions,
-            selectedConnectAddress,
-            onSelectConnectAddress,
+            reownWallet,
             onConnect,
             onRequestConnect,
             connectButtonLabel,
@@ -4454,7 +4494,7 @@ function WithdrawFormStep({
       try {
         const bal = isNativeAsset(asset) ? await publicClient.getBalance({ address: safeAddress }) : await publicClient.readContract({
           address: asset.token,
-          abi: import_viem7.erc20Abi,
+          abi: import_viem8.erc20Abi,
           functionName: "balanceOf",
           args: [safeAddress]
         });
@@ -4482,7 +4522,7 @@ function WithdrawFormStep({
   const formattedBalance = (0, import_react14.useMemo)(() => {
     if (balance === null) return "...";
     try {
-      const raw = (0, import_viem7.formatUnits)(balance, asset.decimals);
+      const raw = (0, import_viem8.formatUnits)(balance, asset.decimals);
       const numeric = Number(raw);
       if (!Number.isFinite(numeric)) return raw;
       return new Intl.NumberFormat("en-US", {
@@ -4497,7 +4537,7 @@ function WithdrawFormStep({
     const sym = asset.symbol.toUpperCase();
     if (sym !== "USDC" && sym !== "USDT") return;
     try {
-      const raw = (0, import_viem7.formatUnits)(balance, asset.decimals);
+      const raw = (0, import_viem8.formatUnits)(balance, asset.decimals);
       const numeric = Number(raw);
       if (!Number.isFinite(numeric)) return;
       onBalanceUsdChange?.(numeric);
@@ -4517,7 +4557,7 @@ function WithdrawFormStep({
   }, [amount, asset.symbol]);
   const handleMaxClick = (0, import_react14.useCallback)(() => {
     if (balance === null) return;
-    const maxAmount = (0, import_viem7.formatUnits)(balance, asset.decimals);
+    const maxAmount = (0, import_viem8.formatUnits)(balance, asset.decimals);
     setAmount(maxAmount);
     setError(null);
   }, [balance, asset.decimals]);
@@ -4538,7 +4578,7 @@ function WithdrawFormStep({
     }
     if (balance !== null) {
       try {
-        const amountInUnits = (0, import_viem7.parseUnits)(amount, asset.decimals);
+        const amountInUnits = (0, import_viem8.parseUnits)(amount, asset.decimals);
         if (amountInUnits > balance) {
           setError("Insufficient balance");
           return;
@@ -4877,12 +4917,12 @@ function WithdrawFormStep({
     /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(PoweredBy, {})
   ] });
 }
-var import_react14, import_viem7, import_jsx_runtime18;
+var import_react14, import_viem8, import_jsx_runtime18;
 var init_WithdrawFormStep = __esm({
   "src/components/steps/WithdrawFormStep.tsx"() {
     "use strict";
     import_react14 = require("react");
-    import_viem7 = require("viem");
+    import_viem8 = require("viem");
     init_Button();
     init_PoweredBy();
     init_deposit_service();
@@ -4928,13 +4968,13 @@ async function executeSafeEthTransfer(params) {
     safeTxGas: 0n,
     baseGas: 0n,
     gasPrice: 0n,
-    gasToken: import_viem8.zeroAddress,
-    refundReceiver: import_viem8.zeroAddress
+    gasToken: import_viem9.zeroAddress,
+    refundReceiver: import_viem9.zeroAddress
   };
-  const signature = (0, import_viem8.concat)([
-    (0, import_viem8.pad)(account.address, { size: 32 }),
-    (0, import_viem8.pad)((0, import_viem8.toHex)(0), { size: 32 }),
-    (0, import_viem8.toHex)(1, { size: 1 })
+  const signature = (0, import_viem9.concat)([
+    (0, import_viem9.pad)(account.address, { size: 32 }),
+    (0, import_viem9.pad)((0, import_viem9.toHex)(0), { size: 32 }),
+    (0, import_viem9.toHex)(1, { size: 1 })
   ]);
   const txHash = await walletClient.writeContract({
     account,
@@ -4961,7 +5001,7 @@ async function executeSafeEthTransfer(params) {
   const safeLogs = receipt.logs.filter(
     (log) => log.address.toLowerCase() === safeAddress.toLowerCase()
   );
-  const parsed = (0, import_viem8.parseEventLogs)({
+  const parsed = (0, import_viem9.parseEventLogs)({
     abi: SAFE_ABI,
     logs: safeLogs,
     strict: false
@@ -5003,8 +5043,8 @@ async function executeSafeErc20Transfer(params) {
   if (!isOwner) {
     throw new Error("Connected wallet is not a Safe owner");
   }
-  const data = (0, import_viem8.encodeFunctionData)({
-    abi: import_viem8.erc20Abi,
+  const data = (0, import_viem9.encodeFunctionData)({
+    abi: import_viem9.erc20Abi,
     functionName: "transfer",
     args: [recipient, amount]
   });
@@ -5016,13 +5056,13 @@ async function executeSafeErc20Transfer(params) {
     safeTxGas: 0n,
     baseGas: 0n,
     gasPrice: 0n,
-    gasToken: import_viem8.zeroAddress,
-    refundReceiver: import_viem8.zeroAddress
+    gasToken: import_viem9.zeroAddress,
+    refundReceiver: import_viem9.zeroAddress
   };
-  const signature = (0, import_viem8.concat)([
-    (0, import_viem8.pad)(account.address, { size: 32 }),
-    (0, import_viem8.pad)((0, import_viem8.toHex)(0), { size: 32 }),
-    (0, import_viem8.toHex)(1, { size: 1 })
+  const signature = (0, import_viem9.concat)([
+    (0, import_viem9.pad)(account.address, { size: 32 }),
+    (0, import_viem9.pad)((0, import_viem9.toHex)(0), { size: 32 }),
+    (0, import_viem9.toHex)(1, { size: 1 })
   ]);
   const txHash = await walletClient.writeContract({
     account,
@@ -5049,7 +5089,7 @@ async function executeSafeErc20Transfer(params) {
   const safeLogs = receipt.logs.filter(
     (log) => log.address.toLowerCase() === safeAddress.toLowerCase()
   );
-  const parsed = (0, import_viem8.parseEventLogs)({
+  const parsed = (0, import_viem9.parseEventLogs)({
     abi: SAFE_ABI,
     logs: safeLogs,
     strict: false
@@ -5064,11 +5104,11 @@ async function executeSafeErc20Transfer(params) {
   }
   return { txHash };
 }
-var import_viem8, SAFE_ABI;
+var import_viem9, SAFE_ABI;
 var init_safe = __esm({
   "src/core/safe.ts"() {
     "use strict";
-    import_viem8 = require("viem");
+    import_viem9 = require("viem");
     init_constants();
     SAFE_ABI = [
       {
@@ -5120,9 +5160,9 @@ var init_safe = __esm({
 
 // src/WithdrawFlow.tsx
 function WithdrawFlow({
-  walletClient,
-  publicClient,
-  address,
+  dappWalletClient,
+  dappPublicClient,
+  dappAddress,
   safeAddress,
   sourceChain,
   sourceToken,
@@ -5131,14 +5171,12 @@ function WithdrawFlow({
   recipient: defaultRecipient,
   amount: defaultAmount,
   service,
-  switchChain,
+  rhinestoneApiKey,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
   waitForFinalTx = true,
-  connectWalletOptions,
-  selectedConnectAddress,
-  onSelectConnectAddress,
+  reownWallet,
   onConnect,
   onWithdrawSign,
   onRequestConnect,
@@ -5163,12 +5201,87 @@ function WithdrawFlow({
     setTargetToken(targetTokenProp);
   }, [targetChainProp, targetTokenProp]);
   const targetChainObj = (0, import_react15.useMemo)(() => CHAIN_BY_ID[targetChain], [targetChain]);
-  const hasCustomSigner = Boolean(address && onWithdrawSign);
-  const sourceChainObj = (0, import_react15.useMemo)(() => CHAIN_BY_ID[sourceChain], [sourceChain]);
-  const effectivePublicClient = (0, import_react15.useMemo)(
-    () => publicClient ?? (sourceChainObj ? (0, import_viem9.createPublicClient)({ chain: sourceChainObj, transport: (0, import_viem9.http)() }) : null),
-    [publicClient, sourceChainObj]
-  );
+  const hasCustomSigner = Boolean(dappAddress && onWithdrawSign);
+  const dappSwitchChain = (0, import_react15.useMemo)(() => {
+    if (!dappWalletClient?.switchChain) return void 0;
+    return async (chainId) => {
+      await dappWalletClient.switchChain?.({ id: chainId });
+    };
+  }, [dappWalletClient]);
+  const walletOptions = (0, import_react15.useMemo)(() => {
+    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] = (0, import_react15.useState)(null);
+  const signerContext = (0, import_react15.useMemo)(() => {
+    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 = (0, import_react15.useMemo)(() => {
     const symbol = getTokenSymbol(sourceToken, sourceChain);
     const decimals = getTokenDecimalsByAddress(sourceToken, sourceChain);
@@ -5219,10 +5332,11 @@ function WithdrawFlow({
   }, []);
   const handleFormSubmit = (0, import_react15.useCallback)(
     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) {
@@ -5230,11 +5344,12 @@ function WithdrawFlow({
       }
       setIsSubmitting(true);
       try {
-        const signerAccount = walletClient ? (0, import_sdk3.walletClientToAccount)(walletClient) : createViewOnlyAccount(address);
-        const sessionOwner = await resolveSessionOwner2(address);
+        const signerAccount = signerContext?.walletClient ? (0, import_sdk3.walletClientToAccount)(signerContext.walletClient) : createViewOnlyAccount(ownerAddress2);
+        const sessionOwner = await resolveSessionOwner2(ownerAddress2);
         const account = await createSmartAccount(
           signerAccount,
-          sessionOwner.account
+          sessionOwner.account,
+          rhinestoneApiKey
         );
         const smartAccount = getAccountAddress(account);
         const checkResult = await service.checkAccount(smartAccount);
@@ -5256,7 +5371,7 @@ function WithdrawFlow({
               factoryData: initData.factoryData,
               sessionDetails
             },
-            eoaAddress: address,
+            eoaAddress: ownerAddress2,
             sessionOwner: sessionOwner.address,
             target: {
               chain: targetChain,
@@ -5265,8 +5380,9 @@ function WithdrawFlow({
             }
           });
         }
-        handleConnected(address, smartAccount);
+        handleConnected(ownerAddress2, smartAccount);
         const amountUnits = (0, import_viem10.parseUnits)(amountValue, asset.decimals);
+        const pc = signerContext?.publicClient ?? getPublicClient(sourceChain);
         const result = onWithdrawSign ? await onWithdrawSign({
           safeAddress,
           recipient: smartAccount,
@@ -5275,15 +5391,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,
@@ -5313,9 +5429,7 @@ function WithdrawFlow({
       }
     },
     [
-      walletClient,
-      publicClient,
-      address,
+      signerContext,
       targetChainObj,
       resolveSessionOwner2,
       signerAddress,
@@ -5324,6 +5438,7 @@ function WithdrawFlow({
       targetChain,
       targetToken,
       service,
+      rhinestoneApiKey,
       handleConnected,
       asset.decimals,
       safeAddress,
@@ -5384,52 +5499,54 @@ function WithdrawFlow({
   const handleTargetTokenChange = (0, import_react15.useCallback)((token) => {
     setTargetToken(token);
   }, []);
-  const hasConnectWalletOptions = (connectWalletOptions?.length ?? 0) > 0;
   const selectedConnectAddressEffective = (0, import_react15.useMemo)(() => {
     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 = (0, import_react15.useMemo)(
-    () => (connectWalletOptions ?? []).map((option) => option.address.toLowerCase()).join(","),
-    [connectWalletOptions]
-  );
-  const hasConnectedWallet = Boolean(
-    walletClient && publicClient && address || hasCustomSigner
+  }, [selectedConnectAddress, walletOptions]);
+  const walletOptionsKey = (0, import_react15.useMemo)(
+    () => walletOptions.map((option) => option.address.toLowerCase()).join(","),
+    [walletOptions]
   );
-  const showConnectStep = !hasConnectedWallet || !hasCustomSigner && hasConnectWalletOptions && !isConnectSelectionConfirmed;
+  const showConnectStep = !canAutoLock && !isConnectSelectionConfirmed;
   (0, import_react15.useEffect)(() => {
     setIsConnectSelectionConfirmed(false);
-  }, [connectWalletOptionsKey, selectedConnectAddressEffective]);
+  }, [walletOptionsKey, selectedConnectAddressEffective]);
   if (showConnectStep) {
     return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: "rs-modal-body", children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
       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__ */ (0, import_jsx_runtime19.jsxs)("div", { className: "rs-modal-body", children: [
     step.type === "form" && /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
       WithdrawFormStep,
       {
-        walletClient,
-        publicClient: effectivePublicClient,
-        address,
+        walletClient: signerContext.walletClient,
+        publicClient: formPublicClient,
+        address: ownerAddress,
         safeAddress,
         asset,
-        defaultRecipient: defaultRecipient ?? address,
+        defaultRecipient: defaultRecipient ?? ownerAddress,
         defaultAmount,
         targetChain,
         targetToken,
@@ -5437,7 +5554,7 @@ function WithdrawFlow({
         targetTokenOptions,
         onTargetChainChange: handleTargetChainChange,
         onTargetTokenChange: handleTargetTokenChange,
-        switchChain,
+        switchChain: signerContext.switchChain,
         submitting: isSubmitting,
         onSubmit: handleFormSubmit,
         onBalanceUsdChange: setTotalBalanceUsd
@@ -5465,13 +5582,13 @@ function WithdrawFlow({
     )
   ] });
 }
-var import_react15, import_viem9, import_sdk3, import_viem10, import_jsx_runtime19;
+var import_react15, import_sdk3, import_viem10, import_jsx_runtime19;
 var init_WithdrawFlow = __esm({
   "src/WithdrawFlow.tsx"() {
     "use strict";
     import_react15 = require("react");
-    import_viem9 = require("viem");
     init_ConnectStep();
+    init_public_client();
     init_WithdrawFormStep();
     init_ProcessingStep();
     init_constants();
@@ -5492,15 +5609,6 @@ __export(WithdrawModalReown_exports, {
 });
 function WithdrawModalWithReown(props) {
   const reown = useReownWallet();
-  const resolved = useResolvedWallet(
-    {
-      walletClient: props.walletClient,
-      publicClient: props.publicClient,
-      address: props.address,
-      switchChain: props.switchChain
-    },
-    reown
-  );
   const handleConnect = (0, import_react16.useCallback)(() => {
     reown.openConnect();
   }, [reown.openConnect]);
@@ -5508,15 +5616,8 @@ function WithdrawModalWithReown(props) {
     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
     }
   );
 }
@@ -5543,9 +5644,9 @@ function WithdrawModal(props) {
   return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(WithdrawModalInner, { ...props });
 }
 function WithdrawModalInner({
-  walletClient,
-  publicClient,
-  address,
+  dappWalletClient,
+  dappPublicClient,
+  dappAddress,
   safeAddress,
   sourceChain: sourceChainProp,
   sourceToken,
@@ -5556,15 +5657,13 @@ function WithdrawModalInner({
   isOpen,
   onClose,
   inline,
-  switchChain,
   backendUrl = DEFAULT_BACKEND_URL,
+  rhinestoneApiKey,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
   waitForFinalTx = true,
-  connectWalletOptions,
-  selectedConnectAddress,
-  onSelectConnectAddress,
+  reownWallet,
   onConnect,
   onWithdrawSign,
   onRequestConnect,
@@ -5716,9 +5815,9 @@ function WithdrawModalInner({
         /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
           WithdrawFlow,
           {
-            walletClient,
-            publicClient,
-            address,
+            dappWalletClient,
+            dappPublicClient,
+            dappAddress,
             safeAddress,
             sourceChain,
             sourceToken,
@@ -5727,14 +5826,12 @@ function WithdrawModalInner({
             recipient,
             amount: defaultAmount,
             service,
-            switchChain,
+            rhinestoneApiKey,
             signerAddress,
             sessionChainIds,
             forceRegister,
             waitForFinalTx,
-            connectWalletOptions,
-            selectedConnectAddress,
-            onSelectConnectAddress,
+            reownWallet,
             onConnect,
             onWithdrawSign,
             onRequestConnect,