From 89ebc452407fe1a356eab9147bf6e8c213e4105c Mon Sep 17 00:00:00 2001
From: meriadec <meriadec.pillet@gmail.com>
Date: Thu, 18 Jan 2018 16:17:43 +0100
Subject: [PATCH] Fix global scrolling, fix SideBar color

---
 src/components/SideBar/index.js |  4 ++--
 src/components/Wrapper.js       | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/SideBar/index.js b/src/components/SideBar/index.js
index 1d27b078..f3ae5bd6 100644
--- a/src/components/SideBar/index.js
+++ b/src/components/SideBar/index.js
@@ -28,7 +28,7 @@ const CapsSubtitle = styled(Box).attrs({
 const Container = styled(Box).attrs({
   noShrink: true,
 })`
-  background-color: ${p => rgba(p.theme.colors[p.bg], 0.4)};
+  background-color: ${p => rgba(p.theme.colors[p.bg], process.platform === 'darwin' ? 0.4 : 1)};
   padding-top: 40px;
   width: 250px;
 `
@@ -62,7 +62,7 @@ class SideBar extends PureComponent<Props> {
     const { accounts, openModal } = this.props
 
     return (
-      <Container>
+      <Container bg="night">
         <GrowScroll flow={4} py={4}>
           <Box flow={2}>
             <CapsSubtitle>{'Menu'}</CapsSubtitle>
diff --git a/src/components/Wrapper.js b/src/components/Wrapper.js
index abcb3887..91c31e7d 100644
--- a/src/components/Wrapper.js
+++ b/src/components/Wrapper.js
@@ -6,7 +6,7 @@ import { Route } from 'react-router'
 import { translate } from 'react-i18next'
 
 import * as modals from 'components/modals'
-import Box from 'components/base/Box'
+import Box, { GrowScroll } from 'components/base/Box'
 
 import AccountPage from 'components/AccountPage'
 import DashboardPage from 'components/DashboardPage'
@@ -42,9 +42,11 @@ class Wrapper extends PureComponent<{}> {
 
                 <Box shrink grow bg="cream">
                   <TopBar />
-                  <Route path="/" exact component={DashboardPage} />
-                  <Route path="/settings" component={SettingsPage} />
-                  <Route path="/account/:id" component={AccountPage} />
+                  <GrowScroll>
+                    <Route path="/" exact component={DashboardPage} />
+                    <Route path="/settings" component={SettingsPage} />
+                    <Route path="/account/:id" component={AccountPage} />
+                  </GrowScroll>
                 </Box>
               </Box>
             </Fragment>