From 4e2b185f5d6c994d51e664e2ed54511975d0bcf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= <c.kussowski@famedly.com>
Date: Sat, 6 Dec 2025 10:24:14 +0100
Subject: [PATCH] chore: Follow up better request history button

---
 lib/pages/chat/chat_event_list.dart | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/pages/chat/chat_event_list.dart b/lib/pages/chat/chat_event_list.dart
index e87a6413c..a6898f517 100644
--- a/lib/pages/chat/chat_event_list.dart
+++ b/lib/pages/chat/chat_event_list.dart
@@ -85,21 +85,19 @@ class ChatEventList extends StatelessWidget {
 
             // Request history button or progress indicator:
             if (i == events.length + 1) {
-              if (controller.activeThreadId != null) {
+              if (controller.activeThreadId != null ||
+                  !timeline.canRequestHistory) {
                 return const SizedBox.shrink();
               }
               return Builder(
                 builder: (context) {
-                  if (timeline.canRequestHistory) {
-                    final visibleIndex = timeline.events.lastIndexWhere(
-                      (event) =>
-                          !event.isCollapsedState && event.isVisibleInGui,
+                  final visibleIndex = timeline.events.lastIndexWhere(
+                    (event) => !event.isCollapsedState && event.isVisibleInGui,
+                  );
+                  if (visibleIndex > timeline.events.length - 50) {
+                    WidgetsBinding.instance.addPostFrameCallback(
+                      controller.requestHistory,
                     );
-                    if (visibleIndex > timeline.events.length - 50) {
-                      WidgetsBinding.instance.addPostFrameCallback(
-                        controller.requestHistory,
-                      );
-                    }
                   }
                   return Center(
                     child: TextButton.icon(