diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-03-29 05:54:04 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-29 05:54:04 +0800 |
| commit | f2587b7e8033eadd4095b378f2e9953c6919cdb0 (patch) | |
| tree | c5a21f787bf60fb6a07c7b2eabbfc703bc835f8c /app/scripts | |
| parent | d1733c1f7521d17b0e8acdae5a2be33c1a9bbd5c (diff) | |
| parent | a95d96d507b9b20e0457baae9f9d38e26b23d8b3 (diff) | |
| download | tangerine-wallet-browser-f2587b7e8033eadd4095b378f2e9953c6919cdb0.tar tangerine-wallet-browser-f2587b7e8033eadd4095b378f2e9953c6919cdb0.tar.gz tangerine-wallet-browser-f2587b7e8033eadd4095b378f2e9953c6919cdb0.tar.bz2 tangerine-wallet-browser-f2587b7e8033eadd4095b378f2e9953c6919cdb0.tar.lz tangerine-wallet-browser-f2587b7e8033eadd4095b378f2e9953c6919cdb0.tar.xz tangerine-wallet-browser-f2587b7e8033eadd4095b378f2e9953c6919cdb0.tar.zst tangerine-wallet-browser-f2587b7e8033eadd4095b378f2e9953c6919cdb0.zip | |
Merge pull request #1273 from MetaMask/i1267-seedfix
Assure that seed words are placed into state tree upon request.
Diffstat (limited to 'app/scripts')
| -rw-r--r-- | app/scripts/metamask-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 92533e022..c0c113a45 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -386,7 +386,7 @@ module.exports = class MetamaskController extends EventEmitter { .then((serialized) => { const seedWords = serialized.mnemonic this.configManager.setSeedWords(seedWords) - cb() + cb(null, seedWords) }) } |