@rhinestone/deposit-modal 0.1.23 → 0.1.24

package/dist/{chunk-V6HZJZOL.cjs → chunk-O3I5KVXA.cjs}

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
 
 
@@ -16,11 +16,7 @@
 
 
 
-
-
-
-
-var _chunkBO745KABcjs = require('./chunk-BO745KAB.cjs');
+var _chunkANQQMGNNcjs = require('./chunk-ANQQMGNN.cjs');
 
 
 
@@ -43,8 +39,6 @@ var _chunkCEIWN53Ncjs = require('./chunk-CEIWN53N.cjs');
 
 
 
-
-
 var _react = require('react');
 
 // src/WithdrawFlow.tsx
@@ -115,7 +109,7 @@ function WithdrawFormStep({
       setIsSwitching(true);
       switchChain(asset.chainId).catch((err) => {
         const raw = err instanceof Error ? err.message : "Failed to switch chain";
-        setError(_chunkBO745KABcjs.formatUserError.call(void 0, raw));
+        setError(_chunkANQQMGNNcjs.formatUserError.call(void 0, raw));
       }).finally(() => {
         setIsSwitching(false);
       });
@@ -132,7 +126,7 @@ function WithdrawFormStep({
         return;
       }
       try {
-        const bal = _chunkBO745KABcjs.isNativeAsset.call(void 0, asset) ? await publicClient.getBalance({ address: safeAddress }) : await publicClient.readContract({
+        const bal = _chunkANQQMGNNcjs.isNativeAsset.call(void 0, asset) ? await publicClient.getBalance({ address: safeAddress }) : await publicClient.readContract({
           address: asset.token,
           abi: _viem.erc20Abi,
           functionName: "balanceOf",
@@ -234,7 +228,7 @@ function WithdrawFormStep({
       await onSubmit(recipient, amount);
     } catch (err) {
       const raw = err instanceof Error ? err.message : "Withdrawal failed";
-      setError(_chunkBO745KABcjs.formatUserError.call(void 0, raw));
+      setError(_chunkANQQMGNNcjs.formatUserError.call(void 0, raw));
     } finally {
       setIsSubmitting(false);
     }
@@ -246,7 +240,7 @@ function WithdrawFormStep({
       await switchChain(asset.chainId);
     } catch (err) {
       const raw = err instanceof Error ? err.message : "Failed to switch chain";
-      setError(_chunkBO745KABcjs.formatUserError.call(void 0, raw));
+      setError(_chunkANQQMGNNcjs.formatUserError.call(void 0, raw));
     } finally {
       setIsSwitching(false);
     }
@@ -336,7 +330,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 ? _chunkBO745KABcjs.currencyFormatter.format(amountUsd) : "$0.00" }),
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-withdraw-usd", children: amountUsd !== null ? _chunkANQQMGNNcjs.currencyFormatter.format(amountUsd) : "$0.00" }),
           /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "rs-withdraw-balance", children: [
             formattedBalance,
             " ",
@@ -513,7 +507,7 @@ function WithdrawFormStep({
           " to continue."
         ] }),
         switchChain && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-          _chunkBO745KABcjs.Button,
+          _chunkANQQMGNNcjs.Button,
           {
             variant: "outline",
             size: "small",
@@ -545,7 +539,7 @@ function WithdrawFormStep({
       ] })
     ] }),
     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step-footer", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkBO745KABcjs.Button,
+      _chunkANQQMGNNcjs.Button,
       {
         onClick: handleWithdraw,
         fullWidth: true,
@@ -554,14 +548,11 @@ function WithdrawFormStep({
         children: isBusy ? "Preparing..." : "Withdraw"
       }
     ) }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkBO745KABcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkANQQMGNNcjs.PoweredBy, {})
   ] });
 }
 WithdrawFormStep.displayName = "WithdrawFormStep";
 
-// src/WithdrawFlow.tsx
-var _sdk = require('@rhinestone/sdk');
-
 // src/core/safe.ts
 
 
