Merge branch 'master' into i1237-xmlfix2

8 years ago · 76e7d6fbb1
parent 2687b8604b 5e40ed1ee9
commit 76e7d6fbb1
2 changed files with 2 additions and 4 deletions
--- 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 ]))
 }
-
--- 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 ]))
 }
-