diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-23 01:45:28 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-11-23 01:45:28 +0800 |
| commit | 88ed1f191f26849b8451c652d30b81fc6d561a27 (patch) | |
| tree | 85fb752a6e9ea9f740d8142e57630ef891182db0 | |
| parent | 1142d7104821b0ee51b46ef27042ad53b7309e8d (diff) | |
| download | tangerine-wallet-browser-88ed1f191f26849b8451c652d30b81fc6d561a27.tar tangerine-wallet-browser-88ed1f191f26849b8451c652d30b81fc6d561a27.tar.gz tangerine-wallet-browser-88ed1f191f26849b8451c652d30b81fc6d561a27.tar.bz2 tangerine-wallet-browser-88ed1f191f26849b8451c652d30b81fc6d561a27.tar.lz tangerine-wallet-browser-88ed1f191f26849b8451c652d30b81fc6d561a27.tar.xz tangerine-wallet-browser-88ed1f191f26849b8451c652d30b81fc6d561a27.tar.zst tangerine-wallet-browser-88ed1f191f26849b8451c652d30b81fc6d561a27.zip | |
Add to changelog.
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 2 | ||||
| -rw-r--r-- | ui/app/components/buy-button-subview.js | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 165562ad9..69764748f 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. ## 2.13.9 2016-11-21 diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 5e76c5ebd..82ad8f9c4 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 === '2') || (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..ad1967616 100644 --- a/ui/app/components/buy-button-subview.js +++ b/ui/app/components/buy-button-subview.js @@ -115,7 +115,7 @@ BuyButtonSubview.prototype.formVersionSubview = function () { }, }, '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', { + (this.props.network === '2' || this.props.network === '3') ? h('button.text-transform-uppercase', { onClick: () => this.props.dispatch(actions.buyEth()), style: { marginTop: '15px', |