diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-08-25 07:07:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-25 07:07:38 +0800 |
| commit | 88671466c6590482f14a2a60d8ce79109b7b1482 (patch) | |
| tree | f6c3d39c7f87504f1e1e71ffd02defc1f8bad9c1 /ui | |
| parent | 55745c59805e691e75b2ceabdbc353032971cc8e (diff) | |
| parent | 8c06463e80f1bd8a9aefadb0462a2aaf27e2a2be (diff) | |
| download | tangerine-wallet-browser-88671466c6590482f14a2a60d8ce79109b7b1482.tar tangerine-wallet-browser-88671466c6590482f14a2a60d8ce79109b7b1482.tar.gz tangerine-wallet-browser-88671466c6590482f14a2a60d8ce79109b7b1482.tar.bz2 tangerine-wallet-browser-88671466c6590482f14a2a60d8ce79109b7b1482.tar.lz tangerine-wallet-browser-88671466c6590482f14a2a60d8ce79109b7b1482.tar.xz tangerine-wallet-browser-88671466c6590482f14a2a60d8ce79109b7b1482.tar.zst tangerine-wallet-browser-88671466c6590482f14a2a60d8ce79109b7b1482.zip | |
Merge pull request #580 from MetaMask/FixEmptySignBug
Fix empty sign bug
Diffstat (limited to 'ui')
| -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 ( |