From b8b9804f42aed29b0fa161e01b81b3c8aa4a946c Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 8 Oct 2025 16:52:31 +0800
Subject: [PATCH 1/4] fix paid date filter is unchecked after refresh

---
 .../Search/SearchDatePresetFilterBase.tsx        | 16 ++++++++++++++--
 .../Search/SearchDatePresetFilterBasePage.tsx    |  5 ++++-
 .../Search/SearchPageHeader/SearchFiltersBar.tsx |  8 ++++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/components/Search/SearchDatePresetFilterBase.tsx b/src/components/Search/SearchDatePresetFilterBase.tsx
index 6c503d2d6532a..2772bc3e640ad 100644
--- a/src/components/Search/SearchDatePresetFilterBase.tsx
+++ b/src/components/Search/SearchDatePresetFilterBase.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback, useImperativeHandle, useMemo, useState} from 'react';
+import React, {useCallback, useEffect, useImperativeHandle, useMemo, useState} from 'react';
 import type {Ref} from 'react';
 import CalendarPicker from '@components/DatePicker/CalendarPicker';
 import MenuItem from '@components/MenuItem';
@@ -42,6 +42,9 @@ type SearchDatePresetFilterBaseProps = {
     /** The date presets */
     presets?: SearchDatePreset[];
 
+    /** Whether the search advanced filters form Onyx data is loading or not */
+    isSearchAdvancedFiltersFormLoading: boolean;
+
     /** The ref handle */
     ref: Ref<SearchDatePresetFilterBaseHandle>;
 };
