CW-2054 Fixed infinity loading for guest user

daostack · Sep 12, 2023 · 0ce5248 · 0ce5248
1 parent 8fb2ce0
commit 0ce5248
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/services/CommonFeedObjectUserUnique.ts b/src/services/CommonFeedObjectUserUnique.ts
@@ -40,9 +40,15 @@ class CommonFeedObjectUserUniqueService {
     feedObjectId: string,
     callback: (data: CommonFeedObjectUserUnique) => void,
   ): UnsubscribeFunction => {
-    const query = this.getCommonFeedObjectUserUniqueSubCollection(commonId)
-      .where("feedObjectId", "==", feedObjectId)
-      .where("userId", "==", userId);
+    let query = this.getCommonFeedObjectUserUniqueSubCollection(commonId).where(
+      "feedObjectId",
+      "==",
+      feedObjectId,
+    );
+
+    if (userId) {
+      query = query.where("userId", "==", userId);
+    }
 
     return query.onSnapshot((snapshot) => {
       const data = snapshot.docChanges()[0]?.doc.data();