From e3f2cf82dfe9f063dc8c11894958bd3755691ffc Mon Sep 17 00:00:00 2001
From: Aryan Deora <adeora@iu.edu>
Date: Wed, 27 Mar 2024 11:28:59 -0400
Subject: [PATCH] fix(query-devtools): Fix Trigger Loading Button

---
 packages/query-devtools/src/Devtools.tsx | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/query-devtools/src/Devtools.tsx b/packages/query-devtools/src/Devtools.tsx
index e5988fc5aa..681f849366 100644
--- a/packages/query-devtools/src/Devtools.tsx
+++ b/packages/query-devtools/src/Devtools.tsx
@@ -1934,13 +1934,17 @@ const QueryDetails = () => {
   }
 
   const restoreQueryAfterLoadingOrError = () => {
-    activeQuery()?.fetch(
-      (activeQuery()?.state.fetchMeta as any).__previousQueryOptions,
-      {
-        // Make sure this fetch will cancel the previous one
-        cancelRefetch: true,
-      },
-    )
+    const activeQueryVal = activeQuery()!
+    const previousState = activeQueryVal.state
+    const previousOptions = (activeQueryVal.state.fetchMeta as any)
+      .__previousQueryOptions
+    activeQueryVal.cancel({ silent: true })
+    activeQueryVal.setState({
+      ...previousState,
+      fetchStatus: 'idle',
+      fetchMeta: null,
+    })
+    activeQueryVal.fetch(previousOptions)
   }
 
   createEffect(() => {