diff options
| author | Dan Finlay <somniac@me.com> | 2016-12-21 06:14:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-21 06:14:03 +0800 |
| commit | de22ab2090ca7d7929dbba188476a18d9d5f50d0 (patch) | |
| tree | f5fc945434bda757f1763905d57b29198c852d23 | |
| parent | 6ce0bc4b11ccb7ffae4f58980db0301dc418c9c0 (diff) | |
| parent | 05e62cbc17889f1020c5ec93456b799bb4ad2b4c (diff) | |
| download | tangerine-wallet-browser-de22ab2090ca7d7929dbba188476a18d9d5f50d0.tar.gz tangerine-wallet-browser-de22ab2090ca7d7929dbba188476a18d9d5f50d0.tar.zst tangerine-wallet-browser-de22ab2090ca7d7929dbba188476a18d9d5f50d0.zip | |
Merge pull request #943 from MetaMask/fixExplorerLink
Fix explorer link
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | test/unit/explorer-link-test.js | 2 | ||||
| -rw-r--r-- | ui/app/components/transaction-list-item.js | 3 | ||||
| -rw-r--r-- | ui/lib/explorer-link.js | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fd1e83bf..70ee9add3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Current Master +- Fixed ropsten transaction links - Temporarily disable extension reload detection causing infinite reload bug. ## 2.14.0 2016-12-16 diff --git a/test/unit/explorer-link-test.js b/test/unit/explorer-link-test.js index 961b400fd..8aa58bff9 100644 --- a/test/unit/explorer-link-test.js +++ b/test/unit/explorer-link-test.js @@ -4,7 +4,7 @@ var linkGen = require('../../ui/lib/explorer-link') describe('explorer-link', function() { it('adds testnet prefix to morden test network', function() { - var result = linkGen('hash', '2') + var result = linkGen('hash', '3') assert.notEqual(result.indexOf('testnet'), -1, 'testnet injected') }) diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js index 491e90c7c..f92a4ab2e 100644 --- a/ui/app/components/transaction-list-item.js +++ b/ui/app/components/transaction-list-item.js @@ -27,7 +27,7 @@ TransactionListItem.prototype.render = function () { let isLinkable = false const numericNet = parseInt(network) - isLinkable = numericNet === 1 || numericNet === 2 + isLinkable = numericNet === 1 || numericNet === 3 var isMsg = ('msgParams' in transaction) var isTx = ('txParams' in transaction) @@ -41,7 +41,6 @@ TransactionListItem.prototype.render = function () { } const isClickable = ('hash' in transaction && isLinkable) || isPending - return ( h(`.transaction-list-item.flex-row.flex-space-between${isClickable ? '.pointer' : ''}`, { onClick: (event) => { diff --git a/ui/lib/explorer-link.js b/ui/lib/explorer-link.js index 2993d1cf1..dc6be2984 100644 --- a/ui/lib/explorer-link.js +++ b/ui/lib/explorer-link.js @@ -5,7 +5,7 @@ module.exports = function (hash, network) { case 1: // main net prefix = '' break - case 2: // morden test net + case 3: // morden test net prefix = 'testnet.' break default: |