From 91cf7bb74c76a1eb7cfcf848a792430fd88356a0 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Wed, 18 Dec 2024 11:35:35 +0100
Subject: [PATCH 1/8] fix: apply safe area padding for workspace screens

---
 src/pages/workspace/WorkspaceInitialPage.tsx             | 5 +----
 src/pages/workspace/WorkspaceMoreFeaturesPage.tsx        | 1 -
 src/pages/workspace/rules/PolicyRulesPage.tsx            | 1 +
 src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx | 1 +
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 95449e4c10ea3..bb2be6053c3d8 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -390,10 +390,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
     }, [policy]);
 
     return (
-        <ScreenWrapper
-            testID={WorkspaceInitialPage.displayName}
-            includeSafeAreaPaddingBottom={false}
-        >
+        <ScreenWrapper testID={WorkspaceInitialPage.displayName}>
             <FullPageNotFoundView
                 onBackButtonPress={Navigation.dismissModal}
                 onLinkPress={Navigation.resetToHome}
diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
index aa540f63599e5..53ab43832d0dc 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
@@ -413,7 +413,6 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
             policyID={route.params.policyID}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={WorkspaceMoreFeaturesPage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
diff --git a/src/pages/workspace/rules/PolicyRulesPage.tsx b/src/pages/workspace/rules/PolicyRulesPage.tsx
index 43ef6819976f5..42b24ef58c125 100644
--- a/src/pages/workspace/rules/PolicyRulesPage.tsx
+++ b/src/pages/workspace/rules/PolicyRulesPage.tsx
@@ -37,6 +37,7 @@ function PolicyRulesPage({route}: PolicyRulesPageProps) {
                 icon={Illustrations.Rules}
                 shouldShowNotFoundPage={false}
                 shouldShowLoading={false}
+                includeSafeAreaPaddingBottom
             >
                 <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                     <IndividualExpenseRulesSection policyID={policyID} />
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
index f4d05a09fba6f..5503ab7a24428 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
@@ -341,6 +341,7 @@ function WorkspaceWorkflowsPage({policy, route}: WorkspaceWorkflowsPageProps) {
                 isLoading={isLoading}
                 shouldShowLoading={isLoading}
                 shouldUseScrollView
+                includeSafeAreaPaddingBottom
             >
                 <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                     {optionItems.map(renderOptionItem)}

From a8b835ec514890b939dab938bc286945e173983d Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Thu, 19 Dec 2024 13:25:13 +0100
Subject: [PATCH 2/8] fix: partially resolve new eslint findings

---
 src/libs/PolicyUtils.ts                           | 6 +++++-
 src/libs/ReportUtils.ts                           | 6 +++++-
 src/pages/workspace/WorkspaceInitialPage.tsx      | 8 ++++----
 src/pages/workspace/WorkspaceMoreFeaturesPage.tsx | 6 +++---
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 9bf68b2c5432e..3f06532df87d4 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -1072,7 +1072,11 @@ function getCurrentTaxID(policy: OnyxEntry<Policy>, taxID: string): string | und
     return Object.keys(policy?.taxRates?.taxes ?? {}).find((taxIDKey) => policy?.taxRates?.taxes?.[taxIDKey].previousTaxCode === taxID || taxIDKey === taxID);
 }
 
-function getWorkspaceAccountID(policyID: string) {
+function getWorkspaceAccountID(policyID?: string) {
+    if (!policyID) {
+        return 0;
+    }
+
     const policy = getPolicy(policyID);
 
     if (!policy) {
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index d2ec8fb3ac624..b5061b1a00cbf 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -6757,7 +6757,11 @@ function getInvoiceChatByParticipants(policyID: string, receiverID: string | num
 /**
  * Attempts to find a policy expense report in onyx that is owned by ownerAccountID in a given policy
  */
-function getPolicyExpenseChat(ownerAccountID: number, policyID: string): OnyxEntry<Report> {
+function getPolicyExpenseChat(ownerAccountID: number, policyID?: string): OnyxEntry<Report> {
+    if (!policyID) {
+        return undefined;
+    }
+
     return Object.values(allReports ?? {}).find((report: OnyxEntry<Report>) => {
         // If the report has been deleted, then skip it
         if (!report) {
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index bb2be6053c3d8..a20583838170d 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -86,7 +86,7 @@ function dismissError(policyID: string, pendingAction: PendingAction | undefined
 function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: WorkspaceInitialPageProps) {
     const styles = useThemeStyles();
     const policy = policyDraft?.id ? policyDraft : policyProp;
-    const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policy?.id ?? '-1');
+    const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policy?.id);
     const [isCurrencyModalOpen, setIsCurrencyModalOpen] = useState(false);
     const hasPolicyCreationError = !!(policy?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD && !isEmptyObject(policy.errors));
     const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`);
@@ -94,7 +94,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
     const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`);
     const [connectionSyncProgress] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policy?.id}`);
     const [currentUserLogin] = useOnyx(ONYXKEYS.SESSION, {selector: (session) => session?.email});
-    const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${route.params?.policyID ?? '-1'}`);
+    const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${route.params?.policyID}`);
     const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
     const {login, accountID} = useCurrentUserPersonalDetails();
     const hasSyncError = PolicyUtils.shouldShowSyncError(policy, isConnectionInProgress(connectionSyncProgress, policy));
@@ -104,7 +104,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const wasRendered = useRef(false);
-    const currentUserPolicyExpenseChatReportID = getPolicyExpenseChat(accountID, policy?.id ?? '-1')?.reportID ?? '-1';
+    const currentUserPolicyExpenseChatReportID = getPolicyExpenseChat(accountID, policy?.id)?.reportID;
     const [currentUserPolicyExpenseChat] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${currentUserPolicyExpenseChatReportID}`);
     const {reportPendingAction} = getReportOfflinePendingActionAndErrors(currentUserPolicyExpenseChat);
     const isPolicyExpenseChatEnabled = !!policy?.isPolicyExpenseChatEnabled;
@@ -385,7 +385,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
             source: avatar,
             name: policy?.name ?? '',
             type: CONST.ICON_TYPE_WORKSPACE,
-            id: policy.id ?? '-1',
+            id: policy.id,
         };
     }, [policy]);
 
diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
index 53ab43832d0dc..3dc7ffa8a065f 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
@@ -74,9 +74,9 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
         !!policy?.connections?.xero?.config?.importTaxRates ||
         !!policy?.connections?.netsuite?.options?.config?.syncOptions?.syncTax;
     const policyID = policy?.id;
-    const workspaceAccountID = policy?.workspaceAccountID ?? -1;
-    const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID.toString()}_${CONST.EXPENSIFY_CARD.BANK}`);
-    const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID.toString()}`);
+    const workspaceAccountID = policy?.workspaceAccountID;
+    const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`);
+    const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`);
     const [isOrganizeWarningModalOpen, setIsOrganizeWarningModalOpen] = useState(false);
     const [isIntegrateWarningModalOpen, setIsIntegrateWarningModalOpen] = useState(false);
     const [isReportFieldsWarningModalOpen, setIsReportFieldsWarningModalOpen] = useState(false);

From d766f3d3f234e0daa4cd705eb05a52fc150b0aea Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Thu, 19 Dec 2024 15:14:40 +0100
Subject: [PATCH 3/8] fix: two more lint violations

---
 src/libs/actions/Policy/Policy.ts                        | 5 ++++-
 src/pages/workspace/WorkspaceInitialPage.tsx             | 7 ++++++-
 src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
index f81539d1e9215..0b66c6ba8e8a2 100644
--- a/src/libs/actions/Policy/Policy.ts
+++ b/src/libs/actions/Policy/Policy.ts
@@ -623,7 +623,10 @@ function setWorkspacePayer(policyID: string, reimburserEmail: string) {
     API.write(WRITE_COMMANDS.SET_WORKSPACE_PAYER, params, {optimisticData, failureData, successData});
 }
 
-function clearPolicyErrorField(policyID: string, fieldName: string) {
+function clearPolicyErrorField(policyID?: string, fieldName?: string) {
+    if (!policyID || !fieldName) {
+        return;
+    }
     Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errorFields: {[fieldName]: null}});
 }
 
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index a20583838170d..8fce856c2b9bc 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -451,7 +451,12 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
                                     title={getReportName(currentUserPolicyExpenseChat)}
                                     description={translate('workspace.common.workspace')}
                                     icon={getIcons(currentUserPolicyExpenseChat, personalDetails)}
-                                    onPress={() => Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(currentUserPolicyExpenseChat?.reportID ?? '-1'), CONST.NAVIGATION.TYPE.UP)}
+                                    onPress={() => {
+                                        if (!currentUserPolicyExpenseChat?.reportID) {
+                                            return;
+                                        }
+                                        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(currentUserPolicyExpenseChat?.reportID), CONST.NAVIGATION.TYPE.UP)
+                                    }}
                                     shouldShowRightIcon
                                     wrapperStyle={[styles.br2, styles.pl2, styles.pr0, styles.pv3, styles.mt1, styles.alignItemsCenter]}
                                     shouldShowSubscriptAvatar
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
index 5503ab7a24428..a9186d19d64a5 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
@@ -260,7 +260,7 @@ function WorkspaceWorkflowsPage({policy, route}: WorkspaceWorkflowsPageProps) {
                                     pendingAction={policy?.pendingFields?.reimburser}
                                     shouldDisableOpacity={isOffline && !!policy?.pendingFields?.reimbursementChoice && !!policy?.pendingFields?.reimburser}
                                     errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.REIMBURSER)}
-                                    onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.REIMBURSER)}
+                                    onClose={() => Policy.clearPolicyErrorField(policy?.id, CONST.POLICY.COLLECTION_KEYS.REIMBURSER)}
                                     errorRowStyles={[styles.ml7]}
                                 >
                                     <MenuItemWithTopDescription

From de185b12cbdaa5ed545ce576e723b6c3e74605a0 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Thu, 19 Dec 2024 15:32:15 +0100
Subject: [PATCH 4/8] fix: eslint

---
 src/pages/workspace/WorkspaceInitialPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 8fce856c2b9bc..b4fed1bf065ca 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -455,7 +455,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
                                         if (!currentUserPolicyExpenseChat?.reportID) {
                                             return;
                                         }
-                                        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(currentUserPolicyExpenseChat?.reportID), CONST.NAVIGATION.TYPE.UP)
+                                        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(currentUserPolicyExpenseChat?.reportID), CONST.NAVIGATION.TYPE.UP);
                                     }}
                                     shouldShowRightIcon
                                     wrapperStyle={[styles.br2, styles.pl2, styles.pr0, styles.pv3, styles.mt1, styles.alignItemsCenter]}

From 366f4f91d3b943aad603f603e0bbdb9c7aeefb37 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Fri, 20 Dec 2024 11:18:42 +0100
Subject: [PATCH 5/8] fix: changes after review

---
 src/libs/PolicyUtils.ts           | 8 ++++----
 src/libs/ReportUtils.ts           | 2 +-
 src/libs/actions/Policy/Policy.ts | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 3f06532df87d4..ccc900fa9fa40 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -1072,17 +1072,17 @@ function getCurrentTaxID(policy: OnyxEntry<Policy>, taxID: string): string | und
     return Object.keys(policy?.taxRates?.taxes ?? {}).find((taxIDKey) => policy?.taxRates?.taxes?.[taxIDKey].previousTaxCode === taxID || taxIDKey === taxID);
 }
 
