From d5f231d4cbbe01285376d820ba7bb69bfa47bc81 Mon Sep 17 00:00:00 2001 From: Mykhailo Kravchenko Date: Fri, 28 Jul 2023 17:40:09 +0200 Subject: [PATCH 1/2] pass write capability --- src/components/ReportActionItem/MoneyRequestAction.js | 1 + src/libs/ReportUtils.js | 1 + src/libs/actions/Report.js | 1 + 3 files changed, 3 insertions(+) diff --git a/src/components/ReportActionItem/MoneyRequestAction.js b/src/components/ReportActionItem/MoneyRequestAction.js index f1482573e4ba..5790e55b2c78 100644 --- a/src/components/ReportActionItem/MoneyRequestAction.js +++ b/src/components/ReportActionItem/MoneyRequestAction.js @@ -110,6 +110,7 @@ function MoneyRequestAction(props) { false, '', undefined, + undefined, CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS, props.action.reportActionID, props.requestReportID, diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js index a96de9cc02c6..d5f9e1586a82 100644 --- a/src/libs/ReportUtils.js +++ b/src/libs/ReportUtils.js @@ -2048,6 +2048,7 @@ function buildOptimisticWorkspaceChats(policyID, policyName) { false, policyName, null, + undefined, // #announce contains all policy members so notifying always should be opt-in only. CONST.REPORT.NOTIFICATION_PREFERENCE.DAILY, diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index c42abfe2d067..988d709b088c 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -587,6 +587,7 @@ function navigateToAndOpenChildReport(childReportID = '0', parentReportAction = false, '', undefined, + undefined, CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS, parentReportAction.reportActionID, parentReportID, From cdd844bff455fc1585ed21ebad29fbe08ab1cdac Mon Sep 17 00:00:00 2001 From: Mykhailo Kravchenko Date: Fri, 28 Jul 2023 20:13:16 +0200 Subject: [PATCH 2/2] pass writeCapability explicitly --- src/libs/ReportUtils.js | 2 +- src/libs/actions/Report.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js index d5f9e1586a82..56466b254c53 100644 --- a/src/libs/ReportUtils.js +++ b/src/libs/ReportUtils.js @@ -1878,7 +1878,7 @@ function buildOptimisticChatReport( isOwnPolicyExpenseChat = false, oldPolicyName = '', visibility = undefined, - writeCapability = CONST.REPORT.WRITE_CAPABILITIES.ALL, + writeCapability = undefined, notificationPreference = CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS, parentReportActionID = '', parentReportID = '', diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 988d709b088c..38e3676492d4 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -1271,7 +1271,7 @@ function navigateToConciergeChat() { * @param {Array} policyMembersAccountIDs * @param {String} writeCapability */ -function addPolicyReport(policyID, reportName, visibility, policyMembersAccountIDs, writeCapability) { +function addPolicyReport(policyID, reportName, visibility, policyMembersAccountIDs, writeCapability = CONST.REPORT.WRITE_CAPABILITIES.ALL) { // The participants include the current user (admin), and for restricted rooms, the policy members. Participants must not be empty. const members = visibility === CONST.REPORT.VISIBILITY.RESTRICTED ? policyMembersAccountIDs : []; const participants = _.unique([currentUserAccountID, ...members]);