Delete forceGasMin state and related selectors (#8504)

feature/default_network_editable
Erik Marks 5 years ago committed by GitHub
parent 898f8458a2
commit 898feee69b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      test/data/mock-state.json
  2. 3
      test/unit/ui/app/reducers/metamask.spec.js
  3. 5
      test/unit/ui/app/selectors.spec.js
  4. 2
      ui/app/ducks/metamask/metamask.js
  5. 4
      ui/app/pages/send/send.selectors.js
  6. 1
      ui/app/pages/send/tests/send-selectors-test-data.js
  7. 10
      ui/app/pages/send/tests/send-selectors.test.js
  8. 4
      ui/app/selectors/selectors.js
  9. 1
      ui/app/selectors/tests/selectors-test-data.js

@ -136,7 +136,6 @@
"errors": {}, "errors": {},
"maxModeOn": false, "maxModeOn": false,
"editingTransactionId": null, "editingTransactionId": null,
"forceGasMin": null,
"toNickname": "" "toNickname": ""
}, },
"currentNetworkTxList": [ "currentNetworkTxList": [

@ -204,7 +204,6 @@ describe('MetaMask Reducers', function () {
memo: '0xMemo', memo: '0xMemo',
errors: {}, errors: {},
editingTransactionId: 22, editingTransactionId: 22,
forceGasMin: '0xGas',
ensResolution: null, ensResolution: null,
ensResolutionError: '', ensResolutionError: '',
} }
@ -231,7 +230,6 @@ describe('MetaMask Reducers', function () {
errors: {}, errors: {},
maxModeOn: false, maxModeOn: false,
editingTransactionId: null, editingTransactionId: null,
forceGasMin: null,
toNickname: '' }, toNickname: '' },
} }
@ -249,7 +247,6 @@ describe('MetaMask Reducers', function () {
memo: '0xMemo', memo: '0xMemo',
errors: {}, errors: {},
editingTransactionId: 22, editingTransactionId: 22,
forceGasMin: '0xGas',
}, },
} }

@ -100,11 +100,6 @@ describe('Selectors', function () {
assert.equal(gasIsLoading, false) assert.equal(gasIsLoading, false)
}) })
it('#getForceGasMin', function () {
const forceGasMin = selectors.getForceGasMin(mockState)
assert.equal(forceGasMin, null)
})
it('#getSendAmount', function () { it('#getSendAmount', function () {
const sendAmount = selectors.getSendAmount(mockState) const sendAmount = selectors.getSendAmount(mockState)
assert.equal(sendAmount, '1bc16d674ec80000') assert.equal(sendAmount, '1bc16d674ec80000')

@ -28,7 +28,6 @@ export default function reduceMetamask (state = {}, action) {
errors: {}, errors: {},
maxModeOn: false, maxModeOn: false,
editingTransactionId: null, editingTransactionId: null,
forceGasMin: null,
toNickname: '', toNickname: '',
ensResolution: null, ensResolution: null,
ensResolutionError: '', ensResolutionError: '',
@ -262,7 +261,6 @@ export default function reduceMetamask (state = {}, action) {
errors: {}, errors: {},
maxModeOn: false, maxModeOn: false,
editingTransactionId: null, editingTransactionId: null,
forceGasMin: null,
toNickname: '', toNickname: '',
}, },
} }

@ -36,10 +36,6 @@ export function getCurrentNetwork (state) {
return state.metamask.network return state.metamask.network
} }
export function getForceGasMin (state) {
return state.metamask.send.forceGasMin
}
export function getGasLimit (state) { export function getGasLimit (state) {
return state.metamask.send.gasLimit || '0' return state.metamask.send.gasLimit || '0'
} }

@ -176,7 +176,6 @@ export default {
}, },
'maxModeOn': false, 'maxModeOn': false,
'editingTransactionId': 97531, 'editingTransactionId': 97531,
'forceGasMin': true,
}, },
'unapprovedTxs': { 'unapprovedTxs': {
'4768706228115573': { '4768706228115573': {

@ -11,7 +11,6 @@ import {
getCurrentCurrency, getCurrentCurrency,
getCurrentNetwork, getCurrentNetwork,
getNativeCurrency, getNativeCurrency,
getForceGasMin,
getGasLimit, getGasLimit,
getGasPrice, getGasPrice,
getGasTotal, 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 () { describe('getGasLimit()', function () {
it('should return the send.gasLimit', function () { it('should return the send.gasLimit', function () {
assert.equal( assert.equal(

@ -248,10 +248,6 @@ export function getGasIsLoading (state) {
return state.appState.gasIsLoading return state.appState.gasIsLoading
} }
export function getForceGasMin (state) {
return state.metamask.send.forceGasMin
}
export function getSendAmount (state) { export function getSendAmount (state) {
return state.metamask.send.amount return state.metamask.send.amount
} }

@ -177,7 +177,6 @@ export default {
}, },
'maxModeOn': false, 'maxModeOn': false,
'editingTransactionId': 97531, 'editingTransactionId': 97531,
'forceGasMin': true,
}, },
'unapprovedTxs': { 'unapprovedTxs': {
'4768706228115573': { '4768706228115573': {

Loading…
Cancel
Save