aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-11-29 05:22:27 +0800
committerGitHub <noreply@github.com>2016-11-29 05:22:27 +0800
commitda5be09a94763f5de292f47c425919f3d4fac866 (patch)
treea68a7c2529a82f4634913755bfc3f781f9476c3c /ui/app
parentb9b3ef8fedc848cbebc60eab70b90aa4f75060f2 (diff)
parentb8991195829474691f17db3a7a6c9c081f9a95c9 (diff)
downloadtangerine-wallet-browser-da5be09a94763f5de292f47c425919f3d4fac866.tar.gz
tangerine-wallet-browser-da5be09a94763f5de292f47c425919f3d4fac866.tar.zst
tangerine-wallet-browser-da5be09a94763f5de292f47c425919f3d4fac866.zip
Merge pull request #890 from MetaMask/MergeMasterIntoDev
Merge master into dev
Diffstat (limited to 'ui/app')
-rw-r--r--ui/app/components/buy-button-subview.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/app/components/buy-button-subview.js b/ui/app/components/buy-button-subview.js
index 0dd8c4946..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'),
- this.props.network === '3' ? h('h3.text-transform-uppercase', 'or:') : null,
- this.props.network === '3' ? 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',