aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-09-16 12:05:24 +0800
committerDan Finlay <dan@danfinlay.com>2016-09-16 12:05:24 +0800
commited51b91b4a526db6c1282445ca1fb4e41d5ca37f (patch)
treeb83b8d2ec55cdf25d7906b8865621ee7bc4a0485
parent4eef2c57cf9178cdf5b0a882d6fae0dcdcfae89a (diff)
parentae2f0f585fd70986ce71f95b40ed49e9909283f5 (diff)
downloadtangerine-wallet-browser-ed51b91b4a526db6c1282445ca1fb4e41d5ca37f.tar.gz
tangerine-wallet-browser-ed51b91b4a526db6c1282445ca1fb4e41d5ca37f.tar.zst
tangerine-wallet-browser-ed51b91b4a526db6c1282445ca1fb4e41d5ca37f.zip
Merge branch 'master' into i675-LoadingBuy
-rw-r--r--CHANGELOG.md2
-rw-r--r--ui/app/components/transaction-list-item.js19
2 files changed, 17 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14b96ce70..63e59617f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## Current Master
+- Add a link to the transaction in history that goes to https://metamask.github.io/eth-tx-viz
+too help visualize transactions and to where they are going.
- Show "Buy Ether" button and warning on tx confirmation when sender balance is insufficient
- Show loading indication when selecting ShapeShift as purchasing method.
diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js
index 66a232981..491e90c7c 100644
--- a/ui/app/components/transaction-list-item.js
+++ b/ui/app/components/transaction-list-item.js
@@ -48,7 +48,7 @@ TransactionListItem.prototype.render = function () {
if (isPending) {
this.props.showTx(transaction.id)
}
-
+ event.stopPropagation()
if (!transaction.hash || !isLinkable) return
var url = explorerLink(transaction.hash, parseInt(network))
extension.tabs.create({ url })
@@ -58,10 +58,21 @@ TransactionListItem.prototype.render = function () {
},
}, [
- // large identicon
h('.identicon-wrapper.flex-column.flex-center.select-none', [
- transaction.status === 'unconfirmed' ? h('i.fa.fa-ellipsis-h', {style: { fontSize: '27px' }})
- : h(TransactionIcon, { txParams, transaction, isTx, isMsg }),
+ transaction.status === 'unconfirmed' ? h('i.fa.fa-ellipsis-h', {
+ style: {
+ fontSize: '27px',
+ },
+ }) : h( '.pop-hover', {
+ onClick: (event) => {
+ event.stopPropagation()
+ if (!isTx || isPending) return
+ var url = `https://metamask.github.io/eth-tx-viz/?tx=${transaction.hash}`
+ extension.tabs.create({ url })
+ },
+ }, [
+ h(TransactionIcon, { txParams, transaction, isTx, isMsg }),
+ ]),
]),
h('.flex-column', {style: {width: '200px', overflow: 'hidden'}}, [