simplify MobileNav

OasisDEX · Jun 28, 2019 · 373e4a1 · 373e4a1
1 parent 8433b43
commit 373e4a1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 22 deletions.
diff --git a/src/components/MobileNav.js b/src/components/MobileNav.js
@@ -9,9 +9,10 @@ import {
 import useStore from 'hooks/useStore';
 
 import RatioDisplay from './RatioDisplay';
-import Sidebar from 'components/SidebarBase';
 import { getCdp, getCollateralizationRatio } from 'reducers/cdps';
 import { ReactComponent as MakerLogo } from 'images/maker-logo.svg';
+import SidebarGlobal from './Sidebars/Global';
+import AccountBox from './AccountBox';
 
 import {
   Dropdown,
@@ -131,11 +132,7 @@ const DrawerBg = styled.div`
         `}
 `;
 
-const SidebarDrawer = ({
-  sidebarDrawerOpen,
-  setSidebarDrawerOpen,
-  children
-}) => {
+const SidebarDrawer = ({ sidebarDrawerOpen, children }) => {
   return (
     <DrawerBg sidebarDrawerOpen={sidebarDrawerOpen}>
       <Box
@@ -150,7 +147,7 @@ const SidebarDrawer = ({
     </DrawerBg>
   );
 };
-const MobileNav = ({ networkId, viewedAddress, cdpId }) => {
+const MobileNav = ({ viewedAddress, cdpId }) => {
   const ref = useRef();
   const [sidebarDrawerOpen, setSidebarDrawerOpen] = useState(false);
   const { account } = useMaker();
@@ -214,12 +211,10 @@ const MobileNav = ({ networkId, viewedAddress, cdpId }) => {
       <div ref={ref}>
         <SidebarDrawer {...{ sidebarDrawerOpen, setSidebarDrawerOpen }}>
           <Box mr="s">
-            <Sidebar
-              {...{
-                networkId,
-                connectedAddress: account ? account.address : null
-              }}
-            />
+            <Box my="s">
+              <AccountBox currentAccount={account} />
+            </Box>
+            <SidebarGlobal />
           </Box>
         </SidebarDrawer>
       </div>

diff --git a/src/reducers/feeds.js b/src/reducers/feeds.js
@@ -1,8 +1,6 @@
 import produce from 'immer';
 import ilkList from 'references/ilkList';
 import uniqBy from 'lodash/uniqBy';
-import round from 'lodash/round';
-import { multiply } from 'utils/bignumber';
 import BigNumber from 'bignumber.js';
 import { fromWei, fromRay, fromRad, sub, mul, RAY } from 'utils/units';
 

diff --git a/src/routes.js b/src/routes.js
@@ -16,7 +16,6 @@ import MakerProvider from 'providers/MakerProvider';
 
 import config from 'references/config';
 import MobileNav from 'components/MobileNav';
-import { networkNameToId } from 'utils/network';
 import { userSnapInit } from 'utils/analytics';
 import useMaker from 'hooks/useMaker';
 import useStore from 'hooks/useStore';
@@ -30,7 +29,6 @@ const withDefaultLayout = route =>
       const { network, testchainId, backendEnv } = request.query;
       const { viewedAddress, cdpId } = request.params;
 
-      const networkId = networkNameToId(network);
       return (
         <MakerProvider
           network={network}
@@ -43,11 +41,7 @@ const withDefaultLayout = route =>
               <SidebarProvider sidebars={sidebars}>
                 <PageLayout
                   mobileNav={
-                    <MobileNav
-                      networkId={networkId}
-                      viewedAddress={viewedAddress}
-                      cdpId={cdpId}
-                    />
+                    <MobileNav viewedAddress={viewedAddress} cdpId={cdpId} />
                   }
                   navbar={<Navbar viewedAddress={viewedAddress} />}
                 >