@rhinestone/deposit-modal 0.4.2 → 0.5.0

package/dist/{chunk-7EQQD7B4.mjs → chunk-PS7HJ62M.mjs}

@@ -1395,31 +1395,49 @@ function formatUserError(raw) {
   return cleaned;
 }
 
+// src/core/rpc.ts
+import { createContext, useContext } from "react";
+function rpcUrlFor(rpcUrls, chain) {
+  const url = rpcUrls?.[chain]?.trim();
+  return url ? url : void 0;
+}
+var RpcUrlsContext = createContext(void 0);
+var RpcUrlsProvider = RpcUrlsContext.Provider;
+function useRpcUrls() {
+  return useContext(RpcUrlsContext);
+}
+
 // src/core/public-client.ts
 import { createPublicClient, http } from "viem";
 import { hyperliquid } from "viem/chains";
 var clientCache = /* @__PURE__ */ new Map();
-function getPublicClient(chainId) {
-  let client = clientCache.get(chainId);
+function getPublicClient(chainId, rpcUrls) {
+  const url = rpcUrlFor(rpcUrls, chainId);
+  const cacheKey = `${chainId}|${url ?? ""}`;
+  let client = clientCache.get(cacheKey);
   if (!client) {
     const chain = CHAIN_BY_ID[chainId];
     client = createPublicClient({
       chain,
-      transport: http()
+      transport: http(url)
     });
-    clientCache.set(chainId, client);
+    clientCache.set(cacheKey, client);
   }
   return client;
 }
-var hyperEvmClient;
-function getHyperEvmReadClient() {
-  if (!hyperEvmClient) {
-    hyperEvmClient = createPublicClient({
+var hyperEvmClientCache = /* @__PURE__ */ new Map();
+function getHyperEvmReadClient(rpcUrls) {
+  const url = rpcUrlFor(rpcUrls, hyperliquid.id);
+  const cacheKey = url ?? "";
+  let client = hyperEvmClientCache.get(cacheKey);
+  if (!client) {
+    client = createPublicClient({
       chain: hyperliquid,
-      transport: http()
+      transport: http(url)
     });
+    hyperEvmClientCache.set(cacheKey, client);
   }
-  return hyperEvmClient;
+  return client;
 }
 
 // src/core/theme.ts
@@ -2789,6 +2807,7 @@ FeesAccordion.displayName = "FeesAccordion";
 import { jsx as jsx22, jsxs as jsxs20 } from "react/jsx-runtime";
 function SwappedReceipt({
   onrampMethod,
+  onrampMethodIcon,
   amountPaid,
   depositedAmount,
   depositedIcon,
@@ -2804,14 +2823,17 @@ function SwappedReceipt({
       /* @__PURE__ */ jsxs20("div", { className: "rs-review-details", children: [
         onrampMethod && /* @__PURE__ */ jsxs20("div", { className: "rs-review-detail-row", children: [
           /* @__PURE__ */ jsx22("span", { children: "Onramp method" }),
-          /* @__PURE__ */ jsx22("span", { className: "rs-review-detail-value", children: onrampMethod })
+          /* @__PURE__ */ jsxs20("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsx22("span", { children: onrampMethod }),
+            onrampMethodIcon && /* @__PURE__ */ jsx22("span", { className: "rs-review-detail-icon rs-review-detail-icon--square", children: /* @__PURE__ */ jsx22("img", { src: onrampMethodIcon, alt: "" }) })
+          ] })
         ] }),
         amountPaid && /* @__PURE__ */ jsxs20("div", { className: "rs-review-detail-row", children: [
           /* @__PURE__ */ jsx22("span", { children: "Amount paid" }),
           /* @__PURE__ */ jsx22("span", { className: "rs-review-detail-value", children: amountPaid })
         ] }),
         /* @__PURE__ */ jsxs20("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx22("span", { children: "Deposited amount" }),
+          /* @__PURE__ */ jsx22("span", { children: "Receive" }),
           /* @__PURE__ */ jsxs20("span", { className: "rs-review-detail-value", children: [
             /* @__PURE__ */ jsx22("span", { children: depositedAmount }),
             depositedIcon && /* @__PURE__ */ jsx22("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx22("img", { src: depositedIcon, alt: "" }) })
@@ -3327,6 +3349,7 @@ function ProcessingStep({
   quotedFeeSymbol,
   balanceAfterUsd,
   isSwappedOrder,
+  swappedContext,
   onClose,
   onNewDeposit,
   onRetry,
@@ -3437,10 +3460,12 @@ function ProcessingStep({
       if (cancelled || !res) return;
       if (res.transactionId != null) {
         if (res.transactionId.toLowerCase() !== txHash.toLowerCase()) return;
-      } else if (!isSwappedOrder) {
+      } else if (!isSwappedOrder || swappedContext?.variant === "connect") {
         return;
       }
       setSwappedFiatContext({
+        orderCrypto: res.orderCrypto,
+        orderCryptoAmount: res.orderCryptoAmount,
         paidAmountUsd: res.paidAmountUsd,
         paidAmountEur: res.paidAmountEur,
         onrampFeeUsd: res.onrampFeeUsd,
@@ -3451,7 +3476,7 @@ function ProcessingStep({
     return () => {
       cancelled = true;
     };
-  }, [service, smartAccount, txHash, isSwappedOrder]);
+  }, [service, smartAccount, txHash, isSwappedOrder, swappedContext?.variant]);
   useEffect5(() => {
     if (directTransfer) return;
     if (state.type !== "processing") {
@@ -3727,8 +3752,14 @@ function ProcessingStep({
     /* @__PURE__ */ jsx23("div", { className: "rs-body-header-text", children: /* @__PURE__ */ jsx23("h2", { className: "rs-body-header-title", children: stateTitle }) })
   ] }) : /* @__PURE__ */ jsx23(BodyHeader, { icon: /* @__PURE__ */ jsx23(WalletIcon, {}), title: stateTitle });
   if (isComplete && isSwappedOrder) {
-    const onrampMethod = swappedFiatContext?.paymentMethod ? formatPaymentMethod(swappedFiatContext.paymentMethod) : null;
-    const amountPaid = swappedFiatContext?.paidAmountUsd != null ? `$${swappedFiatContext.paidAmountUsd.toFixed(2)}` : null;
+    const effectivePaymentMethod = swappedContext?.method ?? swappedFiatContext?.paymentMethod ?? null;
+    const onrampMethod = effectivePaymentMethod ? formatPaymentMethod(effectivePaymentMethod) : null;
+    const onrampMethodIcon = swappedContext?.variant === "connect" && effectivePaymentMethod ? getExchangeLogoSrc(
+      onrampMethod ?? effectivePaymentMethod,
+      effectivePaymentMethod
+    ) : null;
+    const connectPaidAmount = swappedContext?.variant === "connect" ? `${formattedSentAmount} ${sourceSymbol}` : null;
+    const amountPaid = connectPaidAmount ?? (swappedFiatContext?.paidAmountUsd != null ? `$${swappedFiatContext.paidAmountUsd.toFixed(2)}` : null);
     const depositedAmount = receiveDisplay;
     const onrampFeeUsd = swappedFiatContext?.onrampFeeUsd ?? null;
     const networkFeeUsd = quotedFeeAmount !== void 0 && Number.isFinite(Number(quotedFeeAmount)) ? Number(quotedFeeAmount) : null;
@@ -3750,6 +3781,7 @@ function ProcessingStep({
       SwappedReceipt,
       {
         onrampMethod,
+        onrampMethodIcon,
         amountPaid,
         depositedAmount,
         depositedIcon: targetTokenIcon,
@@ -4041,6 +4073,9 @@ export {
   failureMessageForEvent,
   useTokenPrices,
   ProcessingStep,
+  rpcUrlFor,
+  RpcUrlsProvider,
+  useRpcUrls,
   getPublicClient,
   getHyperEvmReadClient,
   loadSessionOwnerFromStorage,

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

@@ -10,6 +10,7 @@ import {
   Modal,
   PoweredBy,
   ProcessingStep,
+  RpcUrlsProvider,
   Spinner,
   WalletIcon,
   accountFromPrivateKey,
@@ -29,8 +30,9 @@ import {
   loadSessionOwnerFromStorage,
   saveSessionOwnerToStorage,
   useLatestRef,
+  useRpcUrls,
   useTokenPrices
-} from "./chunk-7EQQD7B4.mjs";
+} from "./chunk-PS7HJ62M.mjs";
 import {
   buildSafeTransaction,
   executeSafeErc20Transfer,
@@ -200,6 +202,7 @@ function WithdrawFormStep({
   publicClient,
   connectedRecipient,
   safeAddress,
+  depositAddress,
   asset,
   defaultRecipient,
   defaultAmount,
@@ -361,6 +364,13 @@ function WithdrawFormStep({
       setError("Enter a valid recipient address");
       return;
     }
+    const lowerRecipient = recipient.toLowerCase();
+    if (lowerRecipient === safeAddress.toLowerCase() || lowerRecipient === depositAddress?.toLowerCase()) {
+      setError(
+        "Recipient can't be your own account. Send to a different wallet."
+      );
+      return;
+    }
     const parsed = Number(amount);
     if (!amount || !Number.isFinite(parsed) || parsed <= 0) {
       setError("Enter a valid amount");
@@ -388,7 +398,15 @@ function WithdrawFormStep({
     } finally {
       setIsSubmitting(false);
     }
-  }, [recipient, amount, balance, asset.decimals, onSubmit]);
+  }, [
+    recipient,
+    amount,
+    balance,
+    asset.decimals,
+    safeAddress,
+    depositAddress,
+    onSubmit
+  ]);
   if (isBalanceLoading) {
     return /* @__PURE__ */ jsxs("div", { className: "rs-screen", children: [
       /* @__PURE__ */ jsxs("div", { className: "rs-screen-body rs-withdraw-loading", children: [
@@ -829,6 +847,7 @@ function WithdrawFlow({
   onError,
   debug
 }) {
+  const rpcUrls = useRpcUrls();
   const onStepChangeRef = useLatestRef(onStepChange);
   const onEventRef = useLatestRef(onEvent);
   const onLifecycleRef = useLatestRef(onLifecycle);
@@ -925,14 +944,14 @@ function WithdrawFlow({
         return {
           ownerAddress: dappAddress,
           walletClient: dappWalletClient ?? void 0,
-          publicClient: dappPublicClient ?? getPublicClient(sourceChain),
+          publicClient: dappPublicClient ?? getPublicClient(sourceChain, rpcUrls),
           switchChain: dappSwitchChain
         };
       }
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
-        publicClient: dappPublicClient ?? getPublicClient(sourceChain),
+        publicClient: dappPublicClient ?? getPublicClient(sourceChain, rpcUrls),
         switchChain: dappSwitchChain
       };
     }
@@ -943,7 +962,7 @@ function WithdrawFlow({
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
-        publicClient: dappPublicClient ?? getPublicClient(sourceChain),
+        publicClient: dappPublicClient ?? getPublicClient(sourceChain, rpcUrls),
         switchChain: dappSwitchChain
       };
     }
@@ -967,7 +986,8 @@ function WithdrawFlow({
     dappSwitchChain,
     dappAddress,
     reownWallet,
-    sourceChain
+    sourceChain,
+    rpcUrls
   ]);
   const ownerAddress = signerContext?.ownerAddress;
   const recipientForRegistration = useMemo2(() => {
@@ -1209,6 +1229,12 @@ function WithdrawFlow({
         throw new Error("Withdrawal target is still being prepared");
       }
       const smartAccount = matchingRegistration.smartAccount;
+      const lowerRecipient = recipient.toLowerCase();
+      if (lowerRecipient === safeAddress.toLowerCase() || lowerRecipient === smartAccount.toLowerCase()) {
+        throw new Error(
+          "Recipient can't be your own account. Send to a different wallet."
+        );
+      }
       if (!onSignTransaction && !signerContext?.walletClient) {
         throw new Error("Wallet not connected");
       }
@@ -1232,7 +1258,7 @@ function WithdrawFlow({
           targetToken
         });
         const amountUnits = parseUnits2(amountValue, asset.decimals);
-        const pc = signerContext?.publicClient ?? getPublicClient(sourceChain);
+        const pc = signerContext?.publicClient ?? getPublicClient(sourceChain, rpcUrls);
         let result;
         if (onSignTransaction) {
           const transferTarget = isSameRoute ? recipient : smartAccount;
@@ -1340,7 +1366,8 @@ function WithdrawFlow({
       logFlow,
       logFlowError,
       onLifecycleRef,
-      storeApi
+      storeApi,
+      rpcUrls
     ]
   );
   const handleWithdrawComplete = useCallback2(
@@ -1477,7 +1504,8 @@ function WithdrawFlow({
   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);
+  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(
@@ -1487,6 +1515,7 @@ function WithdrawFlow({
         publicClient: formPublicClient,
         connectedRecipient: resolvedConnectedRecipient,
         safeAddress,
+        depositAddress,
         asset,
         defaultRecipient,
         defaultAmount,
@@ -1564,7 +1593,7 @@ function deriveStepView(step, _registration) {
 // src/WithdrawModal.tsx
 import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
 var ReownWithdrawInner = lazy(
-  () => import("./WithdrawModalReown-L4SWLONE.mjs").then((m) => ({
+  () => import("./WithdrawModalReown-FRMD2ACH.mjs").then((m) => ({
     default: m.WithdrawModalReown
   }))
 );
@@ -1593,6 +1622,7 @@ function WithdrawModalInner({
   closeOnOverlayClick,
   allowedRoutes,
   backendUrl = DEFAULT_BACKEND_URL,
+  rpcUrls,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
@@ -1651,7 +1681,7 @@ function WithdrawModalInner({
   }, []);
   const showBackButton = uiConfig?.showBackButton ?? true;
   const canGoBack = backHandler !== void 0;
-  return /* @__PURE__ */ jsx4(WithdrawStoreProvider, { store, children: /* @__PURE__ */ jsx4(
+  return /* @__PURE__ */ jsx4(RpcUrlsProvider, { value: rpcUrls, children: /* @__PURE__ */ jsx4(WithdrawStoreProvider, { store, children: /* @__PURE__ */ jsx4(
     Modal,
     {
       isOpen,
@@ -1715,7 +1745,7 @@ function WithdrawModalInner({
         )
       ] })
     }
-  ) });
+  ) }) });
 }
 
 export {