@rhinestone/deposit-modal 0.1.8 → 0.1.9

package/dist/index.cjs

@@ -1058,12 +1058,16 @@ function createDepositService(baseUrl) {
       }
       return { tokens: [], totalUsd: 0 };
     },
-    async fetchStatus(address) {
-      const response = await fetch(apiUrl(`/status/${address}`), {
-        method: "GET",
-        headers: { "Content-Type": "application/json" },
-        cache: "no-store"
-      });
+    async fetchStatus(address, txHash) {
+      const txHashParam = encodeURIComponent(txHash.toLowerCase());
+      const response = await fetch(
+        apiUrl(`/status/${address}?txHash=${txHashParam}`),
+        {
+          method: "GET",
+          headers: { "Content-Type": "application/json" },
+          cache: "no-store"
+        }
+      );
       if (!response.ok) {
         return { lastEvent: void 0 };
       }
@@ -2208,6 +2212,7 @@ function ProcessingStep({
   const [elapsedSeconds, setElapsedSeconds] = (0, import_react6.useState)(0);
   const startTimeRef = (0, import_react6.useRef)(Date.now());
   const intervalRef = (0, import_react6.useRef)(null);
+  const processTriggerKeyRef = (0, import_react6.useRef)(null);
   const sameChainAndToken = targetChain === sourceChain && targetToken.toLowerCase() === sourceToken.toLowerCase();
   (0, import_react6.useEffect)(() => {
     startTimeRef.current = Date.now();
@@ -2227,13 +2232,21 @@ function ProcessingStep({
     }
   }, [state.type]);
   (0, import_react6.useEffect)(() => {
+    const triggerKey = `${smartAccount.toLowerCase()}:${txHash.toLowerCase()}`;
+    if (processTriggerKeyRef.current === triggerKey) {
+      return;
+    }
+    processTriggerKeyRef.current = triggerKey;
+    let cancelled = false;
     async function triggerProcess() {
       if (!publicClient) {
+        if (cancelled) return;
         setState({ type: "error", message: "No client for source chain" });
         return;
       }
       if (!sender) {
         const message = "Wallet address unavailable";
+        if (cancelled) return;
         setState({ type: "error", message });
         onError?.(message, "PROCESS_ERROR");
         return;
@@ -2242,6 +2255,7 @@ function ProcessingStep({
         await publicClient.waitForTransactionReceipt({ hash: txHash });
       } catch (error) {
         const message = error instanceof Error ? error.message : "Transaction not confirmed";
+        if (cancelled) return;
         setState({ type: "error", message });
         onError?.(message, "PROCESS_ERROR");
         return;
@@ -2254,6 +2268,7 @@ function ProcessingStep({
           txHash,
           sender
         });
+        if (cancelled) return;
         if (result.message.includes("Funds are already on the target chain")) {
           if (sameChainAndToken) {
             setState({ type: "complete" });
@@ -2270,11 +2285,15 @@ function ProcessingStep({
         setState({ type: "processing" });
       } catch (error) {
         const message = error instanceof Error ? error.message : "Process failed";
+        if (cancelled) return;
         setState({ type: "processing", warning: message });
         onError?.(message, "PROCESS_FALLBACK");
       }
     }
     triggerProcess();
+    return () => {
+      cancelled = true;
+    };
   }, [
     smartAccount,
     txHash,
@@ -2300,7 +2319,7 @@ function ProcessingStep({
     let isMounted = true;
     async function pollStatus() {
       try {
-        const data = await service.fetchStatus(smartAccount);
+        const data = await service.fetchStatus(smartAccount, txHash);
         const lastEvent2 = data.lastEvent;
         const eventMatchesTx = isEventForTx(lastEvent2, txHash);
         const eventForCurrentTx = eventMatchesTx ? lastEvent2 : void 0;

package/dist/index.mjs

@@ -1020,12 +1020,16 @@ function createDepositService(baseUrl) {
       }
       return { tokens: [], totalUsd: 0 };
     },
-    async fetchStatus(address) {
-      const response = await fetch(apiUrl(`/status/${address}`), {
-        method: "GET",
-        headers: { "Content-Type": "application/json" },
-        cache: "no-store"
-      });
+    async fetchStatus(address, txHash) {
+      const txHashParam = encodeURIComponent(txHash.toLowerCase());
+      const response = await fetch(
+        apiUrl(`/status/${address}?txHash=${txHashParam}`),
+        {
+          method: "GET",
+          headers: { "Content-Type": "application/json" },
+          cache: "no-store"
+        }
+      );
       if (!response.ok) {
         return { lastEvent: void 0 };
       }
@@ -2170,6 +2174,7 @@ function ProcessingStep({
   const [elapsedSeconds, setElapsedSeconds] = useState5(0);
   const startTimeRef = useRef4(Date.now());
   const intervalRef = useRef4(null);
+  const processTriggerKeyRef = useRef4(null);
   const sameChainAndToken = targetChain === sourceChain && targetToken.toLowerCase() === sourceToken.toLowerCase();
   useEffect5(() => {
     startTimeRef.current = Date.now();
@@ -2189,13 +2194,21 @@ function ProcessingStep({
     }
   }, [state.type]);
   useEffect5(() => {
+    const triggerKey = `${smartAccount.toLowerCase()}:${txHash.toLowerCase()}`;
+    if (processTriggerKeyRef.current === triggerKey) {
+      return;
+    }
+    processTriggerKeyRef.current = triggerKey;
+    let cancelled = false;
     async function triggerProcess() {
       if (!publicClient) {
+        if (cancelled) return;
         setState({ type: "error", message: "No client for source chain" });
         return;
       }
       if (!sender) {
         const message = "Wallet address unavailable";
+        if (cancelled) return;
         setState({ type: "error", message });
         onError?.(message, "PROCESS_ERROR");
         return;
@@ -2204,6 +2217,7 @@ function ProcessingStep({
         await publicClient.waitForTransactionReceipt({ hash: txHash });
       } catch (error) {
         const message = error instanceof Error ? error.message : "Transaction not confirmed";
+        if (cancelled) return;
         setState({ type: "error", message });
         onError?.(message, "PROCESS_ERROR");
         return;
@@ -2216,6 +2230,7 @@ function ProcessingStep({
           txHash,
           sender
         });
+        if (cancelled) return;
         if (result.message.includes("Funds are already on the target chain")) {
           if (sameChainAndToken) {
             setState({ type: "complete" });
@@ -2232,11 +2247,15 @@ function ProcessingStep({
         setState({ type: "processing" });
       } catch (error) {
         const message = error instanceof Error ? error.message : "Process failed";
+        if (cancelled) return;
         setState({ type: "processing", warning: message });
         onError?.(message, "PROCESS_FALLBACK");
       }
     }
     triggerProcess();
+    return () => {
+      cancelled = true;
+    };
   }, [
     smartAccount,
     txHash,
@@ -2262,7 +2281,7 @@ function ProcessingStep({
     let isMounted = true;
     async function pollStatus() {
       try {
-        const data = await service.fetchStatus(smartAccount);
+        const data = await service.fetchStatus(smartAccount, txHash);
         const lastEvent2 = data.lastEvent;
         const eventMatchesTx = isEventForTx(lastEvent2, txHash);
         const eventForCurrentTx = eventMatchesTx ? lastEvent2 : void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhinestone/deposit-modal",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "React modal component for Rhinestone cross-chain deposits",
   "author": "Rhinestone <dev@rhinestone.wtf>",
   "bugs": {