diff options
author | Dan Finlay <somniac@me.com> | 2016-11-23 02:31:29 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-23 02:31:29 +0800 |
commit | cffe0c27f3c66c15622001b5ef0f3c9f35a99a70 (patch) | |
tree | ade4d57ba311779d37e3dfc36700ba2f4814394f | |
parent | 8d2afccdc0e355c2cf5425de5c21042b08989393 (diff) | |
parent | 2df6ebbd10b2d3bf03d82043b63b367548574ed9 (diff) | |
download | tangerine-wallet-browser-cffe0c27f3c66c15622001b5ef0f3c9f35a99a70.tar.gz tangerine-wallet-browser-cffe0c27f3c66c15622001b5ef0f3c9f35a99a70.tar.zst tangerine-wallet-browser-cffe0c27f3c66c15622001b5ef0f3c9f35a99a70.zip |
Merge branch 'master' into new-faucet
-rw-r--r-- | CHANGELOG.md | 2 | ||||
-rw-r--r-- | test/unit/account-link-test.js | 10 | ||||
-rw-r--r-- | ui/lib/account-link.js | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 69764748f..eb7c8a942 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## Current Master - Ropsten networks now properly point to the faucet when attempting to buy ether. +- Make Ropsten transactions link to etherscan correctly. + ## 2.13.9 2016-11-21 - Add support for the new, default Ropsten Test Network. diff --git a/test/unit/account-link-test.js b/test/unit/account-link-test.js index 39889b6be..4ea12e002 100644 --- a/test/unit/account-link-test.js +++ b/test/unit/account-link-test.js @@ -3,9 +3,15 @@ var linkGen = require('../../ui/lib/account-link') describe('account-link', function() { - it('adds testnet prefix to morden test network', function() { + it('adds morden prefix to morden test network', function() { var result = linkGen('account', '2') - assert.notEqual(result.indexOf('testnet'), -1, 'testnet injected') + assert.notEqual(result.indexOf('morden'), -1, 'testnet included') + assert.notEqual(result.indexOf('account'), -1, 'account included') + }) + + it('adds testnet prefix to ropsten test network', function() { + var result = linkGen('account', '3') + assert.notEqual(result.indexOf('testnet'), -1, 'testnet included') assert.notEqual(result.indexOf('account'), -1, 'account included') }) diff --git a/ui/lib/account-link.js b/ui/lib/account-link.js index a6b120c63..ff52d9c54 100644 --- a/ui/lib/account-link.js +++ b/ui/lib/account-link.js @@ -7,10 +7,10 @@ module.exports = function(address, network) { link = `http://etherscan.io/address/${address}` break case 2: // morden test net - link = `http://testnet.etherscan.io/address/${address}` + link = `http://morden.etherscan.io/address/${address}` break case 3: // ropsten test net - link = '' + link = `http://testnet.etherscan.io/address/${address}` break default: link = '' |