m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Force gas min has correct precision and is set when editing gas if max.

Browse Source
This commit is contained in:
Dan 2018-03-14 18:50:18 -02:30
parent a4c6a5e92e
commit 66422cd083
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/app/components/customize-gas-modal/index.js
View File

@ -233,6 +233,7 @@ CustomizeGasModal.prototype.render = function () {
convertedGasPrice += convertedGasPrice.match(/[.]/) ? priceSigZeros : `${priceSigDec}${priceSigZeros}` convertedGasPrice += convertedGasPrice.match(/[.]/) ? priceSigZeros : `${priceSigDec}${priceSigZeros}`
let newGasPrice = gasPrice
if (forceGasMin) { if (forceGasMin) {
const convertedMinPrice = conversionUtil(forceGasMin, { const convertedMinPrice = conversionUtil(forceGasMin, {
fromNumericBase: 'hex', fromNumericBase: 'hex',
@ -242,6 +243,10 @@ CustomizeGasModal.prototype.render = function () {
{ value: convertedMinPrice, fromNumericBase: 'dec' }, { value: convertedMinPrice, fromNumericBase: 'dec' },
{ value: convertedGasPrice, fromNumericBase: 'dec' } { value: convertedGasPrice, fromNumericBase: 'dec' }
) )
newGasPrice = conversionMax(
{ value: gasPrice, fromNumericBase: 'hex' },
{ value: forceGasMin, fromNumericBase: 'hex' }
)
} }
const convertedGasLimit = conversionUtil(gasLimit, { const convertedGasLimit = conversionUtil(gasLimit, {
@ -302,7 +307,7 @@ CustomizeGasModal.prototype.render = function () {
}, [t('cancel')]), }, [t('cancel')]),
h(`div.send-v2__customize-gas__save${error ? '__error' : ''}.allcaps`, { 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')]), }, [t('save')]),
]), ]),

4
ui/app/components/pending-tx/confirm-send-ether.js
View File

@ -68,13 +68,11 @@ function mapDispatchToProps (dispatch) {
let forceGasMin let forceGasMin
if (lastGasPrice) { if (lastGasPrice) {
const stripped = ethUtil.stripHexPrefix(lastGasPrice) forceGasMin = ethUtil.addHexPrefix(multiplyCurrencies(lastGasPrice, 1.1, {
forceGasMin = ethUtil.addHexPrefix(multiplyCurrencies(stripped, 1.1, {
multiplicandBase: 16, multiplicandBase: 16,
multiplierBase: 10, multiplierBase: 10,
toNumericBase: 'hex', toNumericBase: 'hex',
fromDenomination: 'WEI', fromDenomination: 'WEI',
toDenomination: 'GWEI',
})) }))
} }

4
ui/app/components/pending-tx/confirm-send-token.js
View File

@ -104,13 +104,11 @@ function mapDispatchToProps (dispatch, ownProps) {
let forceGasMin let forceGasMin
if (lastGasPrice) { if (lastGasPrice) {
const stripped = ethUtil.stripHexPrefix(lastGasPrice) forceGasMin = ethUtil.addHexPrefix(multiplyCurrencies(lastGasPrice, 1.1, {
forceGasMin = ethUtil.addHexPrefix(multiplyCurrencies(stripped, 1.1, {
multiplicandBase: 16, multiplicandBase: 16,
multiplierBase: 10, multiplierBase: 10,
toNumericBase: 'hex', toNumericBase: 'hex',
fromDenomination: 'WEI', fromDenomination: 'WEI',
toDenomination: 'GWEI',
})) }))
} }