Merge pull request Expensify#89715 from software-mansion-labs/fix/add-copilot-selected-duplicate

[CP Staging] fix: Selected user appears twice in Add Copilot list

Author: grgia

src/hooks/useSearchSelector.base.ts

@@ -79,6 +79,9 @@ type UseSearchSelectorConfig = {
 
     /** Whether to allow name-only options */
     shouldAllowNameOnlyOptions?: boolean;
+
+    /** Whether to keep selected options in availableOptions instead of filtering them out */
+    shouldKeepSelectedInAvailableOptions?: boolean;
 };
 
 type ContactState = {
@@ -170,6 +173,7 @@ function useSearchSelectorBase({
     includeSelfDM = false,
     recentAttendees,
     shouldAllowNameOnlyOptions = false,
+    shouldKeepSelectedInAvailableOptions = false,
 }: UseSearchSelectorConfig): UseSearchSelectorReturn {
     const {options: defaultOptions, areOptionsInitialized} = useOptionsList({
         shouldInitialize,
@@ -352,17 +356,17 @@ function useSearchSelectorBase({
             : null,
     };
 
-    const unselectedRecentReports = searchOptions.recentReports.filter((option) => !option.isSelected);
+    const filteredRecentReports = shouldKeepSelectedInAvailableOptions ? searchOptions.recentReports : searchOptions.recentReports.filter((option) => !option.isSelected);
 
     // Filter out people who appear in recent reports from personal details (recents take priority)
-    const recentReportLogins = new Set(unselectedRecentReports.map((option) => option.login).filter(Boolean));
-    const unselectedPersonalDetails = searchOptions.personalDetails.filter((option) => !option.isSelected && !recentReportLogins.has(option.login));
+    const recentReportLogins = new Set(filteredRecentReports.map((option) => option.login).filter(Boolean));
+    const filteredPersonalDetails = searchOptions.personalDetails.filter((option) => (shouldKeepSelectedInAvailableOptions || !option.isSelected) && !recentReportLogins.has(option.login));
 
     const availableOptions = {
         ...searchOptions,
-        personalDetails: unselectedPersonalDetails,
-        recentReports: unselectedRecentReports,
-        userToInvite: searchOptions.userToInvite?.isSelected ? null : searchOptions.userToInvite,
+        personalDetails: filteredPersonalDetails,
+        recentReports: filteredRecentReports,
+        userToInvite: !shouldKeepSelectedInAvailableOptions && searchOptions.userToInvite?.isSelected ? null : searchOptions.userToInvite,
     };
 
     /**

src/pages/settings/Security/AddDelegate/AddDelegatePage.tsx

@@ -33,13 +33,14 @@ function AddDelegatePage() {
             {} as Record<string, boolean>,
         ) ?? {};
 
-    const {searchTerm, debouncedSearchTerm, setSearchTerm, searchOptions, areOptionsInitialized, setSelectedOptions, onListEndReached} = useSearchSelector({
+    const {searchTerm, debouncedSearchTerm, setSearchTerm, availableOptions, areOptionsInitialized, setSelectedOptions, onListEndReached} = useSearchSelector({
         selectionMode: CONST.SEARCH_SELECTOR.SELECTION_MODE_SINGLE,
         searchContext: CONST.SEARCH_SELECTOR.SEARCH_CONTEXT_GENERAL,
         includeUserToInvite: true,
         excludeLogins: {...CONST.EXPENSIFY_EMAILS_OBJECT, ...existingDelegates},
         includeRecentReports: true,
         maxRecentReportsToShow: CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW,
+        shouldKeepSelectedInAvailableOptions: true,
     });
 
     const handleSelectRow = (option: OptionData) => {
@@ -48,29 +49,29 @@ function AddDelegatePage() {
     };
 
     const headerMessage = getHeaderMessage(
-        (searchOptions.recentReports?.length || 0) + (searchOptions.personalDetails?.length || 0) !== 0,
-        !!searchOptions.userToInvite,
+        (availableOptions.recentReports?.length || 0) + (availableOptions.personalDetails?.length || 0) !== 0,
+        !!availableOptions.userToInvite,
         debouncedSearchTerm,
         countryCode,
     );
     const sectionsList = [
         {
             title: translate('common.recents'),
             sectionIndex: 0,
-            data: searchOptions.recentReports,
+            data: availableOptions.recentReports,
         },
         {
             title: translate('common.contacts'),
             sectionIndex: 1,
-            data: searchOptions.personalDetails,
+            data: availableOptions.personalDetails,
         },
     ];
 
-    if (searchOptions.userToInvite) {
+    if (availableOptions.userToInvite) {
         sectionsList.push({
             sectionIndex: 2,
             title: '',
-            data: [searchOptions.userToInvite],
+            data: [availableOptions.userToInvite],
         });
     }