fix - left menu responsive fixes

blockchain · Jun 29, 2018 · 5a74fb9 · 5a74fb9
1 parent 463ba50
commit 5a74fb9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/layoutWallet/reducers.js b/packages/blockchain-wallet-v4-frontend/src/data/components/layoutWallet/reducers.js
@@ -28,7 +28,8 @@ export default (state = INITIAL_STATE, action) => {
     case '@@router/LOCATION_CHANGE': {
       const pathname = path(['location', 'pathname'], payload)
       const settingsOpened = pathname && pathname.indexOf('/settings') > -1
-      return merge(state, { trayOpened: false, trayContent: '', menuOpened: false, settingsOpened })
+      const shouldOpenSettings = !state.settingsOpened && settingsOpened
+      return merge(state, { trayOpened: false, trayContent: '', menuOpened: shouldOpenSettings, settingsOpened })
     }
     case AT.LAYOUT_WALLET_MENU_TOGGLE_CLICKED: {
       return merge(state, { menuOpened: !state.menuOpened })

diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/template.js b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/template.js
@@ -10,6 +10,7 @@ import { Icon, Separator, Text } from 'blockchain-info-components'
 const Wrapper = styled.div`
   height: 100%;
   position: relative;
+  overflow: auto;
   display: flex;
   flex-direction: column;
   justify-content: space-between;

diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/template.js b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/template.js
@@ -25,6 +25,7 @@ const Wrapper = styled.div`
 `
 const Container = styled.div`
   display: flex;
+  position: relative;
   width: 100%;
   height: calc(100% - 60px);
 `