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 #864 from MetaMask/new-faucet

Browse Source 
Point to ropsten faucet
This commit is contained in:
kumavis 2016-11-22 13:46:13 -05:00 committed by GitHub
commit b9d73a4b8f
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,6 +1,7 @@
# Changelog # Changelog
## Current Master ## Current Master
- Ropsten networks now properly point to the faucet when attempting to buy ether.
- Make Ropsten transactions link to etherscan correctly. - Make Ropsten transactions link to etherscan correctly.

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

@ -364,7 +364,7 @@ module.exports = class MetamaskController {
var network = this.idStore._currentState.network 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` 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/'
} }

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

@ -113,9 +113,9 @@ BuyButtonSubview.prototype.formVersionSubview = function () {
style: { style: {
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',