From 1b09ace65ea5ba62866e88af5436d7f0f32bcad6 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Thu, 10 Sep 2020 18:41:00 -0230
Subject: [PATCH] Enable callback-return and fix issues

---
 .eslintrc.js                        | 1 -
 tests/TransactionController.test.ts | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 6ae3a6666ff..87b735428fb 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -47,7 +47,6 @@ module.exports = {
       },
     ],
 
-    'callback-return': 'off',
     'camelcase': 'off',
     'consistent-return': 'off',
     'default-case': 'off',
diff --git a/tests/TransactionController.test.ts b/tests/TransactionController.test.ts
index bdcd04de6d9..d0639d95afd 100644
--- a/tests/TransactionController.test.ts
+++ b/tests/TransactionController.test.ts
@@ -13,6 +13,7 @@ jest.mock('eth-query', () =>
       estimateGas: (_transaction: any, callback: any) => {
         if (mockFlags.estimateGas) {
           callback(new Error(mockFlags.estimateGas));
+          return;
         }
         callback(undefined, '0x0');
       },