Merge branch 'main' into fix/revert-appbar

equinor · Jan 29, 2024 · 69f4ed6 · 69f4ed6
2 parents 94cc4d9 + 54ee2f8
commit 69f4ed6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 29 deletions.
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "lint": "eslint --fix --ext .ts,.tsx .",
     "prettier:fix": "prettier . --write",
     "prepare": "husky install",
-    "pre-commit": "yarn test --watchAll=false && yarn lint-staged",
+    "pre-commit": "yarn lint-staged",
     "generate-schema:radix": "npx openapi-typescript https://api-pepm-dev.radix.equinor.com/swagger/v1/swagger.yaml -o src/models/schema.d.ts"
   },
   "lint-staged": {

diff --git a/src/App.test.tsx b/src/App.test.tsx
diff --git a/src/features/AppBar/AppBar.test.tsx b/src/features/AppBar/AppBar.test.tsx
diff --git a/src/features/AppBar/AppBar.tsx b/src/features/AppBar/AppBar.tsx
@@ -3,6 +3,7 @@ import { useLocation, useNavigate } from 'react-router-dom';
 import * as Styled from './AppBar.styled';
 import { Icons } from './Icons/Icons';
 import { Navigation } from './Navigation/Navigation';
+
 const AppBar = ({ title }: { title: string }) => {
   const navigate = useNavigate();
   const location = useLocation();
@@ -16,7 +17,7 @@ const AppBar = ({ title }: { title: string }) => {
       >
         {title}
       </Styled.Header>
-      <Navigation />
+      {/* <Navigation /> */}
       <TopBar.Actions>
         <Icons />
       </TopBar.Actions>