Skip to content

Fix: New message marker is not displayed on the first message in expense report #65918

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
youssef-lr merged 5 commits into from
Jul 29, 2025
Merged

Fix: New message marker is not displayed on the first message in expense report #65918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de66dc5
Fix: New message marker is not displayed on the first message in expe…
nyomanjyotisa Jul 11, 2025
4252c2a
Fix: New message marker is not displayed on the first message in expe…
nyomanjyotisa Jul 17, 2025
1e110f5
lint fix
nyomanjyotisa Jul 17, 2025
0f1ae76
Fix: New message marker is not displayed on the first message in expe…
nyomanjyotisa Jul 22, 2025
4b40a1b
Merge branch 'main' into issue-63427-2
nyomanjyotisa Jul 24, 2025
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
4 changes: 2 additions & 2 deletions src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ function MoneyRequestReportActionsList({
}, []);

useEffect(() => {
if (isUnread(report, transactionThreadReport) || (lastAction && isCurrentActionUnread(report, lastAction))) {
if (isUnread(report, transactionThreadReport) || (lastAction && isCurrentActionUnread(report, lastAction, visibleReportActions))) {
// On desktop, when the notification center is displayed, isVisible will return false.
// Currently, there's no programmatic way to dismiss the notification center panel.
// To handle this, we use the 'referrer' parameter to check if the current navigation is triggered from a notification.
Expand Down Expand Up @@ -330,7 +330,7 @@ function MoneyRequestReportActionsList({
// Scan through each visible report action until we find the appropriate action to show the unread marker
for (let index = startIndex; index >= endIndex; index--) {
const reportAction = visibleReportActions.at(index);
const nextAction = visibleReportActions.at(index - 1);
const nextAction = index > 0 ? visibleReportActions.at(index - 1) : undefined;
const isEarliestReceivedOfflineMessage = index === earliestReceivedOfflineMessageIndex;

const shouldDisplayNewMarker =
Expand Down
4 changes: 2 additions & 2 deletions src/libs/ReportActionsUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1883,9 +1883,9 @@ function isReportActionUnread(reportAction: OnyxEntry<ReportAction>, lastReadTim
* Check whether the current report action of the report is unread or not
*
*/
function isCurrentActionUnread(report: OnyxEntry<Report>, reportAction: ReportAction): boolean {
function isCurrentActionUnread(report: OnyxEntry<Report>, reportAction: ReportAction, visibleReportActions?: ReportAction[]): boolean {
const lastReadTime = report?.lastReadTime ?? '';
const sortedReportActions = getSortedReportActions(Object.values(getAllReportActions(report?.reportID)));
const sortedReportActions = visibleReportActions ?? getSortedReportActions(Object.values(getAllReportActions(report?.reportID)));
const currentActionIndex = sortedReportActions.findIndex((action) => action.reportActionID === reportAction.reportActionID);
if (currentActionIndex === -1) {
return false;
Expand Down
3 changes: 1 addition & 2 deletions src/pages/home/report/ReportActionsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,8 +365,7 @@ function ReportActionsList({
if (report.reportID !== prevReportID) {
return;
}

if (isUnread(report, transactionThreadReport) || (lastAction && isCurrentActionUnread(report, lastAction))) {
if (isUnread(report, transactionThreadReport) || (lastAction && isCurrentActionUnread(report, lastAction, sortedVisibleReportActions))) {
// On desktop, when the notification center is displayed, isVisible will return false.
// Currently, there's no programmatic way to dismiss the notification center panel.
// To handle this, we use the 'referrer' parameter to check if the current navigation is triggered from a notification.
Expand Down