From 555861c5c9d4f254924144e10ff1d26ac2721721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Sun, 21 Apr 2024 11:32:37 +0100
Subject: [PATCH] Apply review changes

---
 .../createCustomBottomTabNavigator/BottomTabBar.tsx      | 9 ++++++++-
 .../BaseOnboardingPersonalDetails.tsx                    | 7 ++-----
 src/pages/OnboardingWork/BaseOnboardingWork.tsx          | 7 ++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx
index 4df23c110278..0be4ac5518f3 100644
--- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx
+++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx
@@ -50,7 +50,14 @@ function BottomTabBar({isLoadingApp = false}: PurposeForUsingExpensifyModalProps
         }
 
         Welcome.isOnboardingFlowCompleted({
-            onNotCompleted: () => Navigation.navigate(ROUTES.ONBOARDING_PURPOSE),
+            onNotCompleted: () =>
+                Navigation.navigate(
+                    // Uncomment once Stage 1 Onboarding Flow is ready
+                    //
+                    // ROUTES.ONBOARDING_PERSONAL_DETAILS
+                    //
+                    ROUTES.ONBOARD,
+                ),
         });
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [isLoadingApp]);
diff --git a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
index 96ef9f70f048..c7387c2b6aee 100644
--- a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
+++ b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
@@ -61,6 +61,7 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
             });
 
             Navigation.dismissModal();
+
             // Only navigate to concierge chat when central pane is visible
             // Otherwise stay on the chats screen.
             if (isSmallScreenWidth) {
@@ -110,10 +111,6 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
         return errors;
     };
 
-    const handleGoBack = useCallback(() => {
-        Navigation.goBack();
-    }, []);
-
     const PersonalDetailsFooterInstance = <OfflineIndicator />;
 
     return (
@@ -121,7 +118,7 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
             <HeaderWithBackButton
                 shouldShowBackButton
                 progressBarPercentage={OPEN_WORK_PAGE_PURPOSES.includes(onboardingPurposeSelected ?? '') ? 50 : 75}
-                onBackButtonPress={handleGoBack}
+                onBackButtonPress={Navigation.goBack}
             />
             <KeyboardAvoidingView
                 style={[styles.flex1, styles.dFlex]}
diff --git a/src/pages/OnboardingWork/BaseOnboardingWork.tsx b/src/pages/OnboardingWork/BaseOnboardingWork.tsx
index 81be2bcc6ac5..1236a8178796 100644
--- a/src/pages/OnboardingWork/BaseOnboardingWork.tsx
+++ b/src/pages/OnboardingWork/BaseOnboardingWork.tsx
@@ -57,6 +57,7 @@ function BaseOnboardingWork({currentUserPersonalDetails, shouldUseNativeStyles,
             );
 
             Navigation.dismissModal();
+
             // Only navigate to concierge chat when central pane is visible
             // Otherwise stay on the chats screen.
             if (isSmallScreenWidth) {
@@ -89,10 +90,6 @@ function BaseOnboardingWork({currentUserPersonalDetails, shouldUseNativeStyles,
         return errors;
     };
 
-    const handleGoBack = useCallback(() => {
-        Navigation.goBack();
-    }, []);
-
     const WorkFooterInstance = <OfflineIndicator />;
 
     return (
@@ -100,7 +97,7 @@ function BaseOnboardingWork({currentUserPersonalDetails, shouldUseNativeStyles,
             <HeaderWithBackButton
                 shouldShowBackButton
                 progressBarPercentage={75}
-                onBackButtonPress={handleGoBack}
+                onBackButtonPress={Navigation.goBack}
             />
             <KeyboardAvoidingView
                 style={[styles.flex1, styles.dFlex]}