m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #1606 from MetaMask/ubuntu-warning

Browse Source 
Warn Users about potential JSON import problems
This commit is contained in:
Thomas Huang 2017-06-14 10:20:53 -07:00 committed by GitHub
commit 1a4f982739
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,6 +2,8 @@
## Current Master ## Current Master
- Add a warning to JSON file import.
## 3.7.8 2017-6-12 ## 3.7.8 2017-6-12
- Add a `ethereum:` prefix to the QR code address - Add a `ethereum:` prefix to the QR code address

3
ui/app/accounts/import/json.js
View File

@ -5,6 +5,8 @@ const connect = require('react-redux').connect
const actions = require('../../actions') const actions = require('../../actions')
const FileInput = require('react-simple-file-input').default 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) module.exports = connect(mapStateToProps)(JsonImportSubview)
function mapStateToProps (state) { function mapStateToProps (state) {
@ -32,6 +34,7 @@ JsonImportSubview.prototype.render = function () {
}, [ }, [
h('p', 'Used by a variety of different clients'), 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, { h(FileInput, {
readAs: 'text', readAs: 'text',