From ac079365e6b4cf8b19db127e6971fa694fa54fff Mon Sep 17 00:00:00 2001
From: HackyMiner <hackyminer@gmail.com>
Date: Tue, 30 Oct 2018 20:15:38 +0900
Subject: fixed currency-display (#5619)

* call getValueFromWeiHex() with fromCurrency=nativeCurrency
---
 .../currency-display/currency-display.container.js     |  7 ++++---
 .../tests/currency-display.container.test.js           | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'ui')

diff --git a/ui/app/components/currency-display/currency-display.container.js b/ui/app/components/currency-display/currency-display.container.js
index 1b3fe74da..6ddf07172 100644
--- a/ui/app/components/currency-display/currency-display.container.js
+++ b/ui/app/components/currency-display/currency-display.container.js
@@ -3,16 +3,17 @@ import CurrencyDisplay from './currency-display.component'
 import { getValueFromWeiHex, formatCurrency } from '../../helpers/confirm-transaction/util'
 
 const mapStateToProps = state => {
-  const { metamask: { currentCurrency, conversionRate } } = state
+  const { metamask: { nativeCurrency, currentCurrency, conversionRate } } = state
 
   return {
     currentCurrency,
     conversionRate,
+    nativeCurrency,
   }
 }
 
 const mergeProps = (stateProps, dispatchProps, ownProps) => {
-  const { currentCurrency, conversionRate, ...restStateProps } = stateProps
+  const { nativeCurrency, currentCurrency, conversionRate, ...restStateProps } = stateProps
   const {
     value,
     numberOfDecimals = 2,
@@ -24,7 +25,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
 
   const toCurrency = currency || currentCurrency
   const convertedValue = getValueFromWeiHex({
-    value, toCurrency, conversionRate, numberOfDecimals, toDenomination: denomination,
+    value, fromCurrency: nativeCurrency, toCurrency, conversionRate, numberOfDecimals, toDenomination: denomination,
   })
   const displayValue = formatCurrency(convertedValue, toCurrency)
   const suffix = hideLabel ? undefined : toCurrency.toUpperCase()
diff --git a/ui/app/components/currency-display/tests/currency-display.container.test.js b/ui/app/components/currency-display/tests/currency-display.container.test.js
index fb6678776..0c886af50 100644
--- a/ui/app/components/currency-display/tests/currency-display.container.test.js
+++ b/ui/app/components/currency-display/tests/currency-display.container.test.js
@@ -20,12 +20,14 @@ describe('CurrencyDisplay container', () => {
         metamask: {
           conversionRate: 280.45,
           currentCurrency: 'usd',
+          nativeCurrency: 'ETH',
         },
       }
 
       assert.deepEqual(mapStateToProps(mockState), {
         conversionRate: 280.45,
         currentCurrency: 'usd',
+        nativeCurrency: 'ETH',
       })
     })
   })
@@ -35,6 +37,7 @@ describe('CurrencyDisplay container', () => {
       const mockStateProps = {
         conversionRate: 280.45,
         currentCurrency: 'usd',
+        nativeCurrency: 'ETH',
       }
 
       const tests = [
@@ -43,40 +46,49 @@ describe('CurrencyDisplay container', () => {
             value: '0x2386f26fc10000',
             numberOfDecimals: 2,
             currency: 'usd',
+            nativeCurrency: 'ETH',
           },
           result: {
             displayValue: '$2.80',
             suffix: 'USD',
+            nativeCurrency: 'ETH',
           },
         },
         {
           props: {
             value: '0x2386f26fc10000',
+            currency: 'usd',
+            nativeCurrency: 'ETH',
           },
           result: {
             displayValue: '$2.80',
             suffix: 'USD',
+            nativeCurrency: 'ETH',
           },
         },
         {
           props: {
             value: '0x1193461d01595930',
             currency: 'ETH',
+            nativeCurrency: 'ETH',
             numberOfDecimals: 3,
           },
           result: {
             displayValue: '1.266',
             suffix: 'ETH',
+            nativeCurrency: 'ETH',
           },
         },
         {
           props: {
             value: '0x1193461d01595930',
             currency: 'ETH',
+            nativeCurrency: 'ETH',
             numberOfDecimals: 3,
             hideLabel: true,
           },
           result: {
+            nativeCurrency: 'ETH',
             displayValue: '1.266',
             suffix: undefined,
           },
@@ -85,10 +97,12 @@ describe('CurrencyDisplay container', () => {
           props: {
             value: '0x3b9aca00',
             currency: 'ETH',
+            nativeCurrency: 'ETH',
             denomination: 'GWEI',
             hideLabel: true,
           },
           result: {
+            nativeCurrency: 'ETH',
             displayValue: '1',
             suffix: undefined,
           },
@@ -97,10 +111,12 @@ describe('CurrencyDisplay container', () => {
           props: {
             value: '0x3b9aca00',
             currency: 'ETH',
+            nativeCurrency: 'ETH',
             denomination: 'WEI',
             hideLabel: true,
           },
           result: {
+            nativeCurrency: 'ETH',
             displayValue: '1000000000',
             suffix: undefined,
           },
@@ -109,10 +125,12 @@ describe('CurrencyDisplay container', () => {
           props: {
             value: '0x3b9aca00',
             currency: 'ETH',
+            nativeCurrency: 'ETH',
             numberOfDecimals: 100,
             hideLabel: true,
           },
           result: {
+            nativeCurrency: 'ETH',
             displayValue: '1e-9',
             suffix: undefined,
           },
-- 
cgit v1.2.3