aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
diff options
context:
space:
mode:
Diffstat (limited to 'ui/app')
-rw-r--r--ui/app/components/dropdowns/components/account-dropdowns.js9
-rw-r--r--ui/app/components/wallet-view.js3
2 files changed, 9 insertions, 3 deletions
diff --git a/ui/app/components/dropdowns/components/account-dropdowns.js b/ui/app/components/dropdowns/components/account-dropdowns.js
index fc60c6005..e2eed1e4b 100644
--- a/ui/app/components/dropdowns/components/account-dropdowns.js
+++ b/ui/app/components/dropdowns/components/account-dropdowns.js
@@ -164,7 +164,7 @@ class AccountDropdowns extends Component {
}
renderAccountSelector () {
- const { actions, useCssTransition, innerStyle } = this.props
+ const { actions, useCssTransition, innerStyle, sidebarOpen } = this.props
const { accountSelectorActive, menuItemStyles } = this.state
return h(
@@ -223,7 +223,11 @@ class AccountDropdowns extends Component {
h(
DropdownMenuItem,
{
- closeMenu: () => {},
+ closeMenu: () => {
+ if (sidebarOpen) {
+ actions.hideSidebar()
+ }
+ },
onClick: () => actions.showImportPage(),
style: Object.assign(
{},
@@ -457,6 +461,7 @@ const mapDispatchToProps = (dispatch) => {
function mapStateToProps (state) {
return {
keyrings: state.metamask.keyrings,
+ sidebarOpen: state.appState.sidebarOpen,
}
}
diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js
index 00c86298d..54d90b7ac 100644
--- a/ui/app/components/wallet-view.js
+++ b/ui/app/components/wallet-view.js
@@ -45,8 +45,9 @@ WalletView.prototype.renderWalletBalance = function () {
selectedAccount,
unsetSelectedToken,
hideSidebar,
- sidebarOpen
+ sidebarOpen,
} = this.props
+
const selectedClass = selectedTokenAddress
? ''
: 'wallet-balance-wrapper--active'