Merge pull request #23982 from dukenv0307/fix/23503

New group can't search an email if it's a substring of a selected email
Expensify · Aug 7, 2023 · 242bfe7 · 242bfe7
2 parents 8639fb6 + 3f3fd25
commit 242bfe7
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/src/pages/NewChatPage.js b/src/pages/NewChatPage.js
@@ -80,29 +80,23 @@ function NewChatPage(props) {
             }
         }
 
-        // Filtering out selected users from the search results
-        const filterText = _.reduce(selectedOptions, (str, {login}) => `${str} ${login}`, '');
-        const recentReportsWithoutSelected = _.filter(filteredRecentReports, ({login}) => !filterText.includes(login));
-        const personalDetailsWithoutSelected = _.filter(filteredPersonalDetails, ({login}) => !filterText.includes(login));
-        const hasUnselectedUserToInvite = filteredUserToInvite && !filterText.includes(filteredUserToInvite.login);
-
         sectionsList.push({
             title: props.translate('common.recents'),
-            data: recentReportsWithoutSelected,
-            shouldShow: !_.isEmpty(recentReportsWithoutSelected),
+            data: filteredRecentReports,
+            shouldShow: !_.isEmpty(filteredRecentReports),
             indexOffset,
         });
-        indexOffset += recentReportsWithoutSelected.length;
+        indexOffset += filteredRecentReports.length;
 
         sectionsList.push({
             title: props.translate('common.contacts'),
-            data: personalDetailsWithoutSelected,
-            shouldShow: !_.isEmpty(personalDetailsWithoutSelected),
+            data: filteredPersonalDetails,
+            shouldShow: !_.isEmpty(filteredPersonalDetails),
             indexOffset,
         });
-        indexOffset += personalDetailsWithoutSelected.length;
+        indexOffset += filteredPersonalDetails.length;
 
-        if (hasUnselectedUserToInvite) {
+        if (filteredUserToInvite) {
             sectionsList.push({
                 title: undefined,
                 data: [filteredUserToInvite],
@@ -130,7 +124,14 @@ function NewChatPage(props) {
             newSelectedOptions = [...selectedOptions, option];
         }
 
-        const {recentReports, personalDetails, userToInvite} = OptionsListUtils.getNewChatOptions(props.reports, props.personalDetails, props.betas, searchTerm, [], excludedGroupEmails);
+        const {recentReports, personalDetails, userToInvite} = OptionsListUtils.getNewChatOptions(
+            props.reports,
+            props.personalDetails,
+            props.betas,
+            searchTerm,
+            newSelectedOptions,
+            excludedGroupEmails,
+        );
 
         setSelectedOptions(newSelectedOptions);
         setFilteredRecentReports(recentReports);
@@ -169,7 +170,7 @@ function NewChatPage(props) {
             props.personalDetails,
             props.betas,
             searchTerm,
-            [],
+            selectedOptions,
             props.isGroupChat ? excludedGroupEmails : [],
         );
         setFilteredRecentReports(recentReports);