From 03e4592082df59ddc6921c5e2216319f7e48a046 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Nov 2024 10:17:42 +0400
Subject: [PATCH] Fix search in group/channel requests list.

---
 .../common_groups/info_common_groups_widget.cpp    |  1 -
 Telegram/SourceFiles/info/info_top_bar.cpp         |  1 +
 Telegram/SourceFiles/info/info_wrap_widget.cpp     | 14 +++++++-------
 .../reactions_list/info_reactions_list_widget.cpp  |  1 -
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.cpp b/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.cpp
index 392bee43c..f81019bb7 100644
--- a/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.cpp
+++ b/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.cpp
@@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "info/common_groups/info_common_groups_inner_widget.h"
 #include "info/info_controller.h"
-#include "ui/search_field_controller.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/ui_utility.h"
 #include "lang/lang_keys.h"
diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp
index 0a59d52f2..c08303b3b 100644
--- a/Telegram/SourceFiles/info/info_top_bar.cpp
+++ b/Telegram/SourceFiles/info/info_top_bar.cpp
@@ -208,6 +208,7 @@ void TopBar::setSearchField(
 		rpl::producer<bool> &&shown,
 		bool startsFocused) {
 	Expects(field != nullptr);
+
 	createSearchView(field.release(), std::move(shown), startsFocused);
 }
 
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index 5ede192e5..a638537b1 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -527,14 +527,14 @@ void WrapWidget::showTopBarMenu(bool check) {
 }
 
 bool WrapWidget::requireTopBarSearch() const {
-	if (!_topBar || !_controller->searchFieldController()) {
+	if (!_topBar
+		|| !_controller->searchFieldController()
+		|| (_controller->wrap() == Wrap::Layer)
+		|| (_controller->section().type() == Section::Type::Profile)
+		|| key().isDownloads()) {
 		return false;
-	} else if (_controller->wrap() == Wrap::Layer
-		|| _controller->section().type() == Section::Type::Profile) {
-		return false;
-	} else if (key().isDownloads()) {
-		return false;
-	} else if (hasStackHistory()) {
+	} else if (hasStackHistory()
+		|| _controller->section().type() == Section::Type::RequestsList) {
 		return true;
 	}
 	return false;
diff --git a/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.cpp b/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.cpp
index a94f2f2a7..9b0f4ad0e 100644
--- a/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.cpp
+++ b/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.cpp
@@ -15,7 +15,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/info_controller.h"
 #include "ui/controls/who_reacted_context_action.h"
 #include "ui/widgets/scroll_area.h"
-#include "ui/search_field_controller.h"
 #include "ui/ui_utility.h"
 #include "lang/lang_keys.h"
 #include "styles/style_info.h"