diff --git a/apps/mobile/app/components/selection-header/index.tsx b/apps/mobile/app/components/selection-header/index.tsx index 1925ffca1..19a65f961 100644 --- a/apps/mobile/app/components/selection-header/index.tsx +++ b/apps/mobile/app/components/selection-header/index.tsx @@ -69,7 +69,6 @@ export const SelectionHeader = React.memo( const allSelected = items?.placeholders?.length === selectedItemsList.length; const focusedRouteId = useNavigationStore((state) => state.focusedRouteId); - console.log(focusedRouteId, "focusedRouteId"); useEffect(() => { if (selectionMode) { fluidTabsRef.current?.lock(); diff --git a/apps/mobile/app/navigation/navigation-stack.tsx b/apps/mobile/app/navigation/navigation-stack.tsx index 4642d8a77..635d441b8 100644 --- a/apps/mobile/app/navigation/navigation-stack.tsx +++ b/apps/mobile/app/navigation/navigation-stack.tsx @@ -28,7 +28,7 @@ import useNavigationStore, { } from "../stores/use-navigation-store"; import { useSelectionStore } from "../stores/use-selection-store"; import { useSettingStore } from "../stores/use-setting-store"; -import { fluidTabsRef, rootNavigatorRef } from "../utils/global-refs"; +import { rootNavigatorRef } from "../utils/global-refs"; const RootStack = createNativeStackNavigator(); const AppStack = createNativeStackNavigator(); @@ -50,7 +50,8 @@ const AppNavigation = React.memo( React.useEffect(() => { setTimeout(() => { useNavigationStore.getState().update(homepage as keyof RouteParams); - }, 1000); + useNavigationStore.getState().setFocusedRouteId(homepage); + }, 300); }, [homepage]); return ( @@ -171,15 +172,6 @@ export const RootNavigation = () => { screenOptions={{ headerShown: false }} - screenListeners={{ - focus: (props) => { - if (props.target?.startsWith("FluidPanelsView")) { - fluidTabsRef.current?.unlock(); - } else { - fluidTabsRef.current?.lock(); - } - } - }} initialRouteName={introCompleted ? "FluidPanelsView" : "Welcome"} >