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 - Mark the chat as "read" immediately upon switching to the tab #34537

Merged
merged 12 commits into from
Jan 24, 2024
Merged

Fix - Mark the chat as "read" immediately upon switching to the tab #34537

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5afbe63
set unread marker and read the report on visibility change
FitseTLT Jan 14, 2024
09dadf4
updated to consider manual mark as read case
FitseTLT Jan 15, 2024
9194fd1
implemented useCallback Ref
FitseTLT Jan 18, 2024
e938d62
Merge branch 'main' into fix-mark-as-read-on-visibility-change
FitseTLT Jan 18, 2024
10b518f
minor fix
FitseTLT Jan 19, 2024
d49c487
minor change
FitseTLT Jan 19, 2024
7faf409
updated to run our effect only when there is new message received
FitseTLT Jan 21, 2024
1a022da
refined logic
FitseTLT Jan 21, 2024
bd613b8
Merge branch 'main' into fix-mark-as-read-on-visibility-change
FitseTLT Jan 21, 2024
44d8298
fixed unread marker inconsistency
FitseTLT Jan 22, 2024
9f56657
fix condition to consider usage on different device
FitseTLT Jan 23, 2024
6738d1d
Merge branch 'main' into fix-mark-as-read-on-visibility-change
FitseTLT Jan 24, 2024
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
Prev Previous commit
Next Next commit
refined logic
  • Loading branch information
@FitseTLT
FitseTLT committed Jan 21, 2024
commit 1a022dafedd9c745eadd87bfa44cd34c580ddd80
21 changes: 19 additions & 2 deletions src/pages/home/report/ReportActionsList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ function ReportActionsList({
const route = useRoute();
const opacity = useSharedValue(0);
const userActiveSince = useRef(null);
const userInactiveSince = useRef(null);

const markerInit = () => {
if (!cacheUnreadMarkers.has(report.reportID)) {
Expand Down Expand Up @@ -412,7 +413,23 @@ function ReportActionsList({
}, [calculateUnreadMarker, report.lastReadTime, messageManuallyMarkedUnread]);

const onVisibilityChange = useCallback(() => {
if (!Visibility.isVisible() || scrollingVerticalOffset.current >= MSG_VISIBLE_THRESHOLD || userActiveSince.current > (report.lastVisibleActionCreated || '')) {
if (!Visibility.isVisible()) {
userInactiveSince.current = DateUtils.getDBTime();
return;
}

if (
scrollingVerticalOffset.current >= MSG_VISIBLE_THRESHOLD ||
!(
sortedVisibleReportActions &&
_.some(
sortedVisibleReportActions,
(reportAction) =>
userInactiveSince.current < reportAction.created &&
(ReportActionsUtils.isReportPreviewAction(reportAction) ? !reportAction.childLastActorAccountID : reportAction.actorAccountID) !== Report.getCurrentUserAccountID(),
)
)
) {
return;
}

Expand All @@ -421,7 +438,7 @@ function ReportActionsList({
setCurrentUnreadMarker(null);
cacheUnreadMarkers.delete(report.reportID);
calculateUnreadMarker();
}, [calculateUnreadMarker, report]);
}, [calculateUnreadMarker, report, sortedVisibleReportActions]);

useEffect(() => {
const unsubscribeVisibilityListener = Visibility.onVisibilityChange(onVisibilityChange);
Expand Down