From a105211d5e8d91c9db56657ba50386d40259140b Mon Sep 17 00:00:00 2001
From: Ryan Teguh <ryanteguh123@gmail.com>
Date: Fri, 30 Jan 2026 17:47:01 +0800
Subject: [PATCH 01/10] Fix: Hide Concierge help button on every Search RHP

---
 src/components/Search/FilterComponents/DateFilterBase.tsx    | 1 +
 src/components/Search/SearchBooleanFilterBasePage.tsx        | 1 +
 src/components/Search/SearchFiltersAmountBase.tsx            | 2 ++
 src/components/Search/SearchFiltersCurrencyBase.tsx          | 1 +
 src/components/Search/SearchFiltersTextBase.tsx              | 1 +
 src/pages/Search/SavedSearchRenamePage.tsx                   | 5 ++++-
 src/pages/Search/SearchAdvancedFiltersPage.tsx               | 5 ++++-
 .../SearchAdvancedFiltersPage/SearchFiltersAssigneePage.tsx  | 1 +
 .../SearchAdvancedFiltersPage/SearchFiltersAttendeePage.tsx  | 1 +
 .../SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx      | 1 +
 .../SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx  | 1 +
 .../SearchFiltersExpenseTypePage.tsx                         | 1 +
 .../SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx      | 1 +
 .../SearchAdvancedFiltersPage/SearchFiltersGroupByPage.tsx   | 1 +
 .../SearchAdvancedFiltersPage/SearchFiltersHasPage.tsx       | 1 +
 .../Search/SearchAdvancedFiltersPage/SearchFiltersInPage.tsx | 1 +
 .../Search/SearchAdvancedFiltersPage/SearchFiltersIsPage.tsx | 1 +
 .../SearchFiltersReportFieldPage/ReportFieldList.tsx         | 1 +
 .../SearchFiltersReportFieldPage/ReportFieldText.tsx         | 1 +
 .../SearchFiltersReportFieldPage/index.tsx                   | 1 +
 .../SearchAdvancedFiltersPage/SearchFiltersStatusPage.tsx    | 1 +
 .../SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx       | 1 +
 .../SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx   | 1 +
 .../Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx | 1 +
 .../SearchAdvancedFiltersPage/SearchFiltersTypePage.tsx      | 1 +
 .../SearchFiltersWithdrawalTypePage.tsx                      | 1 +
 .../SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx | 1 +
 src/pages/Search/SearchColumnsPage.tsx                       | 5 ++++-
 28 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/components/Search/FilterComponents/DateFilterBase.tsx b/src/components/Search/FilterComponents/DateFilterBase.tsx
