m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #866 from MetaMask/new-faucet-dev

Browse Source 
Make ropsten faucet button point at the correct url.
This commit is contained in:
Dan Finlay 2016-11-22 10:30:50 -08:00 committed by GitHub
commit ca819781cb
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@
- Add support for the new, default Ropsten Test Network. - Add support for the new, default Ropsten Test Network.
- Fix bug that would cause MetaMask to occasionally lose its StreamProvider connection and drop requests. - Fix bug that would cause MetaMask to occasionally lose its StreamProvider connection and drop requests.
- Fix bug that would cause the Custom RPC menu item to not appear when Localhost 8545 was selected. - Fix bug that would cause the Custom RPC menu item to not appear when Localhost 8545 was selected.
- Point ropsten faucet button to actual faucet.
## 2.13.8 2016-11-16 ## 2.13.8 2016-11-16

2
app/scripts/metamask-controller.js
View File

@ -341,7 +341,7 @@ module.exports = class MetamaskController {
var network = this.state.network var network = this.state.network
var url = `https://buy.coinbase.com/?code=9ec56d01-7e81-5017-930c-513daa27bb6a&amount=${amount}&address=${address}&crypto_currency=ETH` 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/' url = 'https://faucet.metamask.io/'
} }

4
ui/app/components/buy-button-subview.js
View File

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