chore: Do updates in order

pancakeswap · Oct 17, 2024 · e9b10b5 · e9b10b5
1 parent 0f31c80
commit e9b10b5
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/apps/web/src/state/farmsV4/state/poolApr/hooks.ts b/apps/web/src/state/farmsV4/state/poolApr/hooks.ts
@@ -105,23 +105,18 @@ export const usePoolAprUpdater = () => {
   const updateCakeApr = useSetAtom(cakeAprSetterAtom)
   const updateMerklApr = useSetAtom(merklAprAtom)
 
-  useQuery({
-    queryKey: ['apr', 'merkl', 'fetchMerklApr'],
-    queryFn: () => getAllNetworkMerklApr().then(updateMerklApr),
-    refetchInterval: SLOW_INTERVAL,
-    refetchOnMount: false,
-    refetchOnWindowFocus: false,
-  })
-
   useQuery({
     queryKey: ['apr', 'cake', 'fetchCakeApr', generatePoolKey(pools)],
-    queryFn: () =>
-      Promise.all(pools.map((pool) => getCakeApr(pool))).then((aprList) => {
+    queryFn: async () => {
+      await getAllNetworkMerklApr().then(updateMerklApr)
+      await Promise.all(pools.map((pool) => getCakeApr(pool))).then((aprList) => {
         updateCakeApr(aprList.reduce((acc, apr) => Object.assign(acc, apr), {}))
-      }),
-    enabled: pools?.length > 0,
+      })
+    },
+    enabled: pools && pools.length > 0,
     refetchInterval: SLOW_INTERVAL,
     refetchOnMount: false,
+    refetchOnReconnect: false,
     refetchOnWindowFocus: false,
   })
 }