From ba3f61fa1534dc4b75cdb6ecf71dc701c3c3bd3a Mon Sep 17 00:00:00 2001
From: rlee1990 <rickeylee1129@gmail.com>
Date: Tue, 6 Jun 2023 12:11:25 -0400
Subject: [PATCH] Removed Jiffy

---
 .../stream_chat_flutter/lib/src/channel/channel_info.dart  | 2 +-
 .../lib/src/message_list_view/message_list_view.dart       | 7 +++----
 .../user_scroll_view/stream_user_list_tile.dart            | 2 +-
 packages/stream_chat_flutter/lib/src/user/user_item.dart   | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/channel/channel_info.dart b/packages/stream_chat_flutter/lib/src/channel/channel_info.dart
index 264908a8..5c32d278 100644
--- a/packages/stream_chat_flutter/lib/src/channel/channel_info.dart
+++ b/packages/stream_chat_flutter/lib/src/channel/channel_info.dart
@@ -108,7 +108,7 @@ class _ConnectedTitleState extends StatelessWidget {
         } else {
           alternativeWidget = Text(
             '${context.translations.userLastOnlineText} '
-            '${Jiffy(otherMember.user!.lastActive!).fromNow()}',
+            '${Jiffy(otherMember.user?.lastActive).fromNow()}',
             style: textStyle,
           );
         }
diff --git a/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart
index 76d55285..4c29eb69 100644
--- a/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart
@@ -666,12 +666,11 @@ class _StreamMessageListViewState extends State<StreamMessageListView> {
 
                     final createdAt = message.createdAt.toLocal();
                     final nextCreatedAt = nextMessage.createdAt.toLocal();
-                    if (!Jiffy(createdAt)
-                        .isSame(Jiffy(nextCreatedAt), Units.DAY)) {
+                    if (!Jiffy(createdAt).isSame(nextCreatedAt, Units.DAY)) {
                       separator = _buildDateDivider(nextMessage);
                     } else {
                       final hasTimeDiff = !Jiffy(createdAt).isSame(
-                        Jiffy(nextCreatedAt),
+                        nextCreatedAt,
                         Units.MINUTE,
                       );
 
@@ -1063,7 +1062,7 @@ class _StreamMessageListViewState extends State<StreamMessageListView> {
     var hasTimeDiff = false;
     if (nextMessage != null) {
       hasTimeDiff = !Jiffy(message.createdAt.toLocal()).isSame(
-        Jiffy(nextMessage.createdAt.toLocal()),
+        nextMessage.createdAt.toLocal(),
         Units.MINUTE,
       );
     }
diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart
index 00e7339a..dbb0f6a5 100644
--- a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart
+++ b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart
@@ -179,7 +179,7 @@ class UserLastActive extends StatelessWidget {
       user.online
           ? context.translations.userOnlineText
           : '${context.translations.userLastOnlineText} '
-              '${Jiffy(user.lastActive!).fromNow()}',
+              '${Jiffy(user.lastActive).fromNow()}',
       style: chatTheme.textTheme.footnote.copyWith(
         color: chatTheme.colorTheme.textHighEmphasis.withOpacity(0.5),
       ),
diff --git a/packages/stream_chat_flutter/lib/src/user/user_item.dart b/packages/stream_chat_flutter/lib/src/user/user_item.dart
index 0d3b811a..85d12a99 100644
--- a/packages/stream_chat_flutter/lib/src/user/user_item.dart
+++ b/packages/stream_chat_flutter/lib/src/user/user_item.dart
@@ -77,7 +77,7 @@ class StreamUserItem extends StatelessWidget {
       user.online
           ? context.translations.userOnlineText
           : '${context.translations.userLastOnlineText} '
-              '${Jiffy(user.lastActive!).fromNow()}',
+              '${Jiffy(user.lastActive).fromNow()}',
       style: chatTheme.textTheme.footnote.copyWith(
         color: chatTheme.colorTheme.textHighEmphasis.withOpacity(0.5),
       ),