From 3cfe5efd0956834c18f00cd19f1b9f59bda507ea Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Tue, 10 Nov 2020 16:46:25 +0100
Subject: [PATCH] fix tests

---
 lib/src/channel_preview.dart       | 19 ++++++++++++++-----
 test/src/channel_preview_test.dart | 15 ++++++++++++++-
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/lib/src/channel_preview.dart b/lib/src/channel_preview.dart
index cd1a0910..c23d7732 100644
--- a/lib/src/channel_preview.dart
+++ b/lib/src/channel_preview.dart
@@ -70,11 +70,20 @@ class ChannelPreview extends StatelessWidget {
                           StreamChatTheme.of(context).channelPreviewTheme.title,
                     ),
                   ),
-                  if (channel.state.members.contains(
-                      (Member e) => e.userId == channel.client.state.user.id))
-                    UnreadIndicator(
-                      channel: channel,
-                    ),
+                  StreamBuilder<List<Member>>(
+                      stream: channel.state.membersStream,
+                      initialData: channel.state.members,
+                      builder: (context, snapshot) {
+                        if (!snapshot.hasData ||
+                            snapshot.data.isEmpty ||
+                            !snapshot.data.any((Member e) =>
+                                e.user.id == channel.client.state.user.id)) {
+                          return SizedBox();
+                        }
+                        return UnreadIndicator(
+                          channel: channel,
+                        );
+                      }),
                 ],
               ),
               subtitle: Row(
diff --git a/test/src/channel_preview_test.dart b/test/src/channel_preview_test.dart
index 94c45ac2..578d4b28 100644
--- a/test/src/channel_preview_test.dart
+++ b/test/src/channel_preview_test.dart
@@ -19,6 +19,7 @@ void main() {
       when(clientState.user).thenReturn(OwnUser(id: 'user-id'));
       when(channel.lastMessageAt).thenReturn(lastMessageAt);
       when(channel.state).thenReturn(channelState);
+      when(channel.client).thenReturn(client);
       when(channel.isMuted).thenReturn(false);
       when(channel.isMutedStream).thenAnswer((i) => Stream.value(false));
       when(channel.extraDataStream).thenAnswer((i) => Stream.value({
@@ -28,7 +29,19 @@ void main() {
         'name': 'test name',
       });
       when(channelState.unreadCount).thenReturn(1);
-      when(channelState.members).thenReturn([]);
+      when(channelState.unreadCountStream).thenAnswer((i) => Stream.value(1));
+      when(channelState.membersStream).thenAnswer((i) => Stream.value([
+            Member(
+              userId: 'user-id',
+              user: User(id: 'user-id'),
+            )
+          ]));
+      when(channelState.members).thenReturn([
+        Member(
+          userId: 'user-id',
+          user: User(id: 'user-id'),
+        ),
+      ]);
       when(channelState.lastMessage).thenReturn(Message(
         text: 'hello',
         user: User(id: 'other-user'),