@rhinestone/deposit-modal 0.1.68 → 0.1.69

package/dist/{chunk-IUW3SJQT.mjs → chunk-DA3XVDNQ.mjs}

@@ -215,6 +215,69 @@ function isSolanaCaip2(value) {
 }
 
 // src/core/deposit-service.ts
+function depositRowToEvent(row) {
+  const status = row.status;
+  if (!status) return void 0;
+  const deposit = {
+    transactionHash: row.txHash,
+    chain: row.chain,
+    amount: row.sourceAmount ?? row.amount,
+    asset: row.token,
+    token: row.token
+  };
+  const source = row.sourceTxHash ? { transactionHash: row.sourceTxHash, chain: row.chain } : { transactionHash: row.txHash, chain: row.chain };
+  const destination = row.destinationTxHash ? {
+    transactionHash: row.destinationTxHash,
+    chain: row.targetChain,
+    amount: row.destinationAmount ?? void 0
+  } : void 0;
+  const time = row.completedAt ?? row.createdAt ?? void 0;
+  if (status === "completed") {
+    return {
+      type: "post-bridge-swap-complete",
+      time: time ?? void 0,
+      data: {
+        deposit,
+        source,
+        ...destination && { destination },
+        ...destination && {
+          swap: { transactionHash: destination.transactionHash }
+        }
+      }
+    };
+  }
+  if (status === "failed" || status === "refunded") {
+    return {
+      type: "bridge-failed",
+      time: time ?? void 0,
+      data: {
+        deposit,
+        source,
+        ...row.errorCode && { error: { code: row.errorCode } }
+      }
+    };
+  }
+  if (status === "processing") {
+    return {
+      type: "bridge-started",
+      time: time ?? void 0,
+      data: {
+        deposit,
+        source
+      }
+    };
+  }
+  return {
+    type: "deposit-received",
+    time: time ?? void 0,
+    data: {
+      transactionHash: row.txHash,
+      chain: row.chain,
+      amount: row.amount,
+      token: row.token
+    }
+  };
+}
 function jsonReplacer(_key, value) {
   return typeof value === "bigint" ? value.toString() : value;
 }
