Merge pull request #1910 from gnosis/fix/#1905-threshold-reset-when-edit-tx-parameters

Fix threshold reset when edit tx parameters

src/routes/safe/components/Settings/ThresholdSettings/ChangeThreshold/index.tsx

@@ -2,7 +2,7 @@ import IconButton from '@material-ui/core/IconButton'
 import MenuItem from '@material-ui/core/MenuItem'
 import { makeStyles } from '@material-ui/core/styles'
 import Close from '@material-ui/icons/Close'
-import React, { useEffect, useState } from 'react'
+import React, { ReactElement, useEffect, useState } from 'react'
 import { useDispatch } from 'react-redux'
 import { List } from 'immutable'
 
@@ -44,12 +44,13 @@ export const ChangeThresholdModal = ({
   owners,
   safeAddress,
   threshold = 1,
-}: ChangeThresholdModalProps): React.ReactElement => {
+}: ChangeThresholdModalProps): ReactElement => {
   const classes = useStyles()
   const dispatch = useDispatch()
   const [data, setData] = useState('')
   const [manualSafeTxGas, setManualSafeTxGas] = useState(0)
   const [manualGasPrice, setManualGasPrice] = useState<string | undefined>()
+  const [editedThreshold, setEditedThreshold] = useState<number>(threshold)
 
   const {
     gasCostFormatted,
@@ -71,7 +72,7 @@ export const ChangeThresholdModal = ({
     let isCurrent = true
     const calculateChangeThresholdData = async () => {
       const safeInstance = await getGnosisSafeInstanceAt(safeAddress)
-      const txData = safeInstance.methods.changeThreshold(threshold).encodeABI()
+      const txData = safeInstance.methods.changeThreshold(editedThreshold).encodeABI()
       if (isCurrent) {
         setData(txData)
       }
@@ -81,7 +82,7 @@ export const ChangeThresholdModal = ({
     return () => {
       isCurrent = false
     }
-  }, [safeAddress, threshold])
+  }, [safeAddress, editedThreshold])
 
   const getParametersStatus = () => (threshold > 1 ? 'ETH_DISABLED' : 'ENABLED')
 
@@ -135,7 +136,7 @@ export const ChangeThresholdModal = ({
             </IconButton>
           </Row>
           <Hairline />
-          <GnoForm initialValues={{ threshold: threshold.toString(), txParameters }} onSubmit={handleSubmit}>
+          <GnoForm initialValues={{ threshold: editedThreshold.toString(), txParameters }} onSubmit={handleSubmit}>
             {() => (
               <>
                 <Block className={classes.modalContent}>
@@ -147,6 +148,9 @@ export const ChangeThresholdModal = ({
                       <Field
                         data-testid="threshold-select-input"
                         name={THRESHOLD_FIELD_NAME}
+                        onChange={({ target }) => {
+                          setEditedThreshold(parseInt(target.value))
+                        }}
                         render={(props) => (
                           <>
                             <SelectField {...props} disableError>
@@ -177,7 +181,6 @@ export const ChangeThresholdModal = ({
                   <TxParametersDetail
                     txParameters={txParameters}
                     onEdit={toggleEditMode}
-                    compact={true}
                     parametersStatus={getParametersStatus()}
                     isTransactionCreation={isCreation}
                     isTransactionExecution={isExecution}

src/routes/safe/components/Transactions/helpers/EditableTxParameters.tsx

@@ -50,13 +50,6 @@ export const EditableTxParameters = ({
     toggleEditMode((prev) => !prev)
   }
 
-  // Sends a callback with the last values of txParameters
-  useEffect(() => {
-    if (!isEditMode && closeEditModalCallback) {
-      closeEditModalCallback(txParameters)
-    }
-  }, [isEditMode, closeEditModalCallback, txParameters])
-
   const closeEditFormHandler = (txParameters?: TxParameters) => {
     if (txParameters) {
       setUseManualValues(true)
@@ -65,6 +58,7 @@ export const EditableTxParameters = ({
       setEthGasLimit(txParameters.ethGasLimit)
       setEthGasPrice(txParameters.ethGasPrice)
       setEthNonce(txParameters.ethNonce)
+      closeEditModalCallback && closeEditModalCallback(txParameters)
     }
     toggleStatus()
   }