aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-08-25 07:59:22 +0800
committerDan Finlay <dan@danfinlay.com>2016-08-25 07:59:22 +0800
commit793ad6b8d8c5edec96553f3048595deff94d6f05 (patch)
tree47b0721cb4d434fe164029807c71142aade633f8 /ui
parent4e34796983e399c05f18c3bd1355e2eea83ad891 (diff)
parent4448b635b9246103b59fecc617bcee806d66712c (diff)
downloadtangerine-wallet-browser-793ad6b8d8c5edec96553f3048595deff94d6f05.tar
tangerine-wallet-browser-793ad6b8d8c5edec96553f3048595deff94d6f05.tar.gz
tangerine-wallet-browser-793ad6b8d8c5edec96553f3048595deff94d6f05.tar.bz2
tangerine-wallet-browser-793ad6b8d8c5edec96553f3048595deff94d6f05.tar.lz
tangerine-wallet-browser-793ad6b8d8c5edec96553f3048595deff94d6f05.tar.xz
tangerine-wallet-browser-793ad6b8d8c5edec96553f3048595deff94d6f05.tar.zst
tangerine-wallet-browser-793ad6b8d8c5edec96553f3048595deff94d6f05.zip
Merge branch 'master' into PopupNotifications
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/pending-msg-details.js9
-rw-r--r--ui/app/conf-tx.js2
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 (