Merge pull request #53576 from software-mansion-labs/adamgrzybowski/f…

…ix-useActiveWorkspaceFromNavigationState Fix useActiveWorkspaceFromNavigationState
Expensify · Dec 6, 2024 · 96f7fdd · 96f7fdd
2 parents f7d076a + 466b285
commit 96f7fdd
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/hooks/useActiveWorkspaceFromNavigationState.ts b/src/hooks/useActiveWorkspaceFromNavigationState.ts
@@ -18,10 +18,10 @@ function useActiveWorkspaceFromNavigationState() {
             Log.warn('useActiveWorkspaceFromNavigationState should be called only from BottomTab screens');
         }
 
-        const params = state.routes.at(-1)?.params ?? {};
+        const lastHomeParams = state.routes.findLast((route) => route.name === SCREENS.HOME)?.params ?? {};
 
-        if ('policyID' in params) {
-            return params?.policyID;
+        if ('policyID' in lastHomeParams) {
+            return lastHomeParams.policyID;
         }
     });