WIP

Author: chrisnojima-zoom

shared/constants/router.tsx

@@ -124,7 +124,7 @@ export const getModalStack = (navState?: T.Immutable<NavState>) => {
   if (!_isLoggedIn(rs)) {
     return []
   }
-  return (rs.routes?.slice(1) ?? []).filter((r: Route) => !rootNonModalRouteNames.has(r.name))
+  return (rs.routes?.slice(1) ?? []).filter(r => !rootNonModalRouteNames.has(r.name))
 }
 
 export const getVisibleScreen = (navState?: T.Immutable<NavState>, _inludeModals?: boolean) => {
@@ -184,7 +184,7 @@ export const clearModals = () => {
   }
   const rootRoutes = ns?.routes ?? []
   const keepRoutes = rootRoutes.filter(
-    (route: Route, index: number) => index === 0 || rootNonModalRouteNames.has(route.name)
+    (route, index) => index === 0 || rootNonModalRouteNames.has(route.name)
   )
   if (keepRoutes.length !== rootRoutes.length) {
     n.dispatch({

shared/router-v2/common.native.tsx

@@ -87,7 +87,8 @@ const styles = Kb.Styles.styleSheetCreate(() => ({
 
 export const useSubnavTabAction = (navigation: NavigationContainerRef<object>, state: NavState) => {
   const onSelectTab = (tab: string) => {
-    const route = state?.routes?.find((r: NonNullable<NavState['routes']>[number]) => r.name === tab)
+    const routes = state && 'routes' in state ? state.routes : undefined
+    const route = routes?.find(r => r.name === tab)
     const event = route
       ? navigation.emit({
           canPreventDefault: true,