@rhinestone/deposit-modal 0.1.39 → 0.1.41

package/dist/{chunk-K7BHCDJQ.cjs → chunk-37CTMJMO.cjs}

@@ -17,10 +17,10 @@
 
 
 
-var _chunkAHOFT42Hcjs = require('./chunk-AHOFT42H.cjs');
 
 
 
+var _chunkLT3QKJI2cjs = require('./chunk-LT3QKJI2.cjs');
 
 
 
@@ -30,7 +30,10 @@ var _chunkAHOFT42Hcjs = require('./chunk-AHOFT42H.cjs');
 
 
 
-var _chunkFLXTBFMZcjs = require('./chunk-FLXTBFMZ.cjs');
+
+
+
+var _chunkNELAYNA3cjs = require('./chunk-NELAYNA3.cjs');
 
 // src/WithdrawModal.tsx
 
@@ -118,8 +121,8 @@ function WithdrawFormStep({
   const chainMismatch = Boolean(
     _optionalChain([walletClient, 'optionalAccess', _3 => _3.chain, 'optionalAccess', _4 => _4.id]) && walletClient.chain.id !== asset.chainId
   );
-  const targetSymbol = _chunkFLXTBFMZcjs.getTokenSymbol.call(void 0, targetToken, targetChain);
-  const targetChainName = _chunkFLXTBFMZcjs.getChainName.call(void 0, targetChain);
+  const targetSymbol = _chunkNELAYNA3cjs.getTokenSymbol.call(void 0, targetToken, targetChain);
+  const targetChainName = _chunkNELAYNA3cjs.getChainName.call(void 0, targetChain);
   const isBusy = submitting || isSubmitting;
   const seededRecipientRef = _react.useRef.call(void 0, seededRecipient);
   _react.useEffect.call(void 0, () => {
@@ -138,7 +141,7 @@ function WithdrawFormStep({
       setIsSwitching(true);
       switchChain(asset.chainId).catch((err) => {
         const raw = err instanceof Error ? err.message : "Failed to switch chain";
-        setError(_chunkAHOFT42Hcjs.formatUserError.call(void 0, raw));
+        setError(_chunkLT3QKJI2cjs.formatUserError.call(void 0, raw));
       }).finally(() => {
         setIsSwitching(false);
       });
@@ -158,7 +161,7 @@ function WithdrawFormStep({
         return;
       }
       try {
-        const bal = _chunkAHOFT42Hcjs.isNativeAsset.call(void 0, asset) ? await publicClient.getBalance({ address: safeAddress }) : await publicClient.readContract({
+        const bal = _chunkLT3QKJI2cjs.isNativeAsset.call(void 0, asset) ? await publicClient.getBalance({ address: safeAddress }) : await publicClient.readContract({
           address: asset.token,
           abi: _viem.erc20Abi,
           functionName: "balanceOf",
@@ -261,7 +264,7 @@ function WithdrawFormStep({
       await onSubmit(recipient, amount);
     } catch (err) {
       const raw = err instanceof Error ? err.message : "Withdrawal failed";
-      setError(_chunkAHOFT42Hcjs.formatUserError.call(void 0, raw));
+      setError(_chunkLT3QKJI2cjs.formatUserError.call(void 0, raw));
     } finally {
       setIsSubmitting(false);
     }
@@ -269,11 +272,11 @@ function WithdrawFormStep({
   if (isBalanceLoading) {
     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-loading", children: [
-        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkAHOFT42Hcjs.Spinner, { className: "rs-spinner--lg" }),
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkLT3QKJI2cjs.Spinner, { className: "rs-spinner--lg" }),
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-withdraw-loading-title", children: "Loading on-chain balance" }),
-        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-withdraw-loading-subtitle", children: chainMismatch ? `Switch to ${_chunkFLXTBFMZcjs.getChainName.call(void 0, asset.chainId)} to continue.` : "Please wait before withdrawing." })
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-withdraw-loading-subtitle", children: chainMismatch ? `Switch to ${_chunkNELAYNA3cjs.getChainName.call(void 0, asset.chainId)} to continue.` : "Please wait before withdrawing." })
       ] }),
-      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkAHOFT42Hcjs.PoweredBy, {})
+      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkLT3QKJI2cjs.PoweredBy, {})
     ] });
   }
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-step", children: [
@@ -369,7 +372,7 @@ function WithdrawFormStep({
           ] })
         ] }),
         /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-withdraw-amount-info", children: [
-          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-withdraw-usd", children: amountUsd !== null ? _chunkAHOFT42Hcjs.currencyFormatter.format(amountUsd) : "$0.00" }),
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-withdraw-usd", children: amountUsd !== null ? _chunkLT3QKJI2cjs.currencyFormatter.format(amountUsd) : "$0.00" }),
           /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "rs-withdraw-balance", children: [
             formattedBalance,
             " ",
@@ -397,10 +400,10 @@ function WithdrawFormStep({
                     },
                     children: [
                       /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-withdraw-dropdown-value", children: [
-                        _chunkFLXTBFMZcjs.getTokenIcon.call(void 0, targetSymbol) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+                        _chunkNELAYNA3cjs.getTokenIcon.call(void 0, targetSymbol) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
                           "img",
                           {
-                            src: _chunkFLXTBFMZcjs.getTokenIcon.call(void 0, targetSymbol),
+                            src: _chunkNELAYNA3cjs.getTokenIcon.call(void 0, targetSymbol),
                             alt: targetSymbol,
                             className: "rs-withdraw-dropdown-icon"
                           }
@@ -441,10 +444,10 @@ function WithdrawFormStep({
                       setShowTokenDropdown(false);
                     },
                     children: [
-                      _chunkFLXTBFMZcjs.getTokenIcon.call(void 0, option.symbol) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+                      _chunkNELAYNA3cjs.getTokenIcon.call(void 0, option.symbol) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
                         "img",
                         {
-                          src: _chunkFLXTBFMZcjs.getTokenIcon.call(void 0, option.symbol),
+                          src: _chunkNELAYNA3cjs.getTokenIcon.call(void 0, option.symbol),
                           alt: option.symbol,
                           className: "rs-withdraw-dropdown-icon"
                         }
@@ -477,10 +480,10 @@ function WithdrawFormStep({
                     },
                     children: [
                       /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-withdraw-dropdown-value", children: [
-                        _chunkFLXTBFMZcjs.getChainIcon.call(void 0, targetChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+                        _chunkNELAYNA3cjs.getChainIcon.call(void 0, targetChain) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
                           "img",
                           {
-                            src: _chunkFLXTBFMZcjs.getChainIcon.call(void 0, targetChain),
+                            src: _chunkNELAYNA3cjs.getChainIcon.call(void 0, targetChain),
                             alt: targetChainName,
                             className: "rs-withdraw-dropdown-icon"
                           }
@@ -521,10 +524,10 @@ function WithdrawFormStep({
                       setShowChainDropdown(false);
                     },
                     children: [
-                      _chunkFLXTBFMZcjs.getChainIcon.call(void 0, chain.id) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+                      _chunkNELAYNA3cjs.getChainIcon.call(void 0, chain.id) && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
                         "img",
                         {
-                          src: _chunkFLXTBFMZcjs.getChainIcon.call(void 0, chain.id),
+                          src: _chunkNELAYNA3cjs.getChainIcon.call(void 0, chain.id),
                           alt: chain.name,
                           className: "rs-withdraw-dropdown-icon"
                         }
@@ -539,7 +542,7 @@ function WithdrawFormStep({
           )
         ] })
       ] }),
-      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 ${_chunkFLXTBFMZcjs.getChainName.call(void 0, asset.chainId)}...` : `Switch to ${_chunkFLXTBFMZcjs.getChainName.call(void 0, asset.chainId)} to continue.` }) }),
+      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 ${_chunkNELAYNA3cjs.getChainName.call(void 0, asset.chainId)}...` : `Switch to ${_chunkNELAYNA3cjs.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",
@@ -562,7 +565,7 @@ function WithdrawFormStep({
       ] })
     ] }),
     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step-footer", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkAHOFT42Hcjs.Button,
+      _chunkLT3QKJI2cjs.Button,
       {
         onClick: handleWithdraw,
         fullWidth: true,
@@ -571,7 +574,7 @@ function WithdrawFormStep({
         children: isBusy ? "Preparing..." : "Withdraw"
       }
     ) }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkAHOFT42Hcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkLT3QKJI2cjs.PoweredBy, {})
   ] });
 }
 WithdrawFormStep.displayName = "WithdrawFormStep";
@@ -654,7 +657,7 @@ async function executeSafeEthTransfer(params) {
     throw new Error("Wallet not connected");
   }
   if (chain.id !== chainId) {
-    throw new Error(`Switch to ${_chunkFLXTBFMZcjs.getChainName.call(void 0, chainId)} to sign`);
+    throw new Error(`Switch to ${_chunkNELAYNA3cjs.getChainName.call(void 0, chainId)} to sign`);
   }
   const isOwner = await publicClient.readContract({
     address: safeAddress,
@@ -737,7 +740,7 @@ async function executeSafeErc20Transfer(params) {
     throw new Error("Wallet not connected");
   }
   if (chain.id !== chainId) {
-    throw new Error(`Switch to ${_chunkFLXTBFMZcjs.getChainName.call(void 0, chainId)} to sign`);
+    throw new Error(`Switch to ${_chunkNELAYNA3cjs.getChainName.call(void 0, chainId)} to sign`);
   }
   const isOwner = await publicClient.readContract({
     address: safeAddress,
@@ -876,7 +879,7 @@ function WithdrawFlow({
   recipient: defaultRecipient,
   amount: defaultAmount,
   service,
-  signerAddress = _chunkFLXTBFMZcjs.DEFAULT_SIGNER_ADDRESS,
+  signerAddress = _chunkNELAYNA3cjs.DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
   waitForFinalTx = true,
@@ -900,6 +903,18 @@ function WithdrawFlow({
   const [isSubmitting, setIsSubmitting] = _react.useState.call(void 0, false);
   const [totalBalanceUsd, setTotalBalanceUsd] = _react.useState.call(void 0, 0);
   const [isConnectSelectionConfirmed, setIsConnectSelectionConfirmed] = _react.useState.call(void 0, false);
+  const logFlow = _react.useCallback.call(void 0, 
+    (message, data) => {
+      _chunkLT3QKJI2cjs.debugLog.call(void 0, debug, "withdraw-flow", message, data);
+    },
+    [debug]
+  );
+  const logFlowError = _react.useCallback.call(void 0, 
+    (message, error, data) => {
+      _chunkLT3QKJI2cjs.debugError.call(void 0, debug, "withdraw-flow", message, error, data);
+    },
+    [debug]
+  );
   const [targetChain, setTargetChain] = _react.useState.call(void 0, targetChainProp);
   const [targetToken, setTargetToken] = _react.useState.call(void 0, targetTokenProp);
   _react.useEffect.call(void 0, () => {
@@ -917,20 +932,26 @@ function WithdrawFlow({
     const options = [];
     const seen = /* @__PURE__ */ new Set();
     if (_optionalChain([dappWalletClient, 'optionalAccess', _9 => _9.account]) && dappAddress) {
+      const id = `evm:${dappWalletClient.account.address.toLowerCase()}`;
       options.push({
+        id,
         address: dappWalletClient.account.address,
         label: "Connected Wallet",
         kind: "connected"
       });
-      seen.add(dappWalletClient.account.address.toLowerCase());
+      seen.add(id);
     }
     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",
-        kind: "external",
-        icon: reownWallet.icon
-      });
+      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;
   }, [
@@ -942,34 +963,36 @@ function WithdrawFlow({
     _optionalChain([reownWallet, 'optionalAccess', _14 => _14.publicClient])
   ]);
   const canAutoLock = hasCustomSigner || Boolean(_optionalChain([dappWalletClient, 'optionalAccess', _15 => _15.account]) && dappAddress) && !reownWallet;
-  const [selectedConnectAddress, setSelectedConnectAddress] = _react.useState.call(void 0, null);
+  const [selectedWalletId, setSelectedWalletId] = _react.useState.call(void 0, null);
   const signerContext = _react.useMemo.call(void 0, () => {
     if (canAutoLock) {
       if (hasCustomSigner) {
         return {
           ownerAddress: dappAddress,
           walletClient: _nullishCoalesce(dappWalletClient, () => ( void 0)),
-          publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkAHOFT42Hcjs.getPublicClient.call(void 0, sourceChain))),
+          publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkLT3QKJI2cjs.getPublicClient.call(void 0, sourceChain))),
           switchChain: dappSwitchChain
         };
       }
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
-        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkAHOFT42Hcjs.getPublicClient.call(void 0, sourceChain))),
+        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkLT3QKJI2cjs.getPublicClient.call(void 0, sourceChain))),
         switchChain: dappSwitchChain
       };
     }
-    if (!isConnectSelectionConfirmed || !selectedConnectAddress) return null;
-    if (_optionalChain([dappWalletClient, 'optionalAccess', _16 => _16.account]) && dappWalletClient.account.address.toLowerCase() === selectedConnectAddress.toLowerCase()) {
+    if (!isConnectSelectionConfirmed || !selectedWalletId) return null;
+    const selectedOption = walletOptions.find((option) => option.id === selectedWalletId);
+    if (!selectedOption || !selectedOption.address) return null;
+    if (selectedOption.kind === "connected" && _optionalChain([dappWalletClient, 'optionalAccess', _16 => _16.account]) && dappWalletClient.account.address.toLowerCase() === selectedOption.address.toLowerCase()) {
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
-        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkAHOFT42Hcjs.getPublicClient.call(void 0, sourceChain))),
+        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkLT3QKJI2cjs.getPublicClient.call(void 0, sourceChain))),
         switchChain: dappSwitchChain
       };
     }
-    if (_optionalChain([reownWallet, 'optionalAccess', _17 => _17.address, 'optionalAccess', _18 => _18.toLowerCase, 'call', _19 => _19()]) === selectedConnectAddress.toLowerCase() && reownWallet.walletClient && reownWallet.publicClient) {
+    if (selectedOption.kind === "external" && _optionalChain([reownWallet, 'optionalAccess', _17 => _17.address, 'optionalAccess', _18 => _18.toLowerCase, 'call', _19 => _19()]) === selectedOption.address.toLowerCase() && reownWallet.walletClient && reownWallet.publicClient) {
       return {
         ownerAddress: reownWallet.address,
         walletClient: reownWallet.walletClient,
@@ -982,7 +1005,8 @@ function WithdrawFlow({
     canAutoLock,
     hasCustomSigner,
     isConnectSelectionConfirmed,
-    selectedConnectAddress,
+    selectedWalletId,
+    walletOptions,
     dappWalletClient,
     dappPublicClient,
     dappSwitchChain,
@@ -991,10 +1015,10 @@ function WithdrawFlow({
     sourceChain
   ]);
   const asset = _react.useMemo.call(void 0, () => {
-    const symbol = _chunkFLXTBFMZcjs.getTokenSymbol.call(void 0, sourceToken, sourceChain);
-    const decimals = _chunkFLXTBFMZcjs.getTokenDecimalsByAddress.call(void 0, sourceToken, sourceChain);
+    const symbol = _chunkNELAYNA3cjs.getTokenSymbol.call(void 0, sourceToken, sourceChain);
+    const decimals = _chunkNELAYNA3cjs.getTokenDecimalsByAddress.call(void 0, sourceToken, sourceChain);
     return {
-      id: _chunkAHOFT42Hcjs.getAssetId.call(void 0, { chainId: sourceChain, token: sourceToken }),
+      id: _chunkLT3QKJI2cjs.getAssetId.call(void 0, { chainId: sourceChain, token: sourceToken }),
       chainId: sourceChain,
       token: sourceToken,
       symbol,
@@ -1002,37 +1026,57 @@ function WithdrawFlow({
       decimals
     };
   }, [sourceChain, sourceToken]);
-  const isSourceNative = sourceToken.toLowerCase() === _chunkFLXTBFMZcjs.NATIVE_TOKEN_ADDRESS.toLowerCase();
+  const isSourceNative = sourceToken.toLowerCase() === _chunkNELAYNA3cjs.NATIVE_TOKEN_ADDRESS.toLowerCase();
   const stepIndex = step.type === "form" ? 0 : 1;
   const currentBackHandler = void 0;
   _react.useEffect.call(void 0, () => {
     _optionalChain([onStepChange, 'optionalCall', _20 => _20(stepIndex, currentBackHandler)]);
   }, [stepIndex, currentBackHandler, onStepChange]);
+  _react.useEffect.call(void 0, () => {
+    logFlow("state:changed", {
+      step: step.type,
+      sourceChain,
+      sourceToken,
+      targetChain,
+      targetToken,
+      selectedWalletId
+    });
+  }, [
+    logFlow,
+    selectedWalletId,
+    sourceChain,
+    sourceToken,
+    step.type,
+    targetChain,
+    targetToken
+  ]);
   _react.useEffect.call(void 0, () => {
     _optionalChain([onTotalBalanceChange, 'optionalCall', _21 => _21(totalBalanceUsd)]);
   }, [totalBalanceUsd, onTotalBalanceChange]);
   const handleConnected = _react.useCallback.call(void 0, 
     (addr, smartAccount) => {
+      logFlow("setup:connected", { address: addr, smartAccount });
       _optionalChain([onConnected, 'optionalCall', _22 => _22({ address: addr, smartAccount })]);
     },
-    [onConnected]
+    [logFlow, onConnected]
   );
   const handleError = _react.useCallback.call(void 0, 
     (message, code) => {
+      logFlowError("flow:error", message, { code });
       _optionalChain([onError, 'optionalCall', _23 => _23({ message, code })]);
     },
-    [onError]
+    [logFlowError, onError]
   );
   const resolveSessionOwner = _react.useCallback.call(void 0, async (eoaAddress) => {
-    const localOwner = _chunkAHOFT42Hcjs.loadSessionOwnerFromStorage.call(void 0, eoaAddress);
+    const localOwner = _chunkLT3QKJI2cjs.loadSessionOwnerFromStorage.call(void 0, eoaAddress);
     if (localOwner) {
       return {
-        account: _chunkAHOFT42Hcjs.accountFromPrivateKey.call(void 0, localOwner.privateKey),
+        account: _chunkLT3QKJI2cjs.accountFromPrivateKey.call(void 0, localOwner.privateKey),
         address: localOwner.address
       };
     }
-    const created = _chunkAHOFT42Hcjs.createSessionOwnerKey.call(void 0, );
-    _chunkAHOFT42Hcjs.saveSessionOwnerToStorage.call(void 0, eoaAddress, created.privateKey, created.address);
+    const created = _chunkLT3QKJI2cjs.createSessionOwnerKey.call(void 0, );
+    _chunkLT3QKJI2cjs.saveSessionOwnerToStorage.call(void 0, eoaAddress, created.privateKey, created.address);
     return {
       account: created.account,
       address: created.address
@@ -1049,17 +1093,30 @@ function WithdrawFlow({
       }
       setIsSubmitting(true);
       try {
+        logFlow("submit:start", {
+          ownerAddress: ownerAddress2,
+          recipient,
+          amount: amountValue,
+          sourceChain,
+          sourceToken,
+          targetChain,
+          targetToken
+        });
         const sessionOwner = await resolveSessionOwner(ownerAddress2);
         const setup = await service.setupAccount({
           ownerAddress: ownerAddress2,
           sessionOwnerAddress: sessionOwner.address,
-          targetChain,
+          targetChain: _chunkLT3QKJI2cjs.toEvmCaip2.call(void 0, targetChain),
           targetToken,
           signerAddress,
           sessionChainIds,
           forceRegister
         });
         const smartAccount = setup.smartAccount;
+        logFlow("setup:resolved", {
+          smartAccount,
+          needsRegistration: setup.needsRegistration
+        });
         if (setup.needsRegistration) {
           if (!setup.accountParams || !setup.sessionDetailsUnsigned) {
             throw new Error("Missing registration payload from setup-account");
@@ -1076,7 +1133,7 @@ function WithdrawFlow({
             primaryType: typedData.primaryType,
             message: typedData.message
           });
-          const sessionDetails = _chunkAHOFT42Hcjs.buildSessionDetails.call(void 0, 
+          const sessionDetails = _chunkLT3QKJI2cjs.buildSessionDetails.call(void 0, 
             setup.sessionDetailsUnsigned,
             signature
           );
@@ -1090,15 +1147,16 @@ function WithdrawFlow({
             eoaAddress: ownerAddress2,
             sessionOwner: sessionOwner.address,
             target: {
-              chain: targetChain,
+              chain: _chunkLT3QKJI2cjs.toEvmCaip2.call(void 0, targetChain),
               token: targetToken,
               recipient
             }
           });
+          logFlow("register:success", { smartAccount });
         }
         handleConnected(ownerAddress2, smartAccount);
         const amountUnits = _viem.parseUnits.call(void 0, amountValue, asset.decimals);
-        const pc = _nullishCoalesce(_optionalChain([signerContext, 'optionalAccess', _26 => _26.publicClient]), () => ( _chunkAHOFT42Hcjs.getPublicClient.call(void 0, sourceChain)));
+        const pc = _nullishCoalesce(_optionalChain([signerContext, 'optionalAccess', _26 => _26.publicClient]), () => ( _chunkLT3QKJI2cjs.getPublicClient.call(void 0, sourceChain)));
         let result;
         if (onSignTransaction) {
           const transferData = isSourceNative ? { to: smartAccount, value: amountUnits, data: "0x" } : {
@@ -1121,7 +1179,7 @@ function WithdrawFlow({
           const { signature } = await onSignTransaction(request);
           const relayResult = await service.relayWithdraw({
             smartAccount,
-            chainId: sourceChain,
+            chainId: _chunkLT3QKJI2cjs.toEvmCaip2.call(void 0, sourceChain),
             safeAddress,
             safeTransaction: request.typedData.message,
             signature
@@ -1150,6 +1208,13 @@ function WithdrawFlow({
             chainId: sourceChain
           });
         }
+        logFlow("withdraw:submitted", {
+          txHash: result.txHash,
+          smartAccount,
+          amount: amountUnits.toString(),
+          sourceChain,
+          sourceToken
+        });
         _optionalChain([onWithdrawSubmitted, 'optionalCall', _27 => _27({
           txHash: result.txHash,
           sourceChain,
@@ -1166,7 +1231,13 @@ function WithdrawFlow({
         });
       } catch (err) {
         const raw = err instanceof Error ? err.message : "Withdraw failed";
-        handleError(_chunkAHOFT42Hcjs.formatUserError.call(void 0, raw), "WITHDRAW_FLOW_ERROR");
+        logFlowError("submit:failed", err, {
+          sourceChain,
+          sourceToken,
+          targetChain,
+          targetToken
+        });
+        handleError(_chunkLT3QKJI2cjs.formatUserError.call(void 0, raw), "WITHDRAW_FLOW_ERROR");
         throw err;
       } finally {
         setIsSubmitting(false);
@@ -1189,28 +1260,32 @@ function WithdrawFlow({
       onWithdrawSubmitted,
       onSignTransaction,
       isSourceNative,
-      handleError
+      handleError,
+      logFlow,
+      logFlowError
     ]
   );
   const handleWithdrawComplete = _react.useCallback.call(void 0, 
     (txHash, destinationTxHash) => {
+      logFlow("withdraw:complete", { txHash, destinationTxHash });
       _optionalChain([onWithdrawComplete, 'optionalCall', _28 => _28({ txHash, destinationTxHash })]);
     },
-    [onWithdrawComplete]
+    [logFlow, onWithdrawComplete]
   );
   const handleWithdrawFailed = _react.useCallback.call(void 0, 
     (txHash, error) => {
+      logFlowError("withdraw:failed", error, { txHash });
       _optionalChain([onWithdrawFailed, 'optionalCall', _29 => _29({ txHash, error })]);
     },
-    [onWithdrawFailed]
+    [logFlowError, onWithdrawFailed]
   );
   const targetChainOptions = _react.useMemo.call(void 0, () => {
-    return _chunkFLXTBFMZcjs.SOURCE_CHAINS.filter(
-      (chain) => _chunkFLXTBFMZcjs.getSupportedTargetTokens.call(void 0, chain.id).length > 0
+    return _chunkNELAYNA3cjs.SOURCE_CHAINS.filter(
+      (chain) => _chunkNELAYNA3cjs.getSupportedTargetTokens.call(void 0, chain.id).length > 0
     );
   }, []);
   const targetTokenOptions = _react.useMemo.call(void 0, 
-    () => _chunkFLXTBFMZcjs.getSupportedTargetTokens.call(void 0, targetChain),
+    () => _chunkNELAYNA3cjs.getSupportedTargetTokens.call(void 0, targetChain),
     [targetChain]
   );
   _react.useEffect.call(void 0, () => {
@@ -1225,7 +1300,7 @@ function WithdrawFlow({
   const handleTargetChainChange = _react.useCallback.call(void 0, 
     (chainId) => {
       setTargetChain(chainId);
-      const options = _chunkFLXTBFMZcjs.getSupportedTargetTokens.call(void 0, chainId);
+      const options = _chunkNELAYNA3cjs.getSupportedTargetTokens.call(void 0, chainId);
       if (options.length === 0) {
         return;
       }
@@ -1241,17 +1316,24 @@ function WithdrawFlow({
   const handleTargetTokenChange = _react.useCallback.call(void 0, (token) => {
     setTargetToken(token);
   }, []);
-  const selectedConnectAddressEffective = _react.useMemo.call(void 0, () => {
-    if (selectedConnectAddress) return selectedConnectAddress;
+  const selectedWalletIdEffective = _react.useMemo.call(void 0, () => {
+    if (selectedWalletId) return selectedWalletId;
     if (walletOptions.length === 1) {
-      return walletOptions[0].address;
+      return walletOptions[0].id;
     }
     return null;
-  }, [selectedConnectAddress, walletOptions]);
+  }, [selectedWalletId, walletOptions]);
+  const walletOptionsKey = _react.useMemo.call(void 0, 
+    () => walletOptions.map((option) => option.id).join(","),
+    [walletOptions]
+  );
   const showConnectStep = !canAutoLock && !isConnectSelectionConfirmed;
+  _react.useEffect.call(void 0, () => {
+    setIsConnectSelectionConfirmed(false);
+  }, [walletOptionsKey, selectedWalletIdEffective]);
   _react.useEffect.call(void 0, () => {
     if (!showConnectStep && isConnectSelectionConfirmed && !signerContext) {
-      setSelectedConnectAddress(null);
+      setSelectedWalletId(null);
       setIsConnectSelectionConfirmed(false);
     }
   }, [showConnectStep, isConnectSelectionConfirmed, signerContext]);
@@ -1259,23 +1341,23 @@ function WithdrawFlow({
   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()
+      (o) => _optionalChain([o, 'access', _32 => _32.address, 'optionalAccess', _33 => _33.toLowerCase, 'call', _34 => _34()]) === ownerAddress.toLowerCase()
     );
-    return _nullishCoalesce(_optionalChain([selected, 'optionalAccess', _32 => _32.icon]), () => ( _optionalChain([reownWallet, 'optionalAccess', _33 => _33.icon])));
-  }, [walletOptions, ownerAddress, _optionalChain([reownWallet, 'optionalAccess', _34 => _34.icon])]);
+    return _nullishCoalesce(_optionalChain([selected, 'optionalAccess', _35 => _35.icon]), () => ( _optionalChain([reownWallet, 'optionalAccess', _36 => _36.icon])));
+  }, [walletOptions, ownerAddress, _optionalChain([reownWallet, 'optionalAccess', _37 => _37.icon])]);
   if (showConnectStep) {
     return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-modal-body", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkAHOFT42Hcjs.ConnectStep,
+      _chunkLT3QKJI2cjs.ConnectStep,
       {
         walletOptions,
-        selectedAddress: selectedConnectAddressEffective,
-        onSelectAddress: setSelectedConnectAddress,
+        selectedWalletId: selectedWalletIdEffective,
+        onSelectWallet: setSelectedWalletId,
         onRequestConnect,
         onConnect,
         onDisconnect,
         onContinue: () => {
-          if (selectedConnectAddressEffective) {
-            setSelectedConnectAddress(selectedConnectAddressEffective);
+          if (selectedWalletIdEffective) {
+            setSelectedWalletId(selectedWalletIdEffective);
           }
           setIsConnectSelectionConfirmed(true);
         },
@@ -1286,9 +1368,9 @@ function WithdrawFlow({
   if (!signerContext) return null;
   if (!onSignTransaction && !signerContext.walletClient) return null;
   const resolvedOwnerAddress = signerContext.ownerAddress;
-  const resolvedConnectedAddress = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_optionalChain([signerContext, 'access', _35 => _35.walletClient, 'optionalAccess', _36 => _36.account, 'optionalAccess', _37 => _37.address]), () => ( _optionalChain([reownWallet, 'optionalAccess', _38 => _38.address]))), () => ( _optionalChain([dappWalletClient, 'optionalAccess', _39 => _39.account, 'optionalAccess', _40 => _40.address]))), () => ( resolvedOwnerAddress));
+  const resolvedConnectedAddress = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_optionalChain([signerContext, 'access', _38 => _38.walletClient, 'optionalAccess', _39 => _39.account, 'optionalAccess', _40 => _40.address]), () => ( _optionalChain([reownWallet, 'optionalAccess', _41 => _41.address]))), () => ( _optionalChain([dappWalletClient, 'optionalAccess', _42 => _42.account, 'optionalAccess', _43 => _43.address]))), () => ( resolvedOwnerAddress));
   const resolvedDefaultRecipient = _nullishCoalesce(defaultRecipient, () => ( resolvedConnectedAddress));
-  const formPublicClient = _nullishCoalesce(signerContext.publicClient, () => ( _chunkAHOFT42Hcjs.getPublicClient.call(void 0, sourceChain)));
+  const formPublicClient = _nullishCoalesce(signerContext.publicClient, () => ( _chunkLT3QKJI2cjs.getPublicClient.call(void 0, sourceChain)));
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-modal-body", children: [
     step.type === "form" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
       WithdrawFormStep,
@@ -1315,7 +1397,7 @@ function WithdrawFlow({
       }
     ),
     step.type === "processing" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkAHOFT42Hcjs.ProcessingStep,
+      _chunkLT3QKJI2cjs.ProcessingStep,
       {
         smartAccount: step.smartAccount,
         txHash: step.txHash,
@@ -1340,7 +1422,7 @@ function WithdrawFlow({
 // src/WithdrawModal.tsx
 
 var ReownWithdrawInner = _react.lazy.call(void 0, 
-  () => Promise.resolve().then(() => _interopRequireWildcard(require("./WithdrawModalReown-2CWNDVJD.cjs"))).then((m) => ({
+  () => Promise.resolve().then(() => _interopRequireWildcard(require("./WithdrawModalReown-GCOVYZN2.cjs"))).then((m) => ({
     default: m.WithdrawModalReown
   }))
 );
@@ -1366,8 +1448,8 @@ function WithdrawModalInner({
   isOpen,
   onClose,
   inline,
-  backendUrl = _chunkFLXTBFMZcjs.DEFAULT_BACKEND_URL,
-  signerAddress = _chunkFLXTBFMZcjs.DEFAULT_SIGNER_ADDRESS,
+  backendUrl = _chunkNELAYNA3cjs.DEFAULT_BACKEND_URL,
+  signerAddress = _chunkNELAYNA3cjs.DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
   waitForFinalTx = true,
@@ -1393,19 +1475,22 @@ function WithdrawModalInner({
   const [currentStepIndex, setCurrentStepIndex] = _react.useState.call(void 0, 0);
   const [totalBalanceUsd, setTotalBalanceUsd] = _react.useState.call(void 0, null);
   const backHandlerRef = _react.useRef.call(void 0, void 0);
-  const targetChain = _chunkFLXTBFMZcjs.getChainId.call(void 0, targetChainProp);
-  const sourceChain = _chunkFLXTBFMZcjs.getChainId.call(void 0, sourceChainProp);
-  const service = _react.useMemo.call(void 0, () => _chunkAHOFT42Hcjs.createDepositService.call(void 0, backendUrl), [backendUrl]);
+  const targetChain = _chunkNELAYNA3cjs.getChainId.call(void 0, targetChainProp);
+  const sourceChain = _chunkNELAYNA3cjs.getChainId.call(void 0, sourceChainProp);
+  const service = _react.useMemo.call(void 0, 
+    () => _chunkLT3QKJI2cjs.createDepositService.call(void 0, backendUrl, { debug, debugScope: "service:withdraw" }),
+    [backendUrl, debug]
+  );
   _react.useEffect.call(void 0, () => {
     if (isOpen && modalRef.current) {
-      _chunkAHOFT42Hcjs.applyTheme.call(void 0, modalRef.current, theme);
+      _chunkLT3QKJI2cjs.applyTheme.call(void 0, modalRef.current, theme);
     }
   }, [isOpen, theme]);
   const hasCalledReady = _react.useRef.call(void 0, false);
   _react.useEffect.call(void 0, () => {
     if (isOpen && !hasCalledReady.current) {
       hasCalledReady.current = true;
-      _optionalChain([onReady, 'optionalCall', _41 => _41()]);
+      _optionalChain([onReady, 'optionalCall', _44 => _44()]);
     }
   }, [isOpen, onReady]);
   _react.useEffect.call(void 0, () => {
@@ -1424,17 +1509,17 @@ function WithdrawModalInner({
     setTotalBalanceUsd(balance2);
   }, []);
   const handleBack = _react.useCallback.call(void 0, () => {
-    _optionalChain([backHandlerRef, 'access', _42 => _42.current, 'optionalCall', _43 => _43()]);
+    _optionalChain([backHandlerRef, 'access', _45 => _45.current, 'optionalCall', _46 => _46()]);
   }, []);
-  const showLogo = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _44 => _44.showLogo]), () => ( false));
-  const showStepper = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _45 => _45.showStepper]), () => ( false));
-  const showBackButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _46 => _46.showBackButton]), () => ( true));
-  const balance = _optionalChain([uiConfig, 'optionalAccess', _47 => _47.balance]);
-  const logoUrl = _nullishCoalesce(_optionalChain([branding, 'optionalAccess', _48 => _48.logoUrl]), () => ( "https://github.com/rhinestonewtf.png"));
-  const title = _nullishCoalesce(_optionalChain([branding, 'optionalAccess', _49 => _49.title]), () => ( "Withdraw"));
+  const showLogo = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _47 => _47.showLogo]), () => ( false));
+  const showStepper = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _48 => _48.showStepper]), () => ( false));
+  const showBackButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _49 => _49.showBackButton]), () => ( true));
+  const balance = _optionalChain([uiConfig, 'optionalAccess', _50 => _50.balance]);
+  const logoUrl = _nullishCoalesce(_optionalChain([branding, 'optionalAccess', _51 => _51.logoUrl]), () => ( "https://github.com/rhinestonewtf.png"));
+  const title = _nullishCoalesce(_optionalChain([branding, 'optionalAccess', _52 => _52.title]), () => ( "Withdraw"));
   const canGoBack = currentStepIndex > 0 && currentStepIndex < 3 && backHandlerRef.current;
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-    _chunkAHOFT42Hcjs.Modal,
+    _chunkLT3QKJI2cjs.Modal,
     {
       isOpen,
       onClose,
@@ -1492,7 +1577,7 @@ function WithdrawModalInner({
             ] }),
             balance && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-modal-header-balance", children: [
               /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-modal-header-balance-label", children: balance.title }),
-              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-modal-header-balance-value", children: _nullishCoalesce(balance.amount, () => ( (totalBalanceUsd !== null ? _chunkAHOFT42Hcjs.currencyFormatter.format(totalBalanceUsd) : null))) })
+              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-modal-header-balance-value", children: _nullishCoalesce(balance.amount, () => ( (totalBalanceUsd !== null ? _chunkLT3QKJI2cjs.currencyFormatter.format(totalBalanceUsd) : null))) })
             ] })
           ] }),
           /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-modal-header-nav-right", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0,