aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-12-24 09:09:24 +0800
committerDan Finlay <dan@danfinlay.com>2016-12-24 09:09:24 +0800
commite95c93756968284fbe0c968fd79b9d05498d280f (patch)
tree57394f38ebcbcbdbe45fad38df96bfd2d4f69c96 /app
parent2ab34760b0e2e006c0b87722e8397c642eb86981 (diff)
downloadtangerine-wallet-browser-e95c93756968284fbe0c968fd79b9d05498d280f.tar
tangerine-wallet-browser-e95c93756968284fbe0c968fd79b9d05498d280f.tar.gz
tangerine-wallet-browser-e95c93756968284fbe0c968fd79b9d05498d280f.tar.bz2
tangerine-wallet-browser-e95c93756968284fbe0c968fd79b9d05498d280f.tar.lz
tangerine-wallet-browser-e95c93756968284fbe0c968fd79b9d05498d280f.tar.xz
tangerine-wallet-browser-e95c93756968284fbe0c968fd79b9d05498d280f.tar.zst
tangerine-wallet-browser-e95c93756968284fbe0c968fd79b9d05498d280f.zip
Add additional migration test
Diffstat (limited to 'app')
-rw-r--r--app/scripts/metamask-controller.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 983a590d7..9d2f1494f 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -89,7 +89,7 @@ module.exports = class MetamaskController {
setLocked: nodeify(keyringController.setLocked).bind(keyringController),
submitPassword: (password, cb) => {
this.migrateOldVaultIfAny(password)
- .then(keyringController.submitPassword.bind(keyringController))
+ .then(keyringController.submitPassword.bind(keyringController, password))
.then((newState) => { cb(null, newState) })
.catch((reason) => { cb(reason) })
},
@@ -452,7 +452,7 @@ module.exports = class MetamaskController {
return this.idStoreMigrator.migratedVaultForPassword(password)
.then(this.restoreOldVaultAccounts.bind(this))
.then(this.restoreOldLostAccounts.bind(this))
- .then(keyringController.persistAllKeyrings.bind(keyringController))
+ .then(keyringController.persistAllKeyrings.bind(keyringController, password))
.then(() => password)
}