Fix: pass safeTxGas to gas estimation for 1.1.1 Safes

5afe · Jun 20, 2022 · 69391ad · 69391ad
1 parent 5db53ae
commit 69391ad
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/routes/safe/components/Transactions/helpers/TxModalWrapper/index.tsx b/src/routes/safe/components/Transactions/helpers/TxModalWrapper/index.tsx
@@ -120,6 +120,15 @@ export const TxModalWrapper = ({
   const isOffChainSignature = checkIfOffChainSignatureIsPossible(doExecute, isSmartContract, safeVersion)
   const approvalAndExecution = isApproveAndExecute(Number(threshold), confirmationsLen, preApprovingOwner)
 
+  const { result: safeTxGasEstimation, error: safeTxGasError } = useEstimateSafeTxGas({
+    isRejectTx,
+    txData,
+    txRecipient: txTo || safeAddress,
+    txAmount: txValue,
+    operation,
+  })
+  if (safeTxGas == null) safeTxGas = safeTxGasEstimation
+
   const txParameters = useMemo(
     () => ({
       safeAddress,
@@ -133,7 +142,7 @@ export const TxModalWrapper = ({
       gasPrice: '0',
       gasToken: ZERO_ADDRESS,
       refundReceiver: ZERO_ADDRESS,
-      safeTxGas: safeTxGas || manualSafeTxGas || '0',
+      safeTxGas: manualSafeTxGas || safeTxGas || '0',
       approvalAndExecution,
     }),
     [
@@ -161,15 +170,6 @@ export const TxModalWrapper = ({
     return checkTransactionExecution({ ...txParameters, gasLimit })
   }, [gasLimit, txParameters])
 
-  const { result: safeTxGasEstimation, error: safeTxGasError } = useEstimateSafeTxGas({
-    isRejectTx,
-    txData,
-    txRecipient: txTo || safeAddress,
-    txAmount: txValue,
-    operation,
-  })
-  if (safeTxGas == null) safeTxGas = safeTxGasEstimation
-
   const { gasPriceFormatted, gasPrice, gasMaxPrioFee, gasMaxPrioFeeFormatted } = useEstimateTransactionGas({
     manualGasPrice,
     manualMaxPrioFee,