From 8fcb1334787005429941dc03e9c7b18153c6bed1 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Mon, 9 Dec 2024 16:02:00 +0530
Subject: [PATCH 01/21] fix: Make all task titles/descriptions read-only to all
 but the author/assignee.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 .../ReportActionItem/TaskPreview.tsx          |  6 ++--
 src/components/ReportActionItem/TaskView.tsx  |  6 ++--
 src/components/TaskHeaderActionButton.tsx     |  2 +-
 src/libs/actions/Task.ts                      | 32 +++++++------------
 src/pages/ReportDetailsPage.tsx               |  2 +-
 src/pages/home/HeaderView.tsx                 |  6 +++-
 src/pages/home/ReportScreen.tsx               |  3 +-
 7 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/src/components/ReportActionItem/TaskPreview.tsx b/src/components/ReportActionItem/TaskPreview.tsx
index f6f436cbd51e..e09054baa58c 100644
--- a/src/components/ReportActionItem/TaskPreview.tsx
+++ b/src/components/ReportActionItem/TaskPreview.tsx
@@ -106,12 +106,12 @@ function TaskPreview({taskReportID, action, contextMenuAnchor, chatReportID, che
                         <Checkbox
                             style={[styles.mr2]}
                             isChecked={isTaskCompleted}
-                            disabled={!Task.canModifyTask(taskReport, currentUserPersonalDetails.accountID) || !Task.canActionTask(taskReport, currentUserPersonalDetails.accountID)}
+                            disabled={!Task.canModifyTask(taskReport, currentUserPersonalDetails.accountID, true)}
                             onPress={Session.checkIfActionIsAllowed(() => {
                                 if (isTaskCompleted) {
-                                    Task.reopenTask(taskReport);
+                                    Task.reopenTask(taskReport, taskReportID);
                                 } else {
-                                    Task.completeTask(taskReport);
+                                    Task.completeTask(taskReport, taskReportID);
                                 }
                             })}
                             accessibilityLabel={translate('task.task')}
diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
index 9a2906aa7d62..480c4573f293 100644
--- a/src/components/ReportActionItem/TaskView.tsx
+++ b/src/components/ReportActionItem/TaskView.tsx
@@ -56,7 +56,7 @@ function TaskView({report, ...props}: TaskViewProps) {
     const isCompleted = ReportUtils.isCompletedTaskReport(report);
     const isOpen = ReportUtils.isOpenTaskReport(report);
     const canModifyTask = Task.canModifyTask(report, props.currentUserPersonalDetails.accountID);
-    const canActionTask = Task.canActionTask(report, props.currentUserPersonalDetails.accountID);
+    const canActionTask = Task.canModifyTask(report, props.currentUserPersonalDetails.accountID, true);
     const disableState = !canModifyTask;
     const isDisableInteractive = !canModifyTask || !isOpen;
     const personalDetails = usePersonalDetails() || CONST.EMPTY_OBJECT;
@@ -88,8 +88,8 @@ function TaskView({report, ...props}: TaskViewProps) {
                                 styles.pv2,
                                 StyleUtils.getButtonBackgroundColorStyle(getButtonState(hovered, pressed, false, disableState, !isDisableInteractive), true),
                                 isDisableInteractive && !disableState && styles.cursorDefault,
+                                disableState && styles.cursorDisabled,
                             ]}
-                            disabled={disableState}
                             accessibilityLabel={taskTitle || translate('task.task')}
                         >
                             {({pressed}) => (
@@ -114,7 +114,7 @@ function TaskView({report, ...props}: TaskViewProps) {
                                             containerBorderRadius={8}
                                             caretSize={16}
                                             accessibilityLabel={taskTitle || translate('task.task')}
-                                            disabled={!canModifyTask || !canActionTask}
+                                            disabled={!canActionTask}
                                         />
                                         <View style={[styles.flexRow, styles.flex1]}>
                                             <Text
diff --git a/src/components/TaskHeaderActionButton.tsx b/src/components/TaskHeaderActionButton.tsx
index 3841d559311f..c505dc8437a6 100644
--- a/src/components/TaskHeaderActionButton.tsx
+++ b/src/components/TaskHeaderActionButton.tsx
@@ -34,7 +34,7 @@ function TaskHeaderActionButton({report, session}: TaskHeaderActionButtonProps)
         <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentEnd]}>
             <Button
                 success
-                isDisabled={!Task.canModifyTask(report, session?.accountID ?? -1) || !Task.canActionTask(report, session?.accountID ?? -1)}
+                isDisabled={!Task.canModifyTask(report, session?.accountID ?? -1, true)}
                 text={translate(ReportUtils.isCompletedTaskReport(report) ? 'task.markAsIncomplete' : 'task.markAsComplete')}
                 onPress={Session.checkIfActionIsAllowed(() => {
                     // If we're already navigating to these task editing pages, early return not to mark as completed, otherwise we would have not found page.
diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index de0f963596d2..3e4550a74227 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -361,8 +361,8 @@ function getOutstandingChildTask(taskReport: OnyxEntry<OnyxTypes.Report>) {
 /**
  * Complete a task
  */
-function completeTask(taskReport: OnyxEntry<OnyxTypes.Report>) {
-    const taskReportID = taskReport?.reportID ?? '-1';
+function completeTask(taskReport: OnyxEntry<OnyxTypes.Report>, reportIDFromAction?: string) {
+    const taskReportID = taskReport?.reportID ?? reportIDFromAction ?? '-1';
     const message = `marked as complete`;
     const completedTaskReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASK_COMPLETED, message);
     const parentReport = getParentReport(taskReport);
@@ -446,8 +446,8 @@ function completeTask(taskReport: OnyxEntry<OnyxTypes.Report>) {
 /**
  * Reopen a closed task
  */
-function reopenTask(taskReport: OnyxEntry<OnyxTypes.Report>) {
-    const taskReportID = taskReport?.reportID ?? '-1';
+function reopenTask(taskReport: OnyxEntry<OnyxTypes.Report>, reportIDFromAction?: string) {
+    const taskReportID = taskReport?.reportID ?? reportIDFromAction ?? '-1';
     const message = `marked as incomplete`;
     const reopenedTaskReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASK_REOPENED, message);
     const parentReport = getParentReport(taskReport);
@@ -1212,33 +1212,26 @@ function getTaskOwnerAccountID(taskReport: OnyxEntry<OnyxTypes.Report>): number
 /**
  * Check if you're allowed to modify the task - anyone that has write access to the report can modify the task, except auditor
  */
-function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID: number): boolean {
-    if (ReportUtils.isCanceledTaskReport(taskReport)) {
+function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID: number, allowEditingConciergeTask?: boolean): boolean {
+    if (getTaskOwnerAccountID(taskReport) === CONST.ACCOUNT_ID.CONCIERGE && !allowEditingConciergeTask) {
         return false;
     }
 
     const parentReport = getParentReport(taskReport);
     const reportNameValuePairs = ReportUtils.getReportNameValuePairs(parentReport?.reportID);
-    if (ReportUtils.isArchivedRoom(parentReport, reportNameValuePairs)) {
-        return false;
-    }
 
-    if (sessionAccountID === getTaskOwnerAccountID(taskReport) || sessionAccountID === getTaskAssigneeAccountID(taskReport)) {
-        return true;
+    if (ReportUtils.isArchivedRoom(parentReport, reportNameValuePairs) || ReportUtils.isCanceledTaskReport(taskReport)) {
+        return false;
     }
 
     if (!ReportUtils.canWriteInReport(taskReport) || ReportUtils.isAuditor(taskReport)) {
         return false;
     }
 
-    return !isEmptyObject(taskReport) && ReportUtils.isAllowedToComment(taskReport);
-}
-
-/**
- * Check if you can change the status of the task (mark complete or incomplete). Only the task owner and task assignee can do this.
- */
-function canActionTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID: number): boolean {
-    return sessionAccountID === getTaskOwnerAccountID(taskReport) || sessionAccountID === getTaskAssigneeAccountID(taskReport);
+    return (
+        (!isEmptyObject(taskReport) && ReportUtils.isAllowedToComment(taskReport) && sessionAccountID === getTaskOwnerAccountID(taskReport)) ||
+        sessionAccountID === getTaskAssigneeAccountID(taskReport)
+    );
 }
 
 function clearTaskErrors(reportID: string) {
@@ -1282,7 +1275,6 @@ export {
     getTaskAssigneeAccountID,
     clearTaskErrors,
     canModifyTask,
-    canActionTask,
     setNewOptimisticAssignee,
     getNavigationUrlOnTaskDelete,
 };
diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 54f79676fd37..49d50b890951 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -210,7 +210,7 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
     const moneyRequestAction = transactionThreadReportID ? requestParentReportAction : parentReportAction;
 
     const canModifyTask = Task.canModifyTask(report, session?.accountID ?? -1);
-    const canActionTask = Task.canActionTask(report, session?.accountID ?? -1);
+    const canActionTask = Task.canModifyTask(report, session?.accountID ?? -1, true);
     const shouldShowTaskDeleteButton =
         isTaskReport &&
         !isCanceledTaskReport &&
diff --git a/src/pages/home/HeaderView.tsx b/src/pages/home/HeaderView.tsx
index 969e1a90ec3b..481f383add14 100644
--- a/src/pages/home/HeaderView.tsx
+++ b/src/pages/home/HeaderView.tsx
@@ -20,6 +20,7 @@ import SubscriptAvatar from '@components/SubscriptAvatar';
 import TaskHeaderActionButton from '@components/TaskHeaderActionButton';
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import usePolicy from '@hooks/usePolicy';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -75,6 +76,7 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
     const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID || report?.reportID || '-1'}`);
     const policy = usePolicy(report?.policyID);
     const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const {accountID} = useCurrentUserPersonalDetails();
 
     const {translate} = useLocalize();
     const theme = useTheme();
@@ -290,7 +292,9 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
                             </PressableWithoutFeedback>
                             <View style={[styles.reportOptions, styles.flexRow, styles.alignItemsCenter]}>
                                 {!shouldUseNarrowLayout && isChatUsedForOnboarding && freeTrialButton}
-                                {isTaskReport && !shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && <TaskHeaderActionButton report={report} />}
+                                {isTaskReport && !shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && Task.canModifyTask(report, accountID, true) && (
+                                    <TaskHeaderActionButton report={report} />
+                                )}
                                 {canJoin && !shouldUseNarrowLayout && joinButton}
                             </View>
                             {shouldDisplaySearchRouter && <SearchButton style={styles.ml2} />}
diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
index 97582f75b7b1..e69e29054c62 100644
--- a/src/pages/home/ReportScreen.tsx
+++ b/src/pages/home/ReportScreen.tsx
@@ -42,6 +42,7 @@ import * as ValidationUtils from '@libs/ValidationUtils';
 import type {AuthScreensParamList} from '@navigation/types';
 import * as ComposerActions from '@userActions/Composer';
 import * as Report from '@userActions/Report';
+import * as Task from '@userActions/Task';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -785,7 +786,7 @@ function ReportScreen({route, currentReportID = '', navigation}: ReportScreenPro
                             needsOffscreenAlphaCompositing
                         >
                             {headerView}
-                            {!!report && ReportUtils.isTaskReport(report) && shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && (
+                            {!!report && shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && Task.canModifyTask(report, currentUserAccountID, true) && (
                                 <View style={[styles.borderBottom]}>
                                     <View style={[styles.appBG, styles.pl0]}>
                                         <View style={[styles.ph5, styles.pb3]}>

From 737d46921f379036cfc2357a8c529fa2cc973af0 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Mon, 9 Dec 2024 16:08:20 +0530
Subject: [PATCH 02/21] fix 'withOnyx' is deprecated warning.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/components/ReportActionItem/TaskView.tsx | 39 ++++++--------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
index 480c4573f293..9b9f87e0a633 100644
--- a/src/components/ReportActionItem/TaskView.tsx
+++ b/src/components/ReportActionItem/TaskView.tsx
@@ -1,7 +1,5 @@
 import React, {useEffect} from 'react';
 import {View} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
-import type {OnyxEntry} from 'react-native-onyx';
 import Checkbox from '@components/Checkbox';
 import Hoverable from '@components/Hoverable';
 import Icon from '@components/Icon';
@@ -12,8 +10,7 @@ import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {usePersonalDetails} from '@components/OnyxProvider';
 import PressableWithSecondaryInteraction from '@components/PressableWithSecondaryInteraction';
 import Text from '@components/Text';
-import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
-import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -26,40 +23,34 @@ import * as TaskUtils from '@libs/TaskUtils';
 import * as Session from '@userActions/Session';
 import * as Task from '@userActions/Task';
 import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {PersonalDetailsList, Report} from '@src/types/onyx';
+import type {Report} from '@src/types/onyx';
 
-type TaskViewOnyxProps = {
-    /** All of the personal details for everyone */
-    personalDetails: OnyxEntry<PersonalDetailsList>;
+type TaskViewProps = {
+    /** The report currently being looked at */
+    report: Report;
 };
 
-type TaskViewProps = TaskViewOnyxProps &
-    WithCurrentUserPersonalDetailsProps & {
-        /** The report currently being looked at */
-        report: Report;
-    };
-
-function TaskView({report, ...props}: TaskViewProps) {
+function TaskView({report}: TaskViewProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const personalDetails = usePersonalDetails() || CONST.EMPTY_OBJECT;
     useEffect(() => {
         Task.setTaskReport(report);
     }, [report]);
 
     const taskTitle = convertToLTR(report.reportName ?? '');
     const assigneeTooltipDetails = ReportUtils.getDisplayNamesWithTooltips(
-        OptionsListUtils.getPersonalDetailsForAccountIDs(report.managerID ? [report.managerID] : [], props.personalDetails),
+        OptionsListUtils.getPersonalDetailsForAccountIDs(report.managerID ? [report.managerID] : [], personalDetails),
         false,
     );
     const isCompleted = ReportUtils.isCompletedTaskReport(report);
     const isOpen = ReportUtils.isOpenTaskReport(report);
-    const canModifyTask = Task.canModifyTask(report, props.currentUserPersonalDetails.accountID);
-    const canActionTask = Task.canModifyTask(report, props.currentUserPersonalDetails.accountID, true);
+    const canModifyTask = Task.canModifyTask(report, currentUserPersonalDetails.accountID);
+    const canActionTask = Task.canModifyTask(report, currentUserPersonalDetails.accountID, true);
     const disableState = !canModifyTask;
     const isDisableInteractive = !canModifyTask || !isOpen;
-    const personalDetails = usePersonalDetails() || CONST.EMPTY_OBJECT;
     const {translate} = useLocalize();
 
     return (
@@ -190,10 +181,4 @@ function TaskView({report, ...props}: TaskViewProps) {
 
 TaskView.displayName = 'TaskView';
 
-const TaskViewWithOnyx = withOnyx<TaskViewProps, TaskViewOnyxProps>({
-    personalDetails: {
-        key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    },
-})(TaskView);
-
-export default withCurrentUserPersonalDetails(TaskViewWithOnyx);
+export default TaskView;

From 0e46d447fe6acac642eb8aa36f92edbd4750829c Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Mon, 9 Dec 2024 16:11:51 +0530
Subject: [PATCH 03/21] fix 'withOnyx' is deprecated warning in
 TaskHeaderActionButton.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/components/TaskHeaderActionButton.tsx | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/components/TaskHeaderActionButton.tsx b/src/components/TaskHeaderActionButton.tsx
index c505dc8437a6..62dacbf55292 100644
--- a/src/components/TaskHeaderActionButton.tsx
+++ b/src/components/TaskHeaderActionButton.tsx
@@ -1,30 +1,24 @@
 import React from 'react';
 import {View} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as TaskUtils from '@libs/TaskUtils';
 import * as Session from '@userActions/Session';
 import * as Task from '@userActions/Task';
-import ONYXKEYS from '@src/ONYXKEYS';
 import type * as OnyxTypes from '@src/types/onyx';
 import Button from './Button';
+import {useSession} from './OnyxProvider';
 
-type TaskHeaderActionButtonOnyxProps = {
-    /** Current user session */
-    session: OnyxEntry<OnyxTypes.Session>;
-};
-
-type TaskHeaderActionButtonProps = TaskHeaderActionButtonOnyxProps & {
+type TaskHeaderActionButtonProps = {
     /** The report currently being looked at */
     report: OnyxTypes.Report;
 };
 
-function TaskHeaderActionButton({report, session}: TaskHeaderActionButtonProps) {
+function TaskHeaderActionButton({report}: TaskHeaderActionButtonProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
+    const session = useSession();
 
     if (!ReportUtils.canWriteInReport(report)) {
         return null;
@@ -55,8 +49,4 @@ function TaskHeaderActionButton({report, session}: TaskHeaderActionButtonProps)
 
 TaskHeaderActionButton.displayName = 'TaskHeaderActionButton';
 
-export default withOnyx<TaskHeaderActionButtonProps, TaskHeaderActionButtonOnyxProps>({
-    session: {
-        key: ONYXKEYS.SESSION,
-    },
-})(TaskHeaderActionButton);
+export default TaskHeaderActionButton;

From eb1df5b9ddec049dede1f83e4af3cd3c3caa05f5 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Wed, 11 Dec 2024 09:46:51 +0530
Subject: [PATCH 04/21] update cursor style for task view.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/components/Checkbox.tsx                  |  7 +++-
 src/components/ReportActionItem/TaskView.tsx | 40 ++++++++++----------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/components/Checkbox.tsx b/src/components/Checkbox.tsx
index 6da170da3a67..317cc2f808d0 100644
--- a/src/components/Checkbox.tsx
+++ b/src/components/Checkbox.tsx
@@ -47,6 +47,9 @@ type CheckboxProps = Partial<ChildrenProps> & {
 
     /** stop propagation of the mouse down event */
     shouldStopMouseDownPropagation?: boolean;
+
+    /** Should we use default cursor for disabled checkbox */
+    shouldUseDefaultCursorWhenDisabled?: boolean;
 };
 
 function Checkbox(
@@ -64,6 +67,7 @@ function Checkbox(
         onPress,
         accessibilityLabel,
         shouldStopMouseDownPropagation,
+        shouldUseDefaultCursorWhenDisabled,
     }: CheckboxProps,
     ref: ForwardedRef<View>,
 ) {
@@ -115,7 +119,8 @@ function Checkbox(
                         isChecked && styles.checkedContainer,
                         hasError && styles.borderColorDanger,
                         disabled && styles.cursorDisabled,
-                        disabled && styles.buttonOpacityDisabled,
+                        shouldUseDefaultCursorWhenDisabled && disabled && styles.cursorDefault,
+                        disabled && !shouldUseDefaultCursorWhenDisabled && styles.buttonOpacityDisabled,
                         isChecked && styles.borderColorFocus,
                     ]}
                 >
diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
index 640579daf846..e9373ee8ccb3 100644
--- a/src/components/ReportActionItem/TaskView.tsx
+++ b/src/components/ReportActionItem/TaskView.tsx
@@ -29,6 +29,7 @@ import type {Report} from '@src/types/onyx';
 type TaskViewProps = {
     /** The report currently being looked at */
     report: Report;
+};
 
 function TaskView({report}: TaskViewProps) {
     const styles = useThemeStyles();
@@ -38,18 +39,14 @@ function TaskView({report}: TaskViewProps) {
     useEffect(() => {
         Task.setTaskReport(report);
     }, [report]);
-    const personalDetails = usePersonalDetails();
     const taskTitle = convertToLTR(report.reportName ?? '');
     const assigneeTooltipDetails = ReportUtils.getDisplayNamesWithTooltips(
         OptionsListUtils.getPersonalDetailsForAccountIDs(report.managerID ? [report.managerID] : [], personalDetails),
         false,
     );
     const isCompleted = ReportUtils.isCompletedTaskReport(report);
-    const isOpen = ReportUtils.isOpenTaskReport(report);
     const canModifyTask = Task.canModifyTask(report, currentUserPersonalDetails.accountID);
     const canActionTask = Task.canModifyTask(report, currentUserPersonalDetails.accountID, true);
-    const disableState = !canModifyTask;
-    const isDisableInteractive = !canModifyTask || !isOpen;
     const {translate} = useLocalize();
 
     return (
@@ -64,7 +61,7 @@ function TaskView({report}: TaskViewProps) {
                     {(hovered) => (
                         <PressableWithSecondaryInteraction
                             onPress={Session.checkIfActionIsAllowed((e) => {
-                                if (isDisableInteractive) {
+                                if (!canModifyTask) {
                                     return;
                                 }
                                 if (e && e.type === 'click') {
@@ -76,9 +73,8 @@ function TaskView({report}: TaskViewProps) {
                             style={({pressed}) => [
                                 styles.ph5,
                                 styles.pv2,
-                                StyleUtils.getButtonBackgroundColorStyle(getButtonState(hovered, pressed, false, disableState, !isDisableInteractive), true),
-                                isDisableInteractive && !disableState && styles.cursorDefault,
-                                disableState && styles.cursorDisabled,
+                                StyleUtils.getButtonBackgroundColorStyle(getButtonState(hovered, pressed, false, !canModifyTask, canModifyTask), true),
+                                !canModifyTask && styles.cursorDefault,
                             ]}
                             accessibilityLabel={taskTitle || translate('task.task')}
                         >
@@ -105,6 +101,7 @@ function TaskView({report}: TaskViewProps) {
                                             caretSize={16}
                                             accessibilityLabel={taskTitle || translate('task.task')}
                                             disabled={!canActionTask}
+                                            shouldUseDefaultCursorWhenDisabled
                                         />
                                         <View style={[styles.flexRow, styles.flex1]}>
                                             <Text
@@ -114,12 +111,12 @@ function TaskView({report}: TaskViewProps) {
                                                 {taskTitle}
                                             </Text>
                                         </View>
-                                        {isOpen && (
+                                        {canModifyTask && (
                                             <View style={styles.taskRightIconContainer}>
                                                 <Icon
                                                     additionalStyles={[styles.alignItemsCenter]}
                                                     src={Expensicons.ArrowRight}
-                                                    fill={StyleUtils.getIconFillColor(getButtonState(hovered, pressed, false, disableState))}
+                                                    fill={StyleUtils.getIconFillColor(getButtonState(hovered, pressed, false, !canModifyTask))}
                                                 />
                                             </View>
                                         )}
@@ -135,12 +132,13 @@ function TaskView({report}: TaskViewProps) {
                         description={translate('task.description')}
                         title={report.description ?? ''}
                         onPress={() => Navigation.navigate(ROUTES.REPORT_DESCRIPTION.getRoute(report.reportID, Navigation.getReportRHPActiveRoute()))}
-                        shouldShowRightIcon={isOpen}
-                        disabled={disableState}
+                        shouldShowRightIcon={canModifyTask}
+                        disabled={!canModifyTask}
                         wrapperStyle={[styles.pv2, styles.taskDescriptionMenuItem]}
                         shouldGreyOutWhenDisabled={false}
                         numberOfLinesTitle={0}
-                        interactive={!isDisableInteractive}
+                        interactive={canModifyTask}
+                        shouldUseDefaultCursorWhenDisabled
                     />
                 </OfflineWithFeedback>
                 <OfflineWithFeedback pendingAction={report.pendingFields?.managerID}>
@@ -153,23 +151,25 @@ function TaskView({report}: TaskViewProps) {
                             avatarSize={CONST.AVATAR_SIZE.SMALLER}
                             titleStyle={styles.assigneeTextStyle}
                             onPress={() => Navigation.navigate(ROUTES.TASK_ASSIGNEE.getRoute(report.reportID, Navigation.getReportRHPActiveRoute()))}
-                            shouldShowRightIcon={isOpen}
-                            disabled={disableState}
+                            shouldShowRightIcon={canModifyTask}
+                            disabled={!canModifyTask}
                             wrapperStyle={[styles.pv2]}
                             isSmallAvatarSubscriptMenu
                             shouldGreyOutWhenDisabled={false}
-                            interactive={!isDisableInteractive}
+                            interactive={canModifyTask}
                             titleWithTooltips={assigneeTooltipDetails}
+                            shouldUseDefaultCursorWhenDisabled
                         />
                     ) : (
                         <MenuItemWithTopDescription
                             description={translate('task.assignee')}
                             onPress={() => Navigation.navigate(ROUTES.TASK_ASSIGNEE.getRoute(report.reportID, Navigation.getReportRHPActiveRoute()))}
-                            shouldShowRightIcon={isOpen}
-                            disabled={disableState}
+                            shouldShowRightIcon={canModifyTask}
+                            disabled={!canModifyTask}
                             wrapperStyle={[styles.pv2]}
                             shouldGreyOutWhenDisabled={false}
-                            interactive={!isDisableInteractive}
+                            interactive={canModifyTask}
+                            shouldUseDefaultCursorWhenDisabled
                         />
                     )}
                 </OfflineWithFeedback>
@@ -180,4 +180,4 @@ function TaskView({report}: TaskViewProps) {
 
 TaskView.displayName = 'TaskView';
 
-export default TaskView;
\ No newline at end of file
+export default TaskView;

From b78d7bce80cd23f8d55a9fff38c5da7ec8fff78a Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Wed, 11 Dec 2024 09:53:54 +0530
Subject: [PATCH 05/21] fix es-lint.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/components/ReportActionItem/TaskView.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
index e9373ee8ccb3..b4d50fc63947 100644
--- a/src/components/ReportActionItem/TaskView.tsx
+++ b/src/components/ReportActionItem/TaskView.tsx
@@ -35,7 +35,7 @@ function TaskView({report}: TaskViewProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
-    const personalDetails = usePersonalDetails() || CONST.EMPTY_OBJECT;
+    const personalDetails = usePersonalDetails();
     useEffect(() => {
         Task.setTaskReport(report);
     }, [report]);

From 59ccd0cce4da69ef8ea1acd4a677263a9720152b Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Thu, 12 Dec 2024 13:28:37 +0530
Subject: [PATCH 06/21] disable interaction when task is completed.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/components/ReportActionItem/TaskView.tsx | 29 +++++++++++---------
 src/libs/actions/Task.ts                     | 11 ++++++--
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
index b4d50fc63947..eb549365ee60 100644
--- a/src/components/ReportActionItem/TaskView.tsx
+++ b/src/components/ReportActionItem/TaskView.tsx
@@ -44,9 +44,11 @@ function TaskView({report}: TaskViewProps) {
         OptionsListUtils.getPersonalDetailsForAccountIDs(report.managerID ? [report.managerID] : [], personalDetails),
         false,
     );
+    const isOpen = ReportUtils.isOpenTaskReport(report);
     const isCompleted = ReportUtils.isCompletedTaskReport(report);
     const canModifyTask = Task.canModifyTask(report, currentUserPersonalDetails.accountID);
     const canActionTask = Task.canModifyTask(report, currentUserPersonalDetails.accountID, true);
+    const isInteractive = isOpen && canModifyTask;
     const {translate} = useLocalize();
 
     return (
@@ -61,7 +63,7 @@ function TaskView({report}: TaskViewProps) {
                     {(hovered) => (
                         <PressableWithSecondaryInteraction
                             onPress={Session.checkIfActionIsAllowed((e) => {
-                                if (!canModifyTask) {
+                                if (!isInteractive) {
                                     return;
                                 }
                                 if (e && e.type === 'click') {
@@ -73,10 +75,11 @@ function TaskView({report}: TaskViewProps) {
                             style={({pressed}) => [
                                 styles.ph5,
                                 styles.pv2,
-                                StyleUtils.getButtonBackgroundColorStyle(getButtonState(hovered, pressed, false, !canModifyTask, canModifyTask), true),
-                                !canModifyTask && styles.cursorDefault,
+                                StyleUtils.getButtonBackgroundColorStyle(getButtonState(isInteractive && hovered, isInteractive && pressed, false, !canModifyTask, canModifyTask), true),
+                                !isInteractive && styles.cursorDefault,
                             ]}
                             accessibilityLabel={taskTitle || translate('task.task')}
+                            disabled={!isInteractive}
                         >
                             {({pressed}) => (
                                 <OfflineWithFeedback pendingAction={report.pendingFields?.reportName}>
@@ -111,7 +114,7 @@ function TaskView({report}: TaskViewProps) {
                                                 {taskTitle}
                                             </Text>
                                         </View>
-                                        {canModifyTask && (
+                                        {isInteractive && (
                                             <View style={styles.taskRightIconContainer}>
                                                 <Icon
                                                     additionalStyles={[styles.alignItemsCenter]}
@@ -132,12 +135,12 @@ function TaskView({report}: TaskViewProps) {
                         description={translate('task.description')}
                         title={report.description ?? ''}
                         onPress={() => Navigation.navigate(ROUTES.REPORT_DESCRIPTION.getRoute(report.reportID, Navigation.getReportRHPActiveRoute()))}
-                        shouldShowRightIcon={canModifyTask}
-                        disabled={!canModifyTask}
+                        shouldShowRightIcon={isInteractive}
+                        disabled={!isInteractive}
                         wrapperStyle={[styles.pv2, styles.taskDescriptionMenuItem]}
                         shouldGreyOutWhenDisabled={false}
                         numberOfLinesTitle={0}
-                        interactive={canModifyTask}
+                        interactive={isInteractive}
                         shouldUseDefaultCursorWhenDisabled
                     />
                 </OfflineWithFeedback>
@@ -151,12 +154,12 @@ function TaskView({report}: TaskViewProps) {
                             avatarSize={CONST.AVATAR_SIZE.SMALLER}
                             titleStyle={styles.assigneeTextStyle}
                             onPress={() => Navigation.navigate(ROUTES.TASK_ASSIGNEE.getRoute(report.reportID, Navigation.getReportRHPActiveRoute()))}
-                            shouldShowRightIcon={canModifyTask}
-                            disabled={!canModifyTask}
+                            shouldShowRightIcon={isInteractive}
+                            disabled={!isInteractive}
                             wrapperStyle={[styles.pv2]}
                             isSmallAvatarSubscriptMenu
                             shouldGreyOutWhenDisabled={false}
-                            interactive={canModifyTask}
+                            interactive={isInteractive}
                             titleWithTooltips={assigneeTooltipDetails}
                             shouldUseDefaultCursorWhenDisabled
                         />
@@ -164,11 +167,11 @@ function TaskView({report}: TaskViewProps) {
                         <MenuItemWithTopDescription
                             description={translate('task.assignee')}
                             onPress={() => Navigation.navigate(ROUTES.TASK_ASSIGNEE.getRoute(report.reportID, Navigation.getReportRHPActiveRoute()))}
-                            shouldShowRightIcon={canModifyTask}
-                            disabled={!canModifyTask}
+                            shouldShowRightIcon={isInteractive}
+                            disabled={!isInteractive}
                             wrapperStyle={[styles.pv2]}
                             shouldGreyOutWhenDisabled={false}
-                            interactive={canModifyTask}
+                            interactive={isInteractive}
                             shouldUseDefaultCursorWhenDisabled
                         />
                     )}
diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index 3e4550a74227..ee03b205ccda 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -1228,9 +1228,16 @@ function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID
         return false;
     }
 
+    console.log(
+        !isEmptyObject(taskReport) &&
+            ReportUtils.isAllowedToComment(taskReport) &&
+            (sessionAccountID === getTaskOwnerAccountID(taskReport) || sessionAccountID === getTaskAssigneeAccountID(taskReport)),
+    );
+
     return (
-        (!isEmptyObject(taskReport) && ReportUtils.isAllowedToComment(taskReport) && sessionAccountID === getTaskOwnerAccountID(taskReport)) ||
-        sessionAccountID === getTaskAssigneeAccountID(taskReport)
+        !isEmptyObject(taskReport) &&
+        ReportUtils.isAllowedToComment(taskReport) &&
+        (sessionAccountID === getTaskOwnerAccountID(taskReport) || sessionAccountID === getTaskAssigneeAccountID(taskReport))
     );
 }
 

From 4d9471e3f41f7b34ab1c66bb808bd005446c033e Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Thu, 12 Dec 2024 13:29:11 +0530
Subject: [PATCH 07/21] remove console log.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/libs/actions/Task.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index ee03b205ccda..c636716088ee 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -1228,12 +1228,6 @@ function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID
         return false;
     }
 
-    console.log(
-        !isEmptyObject(taskReport) &&
-            ReportUtils.isAllowedToComment(taskReport) &&
-            (sessionAccountID === getTaskOwnerAccountID(taskReport) || sessionAccountID === getTaskAssigneeAccountID(taskReport)),
-    );
-
     return (
         !isEmptyObject(taskReport) &&
         ReportUtils.isAllowedToComment(taskReport) &&

From 93171329e7a193798fa25be9ad2bbb830e94ccee Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Thu, 12 Dec 2024 13:31:21 +0530
Subject: [PATCH 08/21] minor update.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/components/ReportActionItem/TaskView.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
index eb549365ee60..fe8084871c15 100644
--- a/src/components/ReportActionItem/TaskView.tsx
+++ b/src/components/ReportActionItem/TaskView.tsx
@@ -75,7 +75,7 @@ function TaskView({report}: TaskViewProps) {
                             style={({pressed}) => [
                                 styles.ph5,
                                 styles.pv2,
-                                StyleUtils.getButtonBackgroundColorStyle(getButtonState(isInteractive && hovered, isInteractive && pressed, false, !canModifyTask, canModifyTask), true),
+                                StyleUtils.getButtonBackgroundColorStyle(getButtonState(hovered, pressed, false, !canModifyTask, isInteractive), true),
                                 !isInteractive && styles.cursorDefault,
                             ]}
                             accessibilityLabel={taskTitle || translate('task.task')}

From 2d66f3986cc20723349f2e3edbd9a446cb8a8000 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Thu, 12 Dec 2024 13:33:47 +0530
Subject: [PATCH 09/21] minor update.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/components/ReportActionItem/TaskView.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
index fe8084871c15..f476ed464514 100644
--- a/src/components/ReportActionItem/TaskView.tsx
+++ b/src/components/ReportActionItem/TaskView.tsx
@@ -79,7 +79,7 @@ function TaskView({report}: TaskViewProps) {
                                 !isInteractive && styles.cursorDefault,
                             ]}
                             accessibilityLabel={taskTitle || translate('task.task')}
-                            disabled={!isInteractive}
+                            disabled={!canActionTask}
                         >
                             {({pressed}) => (
                                 <OfflineWithFeedback pendingAction={report.pendingFields?.reportName}>

From 880cbed215d419bb2145aa05ce2fe6babd1982aa Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Thu, 12 Dec 2024 13:37:44 +0530
Subject: [PATCH 10/21] use interactive variable.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/components/ReportActionItem/TaskView.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
index f476ed464514..fe8084871c15 100644
--- a/src/components/ReportActionItem/TaskView.tsx
+++ b/src/components/ReportActionItem/TaskView.tsx
@@ -79,7 +79,7 @@ function TaskView({report}: TaskViewProps) {
                                 !isInteractive && styles.cursorDefault,
                             ]}
                             accessibilityLabel={taskTitle || translate('task.task')}
-                            disabled={!canActionTask}
+                            disabled={!isInteractive}
                         >
                             {({pressed}) => (
                                 <OfflineWithFeedback pendingAction={report.pendingFields?.reportName}>

From 7dd9409acf500c3c0fbc64da8c1ba1922fe1c098 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Thu, 12 Dec 2024 13:57:36 +0530
Subject: [PATCH 11/21] update canModifyTask function.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/libs/actions/Task.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index c636716088ee..c6e621e39779 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -1228,11 +1228,7 @@ function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID
         return false;
     }
 
-    return (
-        !isEmptyObject(taskReport) &&
-        ReportUtils.isAllowedToComment(taskReport) &&
-        (sessionAccountID === getTaskOwnerAccountID(taskReport) || sessionAccountID === getTaskAssigneeAccountID(taskReport))
-    );
+    return sessionAccountID === getTaskOwnerAccountID(taskReport) || sessionAccountID === getTaskAssigneeAccountID(taskReport);
 }
 
 function clearTaskErrors(reportID: string) {

From 5609459a99794448dc7be1201ad9318b1601eab2 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Thu, 12 Dec 2024 13:58:34 +0530
Subject: [PATCH 12/21] update canModifyTask function.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/libs/actions/Task.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index c6e621e39779..f19e7d0050b6 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -1224,10 +1224,6 @@ function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID
         return false;
     }
 
-    if (!ReportUtils.canWriteInReport(taskReport) || ReportUtils.isAuditor(taskReport)) {
-        return false;
-    }
-
     return sessionAccountID === getTaskOwnerAccountID(taskReport) || sessionAccountID === getTaskAssigneeAccountID(taskReport);
 }
 

From 2a021410452603f9efd7903b40faac03d8ecd779 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Thu, 12 Dec 2024 14:15:11 +0530
Subject: [PATCH 13/21] use taskOwnerAccountID & taskAssigneeAccountID for task
 previews.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/components/ReportActionItem/TaskPreview.tsx |  3 ++-
 src/libs/actions/Task.ts                        | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/components/ReportActionItem/TaskPreview.tsx b/src/components/ReportActionItem/TaskPreview.tsx
index e09054baa58c..a50a70b2033a 100644
--- a/src/components/ReportActionItem/TaskPreview.tsx
+++ b/src/components/ReportActionItem/TaskPreview.tsx
@@ -76,6 +76,7 @@ function TaskPreview({taskReportID, action, contextMenuAnchor, chatReportID, che
         : action?.childStateNum === CONST.REPORT.STATE_NUM.APPROVED && action?.childStatusNum === CONST.REPORT.STATUS_NUM.APPROVED;
     const taskTitle = Str.htmlEncode(TaskUtils.getTaskTitleFromReport(taskReport, action?.childReportName ?? ''));
     const taskAssigneeAccountID = Task.getTaskAssigneeAccountID(taskReport) ?? action?.childManagerAccountID ?? -1;
+    const taskOwnerAccountID = taskReport?.ownerAccountID ?? action?.actorAccountID;
     const hasAssignee = taskAssigneeAccountID > 0;
     const personalDetails = usePersonalDetails();
     const avatar = personalDetails?.[taskAssigneeAccountID]?.avatar ?? Expensicons.FallbackAvatar;
@@ -106,7 +107,7 @@ function TaskPreview({taskReportID, action, contextMenuAnchor, chatReportID, che
                         <Checkbox
                             style={[styles.mr2]}
                             isChecked={isTaskCompleted}
-                            disabled={!Task.canModifyTask(taskReport, currentUserPersonalDetails.accountID, true)}
+                            disabled={!Task.canModifyTask(taskReport, currentUserPersonalDetails.accountID, true, taskOwnerAccountID, taskAssigneeAccountID)}
                             onPress={Session.checkIfActionIsAllowed(() => {
                                 if (isTaskCompleted) {
                                     Task.reopenTask(taskReport, taskReportID);
diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index f19e7d0050b6..bed768e8254d 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -1212,8 +1212,17 @@ function getTaskOwnerAccountID(taskReport: OnyxEntry<OnyxTypes.Report>): number
 /**
  * Check if you're allowed to modify the task - anyone that has write access to the report can modify the task, except auditor
  */
-function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID: number, allowEditingConciergeTask?: boolean): boolean {
-    if (getTaskOwnerAccountID(taskReport) === CONST.ACCOUNT_ID.CONCIERGE && !allowEditingConciergeTask) {
+function canModifyTask(
+    taskReport: OnyxEntry<OnyxTypes.Report>,
+    sessionAccountID: number,
+    allowEditingConciergeTask?: boolean,
+    taskOwnerAccountID?: number,
+    taskAssigneeAccountID?: number,
+): boolean {
+    const ownerAccountID = getTaskOwnerAccountID(taskReport) ?? taskOwnerAccountID;
+    const assigneeAccountID = getTaskAssigneeAccountID(taskReport) ?? taskAssigneeAccountID;
+
+    if (ownerAccountID === CONST.ACCOUNT_ID.CONCIERGE && !allowEditingConciergeTask) {
         return false;
     }
 
@@ -1224,7 +1233,7 @@ function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID
         return false;
     }
 
-    return sessionAccountID === getTaskOwnerAccountID(taskReport) || sessionAccountID === getTaskAssigneeAccountID(taskReport);
+    return sessionAccountID === ownerAccountID || sessionAccountID === assigneeAccountID;
 }
 
 function clearTaskErrors(reportID: string) {

From 9fb959445f8ea0e707218c3b41816e8aa0f01565 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Thu, 12 Dec 2024 14:17:29 +0530
Subject: [PATCH 14/21] revert back cursor style changes for checkbox.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/components/Checkbox.tsx                  | 7 +------
 src/components/ReportActionItem/TaskView.tsx | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/components/Checkbox.tsx b/src/components/Checkbox.tsx
index 317cc2f808d0..6da170da3a67 100644
--- a/src/components/Checkbox.tsx
+++ b/src/components/Checkbox.tsx
@@ -47,9 +47,6 @@ type CheckboxProps = Partial<ChildrenProps> & {
 
     /** stop propagation of the mouse down event */
     shouldStopMouseDownPropagation?: boolean;
-
-    /** Should we use default cursor for disabled checkbox */
-    shouldUseDefaultCursorWhenDisabled?: boolean;
 };
 
 function Checkbox(
@@ -67,7 +64,6 @@ function Checkbox(
         onPress,
         accessibilityLabel,
         shouldStopMouseDownPropagation,
-        shouldUseDefaultCursorWhenDisabled,
     }: CheckboxProps,
     ref: ForwardedRef<View>,
 ) {
@@ -119,8 +115,7 @@ function Checkbox(
                         isChecked && styles.checkedContainer,
                         hasError && styles.borderColorDanger,
                         disabled && styles.cursorDisabled,
-                        shouldUseDefaultCursorWhenDisabled && disabled && styles.cursorDefault,
-                        disabled && !shouldUseDefaultCursorWhenDisabled && styles.buttonOpacityDisabled,
+                        disabled && styles.buttonOpacityDisabled,
                         isChecked && styles.borderColorFocus,
                     ]}
                 >
diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
index fe8084871c15..1784b4a4279c 100644
--- a/src/components/ReportActionItem/TaskView.tsx
+++ b/src/components/ReportActionItem/TaskView.tsx
@@ -104,7 +104,6 @@ function TaskView({report}: TaskViewProps) {
                                             caretSize={16}
                                             accessibilityLabel={taskTitle || translate('task.task')}
                                             disabled={!canActionTask}
-                                            shouldUseDefaultCursorWhenDisabled
                                         />
                                         <View style={[styles.flexRow, styles.flex1]}>
                                             <Text

From a13be8ab181ca828ca656717a8755079c5557939 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Sun, 15 Dec 2024 10:23:07 +0530
Subject: [PATCH 15/21] revert the new behaviour for tasks.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 .../ReportActionItem/TaskPreview.tsx          |  5 ++-
 src/components/ReportActionItem/TaskView.tsx  | 35 ++++++++++---------
 src/components/TaskHeaderActionButton.tsx     |  2 +-
 src/libs/actions/Task.ts                      | 24 +++++++++++--
 src/pages/ReportDetailsPage.tsx               |  2 +-
 src/pages/home/HeaderView.tsx                 |  2 +-
 src/pages/home/ReportScreen.tsx               |  2 +-
 7 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/src/components/ReportActionItem/TaskPreview.tsx b/src/components/ReportActionItem/TaskPreview.tsx
index a50a70b2033a..5e4c331a04ff 100644
--- a/src/components/ReportActionItem/TaskPreview.tsx
+++ b/src/components/ReportActionItem/TaskPreview.tsx
@@ -107,7 +107,10 @@ function TaskPreview({taskReportID, action, contextMenuAnchor, chatReportID, che
                         <Checkbox
                             style={[styles.mr2]}
                             isChecked={isTaskCompleted}
-                            disabled={!Task.canModifyTask(taskReport, currentUserPersonalDetails.accountID, true, taskOwnerAccountID, taskAssigneeAccountID)}
+                            disabled={
+                                !Task.canModifyTask(taskReport, currentUserPersonalDetails.accountID, true, taskOwnerAccountID, taskAssigneeAccountID) ||
+                                !Task.canActionTask(taskReport, currentUserPersonalDetails.accountID, taskOwnerAccountID, taskAssigneeAccountID)
+                            }
                             onPress={Session.checkIfActionIsAllowed(() => {
                                 if (isTaskCompleted) {
                                     Task.reopenTask(taskReport, taskReportID);
diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
index 1784b4a4279c..e327b4664bcb 100644
--- a/src/components/ReportActionItem/TaskView.tsx
+++ b/src/components/ReportActionItem/TaskView.tsx
@@ -47,8 +47,9 @@ function TaskView({report}: TaskViewProps) {
     const isOpen = ReportUtils.isOpenTaskReport(report);
     const isCompleted = ReportUtils.isCompletedTaskReport(report);
     const canModifyTask = Task.canModifyTask(report, currentUserPersonalDetails.accountID);
-    const canActionTask = Task.canModifyTask(report, currentUserPersonalDetails.accountID, true);
-    const isInteractive = isOpen && canModifyTask;
+    const canActionTask = Task.canActionTask(report, currentUserPersonalDetails.accountID);
+    const disableState = !canModifyTask;
+    const isDisableInteractive = !canModifyTask || !isOpen;
     const {translate} = useLocalize();
 
     return (
@@ -63,7 +64,7 @@ function TaskView({report}: TaskViewProps) {
                     {(hovered) => (
                         <PressableWithSecondaryInteraction
                             onPress={Session.checkIfActionIsAllowed((e) => {
-                                if (!isInteractive) {
+                                if (isDisableInteractive) {
                                     return;
                                 }
                                 if (e && e.type === 'click') {
@@ -75,11 +76,11 @@ function TaskView({report}: TaskViewProps) {
                             style={({pressed}) => [
                                 styles.ph5,
                                 styles.pv2,
-                                StyleUtils.getButtonBackgroundColorStyle(getButtonState(hovered, pressed, false, !canModifyTask, isInteractive), true),
-                                !isInteractive && styles.cursorDefault,
+                                StyleUtils.getButtonBackgroundColorStyle(getButtonState(hovered, pressed, false, disableState, !isDisableInteractive), true),
+                                isDisableInteractive && styles.cursorDefault,
                             ]}
                             accessibilityLabel={taskTitle || translate('task.task')}
-                            disabled={!isInteractive}
+                            disabled={isDisableInteractive}
                         >
                             {({pressed}) => (
                                 <OfflineWithFeedback pendingAction={report.pendingFields?.reportName}>
@@ -113,12 +114,12 @@ function TaskView({report}: TaskViewProps) {
                                                 {taskTitle}
                                             </Text>
                                         </View>
-                                        {isInteractive && (
+                                        {isOpen && (
                                             <View style={styles.taskRightIconContainer}>
                                                 <Icon
                                                     additionalStyles={[styles.alignItemsCenter]}
                                                     src={Expensicons.ArrowRight}
-                                                    fill={StyleUtils.getIconFillColor(getButtonState(hovered, pressed, false, !canModifyTask))}
+                                                    fill={StyleUtils.getIconFillColor(getButtonState(hovered, pressed, false, disableState))}
                                                 />
                                             </View>
                                         )}
@@ -134,12 +135,12 @@ function TaskView({report}: TaskViewProps) {
                         description={translate('task.description')}
                         title={report.description ?? ''}
                         onPress={() => Navigation.navigate(ROUTES.REPORT_DESCRIPTION.getRoute(report.reportID, Navigation.getReportRHPActiveRoute()))}
-                        shouldShowRightIcon={isInteractive}
-                        disabled={!isInteractive}
+                        shouldShowRightIcon={isOpen}
+                        disabled={disableState}
                         wrapperStyle={[styles.pv2, styles.taskDescriptionMenuItem]}
                         shouldGreyOutWhenDisabled={false}
                         numberOfLinesTitle={0}
-                        interactive={isInteractive}
+                        interactive={!isDisableInteractive}
                         shouldUseDefaultCursorWhenDisabled
                     />
                 </OfflineWithFeedback>
@@ -153,12 +154,12 @@ function TaskView({report}: TaskViewProps) {
                             avatarSize={CONST.AVATAR_SIZE.SMALLER}
                             titleStyle={styles.assigneeTextStyle}
                             onPress={() => Navigation.navigate(ROUTES.TASK_ASSIGNEE.getRoute(report.reportID, Navigation.getReportRHPActiveRoute()))}
-                            shouldShowRightIcon={isInteractive}
-                            disabled={!isInteractive}
+                            shouldShowRightIcon={isOpen}
+                            disabled={disableState}
                             wrapperStyle={[styles.pv2]}
                             isSmallAvatarSubscriptMenu
                             shouldGreyOutWhenDisabled={false}
-                            interactive={isInteractive}
+                            interactive={!isDisableInteractive}
                             titleWithTooltips={assigneeTooltipDetails}
                             shouldUseDefaultCursorWhenDisabled
                         />
@@ -166,11 +167,11 @@ function TaskView({report}: TaskViewProps) {
                         <MenuItemWithTopDescription
                             description={translate('task.assignee')}
                             onPress={() => Navigation.navigate(ROUTES.TASK_ASSIGNEE.getRoute(report.reportID, Navigation.getReportRHPActiveRoute()))}
-                            shouldShowRightIcon={isInteractive}
-                            disabled={!isInteractive}
+                            shouldShowRightIcon={isOpen}
+                            disabled={disableState}
                             wrapperStyle={[styles.pv2]}
                             shouldGreyOutWhenDisabled={false}
-                            interactive={isInteractive}
+                            interactive={!isDisableInteractive}
                             shouldUseDefaultCursorWhenDisabled
                         />
                     )}
diff --git a/src/components/TaskHeaderActionButton.tsx b/src/components/TaskHeaderActionButton.tsx
index 62dacbf55292..4fce0d1dd4de 100644
--- a/src/components/TaskHeaderActionButton.tsx
+++ b/src/components/TaskHeaderActionButton.tsx
@@ -28,7 +28,7 @@ function TaskHeaderActionButton({report}: TaskHeaderActionButtonProps) {
         <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentEnd]}>
             <Button
                 success
-                isDisabled={!Task.canModifyTask(report, session?.accountID ?? -1, true)}
+                isDisabled={!Task.canModifyTask(report, session?.accountID ?? -1, true) || !Task.canActionTask(report, session?.accountID ?? -1)}
                 text={translate(ReportUtils.isCompletedTaskReport(report) ? 'task.markAsIncomplete' : 'task.markAsComplete')}
                 onPress={Session.checkIfActionIsAllowed(() => {
                     // If we're already navigating to these task editing pages, early return not to mark as completed, otherwise we would have not found page.
diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index ff14a07915b4..481e7ffa4b17 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -1225,18 +1225,37 @@ function canModifyTask(
 ): boolean {
     const ownerAccountID = getTaskOwnerAccountID(taskReport) ?? taskOwnerAccountID;
     const assigneeAccountID = getTaskAssigneeAccountID(taskReport) ?? taskAssigneeAccountID;
-
     if (ownerAccountID === CONST.ACCOUNT_ID.CONCIERGE && !allowEditingConciergeTask) {
         return false;
     }
 
+    if (ReportUtils.isCanceledTaskReport(taskReport)) {
+        return false;
+    }
+
     const parentReport = getParentReport(taskReport);
     const reportNameValuePairs = ReportUtils.getReportNameValuePairs(parentReport?.reportID);
+    if (ReportUtils.isArchivedRoom(parentReport, reportNameValuePairs)) {
+        return false;
+    }
+
+    if (sessionAccountID === ownerAccountID || sessionAccountID === assigneeAccountID) {
+        return true;
+    }
 
-    if (ReportUtils.isArchivedRoom(parentReport, reportNameValuePairs) || ReportUtils.isCanceledTaskReport(taskReport)) {
+    if (!ReportUtils.canWriteInReport(taskReport) || ReportUtils.isAuditor(taskReport)) {
         return false;
     }
 
+    return !isEmptyObject(taskReport) && ReportUtils.isAllowedToComment(taskReport);
+}
+
+/**
+ * Check if you can change the status of the task (mark complete or incomplete). Only the task owner and task assignee can do this.
+ */
+function canActionTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID: number, taskOwnerAccountID?: number, taskAssigneeAccountID?: number): boolean {
+    const ownerAccountID = getTaskOwnerAccountID(taskReport) ?? taskOwnerAccountID;
+    const assigneeAccountID = getTaskAssigneeAccountID(taskReport) ?? taskAssigneeAccountID;
     return sessionAccountID === ownerAccountID || sessionAccountID === assigneeAccountID;
 }
 
@@ -1283,6 +1302,7 @@ export {
     canModifyTask,
     setNewOptimisticAssignee,
     getNavigationUrlOnTaskDelete,
+    canActionTask,
 };
 
 export type {PolicyValue, Assignee, ShareDestination};
diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 4e7bab645b1a..9d2d7e4ada75 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -210,7 +210,7 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
     const moneyRequestAction = transactionThreadReportID ? requestParentReportAction : parentReportAction;
 
     const canModifyTask = Task.canModifyTask(report, session?.accountID ?? -1);
-    const canActionTask = Task.canModifyTask(report, session?.accountID ?? -1, true);
+    const canActionTask = Task.canActionTask(report, session?.accountID ?? -1);
     const shouldShowTaskDeleteButton =
         isTaskReport &&
         !isCanceledTaskReport &&
diff --git a/src/pages/home/HeaderView.tsx b/src/pages/home/HeaderView.tsx
index 89e07b59a613..045077f3e589 100644
--- a/src/pages/home/HeaderView.tsx
+++ b/src/pages/home/HeaderView.tsx
@@ -290,7 +290,7 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
                             </PressableWithoutFeedback>
                             <View style={[styles.reportOptions, styles.flexRow, styles.alignItemsCenter]}>
                                 {!shouldUseNarrowLayout && isChatUsedForOnboarding && freeTrialButton}
-                                {isTaskReport && !shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && Task.canModifyTask(report, accountID, true) && (
+                                {isTaskReport && !shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && Task.canActionTask(report, accountID) && (
                                     <TaskHeaderActionButton report={report} />
                                 )}
                                 {!isParentReportLoading && canJoin && !shouldUseNarrowLayout && joinButton}
diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
index 1f2df76f0b79..c372d88ce2d0 100644
--- a/src/pages/home/ReportScreen.tsx
+++ b/src/pages/home/ReportScreen.tsx
@@ -785,7 +785,7 @@ function ReportScreen({route, currentReportID = '', navigation}: ReportScreenPro
                             needsOffscreenAlphaCompositing
                         >
                             {headerView}
-                            {!!report && shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && Task.canModifyTask(report, currentUserAccountID, true) && (
+                            {!!report && shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && Task.canActionTask(report, currentUserAccountID) && (
                                 <View style={[styles.borderBottom]}>
                                     <View style={[styles.appBG, styles.pl0]}>
                                         <View style={[styles.ph5, styles.pb3]}>

From 1f0c7acd5cabedbe60fd49199ca517f631517405 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Mon, 16 Dec 2024 20:05:44 +0530
Subject: [PATCH 16/21] revert changes for header task action button.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/pages/home/HeaderView.tsx   | 6 +-----
 src/pages/home/ReportScreen.tsx | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/pages/home/HeaderView.tsx b/src/pages/home/HeaderView.tsx
index 045077f3e589..03e7dcd82156 100644
--- a/src/pages/home/HeaderView.tsx
+++ b/src/pages/home/HeaderView.tsx
@@ -20,7 +20,6 @@ import SubscriptAvatar from '@components/SubscriptAvatar';
 import TaskHeaderActionButton from '@components/TaskHeaderActionButton';
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
-import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import usePolicy from '@hooks/usePolicy';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -76,7 +75,6 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
     const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID || report?.reportID || '-1'}`);
     const policy = usePolicy(report?.policyID);
     const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
-    const {accountID} = useCurrentUserPersonalDetails();
 
     const {translate} = useLocalize();
     const theme = useTheme();
@@ -290,9 +288,7 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
                             </PressableWithoutFeedback>
                             <View style={[styles.reportOptions, styles.flexRow, styles.alignItemsCenter]}>
                                 {!shouldUseNarrowLayout && isChatUsedForOnboarding && freeTrialButton}
-                                {isTaskReport && !shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && Task.canActionTask(report, accountID) && (
-                                    <TaskHeaderActionButton report={report} />
-                                )}
+                                {isTaskReport && !shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && <TaskHeaderActionButton report={report} />}
                                 {!isParentReportLoading && canJoin && !shouldUseNarrowLayout && joinButton}
                             </View>
                             {shouldDisplaySearchRouter && <SearchButton style={styles.ml2} />}
diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
index c372d88ce2d0..67bc64c9c12a 100644
--- a/src/pages/home/ReportScreen.tsx
+++ b/src/pages/home/ReportScreen.tsx
@@ -785,7 +785,7 @@ function ReportScreen({route, currentReportID = '', navigation}: ReportScreenPro
                             needsOffscreenAlphaCompositing
                         >
                             {headerView}
-                            {!!report && shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && Task.canActionTask(report, currentUserAccountID) && (
+                            {!!report && ReportUtils.isTaskReport(report) && shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && (
                                 <View style={[styles.borderBottom]}>
                                     <View style={[styles.appBG, styles.pl0]}>
                                         <View style={[styles.ph5, styles.pb3]}>

From 5877b0e9513f5315eb5c10b31306c9089b2c6329 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Tue, 17 Dec 2024 03:31:56 +0530
Subject: [PATCH 17/21] permit only the author to make changes in task title
 and discription.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 .../ReportActionItem/TaskPreview.tsx          |  2 +-
 src/components/TaskHeaderActionButton.tsx     |  2 +-
 src/libs/actions/Task.ts                      | 19 ++++---------------
 src/pages/home/ReportScreen.tsx               |  1 -
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/components/ReportActionItem/TaskPreview.tsx b/src/components/ReportActionItem/TaskPreview.tsx
index 5e4c331a04ff..a608b46fcedb 100644
--- a/src/components/ReportActionItem/TaskPreview.tsx
+++ b/src/components/ReportActionItem/TaskPreview.tsx
@@ -108,7 +108,7 @@ function TaskPreview({taskReportID, action, contextMenuAnchor, chatReportID, che
                             style={[styles.mr2]}
                             isChecked={isTaskCompleted}
                             disabled={
-                                !Task.canModifyTask(taskReport, currentUserPersonalDetails.accountID, true, taskOwnerAccountID, taskAssigneeAccountID) ||
+                                !Task.canModifyTask(taskReport, currentUserPersonalDetails.accountID, taskOwnerAccountID) ||
                                 !Task.canActionTask(taskReport, currentUserPersonalDetails.accountID, taskOwnerAccountID, taskAssigneeAccountID)
                             }
                             onPress={Session.checkIfActionIsAllowed(() => {
diff --git a/src/components/TaskHeaderActionButton.tsx b/src/components/TaskHeaderActionButton.tsx
index 4fce0d1dd4de..eff86b5f690a 100644
--- a/src/components/TaskHeaderActionButton.tsx
+++ b/src/components/TaskHeaderActionButton.tsx
@@ -28,7 +28,7 @@ function TaskHeaderActionButton({report}: TaskHeaderActionButtonProps) {
         <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentEnd]}>
             <Button
                 success
-                isDisabled={!Task.canModifyTask(report, session?.accountID ?? -1, true) || !Task.canActionTask(report, session?.accountID ?? -1)}
+                isDisabled={!Task.canActionTask(report, session?.accountID ?? -1)}
                 text={translate(ReportUtils.isCompletedTaskReport(report) ? 'task.markAsIncomplete' : 'task.markAsComplete')}
                 onPress={Session.checkIfActionIsAllowed(() => {
                     // If we're already navigating to these task editing pages, early return not to mark as completed, otherwise we would have not found page.
diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index 481e7ffa4b17..98d922c3fff3 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -1216,16 +1216,9 @@ function getTaskOwnerAccountID(taskReport: OnyxEntry<OnyxTypes.Report>): number
 /**
  * Check if you're allowed to modify the task - anyone that has write access to the report can modify the task, except auditor
  */
-function canModifyTask(
-    taskReport: OnyxEntry<OnyxTypes.Report>,
-    sessionAccountID: number,
-    allowEditingConciergeTask?: boolean,
-    taskOwnerAccountID?: number,
-    taskAssigneeAccountID?: number,
-): boolean {
+function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID: number, taskOwnerAccountID?: number): boolean {
     const ownerAccountID = getTaskOwnerAccountID(taskReport) ?? taskOwnerAccountID;
-    const assigneeAccountID = getTaskAssigneeAccountID(taskReport) ?? taskAssigneeAccountID;
-    if (ownerAccountID === CONST.ACCOUNT_ID.CONCIERGE && !allowEditingConciergeTask) {
+    if (ownerAccountID !== sessionAccountID) {
         return false;
     }
 
@@ -1239,15 +1232,11 @@ function canModifyTask(
         return false;
     }
 
-    if (sessionAccountID === ownerAccountID || sessionAccountID === assigneeAccountID) {
+    if (sessionAccountID === ownerAccountID) {
         return true;
     }
 
-    if (!ReportUtils.canWriteInReport(taskReport) || ReportUtils.isAuditor(taskReport)) {
-        return false;
-    }
-
-    return !isEmptyObject(taskReport) && ReportUtils.isAllowedToComment(taskReport);
+    return false;
 }
 
 /**
diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
index 67bc64c9c12a..47315b604f0b 100644
--- a/src/pages/home/ReportScreen.tsx
+++ b/src/pages/home/ReportScreen.tsx
@@ -42,7 +42,6 @@ import * as ValidationUtils from '@libs/ValidationUtils';
 import type {AuthScreensParamList} from '@navigation/types';
 import * as ComposerActions from '@userActions/Composer';
 import * as Report from '@userActions/Report';
-import * as Task from '@userActions/Task';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';

From b31f66e7889ca0aec9b2964225ecbdee7c1b5b93 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Tue, 17 Dec 2024 03:49:51 +0530
Subject: [PATCH 18/21] update 'canActionTask' to include additional checks.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/components/ReportActionItem/TaskPreview.tsx |  5 +----
 src/components/ReportActionItem/TaskView.tsx    |  8 ++++----
 src/libs/actions/Task.ts                        | 12 +++++++++++-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/components/ReportActionItem/TaskPreview.tsx b/src/components/ReportActionItem/TaskPreview.tsx
index a608b46fcedb..8eef8ddfe0ca 100644
--- a/src/components/ReportActionItem/TaskPreview.tsx
+++ b/src/components/ReportActionItem/TaskPreview.tsx
@@ -107,10 +107,7 @@ function TaskPreview({taskReportID, action, contextMenuAnchor, chatReportID, che
                         <Checkbox
                             style={[styles.mr2]}
                             isChecked={isTaskCompleted}
-                            disabled={
-                                !Task.canModifyTask(taskReport, currentUserPersonalDetails.accountID, taskOwnerAccountID) ||
-                                !Task.canActionTask(taskReport, currentUserPersonalDetails.accountID, taskOwnerAccountID, taskAssigneeAccountID)
-                            }
+                            disabled={!Task.canActionTask(taskReport, currentUserPersonalDetails.accountID, taskOwnerAccountID, taskAssigneeAccountID)}
                             onPress={Session.checkIfActionIsAllowed(() => {
                                 if (isTaskCompleted) {
                                     Task.reopenTask(taskReport, taskReportID);
diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
index e327b4664bcb..7901426b33e0 100644
--- a/src/components/ReportActionItem/TaskView.tsx
+++ b/src/components/ReportActionItem/TaskView.tsx
@@ -114,7 +114,7 @@ function TaskView({report}: TaskViewProps) {
                                                 {taskTitle}
                                             </Text>
                                         </View>
-                                        {isOpen && (
+                                        {!isDisableInteractive && (
                                             <View style={styles.taskRightIconContainer}>
                                                 <Icon
                                                     additionalStyles={[styles.alignItemsCenter]}
@@ -135,7 +135,7 @@ function TaskView({report}: TaskViewProps) {
                         description={translate('task.description')}
                         title={report.description ?? ''}
                         onPress={() => Navigation.navigate(ROUTES.REPORT_DESCRIPTION.getRoute(report.reportID, Navigation.getReportRHPActiveRoute()))}
-                        shouldShowRightIcon={isOpen}
+                        shouldShowRightIcon={!isDisableInteractive}
                         disabled={disableState}
                         wrapperStyle={[styles.pv2, styles.taskDescriptionMenuItem]}
                         shouldGreyOutWhenDisabled={false}
@@ -154,7 +154,7 @@ function TaskView({report}: TaskViewProps) {
                             avatarSize={CONST.AVATAR_SIZE.SMALLER}
                             titleStyle={styles.assigneeTextStyle}
                             onPress={() => Navigation.navigate(ROUTES.TASK_ASSIGNEE.getRoute(report.reportID, Navigation.getReportRHPActiveRoute()))}
-                            shouldShowRightIcon={isOpen}
+                            shouldShowRightIcon={!isDisableInteractive}
                             disabled={disableState}
                             wrapperStyle={[styles.pv2]}
                             isSmallAvatarSubscriptMenu
@@ -167,7 +167,7 @@ function TaskView({report}: TaskViewProps) {
                         <MenuItemWithTopDescription
                             description={translate('task.assignee')}
                             onPress={() => Navigation.navigate(ROUTES.TASK_ASSIGNEE.getRoute(report.reportID, Navigation.getReportRHPActiveRoute()))}
-                            shouldShowRightIcon={isOpen}
+                            shouldShowRightIcon={!isDisableInteractive}
                             disabled={disableState}
                             wrapperStyle={[styles.pv2]}
                             shouldGreyOutWhenDisabled={false}
diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index 98d922c3fff3..8c701c22d701 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -1214,7 +1214,7 @@ function getTaskOwnerAccountID(taskReport: OnyxEntry<OnyxTypes.Report>): number
 }
 
 /**
- * Check if you're allowed to modify the task - anyone that has write access to the report can modify the task, except auditor
+ * Check if you're allowed to modify the task - only the author can modify the task
  */
 function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID: number, taskOwnerAccountID?: number): boolean {
     const ownerAccountID = getTaskOwnerAccountID(taskReport) ?? taskOwnerAccountID;
@@ -1243,6 +1243,16 @@ function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID
  * Check if you can change the status of the task (mark complete or incomplete). Only the task owner and task assignee can do this.
  */
 function canActionTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID: number, taskOwnerAccountID?: number, taskAssigneeAccountID?: number): boolean {
+    if (ReportUtils.isCanceledTaskReport(taskReport)) {
+        return false;
+    }
+
+    const parentReport = getParentReport(taskReport);
+    const reportNameValuePairs = ReportUtils.getReportNameValuePairs(parentReport?.reportID);
+    if (ReportUtils.isArchivedRoom(parentReport, reportNameValuePairs)) {
+        return false;
+    }
+
     const ownerAccountID = getTaskOwnerAccountID(taskReport) ?? taskOwnerAccountID;
     const assigneeAccountID = getTaskAssigneeAccountID(taskReport) ?? taskAssigneeAccountID;
     return sessionAccountID === ownerAccountID || sessionAccountID === assigneeAccountID;

From 52a2cea2f0ba2a549efa957e2680029637a2f649 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Tue, 17 Dec 2024 05:03:17 +0530
Subject: [PATCH 19/21] fix eslint.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 .../ReportActionItem/TaskPreview.tsx          |  4 +-
 src/components/TaskHeaderActionButton.tsx     |  3 +-
 src/libs/ReportUtils.ts                       |  7 +++-
 src/libs/actions/Task.ts                      | 42 ++++++++-----------
 4 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/src/components/ReportActionItem/TaskPreview.tsx b/src/components/ReportActionItem/TaskPreview.tsx
index 8eef8ddfe0ca..2ea295d16143 100644
--- a/src/components/ReportActionItem/TaskPreview.tsx
+++ b/src/components/ReportActionItem/TaskPreview.tsx
@@ -75,8 +75,8 @@ function TaskPreview({taskReportID, action, contextMenuAnchor, chatReportID, che
         ? taskReport?.stateNum === CONST.REPORT.STATE_NUM.APPROVED && taskReport.statusNum === CONST.REPORT.STATUS_NUM.APPROVED
         : action?.childStateNum === CONST.REPORT.STATE_NUM.APPROVED && action?.childStatusNum === CONST.REPORT.STATUS_NUM.APPROVED;
     const taskTitle = Str.htmlEncode(TaskUtils.getTaskTitleFromReport(taskReport, action?.childReportName ?? ''));
-    const taskAssigneeAccountID = Task.getTaskAssigneeAccountID(taskReport) ?? action?.childManagerAccountID ?? -1;
-    const taskOwnerAccountID = taskReport?.ownerAccountID ?? action?.actorAccountID;
+    const taskAssigneeAccountID = Task.getTaskAssigneeAccountID(taskReport) ?? action?.childManagerAccountID ?? CONST.DEFAULT_NUMBER_ID;
+    const taskOwnerAccountID = taskReport?.ownerAccountID ?? action?.actorAccountID ?? CONST.DEFAULT_NUMBER_ID;
     const hasAssignee = taskAssigneeAccountID > 0;
     const personalDetails = usePersonalDetails();
     const avatar = personalDetails?.[taskAssigneeAccountID]?.avatar ?? Expensicons.FallbackAvatar;
diff --git a/src/components/TaskHeaderActionButton.tsx b/src/components/TaskHeaderActionButton.tsx
index eff86b5f690a..dd2ba54c2f6d 100644
--- a/src/components/TaskHeaderActionButton.tsx
+++ b/src/components/TaskHeaderActionButton.tsx
@@ -6,6 +6,7 @@ import * as ReportUtils from '@libs/ReportUtils';
 import * as TaskUtils from '@libs/TaskUtils';
 import * as Session from '@userActions/Session';
 import * as Task from '@userActions/Task';
+import CONST from '@src/CONST';
 import type * as OnyxTypes from '@src/types/onyx';
 import Button from './Button';
 import {useSession} from './OnyxProvider';
@@ -28,7 +29,7 @@ function TaskHeaderActionButton({report}: TaskHeaderActionButtonProps) {
         <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentEnd]}>
             <Button
                 success
-                isDisabled={!Task.canActionTask(report, session?.accountID ?? -1)}
+                isDisabled={!Task.canActionTask(report, session?.accountID ?? CONST.DEFAULT_NUMBER_ID)}
                 text={translate(ReportUtils.isCompletedTaskReport(report) ? 'task.markAsIncomplete' : 'task.markAsComplete')}
                 onPress={Session.checkIfActionIsAllowed(() => {
                     // If we're already navigating to these task editing pages, early return not to mark as completed, otherwise we would have not found page.
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index eb728586f8f2..ea23c5d067b5 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -7422,7 +7422,6 @@ function getTaskAssigneeChatOnyxData(
     accountID: number,
     assigneeAccountID: number,
     taskReportID: string,
-    assigneeChatReportID: string,
     parentReportID: string,
     title: string,
     assigneeChatReport: OnyxEntry<Report>,
@@ -7431,6 +7430,7 @@ function getTaskAssigneeChatOnyxData(
     let optimisticAssigneeAddComment: OptimisticReportAction | undefined;
     // Set if this is a new chat that needs to be created for the assignee
     let optimisticChatCreatedReportAction: OptimisticCreatedReportAction | undefined;
+    const assigneeChatReportID = assigneeChatReport?.reportID;
     const assigneeChatReportMetadata = getReportMetadata(assigneeChatReportID);
     const currentTime = DateUtils.getDBTime();
     const optimisticData: OnyxUpdate[] = [];
@@ -7439,7 +7439,7 @@ function getTaskAssigneeChatOnyxData(
 
     // You're able to assign a task to someone you haven't chatted with before - so we need to optimistically create the chat and the chat reportActions
     // Only add the assignee chat report to onyx if we haven't already set it optimistically
-    if (assigneeChatReportMetadata?.isOptimisticReport && assigneeChatReport?.pendingFields?.createChat !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
+    if (assigneeChatReportID && assigneeChatReportMetadata?.isOptimisticReport && assigneeChatReport?.pendingFields?.createChat !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
         optimisticChatCreatedReportAction = buildOptimisticCreatedReportAction(assigneeChatReportID);
         optimisticData.push(
             {
@@ -8507,6 +8507,9 @@ function hasInvoiceReports() {
 }
 
 function getReportMetadata(reportID?: string) {
+    if (!reportID) {
+        return;
+    }
     return allReportMetadata?.[`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`];
 }
 
diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index 8c701c22d701..fde01c7bf8ac 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -47,7 +47,7 @@ Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (value) => {
         currentUserEmail = value?.email ?? '';
-        currentUserAccountID = value?.accountID ?? -1;
+        currentUserAccountID = value?.accountID ?? CONST.DEFAULT_NUMBER_ID;
     },
 });
 
@@ -125,7 +125,7 @@ function createTaskAndNavigate(
 ) {
     const optimisticTaskReport = ReportUtils.buildOptimisticTaskReport(currentUserAccountID, assigneeAccountID, parentReportID, title, description, policyID);
 
-    const assigneeChatReportID = assigneeChatReport?.reportID ?? '-1';
+    const assigneeChatReportID = assigneeChatReport?.reportID;
     const taskReportID = optimisticTaskReport.reportID;
     let assigneeChatReportOnyxData;
 
@@ -222,15 +222,7 @@ function createTaskAndNavigate(
     ];
 
     if (assigneeChatReport) {
-        assigneeChatReportOnyxData = ReportUtils.getTaskAssigneeChatOnyxData(
-            currentUserAccountID,
-            assigneeAccountID,
-            taskReportID,
-            assigneeChatReportID,
-            parentReportID,
-            title,
-            assigneeChatReport,
-        );
+        assigneeChatReportOnyxData = ReportUtils.getTaskAssigneeChatOnyxData(currentUserAccountID, assigneeAccountID, taskReportID, parentReportID, title, assigneeChatReport);
 
         optimisticData.push(...assigneeChatReportOnyxData.optimisticData);
         successData.push(...assigneeChatReportOnyxData.successData);
@@ -366,7 +358,12 @@ function getOutstandingChildTask(taskReport: OnyxEntry<OnyxTypes.Report>) {
  * Complete a task
  */
 function completeTask(taskReport: OnyxEntry<OnyxTypes.Report>, reportIDFromAction?: string) {
-    const taskReportID = taskReport?.reportID ?? reportIDFromAction ?? '-1';
+    const taskReportID = taskReport?.reportID ?? reportIDFromAction;
+
+    if (!taskReportID) {
+        return;
+    }
+
     const message = `marked as complete`;
     const completedTaskReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASK_COMPLETED, message);
     const parentReport = getParentReport(taskReport);
@@ -451,7 +448,10 @@ function completeTask(taskReport: OnyxEntry<OnyxTypes.Report>, reportIDFromActio
  * Reopen a closed task
  */
 function reopenTask(taskReport: OnyxEntry<OnyxTypes.Report>, reportIDFromAction?: string) {
-    const taskReportID = taskReport?.reportID ?? reportIDFromAction ?? '-1';
+    const taskReportID = taskReport?.reportID ?? reportIDFromAction;
+    if (!taskReportID) {
+        return;
+    }
     const message = `marked as incomplete`;
     const reopenedTaskReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASK_REOPENED, message);
     const parentReport = getParentReport(taskReport);
@@ -608,11 +608,11 @@ function editTask(report: OnyxTypes.Report, {title, description}: OnyxTypes.Task
 
 function editTaskAssignee(report: OnyxTypes.Report, sessionAccountID: number, assigneeEmail: string, assigneeAccountID: number | null = 0, assigneeChatReport?: OnyxEntry<OnyxTypes.Report>) {
     // Create the EditedReportAction on the task
-    const editTaskReportAction = ReportUtils.buildOptimisticChangedTaskAssigneeReportAction(assigneeAccountID ?? 0);
+    const editTaskReportAction = ReportUtils.buildOptimisticChangedTaskAssigneeReportAction(assigneeAccountID ?? CONST.DEFAULT_NUMBER_ID);
     const reportName = report.reportName?.trim();
 
     let assigneeChatReportOnyxData;
-    const assigneeChatReportID = assigneeChatReport ? assigneeChatReport.reportID : '-1';
+    const assigneeChatReportID = assigneeChatReport?.reportID;
     const assigneeChatReportMetadata = ReportUtils.getReportMetadata(assigneeChatReport?.reportID);
     const parentReport = getParentReport(report);
     const taskOwnerAccountID = getTaskOwnerAccountID(report);
@@ -705,7 +705,7 @@ function editTaskAssignee(report: OnyxTypes.Report, sessionAccountID: number, as
 
     // If we make a change to the assignee, we want to add a comment to the assignee's chat
     // Check if the assignee actually changed
-    if (assigneeAccountID && assigneeAccountID !== report.managerID && assigneeAccountID !== sessionAccountID && assigneeChatReport) {
+    if (assigneeAccountID && assigneeAccountID !== report.managerID && assigneeAccountID !== sessionAccountID && assigneeChatReport && report.parentReportID && reportName) {
         optimisticReport.participants = {
             ...(optimisticReport.participants ?? {}),
             [assigneeAccountID]: {
@@ -713,15 +713,7 @@ function editTaskAssignee(report: OnyxTypes.Report, sessionAccountID: number, as
             },
         };
 
-        assigneeChatReportOnyxData = ReportUtils.getTaskAssigneeChatOnyxData(
-            currentUserAccountID,
-            assigneeAccountID,
-            report.reportID,
-            assigneeChatReportID ?? '-1',
-            report.parentReportID ?? '-1',
-            reportName ?? '',
-            assigneeChatReport,
-        );
+        assigneeChatReportOnyxData = ReportUtils.getTaskAssigneeChatOnyxData(currentUserAccountID, assigneeAccountID, report.reportID, report.parentReportID, reportName, assigneeChatReport);
 
         if (assigneeChatReportMetadata?.isOptimisticReport && assigneeChatReport.pendingFields?.createChat !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
             // BE will send a different participant. We clear the optimistic one to avoid duplicated entries

From 65b2f4139bb513ad0ba6395aa833c23a235bf649 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Tue, 17 Dec 2024 05:08:03 +0530
Subject: [PATCH 20/21] revert changes to dfeault values.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/libs/ReportUtils.ts  |  7 ++-----
 src/libs/actions/Task.ts | 26 +++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index ea23c5d067b5..eb728586f8f2 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -7422,6 +7422,7 @@ function getTaskAssigneeChatOnyxData(
     accountID: number,
     assigneeAccountID: number,
     taskReportID: string,
+    assigneeChatReportID: string,
     parentReportID: string,
     title: string,
     assigneeChatReport: OnyxEntry<Report>,
@@ -7430,7 +7431,6 @@ function getTaskAssigneeChatOnyxData(
     let optimisticAssigneeAddComment: OptimisticReportAction | undefined;
     // Set if this is a new chat that needs to be created for the assignee
     let optimisticChatCreatedReportAction: OptimisticCreatedReportAction | undefined;
-    const assigneeChatReportID = assigneeChatReport?.reportID;
     const assigneeChatReportMetadata = getReportMetadata(assigneeChatReportID);
     const currentTime = DateUtils.getDBTime();
     const optimisticData: OnyxUpdate[] = [];
@@ -7439,7 +7439,7 @@ function getTaskAssigneeChatOnyxData(
 
     // You're able to assign a task to someone you haven't chatted with before - so we need to optimistically create the chat and the chat reportActions
     // Only add the assignee chat report to onyx if we haven't already set it optimistically
-    if (assigneeChatReportID && assigneeChatReportMetadata?.isOptimisticReport && assigneeChatReport?.pendingFields?.createChat !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
+    if (assigneeChatReportMetadata?.isOptimisticReport && assigneeChatReport?.pendingFields?.createChat !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
         optimisticChatCreatedReportAction = buildOptimisticCreatedReportAction(assigneeChatReportID);
         optimisticData.push(
             {
@@ -8507,9 +8507,6 @@ function hasInvoiceReports() {
 }
 
 function getReportMetadata(reportID?: string) {
-    if (!reportID) {
-        return;
-    }
     return allReportMetadata?.[`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`];
 }
 
diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index fde01c7bf8ac..1888651dedcd 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -125,7 +125,7 @@ function createTaskAndNavigate(
 ) {
     const optimisticTaskReport = ReportUtils.buildOptimisticTaskReport(currentUserAccountID, assigneeAccountID, parentReportID, title, description, policyID);
 
-    const assigneeChatReportID = assigneeChatReport?.reportID;
+    const assigneeChatReportID = assigneeChatReport?.reportID ?? CONST.DEFAULT_NUMBER_ID;
     const taskReportID = optimisticTaskReport.reportID;
     let assigneeChatReportOnyxData;
 
@@ -222,7 +222,15 @@ function createTaskAndNavigate(
     ];
 
     if (assigneeChatReport) {
-        assigneeChatReportOnyxData = ReportUtils.getTaskAssigneeChatOnyxData(currentUserAccountID, assigneeAccountID, taskReportID, parentReportID, title, assigneeChatReport);
+        assigneeChatReportOnyxData = ReportUtils.getTaskAssigneeChatOnyxData(
+            currentUserAccountID,
+            assigneeAccountID,
+            taskReportID,
+            assigneeChatReportID,
+            parentReportID,
+            title,
+            assigneeChatReport,
+        );
 
         optimisticData.push(...assigneeChatReportOnyxData.optimisticData);
         successData.push(...assigneeChatReportOnyxData.successData);
@@ -612,7 +620,7 @@ function editTaskAssignee(report: OnyxTypes.Report, sessionAccountID: number, as
     const reportName = report.reportName?.trim();
 
     let assigneeChatReportOnyxData;
-    const assigneeChatReportID = assigneeChatReport?.reportID;
+    const assigneeChatReportID = assigneeChatReport ? assigneeChatReport.reportID : '-1';
     const assigneeChatReportMetadata = ReportUtils.getReportMetadata(assigneeChatReport?.reportID);
     const parentReport = getParentReport(report);
     const taskOwnerAccountID = getTaskOwnerAccountID(report);
@@ -705,7 +713,7 @@ function editTaskAssignee(report: OnyxTypes.Report, sessionAccountID: number, as
 
     // If we make a change to the assignee, we want to add a comment to the assignee's chat
     // Check if the assignee actually changed
-    if (assigneeAccountID && assigneeAccountID !== report.managerID && assigneeAccountID !== sessionAccountID && assigneeChatReport && report.parentReportID && reportName) {
+    if (assigneeAccountID && assigneeAccountID !== report.managerID && assigneeAccountID !== sessionAccountID && assigneeChatReport) {
         optimisticReport.participants = {
             ...(optimisticReport.participants ?? {}),
             [assigneeAccountID]: {
@@ -713,7 +721,15 @@ function editTaskAssignee(report: OnyxTypes.Report, sessionAccountID: number, as
             },
         };
 
-        assigneeChatReportOnyxData = ReportUtils.getTaskAssigneeChatOnyxData(currentUserAccountID, assigneeAccountID, report.reportID, report.parentReportID, reportName, assigneeChatReport);
+        assigneeChatReportOnyxData = ReportUtils.getTaskAssigneeChatOnyxData(
+            currentUserAccountID,
+            assigneeAccountID,
+            report.reportID,
+            assigneeChatReportID ?? '-1',
+            report.parentReportID ?? '-1',
+            reportName ?? '',
+            assigneeChatReport,
+        );
 
         if (assigneeChatReportMetadata?.isOptimisticReport && assigneeChatReport.pendingFields?.createChat !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
             // BE will send a different participant. We clear the optimistic one to avoid duplicated entries

From e438da3b70be1641121313662ecfd9976ec6169a Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Tue, 17 Dec 2024 05:09:33 +0530
Subject: [PATCH 21/21] minor update.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/libs/actions/Task.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index 1888651dedcd..bfd612bd2196 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -125,7 +125,7 @@ function createTaskAndNavigate(
 ) {
     const optimisticTaskReport = ReportUtils.buildOptimisticTaskReport(currentUserAccountID, assigneeAccountID, parentReportID, title, description, policyID);
 
-    const assigneeChatReportID = assigneeChatReport?.reportID ?? CONST.DEFAULT_NUMBER_ID;
+    const assigneeChatReportID = assigneeChatReport?.reportID ?? '-1';
     const taskReportID = optimisticTaskReport.reportID;
     let assigneeChatReportOnyxData;