Fix merge conflicts

1 files changed, 8 insertions, 2 deletions

diff --git a/ui/app/components/pending-msg-details.js b/ui/app/components/pending-msg-details.js
index ddec8470d..f16fcb1c7 100644
--- a/ui/app/components/pending-msg-details.js
+++ b/ui/app/components/pending-msg-details.js
@@ -1,12 +1,18 @@
 const Component = require('react').Component
+const PropTypes = require('prop-types')
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const connect = require('../metamask-connect')
+const connect = require('react-redux').connect
 
 const AccountPanel = require('./account-panel')
 
+PendingMsgDetails.contextTypes = {
+  t: PropTypes.func,
+}
+
 module.exports = connect()(PendingMsgDetails)
 
+
 inherits(PendingMsgDetails, Component)
 function PendingMsgDetails () {
   Component.call(this)
@@ -40,7 +46,7 @@ PendingMsgDetails.prototype.render = function () {
       // message data
       h('.tx-data.flex-column.flex-justify-center.flex-grow.select-none', [
         h('.flex-column.flex-space-between', [
-          h('label.font-small.allcaps', this.props.t('message')),
+          h('label.font-small.allcaps', this.context.t('message')),
           h('span.font-small', msgParams.data),
         ]),
       ]),