diff options
author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-09-14 23:35:48 +0800 |
---|---|---|
committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-09-14 23:35:48 +0800 |
commit | cb8856597cb650e282e7209f43547a5f9328de28 (patch) | |
tree | 842b64aea519c7041bc4fbf2a6f31f5d17f57cb8 /ui/app/app.js | |
parent | 162aedb30b94890935658921b0dd399f43d6cd65 (diff) | |
parent | 1d3cd9768cdd372d02e7e34674dde9d86af536f5 (diff) | |
download | tangerine-wallet-browser-cb8856597cb650e282e7209f43547a5f9328de28.tar.gz tangerine-wallet-browser-cb8856597cb650e282e7209f43547a5f9328de28.tar.zst tangerine-wallet-browser-cb8856597cb650e282e7209f43547a5f9328de28.zip |
Merge branch 'master' into new-currency-test
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 |