Skip to content

Commit

Permalink
Merge pull request #41608 from FitseTLT/fix-no-activity-yet-on-search…
Browse files Browse the repository at this point in the history
…-bug
  • Loading branch information
francoisl authored May 6, 2024
2 parents 2c3f939 + 0037a6a commit 19c0687
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions src/libs/OptionsListUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -536,12 +536,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 @@ -725,8 +722,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

0 comments on commit 19c0687

Please sign in to comment.