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

Fix#29173:Chat - The New Line Marker does not appear for unread first message #29697

Merged
merged 7 commits into from
Oct 21, 2023
Merged

Fix#29173:Chat - The New Line Marker does not appear for unread first message #29697

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
90c90db
Fix#29173:Chat - The New Line Marker does not appear for unread first…
chamysoftware Oct 12, 2023
4d9d0cb
Merge branch 'Expensify:main' into chamysoftware-29173
chamysoftware Oct 17, 2023
88f61e0
Merge remote-tracking branch 'origin/main' into chamysoftware-29173
chamysoftware Oct 18, 2023
b828136
Merge branch 'Expensify:main' into chamysoftware-29173
chamysoftware Oct 18, 2023
94b451d
Merge branch 'Expensify:main' into chamysoftware-29173
chamysoftware Oct 19, 2023
c340828
Fix lint
chamysoftware Oct 20, 2023
f89cda6
Merge remote-tracking branch 'origin/main' into chamysoftware-29173
chamysoftware Oct 20, 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
7 changes: 6 additions & 1 deletion src/pages/home/report/ReportActionsList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import reportPropTypes from '../../reportPropTypes';
import FloatingMessageCounter from './FloatingMessageCounter';
import ReportActionsListItemRenderer from './ReportActionsListItemRenderer';
import reportActionPropTypes from './reportActionPropTypes';
import * as ReportActionsUtils from '../../../libs/ReportActionsUtils';

const propTypes = {
/** The report currently being looked at */
Expand Down Expand Up @@ -97,6 +98,10 @@ function keyExtractor(item) {
}

function isMessageUnread(message, lastReadTime) {
if (!lastReadTime) {
return Boolean(!ReportActionsUtils.isCreatedAction(message));
}

return Boolean(message && lastReadTime && message.created && lastReadTime < message.created);
}

Expand Down Expand Up @@ -288,7 +293,7 @@ function ReportActionsList({
if (!currentUnreadMarker) {
const nextMessage = sortedReportActions[index + 1];
const isCurrentMessageUnread = isMessageUnread(reportAction, report.lastReadTime);
shouldDisplay = isCurrentMessageUnread && !isMessageUnread(nextMessage, report.lastReadTime);
shouldDisplay = isCurrentMessageUnread && (!nextMessage || !isMessageUnread(nextMessage, report.lastReadTime));
if (!messageManuallyMarkedUnread) {
shouldDisplay = shouldDisplay && reportAction.actorAccountID !== Report.getCurrentUserAccountID();
}
Expand Down
Loading