diff --git a/src/languages/en.ts b/src/languages/en.ts index df9b554ecead..684dc167c3bd 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -1217,10 +1217,6 @@ export default { requiredFirstName: 'Please input your first name to continue', requiredLasttName: 'Please input your last name to continue', }, - errorAlert: { - requiredFirstName: 'Please input your first name to continue', - requiredHitContinue: 'Please press continue to get set up', - }, }, personalDetails: { error: { diff --git a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx index 5d36e422d668..afd1fe6bc3fe 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, {useMemo, useRef} from 'react'; +import React, {useMemo} from 'react'; import {View} from 'react-native'; import NoDropZone from '@components/DragAndDrop/NoDropZone'; import useOnboardingLayout from '@hooks/useOnboardingLayout'; @@ -15,30 +15,18 @@ const Stack = createStackNavigator(); function OnboardingModalNavigator() { const styles = useThemeStyles(); - const isModalFocused = useRef(true); const screenOptions = useMemo(() => OnboardingModalNavigatorScreenOptions(styles), [styles]); const {shouldUseNarrowLayout} = useOnboardingLayout(); return ( - - { - isModalFocused.current = false; - }} - style={styles.onboardingNavigatorOuterView} - > - { - isModalFocused.current = true; - e.stopPropagation(); - }} - style={styles.OnboardingNavigatorInnerView(shouldUseNarrowLayout)} - > + {}} /> + + } + component={OnboardingPersonalDetails} /> ; -}; +type OnboardingPersonalDetailsProps = WithCurrentUserPersonalDetailsProps; -function OnboardingPersonalDetails({isModalFocused, currentUserPersonalDetails}: OnboardingPersonalDetailsProps) { +function OnboardingPersonalDetails({currentUserPersonalDetails}: OnboardingPersonalDetailsProps) { const theme = useTheme(); const styles = useThemeStyles(); const {translate} = useLocalize(); const {shouldUseNarrowLayout} = useOnboardingLayout(); const currentUserDetails = currentUserPersonalDetails || {}; - const [fixErrorsAlert, setFixErrorsAlert] = useState(); const saveAndNavigate = useCallback((values: FormOnyxValues<'displayNameForm'>) => { PersonalDetails.updateDisplayName(values.firstName.trim(), values.lastName.trim(), {preventGoBack: true}); @@ -41,22 +37,6 @@ function OnboardingPersonalDetails({isModalFocused, currentUserPersonalDetails}: Navigation.navigate(ROUTES.ONBOARDING_PURPOSE); }, []); - // Decide whether to show custom error or not. - // Custom errors are shown when user tries to dismiss - // the modal instead of clicking Continue. - const setCustomFixErrorsAlert = (errors) => { - if (isModalFocused.current) { - setFixErrorsAlert(undefined); - return; - } - - if (errors.firstName.length === 0 && errors.lastName.length === 0) { - setFixErrorsAlert(translate('onboarding.errorAlert.requiredHitContinue')); - } else { - setFixErrorsAlert(translate('onboarding.errorAlert.requiredFirstName')); - } - }; - const validate = (values: FormOnyxValues<'displayNameForm'>) => { const errors = {}; @@ -82,8 +62,6 @@ function OnboardingPersonalDetails({isModalFocused, currentUserPersonalDetails}: ErrorUtils.addErrorMessage(errors, 'lastName', 'personalDetails.error.containsReservedWord'); } - setCustomFixErrorsAlert(errors); - return errors; }; @@ -109,7 +87,6 @@ function OnboardingPersonalDetails({isModalFocused, currentUserPersonalDetails}: shouldValidateOnBlur shouldValidateOnChange shouldTrimValues={false} - fixErrorsAlert={fixErrorsAlert} > {translate('onboarding.welcome')}