fix: app goes to workspace initial page when back from not found page

src/libs/Navigation/AppNavigator/createCustomFullScreenNavigator/CustomFullScreenRouter.tsx

@@ -1,19 +1,33 @@
 import type {ParamListBase, PartialState, RouterConfigOptions, StackNavigationState} from '@react-navigation/native';
 import {StackRouter} from '@react-navigation/native';
+import {useOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import getIsNarrowLayout from '@libs/getIsNarrowLayout';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
 import type {FullScreenNavigatorRouterOptions} from './types';
 
 type StackState = StackNavigationState<ParamListBase> | PartialState<StackNavigationState<ParamListBase>>;
 
 const isAtLeastOneInState = (state: StackState, screenName: string): boolean => state.routes.some((route) => route.name === screenName);
 
-function adaptStateIfNecessary(state: StackState) {
+function adaptStateIfNecessary(state: StackState, isLoadingReportData: OnyxEntry<boolean>) {
     const isNarrowLayout = getIsNarrowLayout();
     const workspaceCentralPane = state.routes.at(-1);
+    const policyID =
+        workspaceCentralPane?.params && 'policyID' in workspaceCentralPane.params && typeof workspaceCentralPane.params.policyID === 'string'
+            ? workspaceCentralPane.params.policyID
+            : undefined;
 
     // There should always be WORKSPACE.INITIAL screen in the state to make sure go back works properly if we deeplinkg to a subpage of settings.
     if (!isAtLeastOneInState(state, SCREENS.WORKSPACE.INITIAL)) {
+        const policy = PolicyUtils.getPolicy(policyID ?? '');
+        const isPolicyAccessible = PolicyUtils.isPolicyAccessible(policy);
+        if (!isLoadingReportData && !isPolicyAccessible) {
+            return;
+        }
+
         // @ts-expect-error Updating read only property
         // noinspection JSConstantReassignment
         state.stale = true; // eslint-disable-line
@@ -51,12 +65,13 @@ function adaptStateIfNecessary(state: StackState) {
 
 function CustomFullScreenRouter(options: FullScreenNavigatorRouterOptions) {
     const stackRouter = StackRouter(options);
+    const [isLoadingReportData] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA, {initialValue: true});
 
     return {
         ...stackRouter,
         getInitialState({routeNames, routeParamList, routeGetIdList}: RouterConfigOptions) {
             const initialState = stackRouter.getInitialState({routeNames, routeParamList, routeGetIdList});
-            adaptStateIfNecessary(initialState);
+            adaptStateIfNecessary(initialState, isLoadingReportData);
 
             // If we needed to modify the state we need to rehydrate it to get keys for new routes.
             if (initialState.stale) {
@@ -66,7 +81,7 @@ function CustomFullScreenRouter(options: FullScreenNavigatorRouterOptions) {
             return initialState;
         },
         getRehydratedState(partialState: StackState, {routeNames, routeParamList, routeGetIdList}: RouterConfigOptions): StackNavigationState<ParamListBase> {
-            adaptStateIfNecessary(partialState);
+            adaptStateIfNecessary(partialState, isLoadingReportData);
             const state = stackRouter.getRehydratedState(partialState, {routeNames, routeParamList, routeGetIdList});
             return state;
         },

src/libs/Navigation/Navigation.ts

@@ -12,6 +12,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {HybridAppRoute, Route} from '@src/ROUTES';
 import ROUTES, {HYBRID_APP_ROUTES} from '@src/ROUTES';
 import {PROTECTED_SCREENS} from '@src/SCREENS';
+import type {Screen} from '@src/SCREENS';
 import type {Report} from '@src/types/onyx';
 import originalCloseRHPFlow from './closeRHPFlow';
 import originalDismissModal from './dismissModal';
@@ -410,6 +411,18 @@ function getTopMostCentralPaneRouteFromRootState() {
     return getTopmostCentralPaneRoute(navigationRef.getRootState() as State<RootStackParamList>);
 }
 
+function removeScreenFromNavigationState(screen: Screen) {
+    navigationRef.dispatch((state) => {
+        const routes = state.routes?.filter((item) => item.name !== screen);
+
+        return CommonActions.reset({
+            ...state,
+            routes,
+            index: routes.length < state.routes.length ? state.index - 1 : state.index,
+        });
+    });
+}
+
 export default {
     setShouldPopAllStateOnUP,
     navigate,
@@ -433,6 +446,7 @@ export default {
     closeRHPFlow,
     setNavigationActionToMicrotaskQueue,
     getTopMostCentralPaneRouteFromRootState,
+    removeScreenFromNavigationState,
 };
 
 export {navigationRef};

src/libs/PolicyUtils.ts

@@ -996,6 +996,10 @@ function getWorkflowApprovalsUnavailable(policy: OnyxEntry<Policy>) {
     return policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.OPTIONAL || !!policy?.errorFields?.approvalMode;
 }
 
+function isPolicyAccessible(policy: OnyxEntry<Policy>) {
+    return !isEmptyObject(policy) && (Object.keys(policy).length !== 1 || isEmptyObject(policy.errors)) && policy?.id;
+}
+
 export {
     canEditTaxRate,
     extractPolicyIDFromPath,
@@ -1105,6 +1109,7 @@ export {
     getTagNamesFromTagsLists,
     getDomainNameForPolicy,
     getWorkflowApprovalsUnavailable,
+    isPolicyAccessible,
 };
 
 export type {MemberEmailsToAccountIDs};

src/pages/workspace/AccessOrNotFoundWrapper.tsx

@@ -16,6 +16,7 @@ import type {IOUType} from '@src/CONST';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {PolicyFeatureName} from '@src/types/onyx/Policy';
 import callOrReturn from '@src/types/utils/callOrReturn';
@@ -132,7 +133,7 @@ function AccessOrNotFoundWrapper({accessVariants = [], fullPageNotFoundViewProps
         return acc && accessFunction(policy, login, report, allPolicies ?? null, iouType);
     }, true);
 
-    const isPolicyNotAccessible = isEmptyObject(policy) || (Object.keys(policy).length === 1 && !isEmptyObject(policy.errors)) || !policy?.id;
+    const isPolicyNotAccessible = !PolicyUtils.isPolicyAccessible(policy);
     const shouldShowNotFoundPage = (!isMoneyRequest && !isFromGlobalCreate && isPolicyNotAccessible) || !isPageAccessible || !isPolicyFeatureEnabled || shouldBeBlocked;
 
     // We only update the feature state if it isn't pending.
@@ -145,6 +146,13 @@ function AccessOrNotFoundWrapper({accessVariants = [], fullPageNotFoundViewProps
         setIsPolicyFeatureEnabled(isFeatureEnabled);
     }, [pendingField, isOffline, isFeatureEnabled]);
 
+    useEffect(() => {
+        if (!isPolicyNotAccessible) {
+            return;
+        }
+        Navigation.removeScreenFromNavigationState(SCREENS.WORKSPACE.INITIAL);
+    }, [isPolicyNotAccessible]);
+
     if (shouldShowFullScreenLoadingIndicator) {
         return <FullscreenLoadingIndicator />;
     }