-function getWorkspaceAccountID(policyID?: string) {
+function getWorkspaceAccountID(policyID: string | undefined) {
     if (!policyID) {
-        return 0;
+        return CONST.DEFAULT_NUMBER_ID;
     }
 
     const policy = getPolicy(policyID);
 
     if (!policy) {
-        return 0;
+        return CONST.DEFAULT_NUMBER_ID;
     }
-    return policy.workspaceAccountID ?? 0;
+    return policy.workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID;
 }
 
 function hasVBBA(policyID: string) {
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index b5061b1a00cbf..5fd9bffd6d329 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -6757,7 +6757,7 @@ function getInvoiceChatByParticipants(policyID: string, receiverID: string | num
 /**
  * Attempts to find a policy expense report in onyx that is owned by ownerAccountID in a given policy
  */
-function getPolicyExpenseChat(ownerAccountID: number, policyID?: string): OnyxEntry<Report> {
+function getPolicyExpenseChat(ownerAccountID: number, policyID: string | undefined): OnyxEntry<Report> {
     if (!policyID) {
         return undefined;
     }
diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
index 0b66c6ba8e8a2..ba9b8ed6c9873 100644
--- a/src/libs/actions/Policy/Policy.ts
+++ b/src/libs/actions/Policy/Policy.ts
@@ -623,7 +623,7 @@ function setWorkspacePayer(policyID: string, reimburserEmail: string) {
     API.write(WRITE_COMMANDS.SET_WORKSPACE_PAYER, params, {optimisticData, failureData, successData});
 }
 
-function clearPolicyErrorField(policyID?: string, fieldName?: string) {
+function clearPolicyErrorField(policyID: string | undefined, fieldName: string | undefined) {
     if (!policyID || !fieldName) {
         return;
     }

From d27e0bce0cfe15b471254c48e2ed12d0d7beea49 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Wed, 22 Jan 2025 16:05:28 +0100
Subject: [PATCH 6/8] fix: add bottom safe area padding for more screens

---
 src/pages/settings/Preferences/PreferencesPage.tsx | 1 -
 src/pages/settings/Profile/ProfilePage.tsx         | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/pages/settings/Preferences/PreferencesPage.tsx b/src/pages/settings/Preferences/PreferencesPage.tsx
index 48cb8c99cf21e..6ddd8c6b6871c 100755
--- a/src/pages/settings/Preferences/PreferencesPage.tsx
+++ b/src/pages/settings/Preferences/PreferencesPage.tsx
@@ -36,7 +36,6 @@ function PreferencesPage() {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicatorInWideScreen
             testID={PreferencesPage.displayName}
diff --git a/src/pages/settings/Profile/ProfilePage.tsx b/src/pages/settings/Profile/ProfilePage.tsx
index 271a1c1df5c42..93441a8629b61 100755
--- a/src/pages/settings/Profile/ProfilePage.tsx
+++ b/src/pages/settings/Profile/ProfilePage.tsx
@@ -141,7 +141,6 @@ function ProfilePage() {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             testID={ProfilePage.displayName}
             shouldShowOfflineIndicatorInWideScreen
         >

From 2144b059c3bdac9be407d4ef306d5c9dbb2b3d20 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Wed, 22 Jan 2025 17:20:43 +0100
Subject: [PATCH 7/8] refactor: remove `includeSafeAreaPaddingBottom={false}`

---
 src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx   | 1 -
 src/components/AmountPicker/AmountSelectorModal.tsx          | 1 -
 src/components/AvatarCropModal/AvatarCropModal.tsx           | 1 -
 src/components/CountryPicker/CountrySelectorModal.tsx        | 1 -
 src/components/CurrencyPicker.tsx                            | 1 -
 src/components/HeaderPageLayout.tsx                          | 1 -
 src/components/ImportSpreadsheet.tsx                         | 1 -
 src/components/PushRowWithModal/PushRowModal.tsx             | 1 -
 src/components/StatePicker/StateSelectorModal.tsx            | 1 -
 src/pages/Debug/Report/DebugReportPage.tsx                   | 1 -
 src/pages/Debug/ReportAction/DebugReportActionCreatePage.tsx | 1 -
 src/pages/Debug/ReportAction/DebugReportActionPage.tsx       | 1 -
 src/pages/Debug/Transaction/DebugTransactionPage.tsx         | 1 -
 .../DebugTransactionViolationCreatePage.tsx                  | 1 -
 .../TransactionViolation/DebugTransactionViolationPage.tsx   | 1 -
 src/pages/EditReportFieldPage.tsx                            | 1 -
 src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx   | 1 -
 src/pages/EnablePayments/EnablePayments.tsx                  | 2 --
 src/pages/FlagCommentPage.tsx                                | 5 +----
 src/pages/KeyboardShortcutsPage.tsx                          | 5 +----
 .../MissingPersonalDetails/MissingPersonalDetailsContent.tsx | 1 -
 src/pages/NewChatSelectorPage.tsx                            | 1 -
 src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx  | 1 -
 src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx    | 1 -
 .../OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx  | 1 -
 src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx  | 1 -
 src/pages/PrivateNotes/PrivateNotesListPage.tsx              | 5 +----
 src/pages/ReimbursementAccount/BankAccountStep.tsx           | 5 +----
 .../BusinessTypePicker/BusinessTypeSelectorModal.tsx         | 1 -
 .../ConnectBankAccount/ConnectBankAccount.tsx                | 1 -
 src/pages/ReimbursementAccount/ContinueBankAccountSetup.tsx  | 5 +----
 .../EnableBankAccount/EnableBankAccount.tsx                  | 1 -
 src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx       | 1 -
 src/pages/ReimbursementAccount/RequestorOnfidoStep.tsx       | 1 -
 src/pages/ReportParticipantsPage.tsx                         | 1 -
 src/pages/RoomMembersPage.tsx                                | 1 -
 .../SearchFiltersExpenseTypePage.tsx                         | 1 -
 src/pages/TeachersUnite/SaveTheWorldPage.tsx                 | 1 -
 src/pages/Travel/MyTripsPage.tsx                             | 1 -
 src/pages/Travel/TravelTerms.tsx                             | 1 -
 src/pages/Travel/TripSummaryPage.tsx                         | 1 -
 src/pages/home/sidebar/AllSettingsScreen.tsx                 | 1 -
 src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.tsx   | 1 -
 src/pages/iou/request/step/StepScreenDragAndDropWrapper.tsx  | 1 -
 .../settings/AboutPage/ShareLogList/BaseShareLogList.tsx     | 5 +----
 src/pages/settings/InitialSettingsPage.tsx                   | 1 -
 src/pages/settings/Preferences/LanguagePage.tsx              | 5 +----
 src/pages/settings/Preferences/PriorityModePage.tsx          | 5 +----
 src/pages/settings/Preferences/ThemePage.tsx                 | 5 +----
 .../Profile/PersonalDetails/CountrySelectionPage.tsx         | 5 +----
 .../settings/Profile/PersonalDetails/StateSelectionPage.tsx  | 5 +----
 src/pages/settings/Profile/PronounsPage.tsx                  | 5 +----
 src/pages/settings/Profile/TimezoneSelectPage.tsx            | 5 +----
 src/pages/settings/Report/NotificationPreferencePage.tsx     | 5 +----
 src/pages/settings/Report/VisibilityPage.tsx                 | 5 +----
 src/pages/settings/Report/WriteCapabilityPage.tsx            | 5 +----
 src/pages/settings/Security/AddDelegate/AddDelegatePage.tsx  | 5 +----
 .../settings/Security/AddDelegate/SelectDelegateRolePage.tsx | 5 +----
 .../UpdateDelegateRole/UpdateDelegateMagicCodePage.tsx       | 1 -
 .../UpdateDelegateRole/UpdateDelegateRolePage.tsx            | 5 +----
 src/pages/settings/Security/SecuritySettingsPage.tsx         | 1 -
 .../settings/Security/TwoFactorAuth/TwoFactorAuthPage.tsx    | 1 -
 .../settings/Subscription/CardAuthenticationModal/index.tsx  | 1 -
 .../Subscription/DisableAutoRenewSurveyPage/index.tsx        | 1 -
 .../Subscription/RequestEarlyCancellationPage/index.tsx      | 1 -
 src/pages/settings/Subscription/SubscriptionSize/index.tsx   | 1 -
 src/pages/settings/Wallet/AddDebitCardPage.tsx               | 1 -
 src/pages/signin/SAMLSignInPage/index.native.tsx             | 1 -
 src/pages/signin/SignInModal.tsx                             | 1 -
 src/pages/tasks/TaskAssigneeSelectorModal.tsx                | 5 +----
 src/pages/tasks/TaskShareDestinationSelectorModal.tsx        | 1 -
 src/pages/wallet/WalletStatementPage.tsx                     | 1 -
 src/pages/workspace/WorkspaceInviteMessagePage.tsx           | 1 -
 src/pages/workspace/WorkspaceProfileCurrencyPage.tsx         | 5 +----
 src/pages/workspace/WorkspacesListPage.tsx                   | 1 -
 src/pages/workspace/accounting/PolicyAccountingPage.tsx      | 1 -
 .../accounting/netsuite/advanced/NetSuiteAutoSyncPage.tsx    | 1 -
 .../NetSuiteCustomListSelectorModal.tsx                      | 1 -
 .../accounting/reconciliation/CardReconciliationPage.tsx     | 1 -
 src/pages/workspace/categories/CategoryApproverPage.tsx      | 1 -
 .../workspace/categories/CategoryDefaultTaxRatePage.tsx      | 1 -
 .../workspace/categories/CategoryRequireReceiptsOverPage.tsx | 1 -
 src/pages/workspace/categories/CategorySettingsPage.tsx      | 1 -
 .../ExpenseLimitTypeSelectorModal.tsx                        | 1 -
 src/pages/workspace/categories/WorkspaceCategoriesPage.tsx   | 1 -
 .../workspace/categories/WorkspaceCategoriesSettingsPage.tsx | 1 -
 .../companyCards/WorkspaceCompanyCardDetailsPage.tsx         | 5 +----
 src/pages/workspace/companyCards/addNew/AddNewCardPage.tsx   | 1 -
 src/pages/workspace/companyCards/addNew/AmexCustomFeed.tsx   | 1 -
 .../companyCards/addNew/BankConnection/index.native.tsx      | 1 -
 src/pages/workspace/companyCards/addNew/CardTypeStep.tsx     | 1 -
 src/pages/workspace/companyCards/addNew/SelectBankStep.tsx   | 1 -
 src/pages/workspace/companyCards/addNew/SelectFeedType.tsx   | 1 -
 .../workspace/companyCards/assignCard/AssignCardFeedPage.tsx | 1 -
 .../companyCards/assignCard/BankConnection/index.native.tsx  | 1 -
 .../workspace/companyCards/assignCard/CardSelectionStep.tsx  | 1 -
 .../assignCard/TransactionStartDateSelectorModal.tsx         | 1 -
 .../distanceRates/PolicyDistanceRateDetailsPage.tsx          | 1 -
 .../distanceRates/PolicyDistanceRateTaxRateEditPage.tsx      | 1 -
 .../workspace/distanceRates/PolicyDistanceRatesPage.tsx      | 1 -
 .../distanceRates/PolicyDistanceRatesSettingsPage.tsx        | 1 -
 .../distanceRates/UnitSelector/UnitSelectorModal.tsx         | 1 -
 .../workspace/expensifyCard/WorkspaceCardSettingsPage.tsx    | 1 -
 .../expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx     | 1 -
 .../expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx      | 5 +----
 .../expensifyCard/WorkspaceSettlementAccountPage.tsx         | 1 -
 .../expensifyCard/WorkspaceSettlementFrequencyPage.tsx       | 1 -
 .../workspace/expensifyCard/issueNew/IssueNewCardPage.tsx    | 1 -
 src/pages/workspace/perDiem/WorkspacePerDiemDetailsPage.tsx  | 1 -
 src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx         | 1 -
 src/pages/workspace/perDiem/WorkspacePerDiemSettingsPage.tsx | 1 -
 .../InitialListValueSelectorModal.tsx                        | 1 -
 .../workspace/reportFields/ReportFieldsListValuesPage.tsx    | 1 -
 .../workspace/reportFields/ReportFieldsSettingsPage.tsx      | 1 -
 .../workspace/reportFields/ReportFieldsValueSettingsPage.tsx | 1 -
 .../reportFields/TypeSelector/TypeSelectorModal.tsx          | 1 -
 .../workspace/reportFields/WorkspaceReportFieldsPage.tsx     | 1 -
 src/pages/workspace/rules/RulesBillableDefaultPage.tsx       | 1 -
 src/pages/workspace/tags/TagApproverPage.tsx                 | 1 -
 src/pages/workspace/tags/TagSettingsPage.tsx                 | 1 -
 src/pages/workspace/tags/WorkspaceTagsPage.tsx               | 1 -
 src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx       | 1 -
 src/pages/workspace/tags/WorkspaceViewTagsPage.tsx           | 1 -
 src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx         | 1 -
 src/pages/workspace/taxes/WorkspaceTaxesPage.tsx             | 1 -
 .../taxes/WorkspaceTaxesSettingsForeignCurrency.tsx          | 1 -
 .../taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx        | 1 -
 .../workflows/WorkspaceAutoReportingFrequencyPage.tsx        | 5 +----
 .../workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx    | 5 +----
 .../workspace/workflows/WorkspaceWorkflowsPayerPage.tsx      | 5 +----
 130 files changed, 26 insertions(+), 209 deletions(-)

diff --git a/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx b/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx
index f7c3ca4e2b5e4..9231737ed9bc7 100644
--- a/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx
+++ b/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx
@@ -62,7 +62,6 @@ function PaymentCardCurrencyModal({isVisible, currencies, currentCurrency = CONS
             <ScreenWrapper
                 style={styles.pb0}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
                 testID={PaymentCardCurrencyModal.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/components/AmountPicker/AmountSelectorModal.tsx b/src/components/AmountPicker/AmountSelectorModal.tsx
index d8510aef04993..b1ea8e9281ba7 100644
--- a/src/components/AmountPicker/AmountSelectorModal.tsx
+++ b/src/components/AmountPicker/AmountSelectorModal.tsx
@@ -52,7 +52,6 @@ function AmountSelectorModal({value, description = '', onValueSelected, isVisibl
         >
             <ScreenWrapper
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
                 testID={AmountSelectorModal.displayName}
                 shouldEnableMaxHeight
                 style={[styles.pb0]}
diff --git a/src/components/AvatarCropModal/AvatarCropModal.tsx b/src/components/AvatarCropModal/AvatarCropModal.tsx
index 3ff9ccc4e3f82..05e373d07de17 100644
--- a/src/components/AvatarCropModal/AvatarCropModal.tsx
+++ b/src/components/AvatarCropModal/AvatarCropModal.tsx
@@ -354,7 +354,6 @@ function AvatarCropModal({imageUri = '', imageName = '', imageType = '', onClose
             <ScreenWrapper
                 style={[styles.pb0]}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
                 testID={AvatarCropModal.displayName}
             >
                 {shouldUseNarrowLayout && <HeaderGap />}
diff --git a/src/components/CountryPicker/CountrySelectorModal.tsx b/src/components/CountryPicker/CountrySelectorModal.tsx
index 2daa74dcb4e88..47a1042a771c4 100644
--- a/src/components/CountryPicker/CountrySelectorModal.tsx
+++ b/src/components/CountryPicker/CountrySelectorModal.tsx
@@ -70,7 +70,6 @@ function CountrySelectorModal({isVisible, currentCountry, onCountrySelected, onC
             <ScreenWrapper
                 style={[styles.pb0]}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
                 testID={CountrySelectorModal.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/components/CurrencyPicker.tsx b/src/components/CurrencyPicker.tsx
index bf4b12be292f8..6b40ed7e1c2bc 100644
--- a/src/components/CurrencyPicker.tsx
+++ b/src/components/CurrencyPicker.tsx
@@ -66,7 +66,6 @@ function CurrencyPicker({selectedCurrency, label = '', errorText = '', value, on
                 <ScreenWrapper
                     style={styles.pb0}
                     includePaddingTop={false}
-                    includeSafeAreaPaddingBottom={false}
                     testID={label}
                 >
                     <HeaderWithBackButton
diff --git a/src/components/HeaderPageLayout.tsx b/src/components/HeaderPageLayout.tsx
index 1d3a290ccbff8..197e74035b139 100644
--- a/src/components/HeaderPageLayout.tsx
+++ b/src/components/HeaderPageLayout.tsx
@@ -80,7 +80,6 @@ function HeaderPageLayout({
         <ScreenWrapper
             style={[StyleUtils.getBackgroundColorStyle(backgroundColor ?? theme.appBG)]}
             shouldEnablePickerAvoiding={false}
-            includeSafeAreaPaddingBottom={false}
             offlineIndicatorStyle={[appBGColor]}
             testID={testID}
             shouldShowOfflineIndicatorInWideScreen={shouldShowOfflineIndicatorInWideScreen}
diff --git a/src/components/ImportSpreadsheet.tsx b/src/components/ImportSpreadsheet.tsx
index a6a27e2d5bcba..1c92139afa1eb 100644
--- a/src/components/ImportSpreadsheet.tsx
+++ b/src/components/ImportSpreadsheet.tsx
@@ -160,7 +160,6 @@ function ImportSpreadsheet({backTo, goTo}: ImportSpreedsheetProps) {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             shouldEnableKeyboardAvoidingView={false}
             testID={ImportSpreadsheet.displayName}
             shouldEnableMaxHeight={DeviceCapabilities.canUseTouchScreen()}
diff --git a/src/components/PushRowWithModal/PushRowModal.tsx b/src/components/PushRowWithModal/PushRowModal.tsx
index d2c6d950c7ee7..06db5f97d554a 100644
--- a/src/components/PushRowWithModal/PushRowModal.tsx
+++ b/src/components/PushRowWithModal/PushRowModal.tsx
@@ -81,7 +81,6 @@ function PushRowModal({isVisible, selectedOption, onOptionChange, onClose, optio
         >
             <ScreenWrapper
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
                 testID={PushRowModal.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/components/StatePicker/StateSelectorModal.tsx b/src/components/StatePicker/StateSelectorModal.tsx
index 0ce488c176ee3..8b682d547fa3b 100644
--- a/src/components/StatePicker/StateSelectorModal.tsx
+++ b/src/components/StatePicker/StateSelectorModal.tsx
@@ -74,7 +74,6 @@ function StateSelectorModal({isVisible, currentState, onStateSelected, onClose,
             <ScreenWrapper
                 style={[styles.pb0]}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
                 testID={StateSelectorModal.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/Debug/Report/DebugReportPage.tsx b/src/pages/Debug/Report/DebugReportPage.tsx
index d706dbe97610f..a86ef28f17df4 100644
--- a/src/pages/Debug/Report/DebugReportPage.tsx
+++ b/src/pages/Debug/Report/DebugReportPage.tsx
@@ -211,7 +211,6 @@ function DebugReportPage({
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             shouldEnableKeyboardAvoidingView={false}
             shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
             testID={DebugReportPage.displayName}
diff --git a/src/pages/Debug/ReportAction/DebugReportActionCreatePage.tsx b/src/pages/Debug/ReportAction/DebugReportActionCreatePage.tsx
index 1162146b8f4d5..c30d54385d7ff 100644
--- a/src/pages/Debug/ReportAction/DebugReportActionCreatePage.tsx
+++ b/src/pages/Debug/ReportAction/DebugReportActionCreatePage.tsx
@@ -76,7 +76,6 @@ function DebugReportActionCreatePage({
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             shouldEnableKeyboardAvoidingView={false}
             shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
             testID={DebugReportActionCreatePage.displayName}
diff --git a/src/pages/Debug/ReportAction/DebugReportActionPage.tsx b/src/pages/Debug/ReportAction/DebugReportActionPage.tsx
index a7b6499c70aad..83c46e4d4c609 100644
--- a/src/pages/Debug/ReportAction/DebugReportActionPage.tsx
+++ b/src/pages/Debug/ReportAction/DebugReportActionPage.tsx
@@ -86,7 +86,6 @@ function DebugReportActionPage({
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             shouldEnableKeyboardAvoidingView={false}
             shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
             testID={DebugReportActionPage.displayName}
diff --git a/src/pages/Debug/Transaction/DebugTransactionPage.tsx b/src/pages/Debug/Transaction/DebugTransactionPage.tsx
index 453d87d07cf46..c09aef883e626 100644
--- a/src/pages/Debug/Transaction/DebugTransactionPage.tsx
+++ b/src/pages/Debug/Transaction/DebugTransactionPage.tsx
@@ -92,7 +92,6 @@ function DebugTransactionPage({
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             shouldEnableKeyboardAvoidingView={false}
             shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
             testID={DebugTransactionPage.displayName}
diff --git a/src/pages/Debug/TransactionViolation/DebugTransactionViolationCreatePage.tsx b/src/pages/Debug/TransactionViolation/DebugTransactionViolationCreatePage.tsx
index b5f3d0d603d58..2795391d7daf5 100644
--- a/src/pages/Debug/TransactionViolation/DebugTransactionViolationCreatePage.tsx
+++ b/src/pages/Debug/TransactionViolation/DebugTransactionViolationCreatePage.tsx
@@ -93,7 +93,6 @@ function DebugTransactionViolationCreatePage({
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             shouldEnableKeyboardAvoidingView={false}
             shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
             testID={DebugTransactionViolationCreatePage.displayName}
diff --git a/src/pages/Debug/TransactionViolation/DebugTransactionViolationPage.tsx b/src/pages/Debug/TransactionViolation/DebugTransactionViolationPage.tsx
index 9db84c341d591..d100c26f0514d 100644
--- a/src/pages/Debug/TransactionViolation/DebugTransactionViolationPage.tsx
+++ b/src/pages/Debug/TransactionViolation/DebugTransactionViolationPage.tsx
@@ -82,7 +82,6 @@ function DebugTransactionViolationPage({
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             shouldEnableKeyboardAvoidingView={false}
             shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
             testID={DebugTransactionViolationPage.displayName}
diff --git a/src/pages/EditReportFieldPage.tsx b/src/pages/EditReportFieldPage.tsx
index e429cc8681be6..ef2ac6ba12f97 100644
--- a/src/pages/EditReportFieldPage.tsx
+++ b/src/pages/EditReportFieldPage.tsx
@@ -45,7 +45,6 @@ function EditReportFieldPage({route}: EditReportFieldPageProps) {
     if (!reportFieldsEnabled || !reportField || !policyField || !report || isDisabled) {
         return (
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 shouldEnableMaxHeight
                 testID={EditReportFieldPage.displayName}
             >
diff --git a/src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx b/src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx
index 55f19f8c35b9f..7ec3706a18fac 100644
--- a/src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx
+++ b/src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx
@@ -72,7 +72,6 @@ function AddBankAccount() {
     return (
         <ScreenWrapper
             testID={AddBankAccount.displayName}
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicator
         >
diff --git a/src/pages/EnablePayments/EnablePayments.tsx b/src/pages/EnablePayments/EnablePayments.tsx
index b55141fec2995..86c7486b14bc4 100644
--- a/src/pages/EnablePayments/EnablePayments.tsx
+++ b/src/pages/EnablePayments/EnablePayments.tsx
@@ -39,7 +39,6 @@ function EnablePaymentsPage() {
         return (
             <ScreenWrapper
                 testID={EnablePaymentsPage.displayName}
-                includeSafeAreaPaddingBottom={false}
                 shouldEnablePickerAvoiding={false}
             >
                 <DelegateNoAccessWrapper accessDeniedVariants={[CONST.DELEGATE.DENIED_ACCESS_VARIANTS.DELEGATE]} />
@@ -55,7 +54,6 @@ function EnablePaymentsPage() {
         return (
             <ScreenWrapper
                 testID={EnablePaymentsPage.displayName}
-                includeSafeAreaPaddingBottom={false}
                 shouldEnablePickerAvoiding={false}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/FlagCommentPage.tsx b/src/pages/FlagCommentPage.tsx
index fbedd5fc6c397..3d043aea31975 100644
--- a/src/pages/FlagCommentPage.tsx
+++ b/src/pages/FlagCommentPage.tsx
@@ -130,10 +130,7 @@ function FlagCommentPage({parentReportAction, route, report, parentReport, repor
     ));
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={FlagCommentPage.displayName}
-        >
+        <ScreenWrapper testID={FlagCommentPage.displayName}>
             {({safeAreaPaddingBottomStyle}) => (
                 <FullPageNotFoundView shouldShow={!ReportUtils.shouldShowFlagComment(reportAction, report)}>
                     <HeaderWithBackButton
diff --git a/src/pages/KeyboardShortcutsPage.tsx b/src/pages/KeyboardShortcutsPage.tsx
index d68643e74a5a8..6a13cf582f2a4 100644
--- a/src/pages/KeyboardShortcutsPage.tsx
+++ b/src/pages/KeyboardShortcutsPage.tsx
@@ -42,10 +42,7 @@ function KeyboardShortcutsPage() {
     );
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={KeyboardShortcutsPage.displayName}
-        >
+        <ScreenWrapper testID={KeyboardShortcutsPage.displayName}>
             <HeaderWithBackButton title={translate('keyboardShortcutsPage.title')} />
             <ScrollView contentContainerStyle={styles.flexGrow1}>
                 <View style={[styles.ph5, styles.pv3]}>
diff --git a/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx b/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx
index e09c58b54d5eb..7e8085960d2ec 100644
--- a/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx
+++ b/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx
@@ -109,7 +109,6 @@ function MissingPersonalDetailsContent({privatePersonalDetails, draftValues}: Mi
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
             testID={MissingPersonalDetailsContent.displayName}
         >
diff --git a/src/pages/NewChatSelectorPage.tsx b/src/pages/NewChatSelectorPage.tsx
index 9e167c2d51a77..fd26c19a70910 100755
--- a/src/pages/NewChatSelectorPage.tsx
+++ b/src/pages/NewChatSelectorPage.tsx
@@ -32,7 +32,6 @@ function NewChatSelectorPage() {
     return (
         <ScreenWrapper
             shouldEnableKeyboardAvoidingView={false}
-            includeSafeAreaPaddingBottom={false}
             shouldShowOfflineIndicator={false}
             shouldEnableMaxHeight
             testID={NewChatSelectorPage.displayName}
diff --git a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx
index 3f52722fc30ef..2e655d5979077 100644
--- a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx
+++ b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx
@@ -192,7 +192,6 @@ function BaseOnboardingAccounting({shouldUseNativeStyles}: BaseOnboardingAccount
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             testID="BaseOnboardingAccounting"
             style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}
         >
diff --git a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx
index 12722e87f05a0..778dcb58abcd2 100644
--- a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx
+++ b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx
@@ -114,7 +114,6 @@ function BaseOnboardingEmployees({shouldUseNativeStyles, route}: BaseOnboardingE
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             testID="BaseOnboardingEmployees"
             style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}
         >
diff --git a/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx b/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx
index 50d8b7f7ce2e2..d6bad730d7462 100644
--- a/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx
+++ b/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx
@@ -57,7 +57,6 @@ function BaseOnboardingPrivateDomain({shouldUseNativeStyles, route}: BaseOnboard
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             testID="BaseOnboardingPrivateDomain"
             style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}
         >
diff --git a/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx b/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx
index c6d332f075ed2..1e19ec13aa044 100644
--- a/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx
+++ b/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx
@@ -113,7 +113,6 @@ function BaseOnboardingWorkspaces({shouldUseNativeStyles, route}: BaseOnboarding
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             testID="BaseOnboardingWorkspaces"
             style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}
         >
diff --git a/src/pages/PrivateNotes/PrivateNotesListPage.tsx b/src/pages/PrivateNotes/PrivateNotesListPage.tsx
index d2cdda140bb8b..36c94ed439fb2 100644
--- a/src/pages/PrivateNotes/PrivateNotesListPage.tsx
+++ b/src/pages/PrivateNotes/PrivateNotesListPage.tsx
@@ -87,10 +87,7 @@ function PrivateNotesListPage({report, accountID: sessionAccountID}: PrivateNote
     }, [report, personalDetailsList, sessionAccountID, translate, backTo]);
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={PrivateNotesListPage.displayName}
-        >
+        <ScreenWrapper testID={PrivateNotesListPage.displayName}>
             <HeaderWithBackButton
                 title={translate('privateNotes.title')}
                 shouldShowBackButton
diff --git a/src/pages/ReimbursementAccount/BankAccountStep.tsx b/src/pages/ReimbursementAccount/BankAccountStep.tsx
index 95d8f2c396636..20f1c72b5039b 100644
--- a/src/pages/ReimbursementAccount/BankAccountStep.tsx
+++ b/src/pages/ReimbursementAccount/BankAccountStep.tsx
@@ -128,10 +128,7 @@ function BankAccountStep({
     }
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={BankAccountStep.displayName}
-        >
+        <ScreenWrapper testID={BankAccountStep.displayName}>
             <View style={[styles.flex1, styles.justifyContentBetween]}>
                 <HeaderWithBackButton
                     title={translate('workspace.common.connectBankAccount')}
diff --git a/src/pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/BusinessTypePicker/BusinessTypeSelectorModal.tsx b/src/pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/BusinessTypePicker/BusinessTypeSelectorModal.tsx
index 45db53a232869..473f9b3d9f6e0 100644
--- a/src/pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/BusinessTypePicker/BusinessTypeSelectorModal.tsx
+++ b/src/pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/BusinessTypePicker/BusinessTypeSelectorModal.tsx
@@ -53,7 +53,6 @@ function BusinessTypeSelectorModal({isVisible, currentBusinessType, onBusinessTy
             <ScreenWrapper
                 style={[styles.pb0]}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
                 testID={BusinessTypeSelectorModal.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/ReimbursementAccount/ConnectBankAccount/ConnectBankAccount.tsx b/src/pages/ReimbursementAccount/ConnectBankAccount/ConnectBankAccount.tsx
index 078c216d836c7..cde2dfb8fe60f 100644
--- a/src/pages/ReimbursementAccount/ConnectBankAccount/ConnectBankAccount.tsx
+++ b/src/pages/ReimbursementAccount/ConnectBankAccount/ConnectBankAccount.tsx
@@ -60,7 +60,6 @@ function ConnectBankAccount({reimbursementAccount, onBackButtonPress, account, p
     return (
         <ScreenWrapper
             testID={ConnectBankAccount.displayName}
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
diff --git a/src/pages/ReimbursementAccount/ContinueBankAccountSetup.tsx b/src/pages/ReimbursementAccount/ContinueBankAccountSetup.tsx
index 9e1897348dabe..ddafb35cc9e56 100644
--- a/src/pages/ReimbursementAccount/ContinueBankAccountSetup.tsx
+++ b/src/pages/ReimbursementAccount/ContinueBankAccountSetup.tsx
@@ -39,10 +39,7 @@ function ContinueBankAccountSetup({policyName = '', onBackButtonPress, reimburse
     const pendingAction = reimbursementAccount?.pendingAction ?? null;
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={ContinueBankAccountSetup.displayName}
-        >
+        <ScreenWrapper testID={ContinueBankAccountSetup.displayName}>
             <HeaderWithBackButton
                 title={translate('workspace.common.connectBankAccount')}
                 subtitle={policyName}
diff --git a/src/pages/ReimbursementAccount/EnableBankAccount/EnableBankAccount.tsx b/src/pages/ReimbursementAccount/EnableBankAccount/EnableBankAccount.tsx
index 1d8ce04d7f718..bd225b92b5d07 100644
--- a/src/pages/ReimbursementAccount/EnableBankAccount/EnableBankAccount.tsx
+++ b/src/pages/ReimbursementAccount/EnableBankAccount/EnableBankAccount.tsx
@@ -42,7 +42,6 @@ function EnableBankAccount({reimbursementAccount, onBackButtonPress}: EnableBank
     return (
         <ScreenWrapper
             testID={EnableBankAccount.displayName}
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
             style={[styles.flex1, styles.justifyContentBetween, styles.mh2]}
diff --git a/src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx b/src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx
index 48da42b8b1ef0..aee2d4a53d604 100644
--- a/src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx
+++ b/src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx
@@ -31,7 +31,6 @@ function Finish() {
     return (
         <ScreenWrapper
             testID={Finish.displayName}
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
diff --git a/src/pages/ReimbursementAccount/RequestorOnfidoStep.tsx b/src/pages/ReimbursementAccount/RequestorOnfidoStep.tsx
index 26197abd5f6cf..97e5e70ce3e02 100644
--- a/src/pages/ReimbursementAccount/RequestorOnfidoStep.tsx
+++ b/src/pages/ReimbursementAccount/RequestorOnfidoStep.tsx
@@ -60,7 +60,6 @@ function RequestorOnfidoStep({onBackButtonPress, reimbursementAccount, onfidoTok
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             shouldShowOfflineIndicator={false}
             testID={RequestorOnfidoStep.displayName}
         >
diff --git a/src/pages/ReportParticipantsPage.tsx b/src/pages/ReportParticipantsPage.tsx
index 1bb36bf89080c..b2490529eccf8 100755
--- a/src/pages/ReportParticipantsPage.tsx
+++ b/src/pages/ReportParticipantsPage.tsx
@@ -361,7 +361,6 @@ function ReportParticipantsPage({report, route}: ReportParticipantsPageProps) {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             style={[styles.defaultModalContainer]}
             testID={ReportParticipantsPage.displayName}
         >
diff --git a/src/pages/RoomMembersPage.tsx b/src/pages/RoomMembersPage.tsx
index a14ada3d3f003..4218d3ce2f009 100644
--- a/src/pages/RoomMembersPage.tsx
+++ b/src/pages/RoomMembersPage.tsx
@@ -353,7 +353,6 @@ function RoomMembersPage({report, policies}: RoomMembersPageProps) {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             style={[styles.defaultModalContainer]}
             testID={RoomMembersPage.displayName}
         >
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx
index f0e90912302dd..57ae26d6fa8f9 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx
@@ -45,7 +45,6 @@ function SearchFiltersExpenseTypePage() {
             testID={SearchFiltersExpenseTypePage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
-            includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
         >
             <HeaderWithBackButton
diff --git a/src/pages/TeachersUnite/SaveTheWorldPage.tsx b/src/pages/TeachersUnite/SaveTheWorldPage.tsx
index f52d20ad90142..6be3d59217ce0 100644
--- a/src/pages/TeachersUnite/SaveTheWorldPage.tsx
+++ b/src/pages/TeachersUnite/SaveTheWorldPage.tsx
@@ -49,7 +49,6 @@ function SaveTheWorldPage() {
     return (
         <ScreenWrapper
             testID={SaveTheWorldPage.displayName}
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicatorInWideScreen
         >
diff --git a/src/pages/Travel/MyTripsPage.tsx b/src/pages/Travel/MyTripsPage.tsx
index 58db57685ab70..ebac98dd9fed0 100644
--- a/src/pages/Travel/MyTripsPage.tsx
+++ b/src/pages/Travel/MyTripsPage.tsx
@@ -13,7 +13,6 @@ function MyTripsPage() {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
             testID={MyTripsPage.displayName}
diff --git a/src/pages/Travel/TravelTerms.tsx b/src/pages/Travel/TravelTerms.tsx
index 1d3b530bfbe35..2e81d11ec0461 100644
--- a/src/pages/Travel/TravelTerms.tsx
+++ b/src/pages/Travel/TravelTerms.tsx
@@ -52,7 +52,6 @@ function TravelTerms() {
     // Add beta support for FullPageNotFound that is universal across travel pages
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
             testID={TravelTerms.displayName}
         >
diff --git a/src/pages/Travel/TripSummaryPage.tsx b/src/pages/Travel/TripSummaryPage.tsx
index 69926f0e443e9..95c399eb3d164 100644
--- a/src/pages/Travel/TripSummaryPage.tsx
+++ b/src/pages/Travel/TripSummaryPage.tsx
@@ -26,7 +26,6 @@ function TripSummaryPage({route}: TripSummaryPageProps) {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
             testID={TripSummaryPage.displayName}
diff --git a/src/pages/home/sidebar/AllSettingsScreen.tsx b/src/pages/home/sidebar/AllSettingsScreen.tsx
index 0025e6b429c58..8014d63c48c51 100644
--- a/src/pages/home/sidebar/AllSettingsScreen.tsx
+++ b/src/pages/home/sidebar/AllSettingsScreen.tsx
@@ -89,7 +89,6 @@ function AllSettingsScreen() {
         <ScreenWrapper
             testID={AllSettingsScreen.displayName}
             includePaddingTop={false}
-            includeSafeAreaPaddingBottom={false}
             style={[styles.pb0]}
         >
             <Breadcrumbs
diff --git a/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.tsx b/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.tsx
index 580f94e0f2f47..a963180fbc8d9 100644
--- a/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.tsx
@@ -43,7 +43,6 @@ function BaseSidebarScreen() {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             shouldEnableKeyboardAvoidingView={false}
             style={[styles.sidebar, Browser.isMobile() ? styles.userSelectNone : {}, styles.pb0]}
             testID={BaseSidebarScreen.displayName}
diff --git a/src/pages/iou/request/step/StepScreenDragAndDropWrapper.tsx b/src/pages/iou/request/step/StepScreenDragAndDropWrapper.tsx
index 81a574b6e408d..99d85cf65fef5 100644
--- a/src/pages/iou/request/step/StepScreenDragAndDropWrapper.tsx
+++ b/src/pages/iou/request/step/StepScreenDragAndDropWrapper.tsx
@@ -39,7 +39,6 @@ function StepScreenDragAndDropWrapper({testID, headerTitle, onBackButtonPress, o
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             shouldEnableKeyboardAvoidingView={false}
             onEntryTransitionEnd={onEntryTransitionEnd}
             testID={testID}
diff --git a/src/pages/settings/AboutPage/ShareLogList/BaseShareLogList.tsx b/src/pages/settings/AboutPage/ShareLogList/BaseShareLogList.tsx
index 47b4181790495..5ae71dd1f28f5 100644
--- a/src/pages/settings/AboutPage/ShareLogList/BaseShareLogList.tsx
+++ b/src/pages/settings/AboutPage/ShareLogList/BaseShareLogList.tsx
@@ -109,10 +109,7 @@ function BaseShareLogList({onAttachLogToReport}: BaseShareLogListProps) {
     }, [debouncedSearchValue]);
 
     return (
-        <ScreenWrapper
-            testID={BaseShareLogList.displayName}
-            includeSafeAreaPaddingBottom={false}
-        >
+        <ScreenWrapper testID={BaseShareLogList.displayName}>
             {({didScreenTransitionEnd}) => (
                 <>
                     <HeaderWithBackButton
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 13d0d1d74802b..cf89dc58606b3 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -425,7 +425,6 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
         <ScreenWrapper
             style={[styles.w100, styles.pb0]}
             includePaddingTop={false}
-            includeSafeAreaPaddingBottom={false}
             testID={InitialSettingsPage.displayName}
             shouldEnableKeyboardAvoidingView={false}
         >
diff --git a/src/pages/settings/Preferences/LanguagePage.tsx b/src/pages/settings/Preferences/LanguagePage.tsx
index 0b23210b8ff14..25ac51b16c0bc 100644
--- a/src/pages/settings/Preferences/LanguagePage.tsx
+++ b/src/pages/settings/Preferences/LanguagePage.tsx
@@ -34,10 +34,7 @@ function LanguagePage() {
     };
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={LanguagePage.displayName}
-        >
+        <ScreenWrapper testID={LanguagePage.displayName}>
             <HeaderWithBackButton
                 title={translate('languagePage.language')}
                 onBackButtonPress={() => Navigation.goBack()}
diff --git a/src/pages/settings/Preferences/PriorityModePage.tsx b/src/pages/settings/Preferences/PriorityModePage.tsx
index 57f565e7dca73..3ee5acf890e7c 100644
--- a/src/pages/settings/Preferences/PriorityModePage.tsx
+++ b/src/pages/settings/Preferences/PriorityModePage.tsx
@@ -45,10 +45,7 @@ function PriorityModePage() {
     );
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={PriorityModePage.displayName}
-        >
+        <ScreenWrapper testID={PriorityModePage.displayName}>
             <HeaderWithBackButton
                 title={translate('priorityModePage.priorityMode')}
                 onBackButtonPress={() => Navigation.goBack()}
diff --git a/src/pages/settings/Preferences/ThemePage.tsx b/src/pages/settings/Preferences/ThemePage.tsx
index 274fbee38912f..5911cc880a42e 100644
--- a/src/pages/settings/Preferences/ThemePage.tsx
+++ b/src/pages/settings/Preferences/ThemePage.tsx
@@ -40,10 +40,7 @@ function ThemePage() {
     };
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={ThemePage.displayName}
-        >
+        <ScreenWrapper testID={ThemePage.displayName}>
             <HeaderWithBackButton
                 title={translate('themePage.theme')}
                 onBackButtonPress={() => Navigation.goBack()}
diff --git a/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx b/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx
index e0bf0e781e883..d899080037ac3 100644
--- a/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx
+++ b/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx
@@ -60,10 +60,7 @@ function CountrySelectionPage({route, navigation}: CountrySelectionPageProps) {
     );
 
     return (
-        <ScreenWrapper
-            testID={CountrySelectionPage.displayName}
-            includeSafeAreaPaddingBottom={false}
-        >
+        <ScreenWrapper testID={CountrySelectionPage.displayName}>
             <HeaderWithBackButton
                 title={translate('common.country')}
                 shouldShowBackButton
diff --git a/src/pages/settings/Profile/PersonalDetails/StateSelectionPage.tsx b/src/pages/settings/Profile/PersonalDetails/StateSelectionPage.tsx
index 85bf9333588d2..718a6c2f7298e 100644
--- a/src/pages/settings/Profile/PersonalDetails/StateSelectionPage.tsx
+++ b/src/pages/settings/Profile/PersonalDetails/StateSelectionPage.tsx
@@ -80,10 +80,7 @@ function StateSelectionPage() {
     );
 
     return (
-        <ScreenWrapper
-            testID={StateSelectionPage.displayName}
-            includeSafeAreaPaddingBottom={false}
-        >
+        <ScreenWrapper testID={StateSelectionPage.displayName}>
             <HeaderWithBackButton
                 // Label can be an empty string
                 // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
diff --git a/src/pages/settings/Profile/PronounsPage.tsx b/src/pages/settings/Profile/PronounsPage.tsx
index 7508cedbbb19b..58a656f90edc4 100644
--- a/src/pages/settings/Profile/PronounsPage.tsx
+++ b/src/pages/settings/Profile/PronounsPage.tsx
@@ -76,10 +76,7 @@ function PronounsPage({currentUserPersonalDetails}: PronounsPageProps) {
     };
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={PronounsPage.displayName}
-        >
+        <ScreenWrapper testID={PronounsPage.displayName}>
             {isLoadingApp && !currentUserPersonalDetails.pronouns ? (
                 <FullScreenLoadingIndicator />
             ) : (
diff --git a/src/pages/settings/Profile/TimezoneSelectPage.tsx b/src/pages/settings/Profile/TimezoneSelectPage.tsx
index cee713065de71..ff0aac4e1bfb7 100644
--- a/src/pages/settings/Profile/TimezoneSelectPage.tsx
+++ b/src/pages/settings/Profile/TimezoneSelectPage.tsx
@@ -58,10 +58,7 @@ function TimezoneSelectPage({currentUserPersonalDetails}: TimezoneSelectPageProp
     };
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={TimezoneSelectPage.displayName}
-        >
+        <ScreenWrapper testID={TimezoneSelectPage.displayName}>
             <HeaderWithBackButton
                 title={translate('timezonePage.timezone')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_TIMEZONE)}
diff --git a/src/pages/settings/Report/NotificationPreferencePage.tsx b/src/pages/settings/Report/NotificationPreferencePage.tsx
index 434505ad473ef..0fed154d698d3 100644
--- a/src/pages/settings/Report/NotificationPreferencePage.tsx
+++ b/src/pages/settings/Report/NotificationPreferencePage.tsx
@@ -52,10 +52,7 @@ function NotificationPreferencePage({report}: NotificationPreferencePageProps) {
     );
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={NotificationPreferencePage.displayName}
-        >
+        <ScreenWrapper testID={NotificationPreferencePage.displayName}>
             <FullPageNotFoundView shouldShow={shouldDisableNotificationPreferences}>
                 <HeaderWithBackButton
                     title={translate('notificationPreferencesPage.header')}
diff --git a/src/pages/settings/Report/VisibilityPage.tsx b/src/pages/settings/Report/VisibilityPage.tsx
index 560b96383a57d..758f6f0b8c53b 100644
--- a/src/pages/settings/Report/VisibilityPage.tsx
+++ b/src/pages/settings/Report/VisibilityPage.tsx
@@ -68,10 +68,7 @@ function VisibilityPage({report}: VisibilityProps) {
     }, []);
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={VisibilityPage.displayName}
-        >
+        <ScreenWrapper testID={VisibilityPage.displayName}>
             <FullPageNotFoundView shouldShow={shouldDisableVisibility}>
                 <HeaderWithBackButton
                     title={translate('newRoomPage.visibility')}
diff --git a/src/pages/settings/Report/WriteCapabilityPage.tsx b/src/pages/settings/Report/WriteCapabilityPage.tsx
index 2f6fb9b485a74..2fdf38fc0d915 100644
--- a/src/pages/settings/Report/WriteCapabilityPage.tsx
+++ b/src/pages/settings/Report/WriteCapabilityPage.tsx
@@ -56,10 +56,7 @@ function WriteCapabilityPage({report, policy}: WriteCapabilityPageProps) {
     );
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={WriteCapabilityPage.displayName}
-        >
+        <ScreenWrapper testID={WriteCapabilityPage.displayName}>
             <FullPageNotFoundView shouldShow={!isAbleToEdit}>
                 <HeaderWithBackButton
                     title={translate('writeCapabilityPage.label')}
diff --git a/src/pages/settings/Security/AddDelegate/AddDelegatePage.tsx b/src/pages/settings/Security/AddDelegate/AddDelegatePage.tsx
index 9be88b4c0814b..b889943e973e7 100644
--- a/src/pages/settings/Security/AddDelegate/AddDelegatePage.tsx
+++ b/src/pages/settings/Security/AddDelegate/AddDelegatePage.tsx
@@ -126,10 +126,7 @@ function AddDelegatePage() {
     }, [debouncedSearchValue]);
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={AddDelegatePage.displayName}
-        >
+        <ScreenWrapper testID={AddDelegatePage.displayName}>
             <DelegateNoAccessWrapper accessDeniedVariants={[CONST.DELEGATE.DENIED_ACCESS_VARIANTS.DELEGATE]}>
                 <HeaderWithBackButton
                     title={translate('delegate.addCopilot')}
diff --git a/src/pages/settings/Security/AddDelegate/SelectDelegateRolePage.tsx b/src/pages/settings/Security/AddDelegate/SelectDelegateRolePage.tsx
index b5b7a3bd566bb..5efd96887455e 100644
--- a/src/pages/settings/Security/AddDelegate/SelectDelegateRolePage.tsx
+++ b/src/pages/settings/Security/AddDelegate/SelectDelegateRolePage.tsx
@@ -31,10 +31,7 @@ function SelectDelegateRolePage({route}: SelectDelegateRolePageProps) {
     }));
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={SelectDelegateRolePage.displayName}
-        >
+        <ScreenWrapper testID={SelectDelegateRolePage.displayName}>
             <DelegateNoAccessWrapper accessDeniedVariants={[CONST.DELEGATE.DENIED_ACCESS_VARIANTS.DELEGATE]}>
                 <HeaderWithBackButton
                     title={translate('delegate.accessLevel')}
diff --git a/src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateMagicCodePage.tsx b/src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateMagicCodePage.tsx
index 38663d0f93e0a..623f7ddeb5168 100644
--- a/src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateMagicCodePage.tsx
+++ b/src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateMagicCodePage.tsx
@@ -46,7 +46,6 @@ function UpdateDelegateMagicCodePage({route}: UpdateDelegateMagicCodePageProps)
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
             testID={UpdateDelegateMagicCodePage.displayName}
             offlineIndicatorStyle={styles.mtAuto}
diff --git a/src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateRolePage.tsx b/src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateRolePage.tsx
index 097b1ce679af9..3e3cdceb2a256 100644
--- a/src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateRolePage.tsx
+++ b/src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateRolePage.tsx
@@ -40,10 +40,7 @@ function UpdateDelegateRolePage({route}: UpdateDelegateRolePageProps) {
     }, [login]);
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={UpdateDelegateRolePage.displayName}
-        >
+        <ScreenWrapper testID={UpdateDelegateRolePage.displayName}>
             <DelegateNoAccessWrapper accessDeniedVariants={[CONST.DELEGATE.DENIED_ACCESS_VARIANTS.DELEGATE]}>
                 <HeaderWithBackButton
                     title={translate('delegate.accessLevel')}
diff --git a/src/pages/settings/Security/SecuritySettingsPage.tsx b/src/pages/settings/Security/SecuritySettingsPage.tsx
index ea6207b562dde..5a85204b90301 100644
--- a/src/pages/settings/Security/SecuritySettingsPage.tsx
+++ b/src/pages/settings/Security/SecuritySettingsPage.tsx
@@ -242,7 +242,6 @@ function SecuritySettingsPage() {
     return (
         <ScreenWrapper
             testID={SecuritySettingsPage.displayName}
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicatorInWideScreen
         >
diff --git a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthPage.tsx b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthPage.tsx
index bc3dc588c1b16..ac61bd3eaf598 100644
--- a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthPage.tsx
+++ b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthPage.tsx
@@ -13,7 +13,6 @@ function TwoFactorAuthPage() {
         return (
             <ScreenWrapper
                 testID={TwoFactorAuthPage.displayName}
-                includeSafeAreaPaddingBottom={false}
                 shouldEnablePickerAvoiding={false}
             >
                 <DelegateNoAccessWrapper accessDeniedVariants={[CONST.DELEGATE.DENIED_ACCESS_VARIANTS.DELEGATE]} />
diff --git a/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx b/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx
index b323c668b0b5a..d05f74c1bfc25 100644
--- a/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx
+++ b/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx
@@ -68,7 +68,6 @@ function CardAuthenticationModal({headerTitle, policyID}: CardAuthenticationModa
             <ScreenWrapper
                 style={styles.pb0}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
                 testID={CardAuthenticationModal.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/settings/Subscription/DisableAutoRenewSurveyPage/index.tsx b/src/pages/settings/Subscription/DisableAutoRenewSurveyPage/index.tsx
index 655658363e875..c47be38dfc4fb 100644
--- a/src/pages/settings/Subscription/DisableAutoRenewSurveyPage/index.tsx
+++ b/src/pages/settings/Subscription/DisableAutoRenewSurveyPage/index.tsx
@@ -22,7 +22,6 @@ function DisableAutoRenewSurveyPage() {
     return (
         <ScreenWrapper
             testID={DisableAutoRenewSurveyPage.displayName}
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
diff --git a/src/pages/settings/Subscription/RequestEarlyCancellationPage/index.tsx b/src/pages/settings/Subscription/RequestEarlyCancellationPage/index.tsx
index 922293dc06512..abbadfb8233ce 100644
--- a/src/pages/settings/Subscription/RequestEarlyCancellationPage/index.tsx
+++ b/src/pages/settings/Subscription/RequestEarlyCancellationPage/index.tsx
@@ -124,7 +124,6 @@ function RequestEarlyCancellationPage() {
     return (
         <ScreenWrapper
             testID={RequestEarlyCancellationPage.displayName}
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
diff --git a/src/pages/settings/Subscription/SubscriptionSize/index.tsx b/src/pages/settings/Subscription/SubscriptionSize/index.tsx
index 71febe24ca4c5..d0d5714cce6d3 100644
--- a/src/pages/settings/Subscription/SubscriptionSize/index.tsx
+++ b/src/pages/settings/Subscription/SubscriptionSize/index.tsx
@@ -55,7 +55,6 @@ function SubscriptionSizePage({route}: SubscriptionSizePageProps) {
     return (
         <ScreenWrapper
             testID={SubscriptionSizePage.displayName}
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
             shouldShowOfflineIndicatorInWideScreen
diff --git a/src/pages/settings/Wallet/AddDebitCardPage.tsx b/src/pages/settings/Wallet/AddDebitCardPage.tsx
index 042459f9ac726..b5a95d04d3488 100644
--- a/src/pages/settings/Wallet/AddDebitCardPage.tsx
+++ b/src/pages/settings/Wallet/AddDebitCardPage.tsx
@@ -51,7 +51,6 @@ function DebitCardPage() {
     return (
         <ScreenWrapper
             onEntryTransitionEnd={() => nameOnCardRef.current?.focus()}
-            includeSafeAreaPaddingBottom={false}
             testID={DebitCardPage.displayName}
         >
             <HeaderWithBackButton
diff --git a/src/pages/signin/SAMLSignInPage/index.native.tsx b/src/pages/signin/SAMLSignInPage/index.native.tsx
index 3b9bc456a6807..7fa419b925a8e 100644
--- a/src/pages/signin/SAMLSignInPage/index.native.tsx
+++ b/src/pages/signin/SAMLSignInPage/index.native.tsx
@@ -51,7 +51,6 @@ function SAMLSignInPage() {
     return (
         <ScreenWrapper
             shouldShowOfflineIndicator={false}
-            includeSafeAreaPaddingBottom={false}
             testID={SAMLSignInPage.displayName}
         >
             {showNavigation && (
diff --git a/src/pages/signin/SignInModal.tsx b/src/pages/signin/SignInModal.tsx
index 8cfa3ba3dcc80..824a7c9bfba89 100644
--- a/src/pages/signin/SignInModal.tsx
+++ b/src/pages/signin/SignInModal.tsx
@@ -38,7 +38,6 @@ function SignInModal() {
     return (
         <ScreenWrapper
             style={[StyleUtils.getBackgroundColorStyle(theme.PAGE_THEMES[SCREENS.RIGHT_MODAL.SIGN_IN].backgroundColor)]}
-            includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
             shouldShowOfflineIndicator={false}
             testID={SignInModal.displayName}
diff --git a/src/pages/tasks/TaskAssigneeSelectorModal.tsx b/src/pages/tasks/TaskAssigneeSelectorModal.tsx
index fdb59b0ead0c7..74e4e59cb2d0a 100644
--- a/src/pages/tasks/TaskAssigneeSelectorModal.tsx
+++ b/src/pages/tasks/TaskAssigneeSelectorModal.tsx
@@ -208,10 +208,7 @@ function TaskAssigneeSelectorModal() {
     }, [debouncedSearchValue]);
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={TaskAssigneeSelectorModal.displayName}
-        >
+        <ScreenWrapper testID={TaskAssigneeSelectorModal.displayName}>
             <FullPageNotFoundView shouldShow={isTaskNonEditable}>
                 <HeaderWithBackButton
                     title={translate('task.assignee')}
diff --git a/src/pages/tasks/TaskShareDestinationSelectorModal.tsx b/src/pages/tasks/TaskShareDestinationSelectorModal.tsx
index 543afb4ba0025..8f523cc45c5d0 100644
--- a/src/pages/tasks/TaskShareDestinationSelectorModal.tsx
+++ b/src/pages/tasks/TaskShareDestinationSelectorModal.tsx
@@ -117,7 +117,6 @@ function TaskShareDestinationSelectorModal() {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             testID="TaskShareDestinationSelectorModal"
             onEntryTransitionEnd={() => setDidScreenTransitionEnd(true)}
         >
diff --git a/src/pages/wallet/WalletStatementPage.tsx b/src/pages/wallet/WalletStatementPage.tsx
index 4a363e19e4903..b1a0ec5bc0134 100644
--- a/src/pages/wallet/WalletStatementPage.tsx
+++ b/src/pages/wallet/WalletStatementPage.tsx
@@ -89,7 +89,6 @@ function WalletStatementPage({route}: WalletStatementPageProps) {
     return (
         <ScreenWrapper
             shouldShowOfflineIndicator={false}
-            includeSafeAreaPaddingBottom={false}
             testID={WalletStatementPage.displayName}
         >
             <HeaderWithBackButton
diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.tsx b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
index b9a91fa2ce323..5e8f17851be9e 100644
--- a/src/pages/workspace/WorkspaceInviteMessagePage.tsx
+++ b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
@@ -154,7 +154,6 @@ function WorkspaceInviteMessagePage({policy, route, currentUserPersonalDetails}:
             fullPageNotFoundViewProps={{subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized', onLinkPress: goBackFromInvalidPolicy}}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 testID={WorkspaceInviteMessagePage.displayName}
                 shouldEnableMaxHeight
                 style={{marginTop: viewportOffsetTop}}
diff --git a/src/pages/workspace/WorkspaceProfileCurrencyPage.tsx b/src/pages/workspace/WorkspaceProfileCurrencyPage.tsx
index 155577976c84d..a90c11f306166 100644
--- a/src/pages/workspace/WorkspaceProfileCurrencyPage.tsx
+++ b/src/pages/workspace/WorkspaceProfileCurrencyPage.tsx
@@ -40,10 +40,7 @@ function WorkspaceProfileCurrencyPage({policy}: WorkspaceProfileCurrencyPageProp
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
             fullPageNotFoundViewProps={{onLinkPress: PolicyUtils.goBackFromInvalidPolicy, subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}}
         >
-            <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
-                testID={WorkspaceProfileCurrencyPage.displayName}
-            >
+            <ScreenWrapper testID={WorkspaceProfileCurrencyPage.displayName}>
                 <HeaderWithBackButton
                     title={translate('workspace.editor.currencyInputLabel')}
                     onBackButtonPress={() => Navigation.goBack()}
diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index acd0b158fa677..5a9bc9ef80253 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -426,7 +426,6 @@ function WorkspacesListPage() {
     if (isEmptyObject(workspaces)) {
         return (
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 shouldEnablePickerAvoiding={false}
                 shouldEnableMaxHeight
                 testID={WorkspacesListPage.displayName}
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index 2f38e66b1bed4..7f78ddf1ba31b 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -492,7 +492,6 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
         >
             <ScreenWrapper
                 testID={PolicyAccountingPage.displayName}
-                includeSafeAreaPaddingBottom={false}
                 shouldShowOfflineIndicatorInWideScreen
             >
                 <HeaderWithBackButton
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAutoSyncPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAutoSyncPage.tsx
index 992b42dd9478f..6b906700f897e 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAutoSyncPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAutoSyncPage.tsx
@@ -36,7 +36,6 @@ function NetSuiteAutoSyncPage({policy, route}: WithPolicyConnectionsProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={NetSuiteAutoSyncPage.displayName}
                 offlineIndicatorStyle={styles.mtAuto}
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
index 0f52f6a11d7c4..9bd0d2d8c03b5 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
@@ -80,7 +80,6 @@ function NetSuiteCustomListSelectorModal({isVisible, currentCustomListValue, onC
             <ScreenWrapper
                 style={[styles.pb0]}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
                 testID={NetSuiteCustomListSelectorModal.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx b/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx
index 19429e147426c..e8f19cf207e1a 100644
--- a/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx
+++ b/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx
@@ -79,7 +79,6 @@ function CardReconciliationPage({policy, route}: CardReconciliationPageProps) {
             shouldBeBlocked={!shouldShow}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 shouldEnableMaxHeight
                 testID={CardReconciliationPage.displayName}
             >
diff --git a/src/pages/workspace/categories/CategoryApproverPage.tsx b/src/pages/workspace/categories/CategoryApproverPage.tsx
index 78f5f579bf932..9e6ce3ca86bef 100644
--- a/src/pages/workspace/categories/CategoryApproverPage.tsx
+++ b/src/pages/workspace/categories/CategoryApproverPage.tsx
@@ -35,7 +35,6 @@ function CategoryApproverPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={CategoryApproverPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/categories/CategoryDefaultTaxRatePage.tsx b/src/pages/workspace/categories/CategoryDefaultTaxRatePage.tsx
index a87dae907aeaf..5da11bcd78273 100644
--- a/src/pages/workspace/categories/CategoryDefaultTaxRatePage.tsx
+++ b/src/pages/workspace/categories/CategoryDefaultTaxRatePage.tsx
@@ -58,7 +58,6 @@ function CategoryDefaultTaxRatePage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={CategoryDefaultTaxRatePage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/categories/CategoryRequireReceiptsOverPage.tsx b/src/pages/workspace/categories/CategoryRequireReceiptsOverPage.tsx
index 119786e3b28e8..943c6d405b647 100644
--- a/src/pages/workspace/categories/CategoryRequireReceiptsOverPage.tsx
+++ b/src/pages/workspace/categories/CategoryRequireReceiptsOverPage.tsx
@@ -79,7 +79,6 @@ function CategoryRequireReceiptsOverPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={CategoryRequireReceiptsOverPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/categories/CategorySettingsPage.tsx b/src/pages/workspace/categories/CategorySettingsPage.tsx
index 016cbe91cb72e..c063727a9c47f 100644
--- a/src/pages/workspace/categories/CategorySettingsPage.tsx
+++ b/src/pages/workspace/categories/CategorySettingsPage.tsx
@@ -136,7 +136,6 @@ function CategorySettingsPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={CategorySettingsPage.displayName}
             >
diff --git a/src/pages/workspace/categories/ExpenseLimitTypeSelector/ExpenseLimitTypeSelectorModal.tsx b/src/pages/workspace/categories/ExpenseLimitTypeSelector/ExpenseLimitTypeSelectorModal.tsx
index 7563bea7d031b..4e181f0e20077 100644
--- a/src/pages/workspace/categories/ExpenseLimitTypeSelector/ExpenseLimitTypeSelectorModal.tsx
+++ b/src/pages/workspace/categories/ExpenseLimitTypeSelector/ExpenseLimitTypeSelectorModal.tsx
@@ -50,7 +50,6 @@ function ExpenseLimitTypeSelectorModal({isVisible, currentExpenseLimitType, onEx
             <ScreenWrapper
                 style={[styles.pb0]}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
                 testID={ExpenseLimitTypeSelectorModal.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
index 7b85ddcb02c05..c03c0ca3ae785 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
@@ -360,7 +360,6 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={WorkspaceCategoriesPage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
index bd5edaa437791..2a7d2aab5e707 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
@@ -92,7 +92,6 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={WorkspaceCategoriesSettingsPage.displayName}
             >
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx
index 6528d35b33747..19e87f5215b31 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx
@@ -83,10 +83,7 @@ function WorkspaceCompanyCardDetailsPage({route}: WorkspaceCompanyCardDetailsPag
             policyID={policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED}
         >
-            <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
-                testID={WorkspaceCompanyCardDetailsPage.displayName}
-            >
+            <ScreenWrapper testID={WorkspaceCompanyCardDetailsPage.displayName}>
                 {({safeAreaPaddingBottomStyle}) => (
                     <>
                         <HeaderWithBackButton
diff --git a/src/pages/workspace/companyCards/addNew/AddNewCardPage.tsx b/src/pages/workspace/companyCards/addNew/AddNewCardPage.tsx
index 7a326b56592e2..f558f07337386 100644
--- a/src/pages/workspace/companyCards/addNew/AddNewCardPage.tsx
+++ b/src/pages/workspace/companyCards/addNew/AddNewCardPage.tsx
@@ -26,7 +26,6 @@ function AddNewCardPage({policy}: WithPolicyAndFullscreenLoadingProps) {
         return (
             <ScreenWrapper
                 testID={AddNewCardPage.displayName}
-                includeSafeAreaPaddingBottom={false}
                 shouldEnablePickerAvoiding={false}
             >
                 <DelegateNoAccessWrapper accessDeniedVariants={[CONST.DELEGATE.DENIED_ACCESS_VARIANTS.DELEGATE]} />
diff --git a/src/pages/workspace/companyCards/addNew/AmexCustomFeed.tsx b/src/pages/workspace/companyCards/addNew/AmexCustomFeed.tsx
index d8ce6d6159d58..39956e388324c 100644
--- a/src/pages/workspace/companyCards/addNew/AmexCustomFeed.tsx
+++ b/src/pages/workspace/companyCards/addNew/AmexCustomFeed.tsx
@@ -71,7 +71,6 @@ function AmexCustomFeed() {
     return (
         <ScreenWrapper
             testID={AmexCustomFeed.displayName}
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
diff --git a/src/pages/workspace/companyCards/addNew/BankConnection/index.native.tsx b/src/pages/workspace/companyCards/addNew/BankConnection/index.native.tsx
index 76bf9b2bd9674..b1553bf59a5b1 100644
--- a/src/pages/workspace/companyCards/addNew/BankConnection/index.native.tsx
+++ b/src/pages/workspace/companyCards/addNew/BankConnection/index.native.tsx
@@ -80,7 +80,6 @@ function BankConnection({policyID}: BankConnectionStepProps) {
         <ScreenWrapper
             testID={BankConnection.displayName}
             shouldShowOfflineIndicator={false}
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
diff --git a/src/pages/workspace/companyCards/addNew/CardTypeStep.tsx b/src/pages/workspace/companyCards/addNew/CardTypeStep.tsx
index 26899ed9e50f6..2c99334807bea 100644
--- a/src/pages/workspace/companyCards/addNew/CardTypeStep.tsx
+++ b/src/pages/workspace/companyCards/addNew/CardTypeStep.tsx
@@ -99,7 +99,6 @@ function CardTypeStep() {
     return (
         <ScreenWrapper
             testID={CardTypeStep.displayName}
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
diff --git a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx
index 15ead5b9a3238..c7309235c8f6b 100644
--- a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx
+++ b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx
@@ -71,7 +71,6 @@ function SelectBankStep() {
     return (
         <ScreenWrapper
             testID={SelectBankStep.displayName}
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
diff --git a/src/pages/workspace/companyCards/addNew/SelectFeedType.tsx b/src/pages/workspace/companyCards/addNew/SelectFeedType.tsx
index 7fe8da2f99546..5123b3ef915c1 100644
--- a/src/pages/workspace/companyCards/addNew/SelectFeedType.tsx
+++ b/src/pages/workspace/companyCards/addNew/SelectFeedType.tsx
@@ -61,7 +61,6 @@ function SelectFeedType() {
     return (
         <ScreenWrapper
             testID={SelectFeedType.displayName}
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
diff --git a/src/pages/workspace/companyCards/assignCard/AssignCardFeedPage.tsx b/src/pages/workspace/companyCards/assignCard/AssignCardFeedPage.tsx
index 7d6d415065242..169d0c524edcc 100644
--- a/src/pages/workspace/companyCards/assignCard/AssignCardFeedPage.tsx
+++ b/src/pages/workspace/companyCards/assignCard/AssignCardFeedPage.tsx
@@ -38,7 +38,6 @@ function AssignCardFeedPage({route, policy}: AssignCardFeedPageProps) {
         return (
             <ScreenWrapper
                 testID={AssignCardFeedPage.displayName}
-                includeSafeAreaPaddingBottom={false}
                 shouldEnablePickerAvoiding={false}
             >
                 <DelegateNoAccessWrapper accessDeniedVariants={[CONST.DELEGATE.DENIED_ACCESS_VARIANTS.DELEGATE]} />
diff --git a/src/pages/workspace/companyCards/assignCard/BankConnection/index.native.tsx b/src/pages/workspace/companyCards/assignCard/BankConnection/index.native.tsx
index aec2c9ece0cdf..73aa2effdc03b 100644
--- a/src/pages/workspace/companyCards/assignCard/BankConnection/index.native.tsx
+++ b/src/pages/workspace/companyCards/assignCard/BankConnection/index.native.tsx
@@ -59,7 +59,6 @@ function BankConnection({policyID, feed}: BankConnectionStepProps) {
         <ScreenWrapper
             testID={BankConnection.displayName}
             shouldShowOfflineIndicator={false}
-            includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
diff --git a/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx b/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
index 616a74e17f1e1..b9cb9d5e01944 100644
--- a/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
@@ -157,7 +157,6 @@ function CardSelectionStep({feed, policyID}: CardSelectionStepProps) {
                             </View>
                         }
                         shouldShowTextInputAfterHeader
-                        includeSafeAreaPaddingBottom={false}
                         shouldShowListEmptyContent={false}
                         shouldUpdateFocusedIndex
                     />
diff --git a/src/pages/workspace/companyCards/assignCard/TransactionStartDateSelectorModal.tsx b/src/pages/workspace/companyCards/assignCard/TransactionStartDateSelectorModal.tsx
index 8c0990800bb4c..55cf60e1185a7 100644
--- a/src/pages/workspace/companyCards/assignCard/TransactionStartDateSelectorModal.tsx
+++ b/src/pages/workspace/companyCards/assignCard/TransactionStartDateSelectorModal.tsx
@@ -51,7 +51,6 @@ function TransactionStartDateSelectorModal({isVisible, date, handleSelectDate, o
             <ScreenWrapper
                 style={styles.pb0}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
                 testID={TransactionStartDateSelectorModal.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx
index 4142e65cf35e1..d3e1c95ca8b5e 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx
@@ -99,7 +99,6 @@ function PolicyDistanceRateDetailsPage({route}: PolicyDistanceRateDetailsPagePro
         >
             <ScreenWrapper
                 testID={PolicyDistanceRateDetailsPage.displayName}
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
             >
                 <HeaderWithBackButton title={`${rateValueToDisplay} / ${translate(`common.${customUnit?.attributes?.unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES}`)}`} />
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx
index 06a8faf29c1df..9c65dd23ab7c0 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx
@@ -61,7 +61,6 @@ function PolicyDistanceRateTaxRateEditPage({route, policy}: PolicyDistanceRateTa
             featureName={CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 shouldEnableMaxHeight
                 testID={PolicyDistanceRateTaxRateEditPage.displayName}
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
index 19878036030b0..0a51b0e5b8874 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
@@ -288,7 +288,6 @@ function PolicyDistanceRatesPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={PolicyDistanceRatesPage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx
index 57129ab299ca9..981f0a4c90a1d 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx
@@ -87,7 +87,6 @@ function PolicyDistanceRatesSettingsPage({route}: PolicyDistanceRatesSettingsPag
             featureName={CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={PolicyDistanceRatesSettingsPage.displayName}
             >
diff --git a/src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx b/src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx
index 34eb21ce19c46..fad6fc69838c2 100644
--- a/src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx
+++ b/src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx
@@ -40,7 +40,6 @@ function UnitSelectorModal({isVisible, currentUnit, onUnitSelected, onClose, lab
             <ScreenWrapper
                 style={[styles.pb0]}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
                 testID={UnitSelectorModal.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx
index f05ba655a1fd6..0e5b7d5bb982f 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx
@@ -45,7 +45,6 @@ function WorkspaceCardSettingsPage({route}: WorkspaceCardSettingsPageProps) {
         >
             <ScreenWrapper
                 testID={WorkspaceCardSettingsPage.displayName}
-                includeSafeAreaPaddingBottom={false}
                 shouldEnableMaxHeight
             >
                 <HeaderWithBackButton title={translate('workspace.common.settings')} />
diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx
index 5da459be4a160..5ad27545a92af 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx
@@ -185,7 +185,6 @@ function WorkspaceExpensifyCardBankAccounts({route}: WorkspaceExpensifyCardBankA
         >
             <ScreenWrapper
                 testID={WorkspaceExpensifyCardBankAccounts.displayName}
-                includeSafeAreaPaddingBottom={false}
                 shouldEnablePickerAvoiding={false}
                 shouldShowOfflineIndicator={false}
             >
diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx
index fdef6ecdc481f..c98c298879030 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx
@@ -86,10 +86,7 @@ function WorkspaceExpensifyCardDetailsPage({route}: WorkspaceExpensifyCardDetail
             policyID={policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED}
         >
-            <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
-                testID={WorkspaceExpensifyCardDetailsPage.displayName}
-            >
+            <ScreenWrapper testID={WorkspaceExpensifyCardDetailsPage.displayName}>
                 {({safeAreaPaddingBottomStyle}) => (
                     <>
                         <HeaderWithBackButton
diff --git a/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx
index 6ba68ba25fa7c..e5639872b49df 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx
@@ -90,7 +90,6 @@ function WorkspaceSettlementAccountPage({route}: WorkspaceSettlementAccountPageP
         >
             <ScreenWrapper
                 testID={WorkspaceSettlementAccountPage.displayName}
-                includeSafeAreaPaddingBottom={false}
                 shouldEnableMaxHeight
             >
                 <HeaderWithBackButton
diff --git a/src/pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage.tsx
index 52fa4c8890d03..07c2ad92da3fc 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage.tsx
@@ -68,7 +68,6 @@ function WorkspaceSettlementFrequencyPage({route}: WorkspaceSettlementFrequencyP
         >
             <ScreenWrapper
                 testID={WorkspaceSettlementFrequencyPage.displayName}
-                includeSafeAreaPaddingBottom={false}
                 shouldEnableMaxHeight
             >
                 <HeaderWithBackButton
diff --git a/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx b/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx
index 27653df9f9b0c..7bc8bc8be8503 100644
--- a/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx
@@ -62,7 +62,6 @@ function IssueNewCardPage({policy, route}: IssueNewCardPageProps) {
         return (
             <ScreenWrapper
                 testID={IssueNewCardPage.displayName}
-                includeSafeAreaPaddingBottom={false}
                 shouldEnablePickerAvoiding={false}
             >
                 <DelegateNoAccessWrapper accessDeniedVariants={[CONST.DELEGATE.DENIED_ACCESS_VARIANTS.DELEGATE]} />
diff --git a/src/pages/workspace/perDiem/WorkspacePerDiemDetailsPage.tsx b/src/pages/workspace/perDiem/WorkspacePerDiemDetailsPage.tsx
index 3e53a1681274e..5acda2c9bf25c 100644
--- a/src/pages/workspace/perDiem/WorkspacePerDiemDetailsPage.tsx
+++ b/src/pages/workspace/perDiem/WorkspacePerDiemDetailsPage.tsx
@@ -67,7 +67,6 @@ function WorkspacePerDiemDetailsPage({route}: WorkspacePerDiemDetailsPageProps)
             featureName={CONST.POLICY.MORE_FEATURES.ARE_PER_DIEM_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={WorkspacePerDiemDetailsPage.displayName}
             >
diff --git a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
index 1f51af583d8a9..24aae601e9153 100644
--- a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
+++ b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
@@ -335,7 +335,6 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_PER_DIEM_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={WorkspacePerDiemPage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
diff --git a/src/pages/workspace/perDiem/WorkspacePerDiemSettingsPage.tsx b/src/pages/workspace/perDiem/WorkspacePerDiemSettingsPage.tsx
index aa016ccc23843..242695aefaddc 100644
--- a/src/pages/workspace/perDiem/WorkspacePerDiemSettingsPage.tsx
+++ b/src/pages/workspace/perDiem/WorkspacePerDiemSettingsPage.tsx
@@ -60,7 +60,6 @@ function WorkspacePerDiemSettingsPage({route}: WorkspacePerDiemSettingsPageProps
             featureName={CONST.POLICY.MORE_FEATURES.ARE_PER_DIEM_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={WorkspacePerDiemSettingsPage.displayName}
             >
diff --git a/src/pages/workspace/reportFields/InitialListValueSelector/InitialListValueSelectorModal.tsx b/src/pages/workspace/reportFields/InitialListValueSelector/InitialListValueSelectorModal.tsx
index fa6c5dc76bdbf..81f038ad76df0 100644
--- a/src/pages/workspace/reportFields/InitialListValueSelector/InitialListValueSelectorModal.tsx
+++ b/src/pages/workspace/reportFields/InitialListValueSelector/InitialListValueSelectorModal.tsx
@@ -47,7 +47,6 @@ function InitialListValueSelectorModal({isVisible, currentValue, label, subtitle
             <ScreenWrapper
                 style={styles.pb0}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
                 testID={InitialListValueSelectorModal.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx b/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
index 7203c37ca704d..87c896a123e92 100644
--- a/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
+++ b/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
@@ -273,7 +273,6 @@ function ReportFieldsListValuesPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={styles.defaultModalContainer}
                 testID={ReportFieldsListValuesPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/reportFields/ReportFieldsSettingsPage.tsx b/src/pages/workspace/reportFields/ReportFieldsSettingsPage.tsx
index 401ca93fa9f93..8f102d3c5d7e0 100644
--- a/src/pages/workspace/reportFields/ReportFieldsSettingsPage.tsx
+++ b/src/pages/workspace/reportFields/ReportFieldsSettingsPage.tsx
@@ -63,7 +63,6 @@ function ReportFieldsSettingsPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={ReportFieldsSettingsPage.displayName}
             >
diff --git a/src/pages/workspace/reportFields/ReportFieldsValueSettingsPage.tsx b/src/pages/workspace/reportFields/ReportFieldsValueSettingsPage.tsx
index 08b94fcc4aee8..ee3edd159fa2a 100644
--- a/src/pages/workspace/reportFields/ReportFieldsValueSettingsPage.tsx
+++ b/src/pages/workspace/reportFields/ReportFieldsValueSettingsPage.tsx
@@ -94,7 +94,6 @@ function ReportFieldsValueSettingsPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={styles.defaultModalContainer}
                 testID={ReportFieldsValueSettingsPage.displayName}
             >
diff --git a/src/pages/workspace/reportFields/TypeSelector/TypeSelectorModal.tsx b/src/pages/workspace/reportFields/TypeSelector/TypeSelectorModal.tsx
index ca64dda455a46..1331af715d103 100644
--- a/src/pages/workspace/reportFields/TypeSelector/TypeSelectorModal.tsx
+++ b/src/pages/workspace/reportFields/TypeSelector/TypeSelectorModal.tsx
@@ -45,7 +45,6 @@ function TypeSelectorModal({isVisible, currentType, label, subtitle, onTypeSelec
             <ScreenWrapper
                 style={styles.pb0}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
                 testID={TypeSelectorModal.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx b/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx
index ea29d41199ec6..2af1bf28a1c00 100644
--- a/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx
+++ b/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx
@@ -238,7 +238,6 @@ function WorkspaceReportFieldsPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={WorkspaceReportFieldsPage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
diff --git a/src/pages/workspace/rules/RulesBillableDefaultPage.tsx b/src/pages/workspace/rules/RulesBillableDefaultPage.tsx
index 2b9d42ed748c4..aaeea479d9ab7 100644
--- a/src/pages/workspace/rules/RulesBillableDefaultPage.tsx
+++ b/src/pages/workspace/rules/RulesBillableDefaultPage.tsx
@@ -64,7 +64,6 @@ function RulesBillableDefaultPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 shouldEnableMaxHeight
                 testID={RulesBillableDefaultPage.displayName}
             >
diff --git a/src/pages/workspace/tags/TagApproverPage.tsx b/src/pages/workspace/tags/TagApproverPage.tsx
index 9ad97a1738a75..585ebf3cf072d 100644
--- a/src/pages/workspace/tags/TagApproverPage.tsx
+++ b/src/pages/workspace/tags/TagApproverPage.tsx
@@ -38,7 +38,6 @@ function TagApproverPage({route}: TagApproverPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={TagApproverPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/tags/TagSettingsPage.tsx b/src/pages/workspace/tags/TagSettingsPage.tsx
index 5160fe915d5c3..4b8a7e1ade078 100644
--- a/src/pages/workspace/tags/TagSettingsPage.tsx
+++ b/src/pages/workspace/tags/TagSettingsPage.tsx
@@ -119,7 +119,6 @@ function TagSettingsPage({route, navigation}: TagSettingsPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={TagSettingsPage.displayName}
             >
diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index cd3510cfffb58..a723affe12244 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -361,7 +361,6 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={WorkspaceTagsPage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
diff --git a/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
index 8401ea31f448a..b93b21214ff8c 100644
--- a/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
@@ -126,7 +126,6 @@ function WorkspaceTagsSettingsPage({route}: WorkspaceTagsSettingsPageProps) {
         >
             {({policy}) => (
                 <ScreenWrapper
-                    includeSafeAreaPaddingBottom={false}
                     style={[styles.defaultModalContainer]}
                     testID={WorkspaceTagsSettingsPage.displayName}
                 >
diff --git a/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx
index 173c89c415513..5010f122f04fa 100644
--- a/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx
@@ -252,7 +252,6 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 shouldEnableMaxHeight
                 testID={WorkspaceViewTagsPage.displayName}
             >
diff --git a/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx b/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
index 4dddcb42265d5..e6baaadb01ad9 100644
--- a/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
@@ -72,7 +72,6 @@ function WorkspaceCreateTaxPage({
         >
             <ScreenWrapper
                 testID={WorkspaceCreateTaxPage.displayName}
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
             >
                 <FullPageNotFoundView shouldShow={PolicyUtils.hasAccountingConnections(policy)}>
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
index e064c04878a13..27463416e77dc 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
@@ -290,7 +290,6 @@ function WorkspaceTaxesPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
                 testID={WorkspaceTaxesPage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx
index 6b0a8932e713e..033f7dbcf57bd 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx
@@ -49,7 +49,6 @@ function WorkspaceTaxesSettingsForeignCurrency({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 shouldEnableMaxHeight
                 testID={WorkspaceTaxesSettingsForeignCurrency.displayName}
                 style={styles.defaultModalContainer}
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx
index b04203cf74158..b64b8b10f4b7d 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx
@@ -49,7 +49,6 @@ function WorkspaceTaxesSettingsWorkspaceCurrency({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 shouldEnableMaxHeight
                 testID={WorkspaceTaxesSettingsWorkspaceCurrency.displayName}
                 style={styles.defaultModalContainer}
diff --git a/src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx b/src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx
index c3448c2f7c95d..e667fc8935a41 100644
--- a/src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx
@@ -108,10 +108,7 @@ function WorkspaceAutoReportingFrequencyPage({policy, route}: WorkspaceAutoRepor
             policyID={route.params.policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
         >
-            <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
-                testID={WorkspaceAutoReportingFrequencyPage.displayName}
-            >
+            <ScreenWrapper testID={WorkspaceAutoReportingFrequencyPage.displayName}>
                 <FullPageNotFoundView
                     onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
                     onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
diff --git a/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx b/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx
index 8336700a7d796..83cc176c52976 100644
--- a/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx
@@ -77,10 +77,7 @@ function WorkspaceAutoReportingMonthlyOffsetPage({policy, route}: WorkspaceAutoR
             policyID={route.params.policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
         >
-            <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
-                testID={WorkspaceAutoReportingMonthlyOffsetPage.displayName}
-            >
+            <ScreenWrapper testID={WorkspaceAutoReportingMonthlyOffsetPage.displayName}>
                 <FullPageNotFoundView
                     onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
                     onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
index 4b1666968b3bc..ce71c141d80b1 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
@@ -175,10 +175,7 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
                 onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
                 onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
             >
-                <ScreenWrapper
-                    includeSafeAreaPaddingBottom={false}
-                    testID={WorkspaceWorkflowsPayerPage.displayName}
-                >
+                <ScreenWrapper testID={WorkspaceWorkflowsPayerPage.displayName}>
                     <HeaderWithBackButton
                         title={translate('workflowsPayerPage.title')}
                         subtitle={policyName}

From 63d04fe85a69fa04854c5e59410f1e310f72d3c6 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Mon, 17 Feb 2025 18:28:21 +0100
Subject: [PATCH 8/8] fix: remove `includeSafeAreaPaddingBottom={false}` on
 screens after merge main

---
 src/pages/Travel/TravelUpgrade.tsx                             | 1 -
 src/pages/workspace/accounting/MultiConnectionSelectorPage.tsx | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/pages/Travel/TravelUpgrade.tsx b/src/pages/Travel/TravelUpgrade.tsx
index 78b8f8d7e4880..74247908ecf0a 100644
--- a/src/pages/Travel/TravelUpgrade.tsx
+++ b/src/pages/Travel/TravelUpgrade.tsx
@@ -55,7 +55,6 @@ function TravelUpgrade() {
                 <ScreenWrapper
                     style={[styles.pb0]}
                     includePaddingTop={false}
-                    includeSafeAreaPaddingBottom={false}
                     testID={TravelUpgrade.displayName}
                 >
                     <WorkspaceConfirmationForm
diff --git a/src/pages/workspace/accounting/MultiConnectionSelectorPage.tsx b/src/pages/workspace/accounting/MultiConnectionSelectorPage.tsx
index e8ecca78c7624..49855b5084e92 100644
--- a/src/pages/workspace/accounting/MultiConnectionSelectorPage.tsx
+++ b/src/pages/workspace/accounting/MultiConnectionSelectorPage.tsx
@@ -94,7 +94,6 @@ function MultiConnectionSelectorPage({policy, route}: MultiConnectionSelectorPag
         >
             <ScreenWrapper
                 testID={MultiConnectionSelectorPage.displayName}
-                includeSafeAreaPaddingBottom={false}
                 shouldShowOfflineIndicatorInWideScreen
             >
                 <HeaderWithBackButton title={translate(`workspace.multiConnectionSelector.title`, {connectionName: multiConnectionName})} />