Skip to content

Fix applied filters are in empty state after resetting filters and closing RHP without saving it #78293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JS00001 merged 4 commits into from
Dec 30, 2025
Merged

Fix applied filters are in empty state after resetting filters and closing RHP without saving it #78293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57dcdec
create a hook
JS00001 Dec 22, 2025
58c833e
update searchpage to use hook
JS00001 Dec 22, 2025
c02e5c9
use in filters bar
JS00001 Dec 22, 2025
45a1a24
show the csv icon for export template too
JS00001 Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 54 additions & 48 deletions src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import type {BankAccountMenuItem, SearchDateFilterKeys, SearchQueryJSON, Singula
import SearchFiltersSkeleton from '@components/Skeletons/SearchFiltersSkeleton';
import useAdvancedSearchFilters from '@hooks/useAdvancedSearchFilters';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useFilterFormValues from '@hooks/useFilterFormValues';
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
Expand All @@ -35,7 +36,7 @@ import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import useWorkspaceList from '@hooks/useWorkspaceList';
import {close} from '@libs/actions/Modal';
import {handleBulkPayItemSelected} from '@libs/actions/Search';
import {handleBulkPayItemSelected, updateAdvancedFilters} from '@libs/actions/Search';
import {mergeCardListWithWorkspaceFeeds} from '@libs/CardUtils';
import DateUtils from '@libs/DateUtils';
import Navigation from '@libs/Navigation/Navigation';
Expand Down Expand Up @@ -86,7 +87,7 @@ function SearchFiltersBar({
const scrollRef = useRef<FlatList<FilterItem>>(null);
const currentPolicy = usePolicy(currentSelectedPolicyID);
const [isUserValidated] = useOnyx(ONYXKEYS.ACCOUNT, {selector: isUserValidatedSelector, canBeMissing: true});
const [filterFormValues = getEmptyObject<Partial<SearchAdvancedFiltersForm>>()] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true});
const [searchAdvancedFiltersForm = getEmptyObject<Partial<SearchAdvancedFiltersForm>>()] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true});
// type, groupBy and status values are not guaranteed to respect the ts type as they come from user input
const {hash, type: unsafeType, groupBy: unsafeGroupBy, status: unsafeStatus, flatFilters} = queryJSON;
const [selectedIOUReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${currentSelectedReportID}`, {canBeMissing: true});
Expand All @@ -98,6 +99,7 @@ function SearchFiltersBar({

const {isOffline} = useNetwork();
const personalDetails = usePersonalDetails();
const filterFormValues = useFilterFormValues(queryJSON);
const {shouldUseNarrowLayout, isLargeScreenWidth} = useResponsiveLayout();
const {selectedTransactions, selectAllMatchingItems, areAllMatchingItemsSelected, showSelectAllMatchingItems, shouldShowFiltersBarLoading} = useSearchContext();

Expand Down Expand Up @@ -144,13 +146,13 @@ function SearchFiltersBar({

// Get selected workspace options from filterFormValues or queryJSON
const selectedWorkspaceOptions = useMemo(() => {
const policyIDs = filterFormValues.policyID ?? queryJSON.policyID;
const policyIDs = searchAdvancedFiltersForm.policyID ?? queryJSON.policyID;
if (!policyIDs) {
return [];
}
const normalizedIDs = Array.isArray(policyIDs) ? policyIDs : [policyIDs];
return workspaceOptions.filter((option) => normalizedIDs.includes(option.value));
}, [filterFormValues.policyID, queryJSON.policyID, workspaceOptions]);
}, [searchAdvancedFiltersForm.policyID, queryJSON.policyID, workspaceOptions]);

const hasErrors = Object.keys(searchResultsErrors ?? {}).length > 0 && !isOffline;
const shouldShowSelectedDropdown = headerButtonsOptions.length > 0 && (!shouldUseNarrowLayout || isMobileSelectionModeEnabled);
Expand Down Expand Up @@ -190,9 +192,9 @@ function SearchFiltersBar({

const [groupCurrencyOptions, groupCurrency] = useMemo(() => {
const options = getGroupCurrencyOptions(currencyList);
const value = options.find((option) => option.value === filterFormValues.groupCurrency) ?? null;
const value = options.find((option) => option.value === searchAdvancedFiltersForm.groupCurrency) ?? null;
return [options, value];
}, [filterFormValues.groupCurrency, currencyList]);
}, [searchAdvancedFiltersForm.groupCurrency, currencyList]);

const [feedOptions, feed] = useMemo(() => {
const feedFilterValues = flatFilters.find((filter) => filter.key === CONST.SEARCH.SYNTAX_FILTER_KEYS.FEED)?.filters?.map((filter) => filter.value);
Expand Down Expand Up @@ -252,55 +254,55 @@ function SearchFiltersBar({
const [date, displayDate] = useMemo(
() =>
createDateDisplayValue({
on: filterFormValues.dateOn,
after: filterFormValues.dateAfter,
before: filterFormValues.dateBefore,
on: searchAdvancedFiltersForm.dateOn,
after: searchAdvancedFiltersForm.dateAfter,
before: searchAdvancedFiltersForm.dateBefore,
}),
[filterFormValues.dateOn, filterFormValues.dateAfter, filterFormValues.dateBefore, createDateDisplayValue],
[searchAdvancedFiltersForm.dateOn, searchAdvancedFiltersForm.dateAfter, searchAdvancedFiltersForm.dateBefore, createDateDisplayValue],
);

const [posted, displayPosted] = useMemo(
() =>
createDateDisplayValue({
on: filterFormValues.postedOn,
after: filterFormValues.postedAfter,
before: filterFormValues.postedBefore,
on: searchAdvancedFiltersForm.postedOn,
after: searchAdvancedFiltersForm.postedAfter,
before: searchAdvancedFiltersForm.postedBefore,
}),
[filterFormValues.postedOn, filterFormValues.postedAfter, filterFormValues.postedBefore, createDateDisplayValue],
[searchAdvancedFiltersForm.postedOn, searchAdvancedFiltersForm.postedAfter, searchAdvancedFiltersForm.postedBefore, createDateDisplayValue],
);

const [withdrawn, displayWithdrawn] = useMemo(
() =>
createDateDisplayValue({
on: filterFormValues.withdrawnOn,
after: filterFormValues.withdrawnAfter,
before: filterFormValues.withdrawnBefore,
on: searchAdvancedFiltersForm.withdrawnOn,
after: searchAdvancedFiltersForm.withdrawnAfter,
before: searchAdvancedFiltersForm.withdrawnBefore,
}),
[filterFormValues.withdrawnOn, filterFormValues.withdrawnAfter, filterFormValues.withdrawnBefore, createDateDisplayValue],
[searchAdvancedFiltersForm.withdrawnOn, searchAdvancedFiltersForm.withdrawnAfter, searchAdvancedFiltersForm.withdrawnBefore, createDateDisplayValue],
);

const [withdrawalTypeOptions, withdrawalType] = useMemo(() => {
const options = getWithdrawalTypeOptions(translate);
const value = options.find((option) => option.value === filterFormValues.withdrawalType) ?? null;
const value = options.find((option) => option.value === searchAdvancedFiltersForm.withdrawalType) ?? null;
return [options, value];
}, [translate, filterFormValues.withdrawalType]);
}, [translate, searchAdvancedFiltersForm.withdrawalType]);
const {accountID} = useCurrentUserPersonalDetails();
const activeAdminPolicies = getActiveAdminWorkspaces(allPolicies, accountID.toString()).sort((a, b) => localeCompare(a.name || '', b.name || ''));

const updateFilterForm = useCallback(
(values: Partial<SearchAdvancedFiltersForm>) => {
const updatedFilterFormValues: Partial<SearchAdvancedFiltersForm> = {
...filterFormValues,
...searchAdvancedFiltersForm,
...values,
};

// If the type has changed, reset the status so we dont have an invalid status selected
if (updatedFilterFormValues.type !== filterFormValues.type) {
if (updatedFilterFormValues.type !== searchAdvancedFiltersForm.type) {
updatedFilterFormValues.status = CONST.SEARCH.STATUS.EXPENSE.ALL;
updatedFilterFormValues.columns = [];
}

if (updatedFilterFormValues.groupBy !== filterFormValues.groupBy) {
if (updatedFilterFormValues.groupBy !== searchAdvancedFiltersForm.groupBy) {
updatedFilterFormValues.columns = [];
}

Expand All @@ -311,12 +313,13 @@ function SearchFiltersBar({
Navigation.setParams({q: queryString, rawQuery: undefined});
});
},
[filterFormValues],
[searchAdvancedFiltersForm],
);

const openAdvancedFilters = useCallback(() => {
updateAdvancedFilters(filterFormValues);
Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
}, []);
}, [filterFormValues]);

const openSearchColumns = () => {
Navigation.navigate(ROUTES.SEARCH_COLUMNS);
Expand Down Expand Up @@ -483,7 +486,7 @@ function SearchFiltersBar({

const userPickerComponent = useCallback(
({closeOverlay}: PopoverComponentProps) => {
const value = filterFormValues.from ?? [];
const value = searchAdvancedFiltersForm.from ?? [];

return (
<UserSelectPopup
Expand All @@ -493,7 +496,7 @@ function SearchFiltersBar({
/>
);
},
[filterFormValues.from, updateFilterForm],
[searchAdvancedFiltersForm.from, updateFilterForm],
);

const handleWorkspaceChange = useCallback(
Expand Down Expand Up @@ -528,14 +531,15 @@ function SearchFiltersBar({
* filter bar
*/
const filters = useMemo<FilterItem[]>(() => {
const fromValue = filterFormValues.from?.map((currentAccountID) => getDisplayNameOrDefault(personalDetails?.[currentAccountID], currentAccountID, false)) ?? [];
const fromValue = searchAdvancedFiltersForm.from?.map((currentAccountID) => getDisplayNameOrDefault(personalDetails?.[currentAccountID], currentAccountID, false)) ?? [];

const shouldDisplayGroupByFilter = !!groupBy?.value;
const shouldDisplayGroupCurrencyFilter = shouldDisplayGroupByFilter && hasMultipleOutputCurrency;
const shouldDisplayFeedFilter = feedOptions.length > 1 && !!filterFormValues.feed;
const shouldDisplayPostedFilter = !!filterFormValues.feed && (!!filterFormValues.postedOn || !!filterFormValues.postedAfter || !!filterFormValues.postedBefore);
const shouldDisplayWithdrawalTypeFilter = !!filterFormValues.withdrawalType;
const shouldDisplayWithdrawnFilter = !!filterFormValues.withdrawnOn || !!filterFormValues.withdrawnAfter || !!filterFormValues.withdrawnBefore;
const shouldDisplayFeedFilter = feedOptions.length > 1 && !!searchAdvancedFiltersForm.feed;
const shouldDisplayPostedFilter =
!!searchAdvancedFiltersForm.feed && (!!searchAdvancedFiltersForm.postedOn || !!searchAdvancedFiltersForm.postedAfter || !!searchAdvancedFiltersForm.postedBefore);
const shouldDisplayWithdrawalTypeFilter = !!searchAdvancedFiltersForm.withdrawalType;
const shouldDisplayWithdrawnFilter = !!searchAdvancedFiltersForm.withdrawnOn || !!searchAdvancedFiltersForm.withdrawnAfter || !!searchAdvancedFiltersForm.withdrawnBefore;

const filterList = [
{
Expand Down Expand Up @@ -665,15 +669,15 @@ function SearchFiltersBar({
displayDate,
displayPosted,
displayWithdrawn,
filterFormValues.from,
filterFormValues.feed,
filterFormValues.postedOn,
filterFormValues.postedAfter,
filterFormValues.postedBefore,
filterFormValues.withdrawalType,
filterFormValues.withdrawnOn,
filterFormValues.withdrawnAfter,
filterFormValues.withdrawnBefore,
searchAdvancedFiltersForm.from,
searchAdvancedFiltersForm.feed,
searchAdvancedFiltersForm.postedOn,
searchAdvancedFiltersForm.postedAfter,
searchAdvancedFiltersForm.postedBefore,
searchAdvancedFiltersForm.withdrawalType,
searchAdvancedFiltersForm.withdrawnOn,
searchAdvancedFiltersForm.withdrawnAfter,
searchAdvancedFiltersForm.withdrawnBefore,
translate,
hasComponent,
isComponent,
Expand Down Expand Up @@ -712,12 +716,14 @@ function SearchFiltersBar({
);

const hiddenFilters = advancedSearchFiltersKeys.filter((key) => !exposedFiltersKeys.has(key as SearchAdvancedFiltersKey));
const hasReportFields = Object.keys(filterFormValues).some((key) => key.startsWith(CONST.SEARCH.REPORT_FIELD.GLOBAL_PREFIX) && !key.startsWith(CONST.SEARCH.REPORT_FIELD.NOT_PREFIX));
const hasReportFields = Object.keys(searchAdvancedFiltersForm).some(
(key) => key.startsWith(CONST.SEARCH.REPORT_FIELD.GLOBAL_PREFIX) && !key.startsWith(CONST.SEARCH.REPORT_FIELD.NOT_PREFIX),
);

return hiddenFilters.filter((key) => {
const dateFilterKey = DATE_FILTER_KEYS.find((dateKey) => key === dateKey);
if (dateFilterKey) {
return filterFormValues[`${dateFilterKey}On`] ?? filterFormValues[`${dateFilterKey}After`] ?? filterFormValues[`${dateFilterKey}Before`];
return searchAdvancedFiltersForm[`${dateFilterKey}On`] ?? searchAdvancedFiltersForm[`${dateFilterKey}After`] ?? searchAdvancedFiltersForm[`${dateFilterKey}Before`];
Copy link
Contributor

@abzokhattab abzokhattab Feb 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using searchAdvancedFiltersForm here caused this issue #79857 it was fixed in this PR #81659

}

if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_FIELD) {
Expand All @@ -727,15 +733,15 @@ function SearchFiltersBar({
const amountFilterKey = AMOUNT_FILTER_KEYS.find((amountKey) => key === amountKey);
if (amountFilterKey) {
return (
filterFormValues[`${amountFilterKey}${CONST.SEARCH.AMOUNT_MODIFIERS.EQUAL_TO}`] ??
filterFormValues[`${amountFilterKey}${CONST.SEARCH.AMOUNT_MODIFIERS.GREATER_THAN}`] ??
filterFormValues[`${amountFilterKey}${CONST.SEARCH.AMOUNT_MODIFIERS.LESS_THAN}`]
searchAdvancedFiltersForm[`${amountFilterKey}${CONST.SEARCH.AMOUNT_MODIFIERS.EQUAL_TO}`] ??
searchAdvancedFiltersForm[`${amountFilterKey}${CONST.SEARCH.AMOUNT_MODIFIERS.GREATER_THAN}`] ??
searchAdvancedFiltersForm[`${amountFilterKey}${CONST.SEARCH.AMOUNT_MODIFIERS.LESS_THAN}`]
);
}

return filterFormValues[key as SearchAdvancedFiltersKey];
return searchAdvancedFiltersForm[key as SearchAdvancedFiltersKey];
});
}, [filterFormValues, filters, typeFiltersKeys]);
}, [searchAdvancedFiltersForm, filters, typeFiltersKeys]);

const adjustScroll = useCallback((info: {distanceFromEnd: number}) => {
// Workaround for a known React Native bug on Android (https://github.com/facebook/react-native/issues/27504):
Expand Down
34 changes: 34 additions & 0 deletions src/hooks/useFilterFormValues.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import {usePersonalDetails} from '@components/OnyxListItemProvider';
import type {SearchQueryJSON} from '@components/Search/types';
import {mergeCardListWithWorkspaceFeeds} from '@libs/CardUtils';
import {getAllTaxRates} from '@libs/PolicyUtils';
import {buildFilterFormValuesFromQuery} from '@libs/SearchQueryUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type {SearchAdvancedFiltersForm} from '@src/types/form';
import type {CurrencyList} from '@src/types/onyx';
import {getEmptyObject} from '@src/types/utils/EmptyObject';
import useOnyx from './useOnyx';

const useFilterFormValues = (queryJSON?: SearchQueryJSON) => {
const personalDetails = usePersonalDetails();

const [userCardList] = useOnyx(ONYXKEYS.CARD_LIST, {canBeMissing: true});
const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true});
const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {canBeMissing: true});
const [policyTagsLists] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS, {canBeMissing: true});
const [policyCategories] = useOnyx(ONYXKEYS.COLLECTION.POLICY_CATEGORIES, {canBeMissing: true});
const [workspaceCardFeeds] = useOnyx(ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST, {canBeMissing: true});
const [currencyList = getEmptyObject<CurrencyList>()] = useOnyx(ONYXKEYS.CURRENCY_LIST, {canBeMissing: true});

const taxRates = getAllTaxRates(policies);
const allCards = mergeCardListWithWorkspaceFeeds(workspaceCardFeeds ?? CONST.EMPTY_OBJECT, userCardList);

const formValues = queryJSON
? buildFilterFormValuesFromQuery(queryJSON, policyCategories, policyTagsLists, currencyList, personalDetails, allCards, allReports, taxRates)
: getEmptyObject<Partial<SearchAdvancedFiltersForm>>();

return formValues;
};

export default useFilterFormValues;
Loading
Loading