From dc3827ed5fbe3d20cbc342ef95cf633e83c51a4c Mon Sep 17 00:00:00 2001
From: Elaine <138257830+elaine-signal@users.noreply.github.com>
Date: Wed, 27 May 2026 14:39:07 -0400
Subject: [PATCH] Stay scrolled at bottom when expanding collapse sets

---
 .../ConversationView/ConversationViewController+CVC.swift | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Signal/ConversationView/ConversationViewController+CVC.swift b/Signal/ConversationView/ConversationViewController+CVC.swift
index 9c3232fbfd..29df0c7c67 100644
--- a/Signal/ConversationView/ConversationViewController+CVC.swift
+++ b/Signal/ConversationView/ConversationViewController+CVC.swift
@@ -545,6 +545,14 @@ extension ConversationViewController: CVLoadCoordinatorDelegate {
             }
         }
 
+        if
+            scrollAction.action == .none,
+            update.loadRequest.preferredScrollContinuityAnchorInteractionId != nil,
+            isScrolledToBottom
+        {
+            scrollAction = CVScrollAction(action: .bottomOfLoadWindow, isAnimated: false)
+        }
+
         if .loadOlder == renderState.loadType {
             scrollAction = .none
         }