From 4a17c1bc53788c39654f40b6b8918f723bf4d9de Mon Sep 17 00:00:00 2001
From: VH <hoangzinhvn@gmail.com>
Date: Tue, 26 Sep 2023 22:21:50 +0700
Subject: [PATCH 1/4] Centralize disable updating task status checkboxes

---
 src/components/ReportActionItem/TaskPreview.js | 6 +++++-
 src/components/ReportActionItem/TaskView.js    | 5 ++---
 src/components/TaskHeaderActionButton.js       | 2 +-
 src/libs/actions/Task.js                       | 4 ++++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/ReportActionItem/TaskPreview.js b/src/components/ReportActionItem/TaskPreview.js
index 1da348bb067b..d57cd457421a 100644
--- a/src/components/ReportActionItem/TaskPreview.js
+++ b/src/components/ReportActionItem/TaskPreview.js
@@ -8,6 +8,7 @@ import compose from '../../libs/compose';
 import styles from '../../styles/styles';
 import ONYXKEYS from '../../ONYXKEYS';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
+import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes} from '../withCurrentUserPersonalDetails';
 import Icon from '../Icon';
 import CONST from '../../CONST';
 import * as Expensicons from '../Icon/Expensicons';
@@ -51,6 +52,8 @@ const propTypes = {
     }),
 
     ...withLocalizePropTypes,
+
+    ...withCurrentUserPersonalDetailsPropTypes,
 };
 
 const defaultProps = {
@@ -91,7 +94,7 @@ function TaskPreview(props) {
                         style={[styles.mr2]}
                         containerStyle={[styles.taskCheckbox]}
                         isChecked={isTaskCompleted}
-                        disabled={ReportUtils.isCanceledTaskReport(props.taskReport)}
+                        disabled={!Task.canModifyTask(props.taskReport, props.currentUserPersonalDetails.accountID)}
                         onPress={Session.checkIfActionIsAllowed(() => {
                             if (isTaskCompleted) {
                                 Task.reopenTask(props.taskReport, taskTitle);
@@ -118,6 +121,7 @@ TaskPreview.displayName = 'TaskPreview';
 
 export default compose(
     withLocalize,
+    withCurrentUserPersonalDetails,
     withOnyx({
         taskReport: {
             key: ({taskReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`,
diff --git a/src/components/ReportActionItem/TaskView.js b/src/components/ReportActionItem/TaskView.js
index 39807ab037d5..fd8250fc7876 100644
--- a/src/components/ReportActionItem/TaskView.js
+++ b/src/components/ReportActionItem/TaskView.js
@@ -49,9 +49,8 @@ function TaskView(props) {
     const taskTitle = convertToLTR(props.report.reportName || '');
     const isCompleted = ReportUtils.isCompletedTaskReport(props.report);
     const isOpen = ReportUtils.isOpenTaskReport(props.report);
-    const isCanceled = ReportUtils.isCanceledTaskReport(props.report);
     const canModifyTask = Task.canModifyTask(props.report, props.currentUserPersonalDetails.accountID);
-    const disableState = !canModifyTask || isCanceled;
+    const disableState = !canModifyTask;
     const isDisableInteractive = !canModifyTask || !isOpen;
     return (
         <View>
@@ -102,7 +101,7 @@ function TaskView(props) {
                                             containerBorderRadius={8}
                                             caretSize={16}
                                             accessibilityLabel={taskTitle || props.translate('task.task')}
-                                            disabled={isCanceled || !canModifyTask}
+                                            disabled={disableState}
                                         />
                                         <View style={[styles.flexRow, styles.flex1]}>
                                             <Text
diff --git a/src/components/TaskHeaderActionButton.js b/src/components/TaskHeaderActionButton.js
index aa7694095f5b..1fb8743fc7ee 100644
--- a/src/components/TaskHeaderActionButton.js
+++ b/src/components/TaskHeaderActionButton.js
@@ -34,7 +34,7 @@ function TaskHeaderActionButton(props) {
         <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentEnd]}>
             <Button
                 success
-                isDisabled={ReportUtils.isCanceledTaskReport(props.report) || !Task.canModifyTask(props.report, props.session.accountID)}
+                isDisabled={!Task.canModifyTask(props.report, props.session.accountID)}
                 medium
                 text={props.translate(ReportUtils.isCompletedTaskReport(props.report) ? 'task.markAsIncomplete' : 'task.markAsDone')}
                 onPress={() =>
diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js
index 963bfebb7eb2..e3abab4682b7 100644
--- a/src/libs/actions/Task.js
+++ b/src/libs/actions/Task.js
@@ -894,6 +894,10 @@ function getTaskOwnerAccountID(taskReport) {
  * @returns {Boolean}
  */
 function canModifyTask(taskReport, sessionAccountID) {
+    if (ReportUtils.isCanceledTaskReport(taskReport)) {
+        return false;
+    }
+
     if (sessionAccountID === getTaskOwnerAccountID(taskReport) || sessionAccountID === getTaskAssigneeAccountID(taskReport)) {
         return true;
     }

From d2b8d08c163afdf6288f52fd82b3558e987f5e3c Mon Sep 17 00:00:00 2001
From: VH <hoangzinhvn@gmail.com>
Date: Fri, 29 Sep 2023 00:16:20 +0700
Subject: [PATCH 2/4] Add default props of current user personal details

---
 src/components/ReportActionItem/TaskPreview.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ReportActionItem/TaskPreview.js b/src/components/ReportActionItem/TaskPreview.js
index d57cd457421a..4878d3315b74 100644
--- a/src/components/ReportActionItem/TaskPreview.js
+++ b/src/components/ReportActionItem/TaskPreview.js
@@ -8,7 +8,7 @@ import compose from '../../libs/compose';
 import styles from '../../styles/styles';
 import ONYXKEYS from '../../ONYXKEYS';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
-import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes} from '../withCurrentUserPersonalDetails';
+import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from '../withCurrentUserPersonalDetails';
 import Icon from '../Icon';
 import CONST from '../../CONST';
 import * as Expensicons from '../Icon/Expensicons';
@@ -57,6 +57,7 @@ const propTypes = {
 };
 
 const defaultProps = {
+    ...withCurrentUserPersonalDetailsDefaultProps,
     personalDetailsList: {},
     taskReport: {},
     isHovered: false,

From 15a30eb50ff2286a16073fcec57b71bbf31d6eaa Mon Sep 17 00:00:00 2001
From: VH <hoangzinhvn@gmail.com>
Date: Fri, 29 Sep 2023 00:16:44 +0700
Subject: [PATCH 3/4] Use flag canModifyTask for more readable

---
 src/components/ReportActionItem/TaskView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ReportActionItem/TaskView.js b/src/components/ReportActionItem/TaskView.js
index fd8250fc7876..7393befe79a2 100644
--- a/src/components/ReportActionItem/TaskView.js
+++ b/src/components/ReportActionItem/TaskView.js
@@ -101,7 +101,7 @@ function TaskView(props) {
                                             containerBorderRadius={8}
                                             caretSize={16}
                                             accessibilityLabel={taskTitle || props.translate('task.task')}
-                                            disabled={disableState}
+                                            disabled={!canModifyTask}
                                         />
                                         <View style={[styles.flexRow, styles.flex1]}>
                                             <Text

From 839e52b8ed2fe890eee54e7baad87110aed5547d Mon Sep 17 00:00:00 2001
From: VH <hoangzinhvn@gmail.com>
Date: Sun, 1 Oct 2023 18:45:55 +0700
Subject: [PATCH 4/4] Empty-Commit