diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-08-24 02:14:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-24 02:14:25 +0800 |
| commit | 09235a59247b93b8882b4cd95dbccb9a0ff5f3e0 (patch) | |
| tree | db3121480869ad5e52cf130fee250e45391c9929 | |
| parent | 1d7781da6b895789933c450bdd6d2581d6fff03c (diff) | |
| parent | 86d3169423547530691d9547ab0193a195342b38 (diff) | |
| download | tangerine-wallet-browser-09235a59247b93b8882b4cd95dbccb9a0ff5f3e0.tar tangerine-wallet-browser-09235a59247b93b8882b4cd95dbccb9a0ff5f3e0.tar.gz tangerine-wallet-browser-09235a59247b93b8882b4cd95dbccb9a0ff5f3e0.tar.bz2 tangerine-wallet-browser-09235a59247b93b8882b4cd95dbccb9a0ff5f3e0.tar.lz tangerine-wallet-browser-09235a59247b93b8882b4cd95dbccb9a0ff5f3e0.tar.xz tangerine-wallet-browser-09235a59247b93b8882b4cd95dbccb9a0ff5f3e0.tar.zst tangerine-wallet-browser-09235a59247b93b8882b4cd95dbccb9a0ff5f3e0.zip | |
Merge branch 'master' into useLocalNonce
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | ui/app/components/transaction-list-item.js | 11 |
2 files changed, 2 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 68272404c..c5290ed99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Current Master - Improve nonce calculation, to prevent bug where people are unable to send transactions reliably. +- Remove link to eth-tx-viz from identicons in tx history. ## 3.9.9 2017-8-18 diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js index 9018bab06..5d5d0bcc5 100644 --- a/ui/app/components/transaction-list-item.js +++ b/ui/app/components/transaction-list-item.js @@ -60,16 +60,7 @@ TransactionListItem.prototype.render = function () { }, [ h('.identicon-wrapper.flex-column.flex-center.select-none', [ - h('.pop-hover', { - onClick: (event) => { - event.stopPropagation() - if (!isTx || isPending) return - var url = `https://metamask.github.io/eth-tx-viz/?tx=${transaction.hash}` - global.platform.openWindow({ url }) - }, - }, [ - h(TransactionIcon, { txParams, transaction, isTx, isMsg }), - ]), + h(TransactionIcon, { txParams, transaction, isTx, isMsg }), ]), h(Tooltip, { |