@@ -862,7 +853,6 @@ function WithdrawFlow({
   recipient: defaultRecipient,
   amount: defaultAmount,
   service,
-  rhinestoneApiKey,
   signerAddress = _chunkCEIWN53Ncjs.DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
@@ -933,14 +923,14 @@ function WithdrawFlow({
         return {
           ownerAddress: dappAddress,
           walletClient: _nullishCoalesce(dappWalletClient, () => ( void 0)),
-          publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkBO745KABcjs.getPublicClient.call(void 0, sourceChain))),
+          publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkANQQMGNNcjs.getPublicClient.call(void 0, sourceChain))),
           switchChain: dappSwitchChain
         };
       }
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
-        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkBO745KABcjs.getPublicClient.call(void 0, sourceChain))),
+        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkANQQMGNNcjs.getPublicClient.call(void 0, sourceChain))),
         switchChain: dappSwitchChain
       };
     }
@@ -949,7 +939,7 @@ function WithdrawFlow({
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
-        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkBO745KABcjs.getPublicClient.call(void 0, sourceChain))),
+        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkANQQMGNNcjs.getPublicClient.call(void 0, sourceChain))),
         switchChain: dappSwitchChain
       };
     }
@@ -978,7 +968,7 @@ function WithdrawFlow({
     const symbol = _chunkCEIWN53Ncjs.getTokenSymbol.call(void 0, sourceToken, sourceChain);
     const decimals = _chunkCEIWN53Ncjs.getTokenDecimalsByAddress.call(void 0, sourceToken, sourceChain);
     return {
-      id: _chunkBO745KABcjs.getAssetId.call(void 0, { chainId: sourceChain, token: sourceToken }),
+      id: _chunkANQQMGNNcjs.getAssetId.call(void 0, { chainId: sourceChain, token: sourceToken }),
       chainId: sourceChain,
       token: sourceToken,
       symbol,
@@ -1008,20 +998,30 @@ function WithdrawFlow({
     [onError]
   );
   const resolveSessionOwner = _react.useCallback.call(void 0, async (eoaAddress) => {
-    const localOwner = _chunkBO745KABcjs.loadSessionOwnerFromStorage.call(void 0, eoaAddress);
+    const localOwner = _chunkANQQMGNNcjs.loadSessionOwnerFromStorage.call(void 0, eoaAddress);
     if (localOwner) {
       return {
-        account: _chunkBO745KABcjs.accountFromPrivateKey.call(void 0, localOwner.privateKey),
+        account: _chunkANQQMGNNcjs.accountFromPrivateKey.call(void 0, localOwner.privateKey),
         address: localOwner.address
       };
     }
-    const created = _chunkBO745KABcjs.createSessionOwnerKey.call(void 0, );
-    _chunkBO745KABcjs.saveSessionOwnerToStorage.call(void 0, eoaAddress, created.privateKey, created.address);
+    const created = _chunkANQQMGNNcjs.createSessionOwnerKey.call(void 0, );
+    _chunkANQQMGNNcjs.saveSessionOwnerToStorage.call(void 0, eoaAddress, created.privateKey, created.address);
     return {
       account: created.account,
       address: created.address
     };
   }, []);
+  const signSessionDetails = _react.useCallback.call(void 0, 
+    async (sessionOwnerAccount, typedData) => {
+      const signer = sessionOwnerAccount;
+      if (!signer.signTypedData) {
+        throw new Error("Session owner cannot sign typed data");
+      }
+      return await signer.signTypedData(typedData);
+    },
+    []
+  );
   const handleFormSubmit = _react.useCallback.call(void 0, 
     async (recipient, amountValue) => {
       const ownerAddress2 = _optionalChain([signerContext, 'optionalAccess', _22 => _22.ownerAddress]);
@@ -1036,31 +1036,32 @@ function WithdrawFlow({
       }
       setIsSubmitting(true);
       try {
-        const signerAccount = _optionalChain([signerContext, 'optionalAccess', _24 => _24.walletClient]) ? _sdk.walletClientToAccount.call(void 0, signerContext.walletClient) : _chunkBO745KABcjs.createViewOnlyAccount.call(void 0, ownerAddress2);
         const sessionOwner = await resolveSessionOwner(ownerAddress2);
-        const account = await _chunkBO745KABcjs.createSmartAccount.call(void 0, 
-          signerAccount,
-          sessionOwner.account,
-          rhinestoneApiKey
-        );
-        const smartAccount = _chunkBO745KABcjs.getAccountAddress.call(void 0, account);
+        const prepared = await service.prepareAccount({
+          ownerAddress: ownerAddress2,
+          sessionOwnerAddress: sessionOwner.address,
+          targetChain,
+          targetToken,
+          signerAddress,
+          sessionChainIds
+        });
+        const smartAccount = prepared.smartAccount;
         const checkResult = await service.checkAccount(smartAccount);
-        const targetMatches = checkResult.targetChain === targetChain && _optionalChain([checkResult, 'access', _25 => _25.targetToken, 'optionalAccess', _26 => _26.toLowerCase, 'call', _27 => _27()]) === targetToken.toLowerCase();
+        const targetMatches = checkResult.targetChain === targetChain && _optionalChain([checkResult, 'access', _24 => _24.targetToken, 'optionalAccess', _25 => _25.toLowerCase, 'call', _26 => _26()]) === targetToken.toLowerCase();
         if (!checkResult.isRegistered || forceRegister || !targetMatches) {
-          const initData = _chunkBO745KABcjs.getAccountInitData.call(void 0, account);
-          const sessionDetails = await _chunkBO745KABcjs.getSessionDetails.call(void 0, 
-            account,
-            targetChainObj,
-            signerAddress,
+          const signature = await signSessionDetails(
             sessionOwner.account,
-            targetToken,
-            sessionChainIds
+            prepared.sessionDetailsUnsigned.data
+          );
+          const sessionDetails = _chunkANQQMGNNcjs.buildSessionDetails.call(void 0, 
+            prepared.sessionDetailsUnsigned,
+            signature
           );
           await service.registerAccount({
             address: smartAccount,
             accountParams: {
-              factory: initData.factory,
-              factoryData: initData.factoryData,
+              factory: prepared.accountParams.factory,
+              factoryData: prepared.accountParams.factoryData,
               sessionDetails
             },
             eoaAddress: ownerAddress2,
@@ -1074,7 +1075,7 @@ function WithdrawFlow({
         }
         handleConnected(ownerAddress2, smartAccount);
         const amountUnits = _viem.parseUnits.call(void 0, amountValue, asset.decimals);
-        const pc = _nullishCoalesce(_optionalChain([signerContext, 'optionalAccess', _28 => _28.publicClient]), () => ( _chunkBO745KABcjs.getPublicClient.call(void 0, sourceChain)));
+        const pc = _nullishCoalesce(_optionalChain([signerContext, 'optionalAccess', _27 => _27.publicClient]), () => ( _chunkANQQMGNNcjs.getPublicClient.call(void 0, sourceChain)));
         let result;
         if (onRelayTransaction) {
           const transferData = isSourceNative ? { to: smartAccount, value: amountUnits, data: "0x" } : {
@@ -1115,7 +1116,7 @@ function WithdrawFlow({
             chainId: sourceChain
           });
         }
-        _optionalChain([onWithdrawSubmitted, 'optionalCall', _29 => _29({
+        _optionalChain([onWithdrawSubmitted, 'optionalCall', _28 => _28({
           txHash: result.txHash,
           sourceChain,
           amount: amountUnits.toString(),
@@ -1131,7 +1132,7 @@ function WithdrawFlow({
         });
       } catch (err) {
         const raw = err instanceof Error ? err.message : "Withdraw failed";
-        handleError(_chunkBO745KABcjs.formatUserError.call(void 0, raw), "WITHDRAW_FLOW_ERROR");
+        handleError(_chunkANQQMGNNcjs.formatUserError.call(void 0, raw), "WITHDRAW_FLOW_ERROR");
         throw err;
       } finally {
         setIsSubmitting(false);
@@ -1147,7 +1148,6 @@ function WithdrawFlow({
       targetChain,
       targetToken,
       service,
-      rhinestoneApiKey,
       handleConnected,
       asset.decimals,
       safeAddress,
@@ -1156,18 +1156,19 @@ function WithdrawFlow({
       onWithdrawSubmitted,
       onRelayTransaction,
       isSourceNative,
-      handleError
+      handleError,
+      signSessionDetails
     ]
   );
   const handleWithdrawComplete = _react.useCallback.call(void 0, 
     (txHash, destinationTxHash) => {
-      _optionalChain([onWithdrawComplete, 'optionalCall', _30 => _30({ txHash, destinationTxHash })]);
+      _optionalChain([onWithdrawComplete, 'optionalCall', _29 => _29({ txHash, destinationTxHash })]);
     },
     [onWithdrawComplete]
   );
   const handleWithdrawFailed = _react.useCallback.call(void 0, 
     (txHash, error) => {
-      _optionalChain([onWithdrawFailed, 'optionalCall', _31 => _31({ txHash, error })]);
+      _optionalChain([onWithdrawFailed, 'optionalCall', _30 => _30({ txHash, error })]);
     },
     [onWithdrawFailed]
   );
@@ -1225,7 +1226,7 @@ function WithdrawFlow({
   }, [walletOptionsKey, selectedConnectAddressEffective]);
   if (showConnectStep) {
     return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-modal-body", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkBO745KABcjs.ConnectStep,
+      _chunkANQQMGNNcjs.ConnectStep,
       {
         walletOptions,
         selectedAddress: selectedConnectAddressEffective,
@@ -1245,7 +1246,7 @@ function WithdrawFlow({
   if (!signerContext) return null;
   if (!onRelayTransaction && !signerContext.walletClient) return null;
   const ownerAddress = signerContext.ownerAddress;
-  const formPublicClient = _nullishCoalesce(signerContext.publicClient, () => ( _chunkBO745KABcjs.getPublicClient.call(void 0, sourceChain)));
+  const formPublicClient = _nullishCoalesce(signerContext.publicClient, () => ( _chunkANQQMGNNcjs.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,
@@ -1270,7 +1271,7 @@ function WithdrawFlow({
       }
     ),
     step.type === "processing" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkBO745KABcjs.ProcessingStep,
+      _chunkANQQMGNNcjs.ProcessingStep,
       {
         smartAccount: step.smartAccount,
         txHash: step.txHash,
@@ -1295,15 +1296,11 @@ function WithdrawFlow({
 
 // src/WithdrawModal.tsx
 
-var ReownWithdrawInner = _react.lazy.call(void 0, 
-  () => Promise.resolve().then(() => _interopRequireWildcard(require("./WithdrawModalReown-ZNTE2G6W.cjs"))).then((m) => ({
-    default: m.WithdrawModalReown
-  }))
-);
 function WithdrawModal(props) {
-  const needsReown = !!props.reownAppId;
-  if (needsReown) {
-    return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _react.Suspense, { fallback: null, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ReownWithdrawInner, { ...props }) });
+  if (props.reownAppId) {
+    throw new Error(
+      'Reown support moved to "@rhinestone/deposit-modal/reown". Use that entrypoint when passing reownAppId.'
+    );
   }
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, WithdrawModalInner, { ...props });
 }
@@ -1323,7 +1320,6 @@ function WithdrawModalInner({
   onClose,
   inline,
   backendUrl = _chunkCEIWN53Ncjs.DEFAULT_BACKEND_URL,
-  rhinestoneApiKey,
   signerAddress = _chunkCEIWN53Ncjs.DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
@@ -1351,17 +1347,17 @@ function WithdrawModalInner({
   const backHandlerRef = _react.useRef.call(void 0, void 0);
   const targetChain = _chunkCEIWN53Ncjs.getChainId.call(void 0, targetChainProp);
   const sourceChain = _chunkCEIWN53Ncjs.getChainId.call(void 0, sourceChainProp);
-  const service = _react.useMemo.call(void 0, () => _chunkBO745KABcjs.createDepositService.call(void 0, backendUrl), [backendUrl]);
+  const service = _react.useMemo.call(void 0, () => _chunkANQQMGNNcjs.createDepositService.call(void 0, backendUrl), [backendUrl]);
   _react.useEffect.call(void 0, () => {
     if (isOpen && modalRef.current) {
-      _chunkBO745KABcjs.applyTheme.call(void 0, modalRef.current, theme);
+      _chunkANQQMGNNcjs.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', _32 => _32()]);
+      _optionalChain([onReady, 'optionalCall', _31 => _31()]);
     }
   }, [isOpen, onReady]);
   _react.useEffect.call(void 0, () => {
@@ -1380,17 +1376,17 @@ function WithdrawModalInner({
     setTotalBalanceUsd(balance);
   }, []);
   const handleBack = _react.useCallback.call(void 0, () => {
-    _optionalChain([backHandlerRef, 'access', _33 => _33.current, 'optionalCall', _34 => _34()]);
+    _optionalChain([backHandlerRef, 'access', _32 => _32.current, 'optionalCall', _33 => _33()]);
   }, []);
-  const showLogo = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _35 => _35.showLogo]), () => ( false));
-  const showStepper = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _36 => _36.showStepper]), () => ( false));
-  const showBackButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _37 => _37.showBackButton]), () => ( true));
-  const balanceTitle = _optionalChain([uiConfig, 'optionalAccess', _38 => _38.balanceTitle]);
-  const logoUrl = _nullishCoalesce(_optionalChain([branding, 'optionalAccess', _39 => _39.logoUrl]), () => ( "https://github.com/rhinestonewtf.png"));
-  const title = _nullishCoalesce(_optionalChain([branding, 'optionalAccess', _40 => _40.title]), () => ( "Withdraw"));
+  const showLogo = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _34 => _34.showLogo]), () => ( false));
+  const showStepper = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _35 => _35.showStepper]), () => ( false));
+  const showBackButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _36 => _36.showBackButton]), () => ( true));
+  const balanceTitle = _optionalChain([uiConfig, 'optionalAccess', _37 => _37.balanceTitle]);
+  const logoUrl = _nullishCoalesce(_optionalChain([branding, 'optionalAccess', _38 => _38.logoUrl]), () => ( "https://github.com/rhinestonewtf.png"));
+  const title = _nullishCoalesce(_optionalChain([branding, 'optionalAccess', _39 => _39.title]), () => ( "Withdraw"));
   const canGoBack = currentStepIndex > 0 && currentStepIndex < 3 && backHandlerRef.current;
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-    _chunkBO745KABcjs.Modal,
+    _chunkANQQMGNNcjs.Modal,
     {
       isOpen,
       onClose,
@@ -1448,7 +1444,7 @@ function WithdrawModalInner({
             ] }),
             balanceTitle && totalBalanceUsd !== null && /* @__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: balanceTitle }),
-              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-modal-header-balance-value", children: _chunkBO745KABcjs.currencyFormatter.format(totalBalanceUsd) })
+              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-modal-header-balance-value", children: _chunkANQQMGNNcjs.currencyFormatter.format(totalBalanceUsd) })
             ] })
           ] }),
           /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-modal-header-nav-right", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
@@ -1492,7 +1488,6 @@ function WithdrawModalInner({
             recipient,
             amount: defaultAmount,
             service,
-            rhinestoneApiKey,
             signerAddress,
             sessionChainIds,
             forceRegister,