aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-03-29 03:39:58 +0800
committerDan Finlay <somniac@me.com>2016-03-29 03:39:58 +0800
commit35b0b11e0688561a8b60b651f4be28bbc043c764 (patch)
treed543fded1b066aa6a7a670000bda4f0e2fb8a33c
parent9fbf40e7028a92fe582a8c554bdbea1dbbfe143b (diff)
parent966be992273b618f911e9d3178fa7d1e0b8afbd4 (diff)
downloadtangerine-wallet-browser-35b0b11e0688561a8b60b651f4be28bbc043c764.tar
tangerine-wallet-browser-35b0b11e0688561a8b60b651f4be28bbc043c764.tar.gz
tangerine-wallet-browser-35b0b11e0688561a8b60b651f4be28bbc043c764.tar.bz2
tangerine-wallet-browser-35b0b11e0688561a8b60b651f4be28bbc043c764.tar.lz
tangerine-wallet-browser-35b0b11e0688561a8b60b651f4be28bbc043c764.tar.xz
tangerine-wallet-browser-35b0b11e0688561a8b60b651f4be28bbc043c764.tar.zst
tangerine-wallet-browser-35b0b11e0688561a8b60b651f4be28bbc043c764.zip
Merge pull request #76 from MetaMask/ReturnStateToRestore
Return updated state after restoring vault
-rw-r--r--app/manifest.json2
-rw-r--r--app/scripts/lib/idStore.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/manifest.json b/app/manifest.json
index 1ca0f55e9..dba3a7c6a 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,6 +1,6 @@
{
"name": "__MSG_appName__",
- "version": "1.0.0",
+ "version": "1.1.0",
"manifest_version": 2,
"description": "__MSG_appDescription__",
"icons": {
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index e3f2a841d..f0e566e5e 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -57,7 +57,7 @@ IdentityStore.prototype.recoverFromSeed = function(password, seed, cb){
this._loadIdentities()
this._didUpdate()
- cb()
+ cb(null, this.getState())
})
}