From 702b7568820d7a695f191df6bf44c76b37fdc7d8 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Fri, 31 Aug 2018 12:14:06 -0700
Subject: Allow denominations in CurrencyDisplay component

---
 ui/app/helpers/confirm-transaction/util.js |  2 ++
 ui/app/helpers/conversions.util.js         | 38 ++++++++++++++++++++----------
 2 files changed, 28 insertions(+), 12 deletions(-)

(limited to 'ui/app/helpers')

diff --git a/ui/app/helpers/confirm-transaction/util.js b/ui/app/helpers/confirm-transaction/util.js
index d1a4994e4..bcac22500 100644
--- a/ui/app/helpers/confirm-transaction/util.js
+++ b/ui/app/helpers/confirm-transaction/util.js
@@ -58,6 +58,7 @@ export function getValueFromWeiHex ({
   toCurrency,
   conversionRate,
   numberOfDecimals,
+  toDenomination,
 }) {
   return conversionUtil(value, {
     fromNumericBase: 'hex',
@@ -66,6 +67,7 @@ export function getValueFromWeiHex ({
     toCurrency,
     numberOfDecimals,
     fromDenomination: 'WEI',
+    toDenomination,
     conversionRate,
   })
 }
diff --git a/ui/app/helpers/conversions.util.js b/ui/app/helpers/conversions.util.js
index 1dec216fa..74802c86b 100644
--- a/ui/app/helpers/conversions.util.js
+++ b/ui/app/helpers/conversions.util.js
@@ -1,4 +1,5 @@
 import { conversionUtil } from '../conversion-util'
+import { ETH, GWEI, WEI } from '../constants/common'
 
 export function hexToDecimal (hexValue) {
   return conversionUtil(hexValue, {
@@ -7,16 +8,27 @@ export function hexToDecimal (hexValue) {
   })
 }
 
-export function getEthFromWeiHex ({
-  value,
-  conversionRate,
-}) {
-  return getValueFromWeiHex({
-    value,
-    conversionRate,
-    toCurrency: 'ETH',
-    numberOfDecimals: 6,
-  })
+export function getEthConversionFromWeiHex ({ value, conversionRate, numberOfDecimals = 6 }) {
+  const denominations = [ETH, GWEI]
+
+  let nonZeroDenomination
+
+  for (let i = 0; i < denominations.length; i++) {
+    const convertedValue = getValueFromWeiHex({
+      value,
+      conversionRate,
+      toCurrency: ETH,
+      numberOfDecimals,
+      toDenomination: denominations[i],
+    })
+
+    if (convertedValue !== '0' || i === denominations.length - 1) {
+      nonZeroDenomination = `${convertedValue} ${denominations[i]}`
+      break
+    }
+  }
+
+  return nonZeroDenomination
 }
 
 export function getValueFromWeiHex ({
@@ -24,14 +36,16 @@ export function getValueFromWeiHex ({
   toCurrency,
   conversionRate,
   numberOfDecimals,
+  toDenomination,
 }) {
   return conversionUtil(value, {
     fromNumericBase: 'hex',
     toNumericBase: 'dec',
-    fromCurrency: 'ETH',
+    fromCurrency: ETH,
     toCurrency,
     numberOfDecimals,
-    fromDenomination: 'WEI',
+    fromDenomination: WEI,
+    toDenomination,
     conversionRate,
   })
 }
-- 
cgit 


From fd51ab12298e93286eeaf03c60e0b4e8d5d1bad3 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Fri, 31 Aug 2018 12:36:07 -0700
Subject: Add TransactionBreakdown component

---
 ui/app/helpers/transactions.util.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'ui/app/helpers')

diff --git a/ui/app/helpers/transactions.util.js b/ui/app/helpers/transactions.util.js
index 54df54aa8..b88b00ac6 100644
--- a/ui/app/helpers/transactions.util.js
+++ b/ui/app/helpers/transactions.util.js
@@ -16,6 +16,8 @@ import {
   UNKNOWN_FUNCTION_KEY,
 } from '../constants/transactions'
 
+import { addCurrencies } from '../conversion-util'
+
 abiDecoder.addABI(abi)
 
 export function getTokenData (data = {}) {
@@ -103,3 +105,13 @@ export async function isSmartContractAddress (address) {
   const code = await global.eth.getCode(address)
   return code && code !== '0x'
 }
+
+export function addHex (...args) {
+  const total = args.reduce((acc, base) => {
+    return addCurrencies(acc, base, {
+      toNumericBase: 'hex',
+    })
+  })
+
+  return ethUtil.addHexPrefix(total)
+}
-- 
cgit 


From c04d9095dd4e5ff38508059d0c1e55eabb7a39e4 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Fri, 31 Aug 2018 13:23:16 -0700
Subject: Add WEI to getEthConversionFromWeiHex

---
 ui/app/helpers/conversions.util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/helpers')

diff --git a/ui/app/helpers/conversions.util.js b/ui/app/helpers/conversions.util.js
index 74802c86b..5204faa1f 100644
--- a/ui/app/helpers/conversions.util.js
+++ b/ui/app/helpers/conversions.util.js
@@ -9,7 +9,7 @@ export function hexToDecimal (hexValue) {
 }
 
 export function getEthConversionFromWeiHex ({ value, conversionRate, numberOfDecimals = 6 }) {
-  const denominations = [ETH, GWEI]
+  const denominations = [ETH, GWEI, WEI]
 
   let nonZeroDenomination
 
-- 
cgit 


From f1a309e0cc110060cc56252ec5f7626ca6403fab Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Fri, 7 Sep 2018 13:59:05 -0700
Subject: Fix identicon address. Fix styling of New Contract recipient. Fix
 Activity Log initial ETH value. Add timestamps to Activity Log events

---
 ui/app/helpers/transactions.util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/helpers')

diff --git a/ui/app/helpers/transactions.util.js b/ui/app/helpers/transactions.util.js
index b88b00ac6..0e1a6ca37 100644
--- a/ui/app/helpers/transactions.util.js
+++ b/ui/app/helpers/transactions.util.js
@@ -106,7 +106,7 @@ export async function isSmartContractAddress (address) {
   return code && code !== '0x'
 }
 
-export function addHex (...args) {
+export function sumHexes (...args) {
   const total = args.reduce((acc, base) => {
     return addCurrencies(acc, base, {
       toNumericBase: 'hex',
-- 
cgit