@rhinestone/deposit-modal 0.1.32 → 0.1.34

package/dist/{chunk-SQDXU7ML.cjs → chunk-DQO6MO27.cjs}

@@ -235,18 +235,6 @@ function WithdrawFormStep({
       setIsSubmitting(false);
     }
   }, [recipient, amount, balance, asset.decimals, onSubmit]);
-  const handleSwitch = async () => {
-    if (!asset.chainId || !switchChain) return;
-    setIsSwitching(true);
-    try {
-      await switchChain(asset.chainId);
-    } catch (err) {
-      const raw = err instanceof Error ? err.message : "Failed to switch chain";
-      setError(_chunkYIHOACM3cjs.formatUserError.call(void 0, raw));
-    } finally {
-      setIsSwitching(false);
-    }
-  };
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-step", children: [
     /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-step-body rs-withdraw-form", children: [
       /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-withdraw-section", children: [
@@ -510,23 +498,7 @@ function WithdrawFormStep({
           )
         ] })
       ] }),
-      chainMismatch && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-chain-switch", children: [
-        /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-chain-switch-text", children: [
-          "Switch to ",
-          _chunkS4UBVD3Hcjs.getChainName.call(void 0, asset.chainId),
-          " to continue."
-        ] }),
-        switchChain && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-          _chunkYIHOACM3cjs.Button,
-          {
-            variant: "outline",
-            size: "small",
-            loading: isSwitching,
-            onClick: handleSwitch,
-            children: "Switch"
-          }
-        )
-      ] }),
+      chainMismatch && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-chain-switch", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-chain-switch-text", children: isSwitching ? `Switching to ${_chunkS4UBVD3Hcjs.getChainName.call(void 0, asset.chainId)}...` : `Switch to ${_chunkS4UBVD3Hcjs.getChainName.call(void 0, asset.chainId)} to continue.` }) }),
       error && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-withdraw-error", children: [
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
           "svg",
@@ -911,7 +883,7 @@ function WithdrawFlow({
       });
       seen.add(dappWalletClient.account.address.toLowerCase());
     }
