Skip to content

fix: expense chat doesn't scroll to bottom when we create a distance request #39685

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

Merged
aldo-expensify merged 7 commits into from
Apr 12, 2024
Merged

fix: expense chat doesn't scroll to bottom when we create a distance request #39685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8d82be1
fix: expense chat doesn't scroll to bottom when we create a distance …
nkdengineer Apr 5, 2024
1636ef6
fix lint
nkdengineer Apr 5, 2024
503e821
Merge branch 'main' into fix/39198
nkdengineer Apr 8, 2024
d16be16
refactor logic
nkdengineer Apr 8, 2024
4651dd8
remove unnecessary useEffect
nkdengineer Apr 8, 2024
d0d0049
merge main
nkdengineer Apr 12, 2024
e615d8e
update ref whenever rendering
nkdengineer Apr 12, 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
5 changes: 3 additions & 2 deletions src/libs/actions/IOU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1549,6 +1549,7 @@ function createDistanceRequest(
moneyRequestReportID,
);

const activeReportID = isMoneyRequestReport ? report?.reportID ?? '' : chatReport.reportID;
const parameters: CreateDistanceRequestParams = {
comment,
iouReportID: iouReport.reportID,
Expand All @@ -1569,8 +1570,8 @@ function createDistanceRequest(
};

API.write(WRITE_COMMANDS.CREATE_DISTANCE_REQUEST, parameters, onyxData);
Navigation.dismissModal(isMoneyRequestReport ? report?.reportID : chatReport.reportID);
Report.notifyNewAction(chatReport.reportID, userAccountID);
Navigation.dismissModal(activeReportID);
Report.notifyNewAction(activeReportID, userAccountID);
}

/**
Expand Down
8 changes: 4 additions & 4 deletions src/pages/home/report/ReportActionsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ function ReportActionsList({
const lastActionIndex = sortedVisibleReportActions[0]?.reportActionID;
const reportActionSize = useRef(sortedVisibleReportActions.length);
const hasNewestReportAction = sortedReportActions?.[0].created === report.lastVisibleActionCreated;

const hasNewestReportActionRef = useRef(hasNewestReportAction);
hasNewestReportActionRef.current = hasNewestReportAction;
const previousLastIndex = useRef(lastActionIndex);

const isLastPendingActionIsDelete = sortedReportActions?.[0]?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
Expand Down Expand Up @@ -322,14 +323,13 @@ function ReportActionsList({
(isFromCurrentUser: boolean) => {
// If a new comment is added and it's from the current user scroll to the bottom otherwise leave the user positioned where
// they are now in the list.
if (!isFromCurrentUser || !hasNewestReportAction) {
if (!isFromCurrentUser || !hasNewestReportActionRef.current) {
return;
}
InteractionManager.runAfterInteractions(() => reportScrollManager.scrollToBottom());
},
[hasNewestReportAction, reportScrollManager],
[reportScrollManager],
);

useEffect(() => {
// Why are we doing this, when in the cleanup of the useEffect we are already calling the unsubscribe function?
// Answer: On web, when navigating to another report screen, the previous report screen doesn't get unmounted,
Expand Down