diff --git a/src/CONST.js b/src/CONST.js index 369049a6e79d..2f8bd398b35c 100755 --- a/src/CONST.js +++ b/src/CONST.js @@ -463,6 +463,7 @@ const CONST = { CLOSED: 'CLOSED', CREATED: 'CREATED', TASKEDITED: 'TASKEDITED', + TASKCANCELED: 'TASKCANCELED', IOU: 'IOU', RENAMED: 'RENAMED', CHRONOSOOOLIST: 'CHRONOSOOOLIST', diff --git a/src/components/ReportActionItem/TaskAction.js b/src/components/ReportActionItem/TaskAction.js index f1e94b0b5ed9..1406c78956f7 100644 --- a/src/components/ReportActionItem/TaskAction.js +++ b/src/components/ReportActionItem/TaskAction.js @@ -54,6 +54,9 @@ const TaskAction = (props) => { case CONST.REPORT.ACTIONS.TYPE.TASKCOMPLETED: messageLinkText = props.translate('task.messages.completed'); break; + case CONST.REPORT.ACTIONS.TYPE.TASKCANCELED: + messageLinkText = props.translate('task.messages.canceled'); + break; case CONST.REPORT.ACTIONS.TYPE.TASKREOPENED: messageLinkText = props.translate('task.messages.reopened'); break; diff --git a/src/components/ReportActionItem/TaskPreview.js b/src/components/ReportActionItem/TaskPreview.js index 394ca5d9e366..ae2c5accab26 100644 --- a/src/components/ReportActionItem/TaskPreview.js +++ b/src/components/ReportActionItem/TaskPreview.js @@ -69,6 +69,7 @@ const TaskPreview = (props) => { style={[styles.mr2]} containerStyle={[styles.taskCheckbox]} isChecked={isTaskCompleted} + disabled={TaskUtils.isTaskCanceled(props.taskReport)} onPress={() => { if (isTaskCompleted) { TaskUtils.reopenTask(props.taskReportID, parentReportID, taskTitle); diff --git a/src/components/TaskHeader.js b/src/components/TaskHeader.js index 5b2c8825d0eb..474a009693ee 100644 --- a/src/components/TaskHeader.js +++ b/src/components/TaskHeader.js @@ -87,6 +87,7 @@ function TaskHeader(props) { ) : (