From b56fe4729b8447e4069af110d59dfc1e6eefed1f Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Wed, 23 Dec 2020 12:33:03 +0100
Subject: [PATCH] fix tests

---
 lib/src/channel_preview.dart       | 2 +-
 test/src/channel_preview_test.dart | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/src/channel_preview.dart b/lib/src/channel_preview.dart
index c01ccd5d..58557180 100644
--- a/lib/src/channel_preview.dart
+++ b/lib/src/channel_preview.dart
@@ -128,7 +128,7 @@ class ChannelPreview extends StatelessWidget {
       stream: channel.state.messagesStream,
       initialData: channel.state.messages,
       builder: (context, snapshot) {
-        final lastMessage = snapshot.data.lastWhere((m) => m.shadowed != true);
+        final lastMessage = snapshot.data?.lastWhere((m) => m.shadowed != true);
         if (lastMessage == null) {
           return SizedBox();
         }
diff --git a/test/src/channel_preview_test.dart b/test/src/channel_preview_test.dart
index f5e0fbd0..a7173628 100644
--- a/test/src/channel_preview_test.dart
+++ b/test/src/channel_preview_test.dart
@@ -24,6 +24,11 @@ void main() {
         'name': 'test name',
       });
       when(channelState.unreadCount).thenReturn(1);
+      when(channelState.messages).thenReturn([
+        Message(
+          text: 'hello',
+        )
+      ]);
       when(channelState.lastMessage).thenReturn(Message(
         text: 'hello',
       ));