added chatroute

Author: Aad1tya27

src/App.tsx

@@ -38,7 +38,7 @@ import Posts from 'screens/UserPortal/Posts/Posts';
 import Organizations from 'screens/UserPortal/Organizations/Organizations';
 import People from 'screens/UserPortal/People/People';
 import Settings from 'screens/UserPortal/Settings/Settings';
-// import Chat from 'screens/UserPortal/Chat/Chat';
+import Chat from 'screens/UserPortal/Chat/Chat';
 import { useQuery } from '@apollo/client';
 import { CHECK_AUTH } from 'GraphQl/Queries/Queries';
 import Advertisements from 'components/Advertisements/Advertisements';
@@ -191,6 +191,7 @@ function app(): JSX.Element {
         <Route element={<SecuredRouteForUser />}>
           <Route path="/user/organizations" element={<Organizations />} />
           <Route path="/user/settings" element={<Settings />} />
+          <Route path="/user/chat/:orgId" element={<Chat />} />
           {/* <Route path="/user/chat" element={<Chat />} /> */}
           <Route element={<UserScreen />}>
             <Route path="/user/organizations" element={<Organizations />} />

src/screens/UserPortal/Chat/Chat.tsx

@@ -111,25 +111,6 @@ export default function chat(): JSX.Element {
   const { getItem } = useLocalStorage();
   const userId = getItem('userId');
 
-  React.useEffect(() => {
-    if (filterType === 'all') {
-      chatsListRefetch();
-      if (chatsListData && chatsListData.chatsByUserId) {
-        setChats(chatsListData.chatsByUserId);
-      }
-    } else if (filterType === 'unread') {
-      unreadChatListRefetch();
-      if (unreadChatListData && unreadChatListData.getUnreadChatsByUserId) {
-        setChats(unreadChatListData.getUnreadChatsByUserId);
-      }
-    } else if (filterType === 'group') {
-      groupChatListRefetch();
-      if (groupChatListData && groupChatListData.getGroupChatsByUserId) {
-        setChats(groupChatListData.getGroupChatsByUserId);
-      }
-    }
-  }, [filterType]);
-
   const [createDirectChatModalisOpen, setCreateDirectChatModalisOpen] =
     useState(false);
 
@@ -180,6 +161,25 @@ export default function chat(): JSX.Element {
     });
   }, [selectedContact]);
 
+  React.useEffect(() => {
+    if (filterType === 'all') {
+      chatsListRefetch();
+      if (chatsListData && chatsListData.chatsByUserId) {
+        setChats(chatsListData.chatsByUserId);
+      }
+    } else if (filterType === 'unread') {
+      unreadChatListRefetch();
+      if (unreadChatListData && unreadChatListData.getUnreadChatsByUserId) {
+        setChats(unreadChatListData.getUnreadChatsByUserId);
+      }
+    } else if (filterType === 'group') {
+      groupChatListRefetch();
+      if (groupChatListData && groupChatListData.getGroupChatsByUserId) {
+        setChats(groupChatListData.getGroupChatsByUserId);
+      }
+    }
+  }, [filterType]);
+
   React.useEffect(() => {
     if (chatsListData && chatsListData?.chatsByUserId.length) {
       setChats(chatsListData.chatsByUserId);