Skip to content

[NoQA] Revert "fix: Message Previews Always Include Sender Name" #57894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mountiny merged 1 commit into from
Mar 5, 2025
Merged

[NoQA] Revert "fix: Message Previews Always Include Sender Name" #57894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/libs/OptionsListUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,14 +534,10 @@ function uniqFast(items: string[]): string[] {
* Get the last actor display name from last actor details.
*/
function getLastActorDisplayName(lastActorDetails: Partial<PersonalDetails> | null, hasMultipleParticipants: boolean) {
if (!hasMultipleParticipants || !lastActorDetails) {
return '';
}

return lastActorDetails.accountID !== currentUserAccountID
return hasMultipleParticipants && lastActorDetails && lastActorDetails.accountID !== currentUserAccountID
? // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
lastActorDetails.firstName || formatPhoneNumber(getDisplayNameOrDefault(lastActorDetails))
: translateLocal('common.you');
: '';
}

/**
Expand Down
6 changes: 0 additions & 6 deletions tests/unit/OptionsListUtilsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import {
filterSelfDMChat,
filterWorkspaceChats,
formatMemberForList,
getLastActorDisplayName,
getMemberInviteOptions,
getSearchOptions,
getShareDestinationOptions,
Expand Down Expand Up @@ -812,11 +811,6 @@ describe('OptionsListUtils', () => {
expect(results.personalDetails.at(3)?.text).toBe('Invisible Woman');
});

it('getLastActorDisplayName()', () => {
expect(getLastActorDisplayName(PERSONAL_DETAILS['2'], true)).toBe('You');
expect(getLastActorDisplayName(PERSONAL_DETAILS['3'], true)).toBe('Spider-Man');
});

it('formatMemberForList()', () => {
const formattedMembers = Object.values(PERSONAL_DETAILS).map((personalDetail) => formatMemberForList(personalDetail));

Expand Down