Skip to content
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

Jump to bottom

Fix/26669 lhn logic for paid reports #27700

Merged
merged 10 commits into from
Sep 27, 2023
Merged

Fix/26669 lhn logic for paid reports #27700

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d11037d
fix: wip - show worspace name
koko57 Sep 15, 2023
a5f0f6e
Merge branch 'main' into fix/26669-LHN-logic-for-paid-reports
koko57 Sep 18, 2023
21177c4
Merge branch 'main' into fix/26669-LHN-logic-for-paid-reports
koko57 Sep 18, 2023
3812470
fix: remove console log, rename lastActor variable
koko57 Sep 18, 2023
1b579c3
fix: minor fix
koko57 Sep 18, 2023
2421b63
fix: show policy name only for members
koko57 Sep 19, 2023
45ef578
fix: run prettier
koko57 Sep 19, 2023
2a84e8c
Merge branch 'main' into fix/26669-LHN-logic-for-paid-reports
koko57 Sep 26, 2023
d62bcc3
fix: remove doubled workspace name
koko57 Sep 26, 2023
765d45b
fix: lint
koko57 Sep 26, 2023
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: 5 additions & 3 deletions src/libs/SidebarUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,9 +331,9 @@ function getOptionData(report, reportActions, personalDetails, preferredLocale,
}
: null;
}
let lastMessageText =
hasMultipleParticipants && lastActorDetails && lastActorDetails.accountID && Number(lastActorDetails.accountID) !== currentUserAccountID ? `${lastActorDetails.displayName}: ` : '';
lastMessageText += report ? lastMessageTextFromReport : '';
const lastActorDisplayName =
hasMultipleParticipants && lastActorDetails && lastActorDetails.accountID && Number(lastActorDetails.accountID) !== currentUserAccountID ? lastActorDetails.displayName : '';
let lastMessageText = lastMessageTextFromReport;

if (result.isArchivedRoom) {
const archiveReason =
Expand All @@ -354,6 +354,8 @@ function getOptionData(report, reportActions, personalDetails, preferredLocale,
result.alternateText = `${Localize.translate(preferredLocale, 'task.messages.reopened')}: ${report.reportName}`;
} else if (lodashGet(lastAction, 'actionName', '') === CONST.REPORT.ACTIONS.TYPE.TASKCOMPLETED) {
result.alternateText = `${Localize.translate(preferredLocale, 'task.messages.completed')}: ${report.reportName}`;
} else if (lodashGet(lastAction, 'actionName', '') !== CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW && lastActorDisplayName && lastMessageTextFromReport) {
result.alternateText = `${lastActorDisplayName}: ${lastMessageText}`;
} else {
result.alternateText = lastMessageTextFromReport.length > 0 ? lastMessageText : Localize.translate(preferredLocale, 'report.noActivityYet');
}
Expand Down
Loading