From 293ad5c9bf8ef9b92581c19075566d170f90c4a8 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Mon, 21 Sep 2020 17:17:13 +0200
Subject: [PATCH] fix last active on new message

---
 lib/src/channel_header.dart | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/src/channel_header.dart b/lib/src/channel_header.dart
index 5a7a146c..fbac80f1 100644
--- a/lib/src/channel_header.dart
+++ b/lib/src/channel_header.dart
@@ -120,15 +120,17 @@ class ChannelHeader extends StatelessWidget implements PreferredSizeWidget {
       stream: channel.lastMessageAtStream,
       initialData: channel.lastMessageAt,
       builder: (context, snapshot) {
-        return (snapshot.data != null)
-            ? Text(
-                'Active ${Jiffy(snapshot.data.toLocal()).fromNow()}',
-                style: StreamChatTheme.of(context)
-                    .channelTheme
-                    .channelHeaderTheme
-                    .lastMessageAt,
-              )
-            : SizedBox();
+        if (snapshot.data == null) {
+          return SizedBox();
+        }
+        final jiffyDate = Jiffy(snapshot.data?.toLocal());
+        return Text(
+          'Active ${jiffyDate.isBefore(Jiffy()) ? jiffyDate.fromNow() : 'now'}',
+          style: StreamChatTheme.of(context)
+              .channelTheme
+              .channelHeaderTheme
+              .lastMessageAt,
+        );
       },
     );
   }