From e00e8293bf9a02a9a7a5ada3570abea87431cce9 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Sat, 2 Nov 2024 12:26:49 +0800
Subject: [PATCH 1/2] show create chat error when fails

---
 src/libs/actions/Policy/Policy.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
index b419431bbbb3..ee898a73bcd0 100644
--- 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;
 }

From fddb6b7311954af5f2b82e81858eef0b3ef2701e Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Sat, 2 Nov 2024 12:27:05 +0800
Subject: [PATCH 2/2] fix failed to add member isn't removed from announce room

---
 src/libs/actions/Policy/Member.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/Policy/Member.ts b/src/libs/actions/Policy/Member.ts
index d5b2adc54de3..8fb551cdec81 100644
--- 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,
         },
     });