Merge branch 'master' into i868-estimateGasTooHigh

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
 ## 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
 

app/scripts/metamask-controller.js

@@ -364,7 +364,7 @@ module.exports = class MetamaskController {
     var network = this.idStore._currentState.network
     var url = `https://buy.coinbase.com/?code=9ec56d01-7e81-5017-930c-513daa27bb6a&amount=${amount}&address=${address}&crypto_currency=ETH`
 
-    if (network === '2') {
+    if (network === '3') {
       url = 'https://faucet.metamask.io/'
     }
 

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')
   })
 

ui/app/components/buy-button-subview.js

@@ -113,9 +113,9 @@ BuyButtonSubview.prototype.formVersionSubview = function () {
         style: {
           width: '225px',
         },
-      }, 'In order to access this feature please switch to the Main Network'),
-      h('h3.text-transform-uppercase', 'or:'),
-      this.props.network === '2' ? h('button.text-transform-uppercase', {
+      }, 'In order to access this feature, please switch to the Main Network'),
+      (this.props.network === '3') ? h('h3.text-transform-uppercase', 'or:') : null,
+      (this.props.network === '3') ? h('button.text-transform-uppercase', {
         onClick: () => this.props.dispatch(actions.buyEth()),
         style: {
           marginTop: '15px',

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