@@ -56,7 +59,7 @@ type SearchDatePresetFilterBaseProps = {
  * - On save: if a date modifier is selected (i.e. user clicked save at the calendar picker) you should `setDateValueOfSelectedDateModifier` otherwise `getDateValues`
  * - On reset: if a date modifier is selected (i.e. user clicked reset at the calendar picker) you should `clearDateValueOfSelectedDateModifier` otherwise `clearDateValues`
  */
-function SearchDatePresetFilterBase({defaultDateValues, selectedDateModifier, onSelectDateModifier, presets, ref}: SearchDatePresetFilterBaseProps) {
+function SearchDatePresetFilterBase({defaultDateValues, selectedDateModifier, onSelectDateModifier, presets, isSearchAdvancedFiltersFormLoading, ref}: SearchDatePresetFilterBaseProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -65,6 +68,15 @@ function SearchDatePresetFilterBase({defaultDateValues, selectedDateModifier, on
     const shouldShowHorizontalRule = !!presets?.length;
 
     const [dateValues, setDateValues] = useState<SearchDateValues>(defaultDateValues);
+
+    useEffect(() => {
+        if (isSearchAdvancedFiltersFormLoading) {
+            return;
+        }
+        setDateValues(defaultDateValues);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [isSearchAdvancedFiltersFormLoading]);
+
     const setDateValue = useCallback((dateModifier: SearchDateModifier, value: string | undefined) => {
         setDateValues((prevDateValues) => {
             if (dateModifier === CONST.SEARCH.DATE_MODIFIERS.ON && isSearchDatePreset(value)) {
diff --git a/src/components/Search/SearchDatePresetFilterBasePage.tsx b/src/components/Search/SearchDatePresetFilterBasePage.tsx
index 151ae34b4a66a..83bf7a3efdae3 100644
--- a/src/components/Search/SearchDatePresetFilterBasePage.tsx
+++ b/src/components/Search/SearchDatePresetFilterBasePage.tsx
@@ -18,6 +18,7 @@ import ROUTES from '@src/ROUTES';
 import SearchDatePresetFilterBase from './SearchDatePresetFilterBase';
 import type {SearchDatePresetFilterBaseHandle} from './SearchDatePresetFilterBase';
 import type {SearchDateFilterKeys} from './types';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
 type SearchDatePresetFilterBasePageProps = {
     /** Key used for the date filter */
@@ -32,7 +33,8 @@ function SearchDatePresetFilterBasePage({dateKey, titleKey}: SearchDatePresetFil
     const {translate} = useLocalize();
 
     const searchDatePresetFilterBaseRef = useRef<SearchDatePresetFilterBaseHandle>(null);
-    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true});
+    const [searchAdvancedFiltersForm, searchAdvancedFiltersFormMetadata] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true});
+    const isSearchAdvancedFiltersFormLoading = isLoadingOnyxValue(searchAdvancedFiltersFormMetadata);
     const [selectedDateModifier, setSelectedDateModifier] = useState<SearchDateModifier | null>(null);
 
     const defaultDateValues = {
@@ -116,6 +118,7 @@ function SearchDatePresetFilterBasePage({dateKey, titleKey}: SearchDatePresetFil
                     selectedDateModifier={selectedDateModifier}
                     onSelectDateModifier={setSelectedDateModifier}
                     presets={presets}
+                    isSearchAdvancedFiltersFormLoading={isSearchAdvancedFiltersFormLoading}
                 />
             </ScrollView>
             <Button
diff --git a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
index 0dcd57f2acf28..ac893c3cdbbbe 100644
--- a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
+++ b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
@@ -60,6 +60,7 @@ import type {SearchAdvancedFiltersKey} from '@src/types/form/SearchAdvancedFilte
 import type {CurrencyList, Policy} from '@src/types/onyx';
 import {getEmptyObject} from '@src/types/utils/EmptyObject';
 import type {SearchHeaderOptionValue} from './SearchPageHeader';
+import { useIsFocused } from '@react-navigation/native';
 
 type FilterItem = {
     label: string;
@@ -87,6 +88,7 @@ function SearchFiltersBar({
     confirmPayment,
     latestBankItems,
 }: SearchFiltersBarProps) {
+    const isFocused = useIsFocused();
     const scrollRef = useRef<RNScrollView>(null);
     const currentPolicy = usePolicy(currentSelectedPolicyID);
     const [isUserValidated] = useOnyx(ONYXKEYS.ACCOUNT, {selector: (account) => account?.validated, canBeMissing: true});
@@ -277,10 +279,12 @@ function SearchFiltersBar({
             return;
         }
         if (filterFormValues && Object.keys(filterFormValues).length > 0) {
-            updateAdvancedFilters(filterFormValues, true);
+            if (isFocused) {
+                updateAdvancedFilters(filterFormValues, true);
+            }
             isFormInitializedRef.current = true;
         }
-    }, [queryJSON, filterFormValues]);
+    }, [queryJSON, filterFormValues, isFocused]);
 
     const typeComponent = useCallback(
         ({closeOverlay}: PopoverComponentProps) => {

From d6d83dc9268cdeea981005d0c7665a5123d7ade7 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 8 Oct 2025 17:06:19 +0800
Subject: [PATCH 2/4] prettier

---
 src/components/Search/SearchDatePresetFilterBasePage.tsx    | 2 +-
 src/components/Search/SearchPageHeader/SearchFiltersBar.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Search/SearchDatePresetFilterBasePage.tsx b/src/components/Search/SearchDatePresetFilterBasePage.tsx
index 83bf7a3efdae3..8b257ea091b84 100644
--- a/src/components/Search/SearchDatePresetFilterBasePage.tsx
+++ b/src/components/Search/SearchDatePresetFilterBasePage.tsx
@@ -15,10 +15,10 @@ import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 import SearchDatePresetFilterBase from './SearchDatePresetFilterBase';
 import type {SearchDatePresetFilterBaseHandle} from './SearchDatePresetFilterBase';
 import type {SearchDateFilterKeys} from './types';
-import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
 type SearchDatePresetFilterBasePageProps = {
     /** Key used for the date filter */
diff --git a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
index ac893c3cdbbbe..9b94e75cca540 100644
--- a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
+++ b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
@@ -1,3 +1,4 @@
+import {useIsFocused} from '@react-navigation/native';
 import {emailSelector} from '@selectors/Session';
 import {searchResultsErrorSelector} from '@selectors/Snapshot';
 import React, {useCallback, useContext, useEffect, useMemo, useRef} from 'react';
@@ -60,7 +61,6 @@ import type {SearchAdvancedFiltersKey} from '@src/types/form/SearchAdvancedFilte
 import type {CurrencyList, Policy} from '@src/types/onyx';
 import {getEmptyObject} from '@src/types/utils/EmptyObject';
 import type {SearchHeaderOptionValue} from './SearchPageHeader';
-import { useIsFocused } from '@react-navigation/native';
 
 type FilterItem = {
     label: string;

From 524b76d7a0347a0f6af7d23e1bf48ef0ea99bb36 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 8 Oct 2025 17:17:24 +0800
Subject: [PATCH 3/4] fix type

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

diff --git a/src/components/Search/SearchDatePresetFilterBase.tsx b/src/components/Search/SearchDatePresetFilterBase.tsx
index 2772bc3e640ad..44402dabb2d8b 100644
--- a/src/components/Search/SearchDatePresetFilterBase.tsx
+++ b/src/components/Search/SearchDatePresetFilterBase.tsx
@@ -43,7 +43,7 @@ type SearchDatePresetFilterBaseProps = {
     presets?: SearchDatePreset[];
 
     /** Whether the search advanced filters form Onyx data is loading or not */
-    isSearchAdvancedFiltersFormLoading: boolean;
+    isSearchAdvancedFiltersFormLoading?: boolean;
 
     /** The ref handle */
     ref: Ref<SearchDatePresetFilterBaseHandle>;

From 0924c056b77b5a123fa927dd67057d2ff247df4d Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 29 Oct 2025 12:23:13 +0800
Subject: [PATCH 4/4] fix missing import

---
 src/components/Search/FilterComponents/DateFilterBase.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Search/FilterComponents/DateFilterBase.tsx b/src/components/Search/FilterComponents/DateFilterBase.tsx
index 700c339cd6f59..5f7c7cdc9ecd3 100644
--- a/src/components/Search/FilterComponents/DateFilterBase.tsx
+++ b/src/components/Search/FilterComponents/DateFilterBase.tsx
@@ -11,6 +11,7 @@ import {getDatePresets} from '@libs/SearchUIUtils';
 import type {SearchDateModifier, SearchDateModifierLower} from '@libs/SearchUIUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 import type {SearchDatePresetFilterBaseHandle} from './DatePresetFilterBase';
 import DatePresetFilterBase from './DatePresetFilterBase';