@rhinestone/deposit-modal 0.3.0-alpha.1 → 0.3.0-alpha.10

package/dist/{chunk-D5YCALVX.mjs → chunk-7MZNQ4C2.mjs}

@@ -1,7 +1,7 @@
 import {
-  AlertTriangleIcon,
   BodyHeader,
   Button,
+  Callout,
   ChevronDownIcon,
   ChevronLeftIcon,
   CircleArrowOutUpLeftIcon,
@@ -14,12 +14,15 @@ import {
   WalletIcon,
   accountFromPrivateKey,
   applyTheme,
+  buildSafeTransaction,
   buildSessionDetails,
   createDepositService,
   createSessionOwnerKey,
   currencyFormatter,
   debugError,
   debugLog,
+  executeSafeErc20Transfer,
+  executeSafeEthTransfer,
   formatUserError,
   getAssetId,
   getPublicClient,
@@ -28,7 +31,7 @@ import {
   saveSessionOwnerToStorage,
   toEvmCaip2,
   useLatestRef
-} from "./chunk-FY76DWPD.mjs";
+} from "./chunk-WVE3JN3C.mjs";
 import {
   DEFAULT_BACKEND_URL,
   DEFAULT_SIGNER_ADDRESS,
@@ -41,7 +44,7 @@ import {
   getTokenDecimalsByAddress,
   getTokenIcon,
   getTokenSymbol
-} from "./chunk-VA3ANS7D.mjs";
+} from "./chunk-SZIYS42B.mjs";
 
 // src/WithdrawModal.tsx
 import {
@@ -57,7 +60,7 @@ import {
 // src/WithdrawFlow.tsx
 import { useCallback as useCallback2, useEffect as useEffect2, useMemo as useMemo2, useRef as useRef2, useState as useState3 } from "react";
 
-// src/store/withdraw.tsx
+// src/store/withdraw.ts
 import { createContext, createElement, useContext } from "react";
 import { useStore } from "zustand";
 import { createStore } from "zustand/vanilla";
@@ -382,8 +385,8 @@ function WithdrawFormStep({
     }
   }, [recipient, amount, balance, asset.decimals, onSubmit]);
   if (isBalanceLoading) {
-    return /* @__PURE__ */ jsxs("div", { className: "rs-step", children: [
-      /* @__PURE__ */ jsxs("div", { className: "rs-step-body rs-withdraw-loading", children: [
+    return /* @__PURE__ */ jsxs("div", { className: "rs-screen", children: [
+      /* @__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." })
@@ -391,15 +394,23 @@ function WithdrawFormStep({
       /* @__PURE__ */ jsx(PoweredBy, {})
     ] });
   }
-  return /* @__PURE__ */ jsxs("div", { className: "rs-step", children: [
-    /* @__PURE__ */ jsxs("div", { className: "rs-step-body rs-withdraw-form", children: [
+  return /* @__PURE__ */ jsxs("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs("div", { className: "rs-screen-body", children: [
       /* @__PURE__ */ jsx(BodyHeader, { icon: /* @__PURE__ */ jsx(CircleArrowOutUpLeftIcon, {}), title: "Withdraw" }),
       /* @__PURE__ */ jsxs("div", { className: "rs-withdraw-section", children: [
-        /* @__PURE__ */ jsx("label", { className: "rs-withdraw-label", children: "Recipient address" }),
+        /* @__PURE__ */ jsx(
+          "label",
+          {
+            className: "rs-withdraw-label",
+            htmlFor: "rs-withdraw-recipient",
+            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...",
@@ -439,11 +450,12 @@ function WithdrawFormStep({
         ] })
       ] }),
       /* @__PURE__ */ jsxs("div", { className: "rs-withdraw-section", children: [
-        /* @__PURE__ */ jsx("label", { className: "rs-withdraw-label", children: "Amount" }),
+        /* @__PURE__ */ jsx("label", { className: "rs-withdraw-label", htmlFor: "rs-withdraw-amount", children: "Amount" }),
         /* @__PURE__ */ jsxs("div", { className: "rs-withdraw-input-row", children: [
           /* @__PURE__ */ jsx(
             "input",
             {
+              id: "rs-withdraw-amount",
               type: "text",
               inputMode: "decimal",
               className: "rs-withdraw-input rs-withdraw-input--amount",
@@ -481,7 +493,7 @@ function WithdrawFormStep({
       ] }),
       /* @__PURE__ */ jsxs("div", { className: "rs-withdraw-receive-row", children: [
         /* @__PURE__ */ jsxs("div", { className: "rs-withdraw-receive-col", children: [
-          /* @__PURE__ */ jsx("label", { className: "rs-withdraw-label rs-withdraw-label--sm", children: "Receive chain" }),
+          /* @__PURE__ */ jsx("span", { className: "rs-withdraw-label rs-withdraw-label--sm", children: "Receive chain" }),
           /* @__PURE__ */ jsxs(
             "div",
             {
@@ -492,6 +504,7 @@ function WithdrawFormStep({
                   "button",
                   {
                     type: "button",
+                    "aria-label": "Receive chain",
                     className: "rs-withdraw-dropdown",
                     onClick: () => {
                       setShowChainDropdown(!showChainDropdown);
@@ -549,7 +562,7 @@ function WithdrawFormStep({
           )
         ] }),
         /* @__PURE__ */ jsxs("div", { className: "rs-withdraw-receive-col", children: [
-          /* @__PURE__ */ jsx("label", { className: "rs-withdraw-label rs-withdraw-label--sm", children: "Receive token" }),
+          /* @__PURE__ */ jsx("span", { className: "rs-withdraw-label rs-withdraw-label--sm", children: "Receive token" }),
           /* @__PURE__ */ jsxs(
             "div",
             {
@@ -560,6 +573,7 @@ function WithdrawFormStep({
                   "button",
                   {
                     type: "button",
+                    "aria-label": "Receive token",
                     className: "rs-withdraw-dropdown",
                     onClick: () => {
                       setShowTokenDropdown(!showTokenDropdown);
@@ -618,25 +632,19 @@ 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__ */ jsxs("div", { className: "rs-withdraw-error", children: [
-        /* @__PURE__ */ jsx(AlertTriangleIcon, {}),
-        /* @__PURE__ */ jsx("span", { children: error })
-      ] }),
-      !error && registrationError && /* @__PURE__ */ jsxs("div", { className: "rs-withdraw-error", children: [
-        /* @__PURE__ */ jsx(AlertTriangleIcon, {}),
-        /* @__PURE__ */ jsx("span", { children: registrationError })
-      ] })
+      error && /* @__PURE__ */ jsx(Callout, { variant: "error", children: error }),
+      !error && registrationError && /* @__PURE__ */ jsx(Callout, { variant: "error", children: registrationError }),
+      /* @__PURE__ */ jsx(
+        Button,
+        {
+          onClick: handleWithdraw,
+          fullWidth: true,
+          loading: isBusy,
+          disabled: !recipient || !amount || chainMismatch || isBusy || Boolean(registrationError),
+          children: isBusy ? "Preparing..." : registrationPending ? "Preparing session..." : !recipient ? "Enter Recipient Address" : !amount ? "Enter Withdraw Amount" : "Withdraw"
+        }
+      )
     ] }),
-    /* @__PURE__ */ jsx("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx(
-      Button,
-      {
-        onClick: handleWithdraw,
-        fullWidth: true,
-        loading: isBusy,
-        disabled: !recipient || !amount || chainMismatch || isBusy || Boolean(registrationError),
-        children: isBusy ? "Preparing..." : registrationPending ? "Preparing session..." : !recipient ? "Enter Recipient Address" : !amount ? "Enter Withdraw Amount" : "Withdraw"
-      }
-    ) }),
     /* @__PURE__ */ jsx(PoweredBy, {})
   ] });
 }
@@ -694,60 +702,54 @@ function WithdrawReviewStep({
           title: "Review withdrawal"
         }
       ),
-      /* @__PURE__ */ jsxs2("div", { className: "rs-amount-details", children: [
-        /* @__PURE__ */ jsxs2("div", { className: "rs-amount-detail-row", children: [
+      /* @__PURE__ */ jsxs2("div", { className: "rs-review-details", children: [
+        /* @__PURE__ */ jsxs2("div", { className: "rs-review-detail-row", children: [
           /* @__PURE__ */ jsx2("span", { children: "You send" }),
-          /* @__PURE__ */ jsxs2("span", { className: "rs-amount-detail-value", children: [
+          /* @__PURE__ */ jsxs2("span", { className: "rs-review-detail-value", children: [
             /* @__PURE__ */ jsxs2("span", { children: [
               amount,
               " ",
               sourceSymbol
             ] }),
-            sourceTokenIcon && /* @__PURE__ */ jsx2("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx2("img", { src: sourceTokenIcon, alt: "" }) })
+            sourceTokenIcon && /* @__PURE__ */ jsx2("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx2("img", { src: sourceTokenIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs2("div", { className: "rs-amount-detail-row", children: [
+        /* @__PURE__ */ jsxs2("div", { className: "rs-review-detail-row", children: [
           /* @__PURE__ */ jsx2("span", { children: "Source chain" }),
-          /* @__PURE__ */ jsxs2("span", { className: "rs-amount-detail-value", children: [
+          /* @__PURE__ */ jsxs2("span", { className: "rs-review-detail-value", children: [
             /* @__PURE__ */ jsx2("span", { children: sourceChainName }),
-            sourceChainIcon && /* @__PURE__ */ jsx2("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx2("img", { src: sourceChainIcon, alt: "" }) })
+            sourceChainIcon && /* @__PURE__ */ jsx2("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx2("img", { src: sourceChainIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs2("div", { className: "rs-amount-detail-row", children: [
+        /* @__PURE__ */ jsxs2("div", { className: "rs-review-detail-row", children: [
           /* @__PURE__ */ jsx2("span", { children: "Recipient" }),
-          /* @__PURE__ */ jsx2("span", { className: "rs-amount-detail-value", children: /* @__PURE__ */ jsx2("span", { children: shortenAddress(recipient) }) })
+          /* @__PURE__ */ jsx2("span", { className: "rs-review-detail-value", children: /* @__PURE__ */ jsx2("span", { children: shortenAddress(recipient) }) })
         ] }),
-        /* @__PURE__ */ jsxs2("div", { className: "rs-amount-detail-row", children: [
+        /* @__PURE__ */ jsxs2("div", { className: "rs-review-detail-row", children: [
           /* @__PURE__ */ jsx2("span", { children: "Receive" }),
-          /* @__PURE__ */ jsxs2("span", { className: "rs-amount-detail-value", children: [
+          /* @__PURE__ */ jsxs2("span", { className: "rs-review-detail-value", children: [
             /* @__PURE__ */ jsxs2("span", { children: [
               amount,
               " ",
               targetSymbol
             ] }),
-            targetTokenIcon && /* @__PURE__ */ jsx2("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx2("img", { src: targetTokenIcon, alt: "" }) })
+            targetTokenIcon && /* @__PURE__ */ jsx2("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx2("img", { src: targetTokenIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs2("div", { className: "rs-amount-detail-row", children: [
+        /* @__PURE__ */ jsxs2("div", { className: "rs-review-detail-row", children: [
           /* @__PURE__ */ jsx2("span", { children: "Destination chain" }),
-          /* @__PURE__ */ jsxs2("span", { className: "rs-amount-detail-value", children: [
+          /* @__PURE__ */ jsxs2("span", { className: "rs-review-detail-value", children: [
             /* @__PURE__ */ jsx2("span", { children: targetChainName }),
-            targetChainIcon && /* @__PURE__ */ jsx2("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx2("img", { src: targetChainIcon, alt: "" }) })
+            targetChainIcon && /* @__PURE__ */ jsx2("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx2("img", { src: targetChainIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs2("div", { className: "rs-amount-detail-row", children: [
+        /* @__PURE__ */ jsxs2("div", { className: "rs-review-detail-row", children: [
           /* @__PURE__ */ jsx2("span", { children: "Estimated time" }),
-          /* @__PURE__ */ jsx2("span", { className: "rs-amount-detail-value", children: estimatedTime })
+          /* @__PURE__ */ jsx2("span", { className: "rs-review-detail-value", children: estimatedTime })
         ] })
       ] }),
-      error && /* @__PURE__ */ jsxs2("div", { className: "rs-amount-error", role: "alert", children: [
-        /* @__PURE__ */ jsx2(AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
-        /* @__PURE__ */ jsx2("span", { children: error })
-      ] }),
-      !error && registrationError && /* @__PURE__ */ jsxs2("div", { className: "rs-amount-error", role: "alert", children: [
-        /* @__PURE__ */ jsx2(AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
-        /* @__PURE__ */ jsx2("span", { children: registrationError })
-      ] }),
+      error && /* @__PURE__ */ jsx2(Callout, { variant: "error", children: error }),
+      !error && registrationError && /* @__PURE__ */ jsx2(Callout, { variant: "error", children: registrationError }),
       /* @__PURE__ */ jsx2(
         Button,
         {
@@ -765,293 +767,8 @@ function WithdrawReviewStep({
 }
 WithdrawReviewStep.displayName = "WithdrawReviewStep";
 
-// src/core/safe.ts
-import {
-  concat,
-  encodeFunctionData,
-  erc20Abi as erc20Abi2,
-  hashTypedData,
-  pad,
-  parseEventLogs,
-  toHex,
-  zeroAddress
-} from "viem";
-var SAFE_ABI = [
-  {
-    type: "function",
-    name: "isOwner",
-    stateMutability: "view",
-    inputs: [{ name: "owner", type: "address" }],
-    outputs: [{ name: "", type: "bool" }]
-  },
-  {
-    type: "function",
-    name: "nonce",
-    stateMutability: "view",
-    inputs: [],
-    outputs: [{ type: "uint256" }]
-  },
-  {
-    type: "function",
-    name: "execTransaction",
-    stateMutability: "payable",
-    inputs: [
-      { name: "to", type: "address" },
-      { name: "value", type: "uint256" },
-      { name: "data", type: "bytes" },
-      { name: "operation", type: "uint8" },
-      { name: "safeTxGas", type: "uint256" },
-      { name: "baseGas", type: "uint256" },
-      { name: "gasPrice", type: "uint256" },
-      { name: "gasToken", type: "address" },
-      { name: "refundReceiver", type: "address" },
-      { name: "signatures", type: "bytes" }
-    ],
-    outputs: [{ name: "success", type: "bool" }]
-  },
-  {
-    type: "event",
-    name: "ExecutionSuccess",
-    inputs: [
-      { name: "txHash", type: "bytes32", indexed: true },
-      { name: "payment", type: "uint256", indexed: false }
-    ],
-    anonymous: false
-  },
-  {
-    type: "event",
-    name: "ExecutionFailure",
-    inputs: [
-      { name: "txHash", type: "bytes32", indexed: true },
-      { name: "payment", type: "uint256", indexed: false }
-    ],
-    anonymous: false
-  }
-];
-async function executeSafeEthTransfer(params) {
-  const {
-    walletClient,
-    publicClient,
-    safeAddress,
-    recipient,
-    amount,
-    chainId
-  } = params;
-  const account = walletClient.account;
-  const chain = walletClient.chain;
-  if (!account || !chain) {
-    throw new Error("Wallet not connected");
-  }
-  if (chain.id !== chainId) {
-    throw new Error(`Switch to ${getChainName(chainId)} to sign`);
-  }
-  const isOwner = await publicClient.readContract({
-    address: safeAddress,
-    abi: SAFE_ABI,
-    functionName: "isOwner",
-    args: [account.address]
-  });
-  if (!isOwner) {
-    throw new Error("Connected wallet is not a Safe owner");
-  }
-  const safeTx = {
-    to: recipient,
-    value: amount,
-    data: "0x",
-    operation: 0,
-    safeTxGas: 0n,
-    baseGas: 0n,
-    gasPrice: 0n,
-    gasToken: zeroAddress,
-    refundReceiver: zeroAddress
-  };
-  const signature = concat([
-    pad(account.address, { size: 32 }),
-    pad(toHex(0), { size: 32 }),
-    toHex(1, { size: 1 })
-  ]);
-  const txHash = await walletClient.writeContract({
-    account,
-    chain,
-    address: safeAddress,
-    abi: SAFE_ABI,
-    functionName: "execTransaction",
-    args: [
-      safeTx.to,
-      safeTx.value,
-      safeTx.data,
-      safeTx.operation,
-      safeTx.safeTxGas,
-      safeTx.baseGas,
-      safeTx.gasPrice,
-      safeTx.gasToken,
-      safeTx.refundReceiver,
-      signature
-    ]
-  });
-  const receipt = await publicClient.waitForTransactionReceipt({
-    hash: txHash
-  });
-  const safeLogs = receipt.logs.filter(
-    (log) => log.address.toLowerCase() === safeAddress.toLowerCase()
-  );
-  const parsed = parseEventLogs({
-    abi: SAFE_ABI,
-    logs: safeLogs,
-    strict: false
-  });
-  const failed = parsed.find((log) => log.eventName === "ExecutionFailure");
-  if (failed) {
-    throw new Error("Safe transaction failed");
-  }
-  const succeeded = parsed.find((log) => log.eventName === "ExecutionSuccess");
-  if (!succeeded) {
-    throw new Error("Safe transaction status unavailable");
-  }
-  return { txHash };
-}
-async function executeSafeErc20Transfer(params) {
-  const {
-    walletClient,
-    publicClient,
-    safeAddress,
-    tokenAddress,
-    recipient,
-    amount,
-    chainId
-  } = params;
-  const account = walletClient.account;
-  const chain = walletClient.chain;
-  if (!account || !chain) {
-    throw new Error("Wallet not connected");
-  }
-  if (chain.id !== chainId) {
-    throw new Error(`Switch to ${getChainName(chainId)} to sign`);
-  }
-  const isOwner = await publicClient.readContract({
-    address: safeAddress,
-    abi: SAFE_ABI,
-    functionName: "isOwner",
-    args: [account.address]
-  });
-  if (!isOwner) {
-    throw new Error("Connected wallet is not a Safe owner");
-  }
-  const data = encodeFunctionData({
-    abi: erc20Abi2,
-    functionName: "transfer",
-    args: [recipient, amount]
-  });
-  const safeTx = {
-    to: tokenAddress,
-    value: 0n,
-    data,
-    operation: 0,
-    safeTxGas: 0n,
-    baseGas: 0n,
-    gasPrice: 0n,
-    gasToken: zeroAddress,
-    refundReceiver: zeroAddress
-  };
-  const signature = concat([
-    pad(account.address, { size: 32 }),
-    pad(toHex(0), { size: 32 }),
-    toHex(1, { size: 1 })
-  ]);
-  const txHash = await walletClient.writeContract({
-    account,
-    chain,
-    address: safeAddress,
-    abi: SAFE_ABI,
-    functionName: "execTransaction",
-    args: [
-      safeTx.to,
-      safeTx.value,
-      safeTx.data,
-      safeTx.operation,
-      safeTx.safeTxGas,
-      safeTx.baseGas,
-      safeTx.gasPrice,
-      safeTx.gasToken,
-      safeTx.refundReceiver,
-      signature
-    ]
-  });
-  const receipt = await publicClient.waitForTransactionReceipt({
-    hash: txHash
-  });
-  const safeLogs = receipt.logs.filter(
-    (log) => log.address.toLowerCase() === safeAddress.toLowerCase()
-  );
-  const parsed = parseEventLogs({
-    abi: SAFE_ABI,
-    logs: safeLogs,
-    strict: false
-  });
-  const failed = parsed.find((log) => log.eventName === "ExecutionFailure");
-  if (failed) {
-    throw new Error("Safe transaction failed");
-  }
-  const succeeded = parsed.find((log) => log.eventName === "ExecutionSuccess");
-  if (!succeeded) {
-    throw new Error("Safe transaction status unavailable");
-  }
-  return { txHash };
-}
-var SAFE_TX_TYPES = {
-  SafeTx: [
-    { name: "to", type: "address" },
-    { name: "value", type: "uint256" },
-    { name: "data", type: "bytes" },
-    { name: "operation", type: "uint8" },
-    { name: "safeTxGas", type: "uint256" },
-    { name: "baseGas", type: "uint256" },
-    { name: "gasPrice", type: "uint256" },
-    { name: "gasToken", type: "address" },
-    { name: "refundReceiver", type: "address" },
-    { name: "nonce", type: "uint256" }
-  ]
-};
-async function buildSafeTransaction(params) {
-  const { publicClient, safeAddress, to, value, data, chainId } = params;
-  const nonce = await publicClient.readContract({
-    address: safeAddress,
-    abi: SAFE_ABI,
-    functionName: "nonce"
-  });
-  const message = {
-    to,
-    value,
-    data,
-    operation: 0,
-    safeTxGas: 0n,
-    baseGas: 0n,
-    gasPrice: 0n,
-    gasToken: zeroAddress,
-    refundReceiver: zeroAddress,
-    nonce
-  };
-  const safeTxHash = hashTypedData({
-    domain: { chainId, verifyingContract: safeAddress },
-    types: SAFE_TX_TYPES,
-    primaryType: "SafeTx",
-    message
-  });
-  return {
-    chainId,
-    safeAddress,
-    safeTxHash,
-    typedData: {
-      domain: { chainId, verifyingContract: safeAddress },
-      types: SAFE_TX_TYPES,
-      primaryType: "SafeTx",
-      message
-    }
-  };
-}
-
 // src/WithdrawFlow.tsx
-import { encodeFunctionData as encodeFunctionData2, erc20Abi as erc20Abi3, parseUnits as parseUnits2 } from "viem";
+import { encodeFunctionData, erc20Abi as erc20Abi2, 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;
@@ -1087,7 +804,6 @@ function WithdrawFlow({
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
-  waitForFinalTx = true,
   reownWallet,
   onConnect,
   onDisconnect,
@@ -1475,8 +1191,8 @@ function WithdrawFlow({
           const transferData = isSourceNative ? { to: transferTarget, value: amountUnits, data: "0x" } : {
             to: sourceToken,
             value: 0n,
-            data: encodeFunctionData2({
-              abi: erc20Abi3,
+            data: encodeFunctionData({
+              abi: erc20Abi2,
               functionName: "transfer",
               args: [transferTarget, amountUnits]
             })
@@ -1575,6 +1291,10 @@ function WithdrawFlow({
         txHash,
         destinationTxHash,
         amount: context.amount,
+        // Withdraw targets are always EVM — WithdrawModalProps.targetChain is
+        // Chain | number (never "solana"). The context union is wide only
+        // because ProcessingStep is shared with the deposit flow, so narrow
+        // back here.
         sourceChain: context.sourceChain,
         sourceToken: context.sourceToken,
         targetChain: context.targetChain,
@@ -1670,10 +1390,18 @@ function WithdrawFlow({
     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,
       {
-        walletOptions,
+        walletRows: withdrawRows,
         onConfirmWallet: (walletId) => {
           setSelectedWalletId(walletId);
           setIsConnectSelectionConfirmed(true);
@@ -1743,7 +1471,6 @@ function WithdrawFlow({
         targetToken,
         amount: storeApi.getState().amount ?? "0",
         directTransfer: isSameRoute,
-        waitForFinalTx,
         service,
         flowLabel: "withdraw",
         onClose,
@@ -1767,7 +1494,7 @@ function deriveStepView(step, _registration) {
 // src/WithdrawModal.tsx
 import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
 var ReownWithdrawInner = lazy(
-  () => import("./WithdrawModalReown-SQQQV6KQ.mjs").then((m) => ({
+  () => import("./WithdrawModalReown-QEQPCSWT.mjs").then((m) => ({
     default: m.WithdrawModalReown
   }))
 );
@@ -1799,7 +1526,6 @@ function WithdrawModalInner({
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
-  waitForFinalTx = true,
   reownWallet,
   onConnect,
   onDisconnect,
@@ -1904,7 +1630,6 @@ function WithdrawModalInner({
             signerAddress,
             sessionChainIds,
             forceRegister,
-            waitForFinalTx,
             reownWallet,
             onConnect,
             onDisconnect,