diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-03-23 06:51:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-23 06:51:52 +0800 |
| commit | 45cdf6bdea5c05c49ea6f4168115fdd716b30c0a (patch) | |
| tree | 8a64ba23ca145fb4957ac20fa0cd88501f99eb7e | |
| parent | 16bdfd3d6e515e8f9a3246fe84372bfc6e2158db (diff) | |
| parent | d82549a1ea652d85eaa8ad941e2ed5d2f2b84ff6 (diff) | |
| download | tangerine-wallet-browser-45cdf6bdea5c05c49ea6f4168115fdd716b30c0a.tar tangerine-wallet-browser-45cdf6bdea5c05c49ea6f4168115fdd716b30c0a.tar.gz tangerine-wallet-browser-45cdf6bdea5c05c49ea6f4168115fdd716b30c0a.tar.bz2 tangerine-wallet-browser-45cdf6bdea5c05c49ea6f4168115fdd716b30c0a.tar.lz tangerine-wallet-browser-45cdf6bdea5c05c49ea6f4168115fdd716b30c0a.tar.xz tangerine-wallet-browser-45cdf6bdea5c05c49ea6f4168115fdd716b30c0a.tar.zst tangerine-wallet-browser-45cdf6bdea5c05c49ea6f4168115fdd716b30c0a.zip | |
Merge branch 'master' into i238-kovan
| -rw-r--r-- | ui/app/accounts/import/json.js | 3 | ||||
| -rw-r--r-- | ui/app/accounts/import/private-key.js | 3 | ||||
| -rw-r--r-- | ui/app/components/account-export.js | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/ui/app/accounts/import/json.js b/ui/app/accounts/import/json.js index 1c2b331d4..5ed31ab0a 100644 --- a/ui/app/accounts/import/json.js +++ b/ui/app/accounts/import/json.js @@ -60,7 +60,7 @@ JsonImportSubview.prototype.render = function () { }, }, 'Import'), - error ? h('span.warning', error) : null, + error ? h('span.error', error) : null, ]) ) } @@ -95,4 +95,3 @@ JsonImportSubview.prototype.createNewKeychain = function () { this.props.dispatch(actions.importNewAccount('JSON File', [ fileContents, password ])) } - diff --git a/ui/app/accounts/import/private-key.js b/ui/app/accounts/import/private-key.js index b139a0374..68ccee58e 100644 --- a/ui/app/accounts/import/private-key.js +++ b/ui/app/accounts/import/private-key.js @@ -48,7 +48,7 @@ PrivateKeyImportView.prototype.render = function () { }, }, 'Import'), - error ? h('span.warning', error) : null, + error ? h('span.error', error) : null, ]) ) } @@ -65,4 +65,3 @@ PrivateKeyImportView.prototype.createNewKeychain = function () { const privateKey = input.value this.props.dispatch(actions.importNewAccount('Private Key', [ privateKey ])) } - diff --git a/ui/app/components/account-export.js b/ui/app/components/account-export.js index 38a1d28ef..888196c5d 100644 --- a/ui/app/components/account-export.js +++ b/ui/app/components/account-export.js @@ -52,6 +52,7 @@ ExportAccountView.prototype.render = function () { }, [ h('p.error', warning), h('input#exportAccount.sizing-input', { + type: 'password', placeholder: 'confirm password', onKeyPress: this.onExportKeyPress.bind(this), style: { |