Revert custom error messages

software-mansion-labs · Feb 27, 2024 · f90adc8 · f90adc8
1 parent 308cf29
commit f90adc8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 47 deletions.
diff --git 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
@@ -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<OnboardingModalNavigatorParamList>();
 
 function OnboardingModalNavigator() {
     const styles = useThemeStyles();
-    const isModalFocused = useRef(true);
     const screenOptions = useMemo(() => OnboardingModalNavigatorScreenOptions(styles), [styles]);
     const {shouldUseNarrowLayout} = useOnboardingLayout();
 
     return (
         <NoDropZone>
-            <Overlay />
-            <View
-                onClick={() => {
-                    isModalFocused.current = false;
-                }}
-                style={styles.onboardingNavigatorOuterView}
-            >
-                <View
-                    onClick={(e) => {
-                        isModalFocused.current = true;
-                        e.stopPropagation();
-                    }}
-                    style={styles.OnboardingNavigatorInnerView(shouldUseNarrowLayout)}
-                >
+            <Overlay onPress={() => {}} />
+            <View style={styles.onboardingNavigatorOuterView}>
+                <View style={styles.OnboardingNavigatorInnerView(shouldUseNarrowLayout)}>
                     <Stack.Navigator screenOptions={screenOptions}>
                         <Stack.Screen
                             name={SCREENS.ONBOARDING.PERSONAL_DETAILS}
-                            component={() => <OnboardingPersonalDetails isModalFocused={isModalFocused} />}
+                            component={OnboardingPersonalDetails}
                         />
                         <Stack.Screen
                             name={SCREENS.ONBOARDING.PURPOSE}

diff --git a/src/pages/OnboardingPersonalDetails.tsx b/src/pages/OnboardingPersonalDetails.tsx
@@ -1,5 +1,4 @@
-import type {MutableRefObject} from 'react';
-import React, {useCallback, useState} from 'react';
+import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
@@ -23,40 +22,21 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import INPUT_IDS from '@src/types/form/DisplayNameForm';
 
-type OnboardingPersonalDetailsProps = WithCurrentUserPersonalDetailsProps & {
-    isModalFocused: MutableRefObject<boolean>;
-};
+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<string | undefined>();
 
     const saveAndNavigate = useCallback((values: FormOnyxValues<'displayNameForm'>) => {
         PersonalDetails.updateDisplayName(values.firstName.trim(), values.lastName.trim(), {preventGoBack: true});
 
         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}
                 >
                     <View style={[shouldUseNarrowLayout ? styles.flexRow : styles.flexColumn, styles.mb5]}>
                         <Text style={[styles.textHeroSmall]}>{translate('onboarding.welcome')} </Text>