@rhinestone/deposit-modal 0.4.2 → 0.4.3

package/dist/{WithdrawModalReown-AZ27OBAV.cjs → WithdrawModalReown-KKGW62YO.cjs}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkPNN2YBPFcjs = require('./chunk-PNN2YBPF.cjs');
+var _chunk3NZUMDSTcjs = require('./chunk-3NZUMDST.cjs');
 
 
 
@@ -21,7 +21,7 @@ function WithdrawModalWithReown(props) {
     reown.disconnect();
   }, [reown.disconnect]);
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-    _chunkPNN2YBPFcjs.WithdrawModalInner,
+    _chunk3NZUMDSTcjs.WithdrawModalInner,
     {
       ...props,
       reownWallet: reown,

package/dist/{WithdrawModalReown-L4SWLONE.mjs → WithdrawModalReown-XPB53FKZ.mjs}

@@ -1,6 +1,6 @@
 import {
   WithdrawModalInner
-} from "./chunk-7JVBUMFE.mjs";
+} from "./chunk-IDJBMNV2.mjs";
 import {
   ReownWalletProvider,
   useReownWallet

package/dist/{chunk-PNN2YBPF.cjs → chunk-3NZUMDST.cjs}

@@ -200,6 +200,7 @@ function WithdrawFormStep({
   publicClient,
   connectedRecipient,
   safeAddress,
+  depositAddress,
   asset,
   defaultRecipient,
   defaultAmount,
@@ -361,6 +362,13 @@ function WithdrawFormStep({
       setError("Enter a valid recipient address");
       return;
     }
+    const lowerRecipient = recipient.toLowerCase();
+    if (lowerRecipient === safeAddress.toLowerCase() || lowerRecipient === _optionalChain([depositAddress, 'optionalAccess', _7 => _7.toLowerCase, 'call', _8 => _8()])) {
+      setError(
+        "Recipient can't be your own account. Send to a different wallet."
+      );
+      return;
+    }
     const parsed = Number(amount);
     if (!amount || !Number.isFinite(parsed) || parsed <= 0) {
       setError("Enter a valid amount");
@@ -388,7 +396,15 @@ function WithdrawFormStep({
     } finally {
       setIsSubmitting(false);
     }
-  }, [recipient, amount, balance, asset.decimals, onSubmit]);
+  }, [
+    recipient,
+    amount,
+    balance,
+    asset.decimals,
+    safeAddress,
+    depositAddress,
+    onSubmit
+  ]);
   if (isBalanceLoading) {
     return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen", children: [
       /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen-body rs-withdraw-loading", children: [
@@ -423,7 +439,7 @@ function WithdrawFormStep({
               onChange: (e) => {
                 const next = e.target.value.trim();
                 setRecipient(next);
-                _optionalChain([onRecipientChange, 'optionalCall', _7 => _7(next)]);
+                _optionalChain([onRecipientChange, 'optionalCall', _9 => _9(next)]);
                 if (error) setError(null);
               }
             }
@@ -703,7 +719,7 @@ function WithdrawReviewStep({
       const raw = err instanceof Error ? err.message : "Withdraw failed";
       const message = _chunkEDUWRMQIcjs.formatUserError.call(void 0, raw);
       setError(message);
-      _optionalChain([onError, 'optionalCall', _8 => _8(message, "WITHDRAW_REVIEW_ERROR")]);
+      _optionalChain([onError, 'optionalCall', _10 => _10(message, "WITHDRAW_REVIEW_ERROR")]);
     } finally {
       setIsSubmitting(false);
     }
@@ -799,7 +815,7 @@ function resolveSessionOwner(eoaAddress) {
 }
 function targetsEqual(a, b) {
   if (!a) return false;
-  return a.chain === b.chain && a.token.toLowerCase() === b.token.toLowerCase() && (_nullishCoalesce(_optionalChain([a, 'access', _9 => _9.recipient, 'optionalAccess', _10 => _10.toLowerCase, 'call', _11 => _11()]), () => ( ""))) === (_nullishCoalesce(_optionalChain([b, 'access', _12 => _12.recipient, 'optionalAccess', _13 => _13.toLowerCase, 'call', _14 => _14()]), () => ( "")));
+  return a.chain === b.chain && a.token.toLowerCase() === b.token.toLowerCase() && (_nullishCoalesce(_optionalChain([a, 'access', _11 => _11.recipient, 'optionalAccess', _12 => _12.toLowerCase, 'call', _13 => _13()]), () => ( ""))) === (_nullishCoalesce(_optionalChain([b, 'access', _14 => _14.recipient, 'optionalAccess', _15 => _15.toLowerCase, 'call', _16 => _16()]), () => ( "")));
 }
 function WithdrawFlow({
   dappWalletClient,
@@ -869,15 +885,15 @@ function WithdrawFlow({
   }, [defaultRecipient]);
   const hasCustomSigner = Boolean(dappAddress && onSignTransaction);
   const dappSwitchChain = _react.useMemo.call(void 0, () => {
-    if (!_optionalChain([dappWalletClient, 'optionalAccess', _15 => _15.switchChain])) return void 0;
+    if (!_optionalChain([dappWalletClient, 'optionalAccess', _17 => _17.switchChain])) return void 0;
     return async (chainId) => {
-      await _optionalChain([dappWalletClient, 'access', _16 => _16.switchChain, 'optionalCall', _17 => _17({ id: chainId })]);
+      await _optionalChain([dappWalletClient, 'access', _18 => _18.switchChain, 'optionalCall', _19 => _19({ id: chainId })]);
     };
   }, [dappWalletClient]);
   const walletOptions = _react.useMemo.call(void 0, () => {
     const options = [];
     const seen = /* @__PURE__ */ new Set();
-    if (_optionalChain([dappWalletClient, 'optionalAccess', _18 => _18.account]) && dappAddress) {
+    if (_optionalChain([dappWalletClient, 'optionalAccess', _20 => _20.account]) && dappAddress) {
       const id = `evm:${dappWalletClient.account.address.toLowerCase()}`;
       options.push({
         id,
@@ -887,7 +903,7 @@ function WithdrawFlow({
       });
       seen.add(id);
     }
-    if (_optionalChain([reownWallet, 'optionalAccess', _19 => _19.address]) && reownWallet.isConnected && reownWallet.walletClient && reownWallet.publicClient) {
+    if (_optionalChain([reownWallet, 'optionalAccess', _21 => _21.address]) && reownWallet.isConnected && reownWallet.walletClient && reownWallet.publicClient) {
       const id = `evm:${reownWallet.address.toLowerCase()}`;
       if (!seen.has(id)) {
         options.push({
@@ -903,13 +919,13 @@ function WithdrawFlow({
   }, [
     dappWalletClient,
     dappAddress,
-    _optionalChain([reownWallet, 'optionalAccess', _20 => _20.address]),
-    _optionalChain([reownWallet, 'optionalAccess', _21 => _21.isConnected]),
-    _optionalChain([reownWallet, 'optionalAccess', _22 => _22.walletClient]),
-    _optionalChain([reownWallet, 'optionalAccess', _23 => _23.publicClient]),
-    _optionalChain([reownWallet, 'optionalAccess', _24 => _24.icon])
+    _optionalChain([reownWallet, 'optionalAccess', _22 => _22.address]),
+    _optionalChain([reownWallet, 'optionalAccess', _23 => _23.isConnected]),
+    _optionalChain([reownWallet, 'optionalAccess', _24 => _24.walletClient]),
+    _optionalChain([reownWallet, 'optionalAccess', _25 => _25.publicClient]),
+    _optionalChain([reownWallet, 'optionalAccess', _26 => _26.icon])
   ]);
-  const canAutoLock = hasCustomSigner || Boolean(_optionalChain([dappWalletClient, 'optionalAccess', _25 => _25.account]) && dappAddress) && !reownWallet;
+  const canAutoLock = hasCustomSigner || Boolean(_optionalChain([dappWalletClient, 'optionalAccess', _27 => _27.account]) && dappAddress) && !reownWallet;
   const storeApi = useWithdrawStoreApi();
   const selectedWalletId = useWithdrawStore((s) => s.selectedWalletId);
   const registration = useWithdrawStore((s) => s.registration);
@@ -939,7 +955,7 @@ function WithdrawFlow({
     if (!isConnectSelectionConfirmed || !selectedWalletId) return null;
     const selectedOption = walletOptions.find((o) => o.id === selectedWalletId);
     if (!selectedOption || !selectedOption.address) return null;
-    if (selectedOption.kind === "connected" && _optionalChain([dappWalletClient, 'optionalAccess', _26 => _26.account]) && dappWalletClient.account.address.toLowerCase() === selectedOption.address.toLowerCase()) {
+    if (selectedOption.kind === "connected" && _optionalChain([dappWalletClient, 'optionalAccess', _28 => _28.account]) && dappWalletClient.account.address.toLowerCase() === selectedOption.address.toLowerCase()) {
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
@@ -947,7 +963,7 @@ function WithdrawFlow({
         switchChain: dappSwitchChain
       };
     }
-    if (selectedOption.kind === "external" && _optionalChain([reownWallet, 'optionalAccess', _27 => _27.address, 'optionalAccess', _28 => _28.toLowerCase, 'call', _29 => _29()]) === selectedOption.address.toLowerCase() && reownWallet.walletClient && reownWallet.publicClient) {
+    if (selectedOption.kind === "external" && _optionalChain([reownWallet, 'optionalAccess', _29 => _29.address, 'optionalAccess', _30 => _30.toLowerCase, 'call', _31 => _31()]) === selectedOption.address.toLowerCase() && reownWallet.walletClient && reownWallet.publicClient) {
       return {
         ownerAddress: reownWallet.address,
         walletClient: reownWallet.walletClient,
@@ -969,7 +985,7 @@ function WithdrawFlow({
     reownWallet,
     sourceChain
   ]);
-  const ownerAddress = _optionalChain([signerContext, 'optionalAccess', _30 => _30.ownerAddress]);
+  const ownerAddress = _optionalChain([signerContext, 'optionalAccess', _32 => _32.ownerAddress]);
   const recipientForRegistration = _react.useMemo.call(void 0, () => {
     if (!recipientInput) return void 0;
     return ADDR_REGEX.test(recipientInput) ? recipientInput : void 0;
@@ -1054,7 +1070,7 @@ function WithdrawFlow({
           smartAccount: setup.smartAccount,
           registeredTarget: desiredTarget
         });
-        _optionalChain([onLifecycleRef, 'access', _31 => _31.current, 'optionalCall', _32 => _32({
+        _optionalChain([onLifecycleRef, 'access', _33 => _33.current, 'optionalCall', _34 => _34({
           type: "connected",
           address: ownerAddress,
           smartAccount: setup.smartAccount
@@ -1072,7 +1088,7 @@ function WithdrawFlow({
           type: "registration/failed",
           error: message
         });
-        _optionalChain([onErrorRef, 'access', _33 => _33.current, 'optionalCall', _34 => _34({ message, code: "WITHDRAW_REGISTER_FAILED" })]);
+        _optionalChain([onErrorRef, 'access', _35 => _35.current, 'optionalCall', _36 => _36({ message, code: "WITHDRAW_REGISTER_FAILED" })]);
       }
     }, REGISTRATION_DEBOUNCE_MS);
     return () => {
@@ -1119,7 +1135,7 @@ function WithdrawFlow({
     storeApi.dispatch({ type: "review/back" });
   }, [storeApi]);
   _react.useEffect.call(void 0, () => {
-    _optionalChain([onStepChangeRef, 'access', _35 => _35.current, 'optionalCall', _36 => _36(
+    _optionalChain([onStepChangeRef, 'access', _37 => _37.current, 'optionalCall', _38 => _38(
       flowStep === "review" ? reviewBackHandler : void 0
     )]);
   }, [flowStep, reviewBackHandler, onStepChangeRef]);
@@ -1133,7 +1149,7 @@ function WithdrawFlow({
     lastStepOpenEventKeyRef.current = "form";
     const tokenSymbol = _chunkABVRVW3Pcjs.getTokenSymbol.call(void 0, targetToken, targetChain);
     const chainName = _chunkABVRVW3Pcjs.getChainName.call(void 0, targetChain);
-    _optionalChain([onEventRef, 'access', _37 => _37.current, 'optionalCall', _38 => _38({
+    _optionalChain([onEventRef, 'access', _39 => _39.current, 'optionalCall', _40 => _40({
       type: "withdraw_modal_select_amount_open",
       pred_balance: totalBalanceUsd,
       default_token: tokenSymbol,
@@ -1163,7 +1179,7 @@ function WithdrawFlow({
   const handleError = _react.useCallback.call(void 0, 
     (message, code) => {
       logFlowError("flow:error", message, { code });
-      _optionalChain([onErrorRef, 'access', _39 => _39.current, 'optionalCall', _40 => _40({ message, code })]);
+      _optionalChain([onErrorRef, 'access', _41 => _41.current, 'optionalCall', _42 => _42({ message, code })]);
     },
     [logFlowError, onErrorRef]
   );
@@ -1171,7 +1187,7 @@ function WithdrawFlow({
     (recipient, amountValue) => {
       const tokenSymbol = _chunkABVRVW3Pcjs.getTokenSymbol.call(void 0, targetToken, targetChain);
       const chainName = _chunkABVRVW3Pcjs.getChainName.call(void 0, targetChain);
-      _optionalChain([onEventRef, 'access', _41 => _41.current, 'optionalCall', _42 => _42({
+      _optionalChain([onEventRef, 'access', _43 => _43.current, 'optionalCall', _44 => _44({
         type: "withdraw_modal_select_amount_cta_click",
         pred_balance: totalBalanceUsd,
         selected_token: tokenSymbol,
@@ -1209,7 +1225,13 @@ function WithdrawFlow({
         throw new Error("Withdrawal target is still being prepared");
       }
       const smartAccount = matchingRegistration.smartAccount;
-      if (!onSignTransaction && !_optionalChain([signerContext, 'optionalAccess', _43 => _43.walletClient])) {
+      const lowerRecipient = recipient.toLowerCase();
+      if (lowerRecipient === safeAddress.toLowerCase() || lowerRecipient === smartAccount.toLowerCase()) {
+        throw new Error(
+          "Recipient can't be your own account. Send to a different wallet."
+        );
+      }
+      if (!onSignTransaction && !_optionalChain([signerContext, 'optionalAccess', _45 => _45.walletClient])) {
         throw new Error("Wallet not connected");
       }
       const submitGeneration = submitGenerationRef.current += 1;
@@ -1232,7 +1254,7 @@ function WithdrawFlow({
           targetToken
         });
         const amountUnits = _viem.parseUnits.call(void 0, amountValue, asset.decimals);
-        const pc = _nullishCoalesce(_optionalChain([signerContext, 'optionalAccess', _44 => _44.publicClient]), () => ( _chunkEDUWRMQIcjs.getPublicClient.call(void 0, sourceChain)));
+        const pc = _nullishCoalesce(_optionalChain([signerContext, 'optionalAccess', _46 => _46.publicClient]), () => ( _chunkEDUWRMQIcjs.getPublicClient.call(void 0, sourceChain)));
         let result;
         if (onSignTransaction) {
           const transferTarget = isSameRoute ? recipient : smartAccount;
@@ -1304,7 +1326,7 @@ function WithdrawFlow({
           sourceChain,
           sourceToken
         });
-        _optionalChain([onLifecycleRef, 'access', _45 => _45.current, 'optionalCall', _46 => _46({
+        _optionalChain([onLifecycleRef, 'access', _47 => _47.current, 'optionalCall', _48 => _48({
           type: "submitted",
           txHash: result.txHash,
           sourceChain,
@@ -1346,7 +1368,7 @@ function WithdrawFlow({
   const handleWithdrawComplete = _react.useCallback.call(void 0, 
     (txHash, destinationTxHash, context) => {
       logFlow("withdraw:complete", { txHash, destinationTxHash, ...context });
-      _optionalChain([onLifecycleRef, 'access', _47 => _47.current, 'optionalCall', _48 => _48({
+      _optionalChain([onLifecycleRef, 'access', _49 => _49.current, 'optionalCall', _50 => _50({
         type: "complete",
         txHash,
         destinationTxHash,
@@ -1367,7 +1389,7 @@ function WithdrawFlow({
   const handleWithdrawFailed = _react.useCallback.call(void 0, 
     (txHash, error) => {
       logFlowError("withdraw:failed", error, { txHash });
-      _optionalChain([onLifecycleRef, 'access', _49 => _49.current, 'optionalCall', _50 => _50({
+      _optionalChain([onLifecycleRef, 'access', _51 => _51.current, 'optionalCall', _52 => _52({
         type: "failed",
         txHash,
         error
@@ -1377,12 +1399,12 @@ function WithdrawFlow({
     [logFlowError, onLifecycleRef, storeApi]
   );
   const allowedChainSet = _react.useMemo.call(void 0, 
-    () => _optionalChain([allowedRoutes, 'optionalAccess', _51 => _51.sourceChains]) ? new Set(allowedRoutes.sourceChains) : null,
-    [_optionalChain([allowedRoutes, 'optionalAccess', _52 => _52.sourceChains])]
+    () => _optionalChain([allowedRoutes, 'optionalAccess', _53 => _53.sourceChains]) ? new Set(allowedRoutes.sourceChains) : null,
+    [_optionalChain([allowedRoutes, 'optionalAccess', _54 => _54.sourceChains])]
   );
   const allowedTokenSet = _react.useMemo.call(void 0, 
-    () => _optionalChain([allowedRoutes, 'optionalAccess', _53 => _53.sourceTokens]) ? new Set(allowedRoutes.sourceTokens.map((s) => s.toUpperCase())) : null,
-    [_optionalChain([allowedRoutes, 'optionalAccess', _54 => _54.sourceTokens])]
+    () => _optionalChain([allowedRoutes, 'optionalAccess', _55 => _55.sourceTokens]) ? new Set(allowedRoutes.sourceTokens.map((s) => s.toUpperCase())) : null,
+    [_optionalChain([allowedRoutes, 'optionalAccess', _56 => _56.sourceTokens])]
   );
   const targetChainOptions = _react.useMemo.call(void 0, () => {
     return _chunkABVRVW3Pcjs.SOURCE_CHAINS.filter((chain) => {
@@ -1445,10 +1467,10 @@ function WithdrawFlow({
   const selectedWalletIcon = _react.useMemo.call(void 0, () => {
     if (!ownerAddress) return void 0;
     const selected = walletOptions.find(
-      (o) => _optionalChain([o, 'access', _55 => _55.address, 'optionalAccess', _56 => _56.toLowerCase, 'call', _57 => _57()]) === ownerAddress.toLowerCase()
+      (o) => _optionalChain([o, 'access', _57 => _57.address, 'optionalAccess', _58 => _58.toLowerCase, 'call', _59 => _59()]) === ownerAddress.toLowerCase()
     );
-    return _optionalChain([selected, 'optionalAccess', _58 => _58.kind]) === "external" ? _nullishCoalesce(selected.icon, () => ( _optionalChain([reownWallet, 'optionalAccess', _59 => _59.icon]))) : void 0;
-  }, [walletOptions, ownerAddress, _optionalChain([reownWallet, 'optionalAccess', _60 => _60.icon])]);
+    return _optionalChain([selected, 'optionalAccess', _60 => _60.kind]) === "external" ? _nullishCoalesce(selected.icon, () => ( _optionalChain([reownWallet, 'optionalAccess', _61 => _61.icon]))) : void 0;
+  }, [walletOptions, ownerAddress, _optionalChain([reownWallet, 'optionalAccess', _62 => _62.icon])]);
   if (showConnectStep) {
     const withdrawRows = walletOptions.map((option) => ({
       id: option.id,
@@ -1476,8 +1498,9 @@ function WithdrawFlow({
   }
   if (!signerContext) return null;
   if (!onSignTransaction && !signerContext.walletClient) return null;
-  const resolvedConnectedRecipient = _optionalChain([selectedWalletOption, 'optionalAccess', _61 => _61.kind]) === "external" ? selectedWalletOption.address : void 0;
+  const resolvedConnectedRecipient = _optionalChain([selectedWalletOption, 'optionalAccess', _63 => _63.kind]) === "external" ? selectedWalletOption.address : void 0;
   const formPublicClient = _nullishCoalesce(signerContext.publicClient, () => ( _chunkEDUWRMQIcjs.getPublicClient.call(void 0, sourceChain)));
+  const depositAddress = registration.kind === "ready" || registration.kind === "stale" ? registration.smartAccount : void 0;
   const stepView = deriveStepView(flowStep, registration);
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-modal-body", children: [
     stepView === "form" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
@@ -1487,6 +1510,7 @@ function WithdrawFlow({
         publicClient: formPublicClient,
         connectedRecipient: resolvedConnectedRecipient,
         safeAddress,
+        depositAddress,
         asset,
         defaultRecipient,
         defaultAmount,
@@ -1564,7 +1588,7 @@ function deriveStepView(step, _registration) {
 // src/WithdrawModal.tsx
 
 var ReownWithdrawInner = _react.lazy.call(void 0, 
-  () => Promise.resolve().then(() => _interopRequireWildcard(require("./WithdrawModalReown-AZ27OBAV.cjs"))).then((m) => ({
+  () => Promise.resolve().then(() => _interopRequireWildcard(require("./WithdrawModalReown-KKGW62YO.cjs"))).then((m) => ({
     default: m.WithdrawModalReown
   }))
 );
@@ -1625,7 +1649,7 @@ function WithdrawModalInner({
   const onErrorRef = _chunkEDUWRMQIcjs.useLatestRef.call(void 0, onError);
   _react.useEffect.call(void 0, () => {
     if (isOpen && onSignTransaction && !dappAddress) {
-      _optionalChain([onErrorRef, 'access', _62 => _62.current, 'optionalCall', _63 => _63({
+      _optionalChain([onErrorRef, 'access', _64 => _64.current, 'optionalCall', _65 => _65({
         message: "WithdrawModal requires `dappAddress` when `onSignTransaction` is provided.",
         code: "WITHDRAW_MISSING_DAPP_ADDRESS"
       })]);
@@ -1638,7 +1662,7 @@ function WithdrawModalInner({
   }, [isOpen, theme]);
   _react.useEffect.call(void 0, () => {
     if (isOpen) {
-      _optionalChain([onReadyRef, 'access', _64 => _64.current, 'optionalCall', _65 => _65()]);
+      _optionalChain([onReadyRef, 'access', _66 => _66.current, 'optionalCall', _67 => _67()]);
     }
   }, [isOpen, onReadyRef]);
   _react.useEffect.call(void 0, () => {
@@ -1649,7 +1673,7 @@ function WithdrawModalInner({
   const handleStepChange = _react.useCallback.call(void 0, (onBack) => {
     setBackHandler(() => onBack);
   }, []);
-  const showBackButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _66 => _66.showBackButton]), () => ( true));
+  const showBackButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _68 => _68.showBackButton]), () => ( true));
   const canGoBack = backHandler !== void 0;
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, WithdrawStoreProvider, { store, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
     _chunkEDUWRMQIcjs.Modal,

package/dist/{chunk-7JVBUMFE.mjs → chunk-IDJBMNV2.mjs}

@@ -200,6 +200,7 @@ function WithdrawFormStep({
   publicClient,
   connectedRecipient,
   safeAddress,
+  depositAddress,
   asset,
   defaultRecipient,
   defaultAmount,
@@ -361,6 +362,13 @@ function WithdrawFormStep({
       setError("Enter a valid recipient address");
       return;
     }
+    const lowerRecipient = recipient.toLowerCase();
+    if (lowerRecipient === safeAddress.toLowerCase() || lowerRecipient === depositAddress?.toLowerCase()) {
+      setError(
+        "Recipient can't be your own account. Send to a different wallet."
+      );
+      return;
+    }
     const parsed = Number(amount);
     if (!amount || !Number.isFinite(parsed) || parsed <= 0) {
       setError("Enter a valid amount");
@@ -388,7 +396,15 @@ function WithdrawFormStep({
     } finally {
       setIsSubmitting(false);
     }
-  }, [recipient, amount, balance, asset.decimals, onSubmit]);
+  }, [
+    recipient,
+    amount,
+    balance,
+    asset.decimals,
+    safeAddress,
+    depositAddress,
+    onSubmit
+  ]);
   if (isBalanceLoading) {
     return /* @__PURE__ */ jsxs("div", { className: "rs-screen", children: [
       /* @__PURE__ */ jsxs("div", { className: "rs-screen-body rs-withdraw-loading", children: [
@@ -1209,6 +1225,12 @@ function WithdrawFlow({
         throw new Error("Withdrawal target is still being prepared");
       }
       const smartAccount = matchingRegistration.smartAccount;
+      const lowerRecipient = recipient.toLowerCase();
+      if (lowerRecipient === safeAddress.toLowerCase() || lowerRecipient === smartAccount.toLowerCase()) {
+        throw new Error(
+          "Recipient can't be your own account. Send to a different wallet."
+        );
+      }
       if (!onSignTransaction && !signerContext?.walletClient) {
         throw new Error("Wallet not connected");
       }
@@ -1478,6 +1500,7 @@ function WithdrawFlow({
   if (!onSignTransaction && !signerContext.walletClient) return null;
   const resolvedConnectedRecipient = selectedWalletOption?.kind === "external" ? selectedWalletOption.address : void 0;
   const formPublicClient = signerContext.publicClient ?? getPublicClient(sourceChain);
+  const depositAddress = registration.kind === "ready" || registration.kind === "stale" ? registration.smartAccount : void 0;
   const stepView = deriveStepView(flowStep, registration);
   return /* @__PURE__ */ jsxs3("div", { className: "rs-modal-body", children: [
     stepView === "form" && /* @__PURE__ */ jsx3(
@@ -1487,6 +1510,7 @@ function WithdrawFlow({
         publicClient: formPublicClient,
         connectedRecipient: resolvedConnectedRecipient,
         safeAddress,
+        depositAddress,
         asset,
         defaultRecipient,
         defaultAmount,
@@ -1564,7 +1588,7 @@ function deriveStepView(step, _registration) {
 // src/WithdrawModal.tsx
 import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
 var ReownWithdrawInner = lazy(
-  () => import("./WithdrawModalReown-L4SWLONE.mjs").then((m) => ({
+  () => import("./WithdrawModalReown-XPB53FKZ.mjs").then((m) => ({
     default: m.WithdrawModalReown
   }))
 );

package/dist/index.cjs

@@ -4,7 +4,7 @@ var _chunk36R7XKXPcjs = require('./chunk-36R7XKXP.cjs');
 require('./chunk-NRNJAQUA.cjs');
 
 
-var _chunkPNN2YBPFcjs = require('./chunk-PNN2YBPF.cjs');
+var _chunk3NZUMDSTcjs = require('./chunk-3NZUMDST.cjs');
 require('./chunk-EDUWRMQI.cjs');
 require('./chunk-UEKPBRBY.cjs');
 
@@ -85,4 +85,4 @@ async function disconnectWallet() {
 
 
 
-exports.CHAIN_BY_ID = _chunkABVRVW3Pcjs.CHAIN_BY_ID; exports.DEFAULT_BACKEND_URL = _chunkABVRVW3Pcjs.DEFAULT_BACKEND_URL; exports.DEFAULT_SIGNER_ADDRESS = _chunkABVRVW3Pcjs.DEFAULT_SIGNER_ADDRESS; exports.DepositModal = _chunk36R7XKXPcjs.DepositModal; exports.HYPERCORE_CHAIN_ID = _chunkABVRVW3Pcjs.HYPERCORE_CHAIN_ID; exports.HYPERCORE_USDC_ADDRESS = _chunkABVRVW3Pcjs.HYPERCORE_USDC_ADDRESS; exports.NATIVE_TOKEN_ADDRESS = _chunkABVRVW3Pcjs.NATIVE_TOKEN_ADDRESS; exports.SOURCE_CHAINS = _chunkABVRVW3Pcjs.SOURCE_CHAINS; exports.SUPPORTED_CHAINS = _chunkABVRVW3Pcjs.SUPPORTED_CHAINS; exports.WithdrawModal = _chunkPNN2YBPFcjs.WithdrawModal; exports.chainRegistry = _chunkABVRVW3Pcjs.chainRegistry; exports.disconnectWallet = disconnectWallet; exports.findChainIdForToken = _chunkABVRVW3Pcjs.findChainIdForToken; exports.getChainBadge = _chunkABVRVW3Pcjs.getChainBadge; exports.getChainIcon = _chunkABVRVW3Pcjs.getChainIcon; exports.getChainId = _chunkABVRVW3Pcjs.getChainId; exports.getChainName = _chunkABVRVW3Pcjs.getChainName; exports.getChainObject = _chunkABVRVW3Pcjs.getChainObject; exports.getExplorerName = _chunkABVRVW3Pcjs.getExplorerName; exports.getExplorerTxUrl = _chunkABVRVW3Pcjs.getExplorerTxUrl; exports.getExplorerUrl = _chunkABVRVW3Pcjs.getExplorerUrl; exports.getSupportedChainIds = _chunkABVRVW3Pcjs.getSupportedChainIds; exports.getSupportedTargetTokens = _chunkABVRVW3Pcjs.getSupportedTargetTokens; exports.getSupportedTokenSymbolsForChain = _chunkABVRVW3Pcjs.getSupportedTokenSymbolsForChain; exports.getTargetTokenSymbolsForChain = _chunkABVRVW3Pcjs.getTargetTokenSymbolsForChain; exports.getTokenAddress = _chunkABVRVW3Pcjs.getTokenAddress; exports.getTokenDecimals = _chunkABVRVW3Pcjs.getTokenDecimals; exports.getTokenDecimalsByAddress = _chunkABVRVW3Pcjs.getTokenDecimalsByAddress; exports.getTokenIcon = _chunkABVRVW3Pcjs.getTokenIcon; exports.getTokenSymbol = _chunkABVRVW3Pcjs.getTokenSymbol; exports.getUsdcAddress = _chunkABVRVW3Pcjs.getUsdcAddress; exports.getUsdcDecimals = _chunkABVRVW3Pcjs.getUsdcDecimals; exports.isSupportedTokenAddressForChain = _chunkABVRVW3Pcjs.isSupportedTokenAddressForChain;
+exports.CHAIN_BY_ID = _chunkABVRVW3Pcjs.CHAIN_BY_ID; exports.DEFAULT_BACKEND_URL = _chunkABVRVW3Pcjs.DEFAULT_BACKEND_URL; exports.DEFAULT_SIGNER_ADDRESS = _chunkABVRVW3Pcjs.DEFAULT_SIGNER_ADDRESS; exports.DepositModal = _chunk36R7XKXPcjs.DepositModal; exports.HYPERCORE_CHAIN_ID = _chunkABVRVW3Pcjs.HYPERCORE_CHAIN_ID; exports.HYPERCORE_USDC_ADDRESS = _chunkABVRVW3Pcjs.HYPERCORE_USDC_ADDRESS; exports.NATIVE_TOKEN_ADDRESS = _chunkABVRVW3Pcjs.NATIVE_TOKEN_ADDRESS; exports.SOURCE_CHAINS = _chunkABVRVW3Pcjs.SOURCE_CHAINS; exports.SUPPORTED_CHAINS = _chunkABVRVW3Pcjs.SUPPORTED_CHAINS; exports.WithdrawModal = _chunk3NZUMDSTcjs.WithdrawModal; exports.chainRegistry = _chunkABVRVW3Pcjs.chainRegistry; exports.disconnectWallet = disconnectWallet; exports.findChainIdForToken = _chunkABVRVW3Pcjs.findChainIdForToken; exports.getChainBadge = _chunkABVRVW3Pcjs.getChainBadge; exports.getChainIcon = _chunkABVRVW3Pcjs.getChainIcon; exports.getChainId = _chunkABVRVW3Pcjs.getChainId; exports.getChainName = _chunkABVRVW3Pcjs.getChainName; exports.getChainObject = _chunkABVRVW3Pcjs.getChainObject; exports.getExplorerName = _chunkABVRVW3Pcjs.getExplorerName; exports.getExplorerTxUrl = _chunkABVRVW3Pcjs.getExplorerTxUrl; exports.getExplorerUrl = _chunkABVRVW3Pcjs.getExplorerUrl; exports.getSupportedChainIds = _chunkABVRVW3Pcjs.getSupportedChainIds; exports.getSupportedTargetTokens = _chunkABVRVW3Pcjs.getSupportedTargetTokens; exports.getSupportedTokenSymbolsForChain = _chunkABVRVW3Pcjs.getSupportedTokenSymbolsForChain; exports.getTargetTokenSymbolsForChain = _chunkABVRVW3Pcjs.getTargetTokenSymbolsForChain; exports.getTokenAddress = _chunkABVRVW3Pcjs.getTokenAddress; exports.getTokenDecimals = _chunkABVRVW3Pcjs.getTokenDecimals; exports.getTokenDecimalsByAddress = _chunkABVRVW3Pcjs.getTokenDecimalsByAddress; exports.getTokenIcon = _chunkABVRVW3Pcjs.getTokenIcon; exports.getTokenSymbol = _chunkABVRVW3Pcjs.getTokenSymbol; exports.getUsdcAddress = _chunkABVRVW3Pcjs.getUsdcAddress; exports.getUsdcDecimals = _chunkABVRVW3Pcjs.getUsdcDecimals; exports.isSupportedTokenAddressForChain = _chunkABVRVW3Pcjs.isSupportedTokenAddressForChain;

package/dist/index.mjs

@@ -4,7 +4,7 @@ import {
 import "./chunk-FJWLC4AM.mjs";
 import {
   WithdrawModal
-} from "./chunk-7JVBUMFE.mjs";
+} from "./chunk-IDJBMNV2.mjs";
 import "./chunk-7EQQD7B4.mjs";
 import "./chunk-F7P4MV72.mjs";
 import {

package/dist/withdraw.cjs

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkPNN2YBPFcjs = require('./chunk-PNN2YBPF.cjs');
+var _chunk3NZUMDSTcjs = require('./chunk-3NZUMDST.cjs');
 require('./chunk-EDUWRMQI.cjs');
 require('./chunk-UEKPBRBY.cjs');
 require('./chunk-ABVRVW3P.cjs');
 
 
-exports.WithdrawModal = _chunkPNN2YBPFcjs.WithdrawModal;
+exports.WithdrawModal = _chunk3NZUMDSTcjs.WithdrawModal;

package/dist/withdraw.mjs

@@ -1,6 +1,6 @@
 import {
   WithdrawModal
-} from "./chunk-7JVBUMFE.mjs";
+} from "./chunk-IDJBMNV2.mjs";
 import "./chunk-7EQQD7B4.mjs";
 import "./chunk-F7P4MV72.mjs";
 import "./chunk-WJX3TJFK.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhinestone/deposit-modal",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "React modal component for Rhinestone cross-chain deposits",
   "author": "Rhinestone <dev@rhinestone.wtf>",
   "bugs": {