fix: do not setNonce for default values, keep SafeTxProvider in sync …

…with form
safe-global · Aug 14, 2023 · f246ee7 · f246ee7
1 parent 76d7e6f
commit f246ee7
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/components/tx-flow/common/TxNonce/index.tsx b/src/components/tx-flow/common/TxNonce/index.tsx
@@ -1,4 +1,4 @@
-import { memo, type ReactElement, useContext, useMemo, useEffect } from 'react'
+import { memo, type ReactElement, useContext, useMemo } from 'react'
 import {
   Autocomplete,
   Box,
@@ -102,18 +102,16 @@ const TxNonceForm = ({ nonce, recommendedNonce }: { nonce: string; recommendedNo
     defaultValues: {
       [TxNonceFormFieldNames.NONCE]: nonce,
     },
-    mode: 'all',
+    mode: 'onChange',
+    values: {
+      [TxNonceFormFieldNames.NONCE]: nonce,
+    },
   })
 
   const resetNonce = () => {
     formMethods.setValue(TxNonceFormFieldNames.NONCE, recommendedNonce)
   }
 
-  // keep the formdata up-to-date when the actually used nonce updates
-  useEffect(() => {
-    formMethods.setValue(TxNonceFormFieldNames.NONCE, nonce)
-  }, [nonce, formMethods])
-
   return (
     <Controller
       name={TxNonceFormFieldNames.NONCE}