@naculus/connect-appkit-vue 0.5.0 → 0.6.0

package/dist/index.d.cts

@@ -1148,7 +1148,7 @@ interface TxMonitorLike {
     on(event: "statusChange", listener: (entry: TxStatusEntry) => void): this;
     on(event: "confirmed", listener: (entry: TxStatusEntry) => void): this;
     on(event: "failed", listener: (entry: TxStatusEntry) => void): this;
-    off(event: string, listener: Function): this;
+    off(event: string, listener: (entry: TxStatusEntry) => void): this;
 }
 interface UseTxMonitorReturn {
     entry: ShallowRef<TxStatusEntry | null>;

package/dist/index.d.ts

@@ -1148,7 +1148,7 @@ interface TxMonitorLike {
     on(event: "statusChange", listener: (entry: TxStatusEntry) => void): this;
     on(event: "confirmed", listener: (entry: TxStatusEntry) => void): this;
     on(event: "failed", listener: (entry: TxStatusEntry) => void): this;
-    off(event: string, listener: Function): this;
+    off(event: string, listener: (entry: TxStatusEntry) => void): this;
 }
 interface UseTxMonitorReturn {
     entry: ShallowRef<TxStatusEntry | null>;

package/dist/index.js

@@ -2962,27 +2962,53 @@ function useTxMonitor(hash, chainId, monitor) {
   const entry = shallowRef33(null);
   const isLoading = shallowRef33(false);
   const isWatching = shallowRef33(false);
-  const error = shallowRef33(null);
+  const guard = useActionGuard();
+  const error = guard.error;
   let generation = 0;
+  let refreshed = [];
+  const currentInputs = () => [
+    toValue36(monitor),
+    toValue36(hash),
+    toValue36(chainId)
+  ];
+  const sameInputs = (a, b) => a.every((value, i) => Object.is(value, b[i]));
   const refresh = async () => {
     const activeMonitor = toValue36(monitor);
     const activeHash = toValue36(hash);
     const activeChainId = toValue36(chainId);
     if (!activeMonitor || !activeHash) return;
+    const started = [activeMonitor, activeHash, activeChainId];
+    refreshed = started;
     isLoading.value = true;
-    error.value = null;
-    try {
-      await activeMonitor.refreshTx(activeHash, activeChainId ?? void 0);
-      const current = activeMonitor.getTxStatus(
-        activeHash,
-        activeChainId ?? void 0
-      );
-      if (current) entry.value = current;
-    } catch (err) {
-      error.value = err instanceof Error ? err : new Error("Failed to refresh transaction");
-    } finally {
-      isLoading.value = false;
-    }
+    await guard.run(
+      async (commit) => {
+        try {
+          await activeMonitor.refreshTx(
+            activeHash,
+            activeChainId ?? void 0
+          );
+        } catch (err) {
+          if (!sameInputs(started, currentInputs())) return;
+          throw err;
+        }
+        if (!sameInputs(started, currentInputs())) return;
+        const current = activeMonitor.getTxStatus(
+          activeHash,
+          activeChainId ?? void 0
+        );
+        commit(() => {
+          entry.value = current ?? null;
+        });
+      },
+      "Failed to refresh transaction",
+      void 0,
+      {
+        onSettled: () => {
+          isLoading.value = false;
+        }
+      }
+    ).catch(() => {
+    });
   };
   const stopWatching = () => {
     const activeMonitor = toValue36(monitor);
@@ -2996,6 +3022,9 @@ function useTxMonitor(hash, chainId, monitor) {
     [() => toValue36(monitor), () => toValue36(hash), () => toValue36(chainId)],
     ([activeMonitor, activeHash, activeChainId], _previous, onCleanup) => {
       const mine = ++generation;
+      if (!sameInputs([activeMonitor, activeHash, activeChainId], refreshed)) {
+        guard.invalidate();
+      }
       if (!activeMonitor || !activeHash || !activeChainId) {
         entry.value = null;
         isLoading.value = false;
@@ -3017,8 +3046,7 @@ function useTxMonitor(hash, chainId, monitor) {
       isWatching.value = true;
       isLoading.value = true;
       error.value = null;
-      const current = activeMonitor.getTxStatus(activeHash, activeChainId);
-      if (current) entry.value = current;
+      entry.value = activeMonitor.getTxStatus(activeHash, activeChainId) ?? null;
       activeMonitor.watchTx(activeHash, activeChainId, {}).then((initial) => {
         if (cancelled || mine !== generation) return;
         entry.value = initial;