Skip to content

Commit b2a8875

Browse files
authored
Merge pull request Expensify#68440 from dmkt9/fix/68127
Fix - After resetting some search filters, Advanced Filters are not updating correctly
2 parents 32a0cf3 + aa57d5c commit b2a8875

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

src/components/Search/SearchPageHeader/SearchFiltersBar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ function SearchFiltersBar({queryJSON, headerButtonsOptions, isMobileSelectionMod
219219
);
220220

221221
const openAdvancedFilters = useCallback(() => {
222-
updateAdvancedFilters(filterFormValues);
222+
updateAdvancedFilters(filterFormValues, true);
223223
Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS);
224224
}, [filterFormValues]);
225225

src/libs/actions/Search.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,11 @@ function queueExportSearchWithTemplate({templateName, templateType, jsonQuery, r
532532
/**
533533
* Updates the form values for the advanced filters search form.
534534
*/
535-
function updateAdvancedFilters(values: Nullable<Partial<FormOnyxValues<typeof ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM>>>) {
535+
function updateAdvancedFilters(values: Nullable<Partial<FormOnyxValues<typeof ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM>>>, shouldUseOnyxSetMethod = false) {
536+
if (shouldUseOnyxSetMethod) {
537+
Onyx.set(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, values);
538+
return;
539+
}
536540
Onyx.merge(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, values);
537541
}
538542

0 commit comments

Comments
 (0)