diff options
author | kumavis <kumavis@users.noreply.github.com> | 2017-09-28 04:58:54 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-28 04:58:54 +0800 |
commit | 4404dfc5d328d57c99190dbcf034102882487177 (patch) | |
tree | 5bae6617ea10d2920983b1bb27eabf01f7da0de4 /app/scripts/keyring-controller.js | |
parent | b41aad6d1ae894ab89380b1c7159da8545ad935b (diff) | |
parent | 5bbea78306f13415f85159f3d23c2b69d8f2a26c (diff) | |
download | tangerine-wallet-browser-4404dfc5d328d57c99190dbcf034102882487177.tar tangerine-wallet-browser-4404dfc5d328d57c99190dbcf034102882487177.tar.gz tangerine-wallet-browser-4404dfc5d328d57c99190dbcf034102882487177.tar.bz2 tangerine-wallet-browser-4404dfc5d328d57c99190dbcf034102882487177.tar.lz tangerine-wallet-browser-4404dfc5d328d57c99190dbcf034102882487177.tar.xz tangerine-wallet-browser-4404dfc5d328d57c99190dbcf034102882487177.tar.zst tangerine-wallet-browser-4404dfc5d328d57c99190dbcf034102882487177.zip |
Merge branch 'master' into direct-block-tracker
Diffstat (limited to 'app/scripts/keyring-controller.js')
-rw-r--r-- | app/scripts/keyring-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index 34e008ec4..1a1904621 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -568,7 +568,7 @@ class KeyringController extends EventEmitter { clearKeyrings () { let accounts try { - accounts = Object.keys(this.accountTracker.getState()) + accounts = Object.keys(this.accountTracker.store.getState()) } catch (e) { accounts = [] } |