Merge pull request #11 from rarimo/fixes-v2

fix sidebar
rarimo · Dec 8, 2023 · 94e865a · 94e865a
2 parents c0f230f + b05f0f3
commit 94e865a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,9 +1,11 @@
 import { FC, HTMLAttributes, useEffect, useMemo, useState } from 'react'
+import { useLocation } from 'react-router-dom'
 import { ToastContainer } from 'react-toastify'
 import { useWindowSize } from 'react-use'
 
 import { AppNavbar, Loader, MobileDeviceMessage } from '@/common'
 import { useMetamaskZkpSnapContext, useWeb3Context } from '@/contexts'
+import { RoutesPaths } from '@/enums'
 import { bus, BUS_EVENTS, ErrorHandler, isMobile } from '@/helpers'
 import { useNotification, useViewportSizes } from '@/hooks'
 
@@ -16,7 +18,7 @@ export const App: FC<HTMLAttributes<HTMLDivElement>> = ({ children }) => {
     useMetamaskZkpSnapContext()
   const { showToast } = useNotification()
   const { width } = useWindowSize()
-
+  const { pathname } = useLocation()
   const isDeviceMobile = useMemo(() => {
     if (width <= 1280) {
       return isMobile()
@@ -79,7 +81,9 @@ export const App: FC<HTMLAttributes<HTMLDivElement>> = ({ children }) => {
         <MobileDeviceMessage />
       ) : (
         <>
-          {provider?.isConnected && <AppNavbar className='app__navbar' />}
+          {pathname !== RoutesPaths.SignIn && (
+            <AppNavbar className='app__navbar' />
+          )}
           <div className='app__main'>
             {isAppInitialized ? children : <Loader />}
           </div>

diff --git a/src/pages/SignInPage/styles.scss b/src/pages/SignInPage/styles.scss
@@ -25,7 +25,7 @@
   }
 
   &:after {
-    background: url("/imgs/cells-bg.png") no-repeat top center / contain;
+    background: url("/imgs/cells-bg.png") repeat top center / contain;
     content: "";
     pointer-events: none;
     position: fixed;