From 2edff293c4e1cc847e5058442901df22cdce40cb Mon Sep 17 00:00:00 2001 From: Skyweb331 Date: Mon, 13 May 2024 13:24:17 -0400 Subject: [PATCH 01/13] redirect user to concierge when onboarding completed --- .../Navigators/OnboardingModalNavigator.tsx | 27 +++++++++++++++++-- src/types/onyx/index.ts | 2 ++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx index ef3f6340f3e4..15bc894e959a 100644 --- a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx +++ b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx @@ -1,23 +1,41 @@ import {createStackNavigator} from '@react-navigation/stack'; import React from 'react'; import {View} from 'react-native'; +import type {OnyxEntry} from 'react-native-onyx'; +import {withOnyx} from 'react-native-onyx'; import NoDropZone from '@components/DragAndDrop/NoDropZone'; import useOnboardingLayout from '@hooks/useOnboardingLayout'; import useThemeStyles from '@hooks/useThemeStyles'; import OnboardingModalNavigatorScreenOptions from '@libs/Navigation/AppNavigator/OnboardingModalNavigatorScreenOptions'; +import Navigation from '@libs/Navigation/Navigation'; import type {OnboardingModalNavigatorParamList} from '@libs/Navigation/types'; import OnboardingPersonalDetails from '@pages/OnboardingPersonalDetails'; import OnboardingPurpose from '@pages/OnboardingPurpose'; import OnboardingWork from '@pages/OnboardingWork'; +import * as Report from '@userActions/Report'; +import ONYXKEYS from '@src/ONYXKEYS'; import SCREENS from '@src/SCREENS'; +import type * as OnyxTypes from '@src/types/onyx'; import Overlay from './Overlay'; +type OnboardingModalNavigatorProps = { + /** Current onboarding completion status */ + onboarding: OnyxEntry; +}; + const Stack = createStackNavigator(); -function OnboardingModalNavigator() { +function OnboardingModalNavigator({onboarding}: OnboardingModalNavigatorProps) { const styles = useThemeStyles(); const {shouldUseNarrowLayout} = useOnboardingLayout(); + if (onboarding?.hasCompletedGuidedSetupFlow) { + Navigation.goBack(); + Report.navigateToConciergeChat(); + // eslint-disable-next-line react/jsx-no-useless-fragment + return <>; + } + return ( @@ -45,4 +63,9 @@ function OnboardingModalNavigator() { OnboardingModalNavigator.displayName = 'OnboardingModalNavigator'; -export default OnboardingModalNavigator; +export default withOnyx({ + onboarding: { + key: ONYXKEYS.NVP_ONBOARDING, + selector: (onboarding) => onboarding as OnyxTypes.Onboarding, + }, +})(OnboardingModalNavigator); diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts index 1695daebace8..ad77069084b8 100644 --- a/src/types/onyx/index.ts +++ b/src/types/onyx/index.ts @@ -28,6 +28,7 @@ import type MapboxAccessToken from './MapboxAccessToken'; import type Modal from './Modal'; import type Network from './Network'; import type NewGroupChatDraft from './NewGroupChatDraft'; +import type Onboarding from './Onboarding'; import type {OnyxUpdateEvent, OnyxUpdatesFromServer} from './OnyxUpdatesFromServer'; import type {DecisionName, OriginalMessageIOU} from './OriginalMessage'; import type PersonalBankAccount from './PersonalBankAccount'; @@ -108,6 +109,7 @@ export type { MapboxAccessToken, Modal, Network, + Onboarding, OnyxUpdateEvent, OnyxUpdatesFromServer, PersonalBankAccount, From efc236a0cd5317c8729dbb2f911048e6203d11c2 Mon Sep 17 00:00:00 2001 From: Skyweb331 Date: Tue, 14 May 2024 14:50:40 -0400 Subject: [PATCH 02/13] set onboarding completed as initial --- src/ONYXKEYS.ts | 2 +- .../Navigators/OnboardingModalNavigator.tsx | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index 804c8dadd553..ed59bd7f206d 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -578,7 +578,7 @@ type OnyxValuesMapping = { [ONYXKEYS.ACCOUNT]: OnyxTypes.Account; [ONYXKEYS.ACCOUNT_MANAGER_REPORT_ID]: string; [ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER]: boolean; - [ONYXKEYS.NVP_ONBOARDING]: Onboarding | []; + [ONYXKEYS.NVP_ONBOARDING]: Onboarding; [ONYXKEYS.ACTIVE_CLIENTS]: string[]; [ONYXKEYS.DEVICE_ID]: string; [ONYXKEYS.IS_SIDEBAR_LOADED]: boolean; diff --git a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx index 15bc894e959a..1c90b9825f39 100644 --- a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx +++ b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx @@ -1,7 +1,6 @@ import {createStackNavigator} from '@react-navigation/stack'; import React from 'react'; import {View} from 'react-native'; -import type {OnyxEntry} from 'react-native-onyx'; import {withOnyx} from 'react-native-onyx'; import NoDropZone from '@components/DragAndDrop/NoDropZone'; import useOnboardingLayout from '@hooks/useOnboardingLayout'; @@ -15,21 +14,20 @@ import OnboardingWork from '@pages/OnboardingWork'; import * as Report from '@userActions/Report'; import ONYXKEYS from '@src/ONYXKEYS'; import SCREENS from '@src/SCREENS'; -import type * as OnyxTypes from '@src/types/onyx'; import Overlay from './Overlay'; type OnboardingModalNavigatorProps = { /** Current onboarding completion status */ - onboarding: OnyxEntry; + hasCompletedGuidedSetupFlow: boolean; }; const Stack = createStackNavigator(); -function OnboardingModalNavigator({onboarding}: OnboardingModalNavigatorProps) { +function OnboardingModalNavigator({hasCompletedGuidedSetupFlow}: OnboardingModalNavigatorProps) { const styles = useThemeStyles(); const {shouldUseNarrowLayout} = useOnboardingLayout(); - if (onboarding?.hasCompletedGuidedSetupFlow) { + if (hasCompletedGuidedSetupFlow) { Navigation.goBack(); Report.navigateToConciergeChat(); // eslint-disable-next-line react/jsx-no-useless-fragment @@ -64,8 +62,8 @@ function OnboardingModalNavigator({onboarding}: OnboardingModalNavigatorProps) { OnboardingModalNavigator.displayName = 'OnboardingModalNavigator'; export default withOnyx({ - onboarding: { + hasCompletedGuidedSetupFlow: { key: ONYXKEYS.NVP_ONBOARDING, - selector: (onboarding) => onboarding as OnyxTypes.Onboarding, + selector: (onboarding) => onboarding?.hasCompletedGuidedSetupFlow ?? true, }, })(OnboardingModalNavigator); From 3dfb2936e1419e59aa4aa8f7f6dd5dd8231e5bb3 Mon Sep 17 00:00:00 2001 From: Skyweb331 Date: Wed, 15 May 2024 05:50:50 -0400 Subject: [PATCH 03/13] remove unused onboarding onyx type --- src/types/onyx/index.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts index ad77069084b8..1695daebace8 100644 --- a/src/types/onyx/index.ts +++ b/src/types/onyx/index.ts @@ -28,7 +28,6 @@ import type MapboxAccessToken from './MapboxAccessToken'; import type Modal from './Modal'; import type Network from './Network'; import type NewGroupChatDraft from './NewGroupChatDraft'; -import type Onboarding from './Onboarding'; import type {OnyxUpdateEvent, OnyxUpdatesFromServer} from './OnyxUpdatesFromServer'; import type {DecisionName, OriginalMessageIOU} from './OriginalMessage'; import type PersonalBankAccount from './PersonalBankAccount'; @@ -109,7 +108,6 @@ export type { MapboxAccessToken, Modal, Network, - Onboarding, OnyxUpdateEvent, OnyxUpdatesFromServer, PersonalBankAccount, From 3aa75e9b09d1f722648d8f32429b6317d81d1b70 Mon Sep 17 00:00:00 2001 From: Skyweb331 Date: Wed, 15 May 2024 05:51:51 -0400 Subject: [PATCH 04/13] replace withOnyx HOC with useOnyx hook --- .../Navigators/OnboardingModalNavigator.tsx | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx index 1c90b9825f39..633659818e7d 100644 --- a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx +++ b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx @@ -1,7 +1,7 @@ import {createStackNavigator} from '@react-navigation/stack'; import React from 'react'; import {View} from 'react-native'; -import {withOnyx} from 'react-native-onyx'; +import {useOnyx} from 'react-native-onyx'; import NoDropZone from '@components/DragAndDrop/NoDropZone'; import useOnboardingLayout from '@hooks/useOnboardingLayout'; import useThemeStyles from '@hooks/useThemeStyles'; @@ -16,22 +16,18 @@ import ONYXKEYS from '@src/ONYXKEYS'; import SCREENS from '@src/SCREENS'; import Overlay from './Overlay'; -type OnboardingModalNavigatorProps = { - /** Current onboarding completion status */ - hasCompletedGuidedSetupFlow: boolean; -}; - const Stack = createStackNavigator(); -function OnboardingModalNavigator({hasCompletedGuidedSetupFlow}: OnboardingModalNavigatorProps) { +function OnboardingModalNavigator() { const styles = useThemeStyles(); const {shouldUseNarrowLayout} = useOnboardingLayout(); + const [hasCompletedGuidedSetupFlow] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: (onboarding) => onboarding?.hasCompletedGuidedSetupFlow ?? true}); if (hasCompletedGuidedSetupFlow) { Navigation.goBack(); Report.navigateToConciergeChat(); // eslint-disable-next-line react/jsx-no-useless-fragment - return <>; + return null; } return ( @@ -61,9 +57,4 @@ function OnboardingModalNavigator({hasCompletedGuidedSetupFlow}: OnboardingModal OnboardingModalNavigator.displayName = 'OnboardingModalNavigator'; -export default withOnyx({ - hasCompletedGuidedSetupFlow: { - key: ONYXKEYS.NVP_ONBOARDING, - selector: (onboarding) => onboarding?.hasCompletedGuidedSetupFlow ?? true, - }, -})(OnboardingModalNavigator); +export default OnboardingModalNavigator; From 06706c4444dbf95471e93bfe51934672278dc5b6 Mon Sep 17 00:00:00 2001 From: Skyweb331 Date: Wed, 15 May 2024 10:22:19 -0400 Subject: [PATCH 05/13] fix route change on component rendering --- .../Navigators/OnboardingModalNavigator.tsx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx index 633659818e7d..22ccc300ddb4 100644 --- a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx +++ b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx @@ -1,5 +1,5 @@ import {createStackNavigator} from '@react-navigation/stack'; -import React from 'react'; +import React, {useEffect} from 'react'; import {View} from 'react-native'; import {useOnyx} from 'react-native-onyx'; import NoDropZone from '@components/DragAndDrop/NoDropZone'; @@ -23,10 +23,18 @@ function OnboardingModalNavigator() { const {shouldUseNarrowLayout} = useOnboardingLayout(); const [hasCompletedGuidedSetupFlow] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: (onboarding) => onboarding?.hasCompletedGuidedSetupFlow ?? true}); - if (hasCompletedGuidedSetupFlow) { + useEffect(() => { + if (!hasCompletedGuidedSetupFlow) { + return; + } + + // Need to go back to previous route and then redirect to Concierge, + // otherwise going back on concierge will go to onboarding and then redirected to concierge again Navigation.goBack(); Report.navigateToConciergeChat(); - // eslint-disable-next-line react/jsx-no-useless-fragment + }, [hasCompletedGuidedSetupFlow]); + + if (hasCompletedGuidedSetupFlow) { return null; } From 9fef64b0306513eb7819e5d48f86e2ae1b30ce76 Mon Sep 17 00:00:00 2001 From: Skyweb331 Date: Fri, 17 May 2024 01:47:53 -0400 Subject: [PATCH 06/13] navigate to concierge when navigation is ready --- .../Navigators/OnboardingModalNavigator.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx index 22ccc300ddb4..17d45225677a 100644 --- a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx +++ b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx @@ -27,11 +27,12 @@ function OnboardingModalNavigator() { if (!hasCompletedGuidedSetupFlow) { return; } - - // Need to go back to previous route and then redirect to Concierge, - // otherwise going back on concierge will go to onboarding and then redirected to concierge again - Navigation.goBack(); - Report.navigateToConciergeChat(); + Navigation.isNavigationReady().then(() => { + // Need to go back to previous route and then redirect to Concierge, + // otherwise going back on concierge will go to onboarding and then redirected to concierge again + Navigation.goBack(); + Report.navigateToConciergeChat(); + }); }, [hasCompletedGuidedSetupFlow]); if (hasCompletedGuidedSetupFlow) { From 37aaff4323be5b7116c12be6ff917a9d20ff3970 Mon Sep 17 00:00:00 2001 From: Skyweb331 Date: Wed, 22 May 2024 05:32:35 -0400 Subject: [PATCH 07/13] fix comment for concerige --- .../AppNavigator/Navigators/OnboardingModalNavigator.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx index 17d45225677a..2405495821f9 100644 --- a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx +++ b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx @@ -29,7 +29,7 @@ function OnboardingModalNavigator() { } Navigation.isNavigationReady().then(() => { // Need to go back to previous route and then redirect to Concierge, - // otherwise going back on concierge will go to onboarding and then redirected to concierge again + // otherwise going back on Concierge will go to onboarding and then redirected to Concierge again Navigation.goBack(); Report.navigateToConciergeChat(); }); From f2758fc1aa2d21dd6c0e11cd8f2923c78362b2ff Mon Sep 17 00:00:00 2001 From: Skyweb331 Date: Thu, 23 May 2024 10:44:15 -0400 Subject: [PATCH 08/13] allow array for nvp_onboarding onyx --- src/ONYXKEYS.ts | 2 +- .../AppNavigator/Navigators/OnboardingModalNavigator.tsx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index ed59bd7f206d..804c8dadd553 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -578,7 +578,7 @@ type OnyxValuesMapping = { [ONYXKEYS.ACCOUNT]: OnyxTypes.Account; [ONYXKEYS.ACCOUNT_MANAGER_REPORT_ID]: string; [ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER]: boolean; - [ONYXKEYS.NVP_ONBOARDING]: Onboarding; + [ONYXKEYS.NVP_ONBOARDING]: Onboarding | []; [ONYXKEYS.ACTIVE_CLIENTS]: string[]; [ONYXKEYS.DEVICE_ID]: string; [ONYXKEYS.IS_SIDEBAR_LOADED]: boolean; diff --git a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx index 2405495821f9..8e671867ca6b 100644 --- a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx +++ b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx @@ -21,7 +21,9 @@ const Stack = createStackNavigator(); function OnboardingModalNavigator() { const styles = useThemeStyles(); const {shouldUseNarrowLayout} = useOnboardingLayout(); - const [hasCompletedGuidedSetupFlow] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: (onboarding) => onboarding?.hasCompletedGuidedSetupFlow ?? true}); + const [hasCompletedGuidedSetupFlow] = useOnyx(ONYXKEYS.NVP_ONBOARDING, { + selector: (onboarding) => !Array.isArray(onboarding) && (onboarding?.hasCompletedGuidedSetupFlow ?? true), + }); useEffect(() => { if (!hasCompletedGuidedSetupFlow) { From fd3dd47f940c55b23e93ca6a894c9b35eab375a5 Mon Sep 17 00:00:00 2001 From: Skyweb331 Date: Thu, 23 May 2024 10:47:52 -0400 Subject: [PATCH 09/13] add comment for nvp_onboarding type --- src/ONYXKEYS.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index 804c8dadd553..c17022c3e3a1 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -578,7 +578,10 @@ type OnyxValuesMapping = { [ONYXKEYS.ACCOUNT]: OnyxTypes.Account; [ONYXKEYS.ACCOUNT_MANAGER_REPORT_ID]: string; [ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER]: boolean; - [ONYXKEYS.NVP_ONBOARDING]: Onboarding | []; + + // NVP_ONBOARDING is an array for old users. + [ONYXKEYS.NVP_ONBOARDING]: Onboarding | []; + [ONYXKEYS.ACTIVE_CLIENTS]: string[]; [ONYXKEYS.DEVICE_ID]: string; [ONYXKEYS.IS_SIDEBAR_LOADED]: boolean; From bfeb14bc17afd2d44c817b6a18c0c8850c38bcc2 Mon Sep 17 00:00:00 2001 From: Skyweb331 Date: Mon, 27 May 2024 11:45:48 -0400 Subject: [PATCH 10/13] fix prettier --- src/ONYXKEYS.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index c17022c3e3a1..188d62f2b9b0 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -580,7 +580,7 @@ type OnyxValuesMapping = { [ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER]: boolean; // NVP_ONBOARDING is an array for old users. - [ONYXKEYS.NVP_ONBOARDING]: Onboarding | []; + [ONYXKEYS.NVP_ONBOARDING]: Onboarding | []; [ONYXKEYS.ACTIVE_CLIENTS]: string[]; [ONYXKEYS.DEVICE_ID]: string; From 7a4c24262feaf5754833105692507506fe9ab834 Mon Sep 17 00:00:00 2001 From: Skyweb331 Date: Tue, 28 May 2024 09:35:13 -0400 Subject: [PATCH 11/13] fix merge error --- .../AppNavigator/Navigators/OnboardingModalNavigator.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx index f7ef9c1c775f..557b451073b6 100644 --- a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx +++ b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx @@ -14,8 +14,8 @@ import OnboardingPersonalDetails from '@pages/OnboardingPersonalDetails'; import OnboardingPurpose from '@pages/OnboardingPurpose'; import OnboardingWork from '@pages/OnboardingWork'; import * as Report from '@userActions/Report'; -import ONYXKEYS from '@src/ONYXKEYS'; import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; import SCREENS from '@src/SCREENS'; import Overlay from './Overlay'; @@ -40,10 +40,6 @@ function OnboardingModalNavigator() { }); }, [hasCompletedGuidedSetupFlow]); - if (hasCompletedGuidedSetupFlow) { - return null; - } - const outerViewRef = React.useRef(null); const handleOuterClick = useCallback(() => { From e4a2d44355e7a2ee346e49736ee152e31153fca9 Mon Sep 17 00:00:00 2001 From: Skyweb331 Date: Tue, 28 May 2024 14:58:51 -0400 Subject: [PATCH 12/13] fix onboarding modal flashing --- .../AppNavigator/Navigators/OnboardingModalNavigator.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx index 557b451073b6..927dc0601bb1 100644 --- a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx +++ b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx @@ -48,6 +48,9 @@ function OnboardingModalNavigator() { useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.ESCAPE, handleOuterClick, {shouldBubble: true}); + if (!hasCompletedGuidedSetupFlow) { + return; + } return ( From 2dd159d26b980fb03927437239c536ed7530342a Mon Sep 17 00:00:00 2001 From: Skyweb331 Date: Wed, 29 May 2024 03:31:43 -0400 Subject: [PATCH 13/13] fix return null --- .../AppNavigator/Navigators/OnboardingModalNavigator.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx index 927dc0601bb1..d2d71a5dc2a2 100644 --- a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx +++ b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx @@ -48,8 +48,8 @@ function OnboardingModalNavigator() { useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.ESCAPE, handleOuterClick, {shouldBubble: true}); - if (!hasCompletedGuidedSetupFlow) { - return; + if (hasCompletedGuidedSetupFlow) { + return null; } return (