added await to ensure updated queryData

PalisadoesFoundation · Jan 12, 2025 · 44fc7d5 · 44fc7d5
1 parent 6e25c29
commit 44fc7d5
Showing 1 changed file with 12 additions and 16 deletions.
diff --git a/src/screens/UserPortal/Chat/Chat.tsx b/src/screens/UserPortal/Chat/Chat.tsx
@@ -162,29 +162,25 @@ export default function chat(): JSX.Element {
   }, [selectedContact]);
 
   React.useEffect(() => {
-    let isMounted = true;
-    if (filterType === 'all') {
-      chatsListRefetch().then(() => {
-        if (isMounted && chatsListData?.chatsByUserId) {
+    async function getChats(): Promise<void> {
+      if (filterType === 'all') {
+        await chatsListRefetch();
+        if (chatsListData && chatsListData.chatsByUserId) {
           setChats(chatsListData.chatsByUserId);
         }
-      });
-    } else if (filterType === 'unread') {
-      unreadChatListRefetch().then(() => {
-        if (isMounted && unreadChatListData?.getUnreadChatsByUserId) {
+      } else if (filterType === 'unread') {
+        await unreadChatListRefetch();
+        if (unreadChatListData && unreadChatListData.getUnreadChatsByUserId) {
           setChats(unreadChatListData.getUnreadChatsByUserId);
         }
-      });
-    } else if (filterType === 'group') {
-      groupChatListRefetch().then(() => {
-        if (isMounted && groupChatListData?.getGroupChatsByUserId) {
+      } else if (filterType === 'group') {
+        await groupChatListRefetch();
+        if (groupChatListData && groupChatListData.getGroupChatsByUserId) {
           setChats(groupChatListData.getGroupChatsByUserId);
         }
-      });
+      }
     }
-    return () => {
-      isMounted = false;
-    };
+    getChats();
   }, [filterType]);
 
   React.useEffect(() => {