From 20270a8c23c15ca23fca9d1bfd179ab8969f9026 Mon Sep 17 00:00:00 2001 From: Jakub Szymczak Date: Tue, 30 Jul 2024 10:30:06 +0200 Subject: [PATCH 1/7] add merchant, description and reportID to filters form --- src/libs/SearchUtils.ts | 12 ++++++++++++ src/types/form/SearchAdvancedFiltersForm.ts | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts index 4c3229760d716..e4c46c4614a2d 100644 --- a/src/libs/SearchUtils.ts +++ b/src/libs/SearchUtils.ts @@ -390,6 +390,18 @@ function buildQueryStringFromFilters(filterValues: Partial; @@ -17,6 +20,9 @@ type SearchAdvancedFiltersForm = Form< [INPUT_IDS.DATE_AFTER]: string; [INPUT_IDS.DATE_BEFORE]: string; [INPUT_IDS.STATUS]: string; + [INPUT_IDS.MERCHANT]: string; + [INPUT_IDS.DESCRIPTION]: string; + [INPUT_IDS.REPORT_ID]: string; } >; From a8038275f6fc722fcbd5d5ea19268aaffec9dd8f Mon Sep 17 00:00:00 2001 From: Jakub Szymczak Date: Tue, 30 Jul 2024 10:30:54 +0200 Subject: [PATCH 2/7] add description, merchant and reportID filter pages --- src/ROUTES.ts | 6 ++ src/SCREENS.ts | 3 + src/languages/en.ts | 1 + .../ModalStackNavigators/index.tsx | 3 + src/libs/Navigation/linkingConfig/config.ts | 3 + src/pages/Search/AdvancedSearchFilters.tsx | 15 ++++ .../Search/SearchFiltersDescriptionPage.tsx | 70 +++++++++++++++++++ .../Search/SearchFiltersMerchantPage.tsx | 70 +++++++++++++++++++ .../Search/SearchFiltersReportIDPage.tsx | 69 ++++++++++++++++++ 9 files changed, 240 insertions(+) create mode 100644 src/pages/Search/SearchFiltersDescriptionPage.tsx create mode 100644 src/pages/Search/SearchFiltersMerchantPage.tsx create mode 100644 src/pages/Search/SearchFiltersReportIDPage.tsx diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 2dfbef1cc718b..76d53dd1b778c 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -49,6 +49,12 @@ const ROUTES = { SEARCH_ADVANCED_FILTERS_STATUS: 'search/filters/status', + SEARCH_ADVANCED_FILTERS_MERCHANT: 'search/filters/merchant', + + SEARCH_ADVANCED_FILTERS_DESCRIPTION: 'search/filters/description', + + SEARCH_ADVANCED_FILTERS_REPORT_ID: 'search/filters/reportID', + SEARCH_REPORT: { route: 'search/view/:reportID', getRoute: (reportID: string) => `search/view/${reportID}` as const, diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 32825418d7fab..e8f6e38a859d3 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -34,6 +34,9 @@ const SCREENS = { ADVANCED_FILTERS_DATE_RHP: 'Search_Advanced_Filters_Date_RHP', ADVANCED_FILTERS_TYPE_RHP: 'Search_Advanced_Filters_Type_RHP', ADVANCED_FILTERS_STATUS_RHP: 'Search_Advanced_Filters_Status_RHP', + ADVANCED_FILTERS_DESCRIPTION_RHP: 'Search_Advanced_Filters_Description_RHP', + ADVANCED_FILTERS_MERCHANT_RHP: 'Search_Advanced_Filters_Merchant_RHP', + ADVANCED_FILTERS_REPORT_ID_RHP: 'Search_Advanced_Filters_ReportID_RHP', TRANSACTION_HOLD_REASON_RHP: 'Search_Transaction_Hold_Reason_RHP', BOTTOM_TAB: 'Search_Bottom_Tab', }, diff --git a/src/languages/en.ts b/src/languages/en.ts index 5fed12a55f9ba..1bfd16490a265 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -368,6 +368,7 @@ export default { value: 'Value', downloadFailedTitle: 'Download failed', downloadFailedDescription: "Your download couldn't be completed. Please try again later.", + reportID: 'Report ID', }, location: { useCurrent: 'Use current location', diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index f3fc8accb83fe..17e0d77d9199e 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -514,6 +514,9 @@ const SearchAdvancedFiltersModalStackNavigator = createModalStackNavigator require('../../../../pages/Search/SearchFiltersDatePage').default, [SCREENS.SEARCH.ADVANCED_FILTERS_TYPE_RHP]: () => require('../../../../pages/Search/SearchFiltersTypePage').default, [SCREENS.SEARCH.ADVANCED_FILTERS_STATUS_RHP]: () => require('../../../../pages/Search/SearchFiltersStatusPage').default, + [SCREENS.SEARCH.ADVANCED_FILTERS_DESCRIPTION_RHP]: () => require('../../../../pages/Search/SearchFiltersDescriptionPage').default, + [SCREENS.SEARCH.ADVANCED_FILTERS_MERCHANT_RHP]: () => require('../../../../pages/Search/SearchFiltersMerchantPage').default, + [SCREENS.SEARCH.ADVANCED_FILTERS_REPORT_ID_RHP]: () => require('../../../../pages/Search/SearchFiltersReportIDPage').default, }); const RestrictedActionModalStackNavigator = createModalStackNavigator({ diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts index e4c35643f9500..4106b5ce6d01b 100644 --- a/src/libs/Navigation/linkingConfig/config.ts +++ b/src/libs/Navigation/linkingConfig/config.ts @@ -1010,6 +1010,9 @@ const config: LinkingOptions['config'] = { [SCREENS.SEARCH.ADVANCED_FILTERS_DATE_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_DATE, [SCREENS.SEARCH.ADVANCED_FILTERS_TYPE_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_TYPE, [SCREENS.SEARCH.ADVANCED_FILTERS_STATUS_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_STATUS, + [SCREENS.SEARCH.ADVANCED_FILTERS_MERCHANT_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_MERCHANT, + [SCREENS.SEARCH.ADVANCED_FILTERS_DESCRIPTION_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_DESCRIPTION, + [SCREENS.SEARCH.ADVANCED_FILTERS_REPORT_ID_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_REPORT_ID, }, }, [SCREENS.RIGHT_MODAL.RESTRICTED_ACTION]: { diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx index eff58f140aa18..dcb1b1d70a39e 100644 --- a/src/pages/Search/AdvancedSearchFilters.tsx +++ b/src/pages/Search/AdvancedSearchFilters.tsx @@ -68,6 +68,21 @@ function AdvancedSearchFilters() { description: 'common.date' as const, route: ROUTES.SEARCH_ADVANCED_FILTERS_DATE, }, + { + title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, translate), + description: 'common.merchant' as const, + route: ROUTES.SEARCH_ADVANCED_FILTERS_MERCHANT, + }, + { + title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION, translate), + description: 'common.description' as const, + route: ROUTES.SEARCH_ADVANCED_FILTERS_DESCRIPTION, + }, + { + title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_ID, translate), + description: 'common.reportID' as const, + route: ROUTES.SEARCH_ADVANCED_FILTERS_REPORT_ID, + }, ], [searchAdvancedFilters, translate], ); diff --git a/src/pages/Search/SearchFiltersDescriptionPage.tsx b/src/pages/Search/SearchFiltersDescriptionPage.tsx new file mode 100644 index 0000000000000..bcaf183664531 --- /dev/null +++ b/src/pages/Search/SearchFiltersDescriptionPage.tsx @@ -0,0 +1,70 @@ +import React from 'react'; +import {View} from 'react-native'; +import {useOnyx} from 'react-native-onyx'; +import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; +import FormProvider from '@components/Form/FormProvider'; +import InputWrapper from '@components/Form/InputWrapper'; +import type {FormOnyxValues} from '@components/Form/types'; +import HeaderWithBackButton from '@components/HeaderWithBackButton'; +import ScreenWrapper from '@components/ScreenWrapper'; +import TextInput from '@components/TextInput'; +import useAutoFocusInput from '@hooks/useAutoFocusInput'; +import useLocalize from '@hooks/useLocalize'; +import useThemeStyles from '@hooks/useThemeStyles'; +import {updateAdvancedFilters} from '@libs/actions/Search'; +import Navigation from '@libs/Navigation/Navigation'; +import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; +import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/SearchAdvancedFiltersForm'; + +function SearchFiltersDescriptionPage() { + const styles = useThemeStyles(); + const {translate} = useLocalize(); + + const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM); + const description = searchAdvancedFiltersForm?.[INPUT_IDS.DESCRIPTION]; + const {inputCallbackRef} = useAutoFocusInput(); + + const updateDateFilter = (values: FormOnyxValues) => { + updateAdvancedFilters(values); + Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS); + }; + + return ( + + + + + + + + + + + ); +} + +SearchFiltersDescriptionPage.displayName = 'SearchFiltersMerchantPage'; + +export default SearchFiltersDescriptionPage; diff --git a/src/pages/Search/SearchFiltersMerchantPage.tsx b/src/pages/Search/SearchFiltersMerchantPage.tsx new file mode 100644 index 0000000000000..72d621d4458a7 --- /dev/null +++ b/src/pages/Search/SearchFiltersMerchantPage.tsx @@ -0,0 +1,70 @@ +import React from 'react'; +import {View} from 'react-native'; +import {useOnyx} from 'react-native-onyx'; +import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; +import FormProvider from '@components/Form/FormProvider'; +import InputWrapper from '@components/Form/InputWrapper'; +import type {FormOnyxValues} from '@components/Form/types'; +import HeaderWithBackButton from '@components/HeaderWithBackButton'; +import ScreenWrapper from '@components/ScreenWrapper'; +import TextInput from '@components/TextInput'; +import useAutoFocusInput from '@hooks/useAutoFocusInput'; +import useLocalize from '@hooks/useLocalize'; +import useThemeStyles from '@hooks/useThemeStyles'; +import {updateAdvancedFilters} from '@libs/actions/Search'; +import Navigation from '@libs/Navigation/Navigation'; +import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; +import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/SearchAdvancedFiltersForm'; + +function SearchFiltersMerchantPage() { + const styles = useThemeStyles(); + const {translate} = useLocalize(); + + const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM); + const merchant = searchAdvancedFiltersForm?.[INPUT_IDS.MERCHANT]; + const {inputCallbackRef} = useAutoFocusInput(); + + const updateDateFilter = (values: FormOnyxValues) => { + updateAdvancedFilters(values); + Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS); + }; + + return ( + + + + + + + + + + + ); +} + +SearchFiltersMerchantPage.displayName = 'SearchFiltersMerchantPage'; + +export default SearchFiltersMerchantPage; diff --git a/src/pages/Search/SearchFiltersReportIDPage.tsx b/src/pages/Search/SearchFiltersReportIDPage.tsx new file mode 100644 index 0000000000000..2872ca8feb845 --- /dev/null +++ b/src/pages/Search/SearchFiltersReportIDPage.tsx @@ -0,0 +1,69 @@ +import React from 'react'; +import {View} from 'react-native'; +import {useOnyx} from 'react-native-onyx'; +import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; +import FormProvider from '@components/Form/FormProvider'; +import InputWrapper from '@components/Form/InputWrapper'; +import type {FormOnyxValues} from '@components/Form/types'; +import HeaderWithBackButton from '@components/HeaderWithBackButton'; +import ScreenWrapper from '@components/ScreenWrapper'; +import TextInput from '@components/TextInput'; +import useAutoFocusInput from '@hooks/useAutoFocusInput'; +import useLocalize from '@hooks/useLocalize'; +import useThemeStyles from '@hooks/useThemeStyles'; +import {updateAdvancedFilters} from '@libs/actions/Search'; +import Navigation from '@libs/Navigation/Navigation'; +import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; +import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/SearchAdvancedFiltersForm'; + +function SearchFiltersReportIDPage() { + const styles = useThemeStyles(); + const {translate} = useLocalize(); + + const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM); + const reportID = searchAdvancedFiltersForm?.[INPUT_IDS.REPORT_ID]; + const {inputCallbackRef} = useAutoFocusInput(); + + const updateDateFilter = (values: FormOnyxValues) => { + updateAdvancedFilters(values); + Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS); + }; + + return ( + + + + + + + + + + + ); +} + +SearchFiltersReportIDPage.displayName = 'SearchFiltersMerchantPage'; + +export default SearchFiltersReportIDPage; From 08381cd7f037aa2926c36a2f452fca48f080814b Mon Sep 17 00:00:00 2001 From: Jakub Szymczak Date: Tue, 30 Jul 2024 10:31:04 +0200 Subject: [PATCH 3/7] add spanish translation --- src/languages/es.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/languages/es.ts b/src/languages/es.ts index 8631687a469b2..76359081bfd55 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -358,6 +358,7 @@ export default { value: 'Valor', downloadFailedTitle: 'Error en la descarga', downloadFailedDescription: 'No se pudo completar la descarga. Por favor, inténtalo más tarde.', + reportID: 'ID informe', }, connectionComplete: { title: 'Conexión completa', From 914688fb73a91d95cf71e0012ddbd64b04bc105a Mon Sep 17 00:00:00 2001 From: Jakub Szymczak Date: Tue, 30 Jul 2024 10:37:57 +0200 Subject: [PATCH 4/7] fix typos --- src/pages/Search/SearchFiltersDescriptionPage.tsx | 4 ++-- src/pages/Search/SearchFiltersMerchantPage.tsx | 4 ++-- src/pages/Search/SearchFiltersReportIDPage.tsx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/Search/SearchFiltersDescriptionPage.tsx b/src/pages/Search/SearchFiltersDescriptionPage.tsx index bcaf183664531..7946bb533b3e0 100644 --- a/src/pages/Search/SearchFiltersDescriptionPage.tsx +++ b/src/pages/Search/SearchFiltersDescriptionPage.tsx @@ -26,7 +26,7 @@ function SearchFiltersDescriptionPage() { const description = searchAdvancedFiltersForm?.[INPUT_IDS.DESCRIPTION]; const {inputCallbackRef} = useAutoFocusInput(); - const updateDateFilter = (values: FormOnyxValues) => { + const updateDescriptionFilter = (values: FormOnyxValues) => { updateAdvancedFilters(values); Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS); }; @@ -42,7 +42,7 @@ function SearchFiltersDescriptionPage() { diff --git a/src/pages/Search/SearchFiltersMerchantPage.tsx b/src/pages/Search/SearchFiltersMerchantPage.tsx index 72d621d4458a7..45884c3483a6d 100644 --- a/src/pages/Search/SearchFiltersMerchantPage.tsx +++ b/src/pages/Search/SearchFiltersMerchantPage.tsx @@ -26,7 +26,7 @@ function SearchFiltersMerchantPage() { const merchant = searchAdvancedFiltersForm?.[INPUT_IDS.MERCHANT]; const {inputCallbackRef} = useAutoFocusInput(); - const updateDateFilter = (values: FormOnyxValues) => { + const updateMerchantFilter = (values: FormOnyxValues) => { updateAdvancedFilters(values); Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS); }; @@ -42,7 +42,7 @@ function SearchFiltersMerchantPage() { diff --git a/src/pages/Search/SearchFiltersReportIDPage.tsx b/src/pages/Search/SearchFiltersReportIDPage.tsx index 2872ca8feb845..1bd947620b8db 100644 --- a/src/pages/Search/SearchFiltersReportIDPage.tsx +++ b/src/pages/Search/SearchFiltersReportIDPage.tsx @@ -26,7 +26,7 @@ function SearchFiltersReportIDPage() { const reportID = searchAdvancedFiltersForm?.[INPUT_IDS.REPORT_ID]; const {inputCallbackRef} = useAutoFocusInput(); - const updateDateFilter = (values: FormOnyxValues) => { + const updateReportIDFilter = (values: FormOnyxValues) => { updateAdvancedFilters(values); Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS); }; @@ -42,7 +42,7 @@ function SearchFiltersReportIDPage() { From cd3187e3872b3fce8e709176594fa16321f007fa Mon Sep 17 00:00:00 2001 From: Jakub Szymczak Date: Tue, 30 Jul 2024 11:01:55 +0200 Subject: [PATCH 5/7] fix translations --- src/pages/Search/SearchFiltersDescriptionPage.tsx | 4 ++-- src/pages/Search/SearchFiltersMerchantPage.tsx | 2 +- src/pages/Search/SearchFiltersReportIDPage.tsx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/Search/SearchFiltersDescriptionPage.tsx b/src/pages/Search/SearchFiltersDescriptionPage.tsx index 7946bb533b3e0..186b1331ab5ff 100644 --- a/src/pages/Search/SearchFiltersDescriptionPage.tsx +++ b/src/pages/Search/SearchFiltersDescriptionPage.tsx @@ -38,7 +38,7 @@ function SearchFiltersDescriptionPage() { offlineIndicatorStyle={styles.mtAuto} > - + - + - + Date: Wed, 31 Jul 2024 19:37:02 +0200 Subject: [PATCH 6/7] fix spanish translations --- src/languages/es.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/es.ts b/src/languages/es.ts index 76359081bfd55..502b0e452347b 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -358,7 +358,7 @@ export default { value: 'Valor', downloadFailedTitle: 'Error en la descarga', downloadFailedDescription: 'No se pudo completar la descarga. Por favor, inténtalo más tarde.', - reportID: 'ID informe', + reportID: 'ID del informe', }, connectionComplete: { title: 'Conexión completa', From a80c1868be0780f1c382e45300b2b5da5c00e2d1 Mon Sep 17 00:00:00 2001 From: Jakub Szymczak Date: Thu, 1 Aug 2024 12:13:47 +0200 Subject: [PATCH 7/7] add filters screens to CENTRAL_PANE_TO_RHP_MAPPING --- .../linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts | 13 ++++++++++++- src/pages/Search/SearchFiltersCategoryPage.tsx | 8 +++++++- src/pages/Search/SearchFiltersDatePage.tsx | 7 ++++++- src/pages/Search/SearchFiltersDescriptionPage.tsx | 7 ++++++- src/pages/Search/SearchFiltersMerchantPage.tsx | 7 ++++++- src/pages/Search/SearchFiltersReportIDPage.tsx | 7 ++++++- src/pages/Search/SearchFiltersStatusPage.tsx | 7 ++++++- src/pages/Search/SearchFiltersTypePage.tsx | 7 ++++++- 8 files changed, 55 insertions(+), 8 deletions(-) diff --git a/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts index 8aa259b769b08..758d471e2f7e7 100755 --- a/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts +++ b/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts @@ -38,7 +38,18 @@ const CENTRAL_PANE_TO_RHP_MAPPING: Partial> = [SCREENS.SETTINGS.ABOUT]: [SCREENS.SETTINGS.APP_DOWNLOAD_LINKS], [SCREENS.SETTINGS.SAVE_THE_WORLD]: [SCREENS.I_KNOW_A_TEACHER, SCREENS.INTRO_SCHOOL_PRINCIPAL, SCREENS.I_AM_A_TEACHER], [SCREENS.SETTINGS.TROUBLESHOOT]: [SCREENS.SETTINGS.CONSOLE], - [SCREENS.SEARCH.CENTRAL_PANE]: [SCREENS.SEARCH.REPORT_RHP, SCREENS.SEARCH.TRANSACTION_HOLD_REASON_RHP, SCREENS.SEARCH.ADVANCED_FILTERS_RHP], + [SCREENS.SEARCH.CENTRAL_PANE]: [ + SCREENS.SEARCH.REPORT_RHP, + SCREENS.SEARCH.TRANSACTION_HOLD_REASON_RHP, + SCREENS.SEARCH.ADVANCED_FILTERS_RHP, + SCREENS.SEARCH.ADVANCED_FILTERS_DATE_RHP, + SCREENS.SEARCH.ADVANCED_FILTERS_TYPE_RHP, + SCREENS.SEARCH.ADVANCED_FILTERS_STATUS_RHP, + SCREENS.SEARCH.ADVANCED_FILTERS_DESCRIPTION_RHP, + SCREENS.SEARCH.ADVANCED_FILTERS_MERCHANT_RHP, + SCREENS.SEARCH.ADVANCED_FILTERS_REPORT_ID_RHP, + SCREENS.SEARCH.ADVANCED_FILTERS_CATEGORY_RHP, + ], [SCREENS.SETTINGS.SUBSCRIPTION.ROOT]: [ SCREENS.SETTINGS.SUBSCRIPTION.ADD_PAYMENT_CARD, SCREENS.SETTINGS.SUBSCRIPTION.SIZE, diff --git a/src/pages/Search/SearchFiltersCategoryPage.tsx b/src/pages/Search/SearchFiltersCategoryPage.tsx index abc1be6e4db47..29a149482c81b 100644 --- a/src/pages/Search/SearchFiltersCategoryPage.tsx +++ b/src/pages/Search/SearchFiltersCategoryPage.tsx @@ -17,6 +17,7 @@ import type {OptionData} from '@libs/ReportUtils'; import Navigation from '@navigation/Navigation'; import * as SearchActions from '@userActions/Search'; import ONYXKEYS from '@src/ONYXKEYS'; +import ROUTES from '@src/ROUTES'; function SearchFiltersCategoryPage() { const styles = useThemeStyles(); @@ -127,7 +128,12 @@ function SearchFiltersCategoryPage() { offlineIndicatorStyle={styles.mtAuto} > - + { + Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS); + }} + /> - + { + Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS); + }} + /> - + { + Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS); + }} + /> - + { + Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS); + }} + /> - + { + Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS); + }} + /> - + { + Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS); + }} + /> - + { + Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS); + }} + />