fix(Menu): make menus sticky

blockchain · May 15, 2018 · 7b12222 · 7b12222
1 parent 79f7c4f
commit 7b12222
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Addresses/index.js b/packages/blockchain-wallet-v4-frontend/src/layouts/Addresses/index.js
@@ -1,8 +1,6 @@
 import React from 'react'
 import styled from 'styled-components'
 
-import MenuTop from './MenuTop'
-
 const Wrapper = styled.div`
   display: flex;
   flex-direction: column;
@@ -16,7 +14,6 @@ const AddressesLayout = props => {
 
   return (
     <Wrapper location={location}>
-      <MenuTop />
       {children}
     </Wrapper>
   )

diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/template.js b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/template.js
@@ -10,6 +10,11 @@ import MenuTop from './MenuTop'
 import TrayRight from './TrayRight'
 import Page from './Page'
 
+import BtcMenu from '../../scenes/Transactions/Bitcoin/Menu'
+import BchMenu from '../../scenes/Transactions/Bch/Menu'
+import EthMenu from '../../scenes/Transactions/Ether/Menu'
+import AddrMenu from '../../scenes/Settings/Addresses/Menu'
+
 const Wrapper = styled.div`
   display: flex;
   flex-direction: column;
@@ -82,6 +87,10 @@ const WalletLayout = props => {
           <Top>
             <MenuTop />
           </Top>
+          { location.pathname === '/btc/transactions' && <BtcMenu /> }
+          { location.pathname === '/bch/transactions' && <BchMenu /> }
+          { location.pathname === '/eth/transactions' && <EthMenu /> }
+          { location.pathname === '/settings/addresses' && <AddrMenu /> }
           <Page>
             {children}
           </Page>

diff --git a/...nd/src/layouts/Addresses/MenuTop/index.js → ...c/scenes/Settings/Addresses/Menu/index.js b/...nd/src/layouts/Addresses/MenuTop/index.js → ...c/scenes/Settings/Addresses/Menu/index.js
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/index.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/index.js
@@ -1,7 +1,6 @@
 import React from 'react'
 import styled from 'styled-components'
 
-import Menu from './Menu'
 import Content from './Content'
 
 const Wrapper = styled.div`
@@ -11,7 +10,6 @@ const Wrapper = styled.div`
 const BchTransactionsContainer = (props) => {
   return (
     <Wrapper>
-      <Menu />
       <Content />
     </Wrapper>
   )

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/index.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/index.js
@@ -1,7 +1,5 @@
 import React from 'react'
 import styled from 'styled-components'
-
-import Menu from './Menu'
 import Content from './Content'
 
 const Wrapper = styled.div`
@@ -11,7 +9,6 @@ const Wrapper = styled.div`
 const BitcoinTransactionsContainer = (props) => {
   return (
     <Wrapper>
-      <Menu />
       <Content />
     </Wrapper>
   )

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Ether/index.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Ether/index.js
@@ -1,7 +1,6 @@
 import React from 'react'
 import styled from 'styled-components'
 
-import Menu from './Menu'
 import Content from './Content'
 
 const Wrapper = styled.div`
@@ -11,7 +10,6 @@ const Wrapper = styled.div`
 const EtherTransactionsContainer = (props) => {
   return (
     <Wrapper>
-      <Menu />
       <Content />
     </Wrapper>
   )