Skip to content

Commit 0dd36c9

Browse files
authored
Merge pull request #53732 from mkzie2/mkzie2-issue/52775
Fix remove member message in group chat is not translated in LHN
2 parents c657371 + b94ac84 commit 0dd36c9

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/libs/SidebarUtils.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,11 @@ function getOptionData({
429429
let lastMessageText = Str.removeSMSDomain(lastMessageTextFromReport);
430430

431431
const lastAction = visibleReportActionItems[report.reportID];
432+
const isGroupChat = ReportUtils.isGroupChat(report) || ReportUtils.isDeprecatedGroupDM(report);
432433

433434
const isThreadMessage =
434435
ReportUtils.isThread(report) && lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT && lastAction?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
435-
if ((result.isChatRoom || result.isPolicyExpenseChat || result.isThread || result.isTaskReport || isThreadMessage) && !result.private_isArchived) {
436+
if ((result.isChatRoom || result.isPolicyExpenseChat || result.isThread || result.isTaskReport || isThreadMessage || isGroupChat) && !result.private_isArchived) {
436437
const lastActionName = lastAction?.actionName ?? report.lastActionType;
437438

438439
if (ReportActionsUtils.isRenamedAction(lastAction)) {
@@ -495,10 +496,7 @@ function getOptionData({
495496
if (!lastMessageText) {
496497
lastMessageText = ReportUtils.formatReportLastMessageText(getWelcomeMessage(report, policy).messageText ?? Localize.translateLocal('report.noActivityYet'));
497498
}
498-
result.alternateText =
499-
(ReportUtils.isGroupChat(report) || ReportUtils.isDeprecatedGroupDM(report)) && lastActorDisplayName
500-
? ReportUtils.formatReportLastMessageText(Parser.htmlToText(`${lastActorDisplayName}: ${lastMessageText}`))
501-
: ReportUtils.formatReportLastMessageText(Parser.htmlToText(lastMessageText)) || formattedLogin;
499+
result.alternateText = ReportUtils.formatReportLastMessageText(Parser.htmlToText(lastMessageText)) || formattedLogin;
502500
}
503501

504502
result.isIOUReportOwner = ReportUtils.isIOUOwnedByCurrentUser(result as Report);

0 commit comments

Comments
 (0)