Merge pull request #33928 from DylanDylann/fix/30190

Fix: Duplicate phone number can be invited
Expensify · Jan 26, 2024 · 54013d3 · 54013d3
2 parents e92ffbf + 0805a93
commit 54013d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
@@ -1563,7 +1563,7 @@ function getOptions(
     if (includePersonalDetails) {
         // Next loop over all personal details removing any that are selectedUsers or recentChats
         allPersonalDetailsOptions.forEach((personalDetailOption) => {
-            if (optionsToExclude.some((optionToExclude) => optionToExclude.login === personalDetailOption.login)) {
+            if (optionsToExclude.some((optionToExclude) => optionToExclude.login === addSMSDomainIfPhoneNumber(personalDetailOption.login ?? ''))) {
                 return;
             }
             const {searchText, participantsList, isChatRoom} = personalDetailOption;

diff --git a/src/pages/RoomInvitePage.js b/src/pages/RoomInvitePage.js
@@ -77,7 +77,10 @@ function RoomInvitePage(props) {
 
     // Any existing participants and Expensify emails should not be eligible for invitation
     const excludedUsers = useMemo(
-        () => [...PersonalDetailsUtils.getLoginsByAccountIDs(lodashGet(props.report, 'visibleChatMemberAccountIDs', [])), ...CONST.EXPENSIFY_EMAILS],
+        () =>
+            _.map([...PersonalDetailsUtils.getLoginsByAccountIDs(lodashGet(props.report, 'visibleChatMemberAccountIDs', [])), ...CONST.EXPENSIFY_EMAILS], (participant) =>
+                OptionsListUtils.addSMSDomainIfPhoneNumber(participant),
+            ),
         [props.report],
     );