fix: prevent endless estimation on erronous gas limit estimation (#3959)

5afe · Jun 10, 2022 · c49db48 · c49db48
1 parent 8e5e60a
commit c49db48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/logic/hooks/__tests__/useExecutionStatus.test.ts b/src/logic/hooks/__tests__/useExecutionStatus.test.ts
@@ -43,7 +43,7 @@ describe('useExecutionStatus', () => {
     })
   })
 
-  it('returns LOADING if gasLimit is 0', async () => {
+  it('returns SUCCESS if gasLimit is 0', async () => {
     const mockFn = jest.fn(() => Promise.resolve(true))
 
     const { result } = renderHook(() =>
@@ -58,8 +58,8 @@ describe('useExecutionStatus', () => {
     )
 
     await waitFor(() => {
-      expect(result.current).toBe(EstimationStatus.LOADING)
-      expect(mockFn).toHaveBeenCalledTimes(0)
+      expect(result.current).toBe(EstimationStatus.SUCCESS)
+      expect(mockFn).toHaveBeenCalledTimes(1)
     })
   })
 

diff --git a/src/logic/hooks/useExecutionStatus.ts b/src/logic/hooks/useExecutionStatus.ts
@@ -1,7 +1,6 @@
 import { DEFAULT_GAS, EstimationStatus } from 'src/logic/hooks/useEstimateTransactionGas'
 import { useEffect, useState } from 'react'
 import useAsync from 'src/logic/hooks/useAsync'
-import { DEFAULT_GAS_LIMIT } from 'src/logic/hooks/useEstimateGasLimit'
 
 type Props = {
   checkTxExecution: () => Promise<boolean>
@@ -24,8 +23,7 @@ export const useExecutionStatus = ({
 
   const [status, error, loading] = useAsync(async () => {
     if (!isExecution || !txData) return EstimationStatus.SUCCESS
-    const isEstimationPending =
-      !gasLimit || gasLimit === DEFAULT_GAS_LIMIT || gasPrice === DEFAULT_GAS || gasMaxPrioFee === DEFAULT_GAS
+    const isEstimationPending = !gasLimit || gasPrice === DEFAULT_GAS || gasMaxPrioFee === DEFAULT_GAS
     if (isEstimationPending) return EstimationStatus.LOADING
 
     const success = await checkTxExecution()