Merge pull request Expensify#67904 from dmkt9/fix/66684

mjasikowski · web-flow · commit b62baff492b2 · 2025-08-12T08:17:02.000+02:00
Fix/66684 - Duplicate API call for OpenReport for new account
diff --git a/src/libs/actions/Welcome/OnboardingFlow.ts b/src/libs/actions/Welcome/OnboardingFlow.ts
@@ -84,10 +84,13 @@ function startOnboardingFlow(startOnboardingFlowParams: GetOnboardingInitialPath
     if (focusedRoute?.name === currentRoute?.name) {
         return;
     }
+    const rootState = navigationRef.getRootState();
+    const rootStateRouteNamesSet = new Set(rootState.routes.map((route) => route.name));
     navigationRef.resetRoot({
-        ...navigationRef.getRootState(),
+        ...rootState,
         ...adaptedState,
         stale: true,
+        routes: [...rootState.routes, ...(adaptedState?.routes.filter((route) => !rootStateRouteNamesSet.has(route.name)) ?? [])],
     } as PartialState<NavigationState>);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -84,10 +84,13 @@ function startOnboardingFlow(startOnboardingFlowParams: GetOnboardingInitialPath`
`84`	`84`	`if (focusedRoute?.name === currentRoute?.name) {`
`85`	`85`	`return;`
`86`	`86`	`}`
	`87`	`+ const rootState = navigationRef.getRootState();`
	`88`	`+ const rootStateRouteNamesSet = new Set(rootState.routes.map((route) => route.name));`
`87`	`89`	`navigationRef.resetRoot({`
`88`		`- ...navigationRef.getRootState(),`
	`90`	`+ ...rootState,`
`89`	`91`	`...adaptedState,`
`90`	`92`	`stale: true,`
	`93`	`+ routes: [...rootState.routes, ...(adaptedState?.routes.filter((route) => !rootStateRouteNamesSet.has(route.name)) ?? [])],`
`91`	`94`	`} as PartialState<NavigationState>);`
`92`	`95`	`}`
`93`	`96`