Merge pull request #51923 from bernhardoj/fix/51316-ws-chat-for-inval…

…id-member-not-removed Fix WS chat for invalid member doesn't show error
Expensify · Nov 6, 2024 · 1679540 · 1679540
2 parents 7a90267 + fddb6b7
commit 1679540
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/libs/actions/Policy/Member.ts b/src/libs/actions/Policy/Member.ts
@@ -159,7 +159,10 @@ function buildAnnounceRoomMembersOnyxData(policyID: string, accountIDs: number[]
         onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT}${announceReport?.reportID}`,
         value: {
-            participants: announceReport?.participants ?? null,
+            participants: accountIDs.reduce((acc, curr) => {
+                Object.assign(acc, {[curr]: null});
+                return acc;
+            }, {}),
             pendingChatMembers: announceReport?.pendingChatMembers ?? null,
         },
     });

diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
@@ -1013,6 +1013,16 @@ function createPolicyExpenseChats(policyID: string, invitedEmailsToAccountIDs: I
                 isLoadingInitialReportActions: false,
             },
         });
+
+        workspaceMembersChats.onyxFailureData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticReport.reportID}`,
+            value: {
+                errorFields: {
+                    createChat: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericCreateReportFailureMessage'),
+                },
+            },
+        });
     });
     return workspaceMembersChats;
 }