aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-11-23 08:29:46 +0800
committerDan Finlay <dan@danfinlay.com>2016-11-23 08:29:46 +0800
commit822face7a3513a709277a197e27fd550b7b21954 (patch)
treeb55dfba6ea8f4a20431a1208981cf011801e9dff /app
parent6ebdebc0a5287bce18947fff3e7812bcac43ce36 (diff)
downloadtangerine-wallet-browser-822face7a3513a709277a197e27fd550b7b21954.tar
tangerine-wallet-browser-822face7a3513a709277a197e27fd550b7b21954.tar.gz
tangerine-wallet-browser-822face7a3513a709277a197e27fd550b7b21954.tar.bz2
tangerine-wallet-browser-822face7a3513a709277a197e27fd550b7b21954.tar.lz
tangerine-wallet-browser-822face7a3513a709277a197e27fd550b7b21954.tar.xz
tangerine-wallet-browser-822face7a3513a709277a197e27fd550b7b21954.tar.zst
tangerine-wallet-browser-822face7a3513a709277a197e27fd550b7b21954.zip
Fix password reference
Diffstat (limited to 'app')
-rw-r--r--app/scripts/keyring-controller.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 4fa2b4ee8..141a1281a 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -274,8 +274,9 @@ module.exports = class KeyringController extends EventEmitter {
unlockKeyrings (password) {
const encryptedVault = this.configManager.getVault()
- return this.encryptor.decrypt(this.password, encryptedVault)
+ return this.encryptor.decrypt(password, encryptedVault)
.then((vault) => {
+ this.password = password
vault.forEach(this.restoreKeyring.bind(this))
return this.keyrings
})