Merge pull request #1029 from glific/bug/collection-subscription

Bug fixed for collection messages
glific · Feb 18, 2021 · 4b9a7c2 · 4b9a7c2
2 parents 7d7a396 + 9c9225c
commit 4b9a7c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/containers/Chat/ChatConversations/ChatConversation/ChatConversation.tsx b/src/containers/Chat/ChatConversations/ChatConversation/ChatConversation.tsx
@@ -153,9 +153,11 @@ const ChatConversation: React.SFC<ChatConversationProps> = (props) => {
       onClick={() => {
         if (props.onClick) props.onClick(index);
         setSearchOffset(client, props.messageNumber);
-        markAsRead({
-          variables: { contactId: contactId.toString() },
-        });
+        if (entityType === 'contact') {
+          markAsRead({
+            variables: { contactId: contactId.toString() },
+          });
+        }
       }}
       to={redirectURL}
     >

diff --git a/src/graphql/subscriptions/Chat.ts b/src/graphql/subscriptions/Chat.ts
@@ -89,6 +89,7 @@ export const COLLECTION_SENT_SUBSCRIPTION = gql`
       body
       flow
       type
+      isRead
       groupId
       location {
         latitude
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,6 +89,7 @@ export const COLLECTION_SENT_SUBSCRIPTION = gql` @@
           body
           flow
           type
+          isRead
           groupId
           location {
             latitude
@@ Expand Down @@