Fix i18n merge conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/ui/app/components/pending-msg-details.js b/ui/app/components/pending-msg-details.js
index 87e66855d..ddec8470d 100644
--- a/ui/app/components/pending-msg-details.js
+++ b/ui/app/components/pending-msg-details.js
@@ -1,11 +1,11 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const t = require('../../i18n')
+const connect = require('../metamask-connect')
 
 const AccountPanel = require('./account-panel')
 
-module.exports = PendingMsgDetails
+module.exports = connect()(PendingMsgDetails)
 
 inherits(PendingMsgDetails, Component)
 function PendingMsgDetails () {
@@ -40,7 +40,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', t('message')),
+          h('label.font-small.allcaps', this.props.t('message')),
           h('span.font-small', msgParams.data),
         ]),
       ]),