@rhinestone/deposit-modal 0.8.1 → 0.9.0

package/dist/{chunk-T43VUEJH.mjs → chunk-E4G5BOZP.mjs}

@@ -1,24 +1,27 @@
+import {
+  ProcessingStep,
+  deriveAccountSalt,
+  getPublicClient,
+  useTokenPrices,
+  warnRemovedProps
+} from "./chunk-WYXBY2MQ.mjs";
 import {
   BodyHeader,
   Button,
   Callout,
+  CdnIcon,
   ChevronDownIcon,
   ChevronLeftIcon,
   CircleArrowOutUpLeftIcon,
   CloseIcon,
-  ConnectStep,
   Modal,
   PoweredBy,
-  ProcessingStep,
   RpcUrlsProvider,
   Spinner,
   TokenIcon,
-  WalletIcon,
-  accountFromPrivateKey,
   applyTheme,
-  buildSessionDetails,
+  checkBackendUrl,
   createDepositService,
-  createSessionOwnerKey,
   currencyFormatter,
   debugError,
   debugLog,
@@ -26,24 +29,13 @@ import {
   formatTokenAmount,
   formatUserError,
   getAssetId,
-  getPublicClient,
   isNativeAsset,
   isRecognizedToken,
-  loadSessionOwnerFromStorage,
-  saveSessionOwnerToStorage,
   useLatestRef,
   useRpcUrls,
-  useStableRpcUrls,
-  useTokenPrices
-} from "./chunk-NASHLEVQ.mjs";
-import {
-  buildSafeTransaction,
-  executeSafeErc20Transfer,
-  executeSafeEthTransfer
-} from "./chunk-WK5AFRSP.mjs";
+  useStableRpcUrls
+} from "./chunk-VOGZAZB2.mjs";
 import {
-  DEFAULT_BACKEND_URL,
-  DEFAULT_SIGNER_ADDRESS,
   NATIVE_TOKEN_ADDRESS,
   SOURCE_CHAINS,
   getChainIcon,
@@ -52,19 +44,11 @@ import {
   getSupportedTargetTokens,
   getTokenDecimalsByAddress,
   getTokenSymbol,
-  toEvmCaip2
-} from "./chunk-O5OKA27M.mjs";
+  targetChainToCaip2
+} from "./chunk-A223BLVC.mjs";
 
 // src/WithdrawModal.tsx
-import {
-  useCallback as useCallback3,
-  useEffect as useEffect3,
-  useMemo as useMemo3,
-  useRef as useRef3,
-  useState as useState4,
-  lazy,
-  Suspense
-} from "react";
+import { useCallback as useCallback3, useEffect as useEffect3, useMemo as useMemo3, useRef as useRef3, useState as useState4 } from "react";
 
 // src/WithdrawFlow.tsx
 import { useCallback as useCallback2, useEffect as useEffect2, useMemo as useMemo2, useRef as useRef2, useState as useState3 } from "react";
