diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-03-23 07:00:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-23 07:00:11 +0800 |
| commit | 86f9be06eb3351917e7746988ab4c50e77bb9a1e (patch) | |
| tree | 7fdb83ba4a611a381f47903e3f6b82cb22ce5eec /ui/app/accounts | |
| parent | 457611d8f8766bc756e154bbf4bce1efeb8a3097 (diff) | |
| parent | b9714b881a862302baa0c21d8b8c5360c0e9f85d (diff) | |
| download | tangerine-wallet-browser-86f9be06eb3351917e7746988ab4c50e77bb9a1e.tar tangerine-wallet-browser-86f9be06eb3351917e7746988ab4c50e77bb9a1e.tar.gz tangerine-wallet-browser-86f9be06eb3351917e7746988ab4c50e77bb9a1e.tar.bz2 tangerine-wallet-browser-86f9be06eb3351917e7746988ab4c50e77bb9a1e.tar.lz tangerine-wallet-browser-86f9be06eb3351917e7746988ab4c50e77bb9a1e.tar.xz tangerine-wallet-browser-86f9be06eb3351917e7746988ab4c50e77bb9a1e.tar.zst tangerine-wallet-browser-86f9be06eb3351917e7746988ab4c50e77bb9a1e.zip | |
Merge branch 'master' into i1234-HardGasLimits-BrowserForm
Diffstat (limited to 'ui/app/accounts')
| -rw-r--r-- | ui/app/accounts/import/json.js | 3 | ||||
| -rw-r--r-- | ui/app/accounts/import/private-key.js | 3 |
2 files changed, 2 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 ])) } - |