-    if (_optionalChain([reownWallet, 'optionalAccess', _10 => _10.address]) && reownWallet.isConnected && !seen.has(reownWallet.address.toLowerCase())) {
+    if (_optionalChain([reownWallet, 'optionalAccess', _10 => _10.address]) && reownWallet.isConnected && reownWallet.walletClient && reownWallet.publicClient && !seen.has(reownWallet.address.toLowerCase())) {
       options.push({
         address: reownWallet.address,
         label: "External Wallet",
@@ -924,9 +896,11 @@ function WithdrawFlow({
     dappWalletClient,
     dappAddress,
     _optionalChain([reownWallet, 'optionalAccess', _11 => _11.address]),
-    _optionalChain([reownWallet, 'optionalAccess', _12 => _12.isConnected])
+    _optionalChain([reownWallet, 'optionalAccess', _12 => _12.isConnected]),
+    _optionalChain([reownWallet, 'optionalAccess', _13 => _13.walletClient]),
+    _optionalChain([reownWallet, 'optionalAccess', _14 => _14.publicClient])
   ]);
-  const canAutoLock = (_optionalChain([dappWalletClient, 'optionalAccess', _13 => _13.account]) && dappAddress || hasCustomSigner) && !reownWallet;
+  const canAutoLock = hasCustomSigner || Boolean(_optionalChain([dappWalletClient, 'optionalAccess', _15 => _15.account]) && dappAddress) && !reownWallet;
   const [selectedConnectAddress, setSelectedConnectAddress] = _react.useState.call(void 0, null);
   const signerContext = _react.useMemo.call(void 0, () => {
     if (canAutoLock) {
@@ -946,7 +920,7 @@ function WithdrawFlow({
       };
     }
     if (!isConnectSelectionConfirmed || !selectedConnectAddress) return null;
-    if (_optionalChain([dappWalletClient, 'optionalAccess', _14 => _14.account]) && dappWalletClient.account.address.toLowerCase() === selectedConnectAddress.toLowerCase()) {
+    if (_optionalChain([dappWalletClient, 'optionalAccess', _16 => _16.account]) && dappWalletClient.account.address.toLowerCase() === selectedConnectAddress.toLowerCase()) {
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
@@ -954,7 +928,7 @@ function WithdrawFlow({
         switchChain: dappSwitchChain
       };
     }
-    if (_optionalChain([reownWallet, 'optionalAccess', _15 => _15.address, 'optionalAccess', _16 => _16.toLowerCase, 'call', _17 => _17()]) === selectedConnectAddress.toLowerCase() && reownWallet.walletClient && reownWallet.publicClient) {
+    if (_optionalChain([reownWallet, 'optionalAccess', _17 => _17.address, 'optionalAccess', _18 => _18.toLowerCase, 'call', _19 => _19()]) === selectedConnectAddress.toLowerCase() && reownWallet.walletClient && reownWallet.publicClient) {
       return {
         ownerAddress: reownWallet.address,
         walletClient: reownWallet.walletClient,
@@ -991,20 +965,20 @@ function WithdrawFlow({
   const stepIndex = step.type === "form" ? 0 : 1;
   const currentBackHandler = void 0;
   _react.useEffect.call(void 0, () => {
-    _optionalChain([onStepChange, 'optionalCall', _18 => _18(stepIndex, currentBackHandler)]);
+    _optionalChain([onStepChange, 'optionalCall', _20 => _20(stepIndex, currentBackHandler)]);
   }, [stepIndex, currentBackHandler, onStepChange]);
   _react.useEffect.call(void 0, () => {
-    _optionalChain([onTotalBalanceChange, 'optionalCall', _19 => _19(totalBalanceUsd)]);
+    _optionalChain([onTotalBalanceChange, 'optionalCall', _21 => _21(totalBalanceUsd)]);
   }, [totalBalanceUsd, onTotalBalanceChange]);
   const handleConnected = _react.useCallback.call(void 0, 
     (addr, smartAccount) => {
-      _optionalChain([onConnected, 'optionalCall', _20 => _20({ address: addr, smartAccount })]);
+      _optionalChain([onConnected, 'optionalCall', _22 => _22({ address: addr, smartAccount })]);
     },
     [onConnected]
   );
   const handleError = _react.useCallback.call(void 0, 
     (message, code) => {
-      _optionalChain([onError, 'optionalCall', _21 => _21({ message, code })]);
+      _optionalChain([onError, 'optionalCall', _23 => _23({ message, code })]);
     },
     [onError]
   );
@@ -1025,11 +999,11 @@ function WithdrawFlow({
   }, []);
   const handleFormSubmit = _react.useCallback.call(void 0, 
     async (recipient, amountValue) => {
-      const ownerAddress2 = _optionalChain([signerContext, 'optionalAccess', _22 => _22.ownerAddress]);
+      const ownerAddress2 = _optionalChain([signerContext, 'optionalAccess', _24 => _24.ownerAddress]);
       if (!ownerAddress2) {
         throw new Error("Wallet not connected");
       }
-      if (!onSignTransaction && !_optionalChain([signerContext, 'optionalAccess', _23 => _23.walletClient])) {
+      if (!onSignTransaction && !_optionalChain([signerContext, 'optionalAccess', _25 => _25.walletClient])) {
         throw new Error("Wallet not connected");
       }
       setIsSubmitting(true);
@@ -1080,7 +1054,7 @@ function WithdrawFlow({
         }
         handleConnected(ownerAddress2, smartAccount);
         const amountUnits = _viem.parseUnits.call(void 0, amountValue, asset.decimals);
-        const pc = _nullishCoalesce(_optionalChain([signerContext, 'optionalAccess', _24 => _24.publicClient]), () => ( _chunkYIHOACM3cjs.getPublicClient.call(void 0, sourceChain)));
+        const pc = _nullishCoalesce(_optionalChain([signerContext, 'optionalAccess', _26 => _26.publicClient]), () => ( _chunkYIHOACM3cjs.getPublicClient.call(void 0, sourceChain)));
         let result;
         if (onSignTransaction) {
           const transferData = isSourceNative ? { to: smartAccount, value: amountUnits, data: "0x" } : {
@@ -1132,7 +1106,7 @@ function WithdrawFlow({
             chainId: sourceChain
           });
         }
-        _optionalChain([onWithdrawSubmitted, 'optionalCall', _25 => _25({
+        _optionalChain([onWithdrawSubmitted, 'optionalCall', _27 => _27({
           txHash: result.txHash,
           sourceChain,
           amount: amountUnits.toString(),
@@ -1176,13 +1150,13 @@ function WithdrawFlow({
   );
   const handleWithdrawComplete = _react.useCallback.call(void 0, 
     (txHash, destinationTxHash) => {
-      _optionalChain([onWithdrawComplete, 'optionalCall', _26 => _26({ txHash, destinationTxHash })]);
+      _optionalChain([onWithdrawComplete, 'optionalCall', _28 => _28({ txHash, destinationTxHash })]);
     },
     [onWithdrawComplete]
   );
   const handleWithdrawFailed = _react.useCallback.call(void 0, 
     (txHash, error) => {
-      _optionalChain([onWithdrawFailed, 'optionalCall', _27 => _27({ txHash, error })]);
+      _optionalChain([onWithdrawFailed, 'optionalCall', _29 => _29({ txHash, error })]);
     },
     [onWithdrawFailed]
   );
@@ -1230,14 +1204,21 @@ function WithdrawFlow({
     }
     return null;
   }, [selectedConnectAddress, walletOptions]);
-  const walletOptionsKey = _react.useMemo.call(void 0, 
-    () => walletOptions.map((option) => option.address.toLowerCase()).join(","),
-    [walletOptions]
-  );
   const showConnectStep = !canAutoLock && !isConnectSelectionConfirmed;
   _react.useEffect.call(void 0, () => {
-    setIsConnectSelectionConfirmed(false);
-  }, [walletOptionsKey, selectedConnectAddressEffective]);
+    if (!showConnectStep && isConnectSelectionConfirmed && !signerContext) {
+      setSelectedConnectAddress(null);
+      setIsConnectSelectionConfirmed(false);
+    }
+  }, [showConnectStep, isConnectSelectionConfirmed, signerContext]);
+  const ownerAddress = _optionalChain([signerContext, 'optionalAccess', _30 => _30.ownerAddress]);
+  const selectedWalletIcon = _react.useMemo.call(void 0, () => {
+    if (!ownerAddress) return _optionalChain([reownWallet, 'optionalAccess', _31 => _31.icon]);
+    const selected = walletOptions.find(
+      (o) => o.address.toLowerCase() === ownerAddress.toLowerCase()
+    );
+    return _nullishCoalesce(_optionalChain([selected, 'optionalAccess', _32 => _32.icon]), () => ( _optionalChain([reownWallet, 'optionalAccess', _33 => _33.icon])));
+  }, [walletOptions, ownerAddress, _optionalChain([reownWallet, 'optionalAccess', _34 => _34.icon])]);
   if (showConnectStep) {
     return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-modal-body", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
       _chunkYIHOACM3cjs.ConnectStep,
@@ -1260,24 +1241,18 @@ function WithdrawFlow({
   }
   if (!signerContext) return null;
   if (!onSignTransaction && !signerContext.walletClient) return null;
-  const ownerAddress = signerContext.ownerAddress;
+  const resolvedOwnerAddress = signerContext.ownerAddress;
   const formPublicClient = _nullishCoalesce(signerContext.publicClient, () => ( _chunkYIHOACM3cjs.getPublicClient.call(void 0, sourceChain)));
-  const selectedWalletIcon = _react.useMemo.call(void 0, () => {
-    const selected = walletOptions.find(
-      (o) => o.address.toLowerCase() === ownerAddress.toLowerCase()
-    );
-    return _nullishCoalesce(_optionalChain([selected, 'optionalAccess', _28 => _28.icon]), () => ( _optionalChain([reownWallet, 'optionalAccess', _29 => _29.icon])));
-  }, [walletOptions, ownerAddress, _optionalChain([reownWallet, 'optionalAccess', _30 => _30.icon])]);
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-modal-body", children: [
     step.type === "form" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
       WithdrawFormStep,
       {
         walletClient: signerContext.walletClient,
         publicClient: formPublicClient,
-        address: ownerAddress,
+        address: resolvedOwnerAddress,
         safeAddress,
         asset,
-        defaultRecipient: _nullishCoalesce(defaultRecipient, () => ( ownerAddress)),
+        defaultRecipient: _nullishCoalesce(defaultRecipient, () => ( resolvedOwnerAddress)),
         defaultAmount,
         targetChain,
         targetToken,
@@ -1318,7 +1293,7 @@ function WithdrawFlow({
 // src/WithdrawModal.tsx
 
 var ReownWithdrawInner = _react.lazy.call(void 0, 
-  () => Promise.resolve().then(() => _interopRequireWildcard(require("./WithdrawModalReown-53FDOZG2.cjs"))).then((m) => ({
+  () => Promise.resolve().then(() => _interopRequireWildcard(require("./WithdrawModalReown-HTPBAGPM.cjs"))).then((m) => ({
     default: m.WithdrawModalReown
   }))
 );
@@ -1383,7 +1358,7 @@ function WithdrawModalInner({
   _react.useEffect.call(void 0, () => {
     if (isOpen && !hasCalledReady.current) {
       hasCalledReady.current = true;
-      _optionalChain([onReady, 'optionalCall', _31 => _31()]);
+      _optionalChain([onReady, 'optionalCall', _35 => _35()]);
     }
   }, [isOpen, onReady]);
   _react.useEffect.call(void 0, () => {
@@ -1402,14 +1377,14 @@ function WithdrawModalInner({
     setTotalBalanceUsd(balance2);
   }, []);
   const handleBack = _react.useCallback.call(void 0, () => {
-    _optionalChain([backHandlerRef, 'access', _32 => _32.current, 'optionalCall', _33 => _33()]);
+    _optionalChain([backHandlerRef, 'access', _36 => _36.current, 'optionalCall', _37 => _37()]);
   }, []);
-  const showLogo = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _34 => _34.showLogo]), () => ( false));
-  const showStepper = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _35 => _35.showStepper]), () => ( false));
-  const showBackButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _36 => _36.showBackButton]), () => ( true));
-  const balance = _optionalChain([uiConfig, 'optionalAccess', _37 => _37.balance]);
-  const logoUrl = _nullishCoalesce(_optionalChain([branding, 'optionalAccess', _38 => _38.logoUrl]), () => ( "https://github.com/rhinestonewtf.png"));
-  const title = _nullishCoalesce(_optionalChain([branding, 'optionalAccess', _39 => _39.title]), () => ( "Withdraw"));
+  const showLogo = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _38 => _38.showLogo]), () => ( false));
+  const showStepper = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _39 => _39.showStepper]), () => ( false));
+  const showBackButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _40 => _40.showBackButton]), () => ( true));
+  const balance = _optionalChain([uiConfig, 'optionalAccess', _41 => _41.balance]);
+  const logoUrl = _nullishCoalesce(_optionalChain([branding, 'optionalAccess', _42 => _42.logoUrl]), () => ( "https://github.com/rhinestonewtf.png"));
+  const title = _nullishCoalesce(_optionalChain([branding, 'optionalAccess', _43 => _43.title]), () => ( "Withdraw"));
   const canGoBack = currentStepIndex > 0 && currentStepIndex < 3 && backHandlerRef.current;
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
     _chunkYIHOACM3cjs.Modal,

package/dist/{chunk-RR25E5DZ.mjs → chunk-EIWNQ2MO.mjs}

@@ -235,18 +235,6 @@ function WithdrawFormStep({
       setIsSubmitting(false);
     }
   }, [recipient, amount, balance, asset.decimals, onSubmit]);
-  const handleSwitch = async () => {
-    if (!asset.chainId || !switchChain) return;
-    setIsSwitching(true);
-    try {
-      await switchChain(asset.chainId);
-    } catch (err) {
-      const raw = err instanceof Error ? err.message : "Failed to switch chain";
-      setError(formatUserError(raw));
-    } finally {
-      setIsSwitching(false);
-    }
-  };
   return /* @__PURE__ */ jsxs("div", { className: "rs-step", children: [
     /* @__PURE__ */ jsxs("div", { className: "rs-step-body rs-withdraw-form", children: [
       /* @__PURE__ */ jsxs("div", { className: "rs-withdraw-section", children: [
@@ -510,23 +498,7 @@ function WithdrawFormStep({
           )
         ] })
       ] }),
-      chainMismatch && /* @__PURE__ */ jsxs("div", { className: "rs-chain-switch", children: [
-        /* @__PURE__ */ jsxs("div", { className: "rs-chain-switch-text", children: [
-          "Switch to ",
-          getChainName(asset.chainId),
-          " to continue."
-        ] }),
-        switchChain && /* @__PURE__ */ jsx(
-          Button,
-          {
-            variant: "outline",
-            size: "small",
-            loading: isSwitching,
-            onClick: handleSwitch,
-            children: "Switch"
-          }
-        )
-      ] }),
+      chainMismatch && /* @__PURE__ */ jsx("div", { className: "rs-chain-switch", children: /* @__PURE__ */ jsx("div", { className: "rs-chain-switch-text", children: isSwitching ? `Switching to ${getChainName(asset.chainId)}...` : `Switch to ${getChainName(asset.chainId)} to continue.` }) }),
       error && /* @__PURE__ */ jsxs("div", { className: "rs-withdraw-error", children: [
         /* @__PURE__ */ jsx(
           "svg",
@@ -911,7 +883,7 @@ function WithdrawFlow({
       });
       seen.add(dappWalletClient.account.address.toLowerCase());
     }
-    if (reownWallet?.address && reownWallet.isConnected && !seen.has(reownWallet.address.toLowerCase())) {
+    if (reownWallet?.address && reownWallet.isConnected && reownWallet.walletClient && reownWallet.publicClient && !seen.has(reownWallet.address.toLowerCase())) {
       options.push({
         address: reownWallet.address,
         label: "External Wallet",
@@ -924,9 +896,11 @@ function WithdrawFlow({
     dappWalletClient,
     dappAddress,
     reownWallet?.address,
-    reownWallet?.isConnected
+    reownWallet?.isConnected,
+    reownWallet?.walletClient,
+    reownWallet?.publicClient
   ]);
-  const canAutoLock = (dappWalletClient?.account && dappAddress || hasCustomSigner) && !reownWallet;
+  const canAutoLock = hasCustomSigner || Boolean(dappWalletClient?.account && dappAddress) && !reownWallet;
   const [selectedConnectAddress, setSelectedConnectAddress] = useState2(null);
   const signerContext = useMemo2(() => {
     if (canAutoLock) {
@@ -1230,14 +1204,21 @@ function WithdrawFlow({
     }
     return null;
   }, [selectedConnectAddress, walletOptions]);
-  const walletOptionsKey = useMemo2(
-    () => walletOptions.map((option) => option.address.toLowerCase()).join(","),
-    [walletOptions]
-  );
   const showConnectStep = !canAutoLock && !isConnectSelectionConfirmed;
   useEffect2(() => {
-    setIsConnectSelectionConfirmed(false);
-  }, [walletOptionsKey, selectedConnectAddressEffective]);
+    if (!showConnectStep && isConnectSelectionConfirmed && !signerContext) {
+      setSelectedConnectAddress(null);
+      setIsConnectSelectionConfirmed(false);
+    }
+  }, [showConnectStep, isConnectSelectionConfirmed, signerContext]);
+  const ownerAddress = signerContext?.ownerAddress;
+  const selectedWalletIcon = useMemo2(() => {
+    if (!ownerAddress) return reownWallet?.icon;
+    const selected = walletOptions.find(
+      (o) => o.address.toLowerCase() === ownerAddress.toLowerCase()
+    );
+    return selected?.icon ?? reownWallet?.icon;
+  }, [walletOptions, ownerAddress, reownWallet?.icon]);
   if (showConnectStep) {
     return /* @__PURE__ */ jsx2("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx2(
       ConnectStep,
@@ -1260,24 +1241,18 @@ function WithdrawFlow({
   }
   if (!signerContext) return null;
   if (!onSignTransaction && !signerContext.walletClient) return null;
-  const ownerAddress = signerContext.ownerAddress;
+  const resolvedOwnerAddress = signerContext.ownerAddress;
   const formPublicClient = signerContext.publicClient ?? getPublicClient(sourceChain);
-  const selectedWalletIcon = useMemo2(() => {
-    const selected = walletOptions.find(
-      (o) => o.address.toLowerCase() === ownerAddress.toLowerCase()
-    );
-    return selected?.icon ?? reownWallet?.icon;
-  }, [walletOptions, ownerAddress, reownWallet?.icon]);
   return /* @__PURE__ */ jsxs2("div", { className: "rs-modal-body", children: [
     step.type === "form" && /* @__PURE__ */ jsx2(
       WithdrawFormStep,
       {
         walletClient: signerContext.walletClient,
         publicClient: formPublicClient,
-        address: ownerAddress,
+        address: resolvedOwnerAddress,
         safeAddress,
         asset,
-        defaultRecipient: defaultRecipient ?? ownerAddress,
+        defaultRecipient: defaultRecipient ?? resolvedOwnerAddress,
         defaultAmount,
         targetChain,
         targetToken,
@@ -1318,7 +1293,7 @@ function WithdrawFlow({
 // src/WithdrawModal.tsx
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 var ReownWithdrawInner = lazy(
-  () => import("./WithdrawModalReown-YGGV7BL2.mjs").then((m) => ({
+  () => import("./WithdrawModalReown-E3OEW7QZ.mjs").then((m) => ({
     default: m.WithdrawModalReown
   }))
 );

package/dist/{chunk-K2JJKFTV.mjs → chunk-SJEIKMVO.mjs}

@@ -79,12 +79,16 @@ function useReownWallet() {
     isConnected,
     icon: walletInfo?.icon,
     openConnect: () => {
-      void open({ view: isConnected ? "Account" : "Connect" });
+      void open({ view: "Connect" });
     },
     disconnect: () => {
       wagmiDisconnect();
     },
     switchChain: async (chainId) => {
+      if (walletClient?.switchChain) {
+        await walletClient.switchChain({ id: chainId });
+        return;
+      }
       await switchChainAsync({ chainId });
     }
   };

package/dist/{chunk-52FVEYTL.cjs → chunk-V7I5T4SW.cjs}

@@ -79,12 +79,16 @@ function useReownWallet() {
     isConnected,
     icon: _optionalChain([walletInfo, 'optionalAccess', _3 => _3.icon]),
     openConnect: () => {
-      void open({ view: isConnected ? "Account" : "Connect" });
+      void open({ view: "Connect" });
     },
     disconnect: () => {
       wagmiDisconnect();
     },
     switchChain: async (chainId) => {
+      if (_optionalChain([walletClient, 'optionalAccess', _4 => _4.switchChain])) {
+        await walletClient.switchChain({ id: chainId });
+        return;
+      }
       await switchChainAsync({ chainId });
     }
   };