Merge remote-tracking branch 'upstream/dev' into dev

LiuYi0526 · Jan 24, 2025 · b0a694d · b0a694d
2 parents a584fd8 + 48b6a07
commit b0a694d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -10371,7 +10371,6 @@ public void run(int param) {
                 }
                 filterPopup.show();
             });
-            searchFilterButton.setContentDescription(LocaleController.getString(R.string.JumpToDate));
         }
     }
 
@@ -34103,6 +34102,9 @@ public void openHashtagSearch(String hashtag, boolean forcePublic) {
         if (searchUserButton != null) {
             searchUserButton.setVisibility(View.GONE);
         }
+        if (searchFilterButton != null) {
+            searchFilterButton.setVisibility(View.GONE);
+        }
         if (channelHashtags || forcePublic || ChatObject.isChannelAndNotMegaGroup(currentChat) && ChatObject.isPublic(currentChat) && searchingHashtag != null) {
             defaultSearchPage = 2;
 
@@ -34202,6 +34204,9 @@ private void openSearchWithUser(TLRPC.User user) {
             if (searchUserButton != null) {
                 searchUserButton.setVisibility(View.GONE);
             }
+            if (searchFilterButton != null) {
+                searchFilterButton.setVisibility(View.GONE);
+            }
         }
         if (searchItem != null) {
             preventReopenSearchWithText = true;