From 7985bcd2673c16444f0b5fb7077d38aa3c9dc309 Mon Sep 17 00:00:00 2001 From: Jack Nam Date: Thu, 1 Jun 2023 15:33:09 -0700 Subject: [PATCH 01/13] move completeTask --- .../ReportActionItem/TaskPreview.js | 2 +- src/components/TaskHeader.js | 2 +- src/libs/actions/Task.js | 21 ++++++------------- src/pages/home/HeaderView.js | 2 +- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/components/ReportActionItem/TaskPreview.js b/src/components/ReportActionItem/TaskPreview.js index ae2c5accab26..cdc7ee41d3e0 100644 --- a/src/components/ReportActionItem/TaskPreview.js +++ b/src/components/ReportActionItem/TaskPreview.js @@ -74,7 +74,7 @@ const TaskPreview = (props) => { if (isTaskCompleted) { TaskUtils.reopenTask(props.taskReportID, parentReportID, taskTitle); } else { - TaskUtils.completeTask(props.taskReportID, parentReportID, taskTitle); + TaskUtils.completeTask(props.taskReportID, taskTitle); } }} /> diff --git a/src/components/TaskHeader.js b/src/components/TaskHeader.js index 850271049fe1..ff9d748ab93d 100644 --- a/src/components/TaskHeader.js +++ b/src/components/TaskHeader.js @@ -92,7 +92,7 @@ function TaskHeader(props) { isDisabled={TaskUtils.isTaskCanceled(props.report)} medium text={props.translate('newTaskPage.markAsDone')} - onPress={() => TaskUtils.completeTask(props.report.reportID, parentReportID, title)} + onPress={() => TaskUtils.completeTask(props.report.reportID, title)} /> )} diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index da751e4209a8..59a700976cee 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -170,8 +170,8 @@ function createTaskAndNavigate(currentUserEmail, parentReportID, title, descript Navigation.navigate(ROUTES.getReportRoute(optimisticTaskReport.reportID)); } -function completeTask(taskReportID, parentReportID, taskTitle) { - const message = `Completed task: ${taskTitle}`; +function completeTask(taskReportID, taskTitle) { + const message = `completed task: ${taskTitle}`; const completedTaskReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASKCOMPLETED, message); const optimisticData = [ @@ -185,16 +185,7 @@ function completeTask(taskReportID, parentReportID, taskTitle) { }, { onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`, - value: { - lastVisibleActionCreated: completedTaskReportAction.created, - lastMessageText: message, - lastActorEmail: completedTaskReportAction.actorEmail, - }, - }, - { - onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, + key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${taskReportID}`, value: {[completedTaskReportAction.reportActionID]: completedTaskReportAction}, }, ]; @@ -211,7 +202,7 @@ function completeTask(taskReportID, parentReportID, taskTitle) { }, { onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, + key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${taskReportID}`, value: {[completedTaskReportAction.reportActionID]: {pendingAction: null}}, }, ]; @@ -233,7 +224,7 @@ function completeTask(taskReportID, parentReportID, taskTitle) { * @param {string} taskTitle Title of the task */ function reopenTask(taskReportID, parentReportID, taskTitle) { - const message = `Reopened task: ${taskTitle}`; + const message = `reopened task: ${taskTitle}`; const reopenedTaskReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASKREOPENED, message); const optimisticData = [ @@ -529,7 +520,7 @@ function getShareDestination(reportID, reports, personalDetails) { * @param {number} originalStatusNum */ function cancelTask(taskReportID, parentReportID, taskTitle, originalStateNum, originalStatusNum) { - const message = `Canceled task: ${taskTitle}`; + const message = `canceled task: ${taskTitle}`; const optimisticCancelReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASKCANCELED, message); const optimisticReportActionID = optimisticCancelReportAction.reportActionID; diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js index 73cc0fc4a535..3b9946eca867 100644 --- a/src/pages/home/HeaderView.js +++ b/src/pages/home/HeaderView.js @@ -92,7 +92,7 @@ const HeaderView = (props) => { threeDotMenuItems.push({ icon: Expensicons.Checkmark, text: props.translate('newTaskPage.markAsDone'), - onSelected: () => Task.completeTask(props.report.reportID, props.report.parentReportID, title), + onSelected: () => Task.completeTask(props.report.reportID, title), }); } From 9cb80513559811930217a0c71cd4a9f9ea10983e Mon Sep 17 00:00:00 2001 From: Jack Nam Date: Thu, 1 Jun 2023 15:44:17 -0700 Subject: [PATCH 02/13] update the task action so that it does not redirect to existing link --- src/components/ReportActionItem/TaskAction.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/components/ReportActionItem/TaskAction.js b/src/components/ReportActionItem/TaskAction.js index 1406c78956f7..62cfb4d23cd8 100644 --- a/src/components/ReportActionItem/TaskAction.js +++ b/src/components/ReportActionItem/TaskAction.js @@ -46,7 +46,6 @@ const defaultProps = { isHovered: false, }; const TaskAction = (props) => { - const taskReportID = props.taskReportID; const taskReportName = props.taskReport.reportName || ''; let messageLinkText = ''; @@ -65,19 +64,12 @@ const TaskAction = (props) => { } return ( - Navigation.navigate(ROUTES.getReportRoute(taskReportID))} - style={[styles.flexRow, styles.justifyContentBetween]} - > + <> {messageLinkText} {` ${taskReportName}`} - - + ); }; From 347470100e040d0a0ea9ff238a7a3f8160b77d38 Mon Sep 17 00:00:00 2001 From: Jack Nam Date: Thu, 1 Jun 2023 15:44:29 -0700 Subject: [PATCH 03/13] update copy so it is uncapitalized --- src/languages/en.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 77638749d904..8fd49d50f621 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -1270,9 +1270,9 @@ export default { task: { completed: 'Completed', messages: { - completed: 'Completed task', - canceled: 'Canceled task', - reopened: 'Reopened task', + completed: 'completed task', + canceled: 'canceled task', + reopened: 'reopened task', }, }, statementPage: { From 9df0edb3a95be218b9bb8588386cad6f6facc0af Mon Sep 17 00:00:00 2001 From: Jack Nam Date: Thu, 1 Jun 2023 15:44:37 -0700 Subject: [PATCH 04/13] update reopenTask --- src/components/ReportActionItem/TaskPreview.js | 2 +- src/libs/actions/Task.js | 9 ++++----- src/pages/home/HeaderView.js | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/components/ReportActionItem/TaskPreview.js b/src/components/ReportActionItem/TaskPreview.js index cdc7ee41d3e0..e60005eace15 100644 --- a/src/components/ReportActionItem/TaskPreview.js +++ b/src/components/ReportActionItem/TaskPreview.js @@ -72,7 +72,7 @@ const TaskPreview = (props) => { disabled={TaskUtils.isTaskCanceled(props.taskReport)} onPress={() => { if (isTaskCompleted) { - TaskUtils.reopenTask(props.taskReportID, parentReportID, taskTitle); + TaskUtils.reopenTask(props.taskReportID, taskTitle); } else { TaskUtils.completeTask(props.taskReportID, taskTitle); } diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index 59a700976cee..64cc771b1697 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -220,10 +220,9 @@ function completeTask(taskReportID, taskTitle) { /** * Reopens a closed task * @param {string} taskReportID ReportID of the task - * @param {string} parentReportID ReportID of the linked parent report of the task so we can add the action * @param {string} taskTitle Title of the task */ -function reopenTask(taskReportID, parentReportID, taskTitle) { +function reopenTask(taskReportID, taskTitle) { const message = `reopened task: ${taskTitle}`; const reopenedTaskReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASKREOPENED, message); @@ -238,7 +237,7 @@ function reopenTask(taskReportID, parentReportID, taskTitle) { }, { onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`, + key: `${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`, value: { lastVisibleActionCreated: reopenedTaskReportAction.created, lastMessageText: message, @@ -247,7 +246,7 @@ function reopenTask(taskReportID, parentReportID, taskTitle) { }, { onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, + key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${taskReportID}`, value: {[reopenedTaskReportAction.reportActionID]: reopenedTaskReportAction}, }, ]; @@ -264,7 +263,7 @@ function reopenTask(taskReportID, parentReportID, taskTitle) { }, { onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, + key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${taskReportID}`, value: {[reopenedTaskReportAction.reportActionID]: {pendingAction: null}}, }, ]; diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js index 3b9946eca867..5a52d9c58b34 100644 --- a/src/pages/home/HeaderView.js +++ b/src/pages/home/HeaderView.js @@ -101,7 +101,7 @@ const HeaderView = (props) => { threeDotMenuItems.push({ icon: Expensicons.Checkmark, text: props.translate('newTaskPage.markAsIncomplete'), - onSelected: () => Task.reopenTask(props.report.reportID, props.report.parentReportID, title), + onSelected: () => Task.reopenTask(props.report.reportID, title), }); } From 859c002dc4d58eb8637fb6ead7eb4c15d8044b88 Mon Sep 17 00:00:00 2001 From: Jack Nam Date: Thu, 1 Jun 2023 15:50:16 -0700 Subject: [PATCH 05/13] cancel task --- src/components/ReportActionItem/TaskAction.js | 15 +-------------- src/libs/actions/Task.js | 9 ++++----- src/pages/home/HeaderView.js | 2 +- src/pages/home/report/ReportActionItem.js | 2 -- 4 files changed, 6 insertions(+), 22 deletions(-) diff --git a/src/components/ReportActionItem/TaskAction.js b/src/components/ReportActionItem/TaskAction.js index 62cfb4d23cd8..a32b1d7e474b 100644 --- a/src/components/ReportActionItem/TaskAction.js +++ b/src/components/ReportActionItem/TaskAction.js @@ -1,27 +1,15 @@ import React from 'react'; -import {View, Pressable} from 'react-native'; +import {View} from 'react-native'; import PropTypes from 'prop-types'; import {withOnyx} from 'react-native-onyx'; -import Navigation from '../../libs/Navigation/Navigation'; import withLocalize, {withLocalizePropTypes} from '../withLocalize'; -import ROUTES from '../../ROUTES'; import compose from '../../libs/compose'; import ONYXKEYS from '../../ONYXKEYS'; import Text from '../Text'; import styles from '../../styles/styles'; -import Icon from '../Icon'; -import * as Expensicons from '../Icon/Expensicons'; -import * as StyleUtils from '../../styles/StyleUtils'; -import getButtonState from '../../libs/getButtonState'; import CONST from '../../CONST'; const propTypes = { - /** The ID of the associated taskReport */ - taskReportID: PropTypes.string.isRequired, - - /** Whether the task preview is hovered so we can modify its style */ - isHovered: PropTypes.bool, - /** Name of the reportAction action */ actionName: PropTypes.string.isRequired, @@ -43,7 +31,6 @@ const propTypes = { const defaultProps = { taskReport: {}, - isHovered: false, }; const TaskAction = (props) => { const taskReportName = props.taskReport.reportName || ''; diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index 64cc771b1697..35bc08cac30e 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -513,12 +513,11 @@ function getShareDestination(reportID, reports, personalDetails) { /** * Cancels a task by setting the report state to SUBMITTED and status to CLOSED * @param {string} taskReportID - * @param {string} parentReportID * @param {string} taskTitle * @param {number} originalStateNum * @param {number} originalStatusNum */ -function cancelTask(taskReportID, parentReportID, taskTitle, originalStateNum, originalStatusNum) { +function cancelTask(taskReportID, taskTitle, originalStateNum, originalStatusNum) { const message = `canceled task: ${taskTitle}`; const optimisticCancelReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASKCANCELED, message); const optimisticReportActionID = optimisticCancelReportAction.reportActionID; @@ -534,7 +533,7 @@ function cancelTask(taskReportID, parentReportID, taskTitle, originalStateNum, o }, { onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`, + key: `${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`, value: { lastVisibleActionCreated: optimisticCancelReportAction.created, lastMessageText: message, @@ -543,7 +542,7 @@ function cancelTask(taskReportID, parentReportID, taskTitle, originalStateNum, o }, { onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, + key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${taskReportID}`, value: { [optimisticReportActionID]: optimisticCancelReportAction, }, @@ -561,7 +560,7 @@ function cancelTask(taskReportID, parentReportID, taskTitle, originalStateNum, o }, { onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, + key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${taskReportID}`, value: { [optimisticReportActionID]: null, }, diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js index 5a52d9c58b34..c6f312574394 100644 --- a/src/pages/home/HeaderView.js +++ b/src/pages/home/HeaderView.js @@ -110,7 +110,7 @@ const HeaderView = (props) => { threeDotMenuItems.push({ icon: Expensicons.Trashcan, text: props.translate('common.cancel'), - onSelected: () => Task.cancelTask(props.report.reportID, props.report.parentReportID, props.report.reportName, props.report.stateNum, props.report.statusNum), + onSelected: () => Task.cancelTask(props.report.reportID, props.report.reportName, props.report.stateNum, props.report.statusNum), }); } } diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js index 6a31d96bd23a..f332583b26b4 100644 --- a/src/pages/home/report/ReportActionItem.js +++ b/src/pages/home/report/ReportActionItem.js @@ -230,9 +230,7 @@ function ReportActionItem(props) { ) { children = ( ); } else if (ReportActionsUtils.isCreatedTaskReportAction(props.action)) { From 22a4177c315c7f68d5a6871feff180e320f82dfa Mon Sep 17 00:00:00 2001 From: Jack Nam Date: Thu, 1 Jun 2023 16:31:51 -0700 Subject: [PATCH 06/13] fix taskReportID --- src/components/ReportActionItem/TaskAction.js | 5 ++++- src/libs/actions/Task.js | 1 + src/pages/home/report/ReportActionItem.js | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/TaskAction.js b/src/components/ReportActionItem/TaskAction.js index a32b1d7e474b..90483e9dff3b 100644 --- a/src/components/ReportActionItem/TaskAction.js +++ b/src/components/ReportActionItem/TaskAction.js @@ -13,8 +13,11 @@ const propTypes = { /** Name of the reportAction action */ actionName: PropTypes.string.isRequired, - /* Onyx Props */ + /** The ID of the associated taskReport */ + // eslint-disable-next-line react/no-unused-prop-types -- This is used in the withOnyx HOC + taskReportID: PropTypes.string.isRequired, + /* Onyx Props */ taskReport: PropTypes.shape({ /** Title of the task */ reportName: PropTypes.string, diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index 35bc08cac30e..a445200b0016 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -242,6 +242,7 @@ function reopenTask(taskReportID, taskTitle) { lastVisibleActionCreated: reopenedTaskReportAction.created, lastMessageText: message, lastActorEmail: reopenedTaskReportAction.actorEmail, + lastReadTime: reopenedTaskReportAction.created, }, }, { diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js index f332583b26b4..9b63489a1828 100644 --- a/src/pages/home/report/ReportActionItem.js +++ b/src/pages/home/report/ReportActionItem.js @@ -230,6 +230,7 @@ function ReportActionItem(props) { ) { children = ( ); From 1f26a5cbdf9be4a2c7867fa28ba0763d0bd642b9 Mon Sep 17 00:00:00 2001 From: Jack Nam Date: Thu, 1 Jun 2023 16:38:39 -0700 Subject: [PATCH 07/13] Update Task.js --- src/libs/actions/Task.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index a445200b0016..b3c645ef750e 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -183,6 +183,7 @@ function completeTask(taskReportID, taskTitle) { statusNum: CONST.REPORT.STATUS.APPROVED, }, }, + { onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${taskReportID}`, @@ -233,12 +234,6 @@ function reopenTask(taskReportID, taskTitle) { value: { stateNum: CONST.REPORT.STATE_NUM.OPEN, statusNum: CONST.REPORT.STATUS.OPEN, - }, - }, - { - onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`, - value: { lastVisibleActionCreated: reopenedTaskReportAction.created, lastMessageText: message, lastActorEmail: reopenedTaskReportAction.actorEmail, From 9626322d462c683b52d94d176fa94c316220c99a Mon Sep 17 00:00:00 2001 From: Jack Nam Date: Thu, 1 Jun 2023 16:56:23 -0700 Subject: [PATCH 08/13] remove lint --- src/components/TaskHeader.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/TaskHeader.js b/src/components/TaskHeader.js index ff9d748ab93d..45f4b42050bc 100644 --- a/src/components/TaskHeader.js +++ b/src/components/TaskHeader.js @@ -39,7 +39,6 @@ function TaskHeader(props) { const assigneeAvatar = UserUtils.getAvatar(lodashGet(props.personalDetails, [props.report.managerEmail, 'avatar']), props.report.managerEmail); const isOpen = props.report.stateNum === CONST.REPORT.STATE_NUM.OPEN && props.report.statusNum === CONST.REPORT.STATUS.OPEN; const isCompleted = props.report.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && props.report.statusNum === CONST.REPORT.STATUS.APPROVED; - const parentReportID = props.report.parentReportID; useEffect(() => { TaskUtils.setTaskReport(props.report); From 95978db7dc9b46bfba4fa60637105a0e210aef71 Mon Sep 17 00:00:00 2001 From: Jack Nam Date: Fri, 2 Jun 2023 10:08:18 -0700 Subject: [PATCH 09/13] lint --- src/components/ReportActionItem/TaskPreview.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/ReportActionItem/TaskPreview.js b/src/components/ReportActionItem/TaskPreview.js index e60005eace15..efa99e434b33 100644 --- a/src/components/ReportActionItem/TaskPreview.js +++ b/src/components/ReportActionItem/TaskPreview.js @@ -57,7 +57,6 @@ const TaskPreview = (props) => { (props.taskReport.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && props.taskReport.statusNum === CONST.REPORT.STATUS.APPROVED) || (props.action.childStateNum === CONST.REPORT.STATE_NUM.SUBMITTED && props.action.childStatusNum === CONST.REPORT.STATUS.APPROVED); const taskTitle = props.action.taskTitle || props.taskReport.reportName; - const parentReportID = props.action.parentReportID || props.taskReport.parentReportID; return ( Date: Mon, 5 Jun 2023 15:06:14 -0400 Subject: [PATCH 10/13] Update Task.js --- src/libs/actions/Task.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index 793af1d49de5..1c0663c5b163 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -183,7 +183,7 @@ function completeTask(taskReportID, taskTitle) { statusNum: CONST.REPORT.STATUS.APPROVED, }, }, - + { onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${taskReportID}`, From 3e798cd2f413729c377fa6d90fafae1c69ef16f8 Mon Sep 17 00:00:00 2001 From: Jack Nam Date: Tue, 6 Jun 2023 10:16:36 -0400 Subject: [PATCH 11/13] update spanish translations as well --- src/languages/es.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/languages/es.js b/src/languages/es.js index 889da7379e5f..a06292495d1c 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -1279,9 +1279,9 @@ export default { task: { completed: 'Completada', messages: { - completed: 'Tarea completada', - canceled: 'Tarea cancelada', - reopened: 'Tarea reabrir', + completed: 'tarea completada', + canceled: 'tarea cancelada', + reopened: 'tarea reabrir', }, }, statementPage: { From 75899891c195bf8acdb960c7f2e444aed3913ecf Mon Sep 17 00:00:00 2001 From: Jack Nam Date: Tue, 6 Jun 2023 10:24:41 -0400 Subject: [PATCH 12/13] fix preview not updating --- src/components/ReportActionItem/TaskPreview.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/ReportActionItem/TaskPreview.js b/src/components/ReportActionItem/TaskPreview.js index c824d8b86170..1672261c814c 100644 --- a/src/components/ReportActionItem/TaskPreview.js +++ b/src/components/ReportActionItem/TaskPreview.js @@ -53,9 +53,7 @@ const TaskPreview = (props) => { // The reportAction might not contain details regarding the taskReport // Only the direct parent reportAction will contain details about the taskReport // Other linked reportActions will only contain the taskReportID and we will grab the details from there - const isTaskCompleted = - (props.taskReport.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && props.taskReport.statusNum === CONST.REPORT.STATUS.APPROVED) || - (props.action.childStateNum === CONST.REPORT.STATE_NUM.SUBMITTED && props.action.childStatusNum === CONST.REPORT.STATUS.APPROVED); + const isTaskCompleted = props.taskReport ? (props.taskReport.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && props.taskReport.statusNum === CONST.REPORT.STATUS.APPROVED) : (props.action.childStateNum === CONST.REPORT.STATE_NUM.SUBMITTED && props.action.childStatusNum === CONST.REPORT.STATUS.APPROVED); const taskTitle = props.taskReport.reportName || props.action.childReportName; const taskAssignee = props.taskReport.managerEmail || props.action.childManagerEmail; const htmlForTaskPreview = taskAssignee ? `@${taskAssignee} ${taskTitle}` : `${taskTitle}`; From 8933e76cc076788b6aeb80958fc8d5f322a9d79a Mon Sep 17 00:00:00 2001 From: Jack Nam Date: Tue, 6 Jun 2023 10:43:58 -0400 Subject: [PATCH 13/13] linter --- src/components/ReportActionItem/TaskPreview.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/TaskPreview.js b/src/components/ReportActionItem/TaskPreview.js index 1672261c814c..3f66c211d476 100644 --- a/src/components/ReportActionItem/TaskPreview.js +++ b/src/components/ReportActionItem/TaskPreview.js @@ -53,7 +53,9 @@ const TaskPreview = (props) => { // The reportAction might not contain details regarding the taskReport // Only the direct parent reportAction will contain details about the taskReport // Other linked reportActions will only contain the taskReportID and we will grab the details from there - const isTaskCompleted = props.taskReport ? (props.taskReport.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && props.taskReport.statusNum === CONST.REPORT.STATUS.APPROVED) : (props.action.childStateNum === CONST.REPORT.STATE_NUM.SUBMITTED && props.action.childStatusNum === CONST.REPORT.STATUS.APPROVED); + const isTaskCompleted = props.taskReport + ? props.taskReport.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && props.taskReport.statusNum === CONST.REPORT.STATUS.APPROVED + : props.action.childStateNum === CONST.REPORT.STATE_NUM.SUBMITTED && props.action.childStatusNum === CONST.REPORT.STATUS.APPROVED; const taskTitle = props.taskReport.reportName || props.action.childReportName; const taskAssignee = props.taskReport.managerEmail || props.action.childManagerEmail; const htmlForTaskPreview = taskAssignee ? `@${taskAssignee} ${taskTitle}` : `${taskTitle}`;