Merge branch 'develop' into reducers

1 files changed, 8 insertions, 6 deletions

diff --git a/ui/app/components/transaction-view-balance/transaction-view-balance.component.js b/ui/app/components/transaction-view-balance/transaction-view-balance.component.js
index 1b7a29c87..273845c47 100644
--- a/ui/app/components/transaction-view-balance/transaction-view-balance.component.js
+++ b/ui/app/components/transaction-view-balance/transaction-view-balance.component.js
@@ -3,9 +3,9 @@ import PropTypes from 'prop-types'
 import Button from '../button'
 import Identicon from '../identicon'
 import TokenBalance from '../token-balance'
-import CurrencyDisplay from '../currency-display'
+import UserPreferencedCurrencyDisplay from '../user-preferenced-currency-display'
 import { SEND_ROUTE } from '../../routes'
-import { ETH } from '../../constants/common'
+import { PRIMARY, SECONDARY } from '../../constants/common'
 
 export default class TransactionViewBalance extends PureComponent {
   static contextTypes = {
@@ -33,15 +33,17 @@ export default class TransactionViewBalance extends PureComponent {
         />
       ) : (
         <div className="transaction-view-balance__balance">
-          <CurrencyDisplay
+          <UserPreferencedCurrencyDisplay
             className="transaction-view-balance__primary-balance"
             value={balance}
-            currency={ETH}
-            numberOfDecimals={3}
+            type={PRIMARY}
+            ethNumberOfDecimals={3}
           />
-          <CurrencyDisplay
+          <UserPreferencedCurrencyDisplay
             className="transaction-view-balance__secondary-balance"
             value={balance}
+            type={SECONDARY}
+            ethNumberOfDecimals={3}
           />
         </div>
       )