From 148cff1b48c52c0a1213971cfdb1dfa488402142 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Fri, 28 Jul 2023 15:00:33 -0400
Subject: [PATCH] Fix missed menu invalidation after opening search.

---
 .../securesms/conversation/v2/ConversationFragment.kt           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 c9a59871af..61c66ec426 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
@@ -1144,7 +1144,7 @@ class ConversationFragment :
   }
 
   private fun invalidateOptionsMenu() {
-    if (searchMenuItem?.isActionViewExpanded != true) {
+    if (searchMenuItem?.isActionViewExpanded != true || !isSearchRequested) {
       binding.toolbar.invalidateMenu()
     }
   }