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

Merge branch 'master' into localStorage-clean-up

Browse Source
This commit is contained in:
Frankie 2018-01-30 15:36:24 -08:00 committed by GitHub
commit f690355bd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
## Current Master ## Current Master
- Remove BlacklistController from disk state - Remove BlacklistController from disk state
- Add warning for importing some kinds of files.
## 3.13.8 2018-1-29 ## 3.13.8 2018-1-29

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

@ -81,6 +81,12 @@ JsonImportSubview.prototype.createKeyringOnEnter = function (event) {
JsonImportSubview.prototype.createNewKeychain = function () { JsonImportSubview.prototype.createNewKeychain = function () {
const state = this.state const state = this.state
if (!state) {
const message = 'You must select a valid file to import.'
return this.props.dispatch(actions.displayWarning(message))
}
const { fileContents } = state const { fileContents } = state
if (!fileContents) { if (!fileContents) {