From c321659dca5a3a10853be24f90d628eb2334e248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Stolin=CC=81ski?= <b.stolinski@fivedottwelve.com>
Date: Tue, 8 Feb 2022 15:03:19 +0100
Subject: [PATCH] if the message is not in the main messages list, try to find
 in the threads messages

---
 packages/stream_chat/lib/src/client/channel.dart | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart
index d3900842..4e5f6691 100644
--- a/packages/stream_chat/lib/src/client/channel.dart
+++ b/packages/stream_chat/lib/src/client/channel.dart
@@ -1694,7 +1694,10 @@ class ChannelClientState {
   void _listenReactionDeleted() {
     _subscriptions.add(_channel.on(EventType.reactionDeleted).listen((event) {
       final oldMessage =
-          messages.firstWhereOrNull((it) => it.id == event.message?.id);
+          messages.firstWhereOrNull((it) => it.id == event.message?.id) ??
+              threads.values
+                  .expand((e) => e)
+                  .firstWhereOrNull((e) => e.id == event.message?.id);
       final reaction = event.reaction;
       final ownReactions = oldMessage?.ownReactions
           ?.whereNot((it) =>
@@ -1714,7 +1717,10 @@ class ChannelClientState {
   void _listenReactions() {
     _subscriptions.add(_channel.on(EventType.reactionNew).listen((event) {
       final oldMessage =
-          messages.firstWhereOrNull((it) => it.id == event.message?.id);
+          messages.firstWhereOrNull((it) => it.id == event.message?.id) ??
+              threads.values
+                  .expand((e) => e)
+                  .firstWhereOrNull((e) => e.id == event.message?.id);
       final message = event.message!.copyWith(
         ownReactions: oldMessage?.ownReactions,
       );