Merge pull request #864 from MetaMask/new-faucet

Point to ropsten faucet

3 files changed, 5 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 481130201..eb7c8a942 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## Current Master
+- Ropsten networks now properly point to the faucet when attempting to buy ether.
 
 - Make Ropsten transactions link to etherscan correctly.
 
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 5e76c5ebd..631411bed 100644
--- a/app/scripts/metamask-controller.js
+++ b/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/'
     }
 
diff --git a/ui/app/components/buy-button-subview.js b/ui/app/components/buy-button-subview.js
index b564733b1..35eda647e 100644
--- a/ui/app/components/buy-button-subview.js
+++ b/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',