From 1b9110a03442cbd6c2eedc3a2ad16efcc049c997 Mon Sep 17 00:00:00 2001
From: Leandro Borges Ferreira <lehen01@gmail.com>
Date: Mon, 30 Jan 2023 17:58:30 +0100
Subject: [PATCH] Simply watchers logic

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

diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart
index 15f093e5..a05f9922 100644
--- a/packages/stream_chat/lib/src/client/channel.dart
+++ b/packages/stream_chat/lib/src/client/channel.dart
@@ -2115,16 +2115,9 @@ class ChannelClientState {
       .toList();
 
   /// Channel watchers list as a stream.
-  Stream<List<User>> get watchersStream => CombineLatestStream.combine2<
-          List<User>?, Map<String?, User?>, List<User>>(
-        channelStateStream
-            .map((cs) => cs.watchers)
-            .where((watchers) => watchers != null),
-        _channel.client.state.usersStream,
-        (watchers, users) {
-          return watchers!.map((e) => users[e.id] ?? e).toList();
-        } ,
-      );
+  Stream<List<User>?> get watchersStream => channelStateStream
+      .map((cs) => cs.watchers)
+      .where((watchers) => watchers != null);
 
   /// Channel member for the current user.
   Member? get currentUserMember => members.firstWhereOrNull(