diff --git a/src/pages/ReimbursementAccount/BankInfo/substeps/Confirmation.tsx b/src/pages/ReimbursementAccount/BankInfo/substeps/Confirmation.tsx
index af4b251952de..44f83f55a23f 100644
--- a/src/pages/ReimbursementAccount/BankInfo/substeps/Confirmation.tsx
+++ b/src/pages/ReimbursementAccount/BankInfo/substeps/Confirmation.tsx
@@ -5,6 +5,7 @@ import {withOnyx} from 'react-native-onyx';
import Button from '@components/Button';
import DotIndicatorMessage from '@components/DotIndicatorMessage';
import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import SafeAreaConsumer from '@components/SafeAreaConsumer';
import ScrollView from '@components/ScrollView';
import Text from '@components/Text';
import useLocalize from '@hooks/useLocalize';
@@ -48,55 +49,59 @@ function Confirmation({reimbursementAccount, reimbursementAccountDraft, onNext,
};
return (
-
- {translate('bankAccount.letsDoubleCheck')}
- {translate('bankAccount.thisBankAccount')}
- {setupType === CONST.BANK_ACCOUNT.SUBSTEP.MANUAL && (
-
-
+
+ {({safeAreaPaddingBottomStyle}) => (
+
+ {translate('bankAccount.letsDoubleCheck')}
+ {translate('bankAccount.thisBankAccount')}
+ {setupType === CONST.BANK_ACCOUNT.SUBSTEP.MANUAL && (
+
+
-
-
+
+
+ )}
+ {setupType === CONST.BANK_ACCOUNT.SUBSTEP.PLAID && (
+
+ )}
+
+ {error && error.length > 0 && (
+
+ )}
+
+
+
)}
- {setupType === CONST.BANK_ACCOUNT.SUBSTEP.PLAID && (
-
- )}
-
- {error && error.length > 0 && (
-
- )}
-
-
-
+
);
}
diff --git a/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/ConfirmationUBO.tsx b/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/ConfirmationUBO.tsx
index 4228b1da9d12..3d6f1d5947ef 100644
--- a/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/ConfirmationUBO.tsx
+++ b/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/ConfirmationUBO.tsx
@@ -5,6 +5,7 @@ import {withOnyx} from 'react-native-onyx';
import Button from '@components/Button';
import DotIndicatorMessage from '@components/DotIndicatorMessage';
import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import SafeAreaConsumer from '@components/SafeAreaConsumer';
import ScrollView from '@components/ScrollView';
import Text from '@components/Text';
import TextLink from '@components/TextLink';
@@ -39,84 +40,88 @@ function ConfirmationUBO({reimbursementAccount, reimbursementAccountDraft, onNex
const error = reimbursementAccount ? ErrorUtils.getLatestErrorMessage(reimbursementAccount) : '';
return (
-
- {translate('beneficialOwnerInfoStep.letsDoubleCheck')}
- {
- onMove(UBO_STEP_INDEXES.LEGAL_NAME);
- }}
- />
- {
- onMove(UBO_STEP_INDEXES.DATE_OF_BIRTH);
- }}
- />
- {
- onMove(UBO_STEP_INDEXES.SSN);
- }}
- />
- {
- onMove(UBO_STEP_INDEXES.ADDRESS);
- }}
- />
-
-
- {`${translate('beneficialOwnerInfoStep.byAddingThisBankAccount')} `}
-
- {translate('onfidoStep.facialScan')}
-
- {', '}
-
+ {({safeAreaPaddingBottomStyle}) => (
+
- {translate('common.privacy')}
-
- {` ${translate('common.and')} `}
-
- {translate('common.termsOfService')}
-
-
-
- {error && error.length > 0 && (
- {translate('beneficialOwnerInfoStep.letsDoubleCheck')}
+ {
+ onMove(UBO_STEP_INDEXES.LEGAL_NAME);
+ }}
+ />
+ {
+ onMove(UBO_STEP_INDEXES.DATE_OF_BIRTH);
+ }}
/>
- )}
-
-
-
+ {
+ onMove(UBO_STEP_INDEXES.SSN);
+ }}
+ />
+ {
+ onMove(UBO_STEP_INDEXES.ADDRESS);
+ }}
+ />
+
+
+ {`${translate('beneficialOwnerInfoStep.byAddingThisBankAccount')} `}
+
+ {translate('onfidoStep.facialScan')}
+
+ {', '}
+
+ {translate('common.privacy')}
+
+ {` ${translate('common.and')} `}
+
+ {translate('common.termsOfService')}
+
+
+
+ {error && error.length > 0 && (
+
+ )}
+
+
+
+ )}
+
);
}
diff --git a/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/CompanyOwnersListUBO.tsx b/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/CompanyOwnersListUBO.tsx
index 42bf43d78910..45feabdf102f 100644
--- a/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/CompanyOwnersListUBO.tsx
+++ b/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/CompanyOwnersListUBO.tsx
@@ -6,6 +6,7 @@ import Button from '@components/Button';
import DotIndicatorMessage from '@components/DotIndicatorMessage';
import * as Expensicons from '@components/Icon/Expensicons';
import MenuItem from '@components/MenuItem';
+import SafeAreaConsumer from '@components/SafeAreaConsumer';
import ScrollView from '@components/ScrollView';
import Text from '@components/Text';
import useLocalize from '@hooks/useLocalize';
@@ -103,48 +104,52 @@ function CompanyOwnersListUBO({
});
return (
-
- {translate('beneficialOwnerInfoStep.letsDoubleCheck')}
- {translate('beneficialOwnerInfoStep.regulationRequiresUsToVerifyTheIdentity')}
-
- {`${translate('beneficialOwnerInfoStep.owners')}:`}
- {isUserUBO && (
-
-
-
- {error && error.length > 0 && (
-
- )}
-
-
-
+
+ )}
+
);
}
diff --git a/src/pages/ReimbursementAccount/PersonalInfo/substeps/Confirmation.tsx b/src/pages/ReimbursementAccount/PersonalInfo/substeps/Confirmation.tsx
index f05bb70bcd5a..80639c429685 100644
--- a/src/pages/ReimbursementAccount/PersonalInfo/substeps/Confirmation.tsx
+++ b/src/pages/ReimbursementAccount/PersonalInfo/substeps/Confirmation.tsx
@@ -5,6 +5,7 @@ import {withOnyx} from 'react-native-onyx';
import Button from '@components/Button';
import DotIndicatorMessage from '@components/DotIndicatorMessage';
import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import SafeAreaConsumer from '@components/SafeAreaConsumer';
import ScrollView from '@components/ScrollView';
import Text from '@components/Text';
import TextLink from '@components/TextLink';
@@ -43,87 +44,91 @@ function Confirmation({reimbursementAccount, reimbursementAccountDraft, onNext,
const error = ErrorUtils.getLatestErrorMessage(reimbursementAccount ?? {});
return (
-
- {translate('personalInfoStep.letsDoubleCheck')}
- {
- onMove(PERSONAL_INFO_STEP_INDEXES.LEGAL_NAME);
- }}
- />
- {
- onMove(PERSONAL_INFO_STEP_INDEXES.DATE_OF_BIRTH);
- }}
- />
- {
- onMove(PERSONAL_INFO_STEP_INDEXES.SSN);
- }}
- />
- {
- onMove(PERSONAL_INFO_STEP_INDEXES.ADDRESS);
- }}
- />
-
-
- {`${translate('personalInfoStep.byAddingThisBankAccount')} `}
-
- {translate('onfidoStep.facialScan')}
-
- {', '}
-
+ {({safeAreaPaddingBottomStyle}) => (
+
- {translate('common.privacy')}
-
- {` ${translate('common.and')} `}
-
- {translate('common.termsOfService')}
-
-
-
- {error && error.length > 0 && (
- {translate('personalInfoStep.letsDoubleCheck')}
+ {
+ onMove(PERSONAL_INFO_STEP_INDEXES.LEGAL_NAME);
+ }}
+ />
+ {
+ onMove(PERSONAL_INFO_STEP_INDEXES.DATE_OF_BIRTH);
+ }}
/>
- )}
-
-
-
+ {
+ onMove(PERSONAL_INFO_STEP_INDEXES.SSN);
+ }}
+ />
+ {
+ onMove(PERSONAL_INFO_STEP_INDEXES.ADDRESS);
+ }}
+ />
+
+
+ {`${translate('personalInfoStep.byAddingThisBankAccount')} `}
+
+ {translate('onfidoStep.facialScan')}
+
+ {', '}
+
+ {translate('common.privacy')}
+
+ {` ${translate('common.and')} `}
+
+ {translate('common.termsOfService')}
+
+
+
+ {error && error.length > 0 && (
+
+ )}
+
+
+
+ )}
+
);
}