diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-03-23 06:46:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-23 06:46:50 +0800 |
| commit | c55c768cdec357d07c0a1e6c634f187acc7d6b5f (patch) | |
| tree | eeb361bed3b29f479035e49111dab1ac92229f02 /ui | |
| parent | 463eb01d1d523f5094793a58fbdf5345366ca92a (diff) | |
| parent | 5e40ed1ee956b2207b9d84e60939ab2acfb0558a (diff) | |
| download | tangerine-wallet-browser-c55c768cdec357d07c0a1e6c634f187acc7d6b5f.tar tangerine-wallet-browser-c55c768cdec357d07c0a1e6c634f187acc7d6b5f.tar.gz tangerine-wallet-browser-c55c768cdec357d07c0a1e6c634f187acc7d6b5f.tar.bz2 tangerine-wallet-browser-c55c768cdec357d07c0a1e6c634f187acc7d6b5f.tar.lz tangerine-wallet-browser-c55c768cdec357d07c0a1e6c634f187acc7d6b5f.tar.xz tangerine-wallet-browser-c55c768cdec357d07c0a1e6c634f187acc7d6b5f.tar.zst tangerine-wallet-browser-c55c768cdec357d07c0a1e6c634f187acc7d6b5f.zip | |
Merge branch 'master' into hide-password
Diffstat (limited to 'ui')
| -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 ])) } - |