@@ -488,15 +551,14 @@ function createDepositService(baseUrl, options) {
     async fetchStatus(address, txHash) {
       const normalized = txHash.startsWith("0x") || txHash.startsWith("0X") ? txHash.toLowerCase() : txHash;
       const txHashParam = encodeURIComponent(normalized);
-      const url = apiUrl(`/status/${address}?txHash=${txHashParam}`);
-      const response = await fetch(
-        url,
-        {
-          method: "GET",
-          headers: { "Content-Type": "application/json" },
-          cache: "no-store"
-        }
+      const url = apiUrl(
+        `/deposits?account=${encodeURIComponent(address)}&txHash=${txHashParam}&limit=1`
       );
+      const response = await fetch(url, {
+        method: "GET",
+        headers: { "Content-Type": "application/json" },
+        cache: "no-store"
+      });
       if (!response.ok) {
         debugLog(debug, scope, "fetchStatus:miss", {
           address,
@@ -505,16 +567,20 @@ function createDepositService(baseUrl, options) {
         });
         return { lastEvent: void 0 };
       }
-      const result = await response.json();
+      const body = await response.json();
+      const row = body.deposits?.[0];
+      const lastEvent = row ? depositRowToEvent(row) : void 0;
       debugLog(debug, scope, "fetchStatus:success", {
         address,
         txHash: shortRef(normalized),
-        eventType: result?.lastEvent?.type
+        eventType: lastEvent?.type
       });
-      return result;
+      return { lastEvent };
     },
     async fetchLatestStatus(address) {
-      const url = apiUrl(`/status/${address}`);
+      const url = apiUrl(
+        `/deposits?account=${encodeURIComponent(address)}&limit=1`
+      );
       const response = await fetch(url, {
         method: "GET",
         headers: { "Content-Type": "application/json" },
@@ -527,16 +593,18 @@ function createDepositService(baseUrl, options) {
         });
         return { lastEvent: void 0 };
       }
-      const result = await response.json();
+      const body = await response.json();
+      const row = body.deposits?.[0];
+      const lastEvent = row ? depositRowToEvent(row) : void 0;
       debugLog(debug, scope, "fetchLatestStatus:success", {
         address,
-        eventType: result?.lastEvent?.type
+        eventType: lastEvent?.type
       });
-      return result;
+      return { lastEvent };
     },
     async relayWithdraw(params) {
       const { smartAccount, chainId, safeAddress, safeTransaction, signature } = params;
-      const url = apiUrl(`/relay-withdraw`);
+      const url = apiUrl(`/safe/withdraw`);
       debugLog(debug, scope, "relayWithdraw:request", {
         url,
         smartAccount,

package/dist/{chunk-5FDIQNJJ.mjs → chunk-P3CGKXXZ.mjs}

@@ -21,7 +21,7 @@ import {
   saveSessionOwnerToStorage,
   toEvmCaip2,
   useLatestRef
-} from "./chunk-IUW3SJQT.mjs";
+} from "./chunk-DA3XVDNQ.mjs";
 import {
   DEFAULT_BACKEND_URL,
   DEFAULT_SIGNER_ADDRESS,
@@ -1027,6 +1027,7 @@ function WithdrawFlow({
     };
   }, [sourceChain, sourceToken]);
   const isSourceNative = sourceToken.toLowerCase() === NATIVE_TOKEN_ADDRESS.toLowerCase();
+  const isSameRoute = targetChain === sourceChain && targetToken.toLowerCase() === sourceToken.toLowerCase();
   const stepIndex = step.type === "form" ? 0 : 1;
   const currentBackHandler = void 0;
   useEffect2(() => {
@@ -1191,13 +1192,14 @@ function WithdrawFlow({
         const pc = signerContext?.publicClient ?? getPublicClient(sourceChain);
         let result;
         if (onSignTransaction) {
-          const transferData = isSourceNative ? { to: smartAccount, value: amountUnits, data: "0x" } : {
+          const transferTarget = isSameRoute ? recipient : smartAccount;
+          const transferData = isSourceNative ? { to: transferTarget, value: amountUnits, data: "0x" } : {
             to: sourceToken,
             value: 0n,
             data: encodeFunctionData2({
               abi: erc20Abi3,
               functionName: "transfer",
-              args: [smartAccount, amountUnits]
+              args: [transferTarget, amountUnits]
             })
           };
           const request = await buildSafeTransaction({
@@ -1225,7 +1227,7 @@ function WithdrawFlow({
             walletClient: signerContext.walletClient,
             publicClient: pc,
             safeAddress,
-            recipient: smartAccount,
+            recipient: isSameRoute ? recipient : smartAccount,
             amount: amountUnits,
             chainId: sourceChain
           });
@@ -1235,7 +1237,7 @@ function WithdrawFlow({
             publicClient: pc,
             safeAddress,
             tokenAddress: sourceToken,
-            recipient: smartAccount,
+            recipient: isSameRoute ? recipient : smartAccount,
             amount: amountUnits,
             chainId: sourceChain
           });
@@ -1259,7 +1261,8 @@ function WithdrawFlow({
           txHash: result.txHash,
           sourceChain,
           sourceToken,
-          amount: amountUnits.toString()
+          amount: amountUnits.toString(),
+          directTransfer: isSameRoute
         });
       } catch (err) {
         const raw = err instanceof Error ? err.message : "Withdraw failed";
@@ -1291,6 +1294,7 @@ function WithdrawFlow({
       sourceChain,
       onSignTransaction,
       isSourceNative,
+      isSameRoute,
       handleError,
       logFlow,
       logFlowError,
@@ -1463,6 +1467,7 @@ function WithdrawFlow({
         targetChain,
         targetToken,
         amount: step.amount,
+        directTransfer: step.directTransfer,
         waitForFinalTx,
         service,
         flowLabel: "withdraw",
@@ -1480,7 +1485,7 @@ function WithdrawFlow({
 // src/WithdrawModal.tsx
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 var ReownWithdrawInner = lazy(
-  () => import("./WithdrawModalReown-6VYKKKJN.mjs").then((m) => ({
+  () => import("./WithdrawModalReown-6ZBCJOPK.mjs").then((m) => ({
     default: m.WithdrawModalReown
   }))
 );