Skip to content

Commit 710bfcd

Browse files
committed
fix: unify invite message text
1 parent d40d0af commit 710bfcd

3 files changed

Lines changed: 22 additions & 1 deletion

File tree

src/libs/OptionsListUtils.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ import {
7373
getReportActionHtml,
7474
getReportActionMessageText,
7575
getRetractedMessage,
76+
getRoomChangeLogMessage,
7677
getSortedReportActions,
7778
getTravelUpdateMessage,
7879
getUpdateRoomDescriptionMessage,
@@ -93,6 +94,7 @@ import {
9394
isReimbursementDeQueuedOrCanceledAction,
9495
isReimbursementQueuedAction,
9596
isReportPreviewAction,
97+
isRoomChangeLogAction,
9698
isTaskAction,
9799
isThreadParentMessage,
98100
isUnapprovedAction,
@@ -847,6 +849,8 @@ function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails
847849
lastMessageTextFromReport = getPolicyChangeMessage(lastReportAction);
848850
} else if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.TRAVEL_UPDATE)) {
849851
lastMessageTextFromReport = getTravelUpdateMessage(lastReportAction);
852+
} else if (isRoomChangeLogAction(lastReportAction)) {
853+
lastMessageTextFromReport = getRoomChangeLogMessage(lastReportAction);
850854
}
851855

852856
// we do not want to show report closed in LHN for non archived report so use getReportLastMessage as fallback instead of lastMessageText from report

src/libs/ReportActionsUtils.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2884,6 +2884,22 @@ function getCardIssuedMessage({
28842884
}
28852885
}
28862886

2887+
function getRoomChangeLogMessage(reportAction: ReportAction) {
2888+
if (
2889+
!isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM) &&
2890+
!isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.REMOVE_FROM_ROOM)
2891+
) {
2892+
return '';
2893+
}
2894+
const originalMessage = getOriginalMessage(reportAction);
2895+
const targetAccountIDs: number[] = originalMessage?.targetAccountIDs ?? [];
2896+
const actionText = isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM)
2897+
? translateLocal('workspace.invite.invited')
2898+
: translateLocal('workspace.invite.removed');
2899+
const userText = (targetAccountIDs.length === 1 ? translateLocal('common.member') : translateLocal('common.members')).toLowerCase();
2900+
return `${actionText} ${targetAccountIDs.length} ${userText}`;
2901+
}
2902+
28872903
function getReportActionsLength() {
28882904
return Object.keys(allReportActions ?? {}).length;
28892905
}
@@ -3102,6 +3118,7 @@ export {
31023118
getWorkspaceCustomUnitRateUpdatedMessage,
31033119
getTagListNameUpdatedMessage,
31043120
getWorkspaceCustomUnitUpdatedMessage,
3121+
getRoomChangeLogMessage,
31053122
getReportActions,
31063123
getReopenedMessage,
31073124
getLeaveRoomMessage,

src/libs/SidebarUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ function getOptionData({
683683
? translateLocal('workspace.invite.invited')
684684
: translateLocal('workspace.invite.removed');
685685
const users = translateLocal(targetAccountIDsLength > 1 ? 'common.members' : 'common.member')?.toLocaleLowerCase();
686-
result.alternateText = formatReportLastMessageText(`${actorDisplayName ?? lastActorDisplayName} ${verb} ${targetAccountIDsLength} ${users}`);
686+
result.alternateText = formatReportLastMessageText(`${actorDisplayName ?? lastActorDisplayName}: ${verb} ${targetAccountIDsLength} ${users}`);
687687
const roomName = getReportName(allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${lastActionOriginalMessage?.reportID}`]) || lastActionOriginalMessage?.roomName;
688688
if (roomName) {
689689
const preposition =

0 commit comments

Comments
 (0)