diff --git a/src/components/HeaderPageLayout.tsx b/src/components/HeaderPageLayout.tsx
index e7f5e2de7386..1d3a290ccbff 100644
--- a/src/components/HeaderPageLayout.tsx
+++ b/src/components/HeaderPageLayout.tsx
@@ -1,7 +1,7 @@
import React, {useMemo} from 'react';
import type {ReactNode} from 'react';
import {View} from 'react-native';
-import type {StyleProp, ViewStyle} from 'react-native';
+import type {ScrollViewProps, StyleProp, ViewStyle} from 'react-native';
import useNetwork from '@hooks/useNetwork';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useStyleUtils from '@hooks/useStyleUtils';
@@ -44,6 +44,8 @@ type HeaderPageLayoutProps = ChildrenProps &
/** Whether or not to show the offline indicator */
shouldShowOfflineIndicatorInWideScreen?: boolean;
+
+ keyboardShouldPersistTaps?: ScrollViewProps['keyboardShouldPersistTaps'];
};
function HeaderPageLayout({
backgroundColor,
@@ -56,6 +58,7 @@ function HeaderPageLayout({
headerContent,
shouldShowOfflineIndicatorInWideScreen = false,
testID,
+ keyboardShouldPersistTaps,
...rest
}: HeaderPageLayoutProps) {
const theme = useTheme();
@@ -98,7 +101,10 @@ function HeaderPageLayout({
)}
-
+
{!Browser.isSafari() && }
{headerContent}
diff --git a/src/pages/ReimbursementAccount/BankAccountStep.tsx b/src/pages/ReimbursementAccount/BankAccountStep.tsx
index afa2c10bc68e..8a1c751e37ce 100644
--- a/src/pages/ReimbursementAccount/BankAccountStep.tsx
+++ b/src/pages/ReimbursementAccount/BankAccountStep.tsx
@@ -225,21 +225,21 @@ function BankAccountStep({
/>
- User.requestValidateCodeAction()}
- handleSubmitForm={(validateCode) => User.validateSecondaryLogin(loginList, contactMethod, validateCode)}
- validateError={!isEmptyObject(validateLoginError) ? validateLoginError : ErrorUtils.getLatestErrorField(loginData, 'validateCodeSent')}
- clearError={() => User.clearContactMethodErrors(contactMethod, !isEmptyObject(validateLoginError) ? 'validateLogin' : 'validateCodeSent')}
- onClose={() => toggleValidateCodeActionModal?.(false)}
- />
+ User.requestValidateCodeAction()}
+ handleSubmitForm={(validateCode) => User.validateSecondaryLogin(loginList, contactMethod, validateCode)}
+ validateError={!isEmptyObject(validateLoginError) ? validateLoginError : ErrorUtils.getLatestErrorField(loginData, 'validateCodeSent')}
+ clearError={() => User.clearContactMethodErrors(contactMethod, !isEmptyObject(validateLoginError) ? 'validateLogin' : 'validateCodeSent')}
+ onClose={() => toggleValidateCodeActionModal?.(false)}
+ />
);
diff --git a/src/pages/settings/Security/AddDelegate/ConfirmDelegatePage.tsx b/src/pages/settings/Security/AddDelegate/ConfirmDelegatePage.tsx
index 57d50400863e..ab30ec426fae 100644
--- a/src/pages/settings/Security/AddDelegate/ConfirmDelegatePage.tsx
+++ b/src/pages/settings/Security/AddDelegate/ConfirmDelegatePage.tsx
@@ -59,6 +59,7 @@ function ConfirmDelegatePage({route}: ConfirmDelegatePageProps) {
testID={ConfirmDelegatePage.displayName}
footer={submitButton}
childrenContainerStyles={[styles.pt3, styles.gap6]}
+ keyboardShouldPersistTaps="handled"
>
{translate('delegate.confirmCopilot')}
- User.requestValidateCodeAction()}
- handleSubmitForm={(validateCode) => User.validateSecondaryLogin(loginList, contactMethod, validateCode, true)}
- validateError={!isEmptyObject(validateLoginError) ? validateLoginError : ErrorUtils.getLatestErrorField(loginData, 'validateCodeSent')}
- clearError={() => User.clearContactMethodErrors(contactMethod, !isEmptyObject(validateLoginError) ? 'validateLogin' : 'validateCodeSent')}
- onModalHide={() => {}}
- onClose={() => {
- setIsValidateModalVisible(false);
- TwoFactorAuthActions.quitAndNavigateBack(backTo);
- }}
- />
+ User.requestValidateCodeAction()}
+ handleSubmitForm={(validateCode) => User.validateSecondaryLogin(loginList, contactMethod, validateCode, true)}
+ validateError={!isEmptyObject(validateLoginError) ? validateLoginError : ErrorUtils.getLatestErrorField(loginData, 'validateCodeSent')}
+ clearError={() => User.clearContactMethodErrors(contactMethod, !isEmptyObject(validateLoginError) ? 'validateLogin' : 'validateCodeSent')}
+ onModalHide={() => {}}
+ onClose={() => {
+ setIsValidateModalVisible(false);
+ TwoFactorAuthActions.quitAndNavigateBack(backTo);
+ }}
+ />
);
}