fix: Set safeTxGas to 0 when rejecting a tx (#3605)

* fix: Set safeTxGas to 0 when rejecting a tx * fix: Add missing isRejectTx dependency
5afe · Mar 3, 2022 · 13ca2a7 · 13ca2a7
1 parent 7805d06
commit 13ca2a7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/logic/hooks/__tests__/useEstimateSafeTxGas.test.ts b/src/logic/hooks/__tests__/useEstimateSafeTxGas.test.ts
@@ -12,15 +12,35 @@ jest.mock('react-redux', () => {
 
 describe('useEstimateSafeTxGas', () => {
   it(`should return 0 if it is not a tx creation`, () => {
+    const spy = jest.spyOn(gas, 'estimateSafeTxGas')
+
+    const { result } = renderHook(() =>
+      useEstimateSafeTxGas({
+        txAmount: '',
+        txData: '',
+        txRecipient: '',
+        isCreation: false,
+        isRejectTx: false,
+      }),
+    )
+    expect(result.current).toBe('0')
+    expect(spy).toHaveBeenCalledTimes(0)
+  })
+
+  it(`should return 0 if it is a reject tx`, () => {
+    const spy = jest.spyOn(gas, 'estimateSafeTxGas')
+
     const { result } = renderHook(() =>
       useEstimateSafeTxGas({
         txAmount: '',
         txData: '',
         txRecipient: '',
         isCreation: false,
+        isRejectTx: true,
       }),
     )
     expect(result.current).toBe('0')
+    expect(spy).toHaveBeenCalledTimes(0)
   })
 
   it(`calls estimateSafeTxGas if it is a tx creation`, () => {
@@ -32,6 +52,7 @@ describe('useEstimateSafeTxGas', () => {
         txData: '',
         txRecipient: '',
         isCreation: true,
+        isRejectTx: false,
       }),
     )
     expect(spy).toHaveBeenCalledTimes(1)
@@ -48,6 +69,7 @@ describe('useEstimateSafeTxGas', () => {
         txData: '',
         txRecipient: '',
         isCreation: true,
+        isRejectTx: false,
       }),
     )
     expect(spy).toHaveBeenCalledTimes(1)

diff --git a/src/logic/hooks/useEstimateSafeTxGas.tsx b/src/logic/hooks/useEstimateSafeTxGas.tsx
@@ -7,6 +7,7 @@ import { currentSafe } from 'src/logic/safe/store/selectors'
 
 type UseEstimateSafeTxGasProps = {
   isCreation: boolean
+  isRejectTx: boolean
   txData: string
   txRecipient: string
   txAmount: string
@@ -15,6 +16,7 @@ type UseEstimateSafeTxGasProps = {
 
 export const useEstimateSafeTxGas = ({
   isCreation,
+  isRejectTx,
   txData,
   txRecipient,
   txAmount,
@@ -24,7 +26,7 @@ export const useEstimateSafeTxGas = ({
   const { address: safeAddress, currentVersion: safeVersion } = useSelector(currentSafe) ?? {}
 
   useEffect(() => {
-    if (!isCreation) return
+    if (!isCreation || isRejectTx) return
     const estimateSafeTxGasCall = async () => {
       try {
         const safeTxGasEstimation = await estimateSafeTxGas(
@@ -43,7 +45,7 @@ export const useEstimateSafeTxGas = ({
       }
     }
     estimateSafeTxGasCall()
-  }, [isCreation, operation, safeAddress, safeVersion, txAmount, txData, txRecipient])
+  }, [isCreation, isRejectTx, operation, safeAddress, safeVersion, txAmount, txData, txRecipient])
 
   return safeTxGasEstimation
 }
diff --git a/src/routes/safe/components/Transactions/helpers/TxModalWrapper/index.tsx b/src/routes/safe/components/Transactions/helpers/TxModalWrapper/index.tsx
@@ -117,6 +117,7 @@ export const TxModalWrapper = ({
 
   const safeTxGasEstimation = useEstimateSafeTxGas({
     isCreation,
+    isRejectTx,
     txData,
     txRecipient: txTo || safeAddress,
     txAmount: txValue,