From 571face2022b9ae232c3f47a4aefd688fa5e4731 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 19 Jul 2023 10:33:33 +0700 Subject: [PATCH 1/5] fix: the created task message is grey when offline --- src/libs/actions/Task.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index 29bdf9ab9d44..e5cb1a725ad8 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -119,6 +119,15 @@ function createTaskAndNavigate(parentReportID, title, description, assignee, ass isOptimisticReport: false, }, }, + { + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, + value: { + [optimisticAddCommentReport.reportAction.reportActionID]: { + pendingAction: null, + }, + }, + }, ]; const failureData = [ @@ -138,7 +147,6 @@ function createTaskAndNavigate(parentReportID, title, description, assignee, ass value: {[optimisticAddCommentReport.reportAction.reportActionID]: {pendingAction: null}}, }, ]; - if (optimisticAssigneeAddComment) { const lastAssigneeCommentText = ReportUtils.formatReportLastMessageText(optimisticAssigneeAddComment.reportAction.message[0].text); @@ -162,6 +170,12 @@ function createTaskAndNavigate(parentReportID, title, description, assignee, ass }, ); + successData.push({ + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${assigneeChatReportID}`, + value: {[optimisticAssigneeAddComment.reportAction.reportActionID]: {pendingAction: null}}, + }); + failureData.push({ onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${assigneeChatReportID}`, From 4cc61a9c5ab67360197e18eb301a574696ff9049 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 19 Jul 2023 11:33:42 +0700 Subject: [PATCH 2/5] fix: issue --- src/libs/Permissions.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libs/Permissions.js b/src/libs/Permissions.js index f3dd7177051d..789f1c73feee 100644 --- a/src/libs/Permissions.js +++ b/src/libs/Permissions.js @@ -67,7 +67,8 @@ function canUseCommentLinking(betas) { * @returns {Boolean} */ function canUsePolicyRooms(betas) { - return _.contains(betas, CONST.BETAS.POLICY_ROOMS) || canUseAllBetas(betas); + return true; + // return _.contains(betas, CONST.BETAS.POLICY_ROOMS) || canUseAllBetas(betas); } /** From 8478cdb1edac64fbfc722e088789ad51c7550cbe Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 19 Jul 2023 11:35:45 +0700 Subject: [PATCH 3/5] fix: format code --- src/libs/Permissions.js | 3 +-- src/libs/actions/Task.js | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/Permissions.js b/src/libs/Permissions.js index 789f1c73feee..f3dd7177051d 100644 --- a/src/libs/Permissions.js +++ b/src/libs/Permissions.js @@ -67,8 +67,7 @@ function canUseCommentLinking(betas) { * @returns {Boolean} */ function canUsePolicyRooms(betas) { - return true; - // return _.contains(betas, CONST.BETAS.POLICY_ROOMS) || canUseAllBetas(betas); + return _.contains(betas, CONST.BETAS.POLICY_ROOMS) || canUseAllBetas(betas); } /** diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index e5cb1a725ad8..4eb8bd4ec7a6 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -147,6 +147,7 @@ function createTaskAndNavigate(parentReportID, title, description, assignee, ass value: {[optimisticAddCommentReport.reportAction.reportActionID]: {pendingAction: null}}, }, ]; + if (optimisticAssigneeAddComment) { const lastAssigneeCommentText = ReportUtils.formatReportLastMessageText(optimisticAssigneeAddComment.reportAction.message[0].text); From 75575972f12eaf678e56f076f127405d09b630b8 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 19 Jul 2023 20:42:32 +0700 Subject: [PATCH 4/5] also update optimisticTaskCreatedAction in successdata --- src/libs/actions/Task.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index 4eb8bd4ec7a6..b3ed8358bf65 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -128,6 +128,15 @@ function createTaskAndNavigate(parentReportID, title, description, assignee, ass }, }, }, + { + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticTaskReport.reportID}`, + value: { + [optimisticTaskCreatedAction.reportActionID]: { + pendingAction: null, + }, + }, + }, ]; const failureData = [ From 0df0d4ba26a762b875e13f8e1b4c56454d8a8f58 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 19 Jul 2023 20:51:25 +0700 Subject: [PATCH 5/5] update the order of successData --- src/libs/actions/Task.js | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index b3ed8358bf65..585e9b9934b0 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -121,21 +121,13 @@ function createTaskAndNavigate(parentReportID, title, description, assignee, ass }, { onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, - value: { - [optimisticAddCommentReport.reportAction.reportActionID]: { - pendingAction: null, - }, - }, + key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticTaskReport.reportID}`, + value: {[optimisticTaskCreatedAction.reportActionID]: {pendingAction: null}}, }, { onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticTaskReport.reportID}`, - value: { - [optimisticTaskCreatedAction.reportActionID]: { - pendingAction: null, - }, - }, + key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, + value: {[optimisticAddCommentReport.reportAction.reportActionID]: {pendingAction: null}}, }, ];