diff options
author | kumavis <aaron@kumavis.me> | 2017-09-08 13:37:44 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2017-09-08 13:37:44 +0800 |
commit | 671dafea9e8d379578c73672ba051205456219e3 (patch) | |
tree | c733017a12b83d70db21c61d16a07033ddefecbb /ui/app/app.js | |
parent | 70401626e2544f254ddb06a21b5d3de7fdd7fb82 (diff) | |
parent | a704e1d14370056a9a1a8af43c702bb00142532d (diff) | |
download | tangerine-wallet-browser-671dafea9e8d379578c73672ba051205456219e3.tar.gz tangerine-wallet-browser-671dafea9e8d379578c73672ba051205456219e3.tar.zst tangerine-wallet-browser-671dafea9e8d379578c73672ba051205456219e3.zip |
Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix
Diffstat (limited to 'ui/app/app.js')
-rw-r--r-- | ui/app/app.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index 1f3d5b0f8..ee800ea90 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -42,6 +42,7 @@ function mapStateToProps (state) { identities, accounts, address, + keyrings, } = state.metamask const selected = address || Object.keys(accounts)[0] @@ -69,6 +70,7 @@ function mapStateToProps (state) { // state needed to get account dropdown temporarily rendering from app bar identities, selected, + keyrings, } } @@ -187,6 +189,7 @@ App.prototype.renderAppBar = function () { identities: this.props.identities, selected: this.props.currentView.context, network: this.props.network, + keyrings: this.props.keyrings, }, []), // hamburger |