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

Fix amount max for sending token.

Browse Source
This commit is contained in:
Dan 2017-11-07 21:47:14 -03:30
parent da2e9b9765
commit c156c85eaa
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ui/app/components/send/currency-display.js
View File

@ -36,6 +36,28 @@ CurrencyDisplay.prototype.getAmount = function (value) {
: toHexWei(value)
}
CurrencyDisplay.prototype.getValueToRender = function () {
const { selectedToken, conversionRate, value } = this.props
const { decimals, symbol } = selectedToken || {}
const multiplier = Math.pow(10, Number(decimals || 0))
return selectedToken
? conversionUtil(value, {
fromNumericBase: 'hex',
toCurrency: symbol,
conversionRate: multiplier,
invertConversionRate: true,
})
: conversionUtil(value, {
fromNumericBase: 'hex',
toNumericBase: 'dec',
fromDenomination: 'WEI',
numberOfDecimals: 6,
conversionRate,
})
}
CurrencyDisplay.prototype.render = function () {
const {
className = 'currency-display',
@ -50,13 +72,7 @@ CurrencyDisplay.prototype.render = function () {
handleChange,
} = this.props
const valueToRender = conversionUtil(value, {
fromNumericBase: 'hex',
toNumericBase: 'dec',
fromDenomination: 'WEI',
numberOfDecimals: 6,
conversionRate,
})
const valueToRender = this.getValueToRender()
const convertedValue = conversionUtil(valueToRender, {
fromNumericBase: 'dec',

8
ui/app/send-v2.js
View File

@ -328,9 +328,11 @@ SendTransactionScreen.prototype.setAmountToMax = function () {
)
updateSendErrors({ amount: null })
updateGasPrice(MIN_GAS_PRICE_HEX)
updateGasLimit(MIN_GAS_LIMIT_HEX)
updateGasTotal(MIN_GAS_TOTAL)
if (!selectedToken) {
updateGasPrice(MIN_GAS_PRICE_HEX)
updateGasLimit(MIN_GAS_LIMIT_HEX)
updateGasTotal(MIN_GAS_TOTAL)
}
updateSendAmount(maxAmount)
}