Merge pull request #40473 from lukemorawski/40397-fix-form_bottom_pad…

…ding [CP Staging] FormWrapper bottom padding fix
Expensify · Apr 21, 2024 · 696b9c4 · 696b9c4
2 parents 77a3c12 + aa4301f
commit 696b9c4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/src/components/Form/FormWrapper.tsx b/src/components/Form/FormWrapper.tsx
@@ -102,7 +102,7 @@ function FormWrapper({
             <FormElement
                 key={formID}
                 ref={formContentRef}
-                style={[style, safeAreaPaddingBottomStyle]}
+                style={[style, safeAreaPaddingBottomStyle.paddingBottom ? safeAreaPaddingBottomStyle : styles.pb5]}
             >
                 {children}
                 {isSubmitButtonVisible && (
@@ -123,26 +123,27 @@ function FormWrapper({
             </FormElement>
         ),
         [
-            children,
-            enabledWhenOffline,
-            errorMessage,
-            errors,
-            footerContent,
             formID,
-            formState?.errorFields,
-            formState?.isLoading,
-            isSubmitActionDangerous,
-            isSubmitButtonVisible,
-            onSubmit,
             style,
-            styles.flex1,
+            styles.pb5,
             styles.mh0,
             styles.mt5,
-            submitButtonStyles,
-            submitFlexEnabled,
+            styles.flex1,
+            children,
+            isSubmitButtonVisible,
             submitButtonText,
+            errors,
+            formState?.errorFields,
+            formState?.isLoading,
             shouldHideFixErrorsAlert,
+            errorMessage,
+            onSubmit,
+            footerContent,
             onFixTheErrorsLinkPressed,
+            submitFlexEnabled,
+            submitButtonStyles,
+            enabledWhenOffline,
+            isSubmitActionDangerous,
             disablePressOnEnter,
         ],
     );

diff --git a/src/pages/iou/request/step/IOURequestStepMerchant.tsx b/src/pages/iou/request/step/IOURequestStepMerchant.tsx
@@ -111,6 +111,7 @@ function IOURequestStepMerchant({
             onBackButtonPress={navigateBack}
             shouldShowWrapper
             testID={IOURequestStepMerchant.displayName}
+            includeSafeAreaPaddingBottom
         >
             <FormProvider
                 style={[styles.flexGrow1, styles.ph5]}