diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-12-23 05:41:31 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-12-23 05:45:45 +0800 |
| commit | 291403c13f0c8f61f29585cc9a80ed618718f60f (patch) | |
| tree | 37a59371cb9e61576c9dda5f74ce799439670867 /app/scripts | |
| parent | cf3951c9dfcc42387b165ae76e0a2abaece06b6c (diff) | |
| download | tangerine-wallet-browser-291403c13f0c8f61f29585cc9a80ed618718f60f.tar tangerine-wallet-browser-291403c13f0c8f61f29585cc9a80ed618718f60f.tar.gz tangerine-wallet-browser-291403c13f0c8f61f29585cc9a80ed618718f60f.tar.bz2 tangerine-wallet-browser-291403c13f0c8f61f29585cc9a80ed618718f60f.tar.lz tangerine-wallet-browser-291403c13f0c8f61f29585cc9a80ed618718f60f.tar.xz tangerine-wallet-browser-291403c13f0c8f61f29585cc9a80ed618718f60f.tar.zst tangerine-wallet-browser-291403c13f0c8f61f29585cc9a80ed618718f60f.zip | |
Don't bother changing selected accounts since accounts are recovered
Diffstat (limited to 'app/scripts')
| -rw-r--r-- | app/scripts/metamask-controller.js | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 8b7713df4..ab4cb8ed8 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -427,14 +427,8 @@ module.exports = class MetamaskController { markAccountsFound(cb) { this.configManager.setLostAccounts([]) - this.keyringController.getAccounts() - .then((accounts) => { - return this.keyringController.setSelectedAccount(accounts[0]) - }) - .then(() => { - this.sendUpdate() - cb(null, this.getState()) - }) + this.sendUpdate() + cb(null, this.getState()) } // Migrate Old Vault If Any @@ -461,11 +455,7 @@ module.exports = class MetamaskController { // Restore the correct accounts first: return this.keyringController.restoreKeyring(serialized) - .then(keyring => keyring.getAccounts()) - .then((accounts) => { - this.configManager.setSelectedAccount(accounts[0]) - return result - }) + .then(() => result) }).then((result) => { |