From 7d4da76895a01232753367f4178d433e6ce5713f Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 10 Nov 2025 13:19:05 -0400
Subject: [PATCH] Be a bit smarter about choosing our anchor to animate to.

---
 .../java/org/thoughtcrime/securesms/MainActivity.kt   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
index fd446f541b..ae06517629 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
@@ -387,9 +387,16 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
         }
 
         LaunchedEffect(windowSizeClass) {
-          val anchor = anchors[paneAnchorIndex]
+          val index = when {
+            paneAnchorIndex < 0 -> 1
+            paneAnchorIndex > anchors.lastIndex -> anchors.lastIndex
+            else -> paneAnchorIndex
+          }
 
-          paneExpansionState.animateTo(anchor)
+          if (index in anchors.indices) {
+            val anchor = anchors[index]
+            paneExpansionState.animateTo(anchor)
+          }
         }
 
         val chatNavGraphState = ChatNavGraphState.remember(windowSizeClass)