index 5f7545e0eb214..28a6099c3dbec 100644
--- a/src/components/Search/FilterComponents/DateFilterBase.tsx
+++ b/src/components/Search/FilterComponents/DateFilterBase.tsx
@@ -117,6 +117,7 @@ function DateFilterBase({title, dateKey, back, onSubmit}: DateFilterBaseProps) {
             <HeaderWithBackButton
                 title={computedTitle}
                 onBackButtonPress={goBack}
+                shouldDisplayHelpButton={false}
             />
             <ScrollView contentContainerStyle={[styles.flexGrow1]}>
                 <DatePresetFilterBase
diff --git a/src/components/Search/SearchBooleanFilterBasePage.tsx b/src/components/Search/SearchBooleanFilterBasePage.tsx
index 37004b0d856d6..6fe56fbaf3626 100644
--- a/src/components/Search/SearchBooleanFilterBasePage.tsx
+++ b/src/components/Search/SearchBooleanFilterBasePage.tsx
@@ -78,6 +78,7 @@ function SearchBooleanFilterBasePage({booleanKey, titleKey}: SearchBooleanFilter
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SelectionList
diff --git a/src/components/Search/SearchFiltersAmountBase.tsx b/src/components/Search/SearchFiltersAmountBase.tsx
index 6f9bbfc5ba5d4..65bf117ae6459 100644
--- a/src/components/Search/SearchFiltersAmountBase.tsx
+++ b/src/components/Search/SearchFiltersAmountBase.tsx
@@ -161,6 +161,7 @@ function SearchFiltersAmountBase({title, filterKey, testID}: {title: Translation
                 <HeaderWithBackButton
                     title={fieldTitle}
                     onBackButtonPress={() => Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute())}
+                    shouldDisplayHelpButton={false}
                 />
                 <View style={styles.flex1}>
                     <View style={styles.flexGrow1}>
@@ -203,6 +204,7 @@ function SearchFiltersAmountBase({title, filterKey, testID}: {title: Translation
             <HeaderWithBackButton
                 onBackButtonPress={goBack}
                 title={fieldTitle}
+                shouldDisplayHelpButton={false}
             />
             <FormProvider
                 style={[styles.flex1, styles.ph4]}
diff --git a/src/components/Search/SearchFiltersCurrencyBase.tsx b/src/components/Search/SearchFiltersCurrencyBase.tsx
index 926cab494bea2..4edd80abed820 100644
--- a/src/components/Search/SearchFiltersCurrencyBase.tsx
+++ b/src/components/Search/SearchFiltersCurrencyBase.tsx
@@ -72,6 +72,7 @@ function SearchFiltersCurrencyBase({title, filterKey, multiselect = false}: Sear
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 {multiselect && (
diff --git a/src/components/Search/SearchFiltersTextBase.tsx b/src/components/Search/SearchFiltersTextBase.tsx
index 64419fb64cd35..2052486bde8c0 100644
--- a/src/components/Search/SearchFiltersTextBase.tsx
+++ b/src/components/Search/SearchFiltersTextBase.tsx
@@ -50,6 +50,7 @@ function SearchFiltersTextBase({filterKey, titleKey, testID, characterLimit = CO
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <TextFilterBase
                 filterKey={filterKey}
diff --git a/src/pages/Search/SavedSearchRenamePage.tsx b/src/pages/Search/SavedSearchRenamePage.tsx
index 1d71d1e528d3d..d2a4993238a3b 100644
--- a/src/pages/Search/SavedSearchRenamePage.tsx
+++ b/src/pages/Search/SavedSearchRenamePage.tsx
@@ -53,7 +53,10 @@ function SavedSearchRenamePage({route}: {route: {params: {q: string; name: strin
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom
         >
-            <HeaderWithBackButton title={translate('common.rename')} />
+            <HeaderWithBackButton
+                title={translate('common.rename')}
+                shouldDisplayHelpButton={false}
+            />
             <FormProvider
                 formID={ONYXKEYS.FORMS.SEARCH_SAVED_SEARCH_RENAME_FORM}
                 submitButtonText={translate('common.save')}
diff --git a/src/pages/Search/SearchAdvancedFiltersPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage.tsx
index 91068105af979..b9fec3d4ff578 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage.tsx
@@ -43,7 +43,10 @@ function SearchAdvancedFiltersPage() {
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom
         >
-            <HeaderWithBackButton title={translate('search.filtersHeader')}>
+            <HeaderWithBackButton
+                title={translate('search.filtersHeader')}
+                shouldDisplayHelpButton={false}
+            >
                 {shouldShowResetFilters && <TextLink onPress={clearAdvancedFilters}>{translate('search.resetFilters')}</TextLink>}
             </HeaderWithBackButton>
             <AdvancedSearchFilters />
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAssigneePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAssigneePage.tsx
index f1b53c4fbafaa..7ef207c3fe49c 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAssigneePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAssigneePage.tsx
@@ -30,6 +30,7 @@ function SearchFiltersAssigneePage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchFiltersParticipantsSelector
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAttendeePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAttendeePage.tsx
index d2f67a5d3c3b4..575bcdb22ef9e 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAttendeePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAttendeePage.tsx
@@ -30,6 +30,7 @@ function SearchFiltersAttendeePage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchFiltersParticipantsSelector
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx
index 5b6900d33ddac..fdb03e76eb2c1 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx
@@ -175,6 +175,7 @@ function SearchFiltersCardPage() {
                         onBackButtonPress={() => {
                             Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                         }}
+                        shouldDisplayHelpButton={false}
                     />
                     <View style={[styles.flex1]}>
                         <SelectionList<CardFilterItem>
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
index bb612bf806223..75d85fc3b6f6e 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
@@ -96,6 +96,7 @@ function SearchFiltersCategoryPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchMultipleSelectionPicker
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx
index 45592de8ab800..9b574f6e781bd 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx
@@ -53,6 +53,7 @@ function SearchFiltersExpenseTypePage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchMultipleSelectionPicker
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx
index 8970d16e77884..6fabfa344c525 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx
@@ -30,6 +30,7 @@ function SearchFiltersFromPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchFiltersParticipantsSelector
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersGroupByPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersGroupByPage.tsx
index b8f2c34987f0d..72942f3096e43 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersGroupByPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersGroupByPage.tsx
@@ -56,6 +56,7 @@ function SearchFiltersGroupByPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SelectionList
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersHasPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersHasPage.tsx
index e3e34488251da..c16f307342a44 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersHasPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersHasPage.tsx
@@ -81,6 +81,7 @@ function SearchFiltersHasPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SelectionList
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersInPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersInPage.tsx
index 61eddef26572f..1188da26dccee 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersInPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersInPage.tsx
@@ -34,6 +34,7 @@ function SearchFiltersInPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchFiltersChatsSelector
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersIsPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersIsPage.tsx
index 261e063930f04..7c68660bb5449 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersIsPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersIsPage.tsx
@@ -86,6 +86,7 @@ function SearchFiltersIsPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SelectionList
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/ReportFieldList.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/ReportFieldList.tsx
index b2f1c89975599..428809712de56 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/ReportFieldList.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/ReportFieldList.tsx
@@ -65,6 +65,7 @@ function ReportFieldList({field, close}: ReportFieldListProps) {
             <HeaderWithBackButton
                 title={field.name}
                 onBackButtonPress={close}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SelectionList
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/ReportFieldText.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/ReportFieldText.tsx
index 15c0a734b3534..d033bced2a9a2 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/ReportFieldText.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/ReportFieldText.tsx
@@ -25,6 +25,7 @@ function ReportFieldText({field, close}: ReportFieldListProps) {
             <HeaderWithBackButton
                 title={field.name}
                 onBackButtonPress={close}
+                shouldDisplayHelpButton={false}
             />
             <TextFilterBase
                 filterKey={formKey}
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/index.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/index.tsx
index 1821fb88fb70a..4c253a953bd1a 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/index.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/index.tsx
@@ -125,6 +125,7 @@ function SearchFiltersReportFieldPage() {
                     resetValues();
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <ScrollView contentContainerStyle={[styles.flexGrow1]}>
                 {listItems.map((item) => (
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersStatusPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersStatusPage.tsx
index f7a30fd93a170..63ac8a3dfaa67 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersStatusPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersStatusPage.tsx
@@ -89,6 +89,7 @@ function SearchFiltersStatusPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SelectionList
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx
index c60ee88224622..f93d19668290b 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx
@@ -67,6 +67,7 @@ function SearchFiltersTagPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchMultipleSelectionPicker
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx
index 78830b6717da1..61b0fb1d5af8b 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx
@@ -72,6 +72,7 @@ function SearchFiltersTaxRatePage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchMultipleSelectionPicker
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx
index 4117ac49a8143..fb63c9260ea57 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx
@@ -30,6 +30,7 @@ function SearchFiltersToPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchFiltersParticipantsSelector
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTypePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTypePage.tsx
index 1d377ae626bef..448d7d803c5ea 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTypePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTypePage.tsx
@@ -67,6 +67,7 @@ function SearchFiltersTypePage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SelectionList
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWithdrawalTypePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWithdrawalTypePage.tsx
index 643e08ad3ac46..88a15a966a0c8 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWithdrawalTypePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWithdrawalTypePage.tsx
@@ -56,6 +56,7 @@ function SearchFiltersWithdrawalTypePage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
+                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SelectionList
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx
index fdbe43c54ff2f..94e54a4b0cdfe 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx
@@ -106,6 +106,7 @@ function SearchFiltersWorkspacePage() {
                         onBackButtonPress={() => {
                             Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                         }}
+                        shouldDisplayHelpButton={false}
                     />
                     {shouldShowLoadingIndicator ? (
                         <FullScreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 405aea75a7cb1..c151c868e90e5 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -215,7 +215,10 @@ function SearchColumnsPage() {
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom
         >
-            <HeaderWithBackButton title={translate('search.columns')}>
+            <HeaderWithBackButton
+                title={translate('search.columns')}
+                shouldDisplayHelpButton={false}
+            >
                 {!isDefaultState && <TextLink onPress={resetColumns}>{translate('search.resetColumns')}</TextLink>}
             </HeaderWithBackButton>
             <View style={styles.flex1}>

From 2c8083fa27f3ee49db74492649a8a5f789da7552 Mon Sep 17 00:00:00 2001
From: Ryan Teguh <ryanteguh123@gmail.com>
Date: Mon, 9 Feb 2026 09:37:30 +0800
Subject: [PATCH 02/10] Revert first commit

---
 src/components/Search/FilterComponents/DateFilterBase.tsx    | 1 -
 src/components/Search/SearchBooleanFilterBasePage.tsx        | 1 -
 src/components/Search/SearchFiltersAmountBase.tsx            | 2 --
 src/components/Search/SearchFiltersCurrencyBase.tsx          | 1 -
 src/components/Search/SearchFiltersTextBase.tsx              | 1 -
 src/pages/Search/SavedSearchRenamePage.tsx                   | 5 +----
 src/pages/Search/SearchAdvancedFiltersPage.tsx               | 5 +----
 .../SearchAdvancedFiltersPage/SearchFiltersAssigneePage.tsx  | 1 -
 .../SearchAdvancedFiltersPage/SearchFiltersAttendeePage.tsx  | 1 -
 .../SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx      | 1 -
 .../SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx  | 1 -
 .../SearchFiltersExpenseTypePage.tsx                         | 1 -
 .../SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx      | 1 -
 .../SearchAdvancedFiltersPage/SearchFiltersGroupByPage.tsx   | 1 -
 .../SearchAdvancedFiltersPage/SearchFiltersHasPage.tsx       | 1 -
 .../Search/SearchAdvancedFiltersPage/SearchFiltersInPage.tsx | 1 -
 .../Search/SearchAdvancedFiltersPage/SearchFiltersIsPage.tsx | 1 -
 .../SearchFiltersReportFieldPage/ReportFieldList.tsx         | 1 -
 .../SearchFiltersReportFieldPage/ReportFieldText.tsx         | 1 -
 .../SearchFiltersReportFieldPage/index.tsx                   | 1 -
 .../SearchAdvancedFiltersPage/SearchFiltersStatusPage.tsx    | 1 -
 .../SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx       | 1 -
 .../SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx   | 1 -
 .../Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx | 1 -
 .../SearchAdvancedFiltersPage/SearchFiltersTypePage.tsx      | 1 -
 .../SearchFiltersWithdrawalTypePage.tsx                      | 1 -
 .../SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx | 1 -
 src/pages/Search/SearchColumnsPage.tsx                       | 5 +----
 28 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/src/components/Search/FilterComponents/DateFilterBase.tsx b/src/components/Search/FilterComponents/DateFilterBase.tsx
index 28a6099c3dbec..5f7545e0eb214 100644
--- a/src/components/Search/FilterComponents/DateFilterBase.tsx
+++ b/src/components/Search/FilterComponents/DateFilterBase.tsx
@@ -117,7 +117,6 @@ function DateFilterBase({title, dateKey, back, onSubmit}: DateFilterBaseProps) {
             <HeaderWithBackButton
                 title={computedTitle}
                 onBackButtonPress={goBack}
-                shouldDisplayHelpButton={false}
             />
             <ScrollView contentContainerStyle={[styles.flexGrow1]}>
                 <DatePresetFilterBase
diff --git a/src/components/Search/SearchBooleanFilterBasePage.tsx b/src/components/Search/SearchBooleanFilterBasePage.tsx
index 6fe56fbaf3626..37004b0d856d6 100644
--- a/src/components/Search/SearchBooleanFilterBasePage.tsx
+++ b/src/components/Search/SearchBooleanFilterBasePage.tsx
@@ -78,7 +78,6 @@ function SearchBooleanFilterBasePage({booleanKey, titleKey}: SearchBooleanFilter
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SelectionList
diff --git a/src/components/Search/SearchFiltersAmountBase.tsx b/src/components/Search/SearchFiltersAmountBase.tsx
index 65bf117ae6459..6f9bbfc5ba5d4 100644
--- a/src/components/Search/SearchFiltersAmountBase.tsx
+++ b/src/components/Search/SearchFiltersAmountBase.tsx
@@ -161,7 +161,6 @@ function SearchFiltersAmountBase({title, filterKey, testID}: {title: Translation
                 <HeaderWithBackButton
                     title={fieldTitle}
                     onBackButtonPress={() => Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute())}
-                    shouldDisplayHelpButton={false}
                 />
                 <View style={styles.flex1}>
                     <View style={styles.flexGrow1}>
@@ -204,7 +203,6 @@ function SearchFiltersAmountBase({title, filterKey, testID}: {title: Translation
             <HeaderWithBackButton
                 onBackButtonPress={goBack}
                 title={fieldTitle}
-                shouldDisplayHelpButton={false}
             />
             <FormProvider
                 style={[styles.flex1, styles.ph4]}
diff --git a/src/components/Search/SearchFiltersCurrencyBase.tsx b/src/components/Search/SearchFiltersCurrencyBase.tsx
index 4edd80abed820..926cab494bea2 100644
--- a/src/components/Search/SearchFiltersCurrencyBase.tsx
+++ b/src/components/Search/SearchFiltersCurrencyBase.tsx
@@ -72,7 +72,6 @@ function SearchFiltersCurrencyBase({title, filterKey, multiselect = false}: Sear
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 {multiselect && (
diff --git a/src/components/Search/SearchFiltersTextBase.tsx b/src/components/Search/SearchFiltersTextBase.tsx
index 4821a04d68478..24655d4651ce6 100644
--- a/src/components/Search/SearchFiltersTextBase.tsx
+++ b/src/components/Search/SearchFiltersTextBase.tsx
@@ -53,7 +53,6 @@ function SearchFiltersTextBase({filterKey, titleKey, testID, characterLimit = CO
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <TextFilterBase
                 filterKey={filterKey}
diff --git a/src/pages/Search/SavedSearchRenamePage.tsx b/src/pages/Search/SavedSearchRenamePage.tsx
index d2a4993238a3b..1d71d1e528d3d 100644
--- a/src/pages/Search/SavedSearchRenamePage.tsx
+++ b/src/pages/Search/SavedSearchRenamePage.tsx
@@ -53,10 +53,7 @@ function SavedSearchRenamePage({route}: {route: {params: {q: string; name: strin
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom
         >
-            <HeaderWithBackButton
-                title={translate('common.rename')}
-                shouldDisplayHelpButton={false}
-            />
+            <HeaderWithBackButton title={translate('common.rename')} />
             <FormProvider
                 formID={ONYXKEYS.FORMS.SEARCH_SAVED_SEARCH_RENAME_FORM}
                 submitButtonText={translate('common.save')}
diff --git a/src/pages/Search/SearchAdvancedFiltersPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage.tsx
index b9fec3d4ff578..91068105af979 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage.tsx
@@ -43,10 +43,7 @@ function SearchAdvancedFiltersPage() {
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom
         >
-            <HeaderWithBackButton
-                title={translate('search.filtersHeader')}
-                shouldDisplayHelpButton={false}
-            >
+            <HeaderWithBackButton title={translate('search.filtersHeader')}>
                 {shouldShowResetFilters && <TextLink onPress={clearAdvancedFilters}>{translate('search.resetFilters')}</TextLink>}
             </HeaderWithBackButton>
             <AdvancedSearchFilters />
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAssigneePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAssigneePage.tsx
index 7ef207c3fe49c..f1b53c4fbafaa 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAssigneePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAssigneePage.tsx
@@ -30,7 +30,6 @@ function SearchFiltersAssigneePage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchFiltersParticipantsSelector
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAttendeePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAttendeePage.tsx
index 96572a8670269..e22dd30627ee0 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAttendeePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAttendeePage.tsx
@@ -30,7 +30,6 @@ function SearchFiltersAttendeePage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchFiltersParticipantsSelector
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx
index fdb03e76eb2c1..5b6900d33ddac 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx
@@ -175,7 +175,6 @@ function SearchFiltersCardPage() {
                         onBackButtonPress={() => {
                             Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                         }}
-                        shouldDisplayHelpButton={false}
                     />
                     <View style={[styles.flex1]}>
                         <SelectionList<CardFilterItem>
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
index 75d85fc3b6f6e..bb612bf806223 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
@@ -96,7 +96,6 @@ function SearchFiltersCategoryPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchMultipleSelectionPicker
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx
index 9b574f6e781bd..45592de8ab800 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx
@@ -53,7 +53,6 @@ function SearchFiltersExpenseTypePage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchMultipleSelectionPicker
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx
index 6fabfa344c525..8970d16e77884 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx
@@ -30,7 +30,6 @@ function SearchFiltersFromPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchFiltersParticipantsSelector
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersGroupByPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersGroupByPage.tsx
index f06c1ee5da94b..db3af09b0b13f 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersGroupByPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersGroupByPage.tsx
@@ -58,7 +58,6 @@ function SearchFiltersGroupByPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SelectionList
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersHasPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersHasPage.tsx
index c16f307342a44..e3e34488251da 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersHasPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersHasPage.tsx
@@ -81,7 +81,6 @@ function SearchFiltersHasPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SelectionList
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersInPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersInPage.tsx
index 1188da26dccee..61eddef26572f 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersInPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersInPage.tsx
@@ -34,7 +34,6 @@ function SearchFiltersInPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchFiltersChatsSelector
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersIsPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersIsPage.tsx
index 7c68660bb5449..261e063930f04 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersIsPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersIsPage.tsx
@@ -86,7 +86,6 @@ function SearchFiltersIsPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SelectionList
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/ReportFieldList.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/ReportFieldList.tsx
index 428809712de56..b2f1c89975599 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/ReportFieldList.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/ReportFieldList.tsx
@@ -65,7 +65,6 @@ function ReportFieldList({field, close}: ReportFieldListProps) {
             <HeaderWithBackButton
                 title={field.name}
                 onBackButtonPress={close}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SelectionList
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/ReportFieldText.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/ReportFieldText.tsx
index d033bced2a9a2..15c0a734b3534 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/ReportFieldText.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/ReportFieldText.tsx
@@ -25,7 +25,6 @@ function ReportFieldText({field, close}: ReportFieldListProps) {
             <HeaderWithBackButton
                 title={field.name}
                 onBackButtonPress={close}
-                shouldDisplayHelpButton={false}
             />
             <TextFilterBase
                 filterKey={formKey}
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/index.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/index.tsx
index 4c253a953bd1a..1821fb88fb70a 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/index.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportFieldPage/index.tsx
@@ -125,7 +125,6 @@ function SearchFiltersReportFieldPage() {
                     resetValues();
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <ScrollView contentContainerStyle={[styles.flexGrow1]}>
                 {listItems.map((item) => (
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersStatusPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersStatusPage.tsx
index 63ac8a3dfaa67..f7a30fd93a170 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersStatusPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersStatusPage.tsx
@@ -89,7 +89,6 @@ function SearchFiltersStatusPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SelectionList
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx
index f93d19668290b..c60ee88224622 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx
@@ -67,7 +67,6 @@ function SearchFiltersTagPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchMultipleSelectionPicker
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx
index 61b0fb1d5af8b..78830b6717da1 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx
@@ -72,7 +72,6 @@ function SearchFiltersTaxRatePage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchMultipleSelectionPicker
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx
index fb63c9260ea57..4117ac49a8143 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx
@@ -30,7 +30,6 @@ function SearchFiltersToPage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SearchFiltersParticipantsSelector
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTypePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTypePage.tsx
index 448d7d803c5ea..1d377ae626bef 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTypePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTypePage.tsx
@@ -67,7 +67,6 @@ function SearchFiltersTypePage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SelectionList
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWithdrawalTypePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWithdrawalTypePage.tsx
index 88a15a966a0c8..643e08ad3ac46 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWithdrawalTypePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWithdrawalTypePage.tsx
@@ -56,7 +56,6 @@ function SearchFiltersWithdrawalTypePage() {
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                 }}
-                shouldDisplayHelpButton={false}
             />
             <View style={[styles.flex1]}>
                 <SelectionList
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx
index 94e54a4b0cdfe..fdbe43c54ff2f 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx
@@ -106,7 +106,6 @@ function SearchFiltersWorkspacePage() {
                         onBackButtonPress={() => {
                             Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
                         }}
-                        shouldDisplayHelpButton={false}
                     />
                     {shouldShowLoadingIndicator ? (
                         <FullScreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index f1b4eafa745d0..ea46fb82c3014 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -218,10 +218,7 @@ function SearchColumnsPage() {
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom
         >
-            <HeaderWithBackButton
-                title={translate('search.columns')}
-                shouldDisplayHelpButton={false}
-            >
+            <HeaderWithBackButton title={translate('search.columns')}>
                 {!isDefaultState && <TextLink onPress={resetColumns}>{translate('search.resetColumns')}</TextLink>}
             </HeaderWithBackButton>
             <View style={styles.flex1}>

From 0ccdd4cf7320242a8cbf7406ed130df31594b44c Mon Sep 17 00:00:00 2001
From: Ryan Teguh <ryanteguh123@gmail.com>
Date: Mon, 9 Feb 2026 09:47:43 +0800
Subject: [PATCH 03/10] Fix: Hide Concierge help button on RHP

---
 src/components/HeaderWithBackButton/index.tsx              | 2 +-
 src/components/MoneyReportHeader.tsx                       | 1 +
 src/components/Navigation/TopBar.tsx                       | 2 +-
 src/pages/TeachersUnite/SaveTheWorldPage.tsx               | 1 +
 src/pages/home/HomePage.tsx                                | 1 +
 src/pages/settings/AboutPage/AboutPage.tsx                 | 1 +
 src/pages/settings/Preferences/PreferencesPage.tsx         | 1 +
 src/pages/settings/Profile/ProfilePage.tsx                 | 1 +
 src/pages/settings/Rules/ExpenseRulesPage.tsx              | 1 +
 src/pages/settings/Security/SecuritySettingsPage.tsx       | 1 +
 .../settings/Subscription/SubscriptionSettingsPage.tsx     | 1 +
 src/pages/settings/Troubleshoot/TroubleshootPage.tsx       | 1 +
 src/pages/settings/Wallet/WalletPage/index.tsx             | 1 +
 src/pages/workspace/WorkspaceMoreFeaturesPage.tsx          | 1 +
 src/pages/workspace/WorkspacePageWithSections.tsx          | 1 +
 src/pages/workspace/WorkspacesListPage.tsx                 | 7 ++++++-
 src/pages/workspace/accounting/PolicyAccountingPage.tsx    | 1 +
 src/pages/workspace/categories/WorkspaceCategoriesPage.tsx | 1 +
 .../workspace/distanceRates/PolicyDistanceRatesPage.tsx    | 1 +
 .../expensifyCard/WorkspaceExpensifyCardListPage.tsx       | 1 +
 src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx       | 1 +
 .../receiptPartners/WorkspaceReceiptPartnersPage.tsx       | 1 +
 src/pages/workspace/reports/WorkspaceReportsPage.tsx       | 1 +
 src/pages/workspace/tags/WorkspaceTagsPage.tsx             | 1 +
 src/pages/workspace/taxes/WorkspaceTaxesPage.tsx           | 1 +
 src/pages/workspace/travel/PolicyTravelPage.tsx            | 1 +
 26 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/components/HeaderWithBackButton/index.tsx b/src/components/HeaderWithBackButton/index.tsx
index 7466984c27dd1..203b55468223f 100755
--- a/src/components/HeaderWithBackButton/index.tsx
+++ b/src/components/HeaderWithBackButton/index.tsx
@@ -68,7 +68,7 @@ function HeaderWithBackButton({
     shouldOverlayDots = false,
     shouldOverlay = false,
     shouldNavigateToTopMostReport = false,
-    shouldDisplayHelpButton = true,
+    shouldDisplayHelpButton = false,
     shouldDisplaySearchRouter = false,
     progressBarPercentage,
     style,
diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index cf41cc300790e..f3a30128ebb76 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -1759,6 +1759,7 @@ function MoneyReportHeader({
                 report={moneyRequestReport}
                 shouldShowBackButton={shouldShowBackButton}
                 shouldDisplaySearchRouter={shouldDisplaySearchRouter}
+                shouldDisplayHelpButton
                 onBackButtonPress={onBackButtonPress}
                 shouldShowBorderBottom={false}
                 shouldEnableDetailPageNavigation
diff --git a/src/components/Navigation/TopBar.tsx b/src/components/Navigation/TopBar.tsx
index 80db06732353f..4eda3a904bf6c 100644
--- a/src/components/Navigation/TopBar.tsx
+++ b/src/components/Navigation/TopBar.tsx
@@ -27,7 +27,7 @@ type TopBarProps = {
 
 const authTokenTypeSelector = (session: OnyxEntry<Session>) => session && {authTokenType: session.authTokenType};
 
-function TopBar({breadcrumbLabel, shouldDisplaySearch = true, shouldDisplayHelpButton = true, cancelSearch, shouldShowLoadingBar = false, children}: TopBarProps) {
+function TopBar({breadcrumbLabel, shouldDisplaySearch = true, shouldDisplayHelpButton = false, cancelSearch, shouldShowLoadingBar = false, children}: TopBarProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const [session] = useOnyx(ONYXKEYS.SESSION, {selector: authTokenTypeSelector, canBeMissing: true});
diff --git a/src/pages/TeachersUnite/SaveTheWorldPage.tsx b/src/pages/TeachersUnite/SaveTheWorldPage.tsx
index 38c5803b74bd4..848d5364b9977 100644
--- a/src/pages/TeachersUnite/SaveTheWorldPage.tsx
+++ b/src/pages/TeachersUnite/SaveTheWorldPage.tsx
@@ -58,6 +58,7 @@ function SaveTheWorldPage() {
                 title={translate('sidebarScreen.saveTheWorld')}
                 shouldShowBackButton={shouldUseNarrowLayout}
                 shouldDisplaySearchRouter
+                shouldDisplayHelpButton
                 onBackButtonPress={Navigation.popToSidebar}
                 icon={illustrations.TeachersUnite}
                 shouldUseHeadlineHeader
diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index 34e3100326fd6..8c859fea7f46f 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -48,6 +48,7 @@ function HomePage() {
             <TopBar
                 breadcrumbLabel={translate('common.home')}
                 shouldShowLoadingBar={false}
+                shouldDisplayHelpButton
             />
             <ScrollView
                 contentContainerStyle={styles.homePageContentContainer}
diff --git a/src/pages/settings/AboutPage/AboutPage.tsx b/src/pages/settings/AboutPage/AboutPage.tsx
index 624c97088be5f..ba9cb6a2db527 100644
--- a/src/pages/settings/AboutPage/AboutPage.tsx
+++ b/src/pages/settings/AboutPage/AboutPage.tsx
@@ -148,6 +148,7 @@ function AboutPage() {
                 title={translate('initialSettingsPage.about')}
                 shouldShowBackButton={shouldUseNarrowLayout}
                 shouldDisplaySearchRouter
+                shouldDisplayHelpButton
                 onBackButtonPress={Navigation.popToSidebar}
                 icon={illustrations.PalmTree}
                 shouldUseHeadlineHeader
diff --git a/src/pages/settings/Preferences/PreferencesPage.tsx b/src/pages/settings/Preferences/PreferencesPage.tsx
index 9aeb517656278..4a2691772ed66 100755
--- a/src/pages/settings/Preferences/PreferencesPage.tsx
+++ b/src/pages/settings/Preferences/PreferencesPage.tsx
@@ -61,6 +61,7 @@ function PreferencesPage() {
                 shouldUseHeadlineHeader
                 shouldShowBackButton={shouldUseNarrowLayout}
                 shouldDisplaySearchRouter
+                shouldDisplayHelpButton
                 onBackButtonPress={Navigation.popToSidebar}
             />
             <ScrollView contentContainerStyle={styles.pt3}>
diff --git a/src/pages/settings/Profile/ProfilePage.tsx b/src/pages/settings/Profile/ProfilePage.tsx
index 1983955c30d68..b039e1006fba8 100755
--- a/src/pages/settings/Profile/ProfilePage.tsx
+++ b/src/pages/settings/Profile/ProfilePage.tsx
@@ -168,6 +168,7 @@ function ProfilePage() {
                 }}
                 shouldShowBackButton={shouldUseNarrowLayout}
                 shouldDisplaySearchRouter
+                shouldDisplayHelpButton
                 icon={Profile}
                 shouldUseHeadlineHeader
             />
diff --git a/src/pages/settings/Rules/ExpenseRulesPage.tsx b/src/pages/settings/Rules/ExpenseRulesPage.tsx
index ab2d85090957b..15ee3e5dc15b2 100644
--- a/src/pages/settings/Rules/ExpenseRulesPage.tsx
+++ b/src/pages/settings/Rules/ExpenseRulesPage.tsx
@@ -248,6 +248,7 @@ function ExpenseRulesPage() {
                 }}
                 shouldShowBackButton={shouldUseNarrowLayout}
                 shouldUseHeadlineHeader={!selectionModeHeader}
+                shouldDisplayHelpButton
                 title={selectionModeHeader ? translate('common.selectMultiple') : translate('expenseRulesPage.title')}
             >
                 {!shouldUseNarrowLayout && headerButton}
diff --git a/src/pages/settings/Security/SecuritySettingsPage.tsx b/src/pages/settings/Security/SecuritySettingsPage.tsx
index cb5059d4c1c23..4687c82d0d140 100644
--- a/src/pages/settings/Security/SecuritySettingsPage.tsx
+++ b/src/pages/settings/Security/SecuritySettingsPage.tsx
@@ -371,6 +371,7 @@ function SecuritySettingsPage() {
                         icon={illustrations.LockClosed}
                         shouldUseHeadlineHeader
                         shouldDisplaySearchRouter
+                        shouldDisplayHelpButton
                     />
                     <ScrollView contentContainerStyle={styles.pt3}>
                         <View style={[styles.flex1, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
diff --git a/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
index cfdf294e41da9..f275d65200f00 100644
--- a/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
+++ b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
@@ -64,6 +64,7 @@ function SubscriptionSettingsPage({route}: SubscriptionSettingsPageProps) {
                 }}
                 shouldShowBackButton={shouldUseNarrowLayout}
                 shouldDisplaySearchRouter
+                shouldDisplayHelpButton
                 icon={illustrations.CreditCardsNew}
                 shouldUseHeadlineHeader
             />
diff --git a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
index 8d55ddd4ada47..38a5f3553d193 100644
--- a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
+++ b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
@@ -180,6 +180,7 @@ function TroubleshootPage() {
                 title={translate('initialSettingsPage.aboutPage.troubleshoot')}
                 shouldShowBackButton={shouldUseNarrowLayout}
                 shouldDisplaySearchRouter
+                shouldDisplayHelpButton
                 onBackButtonPress={Navigation.popToSidebar}
                 icon={illustrations.Lightbulb}
                 shouldUseHeadlineHeader
diff --git a/src/pages/settings/Wallet/WalletPage/index.tsx b/src/pages/settings/Wallet/WalletPage/index.tsx
index 1ecf1008e36e0..3c531dbc09fc1 100644
--- a/src/pages/settings/Wallet/WalletPage/index.tsx
+++ b/src/pages/settings/Wallet/WalletPage/index.tsx
@@ -327,6 +327,7 @@ function WalletPage() {
             shouldUseHeadlineHeader
             shouldShowBackButton={shouldUseNarrowLayout}
             shouldDisplaySearchRouter
+            shouldDisplayHelpButton
             onBackButtonPress={Navigation.popToSidebar}
         />
     );
diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
index fc2c308b5059b..66c5e94345fe0 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
@@ -630,6 +630,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
                     shouldUseHeadlineHeader
                     title={translate('workspace.common.moreFeatures')}
                     shouldShowBackButton={shouldUseNarrowLayout}
+                    shouldDisplayHelpButton
                     onBackButtonPress={() => Navigation.goBack()}
                 />
 
diff --git a/src/pages/workspace/WorkspacePageWithSections.tsx b/src/pages/workspace/WorkspacePageWithSections.tsx
index 949550ce8f373..4b7ada2699acc 100644
--- a/src/pages/workspace/WorkspacePageWithSections.tsx
+++ b/src/pages/workspace/WorkspacePageWithSections.tsx
@@ -225,6 +225,7 @@ function WorkspacePageWithSections({
                     shouldShowThreeDotsButton={shouldShowThreeDotsButton}
                     threeDotsMenuItems={threeDotsMenuItems}
                     shouldUseHeadlineHeader={shouldUseHeadlineHeader}
+                    shouldDisplayHelpButton
                 >
                     {headerContent}
                 </HeaderWithBackButton>
diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index d13060cacba11..0050a58d149ee 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -824,7 +824,12 @@ function WorkspacesListPage() {
             }
         >
             <View style={styles.flex1}>
-                <TopBar breadcrumbLabel={translate('common.workspaces')}>{!shouldUseNarrowLayout && <View style={styles.pr2}>{headerButton}</View>}</TopBar>
+                <TopBar
+                    breadcrumbLabel={translate('common.workspaces')}
+                    shouldDisplayHelpButton
+                >
+                    {!shouldUseNarrowLayout && <View style={styles.pr2}>{headerButton}</View>}
+                </TopBar>
                 {shouldUseNarrowLayout && <View style={[styles.ph5, styles.pt2]}>{headerButton}</View>}
                 {shouldShowLoadingIndicator ? (
                     <View style={[styles.flex1]}>
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index dbb0da02177be..22f3d0ca987bf 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -557,6 +557,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
                     shouldShowBackButton={shouldUseNarrowLayout}
                     icon={illustrations.Accounting}
                     shouldUseHeadlineHeader
+                    shouldDisplayHelpButton
                     onBackButtonPress={Navigation.popToSidebar}
                 />
                 <ScrollView
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
index f15aa922d4b07..b1ed413fbe574 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
@@ -643,6 +643,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
                     title={selectionModeHeader ? translate('common.selectMultiple') : translate('workspace.common.categories')}
                     icon={!selectionModeHeader ? illustrations.FolderOpen : undefined}
                     shouldUseHeadlineHeader={!selectionModeHeader}
+                    shouldDisplayHelpButton
                     onBackButtonPress={() => {
                         if (isMobileSelectionModeEnabled) {
                             setSelectedCategories([]);
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
index 24aac8ba48cd3..50186f06436c8 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
@@ -476,6 +476,7 @@ function PolicyDistanceRatesPage({
                     shouldUseHeadlineHeader={!selectionModeHeader}
                     title={translate(!selectionModeHeader ? 'workspace.common.distanceRates' : 'common.selectMultiple')}
                     shouldShowBackButton={shouldUseNarrowLayout}
+                    shouldDisplayHelpButton
                     onBackButtonPress={() => {
                         if (isMobileSelectionModeEnabled) {
                             setSelectedDistanceRates([]);
diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx
index fa75015552f4a..4cf37d6fa04a8 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx
@@ -228,6 +228,7 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp
                 shouldUseHeadlineHeader
                 title={translate('workspace.common.expensifyCard')}
                 shouldShowBackButton={shouldUseNarrowLayout}
+                shouldDisplayHelpButton
                 onBackButtonPress={handleBackButtonPress}
             >
                 {!shouldShowSelector && !shouldUseNarrowLayout && isBankAccountVerified && getHeaderButtons()}
diff --git a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
index e72e00a8393e9..f5f31adbb8988 100644
--- a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
+++ b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
@@ -423,6 +423,7 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) {
                     title={translate(selectionModeHeader ? 'common.selectMultiple' : 'common.perDiem')}
                     icon={!selectionModeHeader ? illustrations.PerDiem : undefined}
                     shouldUseHeadlineHeader={!selectionModeHeader}
+                    shouldDisplayHelpButton
                     onBackButtonPress={() => {
                         if (isMobileSelectionModeEnabled) {
                             setSelectedPerDiem([]);
diff --git a/src/pages/workspace/receiptPartners/WorkspaceReceiptPartnersPage.tsx b/src/pages/workspace/receiptPartners/WorkspaceReceiptPartnersPage.tsx
index 15a82f8d39982..3c58ff9cb81ea 100644
--- a/src/pages/workspace/receiptPartners/WorkspaceReceiptPartnersPage.tsx
+++ b/src/pages/workspace/receiptPartners/WorkspaceReceiptPartnersPage.tsx
@@ -271,6 +271,7 @@ function WorkspaceReceiptPartnersPage({route}: WorkspaceReceiptPartnersPageProps
                         shouldShowBackButton={shouldUseNarrowLayout}
                         icon={ReceiptPartners}
                         shouldUseHeadlineHeader
+                        shouldDisplayHelpButton
                         onBackButtonPress={Navigation.popToSidebar}
                     />
                     <ScrollView
diff --git a/src/pages/workspace/reports/WorkspaceReportsPage.tsx b/src/pages/workspace/reports/WorkspaceReportsPage.tsx
index a4a2a3d7bacff..3eba89a9977d7 100644
--- a/src/pages/workspace/reports/WorkspaceReportsPage.tsx
+++ b/src/pages/workspace/reports/WorkspaceReportsPage.tsx
@@ -186,6 +186,7 @@ function WorkspaceReportFieldsPage({
                     title={translate('common.reports')}
                     shouldUseHeadlineHeader
                     shouldShowBackButton={shouldUseNarrowLayout}
+                    shouldDisplayHelpButton
                     onBackButtonPress={Navigation.popToSidebar}
                 />
                 {isLoading && (
diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index 957340630af4c..2a3e752d48303 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -750,6 +750,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
                         shouldUseHeadlineHeader={!selectionModeHeader}
                         title={translate(selectionModeHeader ? 'common.selectMultiple' : 'workspace.common.tags')}
                         shouldShowBackButton={shouldUseNarrowLayout}
+                        shouldDisplayHelpButton
                         onBackButtonPress={() => {
                             if (isMobileSelectionModeEnabled) {
                                 setSelectedTags([]);
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
index 1c7f7907ec9c4..f9ddadc0a6a7a 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
@@ -400,6 +400,7 @@ function WorkspaceTaxesPage({
                     shouldUseHeadlineHeader={!selectionModeHeader}
                     title={translate(selectionModeHeader ? 'common.selectMultiple' : 'workspace.common.taxes')}
                     shouldShowBackButton={shouldUseNarrowLayout}
+                    shouldDisplayHelpButton
                     onBackButtonPress={() => {
                         if (isMobileSelectionModeEnabled) {
                             setSelectedTaxesIDs([]);
diff --git a/src/pages/workspace/travel/PolicyTravelPage.tsx b/src/pages/workspace/travel/PolicyTravelPage.tsx
index 50f9e8260b053..66147bfb32762 100644
--- a/src/pages/workspace/travel/PolicyTravelPage.tsx
+++ b/src/pages/workspace/travel/PolicyTravelPage.tsx
@@ -104,6 +104,7 @@ function WorkspaceTravelPage({
                     title={translate('workspace.moreFeatures.travel.title')}
                     shouldUseHeadlineHeader
                     shouldShowBackButton={shouldUseNarrowLayout}
+                    shouldDisplayHelpButton
                     onBackButtonPress={Navigation.popToSidebar}
                 />
                 <ScrollViewWithContext addBottomSafeAreaPadding>

From 5bf080b84806c5450dc920da292f864a074ad33a Mon Sep 17 00:00:00 2001
From: Ryan Teguh <ryanteguh123@gmail.com>
Date: Mon, 9 Feb 2026 10:55:50 +0800
Subject: [PATCH 04/10] Hide help button on submit expense confirmation RHP

---
 src/pages/iou/request/step/IOURequestStepConfirmation.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index dd9f72ad55637..37e50236d7425 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -1376,7 +1376,6 @@ function IOURequestStepConfirmation({
                         title={headerTitle}
                         subtitle={hasMultipleTransactions ? `${currentTransactionIndex + 1} ${translate('common.of')} ${transactions.length}` : undefined}
                         onBackButtonPress={navigateBack}
-                        shouldDisplayHelpButton={!hasMultipleTransactions}
                     >
                         {hasMultipleTransactions ? (
                             <PrevNextButtons

From 8f3e19fcafeceda910af9e3c54b427a0756ef1ed Mon Sep 17 00:00:00 2001
From: Ryan Teguh <ryanteguh123@gmail.com>
Date: Mon, 9 Feb 2026 11:08:10 +0800
Subject: [PATCH 05/10] ESLint fix

---
 src/CONST/index.ts                            | 2 ++
 src/components/HeaderWithBackButton/index.tsx | 1 +
 src/components/Navigation/TopBar.tsx          | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 7f930af355a1d..ca197863c6601 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -8067,6 +8067,7 @@ const CONST = {
             DOWNLOAD_BUTTON: 'Header-DownloadButton',
             CLOSE_BUTTON: 'Header-CloseButton',
             MORE_BUTTON: 'Header-MoreButton',
+            ROTATE_BUTTON: 'Header-RotateButton',
         },
         VIDEO_PLAYER: {
             PLAY_PAUSE_BUTTON: 'VideoPlayer-PlayPauseButton',
@@ -8097,6 +8098,7 @@ const CONST = {
             USER_SELECTION_CHECKBOX: 'Search-UserSelectionCheckbox',
             TRANSACTION_GROUP_LIST_ITEM: 'Search-TransactionGroupListItem',
             SELECT_ALL_BUTTON: 'Search-SelectAllButton',
+            CANCEL_BUTTON: 'Search-CancelButton',
         },
         REPORT: {
             FLOATING_MESSAGE_COUNTER: 'Report-FloatingMessageCounter',
diff --git a/src/components/HeaderWithBackButton/index.tsx b/src/components/HeaderWithBackButton/index.tsx
index 203b55468223f..e6885e504d616 100755
--- a/src/components/HeaderWithBackButton/index.tsx
+++ b/src/components/HeaderWithBackButton/index.tsx
@@ -290,6 +290,7 @@ function HeaderWithBackButton({
                                         style={[styles.touchableButtonImage]}
                                         role="button"
                                         accessibilityLabel={translate('common.rotate')}
+                                        sentryLabel={CONST.SENTRY_LABEL.HEADER.ROTATE_BUTTON}
                                     >
                                         <Icon
                                             src={icons.Rotate}
diff --git a/src/components/Navigation/TopBar.tsx b/src/components/Navigation/TopBar.tsx
index 4eda3a904bf6c..a750f4c1ccce4 100644
--- a/src/components/Navigation/TopBar.tsx
+++ b/src/components/Navigation/TopBar.tsx
@@ -13,6 +13,7 @@ import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 import SignInButton from '@pages/inbox/sidebar/SignInButton';
 import {isAnonymousUser as isAnonymousUserUtil} from '@userActions/Session';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Session} from '@src/types/onyx';
 
@@ -65,6 +66,7 @@ function TopBar({breadcrumbLabel, shouldDisplaySearch = true, shouldDisplayHelpB
                         onPress={() => {
                             cancelSearch();
                         }}
+                        sentryLabel={CONST.SENTRY_LABEL.SEARCH.CANCEL_BUTTON}
                     >
                         <Text style={[styles.textBlue]}>{translate('common.cancel')}</Text>
                     </PressableWithoutFeedback>

From 246d593df5f4a93bab48ea10d86239073c005951 Mon Sep 17 00:00:00 2001
From: Ryan Teguh <ryanteguh123@gmail.com>
Date: Fri, 20 Feb 2026 22:34:53 +0800
Subject: [PATCH 06/10] Prettier

---
 src/components/Navigation/TopBar.tsx | 1 -
 src/pages/home/HomePage.tsx          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/Navigation/TopBar.tsx b/src/components/Navigation/TopBar.tsx
index e01a689ef7f16..9a8aee0c6a58a 100644
--- a/src/components/Navigation/TopBar.tsx
+++ b/src/components/Navigation/TopBar.tsx
@@ -68,7 +68,6 @@ function TopBar({breadcrumbLabel, shouldDisplaySearch = true, shouldDisplayHelpB
                         onPress={() => {
                             cancelSearch();
                         }}
-                        sentryLabel={CONST.SENTRY_LABEL.SEARCH.CANCEL_BUTTON}
                     >
                         <Text style={[styles.textBlue]}>{translate('common.cancel')}</Text>
                     </PressableWithoutFeedback>
diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index 62d64dedb489b..5b7f395e8bb13 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -59,7 +59,7 @@ function HomePage() {
                     breadcrumbLabel={translate('common.home')}
                     shouldShowLoadingBar={false}
                     shouldDisplayHelpButton
-            />
+                />
                 <ScrollView
                     contentContainerStyle={styles.homePageContentContainer}
                     addBottomSafeAreaPadding

From aef41ef15e2efa704d9d744e99899d52c9a3ea1e Mon Sep 17 00:00:00 2001
From: Ryan Teguh <ryanteguh123@gmail.com>
Date: Fri, 20 Feb 2026 23:06:10 +0800
Subject: [PATCH 07/10] Hide help button on SearchPageNarrow

---
 src/pages/Search/SearchPageNarrow.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Search/SearchPageNarrow.tsx b/src/pages/Search/SearchPageNarrow.tsx
index 94ecdfa219e83..90da8cbc08d25 100644
--- a/src/pages/Search/SearchPageNarrow.tsx
+++ b/src/pages/Search/SearchPageNarrow.tsx
@@ -197,6 +197,7 @@ function SearchPageNarrow({
                                 shouldShowLoadingBar={shouldShowLoadingState}
                                 breadcrumbLabel={translate('common.reports')}
                                 shouldDisplaySearch={false}
+                                shouldDisplayHelpButton
                                 cancelSearch={shouldDisplayCancelSearch ? cancelSearchCallback : undefined}
                             />
                         </View>

From e82f4880c979213af1b4b8c88425c1bf92bc06ce Mon Sep 17 00:00:00 2001
From: Ryan Teguh <ryanteguh123@gmail.com>
Date: Sat, 21 Feb 2026 00:14:20 +0800
Subject: [PATCH 08/10] Hide help button on MoneyReportHeader

---
 src/components/MoneyReportHeader.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 2e194d68296af..019a049b5c25f 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -1795,7 +1795,7 @@ function MoneyReportHeader({
                 report={moneyRequestReport}
                 shouldShowBackButton={shouldShowBackButton}
                 shouldDisplaySearchRouter={shouldDisplaySearchRouter}
-                shouldDisplayHelpButton
+                shouldDisplayHelpButton={!(isReportInRHP && shouldUseNarrowLayout)}
                 onBackButtonPress={onBackButtonPress}
                 shouldShowBorderBottom={false}
                 shouldEnableDetailPageNavigation

From de045180210728668d877d8cdf139357a6a291f9 Mon Sep 17 00:00:00 2001
From: Ryan Teguh <ryanteguh123@gmail.com>
Date: Mon, 23 Feb 2026 22:54:57 +0800
Subject: [PATCH 09/10] Add TopBar to InitialSettingsPage

---
 src/pages/settings/InitialSettingsPage.tsx | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 4a9759d056305..6fb7d8ad3da2c 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -13,6 +13,7 @@ import MenuItem from '@components/MenuItem';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
 import NavigationTabBar from '@components/Navigation/NavigationTabBar';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
+import TopBar from '@components/Navigation/TopBar';
 import {PressableWithFeedback} from '@components/Pressable';
 import ScreenWrapper from '@components/ScreenWrapper';
 import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
@@ -532,6 +533,13 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
             shouldEnableKeyboardAvoidingView={false}
         >
             {shouldDisplayLHB && <NavigationTabBar selectedTab={NAVIGATION_TABS.SETTINGS} />}
+            {shouldUseNarrowLayout && (
+                <TopBar
+                    breadcrumbLabel={translate('initialSettingsPage.account')}
+                    shouldDisplaySearch
+                    shouldDisplayHelpButton
+                />
+            )}
             {headerContent}
             <ScrollView
                 ref={scrollViewRef}

From 25b0315a06d48d83769b18959188ae7d5e578abe Mon Sep 17 00:00:00 2001
From: Ryan Teguh <ryanteguh123@gmail.com>
Date: Tue, 24 Feb 2026 20:42:07 +0800
Subject: [PATCH 10/10] Swap SearchButton and SidePanelButton position

---
 src/components/HeaderWithBackButton/index.tsx | 2 +-
 src/components/Navigation/TopBar.tsx          | 2 +-
 src/pages/inbox/HeaderView.tsx                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/HeaderWithBackButton/index.tsx b/src/components/HeaderWithBackButton/index.tsx
index 92627a3399dc7..7e1de49ba2065 100755
--- a/src/components/HeaderWithBackButton/index.tsx
+++ b/src/components/HeaderWithBackButton/index.tsx
@@ -344,8 +344,8 @@ function HeaderWithBackButton({
                         </Tooltip>
                     )}
                 </View>
-                {shouldDisplayHelpButton && <SidePanelButton />}
                 {shouldDisplaySearchRouter && <SearchButton />}
+                {shouldDisplayHelpButton && <SidePanelButton />}
             </View>
         </View>
     );
diff --git a/src/components/Navigation/TopBar.tsx b/src/components/Navigation/TopBar.tsx
index 0e9e0c1805449..6783188e263f0 100644
--- a/src/components/Navigation/TopBar.tsx
+++ b/src/components/Navigation/TopBar.tsx
@@ -72,8 +72,8 @@ function TopBar({breadcrumbLabel, shouldDisplaySearch = true, shouldDisplayHelpB
                         <Text style={[styles.textBlue]}>{translate('common.cancel')}</Text>
                     </PressableWithoutFeedback>
                 )}
-                {shouldDisplayHelpButton && <SidePanelButton />}
                 {displaySearch && <SearchButton />}
+                {shouldDisplayHelpButton && <SidePanelButton />}
             </View>
             <LoadingBar shouldShow={!isWideRHPVisible && (shouldShowLoadingBarForReports || shouldShowLoadingBar)} />
         </View>
diff --git a/src/pages/inbox/HeaderView.tsx b/src/pages/inbox/HeaderView.tsx
index 95b651ea38c21..2c4b6bfbe3c6c 100644
--- a/src/pages/inbox/HeaderView.tsx
+++ b/src/pages/inbox/HeaderView.tsx
@@ -391,8 +391,8 @@ function HeaderView({report, parentReportAction, onNavigationMenuButtonClicked,
                                     {!shouldUseNarrowLayout && isOpenTaskReport(report, parentReportAction) && <TaskHeaderActionButton report={report} />}
                                     {!isParentReportLoading && canJoin && !shouldUseNarrowLayout && joinButton}
                                 </View>
-                                {!isInSidePanel && <SidePanelButton style={styles.ml2} />}
-                                {shouldDisplaySearchRouter && <SearchButton />}
+                                {shouldDisplaySearchRouter && <SearchButton style={styles.ml2} />}
+                                {!isInSidePanel && <SidePanelButton />}
                             </View>
                         </View>
                     )}