fix:blank page appears in validate code form page

src/components/ValidateCodeActionForm.tsx

@@ -0,0 +1,98 @@
+import React, {forwardRef, useEffect, useRef, useState} from 'react';
+import type {ForwardedRef} from 'react';
+import {InteractionManager, View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import useThemeStyles from '@hooks/useThemeStyles';
+import ONYXKEYS from '@src/ONYXKEYS';
+import Text from './Text';
+import type {ValidateCodeActionModalProps} from './ValidateCodeActionModal/type';
+import ValidateCodeForm from './ValidateCodeActionModal/ValidateCodeForm';
+import type {ValidateCodeFormHandle} from './ValidateCodeActionModal/ValidateCodeForm/BaseValidateCodeForm';
+
+type ValidateCodeActionFormProps = {
+    /** Ref for validate code form */
+    forwardedRef: ForwardedRef<ValidateCodeFormHandle>;
+};
+
+type ValidateCodeActionProps = ValidateCodeActionModalProps & ValidateCodeActionFormProps;
+
+function ValidateCodeActionForm({
+    isVisible,
+    descriptionPrimary,
+    descriptionSecondary,
+    validatePendingAction,
+    validateError,
+    handleSubmitForm,
+    clearError,
+    sendValidateCode,
+    hasMagicCodeBeenSent,
+    isLoading,
+    forwardedRef,
+}: ValidateCodeActionProps) {
+    const themeStyles = useThemeStyles();
+    const firstRenderRef = useRef(true);
+    const isClosedRef = useRef(false);
+
+    const [validateCodeAction] = useOnyx(ONYXKEYS.VALIDATE_ACTION_CODE);
+
+    const [canSendHasMagicCodeBeenSent, setCanSendHasMagicCodeBeenSent] = useState(false);
+
+    useEffect(
+        () => () => {
+            firstRenderRef.current = true;
+            isClosedRef.current = true;
+        },
+        [],
+    );
+
+    useEffect(() => {
+        if (!firstRenderRef.current || hasMagicCodeBeenSent) {
+            // eslint-disable-next-line rulesdir/prefer-early-return
+            return () => {
+                if (isClosedRef.current && isVisible) {
+                    clearError();
+                }
+            };
+        }
+        firstRenderRef.current = false;
+        if (isVisible) {
+            sendValidateCode();
+        }
+        if (hasMagicCodeBeenSent) {
+            InteractionManager.runAfterInteractions(() => {
+                setCanSendHasMagicCodeBeenSent(true);
+            });
+        }
+    }, [isVisible, sendValidateCode, hasMagicCodeBeenSent, clearError]);
+
+    if (isVisible) {
+        return (
+            <View style={[themeStyles.ph5, themeStyles.mt3, themeStyles.mb5, themeStyles.flex1]}>
+                <Text style={[themeStyles.mb3]}>{descriptionPrimary}</Text>
+                {!!descriptionSecondary && <Text style={[themeStyles.mb3]}>{descriptionSecondary}</Text>}
+                <ValidateCodeForm
+                    isLoading={isLoading}
+                    validateCodeAction={validateCodeAction}
+                    validatePendingAction={validatePendingAction}
+                    validateError={validateError}
+                    handleSubmitForm={handleSubmitForm}
+                    sendValidateCode={sendValidateCode}
+                    clearError={clearError}
+                    buttonStyles={[themeStyles.justifyContentEnd, themeStyles.flex1]}
+                    ref={forwardedRef}
+                    hasMagicCodeBeenSent={canSendHasMagicCodeBeenSent}
+                />
+            </View>
+        );
+    }
+}
+
+ValidateCodeActionForm.displayName = 'ValidateCodeActionForm';
+
+export default forwardRef<ValidateCodeFormHandle, ValidateCodeActionProps>((props, ref) => (
+    <ValidateCodeActionForm
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        forwardedRef={ref}
+    />
+));

src/components/ValidateCodeActionModal/type.ts

@@ -7,7 +7,7 @@ type ValidateCodeActionModalProps = {
     isVisible: boolean;
 
     /** Title of the modal */
-    title: string;
+    title?: string;
 
     /** Primary description of the modal */
     descriptionPrimary: string;

src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx

@@ -13,12 +13,12 @@ import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
-import ValidateCodeActionModal from '@components/ValidateCodeActionModal';
-import useBeforeRemove from '@hooks/useBeforeRemove';
+import ValidateCodeActionForm from '@components/ValidateCodeActionForm';
 import useLocalize from '@hooks/useLocalize';
 import usePrevious from '@hooks/usePrevious';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
 import blurActiveElement from '@libs/Accessibility/blurActiveElement';
 import {
     clearContactMethod,
@@ -30,6 +30,7 @@ import {
     setContactMethodAsDefault,
     validateSecondaryLogin,
 } from '@libs/actions/User';
+import {isMobileSafari} from '@libs/Browser';
 import {canUseTouchScreen} from '@libs/DeviceCapabilities';
 import {getEarliestErrorField, getLatestErrorField} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
@@ -54,13 +55,14 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
     const [myDomainSecurityGroups, myDomainSecurityGroupsResult] = useOnyx(ONYXKEYS.MY_DOMAIN_SECURITY_GROUPS);
     const [securityGroups, securityGroupsResult] = useOnyx(ONYXKEYS.COLLECTION.SECURITY_GROUP);
     const [isLoadingReportData, isLoadingReportDataResult] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA, {initialValue: true});
-    const [isValidateCodeActionModalVisible, setIsValidateCodeActionModalVisible] = useState(true);
+    const [isValidateCodeFormVisible, setIsValidateCodeFormVisible] = useState(true);
 
     const isLoadingOnyxValues = isLoadingOnyxValue(loginListResult, sessionResult, myDomainSecurityGroupsResult, securityGroupsResult, isLoadingReportDataResult);
 
     const {formatPhoneNumber, translate} = useLocalize();
     const theme = useTheme();
     const themeStyles = useThemeStyles();
+    const {windowWidth} = useWindowDimensions();
 
     const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
     const validateCodeFormRef = useRef<ValidateCodeFormHandle>(null);
@@ -160,10 +162,8 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
         Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(backTo));
     }, [prevValidatedDate, loginData?.validatedDate, isDefaultContactMethod, backTo, loginData]);
 
