aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-12-24 09:10:56 +0800
committerDan Finlay <dan@danfinlay.com>2016-12-24 09:10:56 +0800
commit21af3de43d89ee05a9247ad4faada7e211032dd4 (patch)
tree05540920fb2cf27cf311c07fcae8b99fbd6e657d /app/scripts/metamask-controller.js
parent1f1549904650af2e5502d2d4781a555386dfd084 (diff)
parente95c93756968284fbe0c968fd79b9d05498d280f (diff)
downloadtangerine-wallet-browser-21af3de43d89ee05a9247ad4faada7e211032dd4.tar
tangerine-wallet-browser-21af3de43d89ee05a9247ad4faada7e211032dd4.tar.gz
tangerine-wallet-browser-21af3de43d89ee05a9247ad4faada7e211032dd4.tar.bz2
tangerine-wallet-browser-21af3de43d89ee05a9247ad4faada7e211032dd4.tar.lz
tangerine-wallet-browser-21af3de43d89ee05a9247ad4faada7e211032dd4.tar.xz
tangerine-wallet-browser-21af3de43d89ee05a9247ad4faada7e211032dd4.tar.zst
tangerine-wallet-browser-21af3de43d89ee05a9247ad4faada7e211032dd4.zip
Merge branch 'FixMigrationPasswordBug' into ShowDifferentAccounts
Diffstat (limited to 'app/scripts/metamask-controller.js')
-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 78e5a6f0a..8d4d574ff 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -92,7 +92,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) })
},
@@ -455,7 +455,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)
}