Fixed navigation after opening a chat that is not available to you

src/components/screens/Login.js

@@ -13,6 +13,7 @@ import { history } from "../../_helpers/history";
 import { motion as m } from "framer-motion";
 import { setSelectedConversation } from "../../store/SelectedConversation";
 import { setUserIsLoggedIn } from "../../store/UserIsLoggedIn ";
+import { updateNetworkState } from "../../store/NetworkState";
 import { useDispatch } from "react-redux";
 import { useForm } from "react-hook-form";
 
@@ -41,6 +42,8 @@ export default function Login() {
       const userToken = await api.userLogin(data);
       localStorage.setItem("sessionId", userToken);
       history.navigate("/main");
+      dispatch({ type: "RESET_STORE" });
+      dispatch(updateNetworkState(true));
       subscribeForNotifications();
       dispatch(setSelectedConversation({}));
       dispatch(setUserIsLoggedIn(true));

src/components/screens/chat/ChatList.js

@@ -14,6 +14,7 @@ import {
   selectAllConversations,
   upsertChat,
 } from "../../../store/Conversations.js";
+import { history } from "../../../_helpers/history.js";
 import { setSelectedConversation } from "../../../store/SelectedConversation.js";
 import { setUserIsLoggedIn } from "../../../store/UserIsLoggedIn .js";
 import { updateNetworkState } from "../../../store/NetworkState.js";
@@ -26,7 +27,6 @@ import { ReactComponent as IconSun } from "./../../../assets/icons/ThemeSun.svg"
 import { ReactComponent as IconMoon } from "./../../../assets/icons/ThemeMoon.svg";
 import { ReactComponent as CreateChatButton } from "./../../../assets/icons/chatList/CreateChatButton.svg";
 import { ReactComponent as LogoutBtn } from "./../../../assets/icons/chatList/LogoutBtn.svg";
-import { history } from "../../../_helpers/history.js";
 
 export default function ChatList() {
   const dispatch = useDispatch();
@@ -106,7 +106,7 @@ export default function ChatList() {
     let list = [];
     for (const obj of conversations) {
       const chatName = !obj.name
-        ? obj.owner_id === userInfo._id
+        ? obj.owner_id === userInfo?._id
           ? participants[obj.opponent_id]?.login
           : participants[obj.owner_id]?.login
         : obj.name;
@@ -130,7 +130,7 @@ export default function ChatList() {
             countOfNewMessages={obj.unread_messages_count}
             chatType={obj.type}
             lastMessage={obj.last_message}
-            uId={userInfo._id}
+            uId={userInfo?._id}
           />
         </NavLink>
       );

src/services/messagesService.js

@@ -4,6 +4,7 @@ import { addMessages, upsertMessages } from "../store/Messages";
 import { getDownloadFileLinks } from "../api/download_manager";
 import { setSelectedConversation } from "../store/SelectedConversation";
 import { upsertChat } from "../store/Conversations";
+import { history } from "../_helpers/history";
 
 class MessagesService {
   currentChatId;
@@ -61,8 +62,7 @@ class MessagesService {
       })
       .catch(() => {
         store.dispatch(setSelectedConversation({}));
-        // eslint-disable-next-line no-restricted-globals
-        history.pushState({}, null, location.origin + "/main");
+        history.navigate("/main");
       });
   }
 }