Merge pull request #855 from MetaMask/i834-RopstenLinks

Add ropsten link support

3 files changed, 12 insertions, 4 deletions

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.
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 = ''