diff --git a/src/pages/iou/request/step/IOURequestStepAmount.js b/src/pages/iou/request/step/IOURequestStepAmount.js index 913912fcf05c..8f89703e6efd 100644 --- a/src/pages/iou/request/step/IOURequestStepAmount.js +++ b/src/pages/iou/request/step/IOURequestStepAmount.js @@ -99,6 +99,7 @@ function IOURequestStepAmount({ onBackButtonPress={navigateBack} testID={IOURequestStepAmount.displayName} shouldShowWrapper={Boolean(backTo)} + includeSafeAreaPaddingBottom > optionsSelectorRef.current && optionsSelectorRef.current.focus()} + includeSafeAreaPaddingBottom > (optionsSelectorRef.current = el)} diff --git a/src/pages/iou/request/step/StepScreenWrapper.js b/src/pages/iou/request/step/StepScreenWrapper.js index 000beb8432c5..5131a9c60dc6 100644 --- a/src/pages/iou/request/step/StepScreenWrapper.js +++ b/src/pages/iou/request/step/StepScreenWrapper.js @@ -25,13 +25,17 @@ const propTypes = { /** An ID used for unit testing */ testID: PropTypes.string.isRequired, + + /** Whether or not to include safe area padding */ + includeSafeAreaPaddingBottom: PropTypes.bool, }; const defaultProps = { onEntryTransitionEnd: () => {}, + includeSafeAreaPaddingBottom: false, }; -function StepScreenWrapper({testID, headerTitle, onBackButtonPress, onEntryTransitionEnd, children, shouldShowWrapper}) { +function StepScreenWrapper({testID, headerTitle, onBackButtonPress, onEntryTransitionEnd, children, shouldShowWrapper, includeSafeAreaPaddingBottom}) { const styles = useThemeStyles(); if (!shouldShowWrapper) { @@ -40,14 +44,13 @@ function StepScreenWrapper({testID, headerTitle, onBackButtonPress, onEntryTrans return ( {({insets, safeAreaPaddingBottomStyle, didScreenTransitionEnd}) => ( - +