Move getPolicyIDFromNavigationState to PolicyUtils

src/libs/Navigation/Navigation.ts

@@ -13,14 +13,13 @@ import type {Report} from '@src/types/onyx';
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import originalDismissModal from './dismissModal';
 import originalDismissModalWithReport from './dismissModalWithReport';
-import getPolicyIDFromState from './getPolicyIDFromState';
 import originalGetTopmostReportActionId from './getTopmostReportActionID';
 import originalGetTopmostReportId from './getTopmostReportId';
 import linkingConfig from './linkingConfig';
 import linkTo from './linkTo';
 import navigationRef from './navigationRef';
 import switchPolicyID from './switchPolicyID';
-import type {NavigationStateRoute, RootStackParamList, State, StateOrRoute, SwitchPolicyIDParams} from './types';
+import type {NavigationStateRoute, State, StateOrRoute, SwitchPolicyIDParams} from './types';
 
 let resolveNavigationIsReadyPromise: () => void;
 const navigationIsReadyPromise = new Promise<void>((resolve) => {
@@ -360,13 +359,6 @@ function navigateWithSwitchPolicyID(params: SwitchPolicyIDParams) {
     return switchPolicyID(navigationRef.current, params);
 }
 
-/**
- *  Returns the currently selected policy ID stored in the navigation state.
- */
-function getPolicyIDFromNavigationState() {
-    return getPolicyIDFromState(navigationRef.getRootState() as State<RootStackParamList>);
-}
-
 export default {
     setShouldPopAllStateOnUP,
     navigate,
@@ -387,7 +379,6 @@ export default {
     closeFullScreen,
     navigateWithSwitchPolicyID,
     resetToHome,
-    getPolicyIDFromNavigationState,
 };
 
 export {navigationRef};

src/libs/PolicyUtils.ts

@@ -8,7 +8,9 @@ import type {PersonalDetailsList, Policy, PolicyCategories, PolicyMembers, Polic
 import type {PolicyFeatureName} from '@src/types/onyx/Policy';
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import Navigation from './Navigation/Navigation';
+import getPolicyIDFromState from './Navigation/getPolicyIDFromState';
+import Navigation, {navigationRef} from './Navigation/Navigation';
+import type {RootStackParamList, State} from './Navigation/types';
 
 type MemberEmailsToAccountIDs = Record<string, number>;
 type UnitRate = {rate: number};
@@ -297,6 +299,13 @@ function isPolicyFeatureEnabled(policy: OnyxEntry<Policy> | EmptyObject, feature
     return Boolean(policy?.[featureName]);
 }
 
+/**
+ *  Get the currently selected policy ID stored in the navigation state.
+ */
+function getPolicyIDFromNavigationState() {
+    return getPolicyIDFromState(navigationRef.getRootState() as State<RootStackParamList>);
+}
+
 export {
     getActivePolicies,
     hasAccountingConnections,
@@ -332,6 +341,7 @@ export {
     hasTaxRateError,
     getTaxByID,
     hasPolicyCategoriesError,
+    getPolicyIDFromNavigationState,
 };
 
 export type {MemberEmailsToAccountIDs};

src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.js

@@ -4,8 +4,8 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as Browser from '@libs/Browser';
 import TopBar from '@libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar';
-import Navigation from '@libs/Navigation/Navigation';
 import Performance from '@libs/Performance';
+import {getPolicyIDFromNavigationState} from '@libs/PolicyUtils';
 import SidebarLinksData from '@pages/home/sidebar/SidebarLinksData';
 import Timing from '@userActions/Timing';
 import CONST from '@src/CONST';
@@ -21,7 +21,7 @@ const startTimer = () => {
 
 function BaseSidebarScreen(props) {
     const styles = useThemeStyles();
-    const activeWorkspaceID = Navigation.getPolicyIDFromNavigationState();
+    const activeWorkspaceID = getPolicyIDFromNavigationState();
     useEffect(() => {
         Performance.markStart(CONST.TIMING.SIDEBAR_LOADED);
         Timing.start(CONST.TIMING.SIDEBAR_LOADED, true);