From a98a9040435d865311c51268c5cb4371b76df2df Mon Sep 17 00:00:00 2001
From: Krille <christian-pauly@posteo.de>
Date: Wed, 15 Nov 2023 13:53:40 +0100
Subject: [PATCH] chore: Follow up presences

---
 lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart | 6 +++++-
 lib/widgets/avatar.dart                                 | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart
index 70c59aca..bdb1d945 100644
--- a/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart
+++ b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart
@@ -40,7 +40,11 @@ class UserBottomSheetView extends StatelessWidget {
                 userId: userId,
                 client: client,
                 builder: (context, presence) {
-                  if (presence == null) return const SizedBox.shrink();
+                  if (presence == null ||
+                      (presence.presence == PresenceType.offline &&
+                          presence.lastActiveTimestamp == null)) {
+                    return const SizedBox.shrink();
+                  }
 
                   final dotColor = presence.presence.isOnline
                       ? Colors.green
diff --git a/lib/widgets/avatar.dart b/lib/widgets/avatar.dart
index a388823b..0496c52a 100644
--- a/lib/widgets/avatar.dart
+++ b/lib/widgets/avatar.dart
@@ -80,7 +80,11 @@ class Avatar extends StatelessWidget {
         PresenceBuilder(
           userId: presenceUserId,
           builder: (context, presence) {
-            if (presence == null) return const SizedBox.shrink();
+            if (presence == null ||
+                (presence.presence == PresenceType.offline &&
+                    presence.lastActiveTimestamp == null)) {
+              return const SizedBox.shrink();
+            }
             final dotColor = presence.presence.isOnline
                 ? Colors.green
                 : presence.presence.isUnavailable