From 898feee69bf36a2c1a74dd71519ceb2c47477309 Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Mon, 4 May 2020 08:59:33 -0700
Subject: [PATCH] Delete forceGasMin state and related selectors (#8504)

---
 test/data/mock-state.json                           |  1 -
 test/unit/ui/app/reducers/metamask.spec.js          |  3 ---
 test/unit/ui/app/selectors.spec.js                  |  5 -----
 ui/app/ducks/metamask/metamask.js                   |  2 --
 ui/app/pages/send/send.selectors.js                 |  4 ----
 ui/app/pages/send/tests/send-selectors-test-data.js |  1 -
 ui/app/pages/send/tests/send-selectors.test.js      | 10 ----------
 ui/app/selectors/selectors.js                       |  4 ----
 ui/app/selectors/tests/selectors-test-data.js       |  1 -
 9 files changed, 31 deletions(-)

diff --git a/test/data/mock-state.json b/test/data/mock-state.json
index a70bf1efe..cec9ef303 100644
--- a/test/data/mock-state.json
+++ b/test/data/mock-state.json
@@ -136,7 +136,6 @@
       "errors": {},
       "maxModeOn": false,
       "editingTransactionId": null,
-      "forceGasMin": null,
       "toNickname": ""
     },
     "currentNetworkTxList": [
diff --git a/test/unit/ui/app/reducers/metamask.spec.js b/test/unit/ui/app/reducers/metamask.spec.js
index 66afeabbc..e6b121336 100644
--- a/test/unit/ui/app/reducers/metamask.spec.js
+++ b/test/unit/ui/app/reducers/metamask.spec.js
@@ -204,7 +204,6 @@ describe('MetaMask Reducers', function () {
       memo: '0xMemo',
       errors: {},
       editingTransactionId: 22,
-      forceGasMin: '0xGas',
       ensResolution: null,
       ensResolutionError: '',
     }
@@ -231,7 +230,6 @@ describe('MetaMask Reducers', function () {
         errors: {},
         maxModeOn: false,
         editingTransactionId: null,
-        forceGasMin: null,
         toNickname: '' },
     }
 
@@ -249,7 +247,6 @@ describe('MetaMask Reducers', function () {
         memo: '0xMemo',
         errors: {},
         editingTransactionId: 22,
-        forceGasMin: '0xGas',
       },
     }
 
diff --git a/test/unit/ui/app/selectors.spec.js b/test/unit/ui/app/selectors.spec.js
index 5ad0495db..c60851dd8 100644
--- a/test/unit/ui/app/selectors.spec.js
+++ b/test/unit/ui/app/selectors.spec.js
@@ -100,11 +100,6 @@ describe('Selectors', function () {
     assert.equal(gasIsLoading, false)
   })
 
-  it('#getForceGasMin', function () {
-    const forceGasMin = selectors.getForceGasMin(mockState)
-    assert.equal(forceGasMin, null)
-  })
-
   it('#getSendAmount', function () {
     const sendAmount = selectors.getSendAmount(mockState)
     assert.equal(sendAmount, '1bc16d674ec80000')
diff --git a/ui/app/ducks/metamask/metamask.js b/ui/app/ducks/metamask/metamask.js
index c0fe48364..c5130e96e 100644
--- a/ui/app/ducks/metamask/metamask.js
+++ b/ui/app/ducks/metamask/metamask.js
@@ -28,7 +28,6 @@ export default function reduceMetamask (state = {}, action) {
       errors: {},
       maxModeOn: false,
       editingTransactionId: null,
-      forceGasMin: null,
       toNickname: '',
       ensResolution: null,
       ensResolutionError: '',
@@ -262,7 +261,6 @@ export default function reduceMetamask (state = {}, action) {
           errors: {},
           maxModeOn: false,
           editingTransactionId: null,
-          forceGasMin: null,
           toNickname: '',
         },
       }
diff --git a/ui/app/pages/send/send.selectors.js b/ui/app/pages/send/send.selectors.js
index 0347ddd74..95327ba88 100644
--- a/ui/app/pages/send/send.selectors.js
+++ b/ui/app/pages/send/send.selectors.js
@@ -36,10 +36,6 @@ export function getCurrentNetwork (state) {
   return state.metamask.network
 }
 
-export function getForceGasMin (state) {
-  return state.metamask.send.forceGasMin
-}
-
 export function getGasLimit (state) {
   return state.metamask.send.gasLimit || '0'
 }
diff --git a/ui/app/pages/send/tests/send-selectors-test-data.js b/ui/app/pages/send/tests/send-selectors-test-data.js
index b440f0a98..61ebce729 100644
--- a/ui/app/pages/send/tests/send-selectors-test-data.js
+++ b/ui/app/pages/send/tests/send-selectors-test-data.js
@@ -176,7 +176,6 @@ export default {
       },
       'maxModeOn': false,
       'editingTransactionId': 97531,
-      'forceGasMin': true,
     },
     'unapprovedTxs': {
       '4768706228115573': {
diff --git a/ui/app/pages/send/tests/send-selectors.test.js b/ui/app/pages/send/tests/send-selectors.test.js
index 38a297747..b925e3035 100644
--- a/ui/app/pages/send/tests/send-selectors.test.js
+++ b/ui/app/pages/send/tests/send-selectors.test.js
@@ -11,7 +11,6 @@ import {
   getCurrentCurrency,
   getCurrentNetwork,
   getNativeCurrency,
-  getForceGasMin,
   getGasLimit,
   getGasPrice,
   getGasTotal,
@@ -185,15 +184,6 @@ describe('send selectors', function () {
     })
   })
 
-  describe('getForceGasMin()', function () {
-    it('should get the send.forceGasMin property', function () {
-      assert.equal(
-        getForceGasMin(mockState),
-        true
-      )
-    })
-  })
-
   describe('getGasLimit()', function () {
     it('should return the send.gasLimit', function () {
       assert.equal(
diff --git a/ui/app/selectors/selectors.js b/ui/app/selectors/selectors.js
index 2cfb2ff03..314f879da 100644
--- a/ui/app/selectors/selectors.js
+++ b/ui/app/selectors/selectors.js
@@ -248,10 +248,6 @@ export function getGasIsLoading (state) {
   return state.appState.gasIsLoading
 }
 
-export function getForceGasMin (state) {
-  return state.metamask.send.forceGasMin
-}
-
 export function getSendAmount (state) {
   return state.metamask.send.amount
 }
diff --git a/ui/app/selectors/tests/selectors-test-data.js b/ui/app/selectors/tests/selectors-test-data.js
index 9cede8177..b2b0282f0 100644
--- a/ui/app/selectors/tests/selectors-test-data.js
+++ b/ui/app/selectors/tests/selectors-test-data.js
@@ -177,7 +177,6 @@ export default {
       },
       'maxModeOn': false,
       'editingTransactionId': 97531,
-      'forceGasMin': true,
     },
     'unapprovedTxs': {
       '4768706228115573': {