From 7caa9142235cc0eca20d638a066d666d8cfaabee Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Mon, 16 Oct 2017 01:27:51 -0400
Subject: Fix Import Account link not hiding sidebar

---
 ui/app/components/dropdowns/components/account-dropdowns.js | 9 +++++++--
 ui/app/components/wallet-view.js                            | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'ui/app')

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'
-- 
cgit