-    useBeforeRemove(() => setIsValidateCodeActionModalVisible(false));
-
     useEffect(() => {
-        setIsValidateCodeActionModalVisible(!loginData?.validatedDate);
+        setIsValidateCodeFormVisible(!loginData?.validatedDate);
     }, [loginData?.validatedDate, loginData?.errorFields?.addedLogin]);
 
     useEffect(() => {
@@ -172,15 +172,15 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
 
     const getThreeDotsMenuItems = useCallback(() => {
         const menuItems = [];
-        if (isValidateCodeActionModalVisible && !isDefaultContactMethod) {
+        if (isValidateCodeFormVisible && !isDefaultContactMethod) {
             menuItems.push({
                 icon: Trashcan,
                 text: translate('common.remove'),
                 onSelected: () => close(() => toggleDeleteModal(true)),
             });
         }
         return menuItems;
-    }, [isValidateCodeActionModalVisible, translate, toggleDeleteModal, isDefaultContactMethod]);
+    }, [isValidateCodeFormVisible, translate, toggleDeleteModal, isDefaultContactMethod]);
 
     if (isLoadingOnyxValues || (isLoadingReportData && isEmptyObject(loginList))) {
         return <FullscreenLoadingIndicator />;
@@ -262,20 +262,50 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
                     />
                 </OfflineWithFeedback>
             )}
-            {getDeleteConfirmationModal()}
         </>
     );
 
     return (
         <ScreenWrapper
             onEntryTransitionEnd={() => validateCodeFormRef.current?.focus?.()}
             testID={ContactMethodDetailsPage.displayName}
+            focusTrapSettings={{
+                focusTrapOptions: isMobileSafari()
+                    ? undefined
+                    : {
+                          // It is added because input form's focusing bothers transition animation:
+                          // https://github.com/Expensify/App/issues/53884#issuecomment-2594568960
+                          checkCanFocusTrap: (trapContainers: Array<HTMLElement | SVGElement>) => {
+                              return new Promise((resolve) => {
+                                  const interval = setInterval(() => {
+                                      const trapContainer = trapContainers.at(0);
+                                      if (!trapContainer || (trapContainer && getComputedStyle(trapContainer).visibility !== 'hidden')) {
+                                          resolve();
+                                          clearInterval(interval);
+                                      }
+                                  }, 5);
+                              });
+                          },
+                      },
+            }}
         >
             <HeaderWithBackButton
                 title={formattedContactMethod}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(backTo))}
