diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-08-25 07:15:43 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-08-25 07:15:43 +0800 |
| commit | eee08457e51c6d4a4d4817671b93fa57933e338f (patch) | |
| tree | 53f6d83ded894c0b4b16b92cf81bcabb82eff818 /ui/app | |
| parent | 15c8680e21cce1295dd3ec2959bd96373c1f4451 (diff) | |
| parent | c8c77aa8bd03125261e094b0cb264ed9fa9d9d77 (diff) | |
| download | tangerine-wallet-browser-eee08457e51c6d4a4d4817671b93fa57933e338f.tar.gz tangerine-wallet-browser-eee08457e51c6d4a4d4817671b93fa57933e338f.tar.zst tangerine-wallet-browser-eee08457e51c6d4a4d4817671b93fa57933e338f.zip | |
Merge branch 'master' into i484PersistPendingSignatures
Diffstat (limited to 'ui/app')
| -rw-r--r-- | ui/app/components/pending-msg-details.js | 9 | ||||
| -rw-r--r-- | ui/app/conf-tx.js | 2 |
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 db876dd9b..43604e8cf 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -35,7 +35,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] || {} return ( |