From 69ae04e2995cc699b2cd260fca69225cd8f9d600 Mon Sep 17 00:00:00 2001
From: paulnjs <paulqn45@outlook.com>
Date: Fri, 26 Dec 2025 10:05:53 +0700
Subject: [PATCH 1/2] fix: Company card - After resetting card filter, All card
 is not selected

---
 .../Search/FilterDropdowns/SingleSelectPopup.tsx         | 9 ++++++---
 .../Table/TableFilterButtons/buildFilterItems.tsx        | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/Search/FilterDropdowns/SingleSelectPopup.tsx b/src/components/Search/FilterDropdowns/SingleSelectPopup.tsx
index 4ad687e40ef0..a25d0d10fdc6 100644
--- a/src/components/Search/FilterDropdowns/SingleSelectPopup.tsx
+++ b/src/components/Search/FilterDropdowns/SingleSelectPopup.tsx
@@ -26,6 +26,9 @@ type SingleSelectPopupProps<T> = {
     /** The currently selected item */
     value: SingleSelectItem<T> | null;
 
+    /** The default value to set when reset is clicked */
+    defaultValue: string | undefined;
+
     /** Function to call to close the overlay when changes are applied */
     closeOverlay: () => void;
 
@@ -39,7 +42,7 @@ type SingleSelectPopupProps<T> = {
     searchPlaceholder?: string;
 };
 
-function SingleSelectPopup<T extends string>({label, value, items, closeOverlay, onChange, isSearchable, searchPlaceholder}: SingleSelectPopupProps<T>) {
+function SingleSelectPopup<T extends string>({label, value, items, closeOverlay, onChange, isSearchable, searchPlaceholder, defaultValue}: SingleSelectPopupProps<T>) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
@@ -93,9 +96,9 @@ function SingleSelectPopup<T extends string>({label, value, items, closeOverlay,
     }, [closeOverlay, onChange, selectedItem]);
 
     const resetChanges = useCallback(() => {
-        onChange(null);
+        onChange(defaultValue ? (items.find((item) => item.value === defaultValue) ?? null) : null);
         closeOverlay();
-    }, [closeOverlay, onChange]);
+    }, [closeOverlay, onChange, defaultValue, items]);
 
     const textInputOptions = useMemo(
         () => ({
diff --git a/src/components/Table/TableFilterButtons/buildFilterItems.tsx b/src/components/Table/TableFilterButtons/buildFilterItems.tsx
index deeb6e2145d5..832b93f68d16 100644
--- a/src/components/Table/TableFilterButtons/buildFilterItems.tsx
+++ b/src/components/Table/TableFilterButtons/buildFilterItems.tsx
@@ -191,6 +191,7 @@ function createSingleSelectPopover<FilterKey extends string = string>({filterKey
 
         return (
             <SingleSelectPopup
+                defaultValue={filterConfig.default}
                 label={filterConfig.showLabel ? filterKey : undefined}
                 items={filterConfig.options.map((option) => ({
                     text: option.label,

From 7c08d7415952f7466f7187c11edc3a17851f6d8e Mon Sep 17 00:00:00 2001
From: paulnjs <paulqn45@outlook.com>
Date: Fri, 26 Dec 2025 10:34:35 +0700
Subject: [PATCH 2/2] udpate code

---
 src/components/Search/FilterDropdowns/SingleSelectPopup.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Search/FilterDropdowns/SingleSelectPopup.tsx b/src/components/Search/FilterDropdowns/SingleSelectPopup.tsx
index a25d0d10fdc6..b16d6311fbe2 100644
--- a/src/components/Search/FilterDropdowns/SingleSelectPopup.tsx
+++ b/src/components/Search/FilterDropdowns/SingleSelectPopup.tsx
@@ -26,9 +26,6 @@ type SingleSelectPopupProps<T> = {
     /** The currently selected item */
     value: SingleSelectItem<T> | null;
 
-    /** The default value to set when reset is clicked */
-    defaultValue: string | undefined;
-
     /** Function to call to close the overlay when changes are applied */
     closeOverlay: () => void;
 
@@ -40,6 +37,9 @@ type SingleSelectPopupProps<T> = {
 
     /** Search input place holder */
     searchPlaceholder?: string;
+
+    /** The default value to set when reset is clicked */
+    defaultValue?: string;
 };
 
 function SingleSelectPopup<T extends string>({label, value, items, closeOverlay, onChange, isSearchable, searchPlaceholder, defaultValue}: SingleSelectPopupProps<T>) {