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

Fix: do not display new line when creating request money. #32177

Merged
merged 9 commits into from
Dec 7, 2023
Merged

Fix: do not display new line when creating request money. #32177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
20ddda9
do not display new line when creating request money
teneeto Nov 29, 2023
6bac4f8
use isReportPreviewAction
teneeto Nov 29, 2023
8d308c5
fix review comment
teneeto Nov 30, 2023
c189fc5
merge conflict
teneeto Dec 1, 2023
7f23712
fix lint
teneeto Dec 1, 2023
3bf9149
Merge branch 'main' of github.com:teneeto/App into fix/29376-do-not-d…
teneeto Dec 1, 2023
01b27d9
fix failing test
teneeto Dec 1, 2023
05c6b1e
Merge branch 'main' into fix/29376-do-not-display-new-line-when-creat…
MonilBhavsar Dec 4, 2023
d82f0c8
Update hook dependency and property type
MonilBhavsar Dec 4, 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
13 changes: 8 additions & 5 deletions src/pages/home/report/ReportActionsList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ function ReportActionsList({
const readActionSkipped = useRef(false);
const hasHeaderRendered = useRef(false);
const hasFooterRendered = useRef(false);
const reportActionSize = useRef(sortedReportActions.length);
const lastVisibleActionCreatedRef = useRef(report.lastVisibleActionCreated);
const lastReadTimeRef = useRef(report.lastReadTime);

const linkedReportActionID = lodashGet(route, 'params.reportActionID', '');
Expand Down Expand Up @@ -198,15 +198,15 @@ function ReportActionsList({
}
}

if (currentUnreadMarker || reportActionSize.current === sortedReportActions.length) {
if (currentUnreadMarker || lastVisibleActionCreatedRef.current === report.lastVisibleActionCreated) {
return;
}

cacheUnreadMarkers.delete(report.reportID);
reportActionSize.current = sortedReportActions.length;
lastVisibleActionCreatedRef.current = report.lastVisibleActionCreated;
setCurrentUnreadMarker(null);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [sortedReportActions.length, report.reportID]);
}, [report.lastVisibleActionCreated, report.reportID]);

useEffect(() => {
if (!userActiveSince.current || report.reportID !== prevReportID) {
Expand Down Expand Up @@ -339,7 +339,10 @@ function ReportActionsList({
shouldDisplay = isCurrentMessageUnread && (!nextMessage || !isMessageUnread(nextMessage, lastReadTimeRef.current));
if (shouldDisplay && !messageManuallyMarkedUnread) {
const isWithinVisibleThreshold = scrollingVerticalOffset.current < MSG_VISIBLE_THRESHOLD ? reportAction.created < userActiveSince.current : true;
shouldDisplay = reportAction.actorAccountID !== Report.getCurrentUserAccountID() && isWithinVisibleThreshold;
// Prevent displaying a new marker line when report action is of type "REPORTPREVIEW" and last actor is the current user
shouldDisplay =
(ReportActionsUtils.isReportPreviewAction(reportAction) ? !reportAction.childLastActorAccountID : reportAction.actorAccountID) !== Report.getCurrentUserAccountID() &&
isWithinVisibleThreshold;
}
if (shouldDisplay) {
cacheUnreadMarkers.set(report.reportID, reportAction.reportActionID);
Expand Down
3 changes: 2 additions & 1 deletion src/types/onyx/ReportAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,13 @@ type ReportActionBase = {
childStateNum?: ValueOf<typeof CONST.REPORT.STATE_NUM>;
childLastReceiptTransactionIDs?: string;
childLastMoneyRequestComment?: string;
childLastActorAccountID?: number;
timestamp?: number;
reportActionTimestamp?: number;
childMoneyRequestCount?: number;
isFirstItem?: boolean;

/** Informations about attachments of report action */
/** Information about attachments of report action */
attachmentInfo?: (File & {source: string; uri: string}) | Record<string, never>;

/** Receipt tied to report action */
Expand Down
Loading