diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-11-23 04:14:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 04:14:25 +0800 |
| commit | 49a1f43736a209f4d003a1bebe35defe281296b1 (patch) | |
| tree | ca121f1e43cd3cf823999449ccc04ff9b3854f4a /ui | |
| parent | fa2f0dee285d4a9032f8a756ee8711a7fe767b76 (diff) | |
| parent | b9d73a4b8fd8aa88aa1cf51e8305db9809dd7b9d (diff) | |
| download | tangerine-wallet-browser-49a1f43736a209f4d003a1bebe35defe281296b1.tar tangerine-wallet-browser-49a1f43736a209f4d003a1bebe35defe281296b1.tar.gz tangerine-wallet-browser-49a1f43736a209f4d003a1bebe35defe281296b1.tar.bz2 tangerine-wallet-browser-49a1f43736a209f4d003a1bebe35defe281296b1.tar.lz tangerine-wallet-browser-49a1f43736a209f4d003a1bebe35defe281296b1.tar.xz tangerine-wallet-browser-49a1f43736a209f4d003a1bebe35defe281296b1.tar.zst tangerine-wallet-browser-49a1f43736a209f4d003a1bebe35defe281296b1.zip | |
Merge branch 'master' into i868-estimateGasTooHigh
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/components/buy-button-subview.js | 6 | ||||
| -rw-r--r-- | ui/lib/account-link.js | 4 |
2 files changed, 5 insertions, 5 deletions
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', diff --git a/ui/lib/account-link.js b/ui/lib/account-link.js index a6b120c63..ff52d9c54 100644 --- a/ui/lib/account-link.js +++ b/ui/lib/account-link.js @@ -7,10 +7,10 @@ module.exports = function(address, network) { link = `http://etherscan.io/address/${address}` break case 2: // morden test net - link = `http://testnet.etherscan.io/address/${address}` + link = `http://morden.etherscan.io/address/${address}` break case 3: // ropsten test net - link = '' + link = `http://testnet.etherscan.io/address/${address}` break default: link = '' |