fix chat channels with messages loading

daostack · Nov 21, 2023 · 35ecf67 · 35ecf67
1 parent 82ebb55
commit 35ecf67
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/services/Chat.ts b/src/services/Chat.ts
@@ -245,9 +245,6 @@ class ChatService {
       .where("participants", "array-contains", participantId)
       .orderBy("updatedAt", "desc");
 
-    if (onlyWithMessages) {
-      query = query.where("messageCount", ">", 0);
-    }
     if (startAt) {
       query = query.startAt(startAt);
     }
@@ -256,8 +253,13 @@ class ChatService {
     }
 
     const snapshot = await query.get();
+    const chatChannels = snapshot.docs.map((doc) => doc.data());
+
+    if (!onlyWithMessages) {
+      return chatChannels;
+    }
 
-    return snapshot.docs.map((doc) => doc.data());
+    return chatChannels.filter((chatChannel) => chatChannel.messageCount > 0);
   };
 
   public subscribeToNewUpdatedChatChannels = (