From be3d231fcc578d5b30648b370c9c50bd3ff7d4d5 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 17 Nov 2025 13:52:14 -0400
Subject: [PATCH] Fix issue where bottom bar padding would only appear on
 second entry.

---
 .../securesms/conversation/v2/ConversationFragment.kt      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index 1cfe8bcd28..42831fce10 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -2324,14 +2324,17 @@ class ConversationFragment :
 
     val additionalScrollOffset = 54.dp
     if (isVisible) {
-      bottomActionBar.visibility = View.INVISIBLE
+      ViewUtil.animateIn(bottomActionBar, bottomActionBar.enterAnimation)
       animationsAllowed = false
 
       bottomActionBar.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
         override fun onGlobalLayout() {
+          if (bottomActionBar.measuredHeight == 0) {
+            return
+          }
+
           bottomActionBar.viewTreeObserver.removeOnGlobalLayoutListener(this)
 
-          ViewUtil.animateIn(bottomActionBar, bottomActionBar.enterAnimation)
           container.hideInput()
           inputPanel.setHideForSelection(true)