From 2931fb2d4c723bde993c9266ebc2e80a8c2184fb Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Tue, 19 Jan 2021 12:09:50 +0100
Subject: [PATCH] fix channelpreview with messagelistempty

---
 example/ios/Flutter/.last_build_id | 2 +-
 example/lib/main.dart              | 2 +-
 lib/src/channel_preview.dart       | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/example/ios/Flutter/.last_build_id b/example/ios/Flutter/.last_build_id
index e72273c3..f57e1e1f 100644
--- a/example/ios/Flutter/.last_build_id
+++ b/example/ios/Flutter/.last_build_id
@@ -1 +1 @@
-13a41b8138c4868054e44b5158f3bdd6
\ No newline at end of file
+c770358a10272b4ee1cdc2eb432445f6
\ No newline at end of file
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 9eee4db0..f048f584 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -127,7 +127,7 @@ class ChannelListPage extends StatelessWidget {
               '\$in': [StreamChat.of(context).user.id],
             }
           },
-          sort: [SortOption('last_message_at')],
+          // sort: [SortOption('last_message_at')],
           pagination: PaginationParams(
             limit: 20,
           ),
diff --git a/lib/src/channel_preview.dart b/lib/src/channel_preview.dart
index 58557180..61603055 100644
--- a/lib/src/channel_preview.dart
+++ b/lib/src/channel_preview.dart
@@ -128,7 +128,10 @@ 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,
+          orElse: () => null,
+        );
         if (lastMessage == null) {
           return SizedBox();
         }