From b05197674c96012fbb1fc943a8fa6216096df830 Mon Sep 17 00:00:00 2001 From: Jakub Butkiewicz Date: Fri, 26 Jan 2024 13:19:40 +0100 Subject: [PATCH 1/3] fix: use correct property --- src/libs/actions/Task.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts index b2f6b57f390a..893a11e5abba 100644 --- a/src/libs/actions/Task.ts +++ b/src/libs/actions/Task.ts @@ -789,8 +789,7 @@ function deleteTask(taskReportID: string, taskTitle: string, originalStateNum: n key: `${ONYXKEYS.COLLECTION.REPORT}${parentReport?.reportID}`, value: { lastMessageText: ReportActionsUtils.getLastVisibleMessage(parentReport?.reportID ?? '', optimisticReportActions as OnyxTypes.ReportActions).lastMessageText ?? '', - lastVisibleActionCreated: - ReportActionsUtils.getLastVisibleAction(parentReport?.reportID ?? '', optimisticReportActions as OnyxTypes.ReportActions)?.childLastVisibleActionCreated ?? 'created', + lastVisibleActionCreated: ReportActionsUtils.getLastVisibleAction(parentReport?.reportID ?? '', optimisticReportActions as OnyxTypes.ReportActions)?.created, }, }, { From dbcb0b42741bf498b7735a8631437f47e6e27340 Mon Sep 17 00:00:00 2001 From: Jakub Butkiewicz Date: Fri, 26 Jan 2024 15:11:22 +0100 Subject: [PATCH 2/3] fix: after deleting task report action shouldnt be highlighted in report --- src/libs/actions/Task.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts index 893a11e5abba..af18d8f903cc 100644 --- a/src/libs/actions/Task.ts +++ b/src/libs/actions/Task.ts @@ -767,7 +767,6 @@ function deleteTask(taskReportID: string, taskTitle: string, originalStateNum: n ], errors: undefined, linkMetadata: [], - reportActionID: '', }; const optimisticReportActions = { [parentReportAction.reportActionID]: optimisticReportAction, From 44b5f596d923d4e72315b39dfbb2902ae5512280 Mon Sep 17 00:00:00 2001 From: Jakub Butkiewicz Date: Fri, 26 Jan 2024 16:32:23 +0100 Subject: [PATCH 3/3] fix: added an improvment --- src/pages/home/report/ReportActionItem.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js index 80fb341a2cf8..24d53041b20b 100644 --- a/src/pages/home/report/ReportActionItem.js +++ b/src/pages/home/report/ReportActionItem.js @@ -150,7 +150,7 @@ function ReportActionItem(props) { const prevDraftMessage = usePrevious(props.draftMessage); const originalReportID = ReportUtils.getOriginalReportID(props.report.reportID, props.action); const originalReport = props.report.reportID === originalReportID ? props.report : ReportUtils.getReport(originalReportID); - const isReportActionLinked = props.linkedReportActionID === props.action.reportActionID; + const isReportActionLinked = props.linkedReportActionID && props.action.reportActionID && props.linkedReportActionID === props.action.reportActionID; const highlightedBackgroundColorIfNeeded = useMemo( () => (isReportActionLinked ? StyleUtils.getBackgroundColorStyle(theme.hoverComponentBG) : {}),