Merge pull request #326 from MetaMask/conf-tx-refactor

Tx/Msg Conf page + notifcation refactor

1 files changed, 8 insertions, 29 deletions

diff --git a/ui/app/components/pending-msg.js b/ui/app/components/pending-msg.js
index 7f3914d56..f4bde91dc 100644
--- a/ui/app/components/pending-msg.js
+++ b/ui/app/components/pending-msg.js
@@ -1,9 +1,7 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-
-const AccountPanel = require('./account-panel')
-const readableDate = require('../util').readableDate
+const PendingTxDetails = require('./pending-msg-details')
 
 module.exports = PendingMsg
 
@@ -16,16 +14,13 @@ PendingMsg.prototype.render = function () {
   var state = this.props
   var msgData = state.txData
 
-  var msgParams = msgData.msgParams || {}
-  var address = msgParams.from || state.selectedAddress
-  var identity = state.identities[address] || { address: address }
-  var account = state.accounts[address] || { address: address }
-
   return (
-    h('.transaction', {
+
+    h('div', {
       key: msgData.id,
     }, [
 
+      // header
       h('h3', {
         style: {
           fontWeight: 'bold',
@@ -33,27 +28,10 @@ PendingMsg.prototype.render = function () {
         },
       }, 'Sign Message'),
 
-      // account that will sign
-      h(AccountPanel, {
-        showFullAddress: true,
-        identity: identity,
-        account: account,
-      }),
-
-      // tx data
-      h('.tx-data.flex-column.flex-justify-center.flex-grow.select-none', [
-        h('.flex-row.flex-space-between', [
-          h('label.font-small', 'DATE'),
-          h('span.font-small', readableDate(msgData.time)),
-        ]),
+      // message details
+      h(PendingTxDetails, state),
 
-        h('.flex-row.flex-space-between', [
-          h('label.font-small', 'MESSAGE'),
-          h('span.font-small', msgParams.data),
-        ]),
-      ]),
-
-      // send + cancel
+      // sign + cancel
       h('.flex-row.flex-space-around', [
         h('button', {
           onClick: state.cancelMessage,
@@ -63,6 +41,7 @@ PendingMsg.prototype.render = function () {
         }, 'Sign'),
       ]),
     ])
+
   )
 }