aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-09-07 10:36:40 +0800
committerDan Finlay <dan@danfinlay.com>2016-09-07 10:36:40 +0800
commit2ca58f5bf7767b18583e49b5acb3ff35c95b617f (patch)
treea31722385cc6d1cb837f42c6bce1c232fb0d1123 /ui
parente75a1d63f718037aa2f77785f42eccd1ffd9f449 (diff)
parent54425f4ee767fcbd50ac6d9e7fe23e6ab4a3ff57 (diff)
downloadtangerine-wallet-browser-2ca58f5bf7767b18583e49b5acb3ff35c95b617f.tar
tangerine-wallet-browser-2ca58f5bf7767b18583e49b5acb3ff35c95b617f.tar.gz
tangerine-wallet-browser-2ca58f5bf7767b18583e49b5acb3ff35c95b617f.tar.bz2
tangerine-wallet-browser-2ca58f5bf7767b18583e49b5acb3ff35c95b617f.tar.lz
tangerine-wallet-browser-2ca58f5bf7767b18583e49b5acb3ff35c95b617f.tar.xz
tangerine-wallet-browser-2ca58f5bf7767b18583e49b5acb3ff35c95b617f.tar.zst
tangerine-wallet-browser-2ca58f5bf7767b18583e49b5acb3ff35c95b617f.zip
Merge branch 'master' into ModularFiatBalance
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/account-info-link.js2
-rw-r--r--ui/app/components/buy-button-subview.js2
-rw-r--r--ui/app/eth-store-warning.js7
3 files changed, 5 insertions, 6 deletions
diff --git a/ui/app/components/account-info-link.js b/ui/app/components/account-info-link.js
index 4fe3b8b5d..49c42e9ec 100644
--- a/ui/app/components/account-info-link.js
+++ b/ui/app/components/account-info-link.js
@@ -14,7 +14,7 @@ function AccountInfoLink () {
AccountInfoLink.prototype.render = function () {
const { selected, network } = this.props
- const title = 'View account on etherscan'
+ const title = 'View account on Etherscan'
const url = genAccountLink(selected, network)
if (!url) {
diff --git a/ui/app/components/buy-button-subview.js b/ui/app/components/buy-button-subview.js
index 742241e5b..c3e9e5d7b 100644
--- a/ui/app/components/buy-button-subview.js
+++ b/ui/app/components/buy-button-subview.js
@@ -106,7 +106,7 @@ BuyButtonSubview.prototype.formVersionSubview = function () {
style: {
width: '225px',
},
- }, 'In order to access this feature please switch too the Main Network'),
+ }, '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', {
onClick: () => this.props.dispatch(actions.buyEth()),
diff --git a/ui/app/eth-store-warning.js b/ui/app/eth-store-warning.js
index 55274996b..fe3c7ce5d 100644
--- a/ui/app/eth-store-warning.js
+++ b/ui/app/eth-store-warning.js
@@ -35,10 +35,9 @@ EthStoreWarning.prototype.render = function () {
margin: '10px 10px 10px 10px',
},
},
- `The MetaMask team would like to
- remind you that MetaMask is currently in beta - so
- don't store large
- amounts of ether in MetaMask.
+ `MetaMask is currently in beta; use
+ caution in storing large
+ amounts of ether.
`),
h('i.fa.fa-exclamation-triangle.fa-4', {