Merge pull request #42444 from FitseTLT/fix-split-always-creating-new…

…-group-chat-report Fix - Split bill - New group is created when splitting bill with the same users
Expensify · Jun 26, 2024 · aecc38b · aecc38b
2 parents ee7055d + 08c36bf
commit aecc38b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -5523,7 +5523,7 @@ function getSystemChat(): OnyxEntry<Report> {
 /**
  * Attempts to find a report in onyx with the provided list of participants. Does not include threads, task, expense, room, and policy expense chat.
  */
-function getChatByParticipants(newParticipantList: number[], reports: OnyxCollection<Report> = allReports): OnyxEntry<Report> {
+function getChatByParticipants(newParticipantList: number[], reports: OnyxCollection<Report> = allReports, shouldIncludeGroupChats = false): OnyxEntry<Report> {
     const sortedNewParticipantList = newParticipantList.sort();
     return Object.values(reports ?? {}).find((report) => {
         const participantAccountIDs = Object.keys(report?.participants ?? {});
@@ -5536,7 +5536,7 @@ function getChatByParticipants(newParticipantList: number[], reports: OnyxCollec
             isMoneyRequestReport(report) ||
             isChatRoom(report) ||
             isPolicyExpenseChat(report) ||
-            isGroupChat(report)
+            (isGroupChat(report) && !shouldIncludeGroupChats)
         ) {
             return false;
         }

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
@@ -3776,11 +3776,9 @@ function getOrCreateOptimisticSplitChatReport(existingSplitChatReportID: string,
     // Check if the report is available locally if we do have one
     let existingSplitChatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${existingChatReportID}`];
 
-    // If we do not have one locally then we will search for a chat with the same participants (only for 1:1 chats).
-    const shouldGetOrCreateOneOneDM = participants.length < 2;
     const allParticipantsAccountIDs = [...participantAccountIDs, currentUserAccountID];
-    if (!existingSplitChatReport && shouldGetOrCreateOneOneDM) {
-        existingSplitChatReport = ReportUtils.getChatByParticipants(allParticipantsAccountIDs);
+    if (!existingSplitChatReport) {
+        existingSplitChatReport = ReportUtils.getChatByParticipants(allParticipantsAccountIDs, undefined, participantAccountIDs.length > 1);
     }
 
     // We found an existing chat report we are done...