From fb01c47af59d4d1ce8b534eb5f8f6690da38cc7b Mon Sep 17 00:00:00 2001
From: Marc Glasser <marc.aaron.glasser@gmail.com>
Date: Mon, 11 Dec 2023 15:38:29 -1000
Subject: [PATCH 1/3] Enable KB Avoiding View + remove padding bottom

---
 src/pages/iou/request/step/StepScreenWrapper.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/iou/request/step/StepScreenWrapper.js b/src/pages/iou/request/step/StepScreenWrapper.js
index 000beb8432c5..cc5759382f9e 100644
--- a/src/pages/iou/request/step/StepScreenWrapper.js
+++ b/src/pages/iou/request/step/StepScreenWrapper.js
@@ -41,13 +41,12 @@ function StepScreenWrapper({testID, headerTitle, onBackButtonPress, onEntryTrans
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
-            shouldEnableKeyboardAvoidingView={false}
             onEntryTransitionEnd={onEntryTransitionEnd}
             testID={testID}
             shouldEnableMaxHeight={DeviceCapabilities.canUseTouchScreen()}
         >
             {({insets, safeAreaPaddingBottomStyle, didScreenTransitionEnd}) => (
-                <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
+                <View style={[styles.flex1]}>
                     <HeaderWithBackButton
                         title={headerTitle}
                         onBackButtonPress={onBackButtonPress}

From 8824a947643a06283859616614c5240e2b4febb6 Mon Sep 17 00:00:00 2001
From: Marc Glasser <marc.aaron.glasser@gmail.com>
Date: Mon, 11 Dec 2023 15:46:45 -1000
Subject: [PATCH 2/3] Fix the Amount page

---
 src/pages/iou/request/step/IOURequestStepAmount.js | 1 +
 src/pages/iou/request/step/StepScreenWrapper.js    | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepAmount.js b/src/pages/iou/request/step/IOURequestStepAmount.js
index b2dd18c38803..015d879f5459 100644
--- a/src/pages/iou/request/step/IOURequestStepAmount.js
+++ b/src/pages/iou/request/step/IOURequestStepAmount.js
@@ -98,6 +98,7 @@ function IOURequestStepAmount({
             onBackButtonPress={navigateBack}
             testID={IOURequestStepAmount.displayName}
             shouldShowWrapper={Boolean(backTo)}
+            includeSafeAreaPaddingBottom
         >
             <MoneyRequestAmountForm
                 isEditing={Boolean(backTo)}
diff --git a/src/pages/iou/request/step/StepScreenWrapper.js b/src/pages/iou/request/step/StepScreenWrapper.js
index cc5759382f9e..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,7 +44,7 @@ function StepScreenWrapper({testID, headerTitle, onBackButtonPress, onEntryTrans
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom={includeSafeAreaPaddingBottom}
             onEntryTransitionEnd={onEntryTransitionEnd}
             testID={testID}
             shouldEnableMaxHeight={DeviceCapabilities.canUseTouchScreen()}

From 4013094d18d936fba09021aa4a834407d70e376f Mon Sep 17 00:00:00 2001
From: Marc Glasser <marc.aaron.glasser@gmail.com>
Date: Mon, 11 Dec 2023 15:48:14 -1000
Subject: [PATCH 3/3] Fix participants page as well

---
 src/pages/iou/request/step/IOURequestStepParticipants.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.js b/src/pages/iou/request/step/IOURequestStepParticipants.js
index d07f900dbb6f..57af879c38e0 100644
--- a/src/pages/iou/request/step/IOURequestStepParticipants.js
+++ b/src/pages/iou/request/step/IOURequestStepParticipants.js
@@ -83,6 +83,7 @@ function IOURequestStepParticipants({
             shouldShowWrapper
             testID={IOURequestStepParticipants.displayName}
             onEntryTransitionEnd={() => optionsSelectorRef.current && optionsSelectorRef.current.focus()}
+            includeSafeAreaPaddingBottom
         >
             <MoneyRequestParticipantsSelector
                 ref={(el) => (optionsSelectorRef.current = el)}