Removes t from props via metamask-connect and instead places it on context via a provider.

1 files changed, 14 insertions, 8 deletions

diff --git a/ui/app/components/shift-list-item.js b/ui/app/components/shift-list-item.js
index d810eddc9..4334aacba 100644
--- a/ui/app/components/shift-list-item.js
+++ b/ui/app/components/shift-list-item.js
@@ -1,7 +1,8 @@
 const inherits = require('util').inherits
 const Component = require('react').Component
+const PropTypes = require('prop-types')
 const h = require('react-hyperscript')
-const connect = require('../metamask-connect')
+const connect = require('react-redux').connect
 const vreme = new (require('vreme'))()
 const explorerLink = require('etherscan-link').createExplorerLink
 const actions = require('../actions')
@@ -12,8 +13,13 @@ const EthBalance = require('./eth-balance')
 const Tooltip = require('./tooltip')
 
 
+ShiftListItem.contextTypes = {
+  t: PropTypes.func,
+}
+
 module.exports = connect(mapStateToProps)(ShiftListItem)
 
+
 function mapStateToProps (state) {
   return {
     selectedAddress: state.metamask.selectedAddress,
@@ -75,7 +81,7 @@ ShiftListItem.prototype.renderUtilComponents = function () {
           value: this.props.depositAddress,
         }),
         h(Tooltip, {
-          title: this.props.t('qrCode'),
+          title: this.context.t('qrCode'),
         }, [
           h('i.fa.fa-qrcode.pointer.pop-hover', {
             onClick: () => props.dispatch(actions.reshowQrCode(props.depositAddress, props.depositType)),
@@ -135,8 +141,8 @@ ShiftListItem.prototype.renderInfo = function () {
             color: '#ABA9AA',
             width: '100%',
           },
-        }, this.props.t('toETHviaShapeShift', [props.depositType])),
-        h('div', this.props.t('noDeposits')),
+        }, this.context.t('toETHviaShapeShift', [props.depositType])),
+        h('div', this.context.t('noDeposits')),
         h('div', {
           style: {
             fontSize: 'x-small',
@@ -158,8 +164,8 @@ ShiftListItem.prototype.renderInfo = function () {
             color: '#ABA9AA',
             width: '100%',
           },
-        }, this.props.t('toETHviaShapeShift', [props.depositType])),
-        h('div', this.props.t('conversionProgress')),
+        }, this.context.t('toETHviaShapeShift', [props.depositType])),
+        h('div', this.context.t('conversionProgress')),
         h('div', {
           style: {
             fontSize: 'x-small',
@@ -184,7 +190,7 @@ ShiftListItem.prototype.renderInfo = function () {
             color: '#ABA9AA',
             width: '100%',
           },
-        }, this.props.t('fromShapeShift')),
+        }, this.context.t('fromShapeShift')),
         h('div', formatDate(props.time)),
         h('div', {
           style: {
@@ -196,7 +202,7 @@ ShiftListItem.prototype.renderInfo = function () {
       ])
 
     case 'failed':
-      return h('span.error', '(' + this.props.t('failed') + ')')
+      return h('span.error', '(' + this.context.t('failed') + ')')
     default:
       return ''
   }