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

27456 Chat - The green line is displayed chaotically at the recipient #29860

Merged
merged 3 commits into from
Oct 31, 2023
Merged

27456 Chat - The green line is displayed chaotically at the recipient #29860

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ea93f7
Fix: 27456 green line
roksanaz Oct 18, 2023
2f9048a
Merge branch 'main' into 27456-green-line
roksanaz Oct 20, 2023
e5dc05e
Merge branch 'main' into 27456-green-line
roksanaz Oct 23, 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
10 changes: 7 additions & 3 deletions src/pages/home/report/ReportActionsList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,13 @@ function ReportActionsList({
if (!currentUnreadMarker) {
const nextMessage = sortedReportActions[index + 1];
const isCurrentMessageUnread = isMessageUnread(reportAction, report.lastReadTime);
shouldDisplay = isCurrentMessageUnread && !isMessageUnread(nextMessage, report.lastReadTime);
if (!messageManuallyMarkedUnread) {
shouldDisplay = shouldDisplay && reportAction.actorAccountID !== Report.getCurrentUserAccountID();
const isNextMessageRead = !isMessageUnread(nextMessage, report.lastReadTime);
const isWithinVisibleThreshold = scrollingVerticalOffset.current < MSG_VISIBLE_THRESHOLD ? reportAction.created < userActiveSince.current : true;

shouldDisplay = isCurrentMessageUnread && isNextMessageRead && isWithinVisibleThreshold;

if (shouldDisplay && !messageManuallyMarkedUnread) {
shouldDisplay = reportAction.actorAccountID !== Report.getCurrentUserAccountID();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we ignore this condition if shoudlDisplay was set as false before? What is the purpose?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@barttom Yes, the previous logic worked the same (if shoudlDisplay was false before, it was also false for this condition as well), the code was like that:

App/src/pages/home/report/ReportActionsList.js

Lines 292 to 294 in 39d2a84

if (!messageManuallyMarkedUnread) {
shouldDisplay = shouldDisplay && reportAction.actorAccountID !== Report.getCurrentUserAccountID();
}

}
} else {
shouldDisplay = reportAction.reportActionID === currentUnreadMarker;
Expand Down
Loading