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

1 files changed, 6 insertions, 0 deletions

diff --git a/ui/app/conversion-util.js b/ui/app/conversion-util.js
index 847650758..b440aea7f 100644
--- a/ui/app/conversion-util.js
+++ b/ui/app/conversion-util.js
@@ -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,