aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <flyswatter@users.noreply.github.com>2017-03-29 05:56:02 +0800
committerGitHub <noreply@github.com>2017-03-29 05:56:02 +0800
commit7b9ac1855745cb293b008a49a94b3299f2ac0199 (patch)
tree8325334deec93257d2d295c0475ec9341761f581
parentf2587b7e8033eadd4095b378f2e9953c6919cdb0 (diff)
parenta3e08d779ecc81ebddf8609130eae5e6db08ad48 (diff)
downloadtangerine-wallet-browser-7b9ac1855745cb293b008a49a94b3299f2ac0199.tar
tangerine-wallet-browser-7b9ac1855745cb293b008a49a94b3299f2ac0199.tar.gz
tangerine-wallet-browser-7b9ac1855745cb293b008a49a94b3299f2ac0199.tar.bz2
tangerine-wallet-browser-7b9ac1855745cb293b008a49a94b3299f2ac0199.tar.lz
tangerine-wallet-browser-7b9ac1855745cb293b008a49a94b3299f2ac0199.tar.xz
tangerine-wallet-browser-7b9ac1855745cb293b008a49a94b3299f2ac0199.tar.zst
tangerine-wallet-browser-7b9ac1855745cb293b008a49a94b3299f2ac0199.zip
Merge pull request #1268 from MetaMask/kovan-faucet-instructions
Add Kovan faucet instructions
-rw-r--r--CHANGELOG.md1
-rw-r--r--app/scripts/metamask-controller.js4
-rw-r--r--ui/app/components/buy-button-subview.js11
3 files changed, 14 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ac434739..f6383fa51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
## Current Master
+- Add link to Kovan Test Faucet instructions on buy view.
- Inject web3 into loaded iFrames.
## 3.5.1 2017-3-27
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index c0c113a45..03ea104e0 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -623,6 +623,10 @@ module.exports = class MetamaskController extends EventEmitter {
case '3':
url = 'https://faucet.metamask.io/'
break
+
+ case '42':
+ url = 'https://github.com/kovan-testnet/faucet'
+ break
}
if (url) extension.tabs.create({ url })
diff --git a/ui/app/components/buy-button-subview.js b/ui/app/components/buy-button-subview.js
index 3074bd7cd..7b993110d 100644
--- a/ui/app/components/buy-button-subview.js
+++ b/ui/app/components/buy-button-subview.js
@@ -121,15 +121,22 @@ BuyButtonSubview.prototype.formVersionSubview = function () {
h('h3.text-transform-uppercase', {
style: {
width: '225px',
+ marginBottom: '15px',
},
}, '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') || (this.props.network === '42')) ? h('h3.text-transform-uppercase', 'or go to the') : null,
(this.props.network === '3') ? h('button.text-transform-uppercase', {
onClick: () => this.props.dispatch(actions.buyEth()),
style: {
marginTop: '15px',
},
- }, 'Go To Test Faucet') : null,
+ }, 'Ropsten Test Faucet') : null,
+ (this.props.network === '42') ? h('button.text-transform-uppercase', {
+ onClick: () => this.props.dispatch(actions.buyEth()),
+ style: {
+ marginTop: '15px',
+ },
+ }, 'Kovan Test Faucet') : null,
])
}
}