diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx index 68cc7e748413a..f9c3fbc442b07 100644 --- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx +++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx @@ -260,6 +260,12 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie isInitialRender.current = false; } + const isOnboardingCompletedRef = useRef(isOnboardingCompleted); + + useEffect(() => { + isOnboardingCompletedRef.current = isOnboardingCompleted; + }, [isOnboardingCompleted]); + useEffect(() => { const shortcutsOverviewShortcutConfig = CONST.KEYBOARD_SHORTCUTS.SHORTCUTS; const searchShortcutConfig = CONST.KEYBOARD_SHORTCUTS.SEARCH; @@ -358,6 +364,9 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie searchShortcutConfig.shortcutKey, () => { Session.checkIfActionIsAllowed(() => { + if (!isOnboardingCompletedRef.current) { + return; + } toggleSearchRouter(); })(); },