diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-03-23 06:43:26 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-23 06:43:26 +0800 |
| commit | 76e7d6fbb1fa9b9cdc9c4fc90628ebb09f61d6a0 (patch) | |
| tree | 0d88ce51c050ce2e3637dbd0961d4bfd1acd09bc | |
| parent | 2687b8604b0af73e86837153f2ccbf88672ea6ef (diff) | |
| parent | 5e40ed1ee956b2207b9d84e60939ab2acfb0558a (diff) | |
| download | tangerine-wallet-browser-76e7d6fbb1fa9b9cdc9c4fc90628ebb09f61d6a0.tar tangerine-wallet-browser-76e7d6fbb1fa9b9cdc9c4fc90628ebb09f61d6a0.tar.gz tangerine-wallet-browser-76e7d6fbb1fa9b9cdc9c4fc90628ebb09f61d6a0.tar.bz2 tangerine-wallet-browser-76e7d6fbb1fa9b9cdc9c4fc90628ebb09f61d6a0.tar.lz tangerine-wallet-browser-76e7d6fbb1fa9b9cdc9c4fc90628ebb09f61d6a0.tar.xz tangerine-wallet-browser-76e7d6fbb1fa9b9cdc9c4fc90628ebb09f61d6a0.tar.zst tangerine-wallet-browser-76e7d6fbb1fa9b9cdc9c4fc90628ebb09f61d6a0.zip | |
Merge branch 'master' into i1237-xmlfix2
| -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 ])) } - |