Merge branch 'master' into feature/new-ui

2020-07-15 10:06:52 +02:00
parent c00ed3f2a2 d116c0537f
commit 7b46992e7b
10 changed files with 83 additions and 62 deletions
@@ -172,11 +172,7 @@ class ChannelPreview extends StatelessWidget {
      stream: channel.state.messagesStream,
      initialData: channel.state.messages,
      builder: (context, snapshot) {
-        final messages = snapshot.data;
-        final lastMessage = messages?.isNotEmpty == true
-            ? messages.lastWhere((m) =>
-                !(m.isDeleted && m.status == MessageSendingStatus.FAILED))
-            : null;
+        final lastMessage = channel.state.lastMessage;
        if (lastMessage == null) {
          return SizedBox();
        }