fix(client-electron): resolve hook issue in history page

marcincichocki · May 28, 2021 · 9adec4e · 9adec4e
1 parent 500edee
commit 9adec4e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 22 deletions.
diff --git a/src/client-electron/renderer/components/Navigation.tsx b/src/client-electron/renderer/components/Navigation.tsx
@@ -1,7 +1,6 @@
-import styled from 'styled-components';
+import { memo } from 'react';
 import { NavLink as RouterNavLink } from 'react-router-dom';
-import { useContext } from 'react';
-import { StateContext } from '../state';
+import styled from 'styled-components';
 
 const Nav = styled.nav`
   display: flex;
@@ -32,20 +31,15 @@ export const NavLink = styled(RouterNavLink)`
   }
 `;
 
-export const Navigation = () => {
-  const state = useContext(StateContext);
-  const { uuid } = state.history[0];
-
-  return (
-    <Nav>
-      <List>
-        <ListItem>
-          <NavLink to="/history">History</NavLink>
-        </ListItem>
-        <ListItem>
-          <NavLink to="/settings">Settings</NavLink>
-        </ListItem>
-      </List>
-    </Nav>
-  );
-};
+export const Navigation = memo(() => (
+  <Nav>
+    <List>
+      <ListItem>
+        <NavLink to="/history">History</NavLink>
+      </ListItem>
+      <ListItem>
+        <NavLink to="/settings">Settings</NavLink>
+      </ListItem>
+    </List>
+  </Nav>
+));
diff --git a/src/client-electron/renderer/pages/History.tsx b/src/client-electron/renderer/pages/History.tsx
@@ -93,11 +93,10 @@ const H2 = styled.h2`
 
 export const History: FC = () => {
   const { history } = useContext(StateContext);
+  const { path } = useRouteMatch();
 
   if (!history.length) return <NoHistory />;
 
-  const { path } = useRouteMatch();
-
   return (
     <HistoryWrapper>
       <HistoryList>