aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2018-03-15 05:20:18 +0800
committerDan <danjm.com@gmail.com>2018-03-15 08:59:43 +0800
commit66422cd083e86582b44d19664e6c6fc95bdb8ce5 (patch)
treec3f76c169abb295e6070ec0d3f7687f8d1f1ab04
parenta4c6a5e92e09b70db2e9ab92a8123176de127910 (diff)
downloadtangerine-wallet-browser-66422cd083e86582b44d19664e6c6fc95bdb8ce5.tar.gz
tangerine-wallet-browser-66422cd083e86582b44d19664e6c6fc95bdb8ce5.tar.zst
tangerine-wallet-browser-66422cd083e86582b44d19664e6c6fc95bdb8ce5.zip
Force gas min has correct precision and is set when editing gas if max.
-rw-r--r--ui/app/components/customize-gas-modal/index.js7
-rw-r--r--ui/app/components/pending-tx/confirm-send-ether.js4
-rw-r--r--ui/app/components/pending-tx/confirm-send-token.js4
3 files changed, 8 insertions, 7 deletions
diff --git a/ui/app/components/customize-gas-modal/index.js b/ui/app/components/customize-gas-modal/index.js
index 291447bb4..d8384c19d 100644
--- a/ui/app/components/customize-gas-modal/index.js
+++ b/ui/app/components/customize-gas-modal/index.js
@@ -233,6 +233,7 @@ CustomizeGasModal.prototype.render = function () {
convertedGasPrice += convertedGasPrice.match(/[.]/) ? priceSigZeros : `${priceSigDec}${priceSigZeros}`
+ let newGasPrice = gasPrice
if (forceGasMin) {
const convertedMinPrice = conversionUtil(forceGasMin, {
fromNumericBase: 'hex',
@@ -242,6 +243,10 @@ CustomizeGasModal.prototype.render = function () {
{ value: convertedMinPrice, fromNumericBase: 'dec' },
{ value: convertedGasPrice, fromNumericBase: 'dec' }
)
+ newGasPrice = conversionMax(
+ { value: gasPrice, fromNumericBase: 'hex' },
+ { value: forceGasMin, fromNumericBase: 'hex' }
+ )
}
const convertedGasLimit = conversionUtil(gasLimit, {
@@ -302,7 +307,7 @@ CustomizeGasModal.prototype.render = function () {
}, [t('cancel')]),
h(`div.send-v2__customize-gas__save${error ? '__error' : ''}.allcaps`, {
- onClick: () => !error && this.save(gasPrice, gasLimit, gasTotal),
+ onClick: () => !error && this.save(newGasPrice, gasLimit, gasTotal),
}, [t('save')]),
]),
diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js
index 928149ccd..dca39f0a5 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',
}))
}
diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js
index fe323ffd3..6035dd801 100644
--- a/ui/app/components/pending-tx/confirm-send-token.js
+++ b/ui/app/components/pending-tx/confirm-send-token.js
@@ -104,13 +104,11 @@ function mapDispatchToProps (dispatch, ownProps) {
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',
}))
}