fix merge conflicts

1 files changed, 7 insertions, 7 deletions

diff --git a/ui/app/components/transaction-list-item/transaction-list-item.component.js b/ui/app/components/transaction-list-item/transaction-list-item.component.js
index 40eef5e15..88573d2d5 100644
--- a/ui/app/components/transaction-list-item/transaction-list-item.component.js
+++ b/ui/app/components/transaction-list-item/transaction-list-item.component.js
@@ -4,12 +4,12 @@ import classnames from 'classnames'
 import Identicon from '../identicon'
 import TransactionStatus from '../transaction-status'
 import TransactionAction from '../transaction-action'
-import CurrencyDisplay from '../currency-display'
+import UserPreferencedCurrencyDisplay from '../user-preferenced-currency-display'
 import TokenCurrencyDisplay from '../token-currency-display'
 import TransactionListItemDetails from '../transaction-list-item-details'
 import { CONFIRM_TRANSACTION_ROUTE } from '../../routes'
 import { UNAPPROVED_STATUS, TOKEN_METHOD_TRANSFER } from '../../constants/transactions'
-import { ETH } from '../../constants/common'
+import { PRIMARY, SECONDARY } from '../../constants/common'
 import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../app/scripts/lib/enums'
 import { getStatusKey } from '../../helpers/transactions.util'
 
@@ -103,12 +103,11 @@ export default class TransactionListItem extends PureComponent {
           prefix="-"
         />
       ) : (
-        <CurrencyDisplay
+        <UserPreferencedCurrencyDisplay
           className="transaction-list-item__amount transaction-list-item__amount--primary"
           value={value}
+          type={PRIMARY}
           prefix="-"
-          numberOfDecimals={2}
-          currency={ETH}
         />
       )
   }
@@ -119,10 +118,11 @@ export default class TransactionListItem extends PureComponent {
     return token
       ? null
       : (
-        <CurrencyDisplay
+        <UserPreferencedCurrencyDisplay
           className="transaction-list-item__amount transaction-list-item__amount--secondary"
-          prefix="-"
           value={value}
+          prefix="-"
+          type={SECONDARY}
         />
       )
   }