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

Place the new marker when a chat becomes visible #2737

Merged
merged 8 commits into from
May 11, 2021
Merged

Place the new marker when a chat becomes visible #2737

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a273c8e
Display New marker on visibility change
Gonals May 7, 2021
5b68d81
style
Gonals May 7, 2021
e383d89
style
Gonals May 7, 2021
ed9a183
Move code to Report.js
Gonals May 10, 2021
c258399
Move setNewMarkerPosition above the first call
Gonals May 10, 2021
0a10085
handle new reports
Gonals May 11, 2021
ae17923
merge main
Gonals May 11, 2021
810cf3f
style
Gonals May 11, 2021
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
28 changes: 18 additions & 10 deletions src/libs/actions/Report.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,16 @@ function removeOptimisticActions(reportID) {
});
}

/**
* @param {Number} reportID
* @param {Number} sequenceNumber
*/
function setNewMarkerPosition(reportID, sequenceNumber) {
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {
newMarkerSequenceNumber: sequenceNumber,
});
}

/**
* Updates a report action's message to be a new value.
*
Expand Down Expand Up @@ -530,6 +540,14 @@ function updateReportWithNewAction(reportID, reportAction) {
if (lodashGet(reportAction, 'actorEmail') === 'concierge@expensify.com') {
return;
}

// When a new message comes in, if the New marker is not already set (newMarkerSequenceNumber === 0), set the
// marker above the incoming message.
if (lodashGet(allReports, [reportID, 'newMarkerSequenceNumber'], 0) === 0
&& updatedReportObject.unreadActionCount > 0) {
const oldestUnreadSeq = (updatedReportObject.maxSequenceNumber - updatedReportObject.unreadActionCount) + 1;
setNewMarkerPosition(reportID, oldestUnreadSeq);
}
console.debug('[LOCAL_NOTIFICATION] Creating notification');
LocalNotification.showCommentNotification({
reportAction,
Expand Down Expand Up @@ -996,16 +1014,6 @@ function updateLastReadActionID(reportID, sequenceNumber) {
});
}

/**
* @param {Number} reportID
* @param {Number} sequenceNumber
*/
function setNewMarkerPosition(reportID, sequenceNumber) {
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {
newMarkerSequenceNumber: sequenceNumber,
});
}

/**
* Toggles the pinned state of the report.
*
Expand Down