From 45528451dc610ea68ba09c354dbd41fda388a81c Mon Sep 17 00:00:00 2001 From: Ishpaul Singh Date: Tue, 25 Jun 2024 01:15:35 +0530 Subject: [PATCH 1/3] fixes the issue --- src/libs/SidebarUtils.ts | 3 +++ src/types/onyx/OriginalMessage.ts | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts index e44643f391c1..402556da8bce 100644 --- a/src/libs/SidebarUtils.ts +++ b/src/libs/SidebarUtils.ts @@ -352,6 +352,9 @@ function getOptionData({ : ` ${Localize.translate(preferredLocale, 'workspace.invite.from')}`; result.alternateText += `${preposition} ${roomName}`; } + if (lastActionName === CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.UPDATE_ROOM_DESCRIPTION) { + result.alternateText = `${lastActorDisplayName} set the room description to : ${lastActionOriginalMessage?.description}`; + } } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.LEAVE_POLICY) { result.alternateText = Localize.translateLocal('workspace.invite.leftWorkspace'); } else if (lastAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW && lastActorDisplayName && lastMessageTextFromReport) { diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts index c700dca53f34..edeeeab551b0 100644 --- a/src/types/onyx/OriginalMessage.ts +++ b/src/types/onyx/OriginalMessage.ts @@ -236,6 +236,9 @@ type OriginalMessageChangeLog = { /** Name of the chat room */ roomName?: string; + /** Description of the chat room */ + description?: string; + /** ID of the report */ reportID?: number; }; From 28492c4106cd0fef7c9e0d70c47bbbc5923420a7 Mon Sep 17 00:00:00 2001 From: Ishpaul Singh Date: Tue, 25 Jun 2024 01:49:42 +0530 Subject: [PATCH 2/3] fixes empty string --- src/libs/SidebarUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts index 402556da8bce..73a59f96b7a5 100644 --- a/src/libs/SidebarUtils.ts +++ b/src/libs/SidebarUtils.ts @@ -353,7 +353,7 @@ function getOptionData({ result.alternateText += `${preposition} ${roomName}`; } if (lastActionName === CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.UPDATE_ROOM_DESCRIPTION) { - result.alternateText = `${lastActorDisplayName} set the room description to : ${lastActionOriginalMessage?.description}`; + result.alternateText = `${lastActorDisplayName} set the room description to : ${lastActionOriginalMessage?.description}`.trim(); } } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.LEAVE_POLICY) { result.alternateText = Localize.translateLocal('workspace.invite.leftWorkspace'); From a018b79bd9367502a8f2dcbe3caf8e7314f9fbda Mon Sep 17 00:00:00 2001 From: Ishpaul Singh Date: Tue, 25 Jun 2024 02:06:36 +0530 Subject: [PATCH 3/3] fixes translation for room description --- src/languages/en.ts | 3 +++ src/languages/es.ts | 3 +++ src/libs/SidebarUtils.ts | 4 +++- src/pages/home/report/ReportActionItem.tsx | 5 ++++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 56ad3f45193d..5f1e3ad576f8 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -3363,4 +3363,7 @@ export default { additionalInfoTitle: 'What software are you moving to and why?', additionalInfoInputLabel: 'Your response', }, + roomChangeLog: { + updateRoomDescription: 'set the room description to:', + }, } satisfies TranslationBase; diff --git a/src/languages/es.ts b/src/languages/es.ts index 28c7f60384cc..6c3b5b5e8da2 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -3867,4 +3867,7 @@ export default { additionalInfoTitle: '¿A qué software está migrando y por qué?', additionalInfoInputLabel: 'Tu respuesta', }, + roomChangeLog: { + updateRoomDescription: 'establece la descripción de la sala a:', + }, } satisfies EnglishTranslation; diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts index 73a59f96b7a5..a8c5a35d211d 100644 --- a/src/libs/SidebarUtils.ts +++ b/src/libs/SidebarUtils.ts @@ -353,7 +353,9 @@ function getOptionData({ result.alternateText += `${preposition} ${roomName}`; } if (lastActionName === CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.UPDATE_ROOM_DESCRIPTION) { - result.alternateText = `${lastActorDisplayName} set the room description to : ${lastActionOriginalMessage?.description}`.trim(); + result.alternateText = `${lastActorDisplayName} ${Localize.translate(preferredLocale, 'roomChangeLog.updateRoomDescription')} ${ + lastActionOriginalMessage?.description + }`.trim(); } } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.LEAVE_POLICY) { result.alternateText = Localize.translateLocal('workspace.invite.leftWorkspace'); diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx index 7184dd3eabc7..d58da8846ad4 100644 --- a/src/pages/home/report/ReportActionItem.tsx +++ b/src/pages/home/report/ReportActionItem.tsx @@ -62,7 +62,7 @@ import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import type * as OnyxTypes from '@src/types/onyx'; import type {Errors} from '@src/types/onyx/OnyxCommon'; -import type {JoinWorkspaceResolution} from '@src/types/onyx/OriginalMessage'; +import type {JoinWorkspaceResolution, OriginalMessageChangeLog} from '@src/types/onyx/OriginalMessage'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; import {RestrictedReadOnlyContextMenuActions} from './ContextMenu/ContextMenuActions'; import MiniReportActionContextMenu from './ContextMenu/MiniReportActionContextMenu'; @@ -623,6 +623,9 @@ function ReportActionItem({ children = ; } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.MERGED_WITH_CASH_TRANSACTION) { children = ; + } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.UPDATE_ROOM_DESCRIPTION) { + const message = `${translate('roomChangeLog.updateRoomDescription')} ${(originalMessage as OriginalMessageChangeLog)?.description}`; + children = ; } else if (ReportActionsUtils.isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION)) { children = ; } else {