feat: show reset filters button when type and status filters change

Author: sofi-a

src/libs/actions/Search.ts

@@ -18,7 +18,8 @@ import {isReportListItemType, isTransactionListItemType} from '@libs/SearchUIUti
 import playSound, {SOUNDS} from '@libs/Sound';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+import {FILTER_KEYS} from '@src/types/form/SearchAdvancedFiltersForm';
+import type {SearchAdvancedFiltersForm} from '@src/types/form/SearchAdvancedFiltersForm';
 import type {LastPaymentMethod, LastPaymentMethodType, SearchResults} from '@src/types/onyx';
 import type {SearchPolicy, SearchReport, SearchTransaction} from '@src/types/onyx/SearchResults';
 import type Nullable from '@src/types/utils/Nullable';
@@ -421,10 +422,20 @@ function clearAllFilters() {
 }
 
 function clearAdvancedFilters() {
-    const values: Partial<Record<ValueOf<typeof FILTER_KEYS>, null>> = {};
+    const values: Partial<Nullable<SearchAdvancedFiltersForm>> = {};
     Object.values(FILTER_KEYS)
-        .filter((key) => !([FILTER_KEYS.TYPE, FILTER_KEYS.STATUS, FILTER_KEYS.GROUP_BY] as string[]).includes(key))
+        .filter((key) => key !== FILTER_KEYS.GROUP_BY)
         .forEach((key) => {
+            if (key === FILTER_KEYS.TYPE) {
+                values[key] = CONST.SEARCH.DATA_TYPES.EXPENSE;
+                return;
+            }
+
+            if (key === FILTER_KEYS.STATUS) {
+                values[key] = CONST.SEARCH.STATUS.EXPENSE.ALL;
+                return;
+            }
+
             values[key] = null;
         });
 

src/pages/Search/SearchAdvancedFiltersPage.tsx

@@ -19,7 +19,21 @@ function SearchAdvancedFiltersPage() {
     const [searchAdvancedFilters = emptySearchFilters] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true});
 
     const shouldShowResetFilters = Object.entries(searchAdvancedFilters)
-        .filter(([key]) => !([CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE, CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS, CONST.SEARCH.SYNTAX_ROOT_KEYS.GROUP_BY] as string[]).includes(key))
+        .filter(([key]) => {
+            if (key === CONST.SEARCH.SYNTAX_ROOT_KEYS.GROUP_BY) {
+                return false;
+            }
+
+            if (key === CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE) {
+                return searchAdvancedFilters.type !== CONST.SEARCH.DATA_TYPES.EXPENSE;
+            }
+
+            if (key === CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS) {
+                return searchAdvancedFilters.status !== CONST.SEARCH.STATUS.EXPENSE.ALL;
+            }
+
+            return true;
+        })
         .some(([, value]) => (Array.isArray(value) ? value.length !== 0 : !!value));
 
     return (