diff options
author | kumavis <aaron@kumavis.me> | 2017-01-14 07:51:36 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2017-01-14 07:51:36 +0800 |
commit | d06c54e0b7eb7803798e31d8d035b648e9da0421 (patch) | |
tree | 0dc1e906dbc2e460090f86e4e3f8171e8e2960ea /ui/app/components/transaction-list-item.js | |
parent | d755b66e204277ac6a904ba432f7b10a340c9288 (diff) | |
parent | 9f162e72b48552b7ab3f2755114c9e2be6d0aace (diff) | |
download | tangerine-wallet-browser-d06c54e0b7eb7803798e31d8d035b648e9da0421.tar.gz tangerine-wallet-browser-d06c54e0b7eb7803798e31d8d035b648e9da0421.tar.zst tangerine-wallet-browser-d06c54e0b7eb7803798e31d8d035b648e9da0421.zip |
Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-submitTx
Diffstat (limited to 'ui/app/components/transaction-list-item.js')
-rw-r--r-- | ui/app/components/transaction-list-item.js | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js index bb685abda..bcd50c333 100644 --- a/ui/app/components/transaction-list-item.js +++ b/ui/app/components/transaction-list-item.js @@ -8,6 +8,7 @@ const explorerLink = require('../../lib/explorer-link') const CopyButton = require('./copyButton') const vreme = new (require('vreme')) const extension = require('../../../app/scripts/lib/extension') +const Tooltip = require('./tooltip') const TransactionIcon = require('./transaction-list-item-icon') const ShiftListItem = require('./shift-list-item') @@ -59,11 +60,7 @@ TransactionListItem.prototype.render = function () { }, [ h('.identicon-wrapper.flex-column.flex-center.select-none', [ - transaction.status === 'unapproved' ? h('i.fa.fa-ellipsis-h', { - style: { - fontSize: '27px', - }, - }) : h('.pop-hover', { + h('.pop-hover', { onClick: (event) => { event.stopPropagation() if (!isTx || isPending) return @@ -139,7 +136,14 @@ function failIfFailed (transaction) { if (transaction.status === 'rejected') { return h('span.error', ' (Rejected)') } - if (transaction.status === 'failed') { - return h('span.error', ' (Failed)') + if (transaction.err) { + + return h(Tooltip, { + title: transaction.err.message, + position: 'bottom', + }, [ + h('span.error', ' (Failed)'), + ]) } + } |