fix: polling of recommended nonce

safe-global · Jul 7, 2023 · bdd24a1 · bdd24a1
1 parent 471abc0
commit bdd24a1
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/components/tx/SignOrExecuteForm/hooks.ts b/src/components/tx/SignOrExecuteForm/hooks.ts
@@ -143,11 +143,15 @@ export const useIsExecutionLoop = (): boolean => {
 export const useRecommendedNonce = (): number | undefined => {
   const { safeAddress, safe } = useSafeInfo()
 
-  const [recommendedNonce] = useAsync(() => {
-    if (!safe.chainId || !safeAddress) return
-
-    return getRecommendedNonce(safe.chainId, safeAddress)
-  }, [safeAddress, safe.chainId, safe.txQueuedTag]) // update when tx queue changes
+  const [recommendedNonce] = useAsync(
+    () => {
+      if (!safe.chainId || !safeAddress) return
+
+      return getRecommendedNonce(safe.chainId, safeAddress)
+    },
+    [safeAddress, safe.chainId, safe.txQueuedTag], // update when tx queue changes
+    false, // keep old recommended nonce while refreshing to avoid skeleton
+  )
 
   return recommendedNonce
 }