fix: stale isLoadingReportData Onyx value

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

@@ -1,14 +1,23 @@
 import type {ParamListBase, PartialState, RouterConfigOptions, StackNavigationState} from '@react-navigation/native';
 import {StackRouter} from '@react-navigation/native';
+import Onyx 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);
 
+let isLoadingReportData = true;
+Onyx.connect({
+    key: ONYXKEYS.IS_LOADING_REPORT_DATA,
+    initWithStoredValues: false,
+    callback: (value) => (isLoadingReportData = value ?? false),
+});
+
 function adaptStateIfNecessary(state: StackState) {
     const isNarrowLayout = getIsNarrowLayout();
     const workspaceCentralPane = state.routes.at(-1);
@@ -17,7 +26,6 @@ function adaptStateIfNecessary(state: StackState) {
             ? workspaceCentralPane.params.policyID
             : undefined;
     const policy = PolicyUtils.getPolicy(policyID ?? '');
-    const isLoadingReportData = PolicyUtils.getIsLoadingReportData();
     const isPolicyAccessible = PolicyUtils.isPolicyAccessible(policy);
 
     // 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.

src/libs/Navigation/Navigation.ts

@@ -420,13 +420,15 @@ function getTopMostCentralPaneRouteFromRootState() {
 }
 
 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,
+    isNavigationReady().then(() => {
+        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,
+            });
         });
     });
 }

src/libs/PolicyUtils.ts

@@ -62,13 +62,6 @@ Onyx.connect({
     callback: (value) => (activePolicyId = value),
 });
 
-let isLoadingReportData = true;
-Onyx.connect({
-    key: ONYXKEYS.IS_LOADING_REPORT_DATA,
-    initWithStoredValues: false,
-    callback: (value) => (isLoadingReportData = value ?? false),
-});
-
 /**
  * Filter out the active policies, which will exclude policies with pending deletion
  * These are policies that we can use to create reports with in NewDot.
@@ -1075,10 +1068,6 @@ function isPolicyAccessible(policy: OnyxEntry<Policy>): boolean {
     return !isEmptyObject(policy) && (Object.keys(policy).length !== 1 || isEmptyObject(policy.errors)) && !!policy?.id;
 }
 
-function getIsLoadingReportData() {
-    return isLoadingReportData;
-}
-
 export {
     canEditTaxRate,
     extractPolicyIDFromPath,
@@ -1197,7 +1186,6 @@ export {
     getAllPoliciesLength,
     getActivePolicy,
     isPolicyAccessible,
-    getIsLoadingReportData,
 };
 
 export type {MemberEmailsToAccountIDs};

src/pages/workspace/AccessOrNotFoundWrapper.tsx

@@ -167,6 +167,7 @@ function AccessOrNotFoundWrapper({
     }, [pendingField, isOffline, isFeatureEnabled]);
 
     useEffect(() => {
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         if (isLoadingReportData || !isPolicyNotAccessible) {
             return;
         }