diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-11-23 05:18:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 05:18:43 +0800 |
| commit | e14efa8f175e17bd671e0c38b3e743716ea4aa19 (patch) | |
| tree | 21db5d12547010031c30c77b498551f390109dd0 /app | |
| parent | 4669f262e2bad5052aac804c3cff8a8c5ee825e3 (diff) | |
| parent | c4056a861a4a383b3bea18225e71435bdf75f6d0 (diff) | |
| download | tangerine-wallet-browser-e14efa8f175e17bd671e0c38b3e743716ea4aa19.tar tangerine-wallet-browser-e14efa8f175e17bd671e0c38b3e743716ea4aa19.tar.gz tangerine-wallet-browser-e14efa8f175e17bd671e0c38b3e743716ea4aa19.tar.bz2 tangerine-wallet-browser-e14efa8f175e17bd671e0c38b3e743716ea4aa19.tar.lz tangerine-wallet-browser-e14efa8f175e17bd671e0c38b3e743716ea4aa19.tar.xz tangerine-wallet-browser-e14efa8f175e17bd671e0c38b3e743716ea4aa19.tar.zst tangerine-wallet-browser-e14efa8f175e17bd671e0c38b3e743716ea4aa19.zip | |
Merge pull request #858 from MetaMask/i842-WaitForSeedWord
I842 wait for seed word
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/keyring-controller.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index bf6280016..34d81ace3 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -171,10 +171,15 @@ module.exports = class KeyringController extends EventEmitter { }) } - placeSeedWords () { + placeSeedWords (cb) { const firstKeyring = this.keyrings[0] const seedWords = firstKeyring.serialize().mnemonic this.configManager.setSeedWords(seedWords) + + if (cb) { + cb() + } + this.emit('update') } submitPassword (password, cb) { |