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

Handle transaction totals in WEI in tx-list, send and pending.

Browse Source
This commit is contained in:
Dan 2017-09-13 23:50:13 -02:30 committed by Chi Kei Chan
parent b0f1fba2e5
commit 54bbf8d859
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,6 +88,7 @@ PendingTx.prototype.getTotal = function () {
fromCurrency: 'ETH',
toCurrency: 'USD',
numberOfDecimals: 2,
fromDenomination: 'WEI',
conversionRate,
})
const ETH = conversionUtil(amountBn, {
@ -95,6 +96,7 @@ PendingTx.prototype.getTotal = function () {
toNumericBase: 'dec',
fromCurrency: 'ETH',
toCurrency: 'ETH',
fromDenomination: 'WEI',
conversionRate,
numberOfDecimals: 6,
})
@ -109,6 +111,7 @@ PendingTx.prototype.getTotal = function () {
fromCurrency: 'ETH',
toCurrency: 'USD',
numberOfDecimals: 2,
fromDenomination: 'WEI',
conversionRate,
})
const ETH = conversionUtil(amountBn, {
@ -116,6 +119,7 @@ PendingTx.prototype.getTotal = function () {
toNumericBase: 'dec',
fromCurrency: 'ETH',
toCurrency: 'ETH',
fromDenomination: 'WEI',
conversionRate,
numberOfDecimals: 6,
})

2
ui/app/components/tx-list-item.js
View File

@ -60,6 +60,7 @@ TxListItem.prototype.getSendEtherTotal = function () {
toNumericBase: 'dec',
fromCurrency: 'ETH',
toCurrency: 'USD',
fromDenomination: 'WEI',
numberOfDecimals: 2,
conversionRate,
})
@ -68,6 +69,7 @@ TxListItem.prototype.getSendEtherTotal = function () {
toNumericBase: 'dec',
fromCurrency: 'ETH',
toCurrency: 'ETH',
fromDenomination: 'WEI',
conversionRate,
numberOfDecimals: 6,
})

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

@ -46,6 +46,9 @@ const toBigNumber = {
const toNormalizedDenomination = {
WEI: bigNumber => bigNumber.div(BIG_NUMBER_WEI_MULTIPLIER)
}
const toSpecifiedDenomination = {
WEI: bigNumber => bigNumber.times(BIG_NUMBER_WEI_MULTIPLIER)
}
const baseChange = {
hex: n => n.toString(16),
dec: n => n.toString(10),
@ -80,6 +83,7 @@ const whenPropApplySetterMap = (prop, setterMap) => whenPredSetWithPropAndSetter
const converter = R.pipe(
whenPropApplySetterMap('fromNumericBase', toBigNumber),
whenPropApplySetterMap('fromDenomination', toNormalizedDenomination),
whenPropApplySetterMap('toDenomination', toSpecifiedDenomination),
whenPredSetWithPropAndSetter(fromAndToCurrencyPropsNotEqual, 'conversionRate', convert),
whenPredSetWithPropAndSetter(R.prop('ethToUSDRate'), 'ethToUSDRate', convert),
whenPredSetWithPropAndSetter(R.prop('numberOfDecimals'), 'numberOfDecimals', round),
@ -93,6 +97,7 @@ const conversionUtil = (value, {
fromNumericBase,
toNumericBase,
fromDenomination,
toDenomination,
numberOfDecimals,
conversionRate,
ethToUSDRate,
@ -102,6 +107,7 @@ const conversionUtil = (value, {
fromNumericBase,
toNumericBase,
fromDenomination,
toDenomination,
numberOfDecimals,
conversionRate,
ethToUSDRate,

5
ui/app/send.js
View File

@ -400,15 +400,16 @@ SendTransactionScreen.prototype.onSubmit = function (event) {
this.props.dispatch(addToAddressBook(recipient, nickname))
// TODO: need a clean way to integrate this into conversionUtil
const sendConversionRate = this.props.currentCurrency === 'ETH'
const sendConversionRate = state.activeCurrency === 'ETH'
? this.props.conversionRate
: new BigNumber(1.0).div(this.props.conversionRate)
const sendAmount = conversionUtil(this.state.newTx.amount, {
fromNumericBase: 'dec',
toNumericBase: 'hex',
fromCurrency: this.props.currentCurrency,
fromCurrency: state.activeCurrency,
toCurrency: 'ETH',
toDenomination: 'WEI',
conversionRate: sendConversionRate,
})