From 7d38c4ccb657409f123bde6709ddff6418c90c89 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Mon, 21 Nov 2016 19:11:55 -0800 Subject: Add ropsten link support --- ui/lib/account-link.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/lib/account-link.js b/ui/lib/account-link.js index a6b120c63..a77422142 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 = '' break case 3: // ropsten test net - link = '' + link = `http://testnet.etherscan.io/address/${address}` break default: link = '' -- cgit v1.2.3 From aefc346a655320da57ab9d63ec920cc21550ddd8 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Mon, 21 Nov 2016 19:14:22 -0800 Subject: Bump changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 165562ad9..481130201 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +- Make Ropsten transactions link to etherscan correctly. + ## 2.13.9 2016-11-21 - Add support for the new, default Ropsten Test Network. -- cgit v1.2.3 From daec4d5c3639f7a97862ba87df749fbcd9a46c17 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Mon, 21 Nov 2016 19:19:34 -0800 Subject: Fix ropsten link test --- test/unit/account-link-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/account-link-test.js b/test/unit/account-link-test.js index 39889b6be..08d190f71 100644 --- a/test/unit/account-link-test.js +++ b/test/unit/account-link-test.js @@ -3,8 +3,8 @@ var linkGen = require('../../ui/lib/account-link') describe('account-link', function() { - it('adds testnet prefix to morden test network', function() { - var result = linkGen('account', '2') + it('adds testnet prefix to ropsten test network', function() { + var result = linkGen('account', '3') assert.notEqual(result.indexOf('testnet'), -1, 'testnet injected') assert.notEqual(result.indexOf('account'), -1, 'account included') }) -- cgit v1.2.3 From 694f34ae9a11dbe0ea6f484defe2d8f9e55da82a Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Mon, 21 Nov 2016 19:43:59 -0800 Subject: Add temporary morden explorer link support --- test/unit/account-link-test.js | 6 ++++++ ui/lib/account-link.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/test/unit/account-link-test.js b/test/unit/account-link-test.js index 08d190f71..5036f8f5d 100644 --- a/test/unit/account-link-test.js +++ b/test/unit/account-link-test.js @@ -3,6 +3,12 @@ var linkGen = require('../../ui/lib/account-link') describe('account-link', function() { + it('adds morden prefix to morden test network', function() { + var result = linkGen('account', '2') + assert.notEqual(result.indexOf('morden'), -1, 'testnet injected') + 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 injected') diff --git a/ui/lib/account-link.js b/ui/lib/account-link.js index a77422142..ff52d9c54 100644 --- a/ui/lib/account-link.js +++ b/ui/lib/account-link.js @@ -7,7 +7,7 @@ module.exports = function(address, network) { link = `http://etherscan.io/address/${address}` break case 2: // morden test net - link = '' + link = `http://morden.etherscan.io/address/${address}` break case 3: // ropsten test net link = `http://testnet.etherscan.io/address/${address}` -- cgit v1.2.3 From e2a9e1cd4ab6329df3de94d136ccb7e912945c48 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Mon, 21 Nov 2016 19:45:05 -0800 Subject: Unify test wording --- test/unit/account-link-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/account-link-test.js b/test/unit/account-link-test.js index 5036f8f5d..4ea12e002 100644 --- a/test/unit/account-link-test.js +++ b/test/unit/account-link-test.js @@ -5,13 +5,13 @@ describe('account-link', function() { it('adds morden prefix to morden test network', function() { var result = linkGen('account', '2') - assert.notEqual(result.indexOf('morden'), -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 injected') + assert.notEqual(result.indexOf('testnet'), -1, 'testnet included') assert.notEqual(result.indexOf('account'), -1, 'account included') }) -- cgit v1.2.3