aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md2
-rw-r--r--ui/app/accounts/import/json.js3
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8afa1eec4..7f99e680e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## Current Master
+- Add a warning to JSON file import.
+
## 3.7.8 2017-6-12
- Add a `ethereum:` prefix to the QR code address
diff --git a/ui/app/accounts/import/json.js b/ui/app/accounts/import/json.js
index 5ed31ab0a..158a3c923 100644
--- a/ui/app/accounts/import/json.js
+++ b/ui/app/accounts/import/json.js
@@ -5,6 +5,8 @@ const connect = require('react-redux').connect
const actions = require('../../actions')
const FileInput = require('react-simple-file-input').default
+const HELP_LINK = 'https://github.com/MetaMask/faq/blob/master/README.md#q-i-cant-use-the-import-feature-for-uploading-a-json-file-the-window-keeps-closing-when-i-try-to-select-a-file'
+
module.exports = connect(mapStateToProps)(JsonImportSubview)
function mapStateToProps (state) {
@@ -32,6 +34,7 @@ JsonImportSubview.prototype.render = function () {
}, [
h('p', 'Used by a variety of different clients'),
+ h('a.warning', { href: HELP_LINK, target: '_blank' }, 'File import not working? Click here!'),
h(FileInput, {
readAs: 'text',