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 navigation to concierge after leaving the group #42020

Merged
merged 8 commits into from
May 16, 2024
+11 −5
Merged

Fix navigation to concierge after leaving the group #42020

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
573a159
Fix navigation to concierge after leaving the group
Nodebrute May 11, 2024
87d2be5
Merge branch 'Expensify:main' into navigation
Nodebrute May 14, 2024
6ca77b0
add comment
Nodebrute May 14, 2024
1b7f1a8
fix lint error
Nodebrute May 14, 2024
2c4917b
Merge branch 'Expensify:main' into navigation
Nodebrute May 15, 2024
beee045
fix small screen navigation
Nodebrute May 15, 2024
c1eb93d
cleanup
Nodebrute May 15, 2024
6a0e24f
add comment
Nodebrute May 15, 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
9 changes: 5 additions & 4 deletions src/libs/actions/Report.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import * as Environment from '@libs/Environment/Environment';
import * as ErrorUtils from '@libs/ErrorUtils';
import Log from '@libs/Log';
import * as LoginUtils from '@libs/LoginUtils';
import Navigation from '@libs/Navigation/Navigation';
import Navigation, {navigationRef} from '@libs/Navigation/Navigation';
import type {NetworkStatus} from '@libs/NetworkConnection';
import LocalNotification from '@libs/Notification/LocalNotification';
import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
Expand Down Expand Up @@ -2530,10 +2530,11 @@ function navigateToMostRecentReport(currentReport: OnyxEntry<Report>) {
const isChatThread = ReportUtils.isChatThread(currentReport);
if (lastAccessedReportID) {
const lastAccessedReportRoute = ROUTES.REPORT_WITH_ID.getRoute(lastAccessedReportID ?? '');
// We are using index 1 here because on index 0, we'll always have the bottomTabNavigator.
Julesssss marked this conversation as resolved.
Show resolved Hide resolved
const isFirstRoute = navigationRef?.current?.getState()?.index === 1;
// If it is not a chat thread we should call Navigation.goBack to pop the current route first before navigating to last accessed report.
if (!isChatThread) {
// Fallback to the lastAccessedReportID route, if this is first route in the navigator
Navigation.goBack(lastAccessedReportRoute);
if (!isChatThread && !isFirstRoute) {
Navigation.goBack();
}
Navigation.navigate(lastAccessedReportRoute, CONST.NAVIGATION.TYPE.FORCED_UP);
} else {
Expand Down
6 changes: 5 additions & 1 deletion src/pages/home/ReportScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,6 @@ function ReportScreen({
const didReportClose = wasReportRemoved && prevReport.statusNum === CONST.REPORT.STATUS_NUM.OPEN && report.statusNum === CONST.REPORT.STATUS_NUM.CLOSED;
const isTopLevelPolicyRoomWithNoStatus = !report.statusNum && !prevReport.parentReportID && prevReport.chatType === CONST.REPORT.CHAT_TYPE.POLICY_ROOM;
const isClosedTopLevelPolicyRoom = wasReportRemoved && prevReport.statusNum === CONST.REPORT.STATUS_NUM.OPEN && isTopLevelPolicyRoomWithNoStatus;

// Navigate to the Concierge chat if the room was removed from another device (e.g. user leaving a room or removed from a room)
if (
// non-optimistic case
Expand All @@ -540,6 +539,10 @@ function ReportScreen({
Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(prevReport.parentReportID));
return;
}
// If the report isn't focused, navigation to Concierge Chat should be avoided.
if (!isFocused) {
return;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the return early should be in the first line in the block of code, there is no need for any navigation call if navigation is not focused. I think this is more clean. What do you think?

Report.navigateToConciergeChat();
return;
}
Expand Down Expand Up @@ -567,6 +570,7 @@ function ReportScreen({
prevReport.chatType,
prevReport,
reportIDFromRoute,
isFocused,
]);

useEffect(() => {
Expand Down
Loading