aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pending-tx/confirm-send-ether.js
diff options
context:
space:
mode:
Diffstat (limited to 'ui/app/components/pending-tx/confirm-send-ether.js')
-rw-r--r--ui/app/components/pending-tx/confirm-send-ether.js35
1 files changed, 23 insertions, 12 deletions
diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js
index 6624a378d..a4763eab7 100644
--- a/ui/app/components/pending-tx/confirm-send-ether.js
+++ b/ui/app/components/pending-tx/confirm-send-ether.js
@@ -68,13 +68,11 @@ function mapDispatchToProps (dispatch) {
let forceGasMin
if (lastGasPrice) {
- const stripped = ethUtil.stripHexPrefix(lastGasPrice)
- forceGasMin = ethUtil.addHexPrefix(multiplyCurrencies(stripped, 1.1, {
+ forceGasMin = ethUtil.addHexPrefix(multiplyCurrencies(lastGasPrice, 1.1, {
multiplicandBase: 16,
multiplierBase: 10,
toNumericBase: 'hex',
fromDenomination: 'WEI',
- toDenomination: 'GWEI',
}))
}
@@ -454,7 +452,7 @@ ConfirmSendEther.prototype.render = function () {
ConfirmSendEther.prototype.onSubmit = function (event) {
event.preventDefault()
- const txMeta = this.gatherTxMeta({ time: (new Date()).getTime() })
+ const txMeta = this.gatherTxMeta()
const valid = this.checkValidity()
this.setState({ valid, submitting: true })
@@ -489,21 +487,34 @@ ConfirmSendEther.prototype.getFormEl = function () {
}
// After a customizable state value has been updated,
-ConfirmSendEther.prototype.gatherTxMeta = function (opts) {
+ConfirmSendEther.prototype.gatherTxMeta = function () {
const props = this.props
const state = this.state
const txData = clone(state.txData) || clone(props.txData)
- if (txData.lastGasPrice) {
- const { gasPrice: sendGasPrice, gas: sendGasLimit } = props.send
- const { gasPrice: txGasPrice, gas: txGasLimit } = txData.txParams
-
- txData.txParams.gasPrice = sendGasPrice || txGasPrice
- txData.txParams.gas = sendGasLimit || txGasLimit
+ const { gasPrice: sendGasPrice, gas: sendGasLimit } = props.send
+ const {
+ lastGasPrice,
+ txParams: {
+ gasPrice: txGasPrice,
+ gas: txGasLimit,
+ },
+ } = txData
+
+ let forceGasMin
+ if (lastGasPrice) {
+ forceGasMin = ethUtil.addHexPrefix(multiplyCurrencies(lastGasPrice, 1.1, {
+ multiplicandBase: 16,
+ multiplierBase: 10,
+ toNumericBase: 'hex',
+ }))
}
+ txData.txParams.gasPrice = sendGasPrice || forceGasMin || txGasPrice
+ txData.txParams.gas = sendGasLimit || txGasLimit
+
// log.debug(`UI has defaulted to tx meta ${JSON.stringify(txData)}`)
- return Object.assign(txData, opts)
+ return txData
}
ConfirmSendEther.prototype.verifyGasParams = function () {