@@ -80,8 +64,6 @@ function unreachable(action) {
 }
 function applyWithdrawAction(state, action) {
   switch (action.type) {
-    case "wallet/id-selected":
-      return { ...state, selectedWalletId: action.walletId };
     case "registration/started":
       return {
         ...state,
@@ -99,7 +81,7 @@ function applyWithdrawAction(state, action) {
           smartAccount: action.smartAccount,
           registeredTarget: action.registeredTarget
         },
-        step: state.step === "connect" ? "form" : state.step
+        step: state.step
       };
     case "registration/failed":
       return {
@@ -116,7 +98,15 @@ function applyWithdrawAction(state, action) {
     case "review/back":
       return { ...state, step: "form" };
     case "withdraw/submitted":
-      return { ...state, txHash: action.txHash, step: "processing" };
+      return {
+        ...state,
+        txHash: action.txHash,
+        processingSmartAccount: action.smartAccount,
+        processingTargetChain: action.targetChain,
+        processingTargetToken: action.targetToken,
+        processingDirectTransfer: action.directTransfer,
+        step: "processing"
+      };
     case "withdraw/complete":
       return { ...state, step: "complete" };
     case "withdraw/failed":
@@ -127,17 +117,24 @@ function applyWithdrawAction(state, action) {
         step: "form",
         amount: null,
         recipient: null,
-        txHash: null
+        txHash: null,
+        processingSmartAccount: null,
+        processingTargetChain: null,
+        processingTargetToken: null,
+        processingDirectTransfer: null
       };
     case "modal/reset":
       return {
         ...state,
-        step: "connect",
-        selectedWalletId: null,
+        step: "form",
         registration: { kind: "idle" },
         amount: null,
         recipient: null,
-        txHash: null
+        txHash: null,
+        processingSmartAccount: null,
+        processingTargetChain: null,
+        processingTargetToken: null,
+        processingDirectTransfer: null
       };
     default:
       return unreachable(action);
@@ -145,12 +142,15 @@ function applyWithdrawAction(state, action) {
 }
 function createWithdrawStore() {
   const store = createStore(() => ({
-    step: "connect",
-    selectedWalletId: null,
+    step: "form",
     registration: { kind: "idle" },
     amount: null,
     recipient: null,
-    txHash: null
+    txHash: null,
+    processingSmartAccount: null,
+    processingTargetChain: null,
+    processingTargetToken: null,
+    processingDirectTransfer: null
   }));
   return {
     ...store,
@@ -187,7 +187,7 @@ function useWithdrawStore(selector) {
 // src/components/steps/WithdrawFormStep.tsx
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { erc20Abi, formatUnits, parseUnits } from "viem";
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
 function useClickOutside(ref, onClose) {
   useEffect(() => {
     function handleClick(e) {
@@ -200,10 +200,8 @@ function useClickOutside(ref, onClose) {
   }, [ref, onClose]);
 }
 function WithdrawFormStep({
-  walletClient,
   publicClient,
-  connectedRecipient,
-  safeAddress,
+  accountAddress,
   depositAddress,
   asset,
   defaultRecipient,
@@ -214,8 +212,6 @@ function WithdrawFormStep({
   targetTokenOptions,
   onTargetChainChange,
   onTargetTokenChange,
-  switchChain,
-  walletIcon,
   submitting = false,
   registrationPending = false,
   registrationError = null,
@@ -228,23 +224,14 @@ function WithdrawFormStep({
   const [balance, setBalance] = useState(null);
   const [isBalanceLoading, setIsBalanceLoading] = useState(true);
   const [error, setError] = useState(null);
-  const [isSwitching, setIsSwitching] = useState(false);
   const [showChainDropdown, setShowChainDropdown] = useState(false);
   const [showTokenDropdown, setShowTokenDropdown] = useState(false);
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const hasAttemptedSwitch = useRef(false);
   const chainDropdownRef = useRef(null);
   const tokenDropdownRef = useRef(null);
   const publicClientChainId = publicClient.chain?.id;
   useClickOutside(chainDropdownRef, () => setShowChainDropdown(false));
   useClickOutside(tokenDropdownRef, () => setShowTokenDropdown(false));
-  const preferredConnectedRecipient = connectedRecipient ?? "";
-  const isRecipientConnected = Boolean(
-    preferredConnectedRecipient && recipient && recipient.toLowerCase() === preferredConnectedRecipient.toLowerCase()
-  );
-  const chainMismatch = Boolean(
-    walletClient?.chain?.id && walletClient.chain.id !== asset.chainId
-  );
   const targetSymbol = getTokenSymbol(targetToken, targetChain);
   const targetChainName = getChainName(targetChain);
   const isBusy = submitting || isSubmitting;
@@ -259,37 +246,22 @@ function WithdrawFormStep({
     });
     seededRecipientRef.current = nextSeed;
   }, [defaultRecipient]);
-  useEffect(() => {
-    if (chainMismatch && switchChain && !hasAttemptedSwitch.current) {
-      hasAttemptedSwitch.current = true;
-      setIsSwitching(true);
-      switchChain(asset.chainId).catch((err) => {
-        const raw = err instanceof Error ? err.message : "Failed to switch chain";
-        setError(formatUserError(raw));
-      }).finally(() => {
-        setIsSwitching(false);
-      });
-    }
-  }, [chainMismatch, switchChain, asset.chainId]);
-  useEffect(() => {
-    hasAttemptedSwitch.current = false;
-  }, [asset.chainId]);
   useEffect(() => {
     let active = true;
     let timeoutId;
     let retryDelayMs = 5e3;
     async function fetchBalance() {
-      if (!safeAddress || !publicClient) return;
+      if (!accountAddress || !publicClient) return;
       if (publicClientChainId && publicClientChainId !== asset.chainId) {
         timeoutId = setTimeout(fetchBalance, 1e3);
         return;
       }
       try {
-        const bal = isNativeAsset(asset) ? await publicClient.getBalance({ address: safeAddress }) : await publicClient.readContract({
+        const bal = isNativeAsset(asset) ? await publicClient.getBalance({ address: accountAddress }) : await publicClient.readContract({
           address: asset.token,
           abi: erc20Abi,
           functionName: "balanceOf",
-          args: [safeAddress]
+          args: [accountAddress]
         });
         if (active) {
           setBalance(bal);
@@ -312,7 +284,7 @@ function WithdrawFormStep({
         clearTimeout(timeoutId);
       }
     };
-  }, [safeAddress, publicClient, publicClientChainId, asset]);
+  }, [accountAddress, publicClient, publicClientChainId, asset]);
   const formattedBalance = useMemo(() => {
     if (balance === null) return "...";
     try {
@@ -355,19 +327,13 @@ function WithdrawFormStep({
     setAmount(maxAmount);
     setError(null);
   }, [balance, asset.decimals]);
-  const handleUseConnected = useCallback(() => {
-    if (!preferredConnectedRecipient) return;
-    setRecipient(preferredConnectedRecipient);
-    onRecipientChange?.(preferredConnectedRecipient);
-    setError(null);
-  }, [preferredConnectedRecipient, onRecipientChange]);
   const handleWithdraw = useCallback(async () => {
     if (!recipient || !/^0x[a-fA-F0-9]{40}$/.test(recipient)) {
       setError("Enter a valid recipient address");
       return;
     }
     const lowerRecipient = recipient.toLowerCase();
-    if (lowerRecipient === safeAddress.toLowerCase() || lowerRecipient === depositAddress?.toLowerCase()) {
+    if (lowerRecipient === accountAddress.toLowerCase() || lowerRecipient === depositAddress?.toLowerCase()) {
       setError(
         "Recipient can't be your own account. Send to a different wallet."
       );
@@ -405,7 +371,7 @@ function WithdrawFormStep({
     amount,
     balance,
     asset.decimals,
-    safeAddress,
+    accountAddress,
     depositAddress,
     onSubmit
   ]);
@@ -414,7 +380,7 @@ function WithdrawFormStep({
       /* @__PURE__ */ jsxs("div", { className: "rs-screen-body rs-withdraw-loading", children: [
         /* @__PURE__ */ jsx(Spinner, { className: "rs-spinner--lg" }),
         /* @__PURE__ */ jsx("div", { className: "rs-withdraw-loading-title", children: "Loading on-chain balance" }),
-        /* @__PURE__ */ jsx("div", { className: "rs-withdraw-loading-subtitle", children: chainMismatch ? `Switch to ${getChainName(asset.chainId)} to continue.` : "Please wait before withdrawing." })
+        /* @__PURE__ */ jsx("div", { className: "rs-withdraw-loading-subtitle", children: "Please wait before withdrawing." })
       ] }),
       /* @__PURE__ */ jsx(PoweredBy, {})
     ] });
@@ -431,48 +397,22 @@ function WithdrawFormStep({
             children: "Recipient address"
           }
         ),
-        /* @__PURE__ */ jsxs("div", { className: "rs-withdraw-input-row", children: [
-          /* @__PURE__ */ jsx(
-            "input",
-            {
-              id: "rs-withdraw-recipient",
-              type: "text",
-              className: "rs-withdraw-input rs-withdraw-input--address",
-              placeholder: "0x...",
-              value: recipient,
-              onChange: (e) => {
-                const next = e.target.value.trim();
-                setRecipient(next);
-                onRecipientChange?.(next);
-                if (error) setError(null);
-              }
-            }
-          ),
-          preferredConnectedRecipient && /* @__PURE__ */ jsx(
-            "button",
-            {
-              type: "button",
-              className: `rs-withdraw-use-connected ${isRecipientConnected ? "rs-withdraw-use-connected--active" : ""}`,
-              onClick: handleUseConnected,
-              title: isRecipientConnected ? "Using connected wallet" : "Use connected wallet",
-              children: walletIcon ? /* @__PURE__ */ jsxs(Fragment, { children: [
-                /* @__PURE__ */ jsx(
-                  "img",
-                  {
-                    src: walletIcon,
-                    alt: "Wallet",
-                    style: { width: 18, height: 18, borderRadius: 4 },
-                    className: "rs-withdraw-use-connected-icon"
-                  }
-                ),
-                isRecipientConnected ? null : "Use connected"
-              ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
-                /* @__PURE__ */ jsx(WalletIcon, { className: "rs-withdraw-use-connected-icon" }),
-                isRecipientConnected ? null : "Use connected"
-              ] })
+        /* @__PURE__ */ jsx("div", { className: "rs-withdraw-input-row", children: /* @__PURE__ */ jsx(
+          "input",
+          {
+            id: "rs-withdraw-recipient",
+            type: "text",
+            className: "rs-withdraw-input rs-withdraw-input--address",
+            placeholder: "0x...",
+            value: recipient,
+            onChange: (e) => {
+              const next = e.target.value.trim();
+              setRecipient(next);
+              onRecipientChange?.(next);
+              if (error) setError(null);
             }
-          )
-        ] })
+          }
+        ) })
       ] }),
       /* @__PURE__ */ jsxs("div", { className: "rs-withdraw-section", children: [
         /* @__PURE__ */ jsx("label", { className: "rs-withdraw-label", htmlFor: "rs-withdraw-amount", children: "Amount" }),
@@ -507,7 +447,7 @@ function WithdrawFormStep({
           ) })
         ] }),
         /* @__PURE__ */ jsxs("div", { className: "rs-withdraw-amount-info", children: [
-          /* @__PURE__ */ jsx("span", { className: "rs-withdraw-usd", children: amountUsd !== null ? currencyFormatter.format(amountUsd) : "$0.00" }),
+          /* @__PURE__ */ jsx("span", { className: "rs-withdraw-usd", children: amountUsd !== null ? `~${currencyFormatter.format(amountUsd)}` : "$0.00" }),
           /* @__PURE__ */ jsxs("span", { className: "rs-withdraw-balance", children: [
             "Balance: ",
             formattedBalance,
@@ -537,8 +477,8 @@ function WithdrawFormStep({
                     },
                     children: [
                       /* @__PURE__ */ jsxs("div", { className: "rs-withdraw-dropdown-value", children: [
-                        getChainIcon(targetChain) && /* @__PURE__ */ jsx(
-                          "img",
+                        /* @__PURE__ */ jsx(
+                          CdnIcon,
                           {
                             src: getChainIcon(targetChain),
                             alt: targetChainName,
@@ -569,8 +509,8 @@ function WithdrawFormStep({
                       setShowChainDropdown(false);
                     },
                     children: [
-                      getChainIcon(chain.id) && /* @__PURE__ */ jsx(
-                        "img",
+                      /* @__PURE__ */ jsx(
+                        CdnIcon,
                         {
                           src: getChainIcon(chain.id),
                           alt: chain.name,
@@ -654,7 +594,6 @@ function WithdrawFormStep({
           )
         ] })
       ] }),
-      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__ */ jsx(Callout, { variant: "error", children: error }),
       !error && registrationError && /* @__PURE__ */ jsx(Callout, { variant: "error", children: registrationError }),
       /* @__PURE__ */ jsx(
@@ -663,7 +602,7 @@ function WithdrawFormStep({
           onClick: handleWithdraw,
           fullWidth: true,
           loading: isBusy,
-          disabled: !recipient || !amount || chainMismatch || isBusy || Boolean(registrationError),
+          disabled: !recipient || !amount || isBusy || Boolean(registrationError),
           children: isBusy ? "Preparing..." : registrationPending ? "Preparing session..." : !recipient ? "Enter Recipient Address" : !amount ? "Enter Withdraw Amount" : "Withdraw"
         }
       )
@@ -755,7 +694,7 @@ function WithdrawReviewStep({
           /* @__PURE__ */ jsx2("span", { children: "Source chain" }),
           /* @__PURE__ */ jsxs2("span", { className: "rs-review-detail-value", children: [
             /* @__PURE__ */ jsx2("span", { children: sourceChainName }),
-            sourceChainIcon && /* @__PURE__ */ jsx2("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx2("img", { src: sourceChainIcon, alt: "" }) })
+            sourceChainIcon && /* @__PURE__ */ jsx2("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx2(CdnIcon, { src: sourceChainIcon }) })
           ] })
         ] }),
         /* @__PURE__ */ jsxs2("div", { className: "rs-review-detail-row", children: [
@@ -773,7 +712,7 @@ function WithdrawReviewStep({
           /* @__PURE__ */ jsx2("span", { children: "Destination chain" }),
           /* @__PURE__ */ jsxs2("span", { className: "rs-review-detail-value", children: [
             /* @__PURE__ */ jsx2("span", { children: targetChainName }),
-            targetChainIcon && /* @__PURE__ */ jsx2("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx2("img", { src: targetChainIcon, alt: "" }) })
+            targetChainIcon && /* @__PURE__ */ jsx2("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx2(CdnIcon, { src: targetChainIcon }) })
           ] })
         ] }),
         /* @__PURE__ */ jsxs2("div", { className: "rs-review-detail-row", children: [
@@ -801,32 +740,17 @@ function WithdrawReviewStep({
 WithdrawReviewStep.displayName = "WithdrawReviewStep";
 
 // src/WithdrawFlow.tsx
-import { encodeFunctionData, erc20Abi as erc20Abi2, parseUnits as parseUnits2 } from "viem";
+import { parseUnits as parseUnits2 } from "viem";
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 var ADDR_REGEX = /^0x[a-fA-F0-9]{40}$/;
 var REGISTRATION_DEBOUNCE_MS = 600;
 var WITHDRAW_INDEXING_DELAY_MS = 2e3;
-function resolveSessionOwner(eoaAddress) {
-  const localOwner = loadSessionOwnerFromStorage(eoaAddress);
-  if (localOwner) {
-    return {
-      account: accountFromPrivateKey(localOwner.privateKey),
-      address: localOwner.address
-    };
-  }
-  const created = createSessionOwnerKey();
-  saveSessionOwnerToStorage(eoaAddress, created.privateKey, created.address);
-  return { account: created.account, address: created.address };
-}
 function targetsEqual(a, b) {
   if (!a) return false;
   return a.chain === b.chain && a.token.toLowerCase() === b.token.toLowerCase() && (a.recipient?.toLowerCase() ?? "") === (b.recipient?.toLowerCase() ?? "");
 }
 function WithdrawFlow({
-  dappWalletClient,
-  dappPublicClient,
-  dappAddress,
-  safeAddress,
+  accountAddress,
   sourceChain,
   sourceToken,
   targetChain: targetChainProp,
@@ -834,15 +758,8 @@ function WithdrawFlow({
   recipient: defaultRecipient,
   amount: defaultAmount,
   service,
-  allowedRoutes,
-  signerAddress = DEFAULT_SIGNER_ADDRESS,
-  sessionChainIds,
   forceRegister = false,
-  reownWallet,
-  onConnect,
-  onDisconnect,
-  onSignTransaction,
-  onRequestConnect,
+  onSendTransaction,
   onStepChange,
   onClose,
   onLifecycle,
@@ -881,213 +798,81 @@ function WithdrawFlow({
     defaultRecipient ?? ""
   );
   const [totalBalanceUsd, setTotalBalanceUsd] = useState3(0);
-  const [isConnectSelectionConfirmed, setIsConnectSelectionConfirmed] = useState3(false);
   useEffect2(() => {
     setTargetChain(targetChainProp);
+  }, [targetChainProp]);
+  useEffect2(() => {
     setTargetToken(targetTokenProp);
-  }, [targetChainProp, targetTokenProp]);
+  }, [targetTokenProp]);
   useEffect2(() => {
     if (defaultRecipient) setRecipientInput(defaultRecipient);
   }, [defaultRecipient]);
-  const hasCustomSigner = Boolean(dappAddress && onSignTransaction);
-  const dappSwitchChain = useMemo2(() => {
-    if (!dappWalletClient?.switchChain) return void 0;
-    return async (chainId) => {
-      await dappWalletClient.switchChain?.({ id: chainId });
-    };
-  }, [dappWalletClient]);
-  const walletOptions = useMemo2(() => {
-    const options = [];
-    const seen = /* @__PURE__ */ new Set();
-    if (dappWalletClient?.account && dappAddress) {
-      const id = `evm:${dappWalletClient.account.address.toLowerCase()}`;
-      options.push({
-        id,
-        address: dappWalletClient.account.address,
-        label: "Connected Wallet",
-        kind: "connected"
-      });
-      seen.add(id);
-    }
-    if (reownWallet?.address && reownWallet.isConnected && reownWallet.walletClient && reownWallet.publicClient) {
-      const id = `evm:${reownWallet.address.toLowerCase()}`;
-      if (!seen.has(id)) {
-        options.push({
-          id,
-          address: reownWallet.address,
-          label: "External Wallet",
-          kind: "external",
-          icon: reownWallet.icon
-        });
-      }
-    }
-    return options;
-  }, [
-    dappWalletClient,
-    dappAddress,
-    reownWallet?.address,
-    reownWallet?.isConnected,
-    reownWallet?.walletClient,
-    reownWallet?.publicClient,
-    reownWallet?.icon
-  ]);
-  const canAutoLock = hasCustomSigner || Boolean(dappWalletClient?.account && dappAddress) && !reownWallet;
   const storeApi = useWithdrawStoreApi();
-  const selectedWalletId = useWithdrawStore((s) => s.selectedWalletId);
   const registration = useWithdrawStore((s) => s.registration);
   const flowStep = useWithdrawStore((s) => s.step);
   const reviewedRecipient = useWithdrawStore((s) => s.recipient);
-  const setSelectedWalletId = useCallback2(
-    (walletId) => storeApi.dispatch({ type: "wallet/id-selected", walletId }),
-    [storeApi]
+  const publicClient = useMemo2(
+    () => getPublicClient(sourceChain, rpcUrls),
+    [sourceChain, rpcUrls]
   );
-  const signerContext = useMemo2(() => {
-    if (canAutoLock) {
-      if (hasCustomSigner) {
-        return {
-          ownerAddress: dappAddress,
-          walletClient: dappWalletClient ?? void 0,
-          publicClient: dappPublicClient ?? getPublicClient(sourceChain, rpcUrls),
-          switchChain: dappSwitchChain
-        };
-      }
-      return {
-        ownerAddress: dappWalletClient.account.address,
-        walletClient: dappWalletClient,
-        publicClient: dappPublicClient ?? getPublicClient(sourceChain, rpcUrls),
-        switchChain: dappSwitchChain
-      };
-    }
-    if (!isConnectSelectionConfirmed || !selectedWalletId) return null;
-    const selectedOption = walletOptions.find((o) => o.id === selectedWalletId);
-    if (!selectedOption || !selectedOption.address) return null;
-    if (selectedOption.kind === "connected" && dappWalletClient?.account && dappWalletClient.account.address.toLowerCase() === selectedOption.address.toLowerCase()) {
-      return {
-        ownerAddress: dappWalletClient.account.address,
-        walletClient: dappWalletClient,
-        publicClient: dappPublicClient ?? getPublicClient(sourceChain, rpcUrls),
-        switchChain: dappSwitchChain
-      };
-    }
-    if (selectedOption.kind === "external" && reownWallet?.address?.toLowerCase() === selectedOption.address.toLowerCase() && reownWallet.walletClient && reownWallet.publicClient) {
-      return {
-        ownerAddress: reownWallet.address,
-        walletClient: reownWallet.walletClient,
-        publicClient: reownWallet.publicClient,
-        switchChain: reownWallet.switchChain
-      };
-    }
-    return null;
-  }, [
-    canAutoLock,
-    hasCustomSigner,
-    isConnectSelectionConfirmed,
-    selectedWalletId,
-    walletOptions,
-    dappWalletClient,
-    dappPublicClient,
-    dappSwitchChain,
-    dappAddress,
-    reownWallet,
-    sourceChain,
-    rpcUrls
-  ]);
-  const ownerAddress = signerContext?.ownerAddress;
   const recipientForRegistration = useMemo2(() => {
     if (!recipientInput) return void 0;
     return ADDR_REGEX.test(recipientInput) ? recipientInput : void 0;
   }, [recipientInput]);
   useEffect2(() => {
-    if (!ownerAddress || !recipientForRegistration) return;
+    if (!recipientForRegistration) return;
     const desiredTarget = {
       chain: targetChain,
       token: targetToken,
       recipient: recipientForRegistration
     };
     const current = storeApi.getState().registration;
-    if (current.kind === "ready" && targetsEqual(current.registeredTarget, desiredTarget)) {
+    if (!forceRegister && current.kind === "ready" && targetsEqual(current.registeredTarget, desiredTarget)) {
       return;
     }
     let cancelled = false;
     const timeout = setTimeout(async () => {
       try {
         storeApi.dispatch({ type: "registration/started" });
-        const sessionOwner = resolveSessionOwner(ownerAddress);
-        if (cancelled) return;
         logFlow("auto-register:setup", {
-          ownerAddress,
+          accountAddress,
           targetChain,
           targetToken,
           recipient: recipientForRegistration
         });
-        const setup = await service.setupAccount({
-          ownerAddress,
-          sessionOwnerAddress: sessionOwner.address,
-          targetChain: toEvmCaip2(targetChain),
-          targetToken,
+        const salt = deriveAccountSalt({
           recipient: recipientForRegistration,
-          signerAddress,
-          sessionChainIds,
-          forceRegister
+          targetChain,
+          targetToken
         });
-        if (cancelled) return;
-        if (setup.needsRegistration) {
-          if (!setup.accountParams || !setup.sessionDetailsUnsigned) {
-            throw new Error("Missing registration payload from setup-account");
-          }
-          const typedData = setup.sessionDetailsUnsigned.data;
-          if (!sessionOwner.account.signTypedData) {
-            throw new Error(
-              "Session owner account does not support signTypedData"
-            );
+        const { evmDepositAddress } = await service.registerManagedAccount({
+          salt,
+          target: {
+            chain: targetChainToCaip2(targetChain),
+            token: targetToken,
+            recipient: recipientForRegistration
           }
-          const signature = await sessionOwner.account.signTypedData({
-            domain: typedData.domain,
-            types: typedData.types,
-            primaryType: typedData.primaryType,
-            message: typedData.message
-          });
-          if (cancelled) return;
-          const sessionDetails = buildSessionDetails(
-            setup.sessionDetailsUnsigned,
-            signature
-          );
-          await service.registerAccount({
-            address: setup.smartAccount,
-            accountParams: {
-              factory: setup.accountParams.factory,
-              factoryData: setup.accountParams.factoryData,
-              sessionDetails
-            },
-            eoaAddress: ownerAddress,
-            sessionOwner: sessionOwner.address,
-            target: {
-              chain: toEvmCaip2(targetChain),
-              token: targetToken,
-              recipient: recipientForRegistration
-            }
-          });
-          if (cancelled) return;
-          logFlow("auto-register:registered", {
-            smartAccount: setup.smartAccount
-          });
-        }
+        });
+        if (cancelled) return;
+        logFlow("auto-register:registered", {
+          smartAccount: evmDepositAddress
+        });
         storeApi.dispatch({
           type: "registration/ready",
-          smartAccount: setup.smartAccount,
+          smartAccount: evmDepositAddress,
           registeredTarget: desiredTarget
         });
         onLifecycleRef.current?.({
           type: "connected",
-          address: ownerAddress,
-          smartAccount: setup.smartAccount
+          address: accountAddress,
+          smartAccount: evmDepositAddress
         });
       } catch (err) {
         if (cancelled) return;
         const raw = err instanceof Error ? err.message : "Registration failed";
         const message = formatUserError(raw);
         logFlowError("auto-register:failed", err, {
-          ownerAddress,
+          accountAddress,
           targetChain,
           targetToken
         });
@@ -1103,13 +888,11 @@ function WithdrawFlow({
       clearTimeout(timeout);
     };
   }, [
-    ownerAddress,
+    accountAddress,
     targetChain,
     targetToken,
     recipientForRegistration,
     service,
-    signerAddress,
-    sessionChainIds,
     forceRegister,
     storeApi,
     logFlow,
@@ -1170,12 +953,10 @@ function WithdrawFlow({
       sourceToken,
       targetChain,
       targetToken,
-      selectedWalletId,
       registration: registration.kind
     });
   }, [
     logFlow,
-    selectedWalletId,
     sourceChain,
     sourceToken,
     flowStep,
@@ -1233,14 +1014,11 @@ function WithdrawFlow({
       }
       const smartAccount = matchingRegistration.smartAccount;
       const lowerRecipient = recipient.toLowerCase();
-      if (lowerRecipient === safeAddress.toLowerCase() || lowerRecipient === smartAccount.toLowerCase()) {
+      if (lowerRecipient === accountAddress.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");
-      }
       const submitGeneration = submitGenerationRef.current += 1;
       const isSubmissionLive = () => isFlowActiveRef.current && submitGenerationRef.current === submitGeneration;
       try {
@@ -1261,71 +1039,19 @@ function WithdrawFlow({
           targetToken
         });
         const amountUnits = parseUnits2(amountValue, asset.decimals);
-        const pc = signerContext?.publicClient ?? getPublicClient(sourceChain, rpcUrls);
-        let result;
-        if (onSignTransaction) {
-          const transferTarget = isSameRoute ? recipient : smartAccount;
-          const transferData = isSourceNative ? { to: transferTarget, value: amountUnits, data: "0x" } : {
-            to: sourceToken,
-            value: 0n,
-            data: encodeFunctionData({
-              abi: erc20Abi2,
-              functionName: "transfer",
-              args: [transferTarget, amountUnits]
-            })
-          };
-          const request = await buildSafeTransaction({
-            publicClient: pc,
-            safeAddress,
-            to: transferData.to,
-            value: transferData.value,
-            data: transferData.data,
-            chainId: sourceChain
-          });
-          if (!isSubmissionLive()) return;
-          const { signature } = await onSignTransaction(request);
-          if (!isSubmissionLive()) return;
-          if (!getMatchingRegistration()) {
-            throw new Error("Withdrawal target changed before submission");
-          }
-          const relayResult = await service.relayWithdraw({
-            smartAccount,
-            chainId: toEvmCaip2(sourceChain),
-            safeAddress,
-            safeTransaction: request.typedData.message,
-            signature
-          });
-          if (!relayResult.txHash) {
-            throw new Error("Relay succeeded but no txHash returned");
-          }
-          result = { txHash: relayResult.txHash };
-        } else if (isSourceNative) {
-          if (!getMatchingRegistration()) {
-            throw new Error("Withdrawal target changed before submission");
-          }
-          result = await executeSafeEthTransfer({
-            walletClient: signerContext.walletClient,
-            publicClient: pc,
-            safeAddress,
-            recipient: isSameRoute ? recipient : smartAccount,
-            amount: amountUnits,
-            chainId: sourceChain
-          });
-        } else {
-          if (!getMatchingRegistration()) {
-            throw new Error("Withdrawal target changed before submission");
-          }
-          result = await executeSafeErc20Transfer({
-            walletClient: signerContext.walletClient,
-            publicClient: pc,
-            safeAddress,
-            tokenAddress: sourceToken,
-            recipient: isSameRoute ? recipient : smartAccount,
-            amount: amountUnits,
-            chainId: sourceChain
-          });
-        }
+        const result = await onSendTransaction({
+          chainId: sourceChain,
+          token: sourceToken,
+          amount: amountUnits,
+          to: isSameRoute ? recipient : smartAccount
+        });
         if (!isSubmissionLive()) return;
+        if (!getMatchingRegistration()) {
+          throw new Error("Withdrawal target changed before submission");
+        }
+        if (!result?.txHash) {
+          throw new Error("onSendTransaction did not return a txHash");
+        }
         logFlow("withdraw:submitted", {
           txHash: result.txHash,
           smartAccount,
@@ -1338,9 +1064,18 @@ function WithdrawFlow({
           txHash: result.txHash,
           sourceChain,
           amount: amountUnits.toString(),
-          safeAddress
+          accountAddress
+        });
+        storeApi.dispatch({
+          type: "withdraw/submitted",
+          txHash: result.txHash,
+          smartAccount,
+          targetChain,
+          targetToken,
+          // Pin the routing decision this submit actually made — it chose the
+          // transfer target above.
+          directTransfer: isSameRoute
         });
-        storeApi.dispatch({ type: "withdraw/submitted", txHash: result.txHash });
       } catch (err) {
         const raw = err instanceof Error ? err.message : "Withdraw failed";
         logFlowError("submit:failed", err, {
@@ -1354,23 +1089,19 @@ function WithdrawFlow({
       }
     },
     [
-      signerContext,
       targetChain,
       targetToken,
-      service,
       asset.decimals,
-      safeAddress,
+      accountAddress,
       sourceToken,
       sourceChain,
-      onSignTransaction,
-      isSourceNative,
+      onSendTransaction,
       isSameRoute,
       handleError,
       logFlow,
       logFlowError,
       onLifecycleRef,
-      storeApi,
-      rpcUrls
+      storeApi
     ]
   );
   const handleWithdrawComplete = useCallback2(
@@ -1406,29 +1137,16 @@ function WithdrawFlow({
     },
     [logFlowError, onLifecycleRef, storeApi]
   );
-  const allowedChainSet = useMemo2(
-    () => allowedRoutes?.sourceChains ? new Set(allowedRoutes.sourceChains) : null,
-    [allowedRoutes?.sourceChains]
+  const targetChainOptions = useMemo2(
+    () => SOURCE_CHAINS.filter(
+      (chain) => getSupportedTargetTokens(chain.id).length > 0
+    ),
+    []
   );
-  const allowedTokenSet = useMemo2(
-    () => allowedRoutes?.sourceTokens ? new Set(allowedRoutes.sourceTokens.map((s) => s.toUpperCase())) : null,
-    [allowedRoutes?.sourceTokens]
+  const targetTokenOptions = useMemo2(
+    () => getSupportedTargetTokens(targetChain),
+    [targetChain]
   );
-  const targetChainOptions = useMemo2(() => {
-    return SOURCE_CHAINS.filter((chain) => {
-      if (allowedChainSet && !allowedChainSet.has(chain.id)) return false;
-      const tokens = getSupportedTargetTokens(chain.id);
-      if (allowedTokenSet) {
-        return tokens.some((t) => allowedTokenSet.has(t.symbol.toUpperCase()));
-      }
-      return tokens.length > 0;
-    });
-  }, [allowedChainSet, allowedTokenSet]);
-  const targetTokenOptions = useMemo2(() => {
-    const tokens = getSupportedTargetTokens(targetChain);
-    if (!allowedTokenSet) return tokens;
-    return tokens.filter((t) => allowedTokenSet.has(t.symbol.toUpperCase()));
-  }, [targetChain, allowedTokenSet]);
   useEffect2(() => {
     if (targetTokenOptions.length === 0) return;
     const matches = targetTokenOptions.some(
@@ -1439,12 +1157,7 @@ function WithdrawFlow({
   const handleTargetChainChange = useCallback2(
     (chainId) => {
       setTargetChain(chainId);
-      let options = getSupportedTargetTokens(chainId);
-      if (allowedTokenSet) {
-        options = options.filter(
-          (t) => allowedTokenSet.has(t.symbol.toUpperCase())
-        );
-      }
+      const options = getSupportedTargetTokens(chainId);
       if (options.length === 0) return;
       const currentlySupported = options.some(
         (option) => option.address.toLowerCase() === targetToken.toLowerCase()
@@ -1453,71 +1166,19 @@ function WithdrawFlow({
         currentlySupported ? targetToken : options[0].address
       );
     },
-    [targetToken, allowedTokenSet]
+    [targetToken]
   );
   const handleTargetTokenChange = useCallback2((token) => {
     setTargetToken(token);
   }, []);
-  const selectedWalletIdEffective = useMemo2(() => {
-    if (selectedWalletId) return selectedWalletId;
-    if (walletOptions.length === 1) return walletOptions[0].id;
-    return null;
-  }, [selectedWalletId, walletOptions]);
-  const walletOptionsKey = useMemo2(
-    () => walletOptions.map((o) => o.id).join(","),
-    [walletOptions]
-  );
-  const showConnectStep = !canAutoLock && !isConnectSelectionConfirmed;
-  useEffect2(() => {
-    setIsConnectSelectionConfirmed(false);
-  }, [walletOptionsKey]);
-  const selectedWalletOption = selectedWalletIdEffective ? walletOptions.find((o) => o.id === selectedWalletIdEffective) ?? null : null;
-  const selectedWalletIcon = useMemo2(() => {
-    if (!ownerAddress) return void 0;
-    const selected = walletOptions.find(
-      (o) => o.address?.toLowerCase() === ownerAddress.toLowerCase()
-    );
-    return selected?.kind === "external" ? selected.icon ?? reownWallet?.icon : void 0;
-  }, [walletOptions, ownerAddress, reownWallet?.icon]);
-  if (showConnectStep) {
-    const withdrawRows = walletOptions.map((option) => ({
-      id: option.id,
-      kind: option.kind,
-      label: option.label,
-      icon: option.icon,
-      address: option.address ?? option.solanaAddress ?? option.id,
-      state: "ready"
-    }));
-    return /* @__PURE__ */ jsx3("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx3(
-      ConnectStep,
-      {
-        walletRows: withdrawRows,
-        onConfirmWallet: (walletId) => {
-          setSelectedWalletId(walletId);
-          setIsConnectSelectionConfirmed(true);
-        },
-        onRequestConnect,
-        onConnect,
-        onDisconnect,
-        title: "Withdraw",
-        subtitle: "Choose a wallet to continue"
-      }
-    ) });
-  }
-  if (!signerContext) return null;
-  if (!onSignTransaction && !signerContext.walletClient) return null;
-  const resolvedConnectedRecipient = selectedWalletOption?.kind === "external" ? selectedWalletOption.address : void 0;
-  const formPublicClient = signerContext.publicClient ?? getPublicClient(sourceChain, rpcUrls);
   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(
       WithdrawFormStep,
       {
-        walletClient: signerContext.walletClient,
-        publicClient: formPublicClient,
-        connectedRecipient: resolvedConnectedRecipient,
-        safeAddress,
+        publicClient,
+        accountAddress,
         depositAddress,
         asset,
         defaultRecipient,
@@ -1528,8 +1189,6 @@ function WithdrawFlow({
         targetTokenOptions,
         onTargetChainChange: handleTargetChainChange,
         onTargetTokenChange: handleTargetTokenChange,
-        switchChain: signerContext.switchChain,
-        walletIcon: selectedWalletIcon,
         registrationPending: registration.kind === "pending" || registration.kind === "stale",
         registrationError: registration.kind === "failed" ? registration.error : null,
         onRecipientChange: setRecipientInput,
@@ -1557,16 +1216,16 @@ function WithdrawFlow({
     stepView === "processing" && registration.kind !== "idle" && /* @__PURE__ */ jsx3(
       ProcessingStep,
       {
-        smartAccount: registration.kind === "ready" || registration.kind === "stale" ? registration.smartAccount : "0x0",
+        smartAccount: storeApi.getState().processingSmartAccount ?? (registration.kind === "ready" || registration.kind === "stale" ? registration.smartAccount : "0x0"),
         txHash: storeApi.getState().txHash ?? "0x0",
         sourceChain,
         sourceToken,
-        targetChain,
-        targetToken,
+        targetChain: storeApi.getState().processingTargetChain ?? targetChain,
+        targetToken: storeApi.getState().processingTargetToken ?? targetToken,
         amount: toBaseUnits(storeApi.getState().amount ?? "0", asset.decimals),
         sourceSymbol: asset.symbol,
         sourceDecimals: asset.decimals,
-        directTransfer: isSameRoute,
+        directTransfer: storeApi.getState().processingDirectTransfer ?? isSameRoute,
         service,
         flowLabel: "withdraw",
         onClose,
@@ -1596,24 +1255,8 @@ function deriveStepView(step, _registration) {
 
 // src/WithdrawModal.tsx
 import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
-var ReownWithdrawInner = lazy(
-  () => import("./WithdrawModalReown-FVXSSGY5.mjs").then((m) => ({
-    default: m.WithdrawModalReown
-  }))
-);
-function WithdrawModal(props) {
-  const needsReown = !!props.reownAppId;
-  if (needsReown) {
-    return /* @__PURE__ */ jsx4(Suspense, { fallback: null, children: /* @__PURE__ */ jsx4(ReownWithdrawInner, { ...props }) });
-  }
-  return /* @__PURE__ */ jsx4(WithdrawModalInner, { ...props });
-}
-WithdrawModal.displayName = "WithdrawModal";
-function WithdrawModalInner({
-  dappWalletClient,
-  dappPublicClient,
-  dappAddress,
-  safeAddress,
+function WithdrawModal({
+  accountAddress,
   sourceChain: sourceChainProp,
   sourceToken,
   targetChain: targetChainProp,
@@ -1624,17 +1267,10 @@ function WithdrawModalInner({
   onClose,
   inline,
   closeOnOverlayClick,
-  allowedRoutes,
-  backendUrl = DEFAULT_BACKEND_URL,
+  backendUrl,
   rpcUrls: rpcUrlsProp,
-  signerAddress = DEFAULT_SIGNER_ADDRESS,
-  sessionChainIds,
   forceRegister = false,
-  reownWallet,
-  onConnect,
-  onDisconnect,
-  onSignTransaction,
-  onRequestConnect,
+  onSendTransaction,
   theme,
   uiConfig,
   className,
@@ -1642,14 +1278,20 @@ function WithdrawModalInner({
   onLifecycle,
   onEvent,
   onError,
-  debug
+  debug,
+  // Every prop 0.9.0 removed lands here, since none of them is named above.
+  // `uiConfig` is destructured, so its removed nested key isn't scanned — that
+  // one only ever applied to the deposit flow.
+  ...removedProps
 }) {
+  warnRemovedProps("WithdrawModal", removedProps);
+  checkBackendUrl("WithdrawModal", backendUrl);
   const modalRef = useRef3(null);
   const onReadyRef = useLatestRef(onReady);
   const [backHandler, setBackHandler] = useState4(
     void 0
   );
-  const targetChain = getChainId(targetChainProp);
+  const targetChain = getChainId(targetChainProp ?? sourceChainProp);
   const sourceChain = getChainId(sourceChainProp);
   const rpcUrls = useStableRpcUrls(rpcUrlsProp);
   const service = useMemo3(
@@ -1659,13 +1301,13 @@ function WithdrawModalInner({
   const store = useMemo3(() => createWithdrawStore(), []);
   const onErrorRef = useLatestRef(onError);
   useEffect3(() => {
-    if (isOpen && onSignTransaction && !dappAddress) {
+    if (isOpen && typeof onSendTransaction !== "function") {
       onErrorRef.current?.({
-        message: "WithdrawModal requires `dappAddress` when `onSignTransaction` is provided.",
-        code: "WITHDRAW_MISSING_DAPP_ADDRESS"
+        message: "WithdrawModal requires an `onSendTransaction` function.",
+        code: "WITHDRAW_MISSING_SEND_TRANSACTION"
       });
     }
-  }, [isOpen, onSignTransaction, dappAddress, onErrorRef]);
+  }, [isOpen, onSendTransaction, onErrorRef]);
   useEffect3(() => {
     if (isOpen && modalRef.current) {
       applyTheme(modalRef.current, theme);
@@ -1720,26 +1362,16 @@ function WithdrawModalInner({
         /* @__PURE__ */ jsx4(
           WithdrawFlow,
           {
-            dappWalletClient,
-            dappPublicClient,
-            dappAddress,
-            safeAddress,
+            accountAddress,
             sourceChain,
             sourceToken,
             targetChain,
-            targetToken,
+            targetToken: targetToken ?? sourceToken,
             recipient,
             amount: defaultAmount,
             service,
-            allowedRoutes,
-            signerAddress,
-            sessionChainIds,
             forceRegister,
-            reownWallet,
-            onConnect,
-            onDisconnect,
-            onSignTransaction,
-            onRequestConnect,
+            onSendTransaction,
             onStepChange: handleStepChange,
             onClose,
             onLifecycle,
@@ -1754,6 +1386,5 @@ function WithdrawModalInner({
 }
 
 export {
-  WithdrawModal,
-  WithdrawModalInner
+  WithdrawModal
 };