aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/accounts/import/json.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-03-24 04:46:09 +0800
committerDan Finlay <dan@danfinlay.com>2017-03-24 04:46:09 +0800
commit6b100163e9a3c2ca614c91d0bbc7f5c4b1a7a730 (patch)
tree251258045f86bbf97ddef2da9537f5a51cc02795 /ui/app/accounts/import/json.js
parente7a3330b980b150d4b7eae9c628e4ad2b0a1af34 (diff)
parentb8500d384b3d68b92c246d11a5d008d9635002b4 (diff)
downloadtangerine-wallet-browser-6b100163e9a3c2ca614c91d0bbc7f5c4b1a7a730.tar
tangerine-wallet-browser-6b100163e9a3c2ca614c91d0bbc7f5c4b1a7a730.tar.gz
tangerine-wallet-browser-6b100163e9a3c2ca614c91d0bbc7f5c4b1a7a730.tar.bz2
tangerine-wallet-browser-6b100163e9a3c2ca614c91d0bbc7f5c4b1a7a730.tar.lz
tangerine-wallet-browser-6b100163e9a3c2ca614c91d0bbc7f5c4b1a7a730.tar.xz
tangerine-wallet-browser-6b100163e9a3c2ca614c91d0bbc7f5c4b1a7a730.tar.zst
tangerine-wallet-browser-6b100163e9a3c2ca614c91d0bbc7f5c4b1a7a730.zip
Merge branch 'i1234-HardGasLimits-BrowserForm' of github.com:MetaMask/metamask-plugin into i1234-HardGasLimits-BrowserForm
Diffstat (limited to 'ui/app/accounts/import/json.js')
-rw-r--r--ui/app/accounts/import/json.js3
1 files changed, 1 insertions, 2 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 ]))
}
-