Skip to content

fix - Chat - "No activity yet" is seen under a thread with replies #41608

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
francoisl merged 2 commits into from
May 6, 2024
Merged

fix - Chat - "No activity yet" is seen under a thread with replies #41608

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8213ec3
fixed no activity yet bug
FitseTLT May 2, 2024
0037a6a
remove lastmessage from the signature
FitseTLT May 6, 2024
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
10 changes: 3 additions & 7 deletions src/libs/OptionsListUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,12 +526,9 @@ function getLastActorDisplayName(lastActorDetails: Partial<PersonalDetails> | nu
/**
* Update alternate text for the option when applicable
*/
function getAlternateText(
option: ReportUtils.OptionData,
{showChatPreviewLine = false, forcePolicyNamePreview = false, lastMessageTextFromReport = ''}: PreviewConfig & {lastMessageTextFromReport?: string},
) {
function getAlternateText(option: ReportUtils.OptionData, {showChatPreviewLine = false, forcePolicyNamePreview = false}: PreviewConfig) {
if (!!option.isThread || !!option.isMoneyRequestReport) {
return lastMessageTextFromReport.length > 0 ? option.lastMessageText : Localize.translate(preferredLocale, 'report.noActivityYet');
return option.lastMessageText ? option.lastMessageText : Localize.translate(preferredLocale, 'report.noActivityYet');
}
if (!!option.isChatRoom || !!option.isPolicyExpenseChat) {
return showChatPreviewLine && !forcePolicyNamePreview && option.lastMessageText ? option.lastMessageText : option.subtitle;
Expand Down Expand Up @@ -714,8 +711,7 @@ function createOption(
result.lastMessageText = lastMessageText;

// If displaying chat preview line is needed, let's overwrite the default alternate text
result.alternateText =
showPersonalDetails && personalDetail?.login ? personalDetail.login : getAlternateText(result, {showChatPreviewLine, forcePolicyNamePreview, lastMessageTextFromReport});
result.alternateText = showPersonalDetails && personalDetail?.login ? personalDetail.login : getAlternateText(result, {showChatPreviewLine, forcePolicyNamePreview});

reportName = showPersonalDetails
? ReportUtils.getDisplayNameForParticipant(accountIDs[0]) || LocalePhoneNumber.formatPhoneNumber(personalDetail?.login ?? '')
Expand Down