aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/keyring-controller.js
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-01-28 04:17:42 +0800
committerGitHub <noreply@github.com>2017-01-28 04:17:42 +0800
commit61528bdf088e304150698d95218806d7b4faa56e (patch)
treefa330206277463e02dad2be9ee5d52bed794d7dc /app/scripts/keyring-controller.js
parent41bc9c221eb888ba1afe93b511698c21b0c8cf01 (diff)
parentefcd22905a585d8c2ae55ec4e8bd6d9b027b740d (diff)
downloadtangerine-wallet-browser-61528bdf088e304150698d95218806d7b4faa56e.tar
tangerine-wallet-browser-61528bdf088e304150698d95218806d7b4faa56e.tar.gz
tangerine-wallet-browser-61528bdf088e304150698d95218806d7b4faa56e.tar.bz2
tangerine-wallet-browser-61528bdf088e304150698d95218806d7b4faa56e.tar.lz
tangerine-wallet-browser-61528bdf088e304150698d95218806d7b4faa56e.tar.xz
tangerine-wallet-browser-61528bdf088e304150698d95218806d7b4faa56e.tar.zst
tangerine-wallet-browser-61528bdf088e304150698d95218806d7b4faa56e.zip
Merge pull request #1058 from MetaMask/kumavis-refactor2
Ongoing refactor and cleanup
Diffstat (limited to 'app/scripts/keyring-controller.js')
-rw-r--r--app/scripts/keyring-controller.js15
1 files changed, 2 insertions, 13 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 0a1965782..a4bee8ae1 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -154,17 +154,6 @@ module.exports = class KeyringController extends EventEmitter {
.then(this.fullUpdate.bind(this))
}
- // ClearSeedWordCache
- //
- // returns Promise( @string currentSelectedAccount )
- //
- // Removes the current vault's seed words from the UI's state tree,
- // ensuring they are only ever available in the background process.
- clearSeedWordCache () {
- this.configManager.setSeedWords(null)
- return Promise.resolve(this.configManager.getSelectedAccount())
- }
-
// Set Locked
// returns Promise( @object state )
//
@@ -215,8 +204,8 @@ module.exports = class KeyringController extends EventEmitter {
this.keyrings.push(keyring)
return this.setupAccounts(accounts)
})
- .then(() => { return this.password })
- .then(this.persistAllKeyrings.bind(this))
+ .then(() => this.persistAllKeyrings())
+ .then(() => this.fullUpdate())
.then(() => {
return keyring
})