Remove unnecessary addition of nonce to state.

feature/default_network_editable
Dan 7 years ago
parent e94a14ef8a
commit c37684d7bd
  1. 3
      ui/app/components/pending-tx/confirm-send-ether.js
  2. 2
      ui/app/reducers/metamask.js
  3. 5
      ui/app/send-v2.js

@ -76,8 +76,6 @@ function mapDispatchToProps (dispatch) {
fromDenomination: 'WEI', fromDenomination: 'WEI',
toDenomination: 'GWEI', toDenomination: 'GWEI',
})) }))
nonce = txParams.nonce
} }
dispatch(actions.updateSend({ dispatch(actions.updateSend({
@ -86,7 +84,6 @@ function mapDispatchToProps (dispatch) {
editingTransactionId: id, editingTransactionId: id,
gasTotal: sendGasTotal, gasTotal: sendGasTotal,
forceGasMin, forceGasMin,
nonce,
})) }))
dispatch(actions.showModal({ name: 'CUSTOMIZE_GAS' })) dispatch(actions.showModal({ name: 'CUSTOMIZE_GAS' }))
}, },

@ -39,7 +39,6 @@ function reduceMetamask (state, action) {
maxModeOn: false, maxModeOn: false,
editingTransactionId: null, editingTransactionId: null,
forceGasMin: null, forceGasMin: null,
nonce: null,
}, },
coinOptions: {}, coinOptions: {},
useBlockie: false, useBlockie: false,
@ -299,7 +298,6 @@ function reduceMetamask (state, action) {
errors: {}, errors: {},
editingTransactionId: null, editingTransactionId: null,
forceGasMin: null, forceGasMin: null,
nonce: null,
}, },
}) })

@ -548,7 +548,6 @@ SendTransactionScreen.prototype.getEditedTx = function () {
selectedToken, selectedToken,
editingTransactionId, editingTransactionId,
unapprovedTxs, unapprovedTxs,
nonce,
} = this.props } = this.props
const editingTx = { const editingTx = {
@ -560,10 +559,6 @@ SendTransactionScreen.prototype.getEditedTx = function () {
}, },
} }
if (nonce) {
editingTx.txParams.nonce = ethUtil.addHexPrefix(nonce)
}
if (selectedToken) { if (selectedToken) {
const data = TOKEN_TRANSFER_FUNCTION_SIGNATURE + Array.prototype.map.call( const data = TOKEN_TRANSFER_FUNCTION_SIGNATURE + Array.prototype.map.call(
ethAbi.rawEncode(['address', 'uint256'], [to, ethUtil.addHexPrefix(amount)]), ethAbi.rawEncode(['address', 'uint256'], [to, ethUtil.addHexPrefix(amount)]),

Loading…
Cancel
Save