From 6122ce8c637fdc162a462b04a78da3b02227f117 Mon Sep 17 00:00:00 2001
From: Wojciech Boman <wojciechboman@gmail.com>
Date: Fri, 2 Aug 2024 16:10:23 +0200
Subject: [PATCH] Fix paddings on advanced filters screens

---
 src/pages/Search/AdvancedSearchFilters.tsx        | 7 ++++---
 src/pages/Search/SearchAdvancedFiltersPage.tsx    | 1 +
 src/pages/Search/SearchFiltersCategoryPage.tsx    | 3 ++-
 src/pages/Search/SearchFiltersCurrencyPage.tsx    | 3 ++-
 src/pages/Search/SearchFiltersDatePage.tsx        | 1 +
 src/pages/Search/SearchFiltersDescriptionPage.tsx | 3 ++-
 src/pages/Search/SearchFiltersMerchantPage.tsx    | 3 ++-
 src/pages/Search/SearchFiltersReportIDPage.tsx    | 3 ++-
 8 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 6e2a4746ff7d..740a144deb4a 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -5,6 +5,7 @@ import {useOnyx} from 'react-native-onyx';
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
 import type {LocaleContextProps} from '@components/LocaleContextProvider';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import ScrollView from '@components/ScrollView';
 import type {AdvancedFiltersKeys} from '@components/Search/types';
 import useLocalize from '@hooks/useLocalize';
 import useSingleExecution from '@hooks/useSingleExecution';
