Merge branch 'master' into PopupNotifications

2 files changed, 4 insertions, 7 deletions

diff --git a/ui/app/components/pending-msg-details.js b/ui/app/components/pending-msg-details.js
index adcec596e..16308d121 100644
--- a/ui/app/components/pending-msg-details.js
+++ b/ui/app/components/pending-msg-details.js
@@ -3,7 +3,6 @@ const h = require('react-hyperscript')
 const inherits = require('util').inherits
 
 const AccountPanel = require('./account-panel')
-const readableDate = require('../util').readableDate
 
 module.exports = PendingMsgDetails
 
@@ -24,6 +23,9 @@ PendingMsgDetails.prototype.render = function () {
   return (
     h('div', {
       key: msgData.id,
+      style: {
+        margin: '10px 20px',
+      },
     }, [
 
       // account that will sign
@@ -37,11 +39,6 @@ PendingMsgDetails.prototype.render = function () {
       // message 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)),
-        ]),
-
-        h('.flex-row.flex-space-between', [
           h('label.font-small', 'MESSAGE'),
           h('span.font-small', msgParams.data),
         ]),
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index f832b8a4b..22d29383f 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -36,7 +36,7 @@ ConfirmTxScreen.prototype.render = function () {
   var unconfMsgs = state.unconfMsgs
   var unconfTxList = txHelper(unconfTxs, unconfMsgs)
   var index = state.index !== undefined ? state.index : 0
-  var txData = unconfTxList[index] || {}
+  var txData = unconfTxList[index] || unconfTxList[0] || {}
   var isNotification = isPopupOrNotification() === 'notification'
 
   return (