src/components/AppBar/AppBar.tsx

@@ -170,6 +170,8 @@ export const AppBar = () => {
                 </MenuItem>
                 <MenuItem
                   onClick={() => {
+                    setAnchorElUser(null)
+
                     navigate(appPrivateRoutes.relays)
                   }}
                   sx={{

src/controllers/AuthController.ts

@@ -86,15 +86,20 @@ export class AuthController {
         store.dispatch(setRelayMapAction(relayMap.map))
     }
 
-    const visitedLink = getVisitedLink()
+    const currentLocation = window.location.hash.replace('#', '')
 
-    if (visitedLink) {
-      const { pathname, search } = visitedLink
+    if (!Object.values(appPrivateRoutes).includes(currentLocation)) {
+      // User did change the location to one of the private routes
+      const visitedLink = getVisitedLink()
 
-      return Promise.resolve(`${pathname}${search}`)
-    } else {
-      // Navigate user in
-      return Promise.resolve(appPrivateRoutes.homePage)
+      if (visitedLink) {
+        const { pathname, search } = visitedLink
+
+        return Promise.resolve(`${pathname}${search}`)
+      } else {
+        // Navigate user in
+        return Promise.resolve(appPrivateRoutes.homePage)
+      }
     }
   }
 

src/pages/login/index.tsx

@@ -82,7 +82,8 @@ export const Login = () => {
         const redirectPath =
           await authController.authAndGetMetadataAndRelaysMap(pubkey)
 
-        navigateAfterLogin(redirectPath)
+          if (redirectPath) navigateAfterLogin(redirectPath)
+        
       })
       .catch((err) => {
         toast.error('Error capturing public key from nostr extension: ' + err)

src/pages/relays/index.tsx

@@ -71,6 +71,12 @@ export const RelaysPage = () => {
     }
   }, [relaysInfo, relaysState?.info])
 
+  useEffect(() => {
+    if (!compareObjects(relayMap, relaysState?.map)) {
+      setRelayMap(relaysState?.map)
+    }
+  }, [relayMap, relaysState?.map])
+
   useEffect(() => {
     let isMounted = false
 

src/pages/relays/style.module.scss

@@ -2,6 +2,7 @@
 
 .container {
   margin-top: 25px;
+  color: $text-color;
 
   .relayURItextfield {
     width: 100%;