@@ -114,7 +115,7 @@ function AdvancedSearchFilters() {
     };
 
     return (
-        <View style={[styles.flex1, styles.justifyContentBetween]}>
+        <ScrollView contentContainerStyle={[styles.flexGrow1, styles.justifyContentBetween]}>
             <View>
                 {advancedFilters.map((item) => {
                     const onPress = singleExecution(waitForNavigate(() => Navigation.navigate(item.route)));
@@ -132,11 +133,11 @@ function AdvancedSearchFilters() {
             </View>
             <FormAlertWithSubmitButton
                 buttonText={translate('search.viewResults')}
-                containerStyles={[styles.mh4, styles.mt4]}
+                containerStyles={[styles.m4, styles.mb5]}
                 onSubmit={onFormSubmit}
                 enabledWhenOffline
             />
-        </View>
+        </ScrollView>
     );
 }
 
diff --git a/src/pages/Search/SearchAdvancedFiltersPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage.tsx
index 9d4864bce8eb..e24d2411226b 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage.tsx
@@ -15,6 +15,7 @@ function SearchAdvancedFiltersPage() {
             testID={SearchAdvancedFiltersPage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
         >
             <FullPageNotFoundView shouldShow={false}>
                 <HeaderWithBackButton title={translate('search.filtersHeader')} />
diff --git a/src/pages/Search/SearchFiltersCategoryPage.tsx b/src/pages/Search/SearchFiltersCategoryPage.tsx
index 29a149482c81..8105bde2745c 100644
--- a/src/pages/Search/SearchFiltersCategoryPage.tsx
+++ b/src/pages/Search/SearchFiltersCategoryPage.tsx
@@ -126,6 +126,7 @@ function SearchFiltersCategoryPage() {
             testID={SearchFiltersCategoryPage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
         >
             <FullPageNotFoundView shouldShow={false}>
                 <HeaderWithBackButton
@@ -134,7 +135,7 @@ function SearchFiltersCategoryPage() {
                         Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
                     }}
                 />
-                <View style={[styles.flex1]}>
+                <View style={[styles.flex1, styles.pb5]}>
                     <SelectionList
                         sections={sections}
                         textInputValue={searchTerm}
diff --git a/src/pages/Search/SearchFiltersCurrencyPage.tsx b/src/pages/Search/SearchFiltersCurrencyPage.tsx
index 54d52b62df0f..6c020e88ba0f 100644
--- a/src/pages/Search/SearchFiltersCurrencyPage.tsx
+++ b/src/pages/Search/SearchFiltersCurrencyPage.tsx
@@ -38,6 +38,7 @@ function SearchFiltersCurrencyPage() {
             testID={SearchFiltersCurrencyPage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
         >
             {({didScreenTransitionEnd}) => (
                 <FullPageNotFoundView shouldShow={false}>
@@ -55,7 +56,7 @@ function SearchFiltersCurrencyPage() {
                     />
                     <FormAlertWithSubmitButton
                         buttonText={translate('common.save')}
-                        containerStyles={[styles.m4]}
+                        containerStyles={[styles.m4, styles.mb5]}
                         onSubmit={handleOnSubmit}
                         enabledWhenOffline
                     />
diff --git a/src/pages/Search/SearchFiltersDatePage.tsx b/src/pages/Search/SearchFiltersDatePage.tsx
index 3cc19a501198..4bc95aa21351 100644
--- a/src/pages/Search/SearchFiltersDatePage.tsx
+++ b/src/pages/Search/SearchFiltersDatePage.tsx
@@ -34,6 +34,7 @@ function SearchFiltersDatePage() {
             testID={SearchFiltersDatePage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
         >
             <FullPageNotFoundView shouldShow={false}>
                 <HeaderWithBackButton
diff --git a/src/pages/Search/SearchFiltersDescriptionPage.tsx b/src/pages/Search/SearchFiltersDescriptionPage.tsx
index 0c04224f112f..1a00dd8a8372 100644
--- a/src/pages/Search/SearchFiltersDescriptionPage.tsx
+++ b/src/pages/Search/SearchFiltersDescriptionPage.tsx
@@ -36,6 +36,7 @@ function SearchFiltersDescriptionPage() {
             testID={SearchFiltersDescriptionPage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
         >
             <FullPageNotFoundView shouldShow={false}>
                 <HeaderWithBackButton
@@ -51,7 +52,7 @@ function SearchFiltersDescriptionPage() {
                     submitButtonText={translate('common.save')}
                     enabledWhenOffline
                 >
-                    <View style={styles.mb4}>
+                    <View style={styles.mb5}>
                         <InputWrapper
                             InputComponent={TextInput}
                             inputID={INPUT_IDS.DESCRIPTION}
diff --git a/src/pages/Search/SearchFiltersMerchantPage.tsx b/src/pages/Search/SearchFiltersMerchantPage.tsx
index 22092498e08c..db3a3ba1b31d 100644
--- a/src/pages/Search/SearchFiltersMerchantPage.tsx
+++ b/src/pages/Search/SearchFiltersMerchantPage.tsx
@@ -36,6 +36,7 @@ function SearchFiltersMerchantPage() {
             testID={SearchFiltersMerchantPage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
         >
             <FullPageNotFoundView shouldShow={false}>
                 <HeaderWithBackButton
@@ -51,7 +52,7 @@ function SearchFiltersMerchantPage() {
                     submitButtonText={translate('common.save')}
                     enabledWhenOffline
                 >
-                    <View style={styles.mb4}>
+                    <View style={styles.mb5}>
                         <InputWrapper
                             InputComponent={TextInput}
                             inputID={INPUT_IDS.MERCHANT}
diff --git a/src/pages/Search/SearchFiltersReportIDPage.tsx b/src/pages/Search/SearchFiltersReportIDPage.tsx
index 3b1751b65dde..02ee4fcf83dc 100644
--- a/src/pages/Search/SearchFiltersReportIDPage.tsx
+++ b/src/pages/Search/SearchFiltersReportIDPage.tsx
@@ -36,6 +36,7 @@ function SearchFiltersReportIDPage() {
             testID={SearchFiltersReportIDPage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
         >
             <FullPageNotFoundView shouldShow={false}>
                 <HeaderWithBackButton
@@ -51,7 +52,7 @@ function SearchFiltersReportIDPage() {
                     submitButtonText={translate('common.save')}
                     enabledWhenOffline
                 >
-                    <View style={styles.mb4}>
+                    <View style={styles.mb5}>
                         <InputWrapper
                             InputComponent={TextInput}
                             inputID={INPUT_IDS.REPORT_ID}