Skip to content

fix: return to report screen if RHP has valid reportID params #44520

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
roryabraham merged 7 commits into from
Jul 9, 2024
Merged

fix: return to report screen if RHP has valid reportID params #44520

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a885e27
fix: return to report screen if RHP has valid reportID params
dominictb Jun 27, 2024
52557fc
fix: lint
dominictb Jun 27, 2024
a01bd92
fix: remove doesReportExist fn in ReportUtils
dominictb Jul 2, 2024
467bccf
fix: lint issue
dominictb Jul 2, 2024
944b56e
Merge remote-tracking branch 'origin/main' into fix/41017-refresh-rhp
dominictb Jul 9, 2024
3d96978
fix: use ReportConnection func
dominictb Jul 9, 2024
f20710d
fix: prettier
dominictb Jul 9, 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: 9 additions & 0 deletions src/libs/Navigation/linkingConfig/getAdaptedStateFromPath.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ import getIsNarrowLayout from '@libs/getIsNarrowLayout';
import type {BottomTabName, CentralPaneName, FullScreenName, NavigationPartialRoute, RootStackParamList} from '@libs/Navigation/types';
import {isCentralPaneName} from '@libs/NavigationUtils';
import {extractPolicyIDFromPath, getPathWithoutPolicyID} from '@libs/PolicyUtils';
import * as ReportConnection from '@libs/ReportConnection';
import CONST from '@src/CONST';
import NAVIGATORS from '@src/NAVIGATORS';
import ONYXKEYS from '@src/ONYXKEYS';
import SCREENS from '@src/SCREENS';
import CENTRAL_PANE_TO_RHP_MAPPING from './CENTRAL_PANE_TO_RHP_MAPPING';
import config from './config';
Expand Down Expand Up @@ -139,6 +141,13 @@ function getMatchingRootRouteForRHPRoute(route: NavigationPartialRoute): Navigat
return createFullScreenNavigator({name: fullScreenName as FullScreenName, params: route.params});
}
}

// check for valid reportID in the route params
// if the reportID is valid, we should navigate back to screen report in CPN
const reportID = (route.params as Record<string, string | undefined>)?.reportID;
if (ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]) {
return {name: SCREENS.REPORT, params: {reportID}};
}
}

function getAdaptedState(state: PartialState<NavigationState<RootStackParamList>>, policyID?: string): GetAdaptedStateReturnType {
Expand Down