From 4a6e9ff1ac91c87c7e23e93165449c352f3e5858 Mon Sep 17 00:00:00 2001 From: Nam Le Date: Mon, 25 Sep 2023 12:48:07 +0700 Subject: [PATCH] fix last messaage LHN with task action --- src/libs/SidebarUtils.js | 7 +++---- src/libs/actions/Task.js | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js index f645697690e6..d5db3e947070 100644 --- a/src/libs/SidebarUtils.js +++ b/src/libs/SidebarUtils.js @@ -13,6 +13,7 @@ import * as CollectionUtils from './CollectionUtils'; import * as LocalePhoneNumber from './LocalePhoneNumber'; import * as UserUtils from './UserUtils'; import * as PersonalDetailsUtils from './PersonalDetailsUtils'; +import * as Task from './actions/Task'; const visibleReportActionItems = {}; const lastReportActions = {}; @@ -339,10 +340,8 @@ function getOptionData(report, reportActions, personalDetails, preferredLocale, if (lodashGet(lastAction, 'actionName', '') === CONST.REPORT.ACTIONS.TYPE.RENAMED) { const newName = lodashGet(lastAction, 'originalMessage.newName', ''); result.alternateText = Localize.translate(preferredLocale, 'newRoomPage.roomRenamedTo', {newName}); - } else if (lodashGet(lastAction, 'actionName', '') === CONST.REPORT.ACTIONS.TYPE.TASKREOPENED) { - result.alternateText = `${Localize.translate(preferredLocale, 'task.messages.reopened')}: ${report.reportName}`; - } else if (lodashGet(lastAction, 'actionName', '') === CONST.REPORT.ACTIONS.TYPE.TASKCOMPLETED) { - result.alternateText = `${Localize.translate(preferredLocale, 'task.messages.completed')}: ${report.reportName}`; + } else if (ReportActionsUtils.isTaskAction(lastAction)) { + result.alternateText = Task.getTaskReportActionMessage(lastAction.actionName, report.reportID, false); } else { result.alternateText = lastMessageTextFromReport.length > 0 ? lastMessageText : Localize.translate(preferredLocale, 'report.noActivityYet'); } diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index 4e71a8793f1e..e39dad853779 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -941,7 +941,7 @@ function getTaskReportActionMessage(actionName, reportID, isCreateTaskAction) { taskStatusText = Localize.translateLocal('task.task'); } - return `${taskStatusText} ${report.reportName}`; + return `${taskStatusText}: ${report.reportName}`; } export {