Skip to content

Commit 75e46c1

Browse files
chrispaderchrispader
committed
fix: remove all includeSafeAreaPaddingBottom={true} occurences
1 parent 69123c7 commit 75e46c1

File tree

122 files changed

+20
-180
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+20
-180
lines changed

‎src/components/CategorySelector/CategorySelectorModal.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ function CategorySelectorModal({policyID, isVisible, currentCategory, onCategory
4242
<ScreenWrapper
4343
style={[styles.pb0]}
4444
includePaddingTop={false}
45-
includeSafeAreaPaddingBottom
4645
shouldEnableKeyboardAvoidingView={false}
4746
testID={CategorySelectorModal.displayName}
4847
>

‎src/components/DatePicker/CalendarPicker/YearPickerModal.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ function YearPickerModal({isVisible, years, currentYear = new Date().getFullYear
5858
<ScreenWrapper
5959
style={[styles.pb0]}
6060
includePaddingTop={false}
61-
includeSafeAreaPaddingBottom
6261
testID={YearPickerModal.displayName}
6362
>
6463
<HeaderWithBackButton

‎src/components/InteractiveStepWrapper.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ function InteractiveStepWrapper(
6868
<ScreenWrapper
6969
ref={ref}
7070
testID={wrapperID}
71-
includeSafeAreaPaddingBottom
7271
shouldEnablePickerAvoiding={shouldEnablePickerAvoiding}
7372
shouldEnableMaxHeight={shouldEnableMaxHeight}
7473
shouldShowOfflineIndicator={shouldShowOfflineIndicator}

‎src/components/ScreenWrapper.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,7 @@ function ScreenWrapper(
327327
<OfflineIndicator
328328
style={[offlineIndicatorStyle]}
329329
containerStyles={
330-
includeSafeAreaPaddingBottom
331-
? [styles.offlineIndicatorMobile]
330+
? [styles.offlineIndicatorMobile]
332331
: [styles.offlineIndicatorMobile, {paddingBottom: paddingBottom + styles.offlineIndicatorMobile.paddingBottom}]
333332
}
334333
/>

‎src/components/Search/SearchDateFilterBase.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ function SearchDateFilterBase({dateKey, titleKey}: SearchDateFilterBaseProps) {
4545
testID={SearchDateFilterBase.displayName}
4646
shouldShowOfflineIndicatorInWideScreen
4747
offlineIndicatorStyle={styles.mtAuto}
48-
includeSafeAreaPaddingBottom
4948
shouldEnableMaxHeight
5049
>
5150
<HeaderWithBackButton

‎src/components/TextPicker/TextSelectorModal.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ function TextSelectorModal({value, description = '', subtitle, onValueSelected,
8080
>
8181
<ScreenWrapper
8282
includePaddingTop
83-
includeSafeAreaPaddingBottom
8483
testID={TextSelectorModal.displayName}
8584
shouldEnableMaxHeight
8685
>

‎src/components/TimeModalPicker.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ function TimeModalPicker({value, errorText, label, onInputChange = () => {}}: Ti
5959
<ScreenWrapper
6060
style={styles.pb0}
6161
includePaddingTop={false}
62-
includeSafeAreaPaddingBottom
6362
testID={TimeModalPicker.displayName}
6463
>
6564
<HeaderWithBackButton

‎src/components/ValidateCodeActionModal/index.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ function ValidateCodeActionModal({
7272
shouldUseModalPaddingStyle={false}
7373
>
7474
<ScreenWrapper
75-
includeSafeAreaPaddingBottom
7675
includePaddingTop
7776
shouldEnableMaxHeight
7877
testID={ValidateCodeActionModal.displayName}

‎src/components/ValuePicker/ValueSelectorModal.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ function ValueSelectorModal({
3939
<ScreenWrapper
4040
style={styles.pb0}
4141
includePaddingTop={false}
42-
includeSafeAreaPaddingBottom
4342
testID={ValueSelectorModal.displayName}
4443
shouldEnableKeyboardAvoidingView={shouldEnableKeyboardAvoidingView}
4544
>

‎src/pages/AddressPage.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,7 @@ function AddressPage({title, address, updateAddress, isLoadingApp = true, backTo
8181
}, []);
8282

8383
return (
84-
<ScreenWrapper
85-
includeSafeAreaPaddingBottom
86-
testID={AddressPage.displayName}
87-
>
84+
<ScreenWrapper testID={AddressPage.displayName}>
8885
<DelegateNoAccessWrapper accessDeniedVariants={[CONST.DELEGATE.DENIED_ACCESS_VARIANTS.DELEGATE]}>
8986
<HeaderWithBackButton
9087
title={title}

‎src/pages/EditReportFieldPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ function EditReportFieldPage({route}: EditReportFieldPageProps) {
9494

9595
return (
9696
<ScreenWrapper
97-
includeSafeAreaPaddingBottom
9897
shouldEnableMaxHeight
9998
testID={EditReportFieldPage.displayName}
10099
>

‎src/pages/EnablePayments/EnablePaymentsPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ function EnablePaymentsPage({userWallet}: EnablePaymentsPageProps) {
5454
return (
5555
<ScreenWrapper
5656
shouldShowOfflineIndicator={userWallet?.currentStep !== CONST.WALLET.STEP.ONFIDO}
57-
includeSafeAreaPaddingBottom
5857
testID={EnablePaymentsPage.displayName}
5958
>
6059
{() => {

‎src/pages/GroupChatNameEditPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ function GroupChatNameEditPage({report}: GroupChatNameEditPageProps) {
7373

7474
return (
7575
<ScreenWrapper
76-
includeSafeAreaPaddingBottom
7776
style={[styles.defaultModalContainer]}
7877
testID={GroupChatNameEditPage.displayName}
7978
shouldEnableMaxHeight

‎src/pages/NewChatPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,6 @@ function NewChatPage() {
329329
return (
330330
<ScreenWrapper
331331
shouldEnableKeyboardAvoidingView={false}
332-
includeSafeAreaPaddingBottom
333332
shouldShowOfflineIndicator={false}
334333
includePaddingTop={false}
335334
shouldEnablePickerAvoiding={false}

‎src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
148148
<ScreenWrapper
149149
shouldEnableMaxHeight
150150
shouldShowOfflineIndicator={false}
151-
includeSafeAreaPaddingBottom
152151
testID="BaseOnboardingPersonalDetails"
153152
style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}
154153
>

‎src/pages/PrivateNotes/PrivateNotesEditPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ function PrivateNotesEditPage({route, report, accountID}: PrivateNotesEditPagePr
105105
return (
106106
<ScreenWrapper
107107
shouldEnableMaxHeight
108-
includeSafeAreaPaddingBottom
109108
testID={PrivateNotesEditPage.displayName}
110109
>
111110
<HeaderWithBackButton

‎src/pages/RestrictedAction/Workspace/WorkspaceAdminRestrictedAction.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ function WorkspaceAdminRestrictedAction({policyID}: WorkspaceAdminRestrictedActi
3131
}, [policyID]);
3232

3333
return (
34-
<ScreenWrapper
35-
includeSafeAreaPaddingBottom
36-
testID={WorkspaceAdminRestrictedAction.displayName}
37-
>
34+
<ScreenWrapper testID={WorkspaceAdminRestrictedAction.displayName}>
3835
<HeaderWithBackButton
3936
title={translate('workspace.restrictedAction.restricted')}
4037
onBackButtonPress={Navigation.goBack}

‎src/pages/RestrictedAction/Workspace/WorkspaceOwnerRestrictedAction.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ function WorkspaceOwnerRestrictedAction() {
2525
};
2626

2727
return (
28-
<ScreenWrapper
29-
includeSafeAreaPaddingBottom
30-
testID={WorkspaceOwnerRestrictedAction.displayName}
31-
>
28+
<ScreenWrapper testID={WorkspaceOwnerRestrictedAction.displayName}>
3229
<HeaderWithBackButton
3330
title={translate('workspace.restrictedAction.restricted')}
3431
onBackButtonPress={Navigation.goBack}

‎src/pages/RestrictedAction/Workspace/WorkspaceUserRestrictedAction.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ function WorkspaceUserRestrictedAction({policyID}: WorkspaceUserRestrictedAction
3131
}, [policyID]);
3232

3333
return (
34-
<ScreenWrapper
35-
includeSafeAreaPaddingBottom
36-
testID={WorkspaceUserRestrictedAction.displayName}
37-
>
34+
<ScreenWrapper testID={WorkspaceUserRestrictedAction.displayName}>
3835
<HeaderWithBackButton
3936
title={translate('workspace.restrictedAction.restricted')}
4037
onBackButtonPress={Navigation.goBack}

‎src/pages/RoomDescriptionPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ function RoomDescriptionPage({report, policies}: RoomDescriptionPageProps) {
8080
return (
8181
<ScreenWrapper
8282
shouldEnableMaxHeight
83-
includeSafeAreaPaddingBottom
8483
testID={RoomDescriptionPage.displayName}
8584
>
8685
<HeaderWithBackButton

‎src/pages/RoomInvitePage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ function RoomInvitePage({
247247
<ScreenWrapper
248248
shouldEnableMaxHeight
249249
testID={RoomInvitePage.displayName}
250-
includeSafeAreaPaddingBottom
251250
>
252251
<FullPageNotFoundView
253252
shouldShow={isEmptyObject(report)}

‎src/pages/Search/SavedSearchRenamePage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ function SavedSearchRenamePage({route}: {route: {params: {q: string; name: strin
5050
testID={SavedSearchRenamePage.displayName}
5151
shouldShowOfflineIndicatorInWideScreen
5252
offlineIndicatorStyle={styles.mtAuto}
53-
includeSafeAreaPaddingBottom
5453
>
5554
<HeaderWithBackButton title={translate('common.rename')} />
5655
<FormProvider

‎src/pages/Search/SearchAdvancedFiltersPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ function SearchAdvancedFiltersPage() {
2727
testID={SearchAdvancedFiltersPage.displayName}
2828
shouldShowOfflineIndicatorInWideScreen
2929
offlineIndicatorStyle={styles.mtAuto}
30-
includeSafeAreaPaddingBottom
3130
>
3231
<HeaderWithBackButton title={translate('search.filtersHeader')}>
3332
{shouldShowResetFilters && <TextLink onPress={SearchActions.clearAdvancedFilters}>{translate('search.resetFilters')}</TextLink>}

‎src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAmountPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ function SearchFiltersAmountPage() {
4343
testID={SearchFiltersAmountPage.displayName}
4444
shouldShowOfflineIndicatorInWideScreen
4545
offlineIndicatorStyle={styles.mtAuto}
46-
includeSafeAreaPaddingBottom
4746
shouldEnableMaxHeight
4847
>
4948
<HeaderWithBackButton

‎src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCurrencyPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ function SearchFiltersCurrencyPage() {
4545
testID={SearchFiltersCurrencyPage.displayName}
4646
shouldShowOfflineIndicatorInWideScreen
4747
offlineIndicatorStyle={styles.mtAuto}
48-
includeSafeAreaPaddingBottom
4948
shouldEnableMaxHeight
5049
>
5150
<HeaderWithBackButton

‎src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDescriptionPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ function SearchFiltersDescriptionPage() {
3535
testID={SearchFiltersDescriptionPage.displayName}
3636
shouldShowOfflineIndicatorInWideScreen
3737
offlineIndicatorStyle={styles.mtAuto}
38-
includeSafeAreaPaddingBottom
3938
shouldEnableMaxHeight
4039
>
4140
<HeaderWithBackButton

‎src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ function SearchFiltersFromPage() {
2020
return (
2121
<ScreenWrapper
2222
testID={SearchFiltersFromPage.displayName}
23-
includeSafeAreaPaddingBottom
2423
shouldShowOfflineIndicatorInWideScreen
2524
offlineIndicatorStyle={styles.mtAuto}
2625
shouldEnableMaxHeight

‎src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersMerchantPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ function SearchFiltersMerchantPage() {
3535
testID={SearchFiltersMerchantPage.displayName}
3636
shouldShowOfflineIndicatorInWideScreen
3737
offlineIndicatorStyle={styles.mtAuto}
38-
includeSafeAreaPaddingBottom
3938
shouldEnableMaxHeight
4039
>
4140
<HeaderWithBackButton

‎src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportIDPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ function SearchFiltersReportIDPage() {
3535
testID={SearchFiltersReportIDPage.displayName}
3636
shouldShowOfflineIndicatorInWideScreen
3737
offlineIndicatorStyle={styles.mtAuto}
38-
includeSafeAreaPaddingBottom
3938
shouldEnableMaxHeight
4039
>
4140
<HeaderWithBackButton

‎src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ function SearchFiltersToPage() {
2020
return (
2121
<ScreenWrapper
2222
testID={SearchFiltersToPage.displayName}
23-
includeSafeAreaPaddingBottom
2423
shouldShowOfflineIndicatorInWideScreen
2524
offlineIndicatorStyle={styles.mtAuto}
2625
shouldEnableMaxHeight

‎src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,7 @@ function IntroSchoolPrincipalPage(props: IntroSchoolPrincipalPageProps) {
7474
);
7575

7676
return (
77-
<ScreenWrapper
78-
includeSafeAreaPaddingBottom
79-
testID={IntroSchoolPrincipalPage.displayName}
80-
>
77+
<ScreenWrapper testID={IntroSchoolPrincipalPage.displayName}>
8178
<HeaderWithBackButton
8279
title={translate('teachersUnitePage.introSchoolPrincipal')}
8380
onBackButtonPress={() => Navigation.goBack()}

‎src/pages/TeachersUnite/KnowATeacherPage.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,7 @@ function KnowATeacherPage(props: KnowATeacherPageProps) {
8080
);
8181

8282
return (
83-
<ScreenWrapper
84-
includeSafeAreaPaddingBottom
85-
testID={KnowATeacherPage.displayName}
86-
>
83+
<ScreenWrapper testID={KnowATeacherPage.displayName}>
8784
<HeaderWithBackButton
8885
title={translate('teachersUnitePage.iKnowATeacher')}
8986
onBackButtonPress={() => Navigation.goBack()}

‎src/pages/Travel/TripDetailsPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ function TripDetailsPage({route}: TripDetailsPageProps) {
5959

6060
return (
6161
<ScreenWrapper
62-
includeSafeAreaPaddingBottom
6362
shouldEnablePickerAvoiding={false}
6463
shouldEnableMaxHeight
6564
testID={TripDetailsPage.displayName}

‎src/pages/TripChatNameEditPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ function TripChatNameEditPage({report}: TripChatNameEditPageProps) {
6464

6565
return (
6666
<ScreenWrapper
67-
includeSafeAreaPaddingBottom
6867
style={[styles.defaultModalContainer]}
6968
testID={TripChatNameEditPage.displayName}
7069
shouldEnableMaxHeight

‎src/pages/WorkspaceSwitcherPage/index.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ function WorkspaceSwitcherPage() {
143143
return (
144144
<ScreenWrapper
145145
testID={WorkspaceSwitcherPage.displayName}
146-
includeSafeAreaPaddingBottom
147146
shouldEnableMaxHeight
148147
>
149148
{({didScreenTransitionEnd}) => (

‎src/pages/iou/HoldReasonFormView.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ function HoldReasonFormView({backTo, validate, onSubmit}: HoldReasonFormViewProp
3333

3434
return (
3535
<ScreenWrapper
36-
includeSafeAreaPaddingBottom
3736
shouldEnableMaxHeight
3837
testID={HoldReasonFormView.displayName}
3938
>

‎src/pages/iou/request/step/IOURequestStepAmount.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@ function IOURequestStepAmount({
311311
onBackButtonPress={navigateBack}
312312
testID={IOURequestStepAmount.displayName}
313313
shouldShowWrapper={!!backTo || isEditing}
314-
includeSafeAreaPaddingBottom
315314
>
316315
<MoneyRequestAmountForm
317316
isEditing={!!backTo || isEditing}

‎src/pages/iou/request/step/IOURequestStepCurrency.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ function IOURequestStepCurrency({
6969
onBackButtonPress={() => navigateBack()}
7070
shouldShowWrapper
7171
testID={IOURequestStepCurrency.displayName}
72-
includeSafeAreaPaddingBottom
7372
>
7473
{({didScreenTransitionEnd}) => (
7574
<CurrencySelectionList

‎src/pages/iou/request/step/IOURequestStepDate.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ function IOURequestStepDate({
117117
shouldShowNotFoundPage={shouldShowNotFound}
118118
shouldShowWrapper
119119
testID={IOURequestStepDate.displayName}
120-
includeSafeAreaPaddingBottom
121120
>
122121
<FormProvider
123122
style={[styles.flexGrow1, styles.ph5]}

‎src/pages/iou/request/step/IOURequestStepScan/index.native.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,6 @@ function IOURequestStepScan({
611611

612612
return (
613613
<StepScreenWrapper
614-
includeSafeAreaPaddingBottom
615614
headerTitle={translate('common.receipt')}
616615
onBackButtonPress={navigateBack}
617616
shouldShowWrapper={!!backTo || isEditing}

‎src/pages/iou/request/step/IOURequestStepSendFrom.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ function IOURequestStepSendFrom({route, transaction}: IOURequestStepSendFromProp
7979
onBackButtonPress={navigateBack}
8080
shouldShowWrapper
8181
testID={IOURequestStepSendFrom.displayName}
82-
includeSafeAreaPaddingBottom
8382
>
8483
<SelectionList
8584
sections={[{data: workspaceOptions, title: translate('common.workspaces')}]}

‎src/pages/iou/request/step/IOURequestStepSubrate.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ function IOURequestStepSubrate({
173173

174174
return (
175175
<ScreenWrapper
176-
includeSafeAreaPaddingBottom
177176
shouldEnableMaxHeight
178177
testID={IOURequestStepSubrate.displayName}
179178
>

‎src/pages/iou/request/step/IOURequestStepTaxAmountPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ function IOURequestStepTaxAmountPage({
158158
onBackButtonPress={navigateBack}
159159
testID={IOURequestStepTaxAmountPage.displayName}
160160
shouldShowWrapper={!!(backTo || isEditing)}
161-
includeSafeAreaPaddingBottom
162161
>
163162
<MoneyRequestAmountForm
164163
isEditing={!!(backTo || isEditing)}

‎src/pages/iou/request/step/IOURequestStepTime.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ function IOURequestStepTime({
110110
shouldShowNotFoundPage={shouldShowNotFound}
111111
shouldShowWrapper
112112
testID={IOURequestStepTime.displayName}
113-
includeSafeAreaPaddingBottom
114113
>
115114
<FormProvider
116115
style={[styles.flexGrow1, styles.ph5]}

‎src/pages/iou/request/step/IOURequestStepWaypoint.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ function IOURequestStepWaypoint({
161161

162162
return (
163163
<ScreenWrapper
164-
includeSafeAreaPaddingBottom
165164
onEntryTransitionEnd={() => textInput.current?.focus()}
166165
shouldEnableMaxHeight
167166
testID={IOURequestStepWaypoint.displayName}

‎src/pages/settings/Profile/Contacts/NewContactMethodPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ function NewContactMethodPage({route}: NewContactMethodPageProps) {
113113
return (
114114
<ScreenWrapper
115115
onEntryTransitionEnd={() => loginInputRef.current?.focus()}
116-
includeSafeAreaPaddingBottom
117116
shouldEnableMaxHeight
118117
testID={NewContactMethodPage.displayName}
119118
>

0 commit comments

Comments
 (0)