Merge pull request #348 from GetStream/fix-own-reactions-disappear

fix: Message update event handler doesn't respect order change and deletion

Author: szuperaz

projects/stream-chat-angular/src/lib/channel.service.spec.ts

@@ -436,9 +436,8 @@ describe('ChannelService', () => {
     spy.calls.reset();
     let activeChannel!: Channel<DefaultStreamChatGenerics>;
     service.activeChannel$.subscribe((c) => (activeChannel = c!));
-    const message = {
-      ...activeChannel.state.messages[activeChannel.state.messages.length - 1],
-    };
+    const message =
+      activeChannel.state.messages[activeChannel.state.messages.length - 1];
     message.deleted_at = new Date().toISOString();
     (activeChannel as MockChannel).handleEvent('message.deleted', { message });
 

projects/stream-chat-angular/src/lib/channel.service.ts

@@ -997,14 +997,21 @@ export class ChannelService<
   private messageUpdated(event: Event<T>) {
     this.ngZone.run(() => {
       const isThreadReply = event.message && event.message.parent_id;
-      const messages = isThreadReply
-        ? this.activeThreadMessagesSubject.getValue()
-        : this.activeChannelMessagesSubject.getValue();
+      const channel = this.activeChannelSubject.getValue();
+      if (!channel) {
+        return;
+      }
+      // Get messages from state as message order could change, and message could've been deleted
+      const messages: FormatMessageResponse<T>[] = isThreadReply
+        ? channel.state.threads[event?.message?.parent_id || '']
+        : channel.state.messages;
+      if (!messages) {
+        return;
+      }
       const messageIndex = messages.findIndex(
-        (m) => m.id === event.message?.id
+        (m) => m.id === event?.message?.id
       );
-      if (messageIndex !== -1 && event.message) {
-        messages[messageIndex] = event.message;
+      if (messageIndex !== -1) {
         isThreadReply
           ? this.activeThreadMessagesSubject.next([...messages])
           : this.activeChannelMessagesSubject.next([...messages]);