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

Confirm screen shows amount plus gas in total field

Browse Source
This commit is contained in:
Dan 2017-09-20 11:26:20 -02:30 committed by Chi Kei Chan
parent 4fa79ffc6e
commit 39afbea7aa
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ui/app/components/pending-tx.js
View File

@ -14,7 +14,7 @@ const ethUtil = require('ethereumjs-util')
const BN = ethUtil.BN const BN = ethUtil.BN
const hexToBn = require('../../../app/scripts/lib/hex-to-bn') const hexToBn = require('../../../app/scripts/lib/hex-to-bn')
const util = require('../util') const util = require('../util')
const { conversionUtil } = require('../conversion-util') const { conversionUtil, addCurrencies } = require('../conversion-util')
const MIN_GAS_PRICE_GWEI_BN = new BN(1) const MIN_GAS_PRICE_GWEI_BN = new BN(1)
const GWEI_FACTOR = new BN(1e9) const GWEI_FACTOR = new BN(1e9)
@ -67,7 +67,7 @@ PendingTx.prototype.componentWillMount = function () {
this.props.setCurrentCurrencyToUSD() this.props.setCurrentCurrencyToUSD()
} }
PendingTx.prototype.getTotal = function () { PendingTx.prototype.getAmount = function () {
const { conversionRate } = this.props const { conversionRate } = this.props
const txMeta = this.gatherTxMeta() const txMeta = this.gatherTxMeta()
const txParams = txMeta.txParams || {} const txParams = txMeta.txParams || {}
@ -186,7 +186,16 @@ PendingTx.prototype.getData = function () {
const { name, params = [] } = decodedData || {} const { name, params = [] } = decodedData || {}
const { type, value } = params[0] || {} const { type, value } = params[0] || {}
const { USD: gasFeeInUSD, ETH: gasFeeInETH } = this.getGasFee() const { USD: gasFeeInUSD, ETH: gasFeeInETH } = this.getGasFee()
const { USD: totalInUSD, ETH: totalInETH } = this.getTotal() const { USD: amountInUSD, ETH: amountInETH } = this.getAmount()
const totalInUSD = addCurrencies(gasFeeInUSD, amountInUSD, {
toNumericBase: 'dec',
numberOfDecimals: 2,
})
const totalInETH = addCurrencies(gasFeeInETH, amountInETH, {
toNumericBase: 'dec',
numberOfDecimals: 6,
})
if (name === 'transfer' && type === 'address') { if (name === 'transfer' && type === 'address') {
return { return {
@ -201,8 +210,8 @@ PendingTx.prototype.getData = function () {
memo: txParams.memo || '', memo: txParams.memo || '',
gasFeeInUSD, gasFeeInUSD,
gasFeeInETH, gasFeeInETH,
totalInUSD, amountInUSD,
totalInETH, amountInETH,
} }
} else { } else {
return { return {
@ -217,6 +226,8 @@ PendingTx.prototype.getData = function () {
memo: txParams.memo || '', memo: txParams.memo || '',
gasFeeInUSD, gasFeeInUSD,
gasFeeInETH, gasFeeInETH,
amountInUSD,
amountInETH,
totalInUSD, totalInUSD,
totalInETH, totalInETH,
} }
@ -243,6 +254,8 @@ PendingTx.prototype.render = function () {
memo, memo,
gasFeeInUSD, gasFeeInUSD,
gasFeeInETH, gasFeeInETH,
amountInUSD,
amountInETH,
totalInUSD, totalInUSD,
totalInETH, totalInETH,
} = this.getData() } = this.getData()
@ -307,7 +320,7 @@ PendingTx.prototype.render = function () {
`You're sending to Recipient ...${toAddress.slice(toAddress.length - 4)}`, `You're sending to Recipient ...${toAddress.slice(toAddress.length - 4)}`,
]), ]),
h('h3.flex-center.confirm-screen-send-amount', [`$${totalInUSD}`]), h('h3.flex-center.confirm-screen-send-amount', [`$${amountInUSD}`]),
h('h3.flex-center.confirm-screen-send-amount-currency', [ 'USD' ]), h('h3.flex-center.confirm-screen-send-amount-currency', [ 'USD' ]),
h('div.flex-center.confirm-memo-wrapper', [ h('div.flex-center.confirm-memo-wrapper', [
h('h3.confirm-screen-send-memo', [ memo ]), h('h3.confirm-screen-send-memo', [ memo ]),

10
ui/app/conversion-util.js
View File

@ -114,6 +114,16 @@ const conversionUtil = (value, {
value, value,
}); });
const addCurrencies = (a, b, { toNumericBase, numberOfDecimals }) => {
const value = (new BigNumber(a)).add(b);
return converter({
value,
toNumericBase,
numberOfDecimals,
})
}
module.exports = { module.exports = {
conversionUtil, conversionUtil,
addCurrencies,
} }