+                threeDotsMenuItems={getThreeDotsMenuItems()}
+                shouldShowThreeDotsButton={getThreeDotsMenuItems().length > 0}
+                shouldOverlayDots
+                threeDotsAnchorPosition={themeStyles.threeDotsPopoverOffset(windowWidth)}
+                onThreeDotsButtonPress={() => {
+                    // Hide the keyboard when the user clicks the three-dot menu.
+                    // Use blurActiveElement() for mWeb and KeyboardUtils.dismiss() for native apps.
+                    blurActiveElement();
+                    KeyboardUtils.dismiss();
+                }}
             />
-            <ScrollView keyboardShouldPersistTaps="handled">
+            <ScrollView
+                keyboardShouldPersistTaps="handled"
+                contentContainerStyle={themeStyles.flex1}
+            >
                 {isFailedAddContactMethod && (
                     <ErrorMessageRow
                         errors={getLatestErrorField(loginData, 'addedLogin')}
@@ -288,33 +318,22 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
                         canDismissError
                     />
                 )}
+                {isValidateCodeFormVisible && !loginData.validatedDate && !!loginData && (
+                    <ValidateCodeActionForm
+                        hasMagicCodeBeenSent={hasMagicCodeBeenSent}
+                        isVisible={isValidateCodeFormVisible && !loginData.validatedDate && !!loginData}
+                        validatePendingAction={loginData.pendingFields?.validateCodeSent}
+                        handleSubmitForm={(validateCode) => validateSecondaryLogin(loginList, contactMethod, validateCode)}
+                        validateError={!isEmptyObject(validateLoginError) ? validateLoginError : getLatestErrorField(loginData, 'validateCodeSent')}
+                        clearError={() => clearContactMethodErrors(contactMethod, !isEmptyObject(validateLoginError) ? 'validateLogin' : 'validateCodeSent')}
+                        sendValidateCode={() => requestContactMethodValidateCode(contactMethod)}
+                        descriptionPrimary={translate('contacts.enterMagicCode', {contactMethod: formattedContactMethod})}
+                        forwardedRef={validateCodeFormRef}
+                    />
+                )}
 
-                <ValidateCodeActionModal
-                    title={formattedContactMethod}
-                    onModalHide={() => {}}
-                    hasMagicCodeBeenSent={hasMagicCodeBeenSent}
-                    isVisible={isValidateCodeActionModalVisible && !loginData.validatedDate && !!loginData}
-                    validatePendingAction={loginData.pendingFields?.validateCodeSent}
-                    handleSubmitForm={(validateCode) => validateSecondaryLogin(loginList, contactMethod, validateCode)}
-                    validateError={!isEmptyObject(validateLoginError) ? validateLoginError : getLatestErrorField(loginData, 'validateCodeSent')}
-                    clearError={() => clearContactMethodErrors(contactMethod, !isEmptyObject(validateLoginError) ? 'validateLogin' : 'validateCodeSent')}
-                    onClose={() => {
-                        Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(backTo));
-                        setIsValidateCodeActionModalVisible(false);
-                    }}
-                    sendValidateCode={() => requestContactMethodValidateCode(contactMethod)}
-                    descriptionPrimary={translate('contacts.enterMagicCode', {contactMethod: formattedContactMethod})}
-                    onThreeDotsButtonPress={() => {
-                        // Hide the keyboard when the user clicks the three-dot menu.
-                        // Use blurActiveElement() for mWeb and KeyboardUtils.dismiss() for native apps.
-                        blurActiveElement();
-                        KeyboardUtils.dismiss();
-                    }}
-                    threeDotsMenuItems={getThreeDotsMenuItems()}
-                    footer={getDeleteConfirmationModal}
-                />
-
-                {!isValidateCodeActionModalVisible && getMenuItems()}
+                {!isValidateCodeFormVisible && !!loginData.validatedDate && getMenuItems()}
+                {getDeleteConfirmationModal()}
             </ScrollView>
         </ScreenWrapper>
     );