Merge branch 'master' into i3471-checkbalanceonconfirmscreen

1 files changed, 10 insertions, 11 deletions

diff --git a/ui/app/components/tx-list-item.js b/ui/app/components/tx-list-item.js
index d104eda88..5e88d38d3 100644
--- a/ui/app/components/tx-list-item.js
+++ b/ui/app/components/tx-list-item.js
@@ -1,6 +1,6 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
-const connect = require('react-redux').connect
+const connect = require('../metamask-connect')
 const inherits = require('util').inherits
 const classnames = require('classnames')
 const abi = require('human-standard-token-abi')
@@ -14,7 +14,6 @@ const { conversionUtil, multiplyCurrencies } = require('../conversion-util')
 const { calcTokenAmount } = require('../token-util')
 
 const { getCurrentCurrency } = require('../selectors')
-const t = require('../../i18n')
 
 module.exports = connect(mapStateToProps, mapDispatchToProps)(TxListItem)
 
@@ -75,7 +74,7 @@ TxListItem.prototype.getAddressText = function () {
     default:
       return address
         ? `${address.slice(0, 10)}...${address.slice(-4)}`
-        : t('contractDeployment')
+        : this.props.t('contractDeployment')
   }
 }
 
@@ -307,21 +306,21 @@ TxListItem.prototype.txStatusIndicator = function () {
   let name
 
   if (transactionStatus === 'unapproved') {
-    name = t('unapproved')
+    name = this.props.t('unapproved')
   } else if (transactionStatus === 'rejected') {
-    name = t('rejected')
+    name = this.props.t('rejected')
   } else if (transactionStatus === 'approved') {
-    name = t('approved')
+    name = this.props.t('approved')
   } else if (transactionStatus === 'signed') {
-    name = t('signed')
+    name = this.props.t('signed')
   } else if (transactionStatus === 'submitted') {
-    name = t('submitted')
+    name = this.props.t('submitted')
   } else if (transactionStatus === 'confirmed') {
-    name = t('confirmed')
+    name = this.props.t('confirmed')
   } else if (transactionStatus === 'failed') {
-    name = t('failed')
+    name = this.props.t('failed')
   } else if (transactionStatus === 'dropped') {
-    name = t('dropped')
+    name = this.props.t('dropped')
   }
   return name
 }