Merge pull request Expensify#46851 from nkdengineer/fix/46775

fix: User can write and send a message onboarding tasks
brunovjk · Aug 7, 2024 · d8a5aaa · d8a5aaa
2 parents b806725 + 9da6141
commit d8a5aaa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -5845,7 +5845,7 @@ function getChatByParticipants(newParticipantList: number[], reports: OnyxCollec
         const participantAccountIDs = Object.keys(report?.participants ?? {});
 
         // Skip if it's not a 1:1 chat
-        if (!shouldIncludeGroupChats && !isOneOnOneChat(report)) {
+        if (!shouldIncludeGroupChats && !isOneOnOneChat(report) && !isSystemChat(report)) {
             return false;
         }
 

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
@@ -3232,6 +3232,9 @@ function completeOnboarding(
     const isAccountIDOdd = AccountUtils.isAccountIDOddNumber(currentUserAccountID ?? 0);
     const targetEmail = isAccountIDOdd ? CONST.EMAIL.NOTIFICATIONS : CONST.EMAIL.CONCIERGE;
 
+    // If the target report isn't opened, the permission field will not exist. So we should add the fallback permission for task report
+    const fallbackPermission = isAccountIDOdd ? [CONST.REPORT.PERMISSIONS.READ] : [CONST.REPORT.PERMISSIONS.READ, CONST.REPORT.PERMISSIONS.WRITE];
+
     const actorAccountID = PersonalDetailsUtils.getAccountIDsByLogins([targetEmail])[0];
     const targetChatReport = ReportUtils.getChatByParticipants([actorAccountID, currentUserAccountID]);
     const {reportID: targetChatReportID = '', policyID: targetChatPolicyID = ''} = targetChatReport ?? {};
@@ -3347,6 +3350,7 @@ function completeOnboarding(
                     },
                     isOptimisticReport: true,
                     managerID: currentUserAccountID,
+                    permissions: targetChatReport?.permissions ?? fallbackPermission,
                 },
             },
             {