From 3dd451e511d7ffc89da4c46e5c7a311cb045707a Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Fri, 8 Jan 2021 23:37:55 +0530
Subject: [PATCH] [MessageListView] Remove unwanted null checks from separator
 logic

Signed-off-by: Sahil Kumar <xdsahil@gmail.com>
---
 lib/src/message_list_view.dart | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/lib/src/message_list_view.dart b/lib/src/message_list_view.dart
index 7a568361..415539b8 100644
--- a/lib/src/message_list_view.dart
+++ b/lib/src/message_list_view.dart
@@ -342,12 +342,11 @@ class _MessageListViewState extends State<MessageListView> {
                     if (i == messages.length + 1) return Offstage();
                     if (i == 0) return SizedBox(height: 30);
                     final message = messages[i];
-                    final nextMessage = i > 0 ? messages[i - 1] : null;
-                    if (nextMessage != null &&
-                        !Jiffy(message.createdAt.toLocal()).isSame(
-                          nextMessage.createdAt.toLocal(),
-                          Units.DAY,
-                        )) {
+                    final nextMessage = messages[i - 1];
+                    if (!Jiffy(message.createdAt.toLocal()).isSame(
+                      nextMessage.createdAt.toLocal(),
+                      Units.DAY,
+                    )) {
                       final divider = widget.dateDividerBuilder != null
                           ? widget.dateDividerBuilder(
                               nextMessage.createdAt.toLocal(),
@@ -360,15 +359,14 @@ class _MessageListViewState extends State<MessageListView> {
                         child: divider,
                       );
                     }
-                    num timeDiff = 0;
-                    if (nextMessage != null) {
-                      timeDiff = Jiffy(nextMessage.createdAt.toLocal()).diff(
-                        message.createdAt.toLocal(),
-                        Units.MINUTE,
-                      );
-                    }
-                    final isNextUserSame = (i - 1 >= 0) &&
-                        message.user.id == messages[i - 1]?.user?.id;
+                    final timeDiff =
+                        Jiffy(nextMessage.createdAt.toLocal()).diff(
+                      message.createdAt.toLocal(),
+                      Units.MINUTE,
+                    );
+
+                    final isNextUserSame =
+                        message.user.id == nextMessage.user?.id;
                     final isThread = message.replyCount > 0;
                     if (timeDiff >= 1 || !isNextUserSame || isThread) {
                       return SizedBox(height: 8);