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

Merge pull request #86 from MetaMask/CallbackRestoreErrors

Browse Source 
Call back with wallet restore errors
This commit is contained in:
Dan Finlay 2016-04-01 14:05:05 -07:00
commit a5b8e4448e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/scripts/lib/idStore.js
View File

@ -227,7 +227,11 @@ IdentityStore.prototype._createIdmgmt = function(password, seed, entropy, cb){
var serializedKeystore = configManager.getWallet() var serializedKeystore = configManager.getWallet()
if (seed) { if (seed) {
keyStore = this._restoreFromSeed(password, seed, derivedKey) try {
keyStore = this._restoreFromSeed(password, seed, derivedKey)
} catch (e) {
return cb(e)
}
// returning user, recovering from storage // returning user, recovering from storage
} else if (serializedKeystore) { } else if (serializedKeystore) {