diff --git a/src/libs/Navigation/Navigation.ts b/src/libs/Navigation/Navigation.ts index 021c42b092b6..48e2d8db48da 100644 --- a/src/libs/Navigation/Navigation.ts +++ b/src/libs/Navigation/Navigation.ts @@ -137,6 +137,11 @@ function getActiveRoute(): string { * Returns the route of a report opened in RHP. */ function getReportRHPActiveRoute(): string { + // Safe handling when navigation is not yet initialized + if (!navigationRef.isReady()) { + Log.warn('[src/libs/Navigation/Navigation.ts] NavigationRef is not ready. Returning empty string.'); + return ''; + } if (isReportOpenInRHP(navigationRef.getRootState())) { return getActiveRoute(); } diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts index b72ba5464621..ab4ee0d7a290 100644 --- a/src/libs/actions/Session/index.ts +++ b/src/libs/actions/Session/index.ts @@ -857,6 +857,11 @@ function clearSignInData() { */ function resetNavigationState() { Navigation.isNavigationReady().then(() => { + // Safe handling when navigation is not yet initialized + if (!navigationRef.isReady()) { + Log.warn('[src/libs/actions/Session/index.ts] NavigationRef is not ready. Returning undefined.'); + return undefined; + } navigationRef.resetRoot({index: 0, routes: [{name: NAVIGATORS.REPORTS_SPLIT_NAVIGATOR}]}); }); }