From 5d2cb3b4f5e1cc658d75d292a7d4736022eb16b2 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Sat, 22 Feb 2025 11:24:26 +0100
Subject: [PATCH 01/51] feat: add flag to WorkspacePageWithSections component

---
 src/pages/workspace/WorkspacePageWithSections.tsx | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/pages/workspace/WorkspacePageWithSections.tsx b/src/pages/workspace/WorkspacePageWithSections.tsx
index e6bc5fed299b1..b2ed048301520 100644
--- a/src/pages/workspace/WorkspacePageWithSections.tsx
+++ b/src/pages/workspace/WorkspacePageWithSections.tsx
@@ -86,6 +86,11 @@ type WorkspacePageWithSectionsProps = WithPolicyAndFullscreenLoadingProps &
 
         /** Whether the page is loading, example any other API call in progres */
         isLoading?: boolean;
+
+        /**
+         * If enabled, the content will have a bottom padding equal to account for the safe bottom area inset.
+         */
+        addBottomSafeAreaPaddingToContent?: boolean;
     };
 
 function fetchData(policyID: string | undefined, skipVBBACal?: boolean) {
@@ -122,6 +127,7 @@ function WorkspacePageWithSections({
     shouldShowThreeDotsButton,
     threeDotsMenuItems,
     threeDotsAnchorPosition,
+    addBottomSafeAreaPaddingToContent = false,
 }: WorkspacePageWithSectionsProps) {
     const styles = useThemeStyles();
     const policyID = route.params?.policyID;
@@ -168,6 +174,7 @@ function WorkspacePageWithSections({
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={includeSafeAreaPaddingBottom}
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
             testID={testID ?? WorkspacePageWithSections.displayName}
@@ -201,6 +208,7 @@ function WorkspacePageWithSections({
                         {shouldUseScrollView ? (
                             <ScrollViewWithContext
                                 keyboardShouldPersistTaps="handled"
+                                addBottomSafeAreaPaddingToContent={addBottomSafeAreaPaddingToContent}
                                 style={[styles.settingsPageBackground, styles.flex1, styles.w100]}
                             >
                                 <View style={[styles.w100, styles.flex1]}>{content}</View>

From 4d4dc8c5651622f3112a29d4dc5a399d3267458c Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Sat, 22 Feb 2025 11:25:13 +0100
Subject: [PATCH 02/51] feat: enable edge-to-edge in WorkspaceInitialPage

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

diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 36713c5dce8f3..b487c4b9da818 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -432,6 +432,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
         <ScreenWrapper
             testID={WorkspaceInitialPage.displayName}
             includeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
             bottomContent={shouldShowBottomTab ? <BottomTabBar selectedTab={BOTTOM_TABS.SETTINGS} /> : null}
         >
             <FullPageNotFoundView

From 968ec7d15a872be8ba5bfc78ccd52b36f284df72 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Sat, 22 Feb 2025 11:25:21 +0100
Subject: [PATCH 03/51] feat: enable edge-to-edge in WorkspaceProfilePage

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

diff --git a/src/pages/workspace/WorkspaceProfilePage.tsx b/src/pages/workspace/WorkspaceProfilePage.tsx
index 0390d7cda4859..6a9e034370d33 100644
--- a/src/pages/workspace/WorkspaceProfilePage.tsx
+++ b/src/pages/workspace/WorkspaceProfilePage.tsx
@@ -185,6 +185,7 @@ function WorkspaceProfilePage({policyDraft, policy: policyProp, route}: Workspac
             icon={Illustrations.Building}
             shouldShowNotFoundPage={policy === undefined}
             onBackButtonPress={() => Navigation.goBack(backTo)}
+            addBottomSafeAreaPaddingToContent
         >
             {(hasVBA?: boolean) => (
                 <View style={[styles.flex1, styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>

From 26d803358601c10d2f055ae5685691b3eb46e3e3 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Sat, 22 Feb 2025 11:29:17 +0100
Subject: [PATCH 04/51] fix: simplify logical statement

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

diff --git a/src/pages/workspace/WorkspaceProfilePage.tsx b/src/pages/workspace/WorkspaceProfilePage.tsx
index 6a9e034370d33..87f7e8e3eca0d 100644
--- a/src/pages/workspace/WorkspaceProfilePage.tsx
+++ b/src/pages/workspace/WorkspaceProfilePage.tsx
@@ -220,7 +220,7 @@ function WorkspaceProfilePage({policyDraft, policy: policyProp, route}: Workspac
                                 styles.sectionMenuItemTopDescription,
                             ]}
                             editIconStyle={styles.smallEditIconWorkspace}
-                            isUsingDefaultAvatar={!policy?.avatarURL ?? false}
+                            isUsingDefaultAvatar={!policy?.avatarURL}
                             onImageSelected={(file) => {
                                 if (!policy?.id) {
                                     return;

From b114b0dbf40fba094094f5d64b2b854dd11ef942 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Sat, 22 Feb 2025 12:39:43 +0100
Subject: [PATCH 05/51] feat: improve `WorkspaceProfileDescriptionPage`

---
 src/pages/workspace/WorkspaceProfileDescriptionPage.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx b/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
index 54ee3c1753efd..367827bcae0fc 100644
--- a/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
+++ b/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
@@ -73,6 +73,8 @@ function WorkspaceProfileDescriptionPage({policy}: Props) {
             <ScreenWrapper
                 includeSafeAreaPaddingBottom
                 shouldEnableMaxHeight
+                enableEdgeToEdgeBottomSafeAreaPadding
+                keyboardShouldCompensateForBottomSafeAreaPadding
                 testID={WorkspaceProfileDescriptionPage.displayName}
             >
                 <HeaderWithBackButton
@@ -88,6 +90,8 @@ function WorkspaceProfileDescriptionPage({policy}: Props) {
                     onSubmit={submit}
                     validate={validate}
                     enabledWhenOffline
+                    addBottomSafeAreaPaddingToContent
+                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <InputWrapper

From fcb1680384b43de789bf3ec50076daa65071c320 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Sat, 22 Feb 2025 14:18:48 +0100
Subject: [PATCH 06/51] fix: migrate more screens

---
 src/pages/workspace/WorkspaceNamePage.tsx     |  4 +++-
 .../workspace/WorkspacePageWithSections.tsx   | 11 +++-------
 .../WorkspaceProfileCurrencyPage.tsx          |  3 ++-
 .../WorkspaceProfileDescriptionPage.tsx       |  3 +--
 src/pages/workspace/WorkspaceProfilePage.tsx  |  2 +-
 .../WorkspaceProfilePlanTypePage.tsx          | 21 ++++++++++---------
 6 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/pages/workspace/WorkspaceNamePage.tsx b/src/pages/workspace/WorkspaceNamePage.tsx
index f6e0450d93f2c..b591a1506c648 100644
--- a/src/pages/workspace/WorkspaceNamePage.tsx
+++ b/src/pages/workspace/WorkspaceNamePage.tsx
@@ -62,7 +62,8 @@ function WorkspaceNamePage({policy}: Props) {
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                keyboardShouldCompensateForBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={WorkspaceNamePage.displayName}
             >
@@ -79,6 +80,7 @@ function WorkspaceNamePage({policy}: Props) {
                     validate={validate}
                     onSubmit={submit}
                     enabledWhenOffline
+                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/WorkspacePageWithSections.tsx b/src/pages/workspace/WorkspacePageWithSections.tsx
index b2ed048301520..c6e022215e8ae 100644
--- a/src/pages/workspace/WorkspacePageWithSections.tsx
+++ b/src/pages/workspace/WorkspacePageWithSections.tsx
@@ -62,9 +62,6 @@ type WorkspacePageWithSectionsProps = WithPolicyAndFullscreenLoadingProps &
         /** Whether to show the not found page */
         shouldShowNotFoundPage?: boolean;
 
-        /** Whether to include safe area padding bottom or not */
-        includeSafeAreaPaddingBottom?: boolean;
-
         /** Makes firstRender ref display loading page before isLoading is change to true */
         showLoadingAsFirstRender?: boolean;
 
@@ -90,7 +87,7 @@ type WorkspacePageWithSectionsProps = WithPolicyAndFullscreenLoadingProps &
         /**
          * If enabled, the content will have a bottom padding equal to account for the safe bottom area inset.
          */
-        addBottomSafeAreaPaddingToContent?: boolean;
+        addBottomSafeAreaPadding?: boolean;
     };
 
 function fetchData(policyID: string | undefined, skipVBBACal?: boolean) {
@@ -117,7 +114,6 @@ function WorkspacePageWithSections({
     shouldShowBackButton = false,
     shouldShowLoading = true,
     shouldShowOfflineIndicatorInWideScreen = false,
-    includeSafeAreaPaddingBottom = false,
     shouldShowNonAdmin = false,
     headerContent,
     testID,
@@ -127,7 +123,7 @@ function WorkspacePageWithSections({
     shouldShowThreeDotsButton,
     threeDotsMenuItems,
     threeDotsAnchorPosition,
-    addBottomSafeAreaPaddingToContent = false,
+    addBottomSafeAreaPadding = false,
 }: WorkspacePageWithSectionsProps) {
     const styles = useThemeStyles();
     const policyID = route.params?.policyID;
@@ -173,7 +169,6 @@ function WorkspacePageWithSections({
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={includeSafeAreaPaddingBottom}
             enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
@@ -208,7 +203,7 @@ function WorkspacePageWithSections({
                         {shouldUseScrollView ? (
                             <ScrollViewWithContext
                                 keyboardShouldPersistTaps="handled"
-                                addBottomSafeAreaPaddingToContent={addBottomSafeAreaPaddingToContent}
+                                addBottomSafeAreaPadding={addBottomSafeAreaPadding}
                                 style={[styles.settingsPageBackground, styles.flex1, styles.w100]}
                             >
                                 <View style={[styles.w100, styles.flex1]}>{content}</View>
diff --git a/src/pages/workspace/WorkspaceProfileCurrencyPage.tsx b/src/pages/workspace/WorkspaceProfileCurrencyPage.tsx
index 5c0279714cf04..59c80ac31e391 100644
--- a/src/pages/workspace/WorkspaceProfileCurrencyPage.tsx
+++ b/src/pages/workspace/WorkspaceProfileCurrencyPage.tsx
@@ -43,7 +43,7 @@ function WorkspaceProfileCurrencyPage({policy}: WorkspaceProfileCurrencyPageProp
             fullPageNotFoundViewProps={{onLinkPress: goBackFromInvalidPolicy, subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 testID={WorkspaceProfileCurrencyPage.displayName}
             >
                 <HeaderWithBackButton
@@ -55,6 +55,7 @@ function WorkspaceProfileCurrencyPage({policy}: WorkspaceProfileCurrencyPageProp
                     searchInputLabel={translate('workspace.editor.currencyInputLabel')}
                     onSelect={onSelectCurrency}
                     initiallySelectedCurrencyCode={policy?.outputCurrency}
+                    addBottomSafeAreaPadding
                 />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx b/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
index 367827bcae0fc..a170cecc28694 100644
--- a/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
+++ b/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
@@ -71,7 +71,6 @@ function WorkspaceProfileDescriptionPage({policy}: Props) {
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
                 shouldEnableMaxHeight
                 enableEdgeToEdgeBottomSafeAreaPadding
                 keyboardShouldCompensateForBottomSafeAreaPadding
@@ -90,7 +89,7 @@ function WorkspaceProfileDescriptionPage({policy}: Props) {
                     onSubmit={submit}
                     validate={validate}
                     enabledWhenOffline
-                    addBottomSafeAreaPaddingToContent
+                    addBottomSafeAreaPadding
                     shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
diff --git a/src/pages/workspace/WorkspaceProfilePage.tsx b/src/pages/workspace/WorkspaceProfilePage.tsx
index 87f7e8e3eca0d..191cf85b117b7 100644
--- a/src/pages/workspace/WorkspaceProfilePage.tsx
+++ b/src/pages/workspace/WorkspaceProfilePage.tsx
@@ -185,7 +185,7 @@ function WorkspaceProfilePage({policyDraft, policy: policyProp, route}: Workspac
             icon={Illustrations.Building}
             shouldShowNotFoundPage={policy === undefined}
             onBackButtonPress={() => Navigation.goBack(backTo)}
-            addBottomSafeAreaPaddingToContent
+            addBottomSafeAreaPadding
         >
             {(hasVBA?: boolean) => (
                 <View style={[styles.flex1, styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
diff --git a/src/pages/workspace/WorkspaceProfilePlanTypePage.tsx b/src/pages/workspace/WorkspaceProfilePlanTypePage.tsx
index d05fcabd63382..7cdd721c3f1d2 100644
--- a/src/pages/workspace/WorkspaceProfilePlanTypePage.tsx
+++ b/src/pages/workspace/WorkspaceProfilePlanTypePage.tsx
@@ -4,7 +4,6 @@ import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import Button from '@components/Button';
-import FixedFooter from '@components/FixedFooter';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Icon from '@components/Icon';
@@ -104,6 +103,7 @@ function WorkspaceProfilePlanTypePage({policy}: WithPolicyProps) {
             <ScreenWrapper
                 testID={WorkspaceProfilePlanTypePage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
+                enableEdgeToEdgeBottomSafeAreaPadding
             >
                 <HeaderWithBackButton title={translate('workspace.common.planType')} />
                 {policy?.isLoading ? (
@@ -140,16 +140,17 @@ function WorkspaceProfilePlanTypePage({policy}: WithPolicyProps) {
                             shouldUpdateFocusedIndex
                             shouldSingleExecuteRowSelect
                             initiallyFocusedOptionKey={workspacePlanTypes.find((mode) => mode.isSelected)?.keyForList}
+                            addBottomSafeAreaPadding
+                            footerContent={
+                                <Button
+                                    success
+                                    large
+                                    text={isPlanTypeLocked ? translate('common.buttonConfirm') : translate('common.save')}
+                                    style={styles.mt6}
+                                    onPress={handleUpdatePlan}
+                                />
+                            }
                         />
-                        <FixedFooter>
-                            <Button
-                                success
-                                large
-                                text={isPlanTypeLocked ? translate('common.buttonConfirm') : translate('common.save')}
-                                style={styles.mt6}
-                                onPress={handleUpdatePlan}
-                            />
-                        </FixedFooter>
                     </>
                 )}
             </ScreenWrapper>

From b4b4fa04b82bae70b68a791f0b40e5af005f2f49 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Sat, 22 Feb 2025 15:29:20 +0100
Subject: [PATCH 07/51] Update WorkspaceInvitePage.tsx

---
 src/pages/workspace/WorkspaceInvitePage.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index eb81f9cf5d334..2f0ce7c8afc48 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -281,6 +281,7 @@ function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
     const footerContent = useMemo(
         () => (
             <FormAlertWithSubmitButton
+                // shouldBlendOpacity
                 isDisabled={!selectedOptions.length}
                 isAlertVisible={shouldShowAlertPrompt}
                 buttonText={translate('common.next')}
@@ -307,7 +308,8 @@ function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
                 shouldEnableMaxHeight
                 shouldUseCachedViewportHeight
                 testID={WorkspaceInvitePage.displayName}
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 onEntryTransitionEnd={() => setDidScreenTransitionEnd(true)}
             >
                 <HeaderWithBackButton
@@ -337,6 +339,9 @@ function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
                     shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
                     footerContent={footerContent}
                     isLoadingNewOptions={!!isSearchingForReports}
+                    contentContainerStyle={{paddingBottom: 80}}
+                    addBottomSafeAreaPadding
+                    shouldFooterContentStickToBottom
                 />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>

From 845e61fe2bff7b0fbec5ba249f9f708368dbe598 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Sat, 22 Feb 2025 15:36:15 +0100
Subject: [PATCH 08/51] fix: uncomment shouldBlendOpacity

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

diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index 2f0ce7c8afc48..f78029a5f2be3 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -281,7 +281,7 @@ function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
     const footerContent = useMemo(
         () => (
             <FormAlertWithSubmitButton
-                // shouldBlendOpacity
+                shouldBlendOpacity
                 isDisabled={!selectedOptions.length}
                 isAlertVisible={shouldShowAlertPrompt}
                 buttonText={translate('common.next')}

From d27fe134450b02fd54f6d88f99ad8bf6f544a0b5 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Sat, 22 Feb 2025 22:40:31 +0100
Subject: [PATCH 09/51] fix: enable on mWeb and disable on web

---
 src/pages/workspace/WorkspaceInvitePage.tsx | 28 +++++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index f78029a5f2be3..727b4a2e847d1 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -13,10 +13,12 @@ import type {WithNavigationTransitionEndProps} from '@components/withNavigationT
 import useDebouncedState from '@hooks/useDebouncedState';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ReportActions from '@libs/actions/Report';
 import {READ_COMMANDS} from '@libs/API/types';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import getPlatform from '@libs/getPlatform';
 import HttpUtils from '@libs/HttpUtils';
 import * as LoginUtils from '@libs/LoginUtils';
 import Navigation from '@libs/Navigation/Navigation';
@@ -40,6 +42,8 @@ import AccessOrNotFoundWrapper from './AccessOrNotFoundWrapper';
 import withPolicyAndFullscreenLoading from './withPolicyAndFullscreenLoading';
 import type {WithPolicyAndFullscreenLoadingProps} from './withPolicyAndFullscreenLoading';
 
+const FOOTER_BUTTON_CONTENT_PADDING = 80;
+
 type MembersSection = SectionListData<MemberForList, Section<MemberForList>>;
 
 type WorkspaceInvitePageProps = WithPolicyAndFullscreenLoadingProps &
@@ -49,6 +53,7 @@ type WorkspaceInvitePageProps = WithPolicyAndFullscreenLoadingProps &
 function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
     const [selectedOptions, setSelectedOptions] = useState<MemberForList[]>([]);
     const [personalDetails, setPersonalDetails] = useState<OptionData[]>([]);
@@ -278,10 +283,11 @@ function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
         return OptionsListUtils.getHeaderMessage(personalDetails.length !== 0, usersToInvite.length > 0, searchValue);
     }, [excludedUsers, translate, debouncedSearchTerm, policyName, usersToInvite, personalDetails.length]);
 
+    const shouldUseEdgeToEdgeLayout = useMemo(() => shouldUseNarrowLayout && getPlatform(true) !== CONST.PLATFORM.WEB, [shouldUseNarrowLayout]);
+
     const footerContent = useMemo(
         () => (
             <FormAlertWithSubmitButton
-                shouldBlendOpacity
                 isDisabled={!selectedOptions.length}
                 isAlertVisible={shouldShowAlertPrompt}
                 buttonText={translate('common.next')}
@@ -289,9 +295,21 @@ function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
                 message={policy?.alertMessage ?? ''}
                 containerStyles={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto]}
                 enabledWhenOffline
+                shouldBlendOpacity={shouldUseEdgeToEdgeLayout}
             />
         ),
-        [inviteUser, policy?.alertMessage, selectedOptions.length, shouldShowAlertPrompt, styles, translate],
+        [
+            inviteUser,
+            policy?.alertMessage,
+            selectedOptions.length,
+            shouldShowAlertPrompt,
+            shouldUseEdgeToEdgeLayout,
+            styles.flexBasisAuto,
+            styles.flexGrow0,
+            styles.flexReset,
+            styles.flexShrink0,
+            translate,
+        ],
     );
 
     useEffect(() => {
@@ -339,9 +357,9 @@ function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
                     shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
                     footerContent={footerContent}
                     isLoadingNewOptions={!!isSearchingForReports}
-                    contentContainerStyle={{paddingBottom: 80}}
-                    addBottomSafeAreaPadding
-                    shouldFooterContentStickToBottom
+                    contentContainerStyle={shouldUseEdgeToEdgeLayout && {paddingBottom: FOOTER_BUTTON_CONTENT_PADDING}}
+                    addBottomSafeAreaPadding={shouldUseEdgeToEdgeLayout}
+                    shouldFooterContentStickToBottom={shouldUseEdgeToEdgeLayout}
                 />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>

From 494a998dab97c261c17f7b7c2ffb267e27326eb2 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Sun, 23 Feb 2025 00:13:25 +0100
Subject: [PATCH 10/51] feat: migrate more workspace screens

---
 src/components/CategoryPicker.tsx             |  18 +-
 .../CategorySelectorModal.tsx                 |   4 +-
 src/components/InteractiveStepWrapper.tsx     |  17 ++
 src/components/TaxPicker.tsx                  |  18 +-
 .../WorkspaceMemberRoleSelectionModal.tsx     |   2 +
 .../workspace/WorkspaceProfileSharePage.tsx   |  10 +-
 .../distanceRates/CreateDistanceRatePage.tsx  |   3 +-
 .../PolicyDistanceRateDetailsPage.tsx         |   7 +-
 .../PolicyDistanceRateEditPage.tsx            |   3 +-
 .../PolicyDistanceRateTaxRateEditPage.tsx     |  28 +-
 ...licyDistanceRateTaxReclaimableEditPage.tsx |   3 +-
 .../PolicyDistanceRatesSettingsPage.tsx       |   3 +-
 .../UnitSelector/UnitSelectorModal.tsx        |   2 +-
 .../expensifyCard/issueNew/AssigneeStep.tsx   |   2 +
 .../expensifyCard/issueNew/CardNameStep.tsx   |   4 +
 .../expensifyCard/issueNew/CardTypeStep.tsx   |   1 +
 .../issueNew/ConfirmationStep.tsx             |   1 +
 .../issueNew/IssueNewCardPage.tsx             |   2 +-
 .../expensifyCard/issueNew/LimitStep.tsx      |   2 +
 .../expensifyCard/issueNew/LimitTypeStep.tsx  |  19 +-
 .../members/WorkspaceMemberDetailsPage.tsx    | 249 +++++++++---------
 .../WorkspaceTaxesSettingsForeignCurrency.tsx |  26 +-
 ...orkspaceTaxesSettingsWorkspaceCurrency.tsx |  26 +-
 23 files changed, 246 insertions(+), 204 deletions(-)

diff --git a/src/components/CategoryPicker.tsx b/src/components/CategoryPicker.tsx
index f8e9e836c736b..4c3de2eb367a9 100644
--- a/src/components/CategoryPicker.tsx
+++ b/src/components/CategoryPicker.tsx
@@ -1,4 +1,5 @@
 import React, {useMemo} from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import useDebouncedState from '@hooks/useDebouncedState';
 import useLocalize from '@hooks/useLocalize';
@@ -17,9 +18,21 @@ type CategoryPickerProps = {
     policyID: string | undefined;
     selectedCategory?: string;
     onSubmit: (item: ListItem) => void;
+
+    /**
+     * If enabled, the content will have a bottom padding equal to account for the safe bottom area inset.
+     */
+    addBottomSafeAreaPadding?: boolean;
+
+    /**
+     * Temporarily needed until modal safe area handling is enabled
+     * TODO BottomSafeArea: remove both of these props
+     */
+    includeSafeAreaPaddingBottom?: boolean;
+    contentContainerStyle?: StyleProp<ViewStyle>;
 };
 
-function CategoryPicker({selectedCategory, policyID, onSubmit}: CategoryPickerProps) {
+function CategoryPicker({selectedCategory, policyID, onSubmit, addBottomSafeAreaPadding = false, includeSafeAreaPaddingBottom, contentContainerStyle}: CategoryPickerProps) {
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
     const [policyCategoriesDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyID}`);
     const [policyRecentlyUsedCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${policyID}`);
@@ -76,6 +89,9 @@ function CategoryPicker({selectedCategory, policyID, onSubmit}: CategoryPickerPr
             ListItem={RadioListItem}
             initiallyFocusedOptionKey={selectedOptionKey ?? undefined}
             isRowMultilineSupported
+            addBottomSafeAreaPadding={addBottomSafeAreaPadding}
+            includeSafeAreaPaddingBottom={includeSafeAreaPaddingBottom}
+            contentContainerStyle={contentContainerStyle}
         />
     );
 }
diff --git a/src/components/CategorySelector/CategorySelectorModal.tsx b/src/components/CategorySelector/CategorySelectorModal.tsx
index f12a52dbb3145..3eabe7a58f9c1 100644
--- a/src/components/CategorySelector/CategorySelectorModal.tsx
+++ b/src/components/CategorySelector/CategorySelectorModal.tsx
@@ -42,7 +42,7 @@ function CategorySelectorModal({policyID, isVisible, currentCategory, onCategory
             <ScreenWrapper
                 style={[styles.pb0]}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableKeyboardAvoidingView={false}
                 testID={CategorySelectorModal.displayName}
             >
@@ -55,6 +55,8 @@ function CategorySelectorModal({policyID, isVisible, currentCategory, onCategory
                     policyID={policyID}
                     selectedCategory={currentCategory}
                     onSubmit={onCategorySelected}
+                    contentContainerStyle={styles.pb5}
+                    includeSafeAreaPaddingBottom={false}
                 />
             </ScreenWrapper>
         </Modal>
diff --git a/src/components/InteractiveStepWrapper.tsx b/src/components/InteractiveStepWrapper.tsx
index 9d094af0bf262..e4346f69c0c9f 100644
--- a/src/components/InteractiveStepWrapper.tsx
+++ b/src/components/InteractiveStepWrapper.tsx
@@ -43,6 +43,19 @@ type InteractiveStepWrapperProps = {
 
     // Offline indicator style
     offlineIndicatorStyle?: StyleProp<ViewStyle>;
+
+    /**
+     * Whether the KeyboardAvoidingView should compensate for the bottom safe area padding.
+     * The KeyboardAvoidingView will use a negative keyboardVerticalOffset.
+     */
+    shouldKeyboardOffsetBottomSafeAreaPadding?: boolean;
+
+    /**
+     * Temporary flag to disable safe area bottom spacing in the ScreenWrapper and to allow edge-to-edge content
+     * The ScreenWrapper should not always apply bottom safe area padding, instead it should be applied to the scrollable/bottom-docked content directly.
+     * This flag can be removed, once all components/screens have switched to edge-to-edge safe area handling.
+     */
+    enableEdgeToEdgeBottomSafeAreaPadding?: boolean;
 };
 
 function InteractiveStepWrapper(
@@ -59,6 +72,8 @@ function InteractiveStepWrapper(
         shouldEnablePickerAvoiding = false,
         guidesCallTaskID,
         offlineIndicatorStyle,
+        shouldKeyboardOffsetBottomSafeAreaPadding,
+        enableEdgeToEdgeBottomSafeAreaPadding,
     }: InteractiveStepWrapperProps,
     ref: React.ForwardedRef<View>,
 ) {
@@ -69,10 +84,12 @@ function InteractiveStepWrapper(
             ref={ref}
             testID={wrapperID}
             includeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding={enableEdgeToEdgeBottomSafeAreaPadding}
             shouldEnablePickerAvoiding={shouldEnablePickerAvoiding}
             shouldEnableMaxHeight={shouldEnableMaxHeight}
             shouldShowOfflineIndicator={shouldShowOfflineIndicator}
             offlineIndicatorStyle={offlineIndicatorStyle}
+            shouldKeyboardOffsetBottomSafeAreaPadding={shouldKeyboardOffsetBottomSafeAreaPadding}
         >
             <HeaderWithBackButton
                 title={headerTitle}
diff --git a/src/components/TaxPicker.tsx b/src/components/TaxPicker.tsx
index 4cb92eda3f100..c4f44380660cc 100644
--- a/src/components/TaxPicker.tsx
+++ b/src/components/TaxPicker.tsx
@@ -1,9 +1,7 @@
 import React, {useCallback, useMemo, useState} from 'react';
 import {useOnyx} from 'react-native-onyx';
-import type {EdgeInsets} from 'react-native-safe-area-context';
 import type {ValueOf} from 'type-fest';
 import useLocalize from '@hooks/useLocalize';
-import useStyleUtils from '@hooks/useStyleUtils';
 import * as IOUUtils from '@libs/IOUUtils';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as TaxOptionsListUtils from '@libs/TaxOptionsListUtils';
@@ -25,12 +23,6 @@ type TaxPickerProps = {
     /** ID of the transaction */
     transactionID?: string;
 
-    /**
-     * Safe area insets required for reflecting the portion of the view,
-     * that is not covered by navigation bars, tab bars, toolbars, and other ancestor views.
-     */
-    insets?: EdgeInsets;
-
     /** Callback to fire when a tax is pressed */
     onSubmit: (tax: TaxOptionsListUtils.TaxRatesOption) => void;
 
@@ -41,10 +33,14 @@ type TaxPickerProps = {
     iouType?: ValueOf<typeof CONST.IOU.TYPE>;
 
     onDismiss: () => void;
+
+    /**
+     * If enabled, the content will have a bottom padding equal to account for the safe bottom area inset.
+     */
+    addBottomSafeAreaPadding?: boolean;
 };
 
-function TaxPicker({selectedTaxRate = '', policyID, transactionID, insets, onSubmit, action, iouType, onDismiss}: TaxPickerProps) {
-    const StyleUtils = useStyleUtils();
+function TaxPicker({selectedTaxRate = '', policyID, transactionID, onSubmit, action, iouType, onDismiss, addBottomSafeAreaPadding}: TaxPickerProps) {
     const {translate} = useLocalize();
     const [searchValue, setSearchValue] = useState('');
     const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`);
@@ -120,7 +116,7 @@ function TaxPicker({selectedTaxRate = '', policyID, transactionID, insets, onSub
             ListItem={RadioListItem}
             initiallyFocusedOptionKey={selectedOptionKey ?? undefined}
             isRowMultilineSupported
-            containerStyle={{paddingBottom: StyleUtils.getSafeAreaMargins(insets).marginBottom}}
+            addBottomSafeAreaPadding={addBottomSafeAreaPadding}
         />
     );
 }
diff --git a/src/pages/workspace/WorkspaceMemberRoleSelectionModal.tsx b/src/pages/workspace/WorkspaceMemberRoleSelectionModal.tsx
index 47930660b00e1..66b865c02e748 100644
--- a/src/pages/workspace/WorkspaceMemberRoleSelectionModal.tsx
+++ b/src/pages/workspace/WorkspaceMemberRoleSelectionModal.tsx
@@ -48,6 +48,7 @@ function WorkspaceMemberDetailsRoleSelectionModal({isVisible, items, onRoleChang
             <ScreenWrapper
                 testID={WorkspaceMemberDetailsRoleSelectionModal.displayName}
                 includePaddingTop={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
             >
                 <HeaderWithBackButton
                     title={translate('common.role')}
@@ -61,6 +62,7 @@ function WorkspaceMemberDetailsRoleSelectionModal({isVisible, items, onRoleChang
                         isAlternateTextMultilineSupported
                         shouldSingleExecuteRowSelect
                         initiallyFocusedOptionKey={items.find((item) => item.isSelected)?.keyForList}
+                        addBottomSafeAreaPadding
                     />
                 </View>
             </ScreenWrapper>
diff --git a/src/pages/workspace/WorkspaceProfileSharePage.tsx b/src/pages/workspace/WorkspaceProfileSharePage.tsx
index 7d6e73009a9ce..2f9d93df761dc 100644
--- a/src/pages/workspace/WorkspaceProfileSharePage.tsx
+++ b/src/pages/workspace/WorkspaceProfileSharePage.tsx
@@ -70,12 +70,16 @@ function WorkspaceProfileSharePage({policy}: WithPolicyProps) {
             <ScreenWrapper
                 testID={WorkspaceProfileSharePage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
+                enableEdgeToEdgeBottomSafeAreaPadding
             >
                 <HeaderWithBackButton
                     title={translate('common.share')}
                     onBackButtonPress={Navigation.goBack}
                 />
-                <ScrollView style={[themeStyles.flex1, themeStyles.pt3]}>
+                <ScrollView
+                    style={[themeStyles.flex1, themeStyles.pt3]}
+                    addBottomSafeAreaPadding
+                >
                     <View style={[themeStyles.flex1, shouldUseNarrowLayout ? themeStyles.workspaceSectionMobile : themeStyles.workspaceSection]}>
                         <View style={[themeStyles.mh5]}>
                             <Text style={[themeStyles.textHeadlineH1, themeStyles.mb2]}>{translate('workspace.common.shareNote.header')}</Text>
@@ -122,8 +126,8 @@ function WorkspaceProfileSharePage({policy}: WithPolicyProps) {
                                 shouldLimitWidth={false}
                                 wrapperStyle={themeStyles.sectionMenuItemTopDescription}
                             />
-                            {/* Remove this once https://github.com/Expensify/App/issues/19834 is done. 
-                            We shouldn't introduce platform specific code in our codebase. 
+                            {/* Remove this once https://github.com/Expensify/App/issues/19834 is done.
+                            We shouldn't introduce platform specific code in our codebase.
                             This is a temporary solution while Web is not supported for the QR code download feature */}
                             {shouldAllowDownloadQRCode && (
                                 <MenuItem
diff --git a/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx b/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx
index 156f941804ec8..32442a13e2a58 100644
--- a/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx
+++ b/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx
@@ -65,7 +65,7 @@ function CreateDistanceRatePage({route}: CreateDistanceRatePageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={CreateDistanceRatePage.displayName}
                 shouldEnableMaxHeight
@@ -82,6 +82,7 @@ function CreateDistanceRatePage({route}: CreateDistanceRatePageProps) {
                         shouldHideFixErrorsAlert
                         submitFlexEnabled={false}
                         submitButtonStyles={[styles.mh5, styles.mt0]}
+                        addBottomSafeAreaPadding
                     >
                         <InputWrapperWithRef
                             InputComponent={AmountForm}
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx
index 4142e65cf35e1..a3a2058740dbb 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx
@@ -99,11 +99,14 @@ function PolicyDistanceRateDetailsPage({route}: PolicyDistanceRateDetailsPagePro
         >
             <ScreenWrapper
                 testID={PolicyDistanceRateDetailsPage.displayName}
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
             >
                 <HeaderWithBackButton title={`${rateValueToDisplay} / ${translate(`common.${customUnit?.attributes?.unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES}`)}`} />
-                <ScrollView contentContainerStyle={styles.flexGrow1}>
+                <ScrollView
+                    contentContainerStyle={styles.flexGrow1}
+                    addBottomSafeAreaPadding
+                >
                     <OfflineWithFeedback
                         errors={ErrorUtils.getLatestErrorField(rate ?? {}, 'enabled')}
                         pendingAction={rate?.pendingFields?.enabled}
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx
index 2266a2254d403..15b789cb0c775 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx
@@ -67,7 +67,7 @@ function PolicyDistanceRateEditPage({route}: PolicyDistanceRateEditPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={PolicyDistanceRateEditPage.displayName}
                 shouldEnableMaxHeight
@@ -87,6 +87,7 @@ function PolicyDistanceRateEditPage({route}: PolicyDistanceRateEditPageProps) {
                     shouldHideFixErrorsAlert
                     submitFlexEnabled={false}
                     submitButtonStyles={[styles.mh5, styles.mt0]}
+                    addBottomSafeAreaPadding
                 >
                     <InputWrapperWithRef
                         InputComponent={AmountForm}
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx
index c400b200a5cb3..fd4e31942d3ee 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx
@@ -61,26 +61,22 @@ function PolicyDistanceRateTaxRateEditPage({route, policy}: PolicyDistanceRateTa
             featureName={CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 shouldEnableMaxHeight
                 testID={PolicyDistanceRateTaxRateEditPage.displayName}
             >
-                {({insets}) => (
-                    <>
-                        <HeaderWithBackButton
-                            title={translate('workspace.taxes.taxRate')}
-                            shouldShowBackButton
-                        />
-                        <TaxPicker
-                            selectedTaxRate={selectedTaxRate}
-                            policyID={policyID}
-                            insets={insets}
-                            onSubmit={onTaxRateChange}
-                            onDismiss={dismiss}
-                        />
-                    </>
-                )}
+                <HeaderWithBackButton
+                    title={translate('workspace.taxes.taxRate')}
+                    shouldShowBackButton
+                />
+                <TaxPicker
+                    selectedTaxRate={selectedTaxRate}
+                    policyID={policyID}
+                    onSubmit={onTaxRateChange}
+                    onDismiss={dismiss}
+                    addBottomSafeAreaPadding
+                />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateTaxReclaimableEditPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateTaxReclaimableEditPage.tsx
index fd62217f6572c..6fc8b3a11f955 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRateTaxReclaimableEditPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRateTaxReclaimableEditPage.tsx
@@ -67,7 +67,7 @@ function PolicyDistanceRateTaxReclaimableEditPage({route, policy}: PolicyDistanc
             featureName={CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={PolicyDistanceRateTaxReclaimableEditPage.displayName}
                 shouldEnableMaxHeight
@@ -86,6 +86,7 @@ function PolicyDistanceRateTaxReclaimableEditPage({route, policy}: PolicyDistanc
                     shouldHideFixErrorsAlert
                     submitFlexEnabled={false}
                     submitButtonStyles={[styles.mh5, styles.mt0]}
+                    addBottomSafeAreaPadding
                 >
                     <InputWrapperWithRef
                         InputComponent={AmountForm}
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx
index 1f1d9b2710026..010fd782fb9ae 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx
@@ -90,7 +90,7 @@ function PolicyDistanceRatesSettingsPage({route}: PolicyDistanceRatesSettingsPag
             featureName={CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={PolicyDistanceRatesSettingsPage.displayName}
             >
@@ -99,6 +99,7 @@ function PolicyDistanceRatesSettingsPage({route}: PolicyDistanceRatesSettingsPag
                     <ScrollView
                         contentContainerStyle={styles.flexGrow1}
                         keyboardShouldPersistTaps="always"
+                        addBottomSafeAreaPadding
                     >
                         <View>
                             {!!defaultUnit && (
diff --git a/src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx b/src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx
index 34eb21ce19c46..999f6e47edf2e 100644
--- a/src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx
+++ b/src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx
@@ -40,7 +40,7 @@ function UnitSelectorModal({isVisible, currentUnit, onUnitSelected, onClose, lab
             <ScreenWrapper
                 style={[styles.pb0]}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 testID={UnitSelectorModal.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/workspace/expensifyCard/issueNew/AssigneeStep.tsx b/src/pages/workspace/expensifyCard/issueNew/AssigneeStep.tsx
index f6841113b7066..e8978af095c6d 100644
--- a/src/pages/workspace/expensifyCard/issueNew/AssigneeStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/AssigneeStep.tsx
@@ -141,6 +141,7 @@ function AssigneeStep({policy}: AssigneeStepProps) {
             handleBackButtonPress={handleBackButtonPress}
             startStepIndex={0}
             stepNames={CONST.EXPENSIFY_CARD.STEP_NAMES}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.whoNeedsCard')}</Text>
             <SelectionList
@@ -151,6 +152,7 @@ function AssigneeStep({policy}: AssigneeStepProps) {
                 headerMessage={headerMessage}
                 ListItem={UserListItem}
                 onSelectRow={submit}
+                addBottomSafeAreaPadding
             />
         </InteractiveStepWrapper>
     );
diff --git a/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx b/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
index 81ac308b746b3..51e028ba7f437 100644
--- a/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
@@ -75,6 +75,8 @@ function CardNameStep({policyID}: CardNameStepProps) {
             handleBackButtonPress={handleBackButtonPress}
             startStepIndex={4}
             stepNames={CONST.EXPENSIFY_CARD.STEP_NAMES}
+            shouldKeyboardOffsetBottomSafeAreaPadding
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.giveItName')}</Text>
             <FormProvider
@@ -84,6 +86,8 @@ function CardNameStep({policyID}: CardNameStepProps) {
                 validate={validate}
                 style={[styles.mh5, styles.flexGrow1]}
                 enabledWhenOffline
+                addBottomSafeAreaPadding
+                shouldSubmitButtonStickToBottom
             >
                 <InputWrapper
                     InputComponent={TextInput}
diff --git a/src/pages/workspace/expensifyCard/issueNew/CardTypeStep.tsx b/src/pages/workspace/expensifyCard/issueNew/CardTypeStep.tsx
index cd56d7b3dd561..54ac1a5d8c1b2 100644
--- a/src/pages/workspace/expensifyCard/issueNew/CardTypeStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/CardTypeStep.tsx
@@ -54,6 +54,7 @@ function CardTypeStep({policyID}: CardTypeStepProps) {
             handleBackButtonPress={handleBackButtonPress}
             startStepIndex={1}
             stepNames={CONST.EXPENSIFY_CARD.STEP_NAMES}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.chooseCardType')}</Text>
             <View style={styles.mh5}>
diff --git a/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx b/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx
index d5f60a04c9a97..8ae9f2ea3ba41 100644
--- a/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx
@@ -91,6 +91,7 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
             <ScrollView
                 style={styles.pt0}
                 contentContainerStyle={styles.flexGrow1}
+                addBottomSafeAreaPadding
             >
                 <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mt3]}>{translate('workspace.card.issueNewCard.letsDoubleCheck')}</Text>
                 <Text style={[styles.textSupporting, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.willBeReady')}</Text>
diff --git a/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx b/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx
index db86cbe64228b..e9b460d5dc607 100644
--- a/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx
@@ -61,7 +61,7 @@ function IssueNewCardPage({policy, route}: IssueNewCardPageProps) {
         return (
             <ScreenWrapper
                 testID={IssueNewCardPage.displayName}
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnablePickerAvoiding={false}
             >
                 <DelegateNoAccessWrapper
diff --git a/src/pages/workspace/expensifyCard/issueNew/LimitStep.tsx b/src/pages/workspace/expensifyCard/issueNew/LimitStep.tsx
index 84b607bc406f2..65cde6aab5a18 100644
--- a/src/pages/workspace/expensifyCard/issueNew/LimitStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/LimitStep.tsx
@@ -77,6 +77,7 @@ function LimitStep({policyID}: LimitStepProps) {
             handleBackButtonPress={handleBackButtonPress}
             startStepIndex={3}
             stepNames={CONST.EXPENSIFY_CARD.STEP_NAMES}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.setLimit')}</Text>
             <FormProvider
@@ -90,6 +91,7 @@ function LimitStep({policyID}: LimitStepProps) {
                 disablePressOnEnter={false}
                 validate={validate}
                 enabledWhenOffline
+                addBottomSafeAreaPadding
             >
                 <InputWrapper
                     InputComponent={AmountForm}
diff --git a/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx b/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
index 1f5cbad3f63be..0df9f76d44f77 100644
--- a/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
@@ -91,6 +91,7 @@ function LimitTypeStep({policy}: LimitTypeStepProps) {
             handleBackButtonPress={handleBackButtonPress}
             startStepIndex={2}
             stepNames={CONST.EXPENSIFY_CARD.STEP_NAMES}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.chooseLimitType')}</Text>
             <SelectionList
@@ -101,14 +102,16 @@ function LimitTypeStep({policy}: LimitTypeStepProps) {
                 initiallyFocusedOptionKey={typeSelected}
                 shouldUpdateFocusedIndex
                 isAlternateTextMultilineSupported
-            />
-            <Button
-                success
-                large
-                pressOnEnter
-                text={translate(isEditing ? 'common.confirm' : 'common.next')}
-                onPress={submit}
-                style={styles.m5}
+                addBottomSafeAreaPadding
+                footerContent={
+                    <Button
+                        success
+                        large
+                        pressOnEnter
+                        text={translate(isEditing ? 'common.confirm' : 'common.next')}
+                        onPress={submit}
+                    />
+                }
             />
         </InteractiveStepWrapper>
     );
diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
index 32513e6db3c77..f9ae2bca9b147 100644
--- a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
@@ -268,135 +268,132 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
             policyID={policyID}
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
         >
-            <ScreenWrapper testID={WorkspaceMemberDetailsPage.displayName}>
-                {({safeAreaPaddingBottomStyle}) => (
-                    <>
-                        <HeaderWithBackButton
-                            title={displayName}
-                            subtitle={policy?.name}
-                        />
-                        <ScrollView contentContainerStyle={safeAreaPaddingBottomStyle}>
-                            <View style={[styles.containerWithSpaceBetween, styles.pointerEventsBoxNone, styles.justifyContentStart]}>
-                                <View style={[styles.avatarSectionWrapper, styles.pb0]}>
-                                    <OfflineWithFeedback pendingAction={details.pendingFields?.avatar}>
-                                        <Avatar
-                                            containerStyles={[styles.avatarXLarge, styles.mv5, styles.noOutline]}
-                                            imageStyles={[styles.avatarXLarge]}
-                                            source={details.avatar}
-                                            avatarID={accountID}
-                                            type={CONST.ICON_TYPE_AVATAR}
-                                            size={CONST.AVATAR_SIZE.XLARGE}
-                                            fallbackIcon={fallbackIcon}
-                                        />
-                                    </OfflineWithFeedback>
-                                    {!!(details.displayName ?? '') && (
-                                        <Text
-                                            style={[styles.textHeadline, styles.pre, styles.mb6, styles.w100, styles.textAlignCenter]}
-                                            numberOfLines={1}
-                                        >
-                                            {displayName}
-                                        </Text>
-                                    )}
-                                    {isSelectedMemberOwner && isCurrentUserAdmin && !isCurrentUserOwner ? (
-                                        shouldRenderTransferOwnerButton() && (
-                                            <ButtonDisabledWhenOffline
-                                                text={translate('workspace.people.transferOwner')}
-                                                onPress={startChangeOwnershipFlow}
-                                                icon={Expensicons.Transfer}
-                                                iconStyles={StyleUtils.getTransformScaleStyle(0.8)}
-                                                style={styles.mv5}
-                                            />
-                                        )
-                                    ) : (
-                                        <Button
-                                            text={translate('workspace.people.removeWorkspaceMemberButtonTitle')}
-                                            onPress={askForConfirmationToRemove}
-                                            isDisabled={isSelectedMemberOwner || isSelectedMemberCurrentUser}
-                                            icon={Expensicons.RemoveMembers}
-                                            iconStyles={StyleUtils.getTransformScaleStyle(0.8)}
-                                            style={styles.mv5}
-                                        />
-                                    )}
-                                    <ConfirmModal
-                                        danger
-                                        title={translate('workspace.people.removeMemberTitle')}
-                                        isVisible={isRemoveMemberConfirmModalVisible}
-                                        onConfirm={removeUser}
-                                        onCancel={() => setIsRemoveMemberConfirmModalVisible(false)}
-                                        prompt={confirmModalPrompt}
-                                        confirmText={translate('common.remove')}
-                                        cancelText={translate('common.cancel')}
-                                    />
-                                </View>
-                                <View style={styles.w100}>
-                                    <MenuItemWithTopDescription
-                                        disabled={isSelectedMemberOwner || isSelectedMemberCurrentUser}
-                                        title={translate(`workspace.common.roleName`, {role: member?.role})}
-                                        description={translate('common.role')}
-                                        shouldShowRightIcon
-                                        onPress={openRoleSelectionModal}
+            <ScreenWrapper
+                testID={WorkspaceMemberDetailsPage.displayName}
+                enableEdgeToEdgeBottomSafeAreaPadding
+            >
+                <HeaderWithBackButton
+                    title={displayName}
+                    subtitle={policy?.name}
+                />
+                <ScrollView addBottomSafeAreaPadding>
+                    <View style={[styles.containerWithSpaceBetween, styles.pointerEventsBoxNone, styles.justifyContentStart]}>
+                        <View style={[styles.avatarSectionWrapper, styles.pb0]}>
+                            <OfflineWithFeedback pendingAction={details.pendingFields?.avatar}>
+                                <Avatar
+                                    containerStyles={[styles.avatarXLarge, styles.mv5, styles.noOutline]}
+                                    imageStyles={[styles.avatarXLarge]}
+                                    source={details.avatar}
+                                    avatarID={accountID}
+                                    type={CONST.ICON_TYPE_AVATAR}
+                                    size={CONST.AVATAR_SIZE.XLARGE}
+                                    fallbackIcon={fallbackIcon}
+                                />
+                            </OfflineWithFeedback>
+                            {!!(details.displayName ?? '') && (
+                                <Text
+                                    style={[styles.textHeadline, styles.pre, styles.mb6, styles.w100, styles.textAlignCenter]}
+                                    numberOfLines={1}
+                                >
+                                    {displayName}
+                                </Text>
+                            )}
+                            {isSelectedMemberOwner && isCurrentUserAdmin && !isCurrentUserOwner ? (
+                                shouldRenderTransferOwnerButton() && (
+                                    <ButtonDisabledWhenOffline
+                                        text={translate('workspace.people.transferOwner')}
+                                        onPress={startChangeOwnershipFlow}
+                                        icon={Expensicons.Transfer}
+                                        iconStyles={StyleUtils.getTransformScaleStyle(0.8)}
+                                        style={styles.mv5}
                                     />
+                                )
+                            ) : (
+                                <Button
+                                    text={translate('workspace.people.removeWorkspaceMemberButtonTitle')}
+                                    onPress={askForConfirmationToRemove}
+                                    isDisabled={isSelectedMemberOwner || isSelectedMemberCurrentUser}
+                                    icon={Expensicons.RemoveMembers}
+                                    iconStyles={StyleUtils.getTransformScaleStyle(0.8)}
+                                    style={styles.mv5}
+                                />
+                            )}
+                            <ConfirmModal
+                                danger
+                                title={translate('workspace.people.removeMemberTitle')}
+                                isVisible={isRemoveMemberConfirmModalVisible}
+                                onConfirm={removeUser}
+                                onCancel={() => setIsRemoveMemberConfirmModalVisible(false)}
+                                prompt={confirmModalPrompt}
+                                confirmText={translate('common.remove')}
+                                cancelText={translate('common.cancel')}
+                            />
+                        </View>
+                        <View style={styles.w100}>
+                            <MenuItemWithTopDescription
+                                disabled={isSelectedMemberOwner || isSelectedMemberCurrentUser}
+                                title={translate(`workspace.common.roleName`, {role: member?.role})}
+                                description={translate('common.role')}
+                                shouldShowRightIcon
+                                onPress={openRoleSelectionModal}
+                            />
+                            <MenuItem
+                                style={styles.mb5}
+                                title={translate('common.profile')}
+                                icon={Expensicons.Info}
+                                onPress={navigateToProfile}
+                                shouldShowRightIcon
+                            />
+                            <WorkspaceMemberDetailsRoleSelectionModal
+                                isVisible={isRoleSelectionModalVisible}
+                                items={roleItems}
+                                onRoleChange={changeRole}
+                                onClose={() => setIsRoleSelectionModalVisible(false)}
+                            />
+                            {shouldShowCardsSection && (
+                                <>
+                                    <View style={[styles.ph5, styles.pv3]}>
+                                        <Text style={StyleUtils.combineStyles([styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting])}>
+                                            {translate('walletPage.assignedCards')}
+                                        </Text>
+                                    </View>
+                                    {memberCards.map((memberCard) => {
+                                        const isCardDeleted = memberCard.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+                                        return (
+                                            <OfflineWithFeedback
+                                                key={`${memberCard.nameValuePairs?.cardTitle}_${memberCard.cardID}`}
+                                                errorRowStyles={styles.ph5}
+                                                errors={memberCard.errors}
+                                                pendingAction={memberCard.pendingAction}
+                                            >
+                                                <MenuItem
+                                                    key={memberCard.cardID}
+                                                    title={memberCard.nameValuePairs?.cardTitle ?? maskCardNumber(memberCard?.cardName ?? '', memberCard.bank)}
+                                                    badgeText={memberCard.bank === CONST.EXPENSIFY_CARD.BANK ? convertToDisplayString(memberCard.nameValuePairs?.unapprovedExpenseLimit) : ''}
+                                                    icon={getCardFeedIcon(memberCard.bank as CompanyCardFeed)}
+                                                    displayInDefaultIconColor
+                                                    iconStyles={styles.cardIcon}
+                                                    iconWidth={variables.cardIconWidth}
+                                                    iconHeight={variables.cardIconHeight}
+                                                    onPress={() => navigateToDetails(memberCard)}
+                                                    shouldRemoveHoverBackground={isCardDeleted}
+                                                    disabled={isCardDeleted}
+                                                    shouldShowRightIcon={!isCardDeleted}
+                                                    style={[isCardDeleted ? styles.offlineFeedback.deleted : {}]}
+                                                />
+                                            </OfflineWithFeedback>
+                                        );
+                                    })}
                                     <MenuItem
-                                        style={styles.mb5}
-                                        title={translate('common.profile')}
-                                        icon={Expensicons.Info}
-                                        onPress={navigateToProfile}
-                                        shouldShowRightIcon
-                                    />
-                                    <WorkspaceMemberDetailsRoleSelectionModal
-                                        isVisible={isRoleSelectionModalVisible}
-                                        items={roleItems}
-                                        onRoleChange={changeRole}
-                                        onClose={() => setIsRoleSelectionModalVisible(false)}
+                                        title={translate('workspace.expensifyCard.newCard')}
+                                        icon={Expensicons.Plus}
+                                        onPress={handleIssueNewCard}
                                     />
-                                    {shouldShowCardsSection && (
-                                        <>
-                                            <View style={[styles.ph5, styles.pv3]}>
-                                                <Text style={StyleUtils.combineStyles([styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting])}>
-                                                    {translate('walletPage.assignedCards')}
-                                                </Text>
-                                            </View>
-                                            {memberCards.map((memberCard) => {
-                                                const isCardDeleted = memberCard.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-                                                return (
-                                                    <OfflineWithFeedback
-                                                        key={`${memberCard.nameValuePairs?.cardTitle}_${memberCard.cardID}`}
-                                                        errorRowStyles={styles.ph5}
-                                                        errors={memberCard.errors}
-                                                        pendingAction={memberCard.pendingAction}
-                                                    >
-                                                        <MenuItem
-                                                            key={memberCard.cardID}
-                                                            title={memberCard.nameValuePairs?.cardTitle ?? maskCardNumber(memberCard?.cardName ?? '', memberCard.bank)}
-                                                            badgeText={
-                                                                memberCard.bank === CONST.EXPENSIFY_CARD.BANK ? convertToDisplayString(memberCard.nameValuePairs?.unapprovedExpenseLimit) : ''
-                                                            }
-                                                            icon={getCardFeedIcon(memberCard.bank as CompanyCardFeed)}
-                                                            displayInDefaultIconColor
-                                                            iconStyles={styles.cardIcon}
-                                                            iconWidth={variables.cardIconWidth}
-                                                            iconHeight={variables.cardIconHeight}
-                                                            onPress={() => navigateToDetails(memberCard)}
-                                                            shouldRemoveHoverBackground={isCardDeleted}
-                                                            disabled={isCardDeleted}
-                                                            shouldShowRightIcon={!isCardDeleted}
-                                                            style={[isCardDeleted ? styles.offlineFeedback.deleted : {}]}
-                                                        />
-                                                    </OfflineWithFeedback>
-                                                );
-                                            })}
-                                            <MenuItem
-                                                title={translate('workspace.expensifyCard.newCard')}
-                                                icon={Expensicons.Plus}
-                                                onPress={handleIssueNewCard}
-                                            />
-                                        </>
-                                    )}
-                                </View>
-                            </View>
-                        </ScrollView>
-                    </>
-                )}
+                                </>
+                            )}
+                        </View>
+                    </View>
+                </ScrollView>
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx
index 6b0a8932e713e..0d13fc8b561a0 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx
@@ -49,26 +49,22 @@ function WorkspaceTaxesSettingsForeignCurrency({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={WorkspaceTaxesSettingsForeignCurrency.displayName}
                 style={styles.defaultModalContainer}
             >
-                {({insets}) => (
-                    <>
-                        <HeaderWithBackButton title={translate('workspace.taxes.foreignDefault')} />
+                <HeaderWithBackButton title={translate('workspace.taxes.foreignDefault')} />
 
-                        <View style={[styles.mb4, styles.flex1]}>
-                            <TaxPicker
-                                selectedTaxRate={selectedTaxRate}
-                                policyID={policyID}
-                                insets={insets}
-                                onSubmit={submit}
-                                onDismiss={dismiss}
-                            />
-                        </View>
-                    </>
-                )}
+                <View style={[styles.mb4, styles.flex1]}>
+                    <TaxPicker
+                        selectedTaxRate={selectedTaxRate}
+                        policyID={policyID}
+                        onSubmit={submit}
+                        onDismiss={dismiss}
+                        addBottomSafeAreaPadding
+                    />
+                </View>
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx
index b04203cf74158..9e39a4d428949 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx
@@ -49,26 +49,22 @@ function WorkspaceTaxesSettingsWorkspaceCurrency({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={WorkspaceTaxesSettingsWorkspaceCurrency.displayName}
                 style={styles.defaultModalContainer}
             >
-                {({insets}) => (
-                    <>
-                        <HeaderWithBackButton title={translate('workspace.taxes.workspaceDefault')} />
+                <HeaderWithBackButton title={translate('workspace.taxes.workspaceDefault')} />
 
-                        <View style={[styles.mb4, styles.flex1]}>
-                            <TaxPicker
-                                selectedTaxRate={selectedTaxRate}
-                                policyID={policyID}
-                                insets={insets}
-                                onSubmit={submit}
-                                onDismiss={dismiss}
-                            />
-                        </View>
-                    </>
-                )}
+                <View style={[styles.mb4, styles.flex1]}>
+                    <TaxPicker
+                        selectedTaxRate={selectedTaxRate}
+                        policyID={policyID}
+                        onSubmit={submit}
+                        onDismiss={dismiss}
+                        addBottomSafeAreaPadding
+                    />
+                </View>
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
     );

From 15f25ff09341a1cc56a6da7c896a99c569337564 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Sun, 23 Feb 2025 00:24:22 +0100
Subject: [PATCH 11/51] fix: improve CategorySelectorModal

---
 src/components/CategorySelector/CategorySelectorModal.tsx      | 3 ++-
 .../workspace/expensifyCard/issueNew/ConfirmationStep.tsx      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/CategorySelector/CategorySelectorModal.tsx b/src/components/CategorySelector/CategorySelectorModal.tsx
index 3eabe7a58f9c1..4bcfb9e1f9b62 100644
--- a/src/components/CategorySelector/CategorySelectorModal.tsx
+++ b/src/components/CategorySelector/CategorySelectorModal.tsx
@@ -38,6 +38,7 @@ function CategorySelectorModal({policyID, isVisible, currentCategory, onCategory
             onModalHide={onClose}
             hideModalContentWhileAnimating
             useNativeDriver
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ScreenWrapper
                 style={[styles.pb0]}
@@ -56,7 +57,7 @@ function CategorySelectorModal({policyID, isVisible, currentCategory, onCategory
                     selectedCategory={currentCategory}
                     onSubmit={onCategorySelected}
                     contentContainerStyle={styles.pb5}
-                    includeSafeAreaPaddingBottom={false}
+                    addBottomSafeAreaPadding
                 />
             </ScreenWrapper>
         </Modal>
diff --git a/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx b/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx
index 8ae9f2ea3ba41..0d4c5f2791be4 100644
--- a/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx
@@ -87,6 +87,7 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
             handleBackButtonPress={handleBackButtonPress}
             startStepIndex={5}
             stepNames={CONST.EXPENSIFY_CARD.STEP_NAMES}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ScrollView
                 style={styles.pt0}

From c661c5d6ed5de814e96ce5e931835bc18b264082 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Sun, 23 Feb 2025 10:21:12 +0100
Subject: [PATCH 12/51] fix: remove unused props from CategoryPicker

---
 src/components/CategoryPicker.tsx | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/components/CategoryPicker.tsx b/src/components/CategoryPicker.tsx
index 4c3de2eb367a9..14d9bc9a1ebe2 100644
--- a/src/components/CategoryPicker.tsx
+++ b/src/components/CategoryPicker.tsx
@@ -18,21 +18,15 @@ type CategoryPickerProps = {
     policyID: string | undefined;
     selectedCategory?: string;
     onSubmit: (item: ListItem) => void;
+    contentContainerStyle?: StyleProp<ViewStyle>;
 
     /**
      * If enabled, the content will have a bottom padding equal to account for the safe bottom area inset.
      */
     addBottomSafeAreaPadding?: boolean;
-
-    /**
-     * Temporarily needed until modal safe area handling is enabled
-     * TODO BottomSafeArea: remove both of these props
-     */
-    includeSafeAreaPaddingBottom?: boolean;
-    contentContainerStyle?: StyleProp<ViewStyle>;
 };
 
-function CategoryPicker({selectedCategory, policyID, onSubmit, addBottomSafeAreaPadding = false, includeSafeAreaPaddingBottom, contentContainerStyle}: CategoryPickerProps) {
+function CategoryPicker({selectedCategory, policyID, onSubmit, addBottomSafeAreaPadding = false, contentContainerStyle}: CategoryPickerProps) {
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
     const [policyCategoriesDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyID}`);
     const [policyRecentlyUsedCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${policyID}`);
@@ -90,7 +84,6 @@ function CategoryPicker({selectedCategory, policyID, onSubmit, addBottomSafeArea
             initiallyFocusedOptionKey={selectedOptionKey ?? undefined}
             isRowMultilineSupported
             addBottomSafeAreaPadding={addBottomSafeAreaPadding}
-            includeSafeAreaPaddingBottom={includeSafeAreaPaddingBottom}
             contentContainerStyle={contentContainerStyle}
         />
     );

From a7aefeab303d2fd2705e85368b8d12710f4f8c61 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Sun, 23 Feb 2025 11:35:33 +0100
Subject: [PATCH 13/51] fix: rename old ScreenWrapper props

---
 src/pages/workspace/WorkspaceNamePage.tsx               | 2 +-
 src/pages/workspace/WorkspaceProfileDescriptionPage.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/WorkspaceNamePage.tsx b/src/pages/workspace/WorkspaceNamePage.tsx
index b591a1506c648..be40c045a185a 100644
--- a/src/pages/workspace/WorkspaceNamePage.tsx
+++ b/src/pages/workspace/WorkspaceNamePage.tsx
@@ -63,7 +63,7 @@ function WorkspaceNamePage({policy}: Props) {
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                keyboardShouldCompensateForBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={WorkspaceNamePage.displayName}
             >
diff --git a/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx b/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
index a170cecc28694..72f4c90390972 100644
--- a/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
+++ b/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
@@ -73,7 +73,7 @@ function WorkspaceProfileDescriptionPage({policy}: Props) {
             <ScreenWrapper
                 shouldEnableMaxHeight
                 enableEdgeToEdgeBottomSafeAreaPadding
-                keyboardShouldCompensateForBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 testID={WorkspaceProfileDescriptionPage.displayName}
             >
                 <HeaderWithBackButton

From d896e3adced2930a728f8f722e279a2f100fecaa Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Sun, 23 Feb 2025 13:07:37 +0100
Subject: [PATCH 14/51] feat: migrate more workspace screens

---
 .../companyCards/BankConnection/index.tsx     |  8 +-
 .../WorkspaceCompanyCardFeedSelectorPage.tsx  |  2 +
 ...WorkspaceCompanyCardsListHeaderButtons.tsx |  2 +-
 .../WorkspaceCompanyCardsPage.tsx             | 10 +-
 ...kspaceCompanyCardsSettingsFeedNamePage.tsx |  4 +-
 .../WorkspaceCompanyCardsSettingsPage.tsx     |  6 +-
 .../companyCards/addNew/AddNewCardPage.tsx    |  2 +-
 .../companyCards/addNew/AmexCustomFeed.tsx    |  3 +-
 .../addNew/CardInstructionsStep.tsx           |  2 +
 .../companyCards/addNew/DetailsStep.tsx       |  5 +-
 .../companyCards/addNew/SelectBankStep.tsx    |  4 +-
 .../assignCard/AssignCardFeedPage.tsx         |  2 +-
 .../companyCards/assignCard/AssigneeStep.tsx  | 19 ++--
 .../companyCards/assignCard/CardNameStep.tsx  |  3 +-
 .../assignCard/CardSelectionStep.tsx          | 91 ++++++++++---------
 .../assignCard/ConfirmationStep.tsx           |  2 +
 .../TransactionStartDateSelectorModal.tsx     |  3 +
 .../assignCard/TransactionStartDateStep.tsx   | 21 +++--
 .../workspace/expensifyCard/EmptyCardView.tsx |  2 +-
 .../WorkspaceCardSettingsPage.tsx             |  7 +-
 .../WorkspaceExpensifyCardListPage.tsx        |  5 +
 .../WorkspaceExpensifyCardPageEmptyState.tsx  |  1 +
 22 files changed, 126 insertions(+), 78 deletions(-)

diff --git a/src/pages/workspace/companyCards/BankConnection/index.tsx b/src/pages/workspace/companyCards/BankConnection/index.tsx
index 691c085958785..efd662815dd6e 100644
--- a/src/pages/workspace/companyCards/BankConnection/index.tsx
+++ b/src/pages/workspace/companyCards/BankConnection/index.tsx
@@ -133,12 +133,15 @@ function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnecti
     }, [isNewFeedConnected, shouldBlockWindowOpen, newFeed, policyID, url, feed, isFeedExpired, isOffline]);
 
     return (
-        <ScreenWrapper testID={BankConnection.displayName}>
+        <ScreenWrapper
+            testID={BankConnection.displayName}
+            enableEdgeToEdgeBottomSafeAreaPadding
+        >
             <HeaderWithBackButton
                 title={headerTitle}
                 onBackButtonPress={handleBackButtonPress}
             />
-            <FullPageOfflineBlockingView>
+            <FullPageOfflineBlockingView addBottomSafeAreaPadding>
                 <BlockingView
                     icon={Illustrations.PendingBank}
                     iconWidth={styles.pendingBankCardIllustration.width}
@@ -148,6 +151,7 @@ function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnecti
                     CustomSubtitle={CustomSubtitle}
                     shouldShowLink
                     onLinkPress={onOpenBankConnectionFlow}
+                    addBottomSafeAreaPadding
                 />
             </FullPageOfflineBlockingView>
         </ScreenWrapper>
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx
index ae677ca5dbaf8..fd26b1df90c4d 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx
@@ -82,6 +82,7 @@ function WorkspaceCompanyCardFeedSelectorPage({route}: WorkspaceCompanyCardFeedS
                 testID={WorkspaceCompanyCardFeedSelectorPage.displayName}
                 shouldEnablePickerAvoiding={false}
                 shouldEnableMaxHeight
+                enableEdgeToEdgeBottomSafeAreaPadding
             >
                 <HeaderWithBackButton
                     title={translate('workspace.companyCards.selectCards')}
@@ -94,6 +95,7 @@ function WorkspaceCompanyCardFeedSelectorPage({route}: WorkspaceCompanyCardFeedS
                     shouldUpdateFocusedIndex
                     isAlternateTextMultilineSupported
                     initiallyFocusedOptionKey={selectedFeed}
+                    addBottomSafeAreaPadding
                     listFooterContent={
                         <MenuItem
                             title={translate('workspace.companyCards.addCards')}
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx
index 037aa2fdfe8bb..c1739ad78ce7d 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx
@@ -86,7 +86,7 @@ function WorkspaceCompanyCardsListHeaderButtons({policyID, selectedFeed, shouldS
                     {!!shouldShowAssignCardButton && (
                         <Button
                             success
-                            isDisabled={!currentFeedData || !!currentFeedData?.pending || isSelectedFeedConnectionBroken}
+                            isDisabled={false}
                             onPress={handleAssignCard}
                             icon={Expensicons.Plus}
                             text={translate('workspace.companyCards.assignCard')}
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
index 53e325bfb6a87..6643a4d982eb4 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
@@ -30,9 +30,9 @@ import WorkspaceCompanyCardsFeedPendingPage from './WorkspaceCompanyCardsFeedPen
 import WorkspaceCompanyCardsList from './WorkspaceCompanyCardsList';
 import WorkspaceCompanyCardsListHeaderButtons from './WorkspaceCompanyCardsListHeaderButtons';
 
-type WorkspaceCompanyCardPageProps = PlatformStackScreenProps<WorkspaceSplitNavigatorParamList, typeof SCREENS.WORKSPACE.COMPANY_CARDS>;
+type WorkspaceCompanyCardsPageProps = PlatformStackScreenProps<WorkspaceSplitNavigatorParamList, typeof SCREENS.WORKSPACE.COMPANY_CARDS>;
 
-function WorkspaceCompanyCardPage({route}: WorkspaceCompanyCardPageProps) {
+function WorkspaceCompanyCardsPage({route}: WorkspaceCompanyCardsPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const theme = useTheme();
@@ -145,8 +145,8 @@ function WorkspaceCompanyCardPage({route}: WorkspaceCompanyCardPageProps) {
                     route={route}
                     guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_COMPANY_CARDS}
                     shouldShowOfflineIndicatorInWideScreen
-                    includeSafeAreaPaddingBottom
                     showLoadingAsFirstRender={false}
+                    addBottomSafeAreaPadding
                 >
                     {(isFeedAdded || isPending) && !!selectedFeed && (
                         <WorkspaceCompanyCardsListHeaderButtons
@@ -186,6 +186,6 @@ function WorkspaceCompanyCardPage({route}: WorkspaceCompanyCardPageProps) {
     );
 }
 
-WorkspaceCompanyCardPage.displayName = 'WorkspaceCompanyCardPage';
+WorkspaceCompanyCardsPage.displayName = 'WorkspaceCompanyCardsPage';
 
-export default WorkspaceCompanyCardPage;
+export default WorkspaceCompanyCardsPage;
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx
index 4c2d9c3657a0e..d6d4042f09197 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx
@@ -77,7 +77,7 @@ function WorkspaceCompanyCardsSettingsFeedNamePage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={WorkspaceCompanyCardsSettingsFeedNamePage.displayName}
                 style={styles.defaultModalContainer}
@@ -94,6 +94,8 @@ function WorkspaceCompanyCardsSettingsFeedNamePage({
                     enabledWhenOffline
                     validate={validate}
                     onSubmit={submit}
+                    addBottomSafeAreaPadding
+                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx
index 6f23c7c3cbcc0..1b5a44228ca34 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx
@@ -85,8 +85,12 @@ function WorkspaceCompanyCardsSettingsPage({
             <ScreenWrapper
                 testID={WorkspaceCompanyCardsSettingsPage.displayName}
                 style={styles.defaultModalContainer}
+                enableEdgeToEdgeBottomSafeAreaPadding
             >
-                <ScrollView contentContainerStyle={styles.flexGrow1}>
+                <ScrollView
+                    contentContainerStyle={styles.flexGrow1}
+                    addBottomSafeAreaPadding
+                >
                     <HeaderWithBackButton title={translate('common.settings')} />
                     <View style={styles.flex1}>
                         <MenuItemWithTopDescription
diff --git a/src/pages/workspace/companyCards/addNew/AddNewCardPage.tsx b/src/pages/workspace/companyCards/addNew/AddNewCardPage.tsx
index 9ef6a943641f1..74ae7a9e6f34f 100644
--- a/src/pages/workspace/companyCards/addNew/AddNewCardPage.tsx
+++ b/src/pages/workspace/companyCards/addNew/AddNewCardPage.tsx
@@ -26,7 +26,7 @@ function AddNewCardPage({policy}: WithPolicyAndFullscreenLoadingProps) {
         return (
             <ScreenWrapper
                 testID={AddNewCardPage.displayName}
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 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..f7c3190b211db 100644
--- a/src/pages/workspace/companyCards/addNew/AmexCustomFeed.tsx
+++ b/src/pages/workspace/companyCards/addNew/AmexCustomFeed.tsx
@@ -71,7 +71,7 @@ function AmexCustomFeed() {
     return (
         <ScreenWrapper
             testID={AmexCustomFeed.displayName}
-            includeSafeAreaPaddingBottom={false}
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
@@ -101,6 +101,7 @@ function AmexCustomFeed() {
                 showConfirmButton
                 confirmButtonText={translate('common.next')}
                 onConfirm={submit}
+                addBottomSafeAreaPadding
             >
                 {hasError && (
                     <View style={[styles.ph5, styles.mb3]}>
diff --git a/src/pages/workspace/companyCards/addNew/CardInstructionsStep.tsx b/src/pages/workspace/companyCards/addNew/CardInstructionsStep.tsx
index 46920a40b1658..85f2a91abdd38 100644
--- a/src/pages/workspace/companyCards/addNew/CardInstructionsStep.tsx
+++ b/src/pages/workspace/companyCards/addNew/CardInstructionsStep.tsx
@@ -87,6 +87,7 @@ function CardInstructionsStep({policyID}: CardInstructionsStepProps) {
             testID={CardInstructionsStep.displayName}
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <HeaderWithBackButton
                 title={translate('workspace.companyCards.addCards')}
@@ -95,6 +96,7 @@ function CardInstructionsStep({policyID}: CardInstructionsStepProps) {
             <ScrollView
                 style={styles.pt0}
                 contentContainerStyle={styles.flexGrow1}
+                addBottomSafeAreaPadding
             >
                 <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>
                     {translate('workspace.companyCards.addNewCard.enableFeed.title', {provider: getBankName(feedProvider)})}
diff --git a/src/pages/workspace/companyCards/addNew/DetailsStep.tsx b/src/pages/workspace/companyCards/addNew/DetailsStep.tsx
index a5877340a67df..804438ff82097 100644
--- a/src/pages/workspace/companyCards/addNew/DetailsStep.tsx
+++ b/src/pages/workspace/companyCards/addNew/DetailsStep.tsx
@@ -169,7 +169,8 @@ function DetailsStep({policyID}: DetailsStepProps) {
     return (
         <ScreenWrapper
             testID={DetailsStep.displayName}
-            includeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
+            shouldKeyboardOffsetBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
@@ -184,6 +185,8 @@ function DetailsStep({policyID}: DetailsStepProps) {
                 validate={validate}
                 style={[styles.mh5, styles.flexGrow1]}
                 enabledWhenOffline
+                addBottomSafeAreaPadding
+                shouldSubmitButtonStickToBottom
             >
                 <Text style={[styles.textHeadlineLineHeightXXL, styles.mv3]}>
                     {!!feedProvider && !isStripeFeedProvider ? translate(`workspace.companyCards.addNewCard.feedDetails.${feedProvider}.title`) : ''}
diff --git a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx
index 15ead5b9a3238..28986ea40531e 100644
--- a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx
+++ b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx
@@ -71,7 +71,7 @@ function SelectBankStep() {
     return (
         <ScreenWrapper
             testID={SelectBankStep.displayName}
-            includeSafeAreaPaddingBottom={false}
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
@@ -95,6 +95,8 @@ function SelectBankStep() {
                 confirmButtonText={translate('common.next')}
                 onConfirm={submit}
                 confirmButtonStyles={styles.mt5}
+                addBottomSafeAreaPadding
+                shouldFooterContentStickToBottom
             >
                 {hasError && (
                     <View style={[styles.ph5, styles.mb3]}>
diff --git a/src/pages/workspace/companyCards/assignCard/AssignCardFeedPage.tsx b/src/pages/workspace/companyCards/assignCard/AssignCardFeedPage.tsx
index 63160ac57d6b4..3bb1940ea9ac2 100644
--- a/src/pages/workspace/companyCards/assignCard/AssignCardFeedPage.tsx
+++ b/src/pages/workspace/companyCards/assignCard/AssignCardFeedPage.tsx
@@ -38,7 +38,7 @@ function AssignCardFeedPage({route, policy}: AssignCardFeedPageProps) {
         return (
             <ScreenWrapper
                 testID={AssignCardFeedPage.displayName}
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnablePickerAvoiding={false}
             >
                 <DelegateNoAccessWrapper accessDeniedVariants={[CONST.DELEGATE.DENIED_ACCESS_VARIANTS.DELEGATE]} />
diff --git a/src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx b/src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx
index 0794787d89ceb..9cbad1521d3b1 100644
--- a/src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx
@@ -177,6 +177,8 @@ function AssigneeStep({policy, feed}: AssigneeStepProps) {
             startStepIndex={0}
             stepNames={CONST.COMPANY_CARD.STEP_NAMES}
             headerTitle={translate('workspace.companyCards.assignCard')}
+            enableEdgeToEdgeBottomSafeAreaPadding
+            shouldKeyboardOffsetBottomSafeAreaPadding
         >
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.companyCards.whoNeedsCardAssigned')}</Text>
             <SelectionList
@@ -189,14 +191,15 @@ function AssigneeStep({policy, feed}: AssigneeStepProps) {
                 onSelectRow={selectMember}
                 initiallyFocusedOptionKey={selectedMember}
                 shouldUpdateFocusedIndex
-            />
-            <FormAlertWithSubmitButton
-                buttonText={translate(isEditing ? 'common.confirm' : 'common.next')}
-                onSubmit={submit}
-                isAlertVisible={shouldShowError}
-                containerStyles={styles.ph5}
-                message={translate('common.error.pleaseSelectOne')}
-                buttonStyles={styles.mb5}
+                addBottomSafeAreaPadding
+                footerContent={
+                    <FormAlertWithSubmitButton
+                        buttonText={translate(isEditing ? 'common.confirm' : 'common.next')}
+                        onSubmit={submit}
+                        isAlertVisible={shouldShowError}
+                        message={translate('common.error.pleaseSelectOne')}
+                    />
+                }
             />
         </InteractiveStepWrapper>
     );
diff --git a/src/pages/workspace/companyCards/assignCard/CardNameStep.tsx b/src/pages/workspace/companyCards/assignCard/CardNameStep.tsx
index 8bc88744e5b81..834cc36649d36 100644
--- a/src/pages/workspace/companyCards/assignCard/CardNameStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/CardNameStep.tsx
@@ -60,7 +60,7 @@ function CardNameStep({policyID}: CardNameStepProps) {
             <ScreenWrapper
                 testID={CardNameStep.displayName}
                 shouldEnablePickerAvoiding={false}
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
             >
                 <HeaderWithBackButton
                     title={translate('workspace.moreFeatures.companyCards.cardName')}
@@ -74,6 +74,7 @@ function CardNameStep({policyID}: CardNameStepProps) {
                     style={[styles.flex1, styles.mh5]}
                     enabledWhenOffline
                     validate={validate}
+                    addBottomSafeAreaPadding
                 >
                     <InputWrapper
                         InputComponent={TextInput}
diff --git a/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx b/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
index 95fcc9aa66b3c..e95dc34e1170b 100644
--- a/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
@@ -12,6 +12,7 @@ import Text from '@components/Text';
 import TextLink from '@components/TextLink';
 import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
+import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {setAssignCardStepAndData} from '@libs/actions/CompanyCards';
 import {getBankName, getCardFeedIcon, getFilteredCardList, maskCardNumber} from '@libs/CardUtils';
@@ -102,15 +103,19 @@ function CardSelectionStep({feed, policyID}: CardSelectionStepProps) {
         return cardListOptions.filter((option) => option.text.toLowerCase().includes(searchText));
     }, [searchText, cardListOptions]);
 
+    const {safeAreaPaddingBottomStyle} = useStyledSafeAreaInsets();
+
     return (
         <InteractiveStepWrapper
             wrapperID={CardSelectionStep.displayName}
             handleBackButtonPress={handleBackButtonPress}
             headerTitle={translate('workspace.companyCards.assignCard')}
             headerSubtitle={assigneeDisplayName}
+            enableEdgeToEdgeBottomSafeAreaPadding
+            shouldKeyboardOffsetBottomSafeAreaPadding
         >
             {!cardListOptions.length ? (
-                <View style={[styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter, styles.ph5, styles.mb9]}>
+                <View style={[styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter, styles.ph5, styles.mb9, safeAreaPaddingBottomStyle]}>
                     <Icon
                         src={Illustrations.BrokenMagnifyingGlass}
                         width={116}
@@ -129,49 +134,49 @@ function CardSelectionStep({feed, policyID}: CardSelectionStepProps) {
                     </Text>
                 </View>
             ) : (
-                <>
-                    <SelectionList
-                        sections={[{data: searchedListOptions}]}
-                        headerMessage={searchedListOptions.length ? undefined : translate('common.noResultsFound')}
-                        shouldShowTextInput={cardListOptions.length > CONST.COMPANY_CARDS.CARD_LIST_THRESHOLD}
-                        textInputLabel={translate('common.search')}
-                        textInputValue={searchText}
-                        onChangeText={setSearchText}
-                        ListItem={RadioListItem}
-                        onSelectRow={({value}) => handleSelectCard(value)}
-                        initiallyFocusedOptionKey={cardSelected}
-                        listHeaderContent={
-                            <View>
-                                <View style={[styles.ph5, styles.mb5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
-                                    <InteractiveStepSubHeader
-                                        startStepIndex={1}
-                                        stepNames={CONST.COMPANY_CARD.STEP_NAMES}
-                                    />
-                                </View>
-                                <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mt3]}>{translate('workspace.companyCards.chooseCard')}</Text>
-                                <Text style={[styles.textSupporting, styles.ph5, styles.mv3]}>
-                                    {translate('workspace.companyCards.chooseCardFor', {
-                                        assignee: assigneeDisplayName,
-                                        feed: getBankName(feed),
-                                    })}
-                                </Text>
+                <SelectionList
+                    sections={[{data: searchedListOptions}]}
+                    headerMessage={searchedListOptions.length ? undefined : translate('common.noResultsFound')}
+                    shouldShowTextInput={cardListOptions.length > CONST.COMPANY_CARDS.CARD_LIST_THRESHOLD}
+                    textInputLabel={translate('common.search')}
+                    textInputValue={searchText}
+                    onChangeText={setSearchText}
+                    ListItem={RadioListItem}
+                    onSelectRow={({value}) => handleSelectCard(value)}
+                    initiallyFocusedOptionKey={cardSelected}
+                    listHeaderContent={
+                        <View>
+                            <View style={[styles.ph5, styles.mb5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
+                                <InteractiveStepSubHeader
+                                    startStepIndex={1}
+                                    stepNames={CONST.COMPANY_CARD.STEP_NAMES}
+                                />
                             </View>
-                        }
-                        shouldShowTextInputAfterHeader
-                        shouldShowHeaderMessageAfterHeader
-                        includeSafeAreaPaddingBottom={false}
-                        shouldShowListEmptyContent={false}
-                        shouldUpdateFocusedIndex
-                    />
-                    <FormAlertWithSubmitButton
-                        buttonText={translate(isEditing ? 'common.confirm' : 'common.next')}
-                        onSubmit={submit}
-                        isAlertVisible={shouldShowError}
-                        containerStyles={styles.ph5}
-                        message={translate('common.error.pleaseSelectOne')}
-                        buttonStyles={styles.mb5}
-                    />
-                </>
+                            <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mt3]}>{translate('workspace.companyCards.chooseCard')}</Text>
+                            <Text style={[styles.textSupporting, styles.ph5, styles.mv3]}>
+                                {translate('workspace.companyCards.chooseCardFor', {
+                                    assignee: assigneeDisplayName,
+                                    feed: getBankName(feed),
+                                })}
+                            </Text>
+                        </View>
+                    }
+                    shouldShowTextInputAfterHeader
+                    shouldShowHeaderMessageAfterHeader
+                    includeSafeAreaPaddingBottom={false}
+                    shouldShowListEmptyContent={false}
+                    shouldUpdateFocusedIndex
+                    addBottomSafeAreaPadding
+                    shouldFooterContentStickToBottom
+                    footerContent={
+                        <FormAlertWithSubmitButton
+                            buttonText={translate(isEditing ? 'common.confirm' : 'common.next')}
+                            onSubmit={submit}
+                            isAlertVisible={shouldShowError}
+                            message={translate('common.error.pleaseSelectOne')}
+                        />
+                    }
+                />
             )}
         </InteractiveStepWrapper>
     );
diff --git a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
index a5fdbb6d1433a..e45d520e6e8a8 100644
--- a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
@@ -62,10 +62,12 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
             stepNames={CONST.COMPANY_CARD.STEP_NAMES}
             headerTitle={translate('workspace.companyCards.assignCard')}
             headerSubtitle={cardholderName}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ScrollView
                 style={styles.pt0}
                 contentContainerStyle={styles.flexGrow1}
+                addBottomSafeAreaPadding
             >
                 <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mt3]}>{translate('workspace.companyCards.letsDoubleCheck')}</Text>
                 <Text style={[styles.textSupporting, styles.ph5, styles.mv3]}>{translate('workspace.companyCards.confirmationDescription')}</Text>
diff --git a/src/pages/workspace/companyCards/assignCard/TransactionStartDateSelectorModal.tsx b/src/pages/workspace/companyCards/assignCard/TransactionStartDateSelectorModal.tsx
index 1b2ba15bdbd7f..c6cb31291ab7a 100644
--- a/src/pages/workspace/companyCards/assignCard/TransactionStartDateSelectorModal.tsx
+++ b/src/pages/workspace/companyCards/assignCard/TransactionStartDateSelectorModal.tsx
@@ -47,11 +47,13 @@ function TransactionStartDateSelectorModal({isVisible, date, handleSelectDate, o
             onModalHide={onClose}
             hideModalContentWhileAnimating
             useNativeDriver
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ScreenWrapper
                 style={styles.pb0}
                 includePaddingTop={false}
                 testID={TransactionStartDateSelectorModal.displayName}
+                enableEdgeToEdgeBottomSafeAreaPadding
             >
                 <HeaderWithBackButton
                     title={translate('common.date')}
@@ -65,6 +67,7 @@ function TransactionStartDateSelectorModal({isVisible, date, handleSelectDate, o
                     style={[styles.flexGrow1, styles.ph5]}
                     enabledWhenOffline
                     validate={validate}
+                    addBottomSafeAreaPadding
                 >
                     <InputWrapper
                         InputComponent={DatePicker}
diff --git a/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx b/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx
index eb0b4551123d4..1e4186024e669 100644
--- a/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx
@@ -90,6 +90,8 @@ function TransactionStartDateStep() {
             stepNames={CONST.COMPANY_CARD.STEP_NAMES}
             headerTitle={translate('workspace.companyCards.assignCard')}
             headerSubtitle={assigneeDisplayName}
+            enableEdgeToEdgeBottomSafeAreaPadding
+            shouldKeyboardOffsetBottomSafeAreaPadding
         >
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mt3]}>{translate('workspace.companyCards.chooseTransactionStartDate')}</Text>
             <Text style={[styles.textSupporting, styles.ph5, styles.mv3]}>{translate('workspace.companyCards.startDateDescription')}</Text>
@@ -101,6 +103,17 @@ function TransactionStartDateStep() {
                     shouldSingleExecuteRowSelect
                     initiallyFocusedOptionKey={dateOptionSelected}
                     shouldUpdateFocusedIndex
+                    addBottomSafeAreaPadding
+                    shouldFooterContentStickToBottom
+                    footerContent={
+                        <Button
+                            success
+                            large
+                            pressOnEnter
+                            text={translate(isEditing ? 'common.confirm' : 'common.next')}
+                            onPress={submit}
+                        />
+                    }
                     listFooterContent={
                         dateOptionSelected === CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM ? (
                             <>
@@ -121,14 +134,6 @@ function TransactionStartDateStep() {
                     }
                 />
             </View>
-            <Button
-                success
-                large
-                pressOnEnter
-                text={translate(isEditing ? 'common.confirm' : 'common.next')}
-                onPress={submit}
-                style={styles.m5}
-            />
         </InteractiveStepWrapper>
     );
 }
diff --git a/src/pages/workspace/expensifyCard/EmptyCardView.tsx b/src/pages/workspace/expensifyCard/EmptyCardView.tsx
index 1902a4c60810d..b058ea4351b57 100644
--- a/src/pages/workspace/expensifyCard/EmptyCardView.tsx
+++ b/src/pages/workspace/expensifyCard/EmptyCardView.tsx
@@ -27,7 +27,7 @@ function EmptyCardView({isBankAccountVerified}: EmptyCardViewProps) {
     const headerHeight = useEmptyViewHeaderHeight(shouldUseNarrowLayout, isBankAccountVerified);
 
     return (
-        <ScrollView>
+        <ScrollView addBottomSafeAreaPadding>
             <View style={[{height: windowHeight - headerHeight}, styles.pt5]}>
                 <EmptyStateComponent
                     SkeletonComponent={CardRowSkeleton}
diff --git a/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx
index f05ba655a1fd6..bcb3424a900b0 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx
@@ -45,11 +45,14 @@ function WorkspaceCardSettingsPage({route}: WorkspaceCardSettingsPageProps) {
         >
             <ScreenWrapper
                 testID={WorkspaceCardSettingsPage.displayName}
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableMaxHeight
             >
                 <HeaderWithBackButton title={translate('workspace.common.settings')} />
-                <ScrollView contentContainerStyle={styles.flexGrow1}>
+                <ScrollView
+                    contentContainerStyle={styles.flexGrow1}
+                    addBottomSafeAreaPadding
+                >
                     <View>
                         <OfflineWithFeedback errorRowStyles={styles.mh5}>
                             <MenuItemWithTopDescription
diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx
index 778519b1d35eb..c4b77998965f2 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx
@@ -11,6 +11,7 @@ import * as Illustrations from '@components/Icon/Illustrations';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
 import ScreenWrapper from '@components/ScreenWrapper';
+import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddingStyle';
 import useLocalize from '@hooks/useLocalize';
 import usePolicy from '@hooks/usePolicy';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -118,8 +119,11 @@ function WorkspaceExpensifyCardListPage({route, cardsList}: WorkspaceExpensifyCa
 
     const renderListHeader = useCallback(() => <WorkspaceCardListHeader policyID={policyID} />, [policyID]);
 
+    const bottomSafeAreaPaddingStyle = useBottomSafeSafeAreaPaddingStyle();
+
     return (
         <ScreenWrapper
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicatorInWideScreen
             shouldEnableMaxHeight
@@ -142,6 +146,7 @@ function WorkspaceExpensifyCardListPage({route, cardsList}: WorkspaceExpensifyCa
                     data={sortedCards}
                     renderItem={renderItem}
                     ListHeaderComponent={renderListHeader}
+                    contentContainerStyle={bottomSafeAreaPaddingStyle}
                 />
             )}
             <DelegateNoAccessModal
diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPageEmptyState.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPageEmptyState.tsx
index 27c037ebaa0e3..c16e8cbb16761 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPageEmptyState.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPageEmptyState.tsx
@@ -89,6 +89,7 @@ function WorkspaceExpensifyCardPageEmptyState({route, policy}: WorkspaceExpensif
             guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_EXPENSIFY_CARD}
             showLoadingAsFirstRender={false}
             shouldShowOfflineIndicatorInWideScreen
+            addBottomSafeAreaPadding
         >
             <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                 <FeatureList

From 08ae4eece7469cccd1c090f589c1bc069f4f8261 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Sun, 23 Feb 2025 20:47:55 +0100
Subject: [PATCH 15/51] feat: migrate categories, invoices, rules, tags

---
 src/pages/workspace/categories/CategoryForm.tsx     |  2 ++
 .../workspace/categories/CreateCategoryPage.tsx     |  3 ++-
 .../categories/WorkspaceCategoriesPage.tsx          |  3 ++-
 .../categories/WorkspaceCategoriesSettingsPage.tsx  |  3 ++-
 .../workspace/invoices/WorkspaceInvoicesPage.tsx    |  1 +
 .../invoices/WorkspaceInvoicingDetailsName.tsx      |  4 ++++
 .../invoices/WorkspaceInvoicingDetailsWebsite.tsx   |  4 ++++
 src/pages/workspace/rules/PolicyRulesPage.tsx       |  1 +
 .../workspace/rules/RulesBillableDefaultPage.tsx    |  3 ++-
 .../workspace/rules/RulesMaxExpenseAgePage.tsx      |  5 ++++-
 .../workspace/rules/RulesMaxExpenseAmountPage.tsx   |  5 ++++-
 .../rules/RulesReceiptRequiredAmountPage.tsx        |  5 ++++-
 src/pages/workspace/tags/WorkspaceCreateTagPage.tsx | 13 ++++++++-----
 src/pages/workspace/tags/WorkspaceEditTagsPage.tsx  |  5 ++++-
 src/pages/workspace/tags/WorkspaceTagsPage.tsx      |  3 ++-
 .../workspace/tags/WorkspaceTagsSettingsPage.tsx    |  2 +-
 .../workspace/workflows/WorkspaceWorkflowsPage.tsx  |  1 +
 17 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/src/pages/workspace/categories/CategoryForm.tsx b/src/pages/workspace/categories/CategoryForm.tsx
index efe457729e367..6150df46d3dbd 100644
--- a/src/pages/workspace/categories/CategoryForm.tsx
+++ b/src/pages/workspace/categories/CategoryForm.tsx
@@ -76,6 +76,8 @@ function CategoryForm({onSubmit, policyCategories, categoryName, validateEdit}:
             validate={validateEdit || validate}
             style={[styles.mh5, styles.flex1]}
             enabledWhenOffline
+            addBottomSafeAreaPadding
+            shouldSubmitButtonStickToBottom
         >
             <InputWrapper
                 ref={inputCallbackRef}
diff --git a/src/pages/workspace/categories/CreateCategoryPage.tsx b/src/pages/workspace/categories/CreateCategoryPage.tsx
index f17804a5ddff1..aa0a91f79617d 100644
--- a/src/pages/workspace/categories/CreateCategoryPage.tsx
+++ b/src/pages/workspace/categories/CreateCategoryPage.tsx
@@ -40,7 +40,8 @@ function CreateCategoryPage({route}: CreateCategoryPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={CreateCategoryPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
index 4b645b27a43e9..11871075924ba 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
@@ -378,7 +378,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={WorkspaceCategoriesPage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
@@ -452,6 +452,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
                         listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
                         listHeaderContent={shouldUseNarrowLayout ? getHeaderText() : null}
                         showScrollIndicator={false}
+                        addBottomSafeAreaPadding
                     />
                 )}
 
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
index 86e4a6d80786d..6cf343d3125cc 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
@@ -97,7 +97,7 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={WorkspaceCategoriesSettingsPage.displayName}
             >
@@ -123,6 +123,7 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
                     <View style={[styles.containerWithSpaceBetween]}>
                         {!!currentPolicy && (sections.at(0)?.data?.length ?? 0) > 0 && (
                             <SelectionList
+                                addBottomSafeAreaPadding
                                 headerContent={
                                     <View style={[styles.mh5, styles.mt2, styles.mb1]}>
                                         <Text style={[styles.headerText]}>{translate('workspace.categories.defaultSpendCategories')}</Text>
diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx b/src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx
index d3eedabf38e1b..6a04b1c75405f 100644
--- a/src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx
+++ b/src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx
@@ -34,6 +34,7 @@ function WorkspaceInvoicesPage({route}: WorkspaceInvoicesPageProps) {
                 shouldSkipVBBACall={false}
                 route={route}
                 icon={Illustrations.InvoiceBlue}
+                addBottomSafeAreaPadding
             >
                 {(_hasVBA?: boolean, policyID?: string) => (
                     <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
diff --git a/src/pages/workspace/invoices/WorkspaceInvoicingDetailsName.tsx b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsName.tsx
index 245c99c8fdcd1..772e9e5a8b55c 100644
--- a/src/pages/workspace/invoices/WorkspaceInvoicingDetailsName.tsx
+++ b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsName.tsx
@@ -49,6 +49,8 @@ function WorkspaceInvoicingDetailsName({route}: WorkspaceInvoicingDetailsNamePro
                 testID={WorkspaceInvoicingDetailsName.displayName}
                 shouldEnablePickerAvoiding={false}
                 shouldEnableMaxHeight
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
             >
                 <HeaderWithBackButton title={translate('workspace.invoices.companyName')} />
                 <FormProvider
@@ -58,6 +60,8 @@ function WorkspaceInvoicingDetailsName({route}: WorkspaceInvoicingDetailsNamePro
                     style={[styles.flex1, styles.mh5]}
                     enabledWhenOffline
                     validate={validate}
+                    addBottomSafeAreaPadding
+                    shouldSubmitButtonStickToBottom
                 >
                     <InputWrapper
                         InputComponent={TextInput}
diff --git a/src/pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite.tsx b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite.tsx
index 65c98c8760228..05cc84e11fbf7 100644
--- a/src/pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite.tsx
+++ b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite.tsx
@@ -72,6 +72,8 @@ function WorkspaceInvoicingDetailsWebsite({route}: WorkspaceInvoicingDetailsWebs
                 testID={WorkspaceInvoicingDetailsWebsite.displayName}
                 shouldEnablePickerAvoiding={false}
                 shouldEnableMaxHeight
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
             >
                 <HeaderWithBackButton title={translate('workspace.invoices.companyWebsite')} />
                 <FormProvider
@@ -81,6 +83,8 @@ function WorkspaceInvoicingDetailsWebsite({route}: WorkspaceInvoicingDetailsWebs
                     style={[styles.flex1, styles.mh5]}
                     enabledWhenOffline
                     validate={validate}
+                    addBottomSafeAreaPadding
+                    shouldSubmitButtonStickToBottom
                 >
                     <InputWrapper
                         InputComponent={TextInput}
diff --git a/src/pages/workspace/rules/PolicyRulesPage.tsx b/src/pages/workspace/rules/PolicyRulesPage.tsx
index f8f0308893ac4..363fc476dae0c 100644
--- a/src/pages/workspace/rules/PolicyRulesPage.tsx
+++ b/src/pages/workspace/rules/PolicyRulesPage.tsx
@@ -40,6 +40,7 @@ function PolicyRulesPage({route}: PolicyRulesPageProps) {
                 icon={Illustrations.Rules}
                 shouldShowNotFoundPage={false}
                 shouldShowLoading={false}
+                addBottomSafeAreaPadding
             >
                 <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                     <IndividualExpenseRulesSection policyID={policyID} />
diff --git a/src/pages/workspace/rules/RulesBillableDefaultPage.tsx b/src/pages/workspace/rules/RulesBillableDefaultPage.tsx
index 2b9d42ed748c4..85fd12e6854f6 100644
--- a/src/pages/workspace/rules/RulesBillableDefaultPage.tsx
+++ b/src/pages/workspace/rules/RulesBillableDefaultPage.tsx
@@ -64,7 +64,7 @@ function RulesBillableDefaultPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={RulesBillableDefaultPage.displayName}
             >
@@ -92,6 +92,7 @@ function RulesBillableDefaultPage({
                     shouldSingleExecuteRowSelect
                     containerStyle={[styles.pt3]}
                     initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+                    addBottomSafeAreaPadding
                 />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx b/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx
index 06f97a2f554dc..8273da12dfe65 100644
--- a/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx
+++ b/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx
@@ -51,7 +51,8 @@ function RulesMaxExpenseAgePage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={RulesMaxExpenseAgePage.displayName}
             >
@@ -68,6 +69,8 @@ function RulesMaxExpenseAgePage({
                     }}
                     submitButtonText={translate('workspace.editor.save')}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
+                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx b/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx
index e2eb6ccc57917..65351dd92618c 100644
--- a/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx
+++ b/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx
@@ -46,7 +46,8 @@ function RulesMaxExpenseAmountPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={RulesMaxExpenseAmountPage.displayName}
             >
@@ -63,6 +64,8 @@ function RulesMaxExpenseAmountPage({
                     }}
                     submitButtonText={translate('workspace.editor.save')}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
+                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx b/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx
index 646722e44d9d4..526677409e76c 100644
--- a/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx
+++ b/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx
@@ -46,8 +46,9 @@ function RulesReceiptRequiredAmountPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableMaxHeight
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 testID={RulesReceiptRequiredAmountPage.displayName}
             >
                 <HeaderWithBackButton
@@ -63,6 +64,8 @@ function RulesReceiptRequiredAmountPage({
                     }}
                     submitButtonText={translate('workspace.editor.save')}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
+                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx b/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
index 57a4286561e91..dbf45832126b3 100644
--- a/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
@@ -26,7 +26,7 @@ import INPUT_IDS from '@src/types/form/WorkspaceTagForm';
 
 type CreateTagPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAG_CREATE>;
 
-function CreateTagPage({route}: CreateTagPageProps) {
+function WorkspaceCreateTagPage({route}: CreateTagPageProps) {
     const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${route?.params?.policyID}`);
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -72,9 +72,10 @@ function CreateTagPage({route}: CreateTagPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
-                testID={CreateTagPage.displayName}
+                testID={WorkspaceCreateTagPage.displayName}
                 shouldEnableMaxHeight
             >
                 <HeaderWithBackButton
@@ -88,6 +89,8 @@ function CreateTagPage({route}: CreateTagPageProps) {
                     validate={validate}
                     style={[styles.mh5, styles.flex1]}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
+                    shouldSubmitButtonStickToBottom
                 >
                     <InputWrapper
                         InputComponent={TextInput}
@@ -104,6 +107,6 @@ function CreateTagPage({route}: CreateTagPageProps) {
     );
 }
 
-CreateTagPage.displayName = 'CreateTagPage';
+WorkspaceCreateTagPage.displayName = 'WorkspaceCreateTagPage';
 
-export default CreateTagPage;
+export default WorkspaceCreateTagPage;
diff --git a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
index 0e72802115d70..f89d4d2471f15 100644
--- a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
@@ -72,7 +72,8 @@ function WorkspaceEditTagsPage({route}: WorkspaceEditTagsPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={WorkspaceEditTagsPage.displayName}
             >
@@ -87,6 +88,8 @@ function WorkspaceEditTagsPage({route}: WorkspaceEditTagsPageProps) {
                     validate={validateTagName}
                     submitButtonText={translate('common.save')}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
+                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index 93e64e6dd02f7..afd8ce76ae9e6 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -412,7 +412,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={WorkspaceTagsPage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
@@ -485,6 +485,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
                         onDismissError={(item) => !isMultiLevelTags && clearPolicyTagErrors(policyID, item.value, 0)}
                         listHeaderContent={shouldUseNarrowLayout ? getHeaderText() : null}
                         showScrollIndicator={false}
+                        addBottomSafeAreaPadding
                     />
                 )}
 
diff --git a/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
index 8401ea31f448a..ad94a06c84d28 100644
--- a/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
@@ -126,7 +126,7 @@ function WorkspaceTagsSettingsPage({route}: WorkspaceTagsSettingsPageProps) {
         >
             {({policy}) => (
                 <ScreenWrapper
-                    includeSafeAreaPaddingBottom={false}
+                    enableEdgeToEdgeBottomSafeAreaPadding
                     style={[styles.defaultModalContainer]}
                     testID={WorkspaceTagsSettingsPage.displayName}
                 >
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
index efd05804d91a2..8f2861f0ef0fc 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
@@ -351,6 +351,7 @@ function WorkspaceWorkflowsPage({policy, route}: WorkspaceWorkflowsPageProps) {
                 isLoading={isLoading}
                 shouldShowLoading={isLoading}
                 shouldUseScrollView
+                addBottomSafeAreaPadding
             >
                 <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                     {optionItems.map(renderOptionItem)}

From adecd13bd27281cd587ef064ea34d20905b781a3 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Sun, 23 Feb 2025 21:36:24 +0100
Subject: [PATCH 16/51] fix: remaining workspace pages

---
 src/components/WorkspaceConfirmationForm.tsx        |  1 +
 src/pages/Travel/TravelUpgrade.tsx                  |  4 +++-
 src/pages/workspace/WorkspaceConfirmationPage.tsx   |  3 ++-
 src/pages/workspace/WorkspaceMoreFeaturesPage.tsx   |  6 ++----
 src/pages/workspace/WorkspacesListPage.tsx          |  7 ++++++-
 .../workspace/accounting/PolicyAccountingPage.tsx   |  7 +++++--
 .../reportFields/CreateReportFieldsPage.tsx         | 13 ++++++++-----
 .../reportFields/ReportFieldTypePicker/index.tsx    |  1 +
 .../reportFields/TypeSelector/TypeSelectorModal.tsx |  3 ++-
 .../reportFields/WorkspaceReportFieldsPage.tsx      |  3 ++-
 .../workspace/taxes/WorkspaceCreateTaxPage.tsx      | 10 ++++++++--
 src/pages/workspace/taxes/WorkspaceTaxesPage.tsx    |  3 ++-
 .../taxes/WorkspaceTaxesSettingsCustomTaxName.tsx   |  5 ++++-
 .../workspace/taxes/WorkspaceTaxesSettingsPage.tsx  |  6 +++++-
 14 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/src/components/WorkspaceConfirmationForm.tsx b/src/components/WorkspaceConfirmationForm.tsx
index b74cc279abeeb..5525f765b2842 100644
--- a/src/components/WorkspaceConfirmationForm.tsx
+++ b/src/components/WorkspaceConfirmationForm.tsx
@@ -167,6 +167,7 @@ function WorkspaceConfirmationForm({onSubmit, policyOwnerEmail = '', onBackButto
                         })
                     }
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/Travel/TravelUpgrade.tsx b/src/pages/Travel/TravelUpgrade.tsx
index 78b8f8d7e4880..47b06885d67f6 100644
--- a/src/pages/Travel/TravelUpgrade.tsx
+++ b/src/pages/Travel/TravelUpgrade.tsx
@@ -51,11 +51,13 @@ function TravelUpgrade() {
                 hideModalContentWhileAnimating
                 useNativeDriver
                 onBackdropPress={Navigation.dismissModal}
+                enableEdgeToEdgeBottomSafeAreaPadding
             >
                 <ScreenWrapper
                     style={[styles.pb0]}
                     includePaddingTop={false}
-                    includeSafeAreaPaddingBottom={false}
+                    enableEdgeToEdgeBottomSafeAreaPadding
+                    shouldKeyboardOffsetBottomSafeAreaPadding
                     testID={TravelUpgrade.displayName}
                 >
                     <WorkspaceConfirmationForm
diff --git a/src/pages/workspace/WorkspaceConfirmationPage.tsx b/src/pages/workspace/WorkspaceConfirmationPage.tsx
index ea3638b0c84d9..baabd312e85a9 100644
--- a/src/pages/workspace/WorkspaceConfirmationPage.tsx
+++ b/src/pages/workspace/WorkspaceConfirmationPage.tsx
@@ -26,7 +26,8 @@ function WorkspaceConfirmationPage() {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
+            shouldKeyboardOffsetBottomSafeAreaPadding
             shouldEnableMaxHeight
             testID={WorkspaceConfirmationPage.displayName}
         >
diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
index 72b165821c61c..00d09d37b04b0 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
@@ -12,7 +12,6 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {getCompanyFeeds} from '@libs/CardUtils';
@@ -76,7 +75,6 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
     const styles = useThemeStyles();
     const stylesutils = useStyleUtils();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const {safeAreaPaddingBottomStyle} = useStyledSafeAreaInsets();
     const {translate} = useLocalize();
     const {canUsePerDiem} = usePermissions();
     const hasAccountingConnection = !isEmptyObject(policy?.connections);
@@ -451,7 +449,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
             policyID={route.params.policyID}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={WorkspaceMoreFeaturesPage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
@@ -463,7 +461,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
                     shouldShowBackButton={shouldUseNarrowLayout}
                 />
 
-                <ScrollView contentContainerStyle={safeAreaPaddingBottomStyle}>
+                <ScrollView addBottomSafeAreaPadding>
                     <Text style={[styles.ph5, styles.mb5, styles.mt3, styles.textSupporting, styles.workspaceSectionMobile]}>{translate('workspace.moreFeatures.subtitle')}</Text>
                     {sections.map(renderSection)}
                 </ScrollView>
diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index 219637583e70a..9e81534d2db9d 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -437,6 +437,7 @@ function WorkspacesListPage() {
                 testID={WorkspacesListPage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
                 bottomContent={shouldUseNarrowLayout && <BottomTabBar selectedTab={BOTTOM_TABS.SETTINGS} />}
+                enableEdgeToEdgeBottomSafeAreaPadding
             >
                 <HeaderWithBackButton
                     title={translate('common.workspaces')}
@@ -449,7 +450,10 @@ function WorkspacesListPage() {
                 {shouldShowLoadingIndicator ? (
                     <FullScreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
                 ) : (
-                    <ScrollView contentContainerStyle={styles.pt3}>
+                    <ScrollView
+                        contentContainerStyle={styles.pt3}
+                        addBottomSafeAreaPadding
+                    >
                         <View style={[styles.flex1, isLessThanMediumScreen ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                             <FeatureList
                                 menuItems={workspaceFeatures}
@@ -475,6 +479,7 @@ function WorkspacesListPage() {
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicatorInWideScreen
             testID={WorkspacesListPage.displayName}
+            enableEdgeToEdgeBottomSafeAreaPadding
             bottomContent={shouldUseNarrowLayout && <BottomTabBar selectedTab={BOTTOM_TABS.SETTINGS} />}
         >
             <View style={styles.flex1}>
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index 3303ff79219bd..1a7ecd7145aaa 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -552,7 +552,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
         >
             <ScreenWrapper
                 testID={PolicyAccountingPage.displayName}
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldShowOfflineIndicatorInWideScreen
             >
                 <HeaderWithBackButton
@@ -562,7 +562,10 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
                     shouldUseHeadlineHeader
                     threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(windowWidth)}
                 />
-                <ScrollView contentContainerStyle={styles.pt3}>
+                <ScrollView
+                    contentContainerStyle={styles.pt3}
+                    addBottomSafeAreaPadding
+                >
                     <View style={[styles.flex1, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                         <Section
                             title={translate('workspace.accounting.title')}
diff --git a/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx b/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx
index b3ae0aae6a186..b07b41c0eb55c 100644
--- a/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx
+++ b/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx
@@ -34,7 +34,7 @@ type CreateReportFieldsPageProps = WithPolicyAndFullscreenLoadingProps & Platfor
 
 const defaultDate = DateUtils.extractDate(new Date().toString());
 
-function CreateReportFieldsPage({
+function WorkspaceCreateReportFieldsPage({
     policy,
     route: {
         params: {policyID},
@@ -102,9 +102,10 @@ function CreateReportFieldsPage({
             shouldBeBlocked={PolicyUtils.hasAccountingConnections(policy)}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={styles.defaultModalContainer}
-                testID={CreateReportFieldsPage.displayName}
+                testID={WorkspaceCreateReportFieldsPage.displayName}
                 shouldEnableMaxHeight
             >
                 <HeaderWithBackButton
@@ -121,6 +122,8 @@ function CreateReportFieldsPage({
                     enabledWhenOffline
                     shouldValidateOnBlur={false}
                     disablePressOnEnter={!!modal?.isVisible}
+                    addBottomSafeAreaPadding
+                    shouldSubmitButtonStickToBottom
                 >
                     {({inputValues}) => (
                         <View style={styles.mhn5}>
@@ -194,6 +197,6 @@ function CreateReportFieldsPage({
     );
 }
 
-CreateReportFieldsPage.displayName = 'CreateReportFieldsPage';
+WorkspaceCreateReportFieldsPage.displayName = 'WorkspaceCreateReportFieldsPage';
 
-export default withPolicyAndFullscreenLoading(CreateReportFieldsPage);
+export default withPolicyAndFullscreenLoading(WorkspaceCreateReportFieldsPage);
diff --git a/src/pages/workspace/reportFields/ReportFieldTypePicker/index.tsx b/src/pages/workspace/reportFields/ReportFieldTypePicker/index.tsx
index 9c9cf0c94e293..1df3ab08b49cc 100644
--- a/src/pages/workspace/reportFields/ReportFieldTypePicker/index.tsx
+++ b/src/pages/workspace/reportFields/ReportFieldTypePicker/index.tsx
@@ -48,6 +48,7 @@ function ReportFieldTypePicker({defaultValue, onOptionSelected}: ReportFieldType
             sections={typeSections}
             ListItem={RadioListItem}
             onSelectRow={onOptionSelected}
+            addBottomSafeAreaPadding
             initiallyFocusedOptionKey={typeSections.at(0)?.data?.find((reportField) => reportField.isSelected)?.keyForList}
         />
     );
diff --git a/src/pages/workspace/reportFields/TypeSelector/TypeSelectorModal.tsx b/src/pages/workspace/reportFields/TypeSelector/TypeSelectorModal.tsx
index ca64dda455a46..bf34d8b1e3b27 100644
--- a/src/pages/workspace/reportFields/TypeSelector/TypeSelectorModal.tsx
+++ b/src/pages/workspace/reportFields/TypeSelector/TypeSelectorModal.tsx
@@ -41,11 +41,12 @@ function TypeSelectorModal({isVisible, currentType, label, subtitle, onTypeSelec
             onModalHide={onClose}
             hideModalContentWhileAnimating
             useNativeDriver
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ScreenWrapper
                 style={styles.pb0}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 testID={TypeSelectorModal.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx b/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx
index d2ef52d431ae5..310804a9cb847 100644
--- a/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx
+++ b/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx
@@ -238,7 +238,7 @@ function WorkspaceReportFieldsPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={WorkspaceReportFieldsPage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
@@ -306,6 +306,7 @@ function WorkspaceReportFieldsPage({
                         shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
                         listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
                         showScrollIndicator={false}
+                        addBottomSafeAreaPadding
                     />
                 )}
             </ScreenWrapper>
diff --git a/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx b/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
index 4dddcb42265d5..eae35e77a8278 100644
--- a/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
@@ -72,10 +72,14 @@ function WorkspaceCreateTaxPage({
         >
             <ScreenWrapper
                 testID={WorkspaceCreateTaxPage.displayName}
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
             >
-                <FullPageNotFoundView shouldShow={PolicyUtils.hasAccountingConnections(policy)}>
+                <FullPageNotFoundView
+                    shouldShow={PolicyUtils.hasAccountingConnections(policy)}
+                    addBottomSafeAreaPadding
+                >
                     <View style={[styles.h100, styles.flex1, styles.justifyContentBetween]}>
                         <HeaderWithBackButton title={translate('workspace.taxes.addRate')} />
                         <FormProvider
@@ -87,6 +91,8 @@ function WorkspaceCreateTaxPage({
                             enabledWhenOffline
                             shouldValidateOnBlur={false}
                             disablePressOnEnter={!!modal?.isVisible}
+                            addBottomSafeAreaPadding
+                            shouldSubmitButtonStickToBottom
                         >
                             <View style={styles.mhn5}>
                                 <InputWrapper
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
index a8e2bd0a6c736..22b703dc24d09 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
@@ -316,7 +316,7 @@ function WorkspaceTaxesPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={WorkspaceTaxesPage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
@@ -362,6 +362,7 @@ function WorkspaceTaxesPage({
                     listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
                     onDismissError={(item) => (item.keyForList ? clearTaxRateError(policyID, item.keyForList, item.pendingAction) : undefined)}
                     showScrollIndicator={false}
+                    addBottomSafeAreaPadding
                 />
                 <ConfirmModal
                     title={translate('workspace.taxes.actions.delete')}
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
index b7927692f4f31..7a80475b3329a 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
@@ -63,7 +63,8 @@ function WorkspaceTaxesSettingsCustomTaxName({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={WorkspaceTaxesSettingsCustomTaxName.displayName}
                 style={styles.defaultModalContainer}
@@ -78,6 +79,8 @@ function WorkspaceTaxesSettingsCustomTaxName({
                     enabledWhenOffline
                     validate={validate}
                     onSubmit={submit}
+                    addBottomSafeAreaPadding
+                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsPage.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsPage.tsx
index 4de7c320cd2f4..97926929aa585 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsPage.tsx
@@ -61,8 +61,12 @@ function WorkspaceTaxesSettingsPage({
             <ScreenWrapper
                 testID={WorkspaceTaxesSettingsPage.displayName}
                 style={styles.defaultModalContainer}
+                enableEdgeToEdgeBottomSafeAreaPadding
             >
-                <ScrollView contentContainerStyle={styles.flexGrow1}>
+                <ScrollView
+                    contentContainerStyle={styles.flexGrow1}
+                    addBottomSafeAreaPadding
+                >
                     <HeaderWithBackButton title={translate('common.settings')} />
                     <View style={styles.flex1}>
                         {menuItems.map((item) => (

From 0cdada256198685545ae99d02c5791881096528f Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Sun, 23 Feb 2025 23:48:17 +0100
Subject: [PATCH 17/51] refactor: migrate more workspace screens

---
 src/components/ImportSpreadsheetColumns.tsx   |   2 +-
 .../WorkspaceMembersSelectionList.tsx         |   1 +
 src/pages/workspace/WorkspaceInitialPage.tsx  |   1 -
 .../workspace/WorkspaceInviteMessagePage.tsx  |   4 +-
 .../WorkspaceMemberRoleSelectionModal.tsx     |   1 +
 src/pages/workspace/WorkspaceNewRoomPage.tsx  |   5 +-
 .../categories/CategoryApproverPage.tsx       |   2 +-
 .../categories/CategoryDefaultTaxRatePage.tsx |   3 +-
 .../CategoryDescriptionHintPage.tsx           |   5 +-
 .../CategoryFlagAmountsOverPage.tsx           |   5 +-
 .../categories/CategoryGLCodePage.tsx         |   5 +-
 .../categories/CategoryPayrollCodePage.tsx    |   5 +-
 .../CategoryRequireReceiptsOverPage.tsx       |   3 +-
 .../categories/CategorySettingsPage.tsx       | 335 +++++++++---------
 .../workspace/categories/EditCategoryPage.tsx |   3 +-
 .../ExpenseLimitTypeSelectorModal.tsx         |   4 +-
 .../categories/ImportedCategoriesPage.tsx     |   2 +-
 .../workspace/members/ImportedMembersPage.tsx |   2 +-
 .../workspace/perDiem/ImportedPerDiemPage.tsx |   2 +-
 src/pages/workspace/tags/EditTagPage.tsx      |   5 +-
 src/pages/workspace/tags/ImportedTagsPage.tsx |   2 +-
 src/pages/workspace/tags/TagApproverPage.tsx  |   2 +-
 src/pages/workspace/tags/TagGLCodePage.tsx    |   5 +-
 src/pages/workspace/tags/TagSettingsPage.tsx  |   2 +-
 .../workspace/tags/WorkspaceViewTagsPage.tsx  |   3 +-
 25 files changed, 219 insertions(+), 190 deletions(-)

diff --git a/src/components/ImportSpreadsheetColumns.tsx b/src/components/ImportSpreadsheetColumns.tsx
index 7df36dd80c9d1..4edfd656dc700 100644
--- a/src/components/ImportSpreadsheetColumns.tsx
+++ b/src/components/ImportSpreadsheetColumns.tsx
@@ -80,7 +80,7 @@ function ImportSpreadsheetColumns({spreadsheetColumns, columnNames, columnRoles,
                     })}
                 </View>
             </ScrollView>
-            <FixedFooter>
+            <FixedFooter addBottomSafeAreaPadding>
                 <OfflineWithFeedback
                     shouldDisplayErrorAbove
                     errors={errors}
diff --git a/src/components/WorkspaceMembersSelectionList.tsx b/src/components/WorkspaceMembersSelectionList.tsx
index aff095f09839d..f7614fd4b9dc4 100644
--- a/src/components/WorkspaceMembersSelectionList.tsx
+++ b/src/components/WorkspaceMembersSelectionList.tsx
@@ -108,6 +108,7 @@ function WorkspaceMembersSelectionList({policyID, selectedApprover, setApprover}
             showScrollIndicator
             showLoadingPlaceholder={!didScreenTransitionEnd}
             shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
+            addBottomSafeAreaPadding
         />
     );
 }
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index b487c4b9da818..94a399a7a3222 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -431,7 +431,6 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
     return (
         <ScreenWrapper
             testID={WorkspaceInitialPage.displayName}
-            includeSafeAreaPaddingBottom
             enableEdgeToEdgeBottomSafeAreaPadding
             bottomContent={shouldShowBottomTab ? <BottomTabBar selectedTab={BOTTOM_TABS.SETTINGS} /> : null}
         >
diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.tsx b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
index 1fef164e158da..1c91de1823afb 100644
--- a/src/pages/workspace/WorkspaceInviteMessagePage.tsx
+++ b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
@@ -175,7 +175,8 @@ function WorkspaceInviteMessagePage({policy, route, currentUserPersonalDetails}:
             fullPageNotFoundViewProps={{subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized', onLinkPress: goBackFromInvalidPolicy}}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 testID={WorkspaceInviteMessagePage.displayName}
                 shouldEnableMaxHeight
                 style={{marginTop: viewportOffsetTop}}
@@ -196,6 +197,7 @@ function WorkspaceInviteMessagePage({policy, route, currentUserPersonalDetails}:
                     onSubmit={sendInvitation}
                     submitButtonText={translate('common.invite')}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
                     footerContent={
                         <PressableWithoutFeedback
                             onPress={openPrivacyURL}
diff --git a/src/pages/workspace/WorkspaceMemberRoleSelectionModal.tsx b/src/pages/workspace/WorkspaceMemberRoleSelectionModal.tsx
index 66b865c02e748..6dac5bd4b267d 100644
--- a/src/pages/workspace/WorkspaceMemberRoleSelectionModal.tsx
+++ b/src/pages/workspace/WorkspaceMemberRoleSelectionModal.tsx
@@ -44,6 +44,7 @@ function WorkspaceMemberDetailsRoleSelectionModal({isVisible, items, onRoleChang
             onModalHide={onClose}
             hideModalContentWhileAnimating
             useNativeDriver
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ScreenWrapper
                 testID={WorkspaceMemberDetailsRoleSelectionModal.displayName}
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.tsx b/src/pages/workspace/WorkspaceNewRoomPage.tsx
index 000f61510acd5..c25252f07954b 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.tsx
+++ b/src/pages/workspace/WorkspaceNewRoomPage.tsx
@@ -217,6 +217,7 @@ function WorkspaceNewRoomPage() {
                 title={translate('workspace.emptyWorkspace.notFound')}
                 subtitle={translate('workspace.emptyWorkspace.description')}
                 shouldShowLink={false}
+                addBottomSafeAreaPadding
             />
             <Button
                 success
@@ -237,7 +238,7 @@ function WorkspaceNewRoomPage() {
     return (
         <ScreenWrapper
             shouldEnableKeyboardAvoidingView={false}
-            includeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldShowOfflineIndicator={false}
             includePaddingTop={false}
             shouldEnablePickerAvoiding={false}
@@ -253,6 +254,7 @@ function WorkspaceNewRoomPage() {
                     behavior="padding"
                     // Offset is needed as KeyboardAvoidingView in nested inside of TabNavigator instead of wrapping whole screen.
                     // This is because when wrapping whole screen the screen was freezing when changing Tabs.
+                    shouldOffsetBottomSafeAreaPadding
                     keyboardVerticalOffset={variables.contentHeaderHeight + variables.tabSelectorButtonHeight + variables.tabSelectorButtonPadding + top}
                 >
                     <FormProvider
@@ -262,6 +264,7 @@ function WorkspaceNewRoomPage() {
                         validate={validate}
                         onSubmit={submit}
                         enabledWhenOffline
+                        addBottomSafeAreaPadding
                     >
                         <View style={styles.mb5}>
                             <InputWrapper
diff --git a/src/pages/workspace/categories/CategoryApproverPage.tsx b/src/pages/workspace/categories/CategoryApproverPage.tsx
index 78f5f579bf932..80841ec6c3d63 100644
--- a/src/pages/workspace/categories/CategoryApproverPage.tsx
+++ b/src/pages/workspace/categories/CategoryApproverPage.tsx
@@ -35,7 +35,7 @@ function CategoryApproverPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 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..01b66d7a7642f 100644
--- a/src/pages/workspace/categories/CategoryDefaultTaxRatePage.tsx
+++ b/src/pages/workspace/categories/CategoryDefaultTaxRatePage.tsx
@@ -58,7 +58,7 @@ function CategoryDefaultTaxRatePage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={CategoryDefaultTaxRatePage.displayName}
                 shouldEnableMaxHeight
@@ -86,6 +86,7 @@ function CategoryDefaultTaxRatePage({
                     shouldSingleExecuteRowSelect
                     containerStyle={[styles.pt3]}
                     initiallyFocusedOptionKey={selectedTaxRate}
+                    addBottomSafeAreaPadding
                 />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/categories/CategoryDescriptionHintPage.tsx b/src/pages/workspace/categories/CategoryDescriptionHintPage.tsx
index e33719596feda..1f0aac94f5b28 100644
--- a/src/pages/workspace/categories/CategoryDescriptionHintPage.tsx
+++ b/src/pages/workspace/categories/CategoryDescriptionHintPage.tsx
@@ -43,7 +43,8 @@ function CategoryDescriptionHintPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={CategoryDescriptionHintPage.displayName}
                 shouldEnableMaxHeight
@@ -61,6 +62,8 @@ function CategoryDescriptionHintPage({
                     }}
                     submitButtonText={translate('common.save')}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
+                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <Text style={styles.pb5}>{translate('workspace.rules.categoryRules.descriptionHintDescription', {categoryName})}</Text>
diff --git a/src/pages/workspace/categories/CategoryFlagAmountsOverPage.tsx b/src/pages/workspace/categories/CategoryFlagAmountsOverPage.tsx
index dd80757749dd7..e01b45de67419 100644
--- a/src/pages/workspace/categories/CategoryFlagAmountsOverPage.tsx
+++ b/src/pages/workspace/categories/CategoryFlagAmountsOverPage.tsx
@@ -54,7 +54,8 @@ function CategoryFlagAmountsOverPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={CategoryFlagAmountsOverPage.displayName}
                 shouldEnableMaxHeight
@@ -73,6 +74,8 @@ function CategoryFlagAmountsOverPage({
                     submitButtonText={translate('workspace.editor.save')}
                     enabledWhenOffline
                     submitButtonStyles={styles.ph5}
+                    addBottomSafeAreaPadding
+                    shouldSubmitButtonStickToBottom
                 >
                     <View style={[styles.mb4, styles.pt3, styles.ph5]}>
                         <Text style={styles.pb5}>{translate('workspace.rules.categoryRules.flagAmountsOverDescription', {categoryName})}</Text>
diff --git a/src/pages/workspace/categories/CategoryGLCodePage.tsx b/src/pages/workspace/categories/CategoryGLCodePage.tsx
index 86dc767ef6d0a..d9b51dbe84f6b 100644
--- a/src/pages/workspace/categories/CategoryGLCodePage.tsx
+++ b/src/pages/workspace/categories/CategoryGLCodePage.tsx
@@ -56,7 +56,8 @@ function CategoryGLCodePage({route}: EditCategoryPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={CategoryGLCodePage.displayName}
                 shouldEnableMaxHeight
@@ -77,6 +78,8 @@ function CategoryGLCodePage({route}: EditCategoryPageProps) {
                     submitButtonText={translate('common.save')}
                     style={[styles.mh5, styles.flex1]}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
+                    shouldSubmitButtonStickToBottom
                 >
                     <InputWrapper
                         ref={inputCallbackRef}
diff --git a/src/pages/workspace/categories/CategoryPayrollCodePage.tsx b/src/pages/workspace/categories/CategoryPayrollCodePage.tsx
index b6e14a3968f9c..47a5347b11d78 100644
--- a/src/pages/workspace/categories/CategoryPayrollCodePage.tsx
+++ b/src/pages/workspace/categories/CategoryPayrollCodePage.tsx
@@ -56,7 +56,8 @@ function CategoryPayrollCodePage({route}: EditCategoryPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={CategoryPayrollCodePage.displayName}
                 shouldEnableMaxHeight
@@ -77,6 +78,8 @@ function CategoryPayrollCodePage({route}: EditCategoryPageProps) {
                     submitButtonText={translate('common.save')}
                     style={[styles.mh5, styles.flex1]}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
+                    shouldSubmitButtonStickToBottom
                 >
                     <InputWrapper
                         ref={inputCallbackRef}
diff --git a/src/pages/workspace/categories/CategoryRequireReceiptsOverPage.tsx b/src/pages/workspace/categories/CategoryRequireReceiptsOverPage.tsx
index 119786e3b28e8..13a91483358c9 100644
--- a/src/pages/workspace/categories/CategoryRequireReceiptsOverPage.tsx
+++ b/src/pages/workspace/categories/CategoryRequireReceiptsOverPage.tsx
@@ -79,7 +79,7 @@ function CategoryRequireReceiptsOverPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={CategoryRequireReceiptsOverPage.displayName}
                 shouldEnableMaxHeight
@@ -102,6 +102,7 @@ function CategoryRequireReceiptsOverPage({
                     shouldSingleExecuteRowSelect
                     containerStyle={[styles.pt3]}
                     initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+                    addBottomSafeAreaPadding
                 />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/categories/CategorySettingsPage.tsx b/src/pages/workspace/categories/CategorySettingsPage.tsx
index 983795fd3e7cf..5b58491885e1a 100644
--- a/src/pages/workspace/categories/CategorySettingsPage.tsx
+++ b/src/pages/workspace/categories/CategorySettingsPage.tsx
@@ -139,202 +139,201 @@ function CategorySettingsPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={CategorySettingsPage.displayName}
             >
-                {({safeAreaPaddingBottomStyle}) => (
-                    <>
-                        <HeaderWithBackButton
-                            title={categoryName}
-                            onBackButtonPress={navigateBack}
+                <HeaderWithBackButton
+                    title={categoryName}
+                    onBackButtonPress={navigateBack}
+                />
+                <ConfirmModal
+                    isVisible={deleteCategoryConfirmModalVisible}
+                    onConfirm={deleteCategory}
+                    onCancel={() => setDeleteCategoryConfirmModalVisible(false)}
+                    title={translate('workspace.categories.deleteCategory')}
+                    prompt={translate('workspace.categories.deleteCategoryPrompt')}
+                    confirmText={translate('common.delete')}
+                    cancelText={translate('common.cancel')}
+                    danger
+                />
+                <ScrollView
+                    contentContainerStyle={[styles.flexGrow1]}
+                    addBottomSafeAreaPadding
+                >
+                    <OfflineWithFeedback
+                        errors={getLatestErrorMessageField(policyCategory)}
+                        pendingAction={policyCategory?.pendingFields?.enabled}
+                        errorRowStyles={styles.mh5}
+                        onClose={() => clearCategoryErrors(policyID, categoryName)}
+                    >
+                        <View style={[styles.mt2, styles.mh5]}>
+                            <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                                <Text style={[styles.flexShrink1, styles.mr2]}>{translate('workspace.categories.enableCategory')}</Text>
+                                <Switch
+                                    isOn={policyCategory.enabled}
+                                    accessibilityLabel={translate('workspace.categories.enableCategory')}
+                                    onToggle={updateWorkspaceRequiresCategory}
+                                />
+                            </View>
+                        </View>
+                    </OfflineWithFeedback>
+                    <OfflineWithFeedback pendingAction={policyCategory.pendingFields?.name}>
+                        <MenuItemWithTopDescription
+                            title={policyCategory.name}
+                            description={translate('common.name')}
+                            onPress={navigateToEditCategory}
+                            shouldShowRightIcon
+                        />
+                    </OfflineWithFeedback>
+                    <OfflineWithFeedback pendingAction={policyCategory.pendingFields?.['GL Code']}>
+                        <MenuItemWithTopDescription
+                            title={policyCategory['GL Code']}
+                            description={translate('workspace.categories.glCode')}
+                            onPress={() => {
+                                if (!isControlPolicy(policy)) {
+                                    Navigation.navigate(
+                                        ROUTES.WORKSPACE_UPGRADE.getRoute(
+                                            policyID,
+                                            CONST.UPGRADE_FEATURE_INTRO_MAPPING.glAndPayrollCodes.alias,
+                                            isQuickSettingsFlow
+                                                ? ROUTES.SETTINGS_CATEGORY_GL_CODE.getRoute(policyID, policyCategory.name, backTo)
+                                                : ROUTES.WORKSPACE_CATEGORY_GL_CODE.getRoute(policyID, policyCategory.name),
+                                        ),
+                                    );
+                                    return;
+                                }
+                                Navigation.navigate(
+                                    isQuickSettingsFlow
+                                        ? ROUTES.SETTINGS_CATEGORY_GL_CODE.getRoute(policyID, policyCategory.name, backTo)
+                                        : ROUTES.WORKSPACE_CATEGORY_GL_CODE.getRoute(policyID, policyCategory.name),
+                                );
+                            }}
+                            shouldShowRightIcon
                         />
-                        <ConfirmModal
-                            isVisible={deleteCategoryConfirmModalVisible}
-                            onConfirm={deleteCategory}
-                            onCancel={() => setDeleteCategoryConfirmModalVisible(false)}
-                            title={translate('workspace.categories.deleteCategory')}
-                            prompt={translate('workspace.categories.deleteCategoryPrompt')}
-                            confirmText={translate('common.delete')}
-                            cancelText={translate('common.cancel')}
-                            danger
+                    </OfflineWithFeedback>
+                    <OfflineWithFeedback pendingAction={policyCategory.pendingFields?.['Payroll Code']}>
+                        <MenuItemWithTopDescription
+                            title={policyCategory['Payroll Code']}
+                            description={translate('workspace.categories.payrollCode')}
+                            onPress={() => {
+                                if (!isControlPolicy(policy)) {
+                                    Navigation.navigate(
+                                        ROUTES.WORKSPACE_UPGRADE.getRoute(
+                                            policyID,
+                                            CONST.UPGRADE_FEATURE_INTRO_MAPPING.glAndPayrollCodes.alias,
+                                            ROUTES.WORKSPACE_CATEGORY_PAYROLL_CODE.getRoute(policyID, policyCategory.name),
+                                        ),
+                                    );
+                                    return;
+                                }
+                                Navigation.navigate(
+                                    isQuickSettingsFlow
+                                        ? ROUTES.SETTINGS_CATEGORY_PAYROLL_CODE.getRoute(policyID, policyCategory.name, backTo)
+                                        : ROUTES.WORKSPACE_CATEGORY_PAYROLL_CODE.getRoute(policyID, policyCategory.name),
+                                );
+                            }}
+                            shouldShowRightIcon
                         />
-                        <ScrollView contentContainerStyle={[styles.flexGrow1, safeAreaPaddingBottomStyle]}>
-                            <OfflineWithFeedback
-                                errors={getLatestErrorMessageField(policyCategory)}
-                                pendingAction={policyCategory?.pendingFields?.enabled}
-                                errorRowStyles={styles.mh5}
-                                onClose={() => clearCategoryErrors(policyID, categoryName)}
-                            >
+                    </OfflineWithFeedback>
+
+                    {!!policy?.areRulesEnabled && (
+                        <>
+                            <View style={[styles.mh5, styles.pt3, styles.borderTop]}>
+                                <Text style={[styles.textNormal, styles.textStrong, styles.mv3]}>{translate('workspace.rules.categoryRules.title')}</Text>
+                            </View>
+                            <OfflineWithFeedback pendingAction={policyCategory?.pendingFields?.areCommentsRequired}>
                                 <View style={[styles.mt2, styles.mh5]}>
                                     <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
-                                        <Text style={[styles.flexShrink1, styles.mr2]}>{translate('workspace.categories.enableCategory')}</Text>
+                                        <Text style={[styles.flexShrink1, styles.mr2]}>{translate('workspace.rules.categoryRules.requireDescription')}</Text>
                                         <Switch
-                                            isOn={policyCategory.enabled}
-                                            accessibilityLabel={translate('workspace.categories.enableCategory')}
-                                            onToggle={updateWorkspaceRequiresCategory}
+                                            isOn={policyCategory?.areCommentsRequired ?? false}
+                                            accessibilityLabel={translate('workspace.rules.categoryRules.requireDescription')}
+                                            onToggle={() => {
+                                                if (policyCategory.commentHint && areCommentsRequired) {
+                                                    setWorkspaceCategoryDescriptionHint(policyID, categoryName, '');
+                                                }
+                                                setPolicyCategoryDescriptionRequired(policyID, categoryName, !areCommentsRequired);
+                                            }}
                                         />
                                     </View>
                                 </View>
                             </OfflineWithFeedback>
-                            <OfflineWithFeedback pendingAction={policyCategory.pendingFields?.name}>
+                            {!!policyCategory?.areCommentsRequired && (
+                                <OfflineWithFeedback pendingAction={policyCategory.pendingFields?.commentHint}>
+                                    <MenuItemWithTopDescription
+                                        title={policyCategory?.commentHint}
+                                        description={translate('workspace.rules.categoryRules.descriptionHint')}
+                                        onPress={() => {
+                                            Navigation.navigate(ROUTES.WORSKPACE_CATEGORY_DESCRIPTION_HINT.getRoute(policyID, policyCategory.name));
+                                        }}
+                                        shouldShowRightIcon
+                                    />
+                                </OfflineWithFeedback>
+                            )}
+                            <MenuItemWithTopDescription
+                                title={approverText}
+                                description={translate('workspace.rules.categoryRules.approver')}
+                                onPress={() => {
+                                    Navigation.navigate(ROUTES.WORSKPACE_CATEGORY_APPROVER.getRoute(policyID, policyCategory.name));
+                                }}
+                                shouldShowRightIcon
+                                // disabled={approverDisabled}
+                            />
+                            {approverDisabled && (
+                                <Text style={[styles.flexRow, styles.alignItemsCenter, styles.mv2, styles.mh5]}>
+                                    <Text style={[styles.textLabel, styles.colorMuted]}>{translate('workspace.rules.categoryRules.goTo')}</Text>{' '}
+                                    <TextLink
+                                        style={[styles.link, styles.label]}
+                                        onPress={() => Navigation.navigate(ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID))}
+                                    >
+                                        {translate('workspace.common.moreFeatures')}
+                                    </TextLink>{' '}
+                                    <Text style={[styles.textLabel, styles.colorMuted]}>{translate('workspace.rules.categoryRules.andEnableWorkflows')}</Text>
+                                </Text>
+                            )}
+                            {!!policy?.tax?.trackingEnabled && (
                                 <MenuItemWithTopDescription
-                                    title={policyCategory.name}
-                                    description={translate('common.name')}
-                                    onPress={navigateToEditCategory}
+                                    title={defaultTaxRateText}
+                                    description={translate('workspace.rules.categoryRules.defaultTaxRate')}
+                                    onPress={() => {
+                                        Navigation.navigate(ROUTES.WORSKPACE_CATEGORY_DEFAULT_TAX_RATE.getRoute(policyID, policyCategory.name));
+                                    }}
                                     shouldShowRightIcon
                                 />
-                            </OfflineWithFeedback>
-                            <OfflineWithFeedback pendingAction={policyCategory.pendingFields?.['GL Code']}>
+                            )}
+
+                            <OfflineWithFeedback pendingAction={policyCategory.pendingFields?.maxExpenseAmount}>
                                 <MenuItemWithTopDescription
-                                    title={policyCategory['GL Code']}
-                                    description={translate('workspace.categories.glCode')}
+                                    title={flagAmountsOverText}
+                                    description={translate('workspace.rules.categoryRules.flagAmountsOver')}
                                     onPress={() => {
-                                        if (!isControlPolicy(policy)) {
-                                            Navigation.navigate(
-                                                ROUTES.WORKSPACE_UPGRADE.getRoute(
-                                                    policyID,
-                                                    CONST.UPGRADE_FEATURE_INTRO_MAPPING.glAndPayrollCodes.alias,
-                                                    isQuickSettingsFlow
-                                                        ? ROUTES.SETTINGS_CATEGORY_GL_CODE.getRoute(policyID, policyCategory.name, backTo)
-                                                        : ROUTES.WORKSPACE_CATEGORY_GL_CODE.getRoute(policyID, policyCategory.name),
-                                                ),
-                                            );
-                                            return;
-                                        }
-                                        Navigation.navigate(
-                                            isQuickSettingsFlow
-                                                ? ROUTES.SETTINGS_CATEGORY_GL_CODE.getRoute(policyID, policyCategory.name, backTo)
-                                                : ROUTES.WORKSPACE_CATEGORY_GL_CODE.getRoute(policyID, policyCategory.name),
-                                        );
+                                        Navigation.navigate(ROUTES.WORSKPACE_CATEGORY_FLAG_AMOUNTS_OVER.getRoute(policyID, policyCategory.name));
                                     }}
                                     shouldShowRightIcon
                                 />
                             </OfflineWithFeedback>
-                            <OfflineWithFeedback pendingAction={policyCategory.pendingFields?.['Payroll Code']}>
+                            <OfflineWithFeedback pendingAction={policyCategory.pendingFields?.maxAmountNoReceipt}>
                                 <MenuItemWithTopDescription
-                                    title={policyCategory['Payroll Code']}
-                                    description={translate('workspace.categories.payrollCode')}
+                                    title={requireReceiptsOverText}
+                                    description={translate(`workspace.rules.categoryRules.requireReceiptsOver`)}
                                     onPress={() => {
-                                        if (!isControlPolicy(policy)) {
-                                            Navigation.navigate(
-                                                ROUTES.WORKSPACE_UPGRADE.getRoute(
-                                                    policyID,
-                                                    CONST.UPGRADE_FEATURE_INTRO_MAPPING.glAndPayrollCodes.alias,
-                                                    ROUTES.WORKSPACE_CATEGORY_PAYROLL_CODE.getRoute(policyID, policyCategory.name),
-                                                ),
-                                            );
-                                            return;
-                                        }
-                                        Navigation.navigate(
-                                            isQuickSettingsFlow
-                                                ? ROUTES.SETTINGS_CATEGORY_PAYROLL_CODE.getRoute(policyID, policyCategory.name, backTo)
-                                                : ROUTES.WORKSPACE_CATEGORY_PAYROLL_CODE.getRoute(policyID, policyCategory.name),
-                                        );
+                                        Navigation.navigate(ROUTES.WORSKPACE_CATEGORY_REQUIRE_RECEIPTS_OVER.getRoute(policyID, policyCategory.name));
                                     }}
                                     shouldShowRightIcon
                                 />
                             </OfflineWithFeedback>
+                        </>
+                    )}
 
-                            {!!policy?.areRulesEnabled && (
-                                <>
-                                    <View style={[styles.mh5, styles.pt3, styles.borderTop]}>
-                                        <Text style={[styles.textNormal, styles.textStrong, styles.mv3]}>{translate('workspace.rules.categoryRules.title')}</Text>
-                                    </View>
-                                    <OfflineWithFeedback pendingAction={policyCategory?.pendingFields?.areCommentsRequired}>
-                                        <View style={[styles.mt2, styles.mh5]}>
-                                            <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
-                                                <Text style={[styles.flexShrink1, styles.mr2]}>{translate('workspace.rules.categoryRules.requireDescription')}</Text>
-                                                <Switch
-                                                    isOn={policyCategory?.areCommentsRequired ?? false}
-                                                    accessibilityLabel={translate('workspace.rules.categoryRules.requireDescription')}
-                                                    onToggle={() => {
-                                                        if (policyCategory.commentHint && areCommentsRequired) {
-                                                            setWorkspaceCategoryDescriptionHint(policyID, categoryName, '');
-                                                        }
-                                                        setPolicyCategoryDescriptionRequired(policyID, categoryName, !areCommentsRequired);
-                                                    }}
-                                                />
-                                            </View>
-                                        </View>
-                                    </OfflineWithFeedback>
-                                    {!!policyCategory?.areCommentsRequired && (
-                                        <OfflineWithFeedback pendingAction={policyCategory.pendingFields?.commentHint}>
-                                            <MenuItemWithTopDescription
-                                                title={policyCategory?.commentHint}
-                                                description={translate('workspace.rules.categoryRules.descriptionHint')}
-                                                onPress={() => {
-                                                    Navigation.navigate(ROUTES.WORSKPACE_CATEGORY_DESCRIPTION_HINT.getRoute(policyID, policyCategory.name));
-                                                }}
-                                                shouldShowRightIcon
-                                            />
-                                        </OfflineWithFeedback>
-                                    )}
-                                    <MenuItemWithTopDescription
-                                        title={approverText}
-                                        description={translate('workspace.rules.categoryRules.approver')}
-                                        onPress={() => {
-                                            Navigation.navigate(ROUTES.WORSKPACE_CATEGORY_APPROVER.getRoute(policyID, policyCategory.name));
-                                        }}
-                                        shouldShowRightIcon
-                                        disabled={approverDisabled}
-                                    />
-                                    {approverDisabled && (
-                                        <Text style={[styles.flexRow, styles.alignItemsCenter, styles.mv2, styles.mh5]}>
-                                            <Text style={[styles.textLabel, styles.colorMuted]}>{translate('workspace.rules.categoryRules.goTo')}</Text>{' '}
-                                            <TextLink
-                                                style={[styles.link, styles.label]}
-                                                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID))}
-                                            >
-                                                {translate('workspace.common.moreFeatures')}
-                                            </TextLink>{' '}
-                                            <Text style={[styles.textLabel, styles.colorMuted]}>{translate('workspace.rules.categoryRules.andEnableWorkflows')}</Text>
-                                        </Text>
-                                    )}
-                                    {!!policy?.tax?.trackingEnabled && (
-                                        <MenuItemWithTopDescription
-                                            title={defaultTaxRateText}
-                                            description={translate('workspace.rules.categoryRules.defaultTaxRate')}
-                                            onPress={() => {
-                                                Navigation.navigate(ROUTES.WORSKPACE_CATEGORY_DEFAULT_TAX_RATE.getRoute(policyID, policyCategory.name));
-                                            }}
-                                            shouldShowRightIcon
-                                        />
-                                    )}
-
-                                    <OfflineWithFeedback pendingAction={policyCategory.pendingFields?.maxExpenseAmount}>
-                                        <MenuItemWithTopDescription
-                                            title={flagAmountsOverText}
-                                            description={translate('workspace.rules.categoryRules.flagAmountsOver')}
-                                            onPress={() => {
-                                                Navigation.navigate(ROUTES.WORSKPACE_CATEGORY_FLAG_AMOUNTS_OVER.getRoute(policyID, policyCategory.name));
-                                            }}
-                                            shouldShowRightIcon
-                                        />
-                                    </OfflineWithFeedback>
-                                    <OfflineWithFeedback pendingAction={policyCategory.pendingFields?.maxAmountNoReceipt}>
-                                        <MenuItemWithTopDescription
-                                            title={requireReceiptsOverText}
-                                            description={translate(`workspace.rules.categoryRules.requireReceiptsOver`)}
-                                            onPress={() => {
-                                                Navigation.navigate(ROUTES.WORSKPACE_CATEGORY_REQUIRE_RECEIPTS_OVER.getRoute(policyID, policyCategory.name));
-                                            }}
-                                            shouldShowRightIcon
-                                        />
-                                    </OfflineWithFeedback>
-                                </>
-                            )}
-
-                            {!isThereAnyAccountingConnection && (
-                                <MenuItem
-                                    icon={Trashcan}
-                                    title={translate('common.delete')}
-                                    onPress={() => setDeleteCategoryConfirmModalVisible(true)}
-                                />
-                            )}
-                        </ScrollView>
-                    </>
-                )}
+                    {!isThereAnyAccountingConnection && (
+                        <MenuItem
+                            icon={Trashcan}
+                            title={translate('common.delete')}
+                            onPress={() => setDeleteCategoryConfirmModalVisible(true)}
+                        />
+                    )}
+                </ScrollView>
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/categories/EditCategoryPage.tsx b/src/pages/workspace/categories/EditCategoryPage.tsx
index 68332f01a64f1..85a5883977417 100644
--- a/src/pages/workspace/categories/EditCategoryPage.tsx
+++ b/src/pages/workspace/categories/EditCategoryPage.tsx
@@ -70,7 +70,8 @@ function EditCategoryPage({route}: EditCategoryPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={EditCategoryPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/categories/ExpenseLimitTypeSelector/ExpenseLimitTypeSelectorModal.tsx b/src/pages/workspace/categories/ExpenseLimitTypeSelector/ExpenseLimitTypeSelectorModal.tsx
index 7563bea7d031b..509fbeb97c7f8 100644
--- a/src/pages/workspace/categories/ExpenseLimitTypeSelector/ExpenseLimitTypeSelectorModal.tsx
+++ b/src/pages/workspace/categories/ExpenseLimitTypeSelector/ExpenseLimitTypeSelectorModal.tsx
@@ -46,11 +46,12 @@ function ExpenseLimitTypeSelectorModal({isVisible, currentExpenseLimitType, onEx
             onModalHide={onClose}
             hideModalContentWhileAnimating
             useNativeDriver
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ScreenWrapper
                 style={[styles.pb0]}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 testID={ExpenseLimitTypeSelectorModal.displayName}
             >
                 <HeaderWithBackButton
@@ -67,6 +68,7 @@ function ExpenseLimitTypeSelectorModal({isVisible, currentExpenseLimitType, onEx
                     initiallyFocusedOptionKey={currentExpenseLimitType}
                     isAlternateTextMultilineSupported
                     alternateTextNumberOfLines={3}
+                    addBottomSafeAreaPadding
                 />
             </ScreenWrapper>
         </Modal>
diff --git a/src/pages/workspace/categories/ImportedCategoriesPage.tsx b/src/pages/workspace/categories/ImportedCategoriesPage.tsx
index 88cd5ca333d5c..a65576457b72d 100644
--- a/src/pages/workspace/categories/ImportedCategoriesPage.tsx
+++ b/src/pages/workspace/categories/ImportedCategoriesPage.tsx
@@ -135,7 +135,7 @@ function ImportedCategoriesPage({route}: ImportedCategoriesPageProps) {
     return (
         <ScreenWrapper
             testID={ImportedCategoriesPage.displayName}
-            includeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <HeaderWithBackButton
                 title={translate('workspace.categories.importCategories')}
diff --git a/src/pages/workspace/members/ImportedMembersPage.tsx b/src/pages/workspace/members/ImportedMembersPage.tsx
index e0204e40f4fa3..6bd8524f5795f 100644
--- a/src/pages/workspace/members/ImportedMembersPage.tsx
+++ b/src/pages/workspace/members/ImportedMembersPage.tsx
@@ -106,7 +106,7 @@ function ImportedMembersPage({route}: ImportedMembersPageProps) {
     return (
         <ScreenWrapper
             testID={ImportedMembersPage.displayName}
-            includeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <HeaderWithBackButton
                 title={translate('workspace.people.importMembers')}
diff --git a/src/pages/workspace/perDiem/ImportedPerDiemPage.tsx b/src/pages/workspace/perDiem/ImportedPerDiemPage.tsx
index 4c778538267d8..b85b2d574e58f 100644
--- a/src/pages/workspace/perDiem/ImportedPerDiemPage.tsx
+++ b/src/pages/workspace/perDiem/ImportedPerDiemPage.tsx
@@ -140,7 +140,7 @@ function ImportedPerDiemPage({route}: ImportedPerDiemPageProps) {
     return (
         <ScreenWrapper
             testID={ImportedPerDiemPage.displayName}
-            includeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <HeaderWithBackButton
                 title={translate('workspace.perDiem.importPerDiemRates')}
diff --git a/src/pages/workspace/tags/EditTagPage.tsx b/src/pages/workspace/tags/EditTagPage.tsx
index dbf60f2452433..1b9bc87a5aa55 100644
--- a/src/pages/workspace/tags/EditTagPage.tsx
+++ b/src/pages/workspace/tags/EditTagPage.tsx
@@ -77,7 +77,8 @@ function EditTagPage({route}: EditTagPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={EditTagPage.displayName}
                 shouldEnableMaxHeight
@@ -99,6 +100,8 @@ function EditTagPage({route}: EditTagPageProps) {
                     validate={validate}
                     style={[styles.mh5, styles.flex1]}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
+                    shouldSubmitButtonStickToBottom
                 >
                     <InputWrapper
                         InputComponent={TextInput}
diff --git a/src/pages/workspace/tags/ImportedTagsPage.tsx b/src/pages/workspace/tags/ImportedTagsPage.tsx
index b15a3578e6d76..8fd3c1245d47c 100644
--- a/src/pages/workspace/tags/ImportedTagsPage.tsx
+++ b/src/pages/workspace/tags/ImportedTagsPage.tsx
@@ -124,7 +124,7 @@ function ImportedTagsPage({route}: ImportedTagsPageProps) {
     return (
         <ScreenWrapper
             testID={ImportedTagsPage.displayName}
-            includeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <HeaderWithBackButton
                 title={translate('workspace.tags.importTags')}
diff --git a/src/pages/workspace/tags/TagApproverPage.tsx b/src/pages/workspace/tags/TagApproverPage.tsx
index 9ad97a1738a75..1d263f9e93c73 100644
--- a/src/pages/workspace/tags/TagApproverPage.tsx
+++ b/src/pages/workspace/tags/TagApproverPage.tsx
@@ -38,7 +38,7 @@ function TagApproverPage({route}: TagApproverPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={TagApproverPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/tags/TagGLCodePage.tsx b/src/pages/workspace/tags/TagGLCodePage.tsx
index f6227619b7125..b1c7922d66cb3 100644
--- a/src/pages/workspace/tags/TagGLCodePage.tsx
+++ b/src/pages/workspace/tags/TagGLCodePage.tsx
@@ -65,7 +65,8 @@ function TagGLCodePage({route}: EditTagGLCodePageProps) {
             shouldBeBlocked={PolicyUtils.hasAccountingConnections(policy)}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={TagGLCodePage.displayName}
                 shouldEnableMaxHeight
@@ -80,6 +81,8 @@ function TagGLCodePage({route}: EditTagGLCodePageProps) {
                     submitButtonText={translate('common.save')}
                     style={[styles.mh5, styles.flex1]}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
+                    shouldSubmitButtonStickToBottom
                 >
                     <InputWrapper
                         ref={inputCallbackRef}
diff --git a/src/pages/workspace/tags/TagSettingsPage.tsx b/src/pages/workspace/tags/TagSettingsPage.tsx
index e312e82bd8c40..21af4920f6c2d 100644
--- a/src/pages/workspace/tags/TagSettingsPage.tsx
+++ b/src/pages/workspace/tags/TagSettingsPage.tsx
@@ -124,7 +124,7 @@ function TagSettingsPage({route, navigation}: TagSettingsPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={TagSettingsPage.displayName}
             >
diff --git a/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx
index 3568ff7e1ba0a..4ec5a78214e89 100644
--- a/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx
@@ -282,7 +282,7 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={WorkspaceViewTagsPage.displayName}
             >
@@ -358,6 +358,7 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) {
                         customListHeader={getCustomListHeader()}
                         shouldPreventDefaultFocusOnSelectRow={!canUseTouchScreen()}
                         listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
+                        addBottomSafeAreaPadding
                         onDismissError={(item) => {
                             clearPolicyTagErrors(policyID, item.value, route.params.orderWeight);
                         }}

From 052ce04736569b0bf8477ef586b1a77d367cc3c1 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Mon, 24 Feb 2025 12:54:57 +0100
Subject: [PATCH 18/51] fix: more workspace migrations

---
 .../WorkspaceAutoReportingFrequencyPage.tsx         |  4 +++-
 .../workflows/approvals/ApprovalWorkflowEditor.tsx  |  1 +
 .../WorkspaceWorkflowsApprovalsApproverPage.tsx     | 13 ++++++++++++-
 .../WorkspaceWorkflowsApprovalsCreatePage.tsx       |  8 ++++++--
 .../WorkspaceWorkflowsApprovalsEditPage.tsx         |  8 ++++++--
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx b/src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx
index b6821069fdf67..921c3386bdff4 100644
--- a/src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx
@@ -109,7 +109,7 @@ function WorkspaceAutoReportingFrequencyPage({policy, route}: WorkspaceAutoRepor
             featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 testID={WorkspaceAutoReportingFrequencyPage.displayName}
             >
                 <FullPageNotFoundView
@@ -117,6 +117,7 @@ function WorkspaceAutoReportingFrequencyPage({policy, route}: WorkspaceAutoRepor
                     onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
                     shouldShow={isEmptyObject(policy) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy) || !PolicyUtils.isPaidGroupPolicy(policy)}
                     subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
+                    addBottomSafeAreaPadding
                 >
                     <HeaderWithBackButton
                         title={translate('workflowsPage.submissionFrequency')}
@@ -135,6 +136,7 @@ function WorkspaceAutoReportingFrequencyPage({policy, route}: WorkspaceAutoRepor
                             onSelectRow={onSelectAutoReportingFrequency}
                             initiallyFocusedOptionKey={autoReportingFrequency}
                             shouldUpdateFocusedIndex
+                            addBottomSafeAreaPadding
                         />
                     </OfflineWithFeedback>
                 </FullPageNotFoundView>
diff --git a/src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx b/src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx
index 1ac3f67899935..9e104241a8eb1 100644
--- a/src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx
+++ b/src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx
@@ -121,6 +121,7 @@ function ApprovalWorkflowEditor({approvalWorkflow, removeApprovalWorkflow, polic
         <ScrollView
             style={[styles.flex1]}
             ref={ref}
+            addBottomSafeAreaPadding
         >
             <View style={[styles.mh5]}>
                 {approvalWorkflow.action === CONST.APPROVAL_WORKFLOW.ACTION.CREATE && (
diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx
index bb7e1d75325d1..08ba0bced0cf1 100644
--- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx
+++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx
@@ -35,6 +35,8 @@ import type SCREENS from '@src/SCREENS';
 import type {Icon} from '@src/types/onyx/OnyxCommon';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
+const FOOTER_BUTTON_CONTENT_PADDING = 80;
+
 type WorkspaceWorkflowsApprovalsApproverPageProps = WithPolicyAndFullscreenLoadingProps &
     PlatformStackScreenProps<WorkspaceSplitNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_APPROVER>;
 
@@ -202,6 +204,7 @@ function WorkspaceWorkflowsApprovalsApproverPage({policy, personalDetails, isLoa
                 onSubmit={nextStep}
                 containerStyles={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto]}
                 enabledWhenOffline
+                shouldBlendOpacity
             />
         );
     }, [isInitialCreationFlow, nextStep, selectedApproverEmail, shouldShowListEmptyContent, styles.flexBasisAuto, styles.flexGrow0, styles.flexReset, styles.flexShrink0, translate]);
@@ -250,12 +253,17 @@ function WorkspaceWorkflowsApprovalsApproverPage({policy, personalDetails, isLoa
             policyID={route.params.policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
         >
-            <ScreenWrapper testID={WorkspaceWorkflowsApprovalsApproverPage.displayName}>
+            <ScreenWrapper
+                testID={WorkspaceWorkflowsApprovalsApproverPage.displayName}
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
+            >
                 <FullPageNotFoundView
                     shouldShow={shouldShowNotFoundView}
                     subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
                     onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
                     onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
+                    addBottomSafeAreaPadding
                 >
                     <HeaderWithBackButton
                         title={translate('workflowsPage.approver')}
@@ -279,6 +287,9 @@ function WorkspaceWorkflowsApprovalsApproverPage({policy, personalDetails, isLoa
                         shouldShowListEmptyContent={shouldShowListEmptyContent}
                         shouldHighlightSelectedItem
                         shouldShowTextInput={shouldShowTextInput}
+                        addBottomSafeAreaPadding
+                        contentContainerStyle={{paddingBottom: FOOTER_BUTTON_CONTENT_PADDING}}
+                        shouldFooterContentStickToBottom
                     />
                 </FullPageNotFoundView>
             </ScreenWrapper>
diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsCreatePage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsCreatePage.tsx
index 418e2ec6a2224..cb5d8c8ed184f 100644
--- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsCreatePage.tsx
+++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsCreatePage.tsx
@@ -7,6 +7,7 @@ import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
+import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddingStyle';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
@@ -49,13 +50,15 @@ function WorkspaceWorkflowsApprovalsCreatePage({policy, isLoadingReportData = tr
         Navigation.dismissModal();
     }, [approvalWorkflow, route.params.policyID]);
 
+    const submitButtonContainerStyles = useBottomSafeSafeAreaPaddingStyle({addBottomSafeAreaPadding: true, style: [styles.mb5, styles.mh5]});
+
     return (
         <AccessOrNotFoundWrapper
             policyID={route.params.policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 testID={WorkspaceWorkflowsApprovalsCreatePage.displayName}
             >
                 <FullPageNotFoundView
@@ -63,6 +66,7 @@ function WorkspaceWorkflowsApprovalsCreatePage({policy, isLoadingReportData = tr
                     subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
                     onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
                     onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
+                    addBottomSafeAreaPadding
                 >
                     <HeaderWithBackButton
                         title={translate('workflowsCreateApprovalsPage.title')}
@@ -83,7 +87,7 @@ function WorkspaceWorkflowsApprovalsCreatePage({policy, isLoadingReportData = tr
                                     formRef.current?.scrollTo({y: 0, animated: true});
                                 }}
                                 buttonText={translate('workflowsCreateApprovalsPage.submitButton')}
-                                containerStyles={[styles.mb5, styles.mh5]}
+                                containerStyles={submitButtonContainerStyles}
                                 enabledWhenOffline
                             />
                         </>
diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
index 348fc1b3a2995..bfb4f93a273e6 100644
--- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
+++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
@@ -9,6 +9,7 @@ import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
+import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddingStyle';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
@@ -115,13 +116,15 @@ function WorkspaceWorkflowsApprovalsEditPage({policy, isLoadingReportData = true
         setInitialApprovalWorkflow(currentApprovalWorkflow);
     }, [currentApprovalWorkflow, defaultWorkflowMembers, initialApprovalWorkflow, usedApproverEmails]);
 
+    const submitButtonContainerStyles = useBottomSafeSafeAreaPaddingStyle({addBottomSafeAreaPadding: true, style: [styles.mb5, styles.mh5]});
+
     return (
         <AccessOrNotFoundWrapper
             policyID={route.params.policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 testID={WorkspaceWorkflowsApprovalsEditPage.displayName}
             >
                 <FullPageNotFoundView
@@ -129,6 +132,7 @@ function WorkspaceWorkflowsApprovalsEditPage({policy, isLoadingReportData = true
                     subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
                     onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
                     onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
+                    addBottomSafeAreaPadding
                 >
                     <HeaderWithBackButton
                         title={translate('workflowsEditApprovalsPage.title')}
@@ -150,7 +154,7 @@ function WorkspaceWorkflowsApprovalsEditPage({policy, isLoadingReportData = true
                                     formRef.current?.scrollTo({y: 0, animated: true});
                                 }}
                                 buttonText={translate('common.save')}
-                                containerStyles={[styles.mb5, styles.mh5]}
+                                containerStyles={submitButtonContainerStyles}
                                 enabledWhenOffline
                             />
                         </>

From d17bd6792066b572e70be012b13ef5ec3360e329 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Mon, 24 Feb 2025 22:13:45 +0100
Subject: [PATCH 19/51] fix: monthly offset page

---
 .../workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx b/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx
index d376f4cb7d365..fd703381342df 100644
--- a/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx
@@ -78,7 +78,7 @@ function WorkspaceAutoReportingMonthlyOffsetPage({policy, route}: WorkspaceAutoR
             featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 testID={WorkspaceAutoReportingMonthlyOffsetPage.displayName}
             >
                 <FullPageNotFoundView
@@ -86,6 +86,7 @@ function WorkspaceAutoReportingMonthlyOffsetPage({policy, route}: WorkspaceAutoR
                     onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
                     shouldShow={isEmptyObject(policy) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy) || !PolicyUtils.isPaidGroupPolicy(policy)}
                     subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
+                    addBottomSafeAreaPadding
                 >
                     <HeaderWithBackButton
                         title={translate('workflowsPage.submissionFrequency')}
@@ -103,6 +104,7 @@ function WorkspaceAutoReportingMonthlyOffsetPage({policy, route}: WorkspaceAutoR
                         shouldSingleExecuteRowSelect
                         initiallyFocusedOptionKey={offset.toString()}
                         showScrollIndicator
+                        addBottomSafeAreaPadding
                     />
                 </FullPageNotFoundView>
             </ScreenWrapper>

From 365e010c7839817776ba62b83f4eb6e41c59188d Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Tue, 25 Feb 2025 13:49:55 +0100
Subject: [PATCH 20/51] refactor: more workspace pages

---
 src/pages/workspace/WorkspaceInvitePage.tsx              | 2 +-
 src/pages/workspace/companyCards/addNew/CardNameStep.tsx | 3 ++-
 src/pages/workspace/companyCards/addNew/CardTypeStep.tsx | 3 ++-
 .../workspace/companyCards/addNew/SelectBankStep.tsx     | 5 ++---
 .../workspace/companyCards/addNew/SelectFeedType.tsx     | 4 +++-
 .../WorkspaceWorkflowsApprovalsExpensesFromPage.tsx      | 9 ++++++++-
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index 727b4a2e847d1..1b7693297962f 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -359,7 +359,7 @@ function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
                     isLoadingNewOptions={!!isSearchingForReports}
                     contentContainerStyle={shouldUseEdgeToEdgeLayout && {paddingBottom: FOOTER_BUTTON_CONTENT_PADDING}}
                     addBottomSafeAreaPadding={shouldUseEdgeToEdgeLayout}
-                    shouldFooterContentStickToBottom={shouldUseEdgeToEdgeLayout}
+                    // shouldFooterContentStickToBottom={shouldUseEdgeToEdgeLayout}
                 />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/companyCards/addNew/CardNameStep.tsx b/src/pages/workspace/companyCards/addNew/CardNameStep.tsx
index b7f1c438ad6f2..1f2cd5b3428d2 100644
--- a/src/pages/workspace/companyCards/addNew/CardNameStep.tsx
+++ b/src/pages/workspace/companyCards/addNew/CardNameStep.tsx
@@ -49,7 +49,7 @@ function CardNameStep() {
     return (
         <ScreenWrapper
             testID={CardNameStep.displayName}
-            includeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
@@ -65,6 +65,7 @@ function CardNameStep() {
                 validate={validate}
                 style={[styles.mh5, styles.flexGrow1]}
                 enabledWhenOffline
+                addBottomSafeAreaPadding
             >
                 <InputWrapper
                     InputComponent={TextInput}
diff --git a/src/pages/workspace/companyCards/addNew/CardTypeStep.tsx b/src/pages/workspace/companyCards/addNew/CardTypeStep.tsx
index 26899ed9e50f6..169696be5592c 100644
--- a/src/pages/workspace/companyCards/addNew/CardTypeStep.tsx
+++ b/src/pages/workspace/companyCards/addNew/CardTypeStep.tsx
@@ -99,7 +99,7 @@ function CardTypeStep() {
     return (
         <ScreenWrapper
             testID={CardTypeStep.displayName}
-            includeSafeAreaPaddingBottom={false}
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
@@ -122,6 +122,7 @@ function CardTypeStep() {
                 showConfirmButton
                 confirmButtonText={translate('common.next')}
                 onConfirm={submit}
+                addBottomSafeAreaPadding
             >
                 {isError && (
                     <View style={[styles.ph5, styles.mb3]}>
diff --git a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx
index 28986ea40531e..7441ab7053de2 100644
--- a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx
+++ b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx
@@ -94,12 +94,11 @@ function SelectBankStep() {
                 showConfirmButton
                 confirmButtonText={translate('common.next')}
                 onConfirm={submit}
-                confirmButtonStyles={styles.mt5}
                 addBottomSafeAreaPadding
-                shouldFooterContentStickToBottom
+                shouldFooterContentUseSmallPadding
             >
                 {hasError && (
-                    <View style={[styles.ph5, styles.mb3]}>
+                    <View style={[styles.ph3, styles.mb3]}>
                         <FormHelpMessage
                             isError={hasError}
                             message={translate('workspace.companyCards.addNewCard.error.pleaseSelectBank')}
diff --git a/src/pages/workspace/companyCards/addNew/SelectFeedType.tsx b/src/pages/workspace/companyCards/addNew/SelectFeedType.tsx
index 7fe8da2f99546..e1d2072a1955f 100644
--- a/src/pages/workspace/companyCards/addNew/SelectFeedType.tsx
+++ b/src/pages/workspace/companyCards/addNew/SelectFeedType.tsx
@@ -61,7 +61,7 @@ function SelectFeedType() {
     return (
         <ScreenWrapper
             testID={SelectFeedType.displayName}
-            includeSafeAreaPaddingBottom={false}
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
@@ -91,6 +91,8 @@ function SelectFeedType() {
                 showConfirmButton
                 confirmButtonText={translate('common.next')}
                 onConfirm={submit}
+                addBottomSafeAreaPadding
+                shouldFooterContentUseSmallPadding
             >
                 {hasError && (
                     <View style={[styles.ph5, styles.mb3]}>
diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx
index d5861895f93d3..b1918f47049d1 100644
--- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx
+++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx
@@ -205,12 +205,17 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat
             policyID={route.params.policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
         >
-            <ScreenWrapper testID={WorkspaceWorkflowsApprovalsExpensesFromPage.displayName}>
+            <ScreenWrapper
+                testID={WorkspaceWorkflowsApprovalsExpensesFromPage.displayName}
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
+            >
                 <FullPageNotFoundView
                     shouldShow={shouldShowNotFoundView}
                     subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
                     onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
                     onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
+                    addBottomSafeAreaPadding
                 >
                     <HeaderWithBackButton
                         title={translate('workflowsExpensesFromPage.title')}
@@ -234,6 +239,8 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat
                         footerContent={button}
                         listEmptyContent={listEmptyContent}
                         shouldShowListEmptyContent={shouldShowListEmptyContent}
+                        addBottomSafeAreaPadding
+                        shouldFooterContentStickToBottom
                     />
                 </FullPageNotFoundView>
             </ScreenWrapper>

From 9e13956c5fd5b9f6682a22a5aa7b44671bd32571 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Tue, 25 Feb 2025 16:56:29 +0100
Subject: [PATCH 21/51] fix: remove padding changes and bottom docked footer
 content

---
 src/pages/workspace/companyCards/addNew/SelectBankStep.tsx    | 1 -
 src/pages/workspace/companyCards/addNew/SelectFeedType.tsx    | 1 -
 .../approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx     | 4 ----
 .../approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx | 1 -
 4 files changed, 7 deletions(-)

diff --git a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx
index 7441ab7053de2..bee3cc25c2d7b 100644
--- a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx
+++ b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx
@@ -95,7 +95,6 @@ function SelectBankStep() {
                 confirmButtonText={translate('common.next')}
                 onConfirm={submit}
                 addBottomSafeAreaPadding
-                shouldFooterContentUseSmallPadding
             >
                 {hasError && (
                     <View style={[styles.ph3, styles.mb3]}>
diff --git a/src/pages/workspace/companyCards/addNew/SelectFeedType.tsx b/src/pages/workspace/companyCards/addNew/SelectFeedType.tsx
index e1d2072a1955f..53bd6ce4ea78b 100644
--- a/src/pages/workspace/companyCards/addNew/SelectFeedType.tsx
+++ b/src/pages/workspace/companyCards/addNew/SelectFeedType.tsx
@@ -92,7 +92,6 @@ function SelectFeedType() {
                 confirmButtonText={translate('common.next')}
                 onConfirm={submit}
                 addBottomSafeAreaPadding
-                shouldFooterContentUseSmallPadding
             >
                 {hasError && (
                     <View style={[styles.ph5, styles.mb3]}>
diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx
index 08ba0bced0cf1..5be8836e95342 100644
--- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx
+++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx
@@ -35,8 +35,6 @@ import type SCREENS from '@src/SCREENS';
 import type {Icon} from '@src/types/onyx/OnyxCommon';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
-const FOOTER_BUTTON_CONTENT_PADDING = 80;
-
 type WorkspaceWorkflowsApprovalsApproverPageProps = WithPolicyAndFullscreenLoadingProps &
     PlatformStackScreenProps<WorkspaceSplitNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_APPROVER>;
 
@@ -288,8 +286,6 @@ function WorkspaceWorkflowsApprovalsApproverPage({policy, personalDetails, isLoa
                         shouldHighlightSelectedItem
                         shouldShowTextInput={shouldShowTextInput}
                         addBottomSafeAreaPadding
-                        contentContainerStyle={{paddingBottom: FOOTER_BUTTON_CONTENT_PADDING}}
-                        shouldFooterContentStickToBottom
                     />
                 </FullPageNotFoundView>
             </ScreenWrapper>
diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx
index b1918f47049d1..0825f9d476449 100644
--- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx
+++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx
@@ -240,7 +240,6 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat
                         listEmptyContent={listEmptyContent}
                         shouldShowListEmptyContent={shouldShowListEmptyContent}
                         addBottomSafeAreaPadding
-                        shouldFooterContentStickToBottom
                     />
                 </FullPageNotFoundView>
             </ScreenWrapper>

From 3cc59ff0e4faef9cd9982f256cfdb8ba393b9b08 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Wed, 26 Feb 2025 11:25:23 +0100
Subject: [PATCH 22/51] fix: remove sticky footer content

---
 src/pages/workspace/WorkspaceInvitePage.tsx   |  25 +-
 src/pages/workspace/WorkspaceNamePage.tsx     |   1 -
 .../WorkspaceProfileDescriptionPage.tsx       |   1 -
 .../CategoryDescriptionHintPage.tsx           |   1 -
 .../CategoryFlagAmountsOverPage.tsx           |   1 -
 .../workspace/categories/CategoryForm.tsx     |   1 -
 .../categories/CategoryGLCodePage.tsx         |   1 -
 .../categories/CategoryPayrollCodePage.tsx    |   1 -
 .../WorkspaceCompanyCardDetailsPage.tsx       | 242 +++++++++--------
 ...kspaceCompanyCardsSettingsFeedNamePage.tsx |   1 -
 .../companyCards/addNew/DetailsStep.tsx       |   1 -
 .../assignCard/CardSelectionStep.tsx          |   2 -
 .../assignCard/TransactionStartDateStep.tsx   |   1 -
 .../WorkspaceExpensifyCardDetailsPage.tsx     | 248 +++++++++---------
 .../expensifyCard/issueNew/CardNameStep.tsx   |   1 -
 .../WorkspaceInvoicingDetailsName.tsx         |   1 -
 .../WorkspaceInvoicingDetailsWebsite.tsx      |   1 -
 .../reportFields/CreateReportFieldsPage.tsx   |   1 -
 .../rules/RulesMaxExpenseAgePage.tsx          |   1 -
 .../rules/RulesMaxExpenseAmountPage.tsx       |   1 -
 .../rules/RulesReceiptRequiredAmountPage.tsx  |   1 -
 src/pages/workspace/tags/EditTagPage.tsx      |   1 -
 src/pages/workspace/tags/TagGLCodePage.tsx    |   1 -
 .../workspace/tags/WorkspaceCreateTagPage.tsx |   1 -
 .../workspace/tags/WorkspaceEditTagsPage.tsx  |   1 -
 .../taxes/WorkspaceCreateTaxPage.tsx          |   1 -
 .../WorkspaceTaxesSettingsCustomTaxName.tsx   |   1 -
 27 files changed, 243 insertions(+), 297 deletions(-)

diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index 1b7693297962f..2be54f45008a2 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -13,12 +13,10 @@ import type {WithNavigationTransitionEndProps} from '@components/withNavigationT
 import useDebouncedState from '@hooks/useDebouncedState';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
-import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ReportActions from '@libs/actions/Report';
 import {READ_COMMANDS} from '@libs/API/types';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
-import getPlatform from '@libs/getPlatform';
 import HttpUtils from '@libs/HttpUtils';
 import * as LoginUtils from '@libs/LoginUtils';
 import Navigation from '@libs/Navigation/Navigation';
@@ -42,8 +40,6 @@ import AccessOrNotFoundWrapper from './AccessOrNotFoundWrapper';
 import withPolicyAndFullscreenLoading from './withPolicyAndFullscreenLoading';
 import type {WithPolicyAndFullscreenLoadingProps} from './withPolicyAndFullscreenLoading';
 
-const FOOTER_BUTTON_CONTENT_PADDING = 80;
-
 type MembersSection = SectionListData<MemberForList, Section<MemberForList>>;
 
 type WorkspaceInvitePageProps = WithPolicyAndFullscreenLoadingProps &
@@ -53,7 +49,6 @@ type WorkspaceInvitePageProps = WithPolicyAndFullscreenLoadingProps &
 function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
     const [selectedOptions, setSelectedOptions] = useState<MemberForList[]>([]);
     const [personalDetails, setPersonalDetails] = useState<OptionData[]>([]);
@@ -283,8 +278,6 @@ function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
         return OptionsListUtils.getHeaderMessage(personalDetails.length !== 0, usersToInvite.length > 0, searchValue);
     }, [excludedUsers, translate, debouncedSearchTerm, policyName, usersToInvite, personalDetails.length]);
 
-    const shouldUseEdgeToEdgeLayout = useMemo(() => shouldUseNarrowLayout && getPlatform(true) !== CONST.PLATFORM.WEB, [shouldUseNarrowLayout]);
-
     const footerContent = useMemo(
         () => (
             <FormAlertWithSubmitButton
@@ -295,21 +288,9 @@ function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
                 message={policy?.alertMessage ?? ''}
                 containerStyles={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto]}
                 enabledWhenOffline
-                shouldBlendOpacity={shouldUseEdgeToEdgeLayout}
             />
         ),
-        [
-            inviteUser,
-            policy?.alertMessage,
-            selectedOptions.length,
-            shouldShowAlertPrompt,
-            shouldUseEdgeToEdgeLayout,
-            styles.flexBasisAuto,
-            styles.flexGrow0,
-            styles.flexReset,
-            styles.flexShrink0,
-            translate,
-        ],
+        [inviteUser, policy?.alertMessage, selectedOptions.length, shouldShowAlertPrompt, styles.flexBasisAuto, styles.flexGrow0, styles.flexReset, styles.flexShrink0, translate],
     );
 
     useEffect(() => {
@@ -357,9 +338,7 @@ function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
                     shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
                     footerContent={footerContent}
                     isLoadingNewOptions={!!isSearchingForReports}
-                    contentContainerStyle={shouldUseEdgeToEdgeLayout && {paddingBottom: FOOTER_BUTTON_CONTENT_PADDING}}
-                    addBottomSafeAreaPadding={shouldUseEdgeToEdgeLayout}
-                    // shouldFooterContentStickToBottom={shouldUseEdgeToEdgeLayout}
+                    addBottomSafeAreaPadding
                 />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/WorkspaceNamePage.tsx b/src/pages/workspace/WorkspaceNamePage.tsx
index be40c045a185a..49ea2c2a250f5 100644
--- a/src/pages/workspace/WorkspaceNamePage.tsx
+++ b/src/pages/workspace/WorkspaceNamePage.tsx
@@ -80,7 +80,6 @@ function WorkspaceNamePage({policy}: Props) {
                     validate={validate}
                     onSubmit={submit}
                     enabledWhenOffline
-                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx b/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
index 72f4c90390972..6b5b52443ad36 100644
--- a/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
+++ b/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
@@ -90,7 +90,6 @@ function WorkspaceProfileDescriptionPage({policy}: Props) {
                     validate={validate}
                     enabledWhenOffline
                     addBottomSafeAreaPadding
-                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/categories/CategoryDescriptionHintPage.tsx b/src/pages/workspace/categories/CategoryDescriptionHintPage.tsx
index 1f0aac94f5b28..2821ede505a83 100644
--- a/src/pages/workspace/categories/CategoryDescriptionHintPage.tsx
+++ b/src/pages/workspace/categories/CategoryDescriptionHintPage.tsx
@@ -63,7 +63,6 @@ function CategoryDescriptionHintPage({
                     submitButtonText={translate('common.save')}
                     enabledWhenOffline
                     addBottomSafeAreaPadding
-                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <Text style={styles.pb5}>{translate('workspace.rules.categoryRules.descriptionHintDescription', {categoryName})}</Text>
diff --git a/src/pages/workspace/categories/CategoryFlagAmountsOverPage.tsx b/src/pages/workspace/categories/CategoryFlagAmountsOverPage.tsx
index e01b45de67419..0e3e46d35b03f 100644
--- a/src/pages/workspace/categories/CategoryFlagAmountsOverPage.tsx
+++ b/src/pages/workspace/categories/CategoryFlagAmountsOverPage.tsx
@@ -75,7 +75,6 @@ function CategoryFlagAmountsOverPage({
                     enabledWhenOffline
                     submitButtonStyles={styles.ph5}
                     addBottomSafeAreaPadding
-                    shouldSubmitButtonStickToBottom
                 >
                     <View style={[styles.mb4, styles.pt3, styles.ph5]}>
                         <Text style={styles.pb5}>{translate('workspace.rules.categoryRules.flagAmountsOverDescription', {categoryName})}</Text>
diff --git a/src/pages/workspace/categories/CategoryForm.tsx b/src/pages/workspace/categories/CategoryForm.tsx
index 6150df46d3dbd..8c68e7dc30ba9 100644
--- a/src/pages/workspace/categories/CategoryForm.tsx
+++ b/src/pages/workspace/categories/CategoryForm.tsx
@@ -77,7 +77,6 @@ function CategoryForm({onSubmit, policyCategories, categoryName, validateEdit}:
             style={[styles.mh5, styles.flex1]}
             enabledWhenOffline
             addBottomSafeAreaPadding
-            shouldSubmitButtonStickToBottom
         >
             <InputWrapper
                 ref={inputCallbackRef}
diff --git a/src/pages/workspace/categories/CategoryGLCodePage.tsx b/src/pages/workspace/categories/CategoryGLCodePage.tsx
index d9b51dbe84f6b..9996f3157d366 100644
--- a/src/pages/workspace/categories/CategoryGLCodePage.tsx
+++ b/src/pages/workspace/categories/CategoryGLCodePage.tsx
@@ -79,7 +79,6 @@ function CategoryGLCodePage({route}: EditCategoryPageProps) {
                     style={[styles.mh5, styles.flex1]}
                     enabledWhenOffline
                     addBottomSafeAreaPadding
-                    shouldSubmitButtonStickToBottom
                 >
                     <InputWrapper
                         ref={inputCallbackRef}
diff --git a/src/pages/workspace/categories/CategoryPayrollCodePage.tsx b/src/pages/workspace/categories/CategoryPayrollCodePage.tsx
index 47a5347b11d78..69c0cb2b59f29 100644
--- a/src/pages/workspace/categories/CategoryPayrollCodePage.tsx
+++ b/src/pages/workspace/categories/CategoryPayrollCodePage.tsx
@@ -79,7 +79,6 @@ function CategoryPayrollCodePage({route}: EditCategoryPageProps) {
                     style={[styles.mh5, styles.flex1]}
                     enabledWhenOffline
                     addBottomSafeAreaPadding
-                    shouldSubmitButtonStickToBottom
                 >
                     <InputWrapper
                         ref={inputCallbackRef}
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx
index 20eac995a72b4..1cbeb9b32292a 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx
@@ -84,137 +84,133 @@ function WorkspaceCompanyCardDetailsPage({route}: WorkspaceCompanyCardDetailsPag
             featureName={CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 testID={WorkspaceCompanyCardDetailsPage.displayName}
             >
-                {({safeAreaPaddingBottomStyle}) => (
-                    <>
-                        <HeaderWithBackButton
-                            title={translate('workspace.moreFeatures.companyCards.cardDetails')}
-                            onBackButtonPress={() => Navigation.goBack(backTo)}
+                <HeaderWithBackButton
+                    title={translate('workspace.moreFeatures.companyCards.cardDetails')}
+                    onBackButtonPress={() => Navigation.goBack(backTo)}
+                />
+                <ScrollView addBottomSafeAreaPadding>
+                    <View style={[styles.walletCard, styles.mb3]}>
+                        <ImageSVG
+                            contentFit="contain"
+                            src={getCardFeedIcon(cardBank as CompanyCardFeed)}
+                            pointerEvents="none"
+                            height={variables.cardPreviewHeight}
+                            width={variables.cardPreviewWidth}
                         />
-                        <ScrollView contentContainerStyle={safeAreaPaddingBottomStyle}>
-                            <View style={[styles.walletCard, styles.mb3]}>
-                                <ImageSVG
-                                    contentFit="contain"
-                                    src={getCardFeedIcon(cardBank as CompanyCardFeed)}
-                                    pointerEvents="none"
-                                    height={variables.cardPreviewHeight}
-                                    width={variables.cardPreviewWidth}
-                                />
-                            </View>
+                    </View>
 
-                            <MenuItem
-                                label={translate('workspace.moreFeatures.companyCards.cardholder')}
-                                title={displayName}
-                                icon={cardholder?.avatar ?? FallbackAvatar}
-                                iconType={CONST.ICON_TYPE_AVATAR}
-                                description={cardholder?.login}
-                                interactive={false}
-                            />
-                            <MenuItemWithTopDescription
-                                description={translate('workspace.moreFeatures.companyCards.cardNumber')}
-                                title={maskCardNumber(card?.cardName ?? '', bank)}
-                                interactive={false}
-                                titleStyle={styles.walletCardNumber}
-                            />
-                            <OfflineWithFeedback
-                                pendingAction={card?.nameValuePairs?.pendingFields?.cardTitle}
-                                errorRowStyles={[styles.ph5, styles.mb3]}
-                                errors={getLatestErrorField(card?.nameValuePairs ?? {}, 'cardTitle')}
-                                onClose={() => clearCompanyCardErrorField(workspaceAccountID, cardID, bank, 'cardTitle')}
-                            >
-                                <MenuItemWithTopDescription
-                                    description={translate('workspace.moreFeatures.companyCards.cardName')}
-                                    title={customCardNames?.[cardID] ?? getDefaultCardName(cardholder?.firstName)}
-                                    shouldShowRightIcon
-                                    brickRoadIndicator={card?.nameValuePairs?.errorFields?.cardTitle ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARD_NAME.getRoute(policyID, cardID, bank))}
-                                />
-                            </OfflineWithFeedback>
-                            {exportMenuItem?.shouldShowMenuItem ? (
-                                <OfflineWithFeedback
-                                    pendingAction={exportMenuItem?.exportType ? card?.nameValuePairs?.pendingFields?.[exportMenuItem.exportType] : undefined}
-                                    errorRowStyles={[styles.ph5, styles.mb3]}
-                                    errors={exportMenuItem.exportType ? getLatestErrorField(card?.nameValuePairs ?? {}, exportMenuItem.exportType) : undefined}
-                                    onClose={() => {
-                                        if (!exportMenuItem.exportType) {
-                                            return;
-                                        }
-                                        clearCompanyCardErrorField(workspaceAccountID, cardID, bank, exportMenuItem.exportType);
-                                    }}
-                                >
-                                    <MenuItemWithTopDescription
-                                        description={exportMenuItem.description}
-                                        title={exportMenuItem.title}
-                                        shouldShowRightIcon
-                                        onPress={() => Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARD_EXPORT.getRoute(policyID, cardID, bank, Navigation.getActiveRoute()))}
-                                    />
-                                </OfflineWithFeedback>
-                            ) : null}
-                            <MenuItemWithTopDescription
-                                shouldShowRightComponent={card?.isLoadingLastUpdated}
-                                rightComponent={
-                                    <ActivityIndicator
-                                        style={[styles.popoverMenuIcon]}
-                                        color={theme.spinner}
-                                    />
+                    <MenuItem
+                        label={translate('workspace.moreFeatures.companyCards.cardholder')}
+                        title={displayName}
+                        icon={cardholder?.avatar ?? FallbackAvatar}
+                        iconType={CONST.ICON_TYPE_AVATAR}
+                        description={cardholder?.login}
+                        interactive={false}
+                    />
+                    <MenuItemWithTopDescription
+                        description={translate('workspace.moreFeatures.companyCards.cardNumber')}
+                        title={maskCardNumber(card?.cardName ?? '', bank)}
+                        interactive={false}
+                        titleStyle={styles.walletCardNumber}
+                    />
+                    <OfflineWithFeedback
+                        pendingAction={card?.nameValuePairs?.pendingFields?.cardTitle}
+                        errorRowStyles={[styles.ph5, styles.mb3]}
+                        errors={getLatestErrorField(card?.nameValuePairs ?? {}, 'cardTitle')}
+                        onClose={() => clearCompanyCardErrorField(workspaceAccountID, cardID, bank, 'cardTitle')}
+                    >
+                        <MenuItemWithTopDescription
+                            description={translate('workspace.moreFeatures.companyCards.cardName')}
+                            title={customCardNames?.[cardID] ?? getDefaultCardName(cardholder?.firstName)}
+                            shouldShowRightIcon
+                            brickRoadIndicator={card?.nameValuePairs?.errorFields?.cardTitle ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                            onPress={() => Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARD_NAME.getRoute(policyID, cardID, bank))}
+                        />
+                    </OfflineWithFeedback>
+                    {exportMenuItem?.shouldShowMenuItem ? (
+                        <OfflineWithFeedback
+                            pendingAction={exportMenuItem?.exportType ? card?.nameValuePairs?.pendingFields?.[exportMenuItem.exportType] : undefined}
+                            errorRowStyles={[styles.ph5, styles.mb3]}
+                            errors={exportMenuItem.exportType ? getLatestErrorField(card?.nameValuePairs ?? {}, exportMenuItem.exportType) : undefined}
+                            onClose={() => {
+                                if (!exportMenuItem.exportType) {
+                                    return;
                                 }
-                                description={translate('workspace.moreFeatures.companyCards.lastUpdated')}
-                                title={card?.isLoadingLastUpdated ? translate('workspace.moreFeatures.companyCards.updating') : card?.lastScrape}
-                                interactive={false}
-                            />
+                                clearCompanyCardErrorField(workspaceAccountID, cardID, bank, exportMenuItem.exportType);
+                            }}
+                        >
                             <MenuItemWithTopDescription
-                                description={translate('workspace.moreFeatures.companyCards.transactionStartDate')}
-                                title={card?.scrapeMinDate ? format(parseISO(card.scrapeMinDate), CONST.DATE.FNS_FORMAT_STRING) : ''}
-                                interactive={false}
-                            />
-                            <MenuItem
-                                icon={Expensicons.MoneySearch}
-                                title={translate('workspace.common.viewTransactions')}
-                                style={styles.mt3}
-                                onPress={() => {
-                                    Navigation.navigate(
-                                        ROUTES.SEARCH_ROOT.getRoute({
-                                            query: buildCannedSearchQuery({type: CONST.SEARCH.DATA_TYPES.EXPENSE, status: CONST.SEARCH.STATUS.EXPENSE.ALL, cardID}),
-                                        }),
-                                    );
-                                }}
+                                description={exportMenuItem.description}
+                                title={exportMenuItem.title}
+                                shouldShowRightIcon
+                                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARD_EXPORT.getRoute(policyID, cardID, bank, Navigation.getActiveRoute()))}
                             />
-                            <OfflineWithFeedback
-                                pendingAction={card?.pendingFields?.lastScrape}
-                                errorRowStyles={[styles.ph5, styles.mb3]}
-                                errors={getLatestErrorField(card ?? {}, 'lastScrape')}
-                                onClose={() => clearCompanyCardErrorField(workspaceAccountID, cardID, bank, 'lastScrape', true)}
-                            >
-                                <MenuItem
-                                    icon={Expensicons.Sync}
-                                    disabled={isOffline || card?.isLoadingLastUpdated}
-                                    title={translate('workspace.moreFeatures.companyCards.updateCard')}
-                                    brickRoadIndicator={card?.errorFields?.lastScrape ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                                    onPress={updateCard}
-                                />
-                            </OfflineWithFeedback>
-                            <MenuItem
-                                icon={Expensicons.RemoveMembers}
-                                title={translate('workspace.moreFeatures.companyCards.unassignCard')}
-                                style={styles.mb1}
-                                onPress={() => setIsUnassignModalVisible(true)}
+                        </OfflineWithFeedback>
+                    ) : null}
+                    <MenuItemWithTopDescription
+                        shouldShowRightComponent={card?.isLoadingLastUpdated}
+                        rightComponent={
+                            <ActivityIndicator
+                                style={[styles.popoverMenuIcon]}
+                                color={theme.spinner}
                             />
-                            <ConfirmModal
-                                title={translate('workspace.moreFeatures.companyCards.unassignCard')}
-                                isVisible={isUnassignModalVisible}
-                                onConfirm={unassignCard}
-                                onCancel={() => setIsUnassignModalVisible(false)}
-                                shouldSetModalVisibility={false}
-                                prompt={translate('workspace.moreFeatures.companyCards.unassignCardDescription')}
-                                confirmText={translate('workspace.moreFeatures.companyCards.unassign')}
-                                cancelText={translate('common.cancel')}
-                                danger
-                            />
-                        </ScrollView>
-                    </>
-                )}
+                        }
+                        description={translate('workspace.moreFeatures.companyCards.lastUpdated')}
+                        title={card?.isLoadingLastUpdated ? translate('workspace.moreFeatures.companyCards.updating') : card?.lastScrape}
+                        interactive={false}
+                    />
+                    <MenuItemWithTopDescription
+                        description={translate('workspace.moreFeatures.companyCards.transactionStartDate')}
+                        title={card?.scrapeMinDate ? format(parseISO(card.scrapeMinDate), CONST.DATE.FNS_FORMAT_STRING) : ''}
+                        interactive={false}
+                    />
+                    <MenuItem
+                        icon={Expensicons.MoneySearch}
+                        title={translate('workspace.common.viewTransactions')}
+                        style={styles.mt3}
+                        onPress={() => {
+                            Navigation.navigate(
+                                ROUTES.SEARCH_ROOT.getRoute({
+                                    query: buildCannedSearchQuery({type: CONST.SEARCH.DATA_TYPES.EXPENSE, status: CONST.SEARCH.STATUS.EXPENSE.ALL, cardID}),
+                                }),
+                            );
+                        }}
+                    />
+                    <OfflineWithFeedback
+                        pendingAction={card?.pendingFields?.lastScrape}
+                        errorRowStyles={[styles.ph5, styles.mb3]}
+                        errors={getLatestErrorField(card ?? {}, 'lastScrape')}
+                        onClose={() => clearCompanyCardErrorField(workspaceAccountID, cardID, bank, 'lastScrape', true)}
+                    >
+                        <MenuItem
+                            icon={Expensicons.Sync}
+                            disabled={isOffline || card?.isLoadingLastUpdated}
+                            title={translate('workspace.moreFeatures.companyCards.updateCard')}
+                            brickRoadIndicator={card?.errorFields?.lastScrape ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                            onPress={updateCard}
+                        />
+                    </OfflineWithFeedback>
+                    <MenuItem
+                        icon={Expensicons.RemoveMembers}
+                        title={translate('workspace.moreFeatures.companyCards.unassignCard')}
+                        style={styles.mb1}
+                        onPress={() => setIsUnassignModalVisible(true)}
+                    />
+                    <ConfirmModal
+                        title={translate('workspace.moreFeatures.companyCards.unassignCard')}
+                        isVisible={isUnassignModalVisible}
+                        onConfirm={unassignCard}
+                        onCancel={() => setIsUnassignModalVisible(false)}
+                        shouldSetModalVisibility={false}
+                        prompt={translate('workspace.moreFeatures.companyCards.unassignCardDescription')}
+                        confirmText={translate('workspace.moreFeatures.companyCards.unassign')}
+                        cancelText={translate('common.cancel')}
+                        danger
+                    />
+                </ScrollView>
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx
index d6d4042f09197..238c6b1e6764c 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx
@@ -95,7 +95,6 @@ function WorkspaceCompanyCardsSettingsFeedNamePage({
                     validate={validate}
                     onSubmit={submit}
                     addBottomSafeAreaPadding
-                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/companyCards/addNew/DetailsStep.tsx b/src/pages/workspace/companyCards/addNew/DetailsStep.tsx
index b734e33e63104..7732772e17591 100644
--- a/src/pages/workspace/companyCards/addNew/DetailsStep.tsx
+++ b/src/pages/workspace/companyCards/addNew/DetailsStep.tsx
@@ -186,7 +186,6 @@ function DetailsStep({policyID}: DetailsStepProps) {
                 style={[styles.mh5, styles.flexGrow1]}
                 enabledWhenOffline
                 addBottomSafeAreaPadding
-                shouldSubmitButtonStickToBottom
             >
                 <Text style={[styles.textHeadlineLineHeightXXL, styles.mv3]}>
                     {!!feedProvider && !isStripeFeedProvider ? translate(`workspace.companyCards.addNewCard.feedDetails.${feedProvider}.title`) : ''}
diff --git a/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx b/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
index e95dc34e1170b..4e2ad1028120f 100644
--- a/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
@@ -163,11 +163,9 @@ function CardSelectionStep({feed, policyID}: CardSelectionStepProps) {
                     }
                     shouldShowTextInputAfterHeader
                     shouldShowHeaderMessageAfterHeader
-                    includeSafeAreaPaddingBottom={false}
                     shouldShowListEmptyContent={false}
                     shouldUpdateFocusedIndex
                     addBottomSafeAreaPadding
-                    shouldFooterContentStickToBottom
                     footerContent={
                         <FormAlertWithSubmitButton
                             buttonText={translate(isEditing ? 'common.confirm' : 'common.next')}
diff --git a/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx b/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx
index 1e4186024e669..f359e22b3dd34 100644
--- a/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx
@@ -104,7 +104,6 @@ function TransactionStartDateStep() {
                     initiallyFocusedOptionKey={dateOptionSelected}
                     shouldUpdateFocusedIndex
                     addBottomSafeAreaPadding
-                    shouldFooterContentStickToBottom
                     footerContent={
                         <Button
                             success
diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx
index 78277c62605a4..a5d44474195e5 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx
@@ -92,136 +92,132 @@ function WorkspaceExpensifyCardDetailsPage({route}: WorkspaceExpensifyCardDetail
             featureName={CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 testID={WorkspaceExpensifyCardDetailsPage.displayName}
             >
-                {({safeAreaPaddingBottomStyle}) => (
-                    <>
-                        <HeaderWithBackButton
-                            title={translate('workspace.expensifyCard.cardDetails')}
-                            onBackButtonPress={() => Navigation.goBack(backTo)}
+                <HeaderWithBackButton
+                    title={translate('workspace.expensifyCard.cardDetails')}
+                    onBackButtonPress={() => Navigation.goBack(backTo)}
+                />
+                <ScrollView addBottomSafeAreaPadding>
+                    <View style={[styles.walletCard, styles.mb3]}>
+                        <ImageSVG
+                            contentFit="contain"
+                            src={ExpensifyCardImage}
+                            pointerEvents="none"
+                            height={variables.cardPreviewHeight}
+                            width={variables.cardPreviewWidth}
                         />
-                        <ScrollView contentContainerStyle={safeAreaPaddingBottomStyle}>
-                            <View style={[styles.walletCard, styles.mb3]}>
-                                <ImageSVG
-                                    contentFit="contain"
-                                    src={ExpensifyCardImage}
-                                    pointerEvents="none"
-                                    height={variables.cardPreviewHeight}
-                                    width={variables.cardPreviewWidth}
-                                />
-                                <Badge
-                                    badgeStyles={styles.cardBadge}
-                                    textStyles={styles.cardBadgeText}
-                                    text={translate(isVirtual ? 'workspace.expensifyCard.virtual' : 'workspace.expensifyCard.physical')}
-                                />
-                            </View>
+                        <Badge
+                            badgeStyles={styles.cardBadge}
+                            textStyles={styles.cardBadgeText}
+                            text={translate(isVirtual ? 'workspace.expensifyCard.virtual' : 'workspace.expensifyCard.physical')}
+                        />
+                    </View>
 
-                            <MenuItem
-                                label={translate('workspace.card.issueNewCard.cardholder')}
-                                title={displayName}
-                                icon={cardholder?.avatar ?? FallbackAvatar}
-                                iconType={CONST.ICON_TYPE_AVATAR}
-                                description={cardholder?.login}
-                                interactive={false}
-                            />
-                            <MenuItemWithTopDescription
-                                description={translate(isVirtual ? 'cardPage.virtualCardNumber' : 'cardPage.physicalCardNumber')}
-                                title={maskCard(card?.lastFourPAN)}
-                                interactive={false}
-                                titleStyle={styles.walletCardNumber}
-                            />
-                            <OfflineWithFeedback pendingAction={card?.pendingFields?.availableSpend}>
-                                <MenuItemWithTopDescription
-                                    description={translate('cardPage.availableSpend')}
-                                    title={formattedAvailableSpendAmount}
-                                    interactive={false}
-                                    titleStyle={styles.newKansasLarge}
-                                />
-                            </OfflineWithFeedback>
-                            <OfflineWithFeedback pendingAction={card?.nameValuePairs?.pendingFields?.unapprovedExpenseLimit}>
-                                <MenuItemWithTopDescription
-                                    description={translate('workspace.expensifyCard.cardLimit')}
-                                    title={formattedLimit}
-                                    shouldShowRightIcon
-                                    onPress={() =>
-                                        Navigation.navigate(
-                                            isWorkspaceCardRhp
-                                                ? ROUTES.WORKSPACE_EXPENSIFY_CARD_LIMIT.getRoute(policyID, cardID, Navigation.getActiveRoute())
-                                                : ROUTES.EXPENSIFY_CARD_LIMIT.getRoute(policyID, cardID, Navigation.getActiveRoute()),
-                                        )
-                                    }
-                                />
-                            </OfflineWithFeedback>
-                            <OfflineWithFeedback pendingAction={card?.nameValuePairs?.pendingFields?.limitType}>
-                                <MenuItemWithTopDescription
-                                    description={translate('workspace.card.issueNewCard.limitType')}
-                                    title={translationForLimitType ? translate(translationForLimitType) : ''}
-                                    shouldShowRightIcon
-                                    onPress={() =>
-                                        Navigation.navigate(
-                                            isWorkspaceCardRhp
-                                                ? ROUTES.WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE.getRoute(policyID, cardID, Navigation.getActiveRoute())
-                                                : ROUTES.EXPENSIFY_CARD_LIMIT_TYPE.getRoute(policyID, cardID, Navigation.getActiveRoute()),
-                                        )
-                                    }
-                                />
-                            </OfflineWithFeedback>
-                            <OfflineWithFeedback pendingAction={card?.nameValuePairs?.pendingFields?.cardTitle}>
-                                <MenuItemWithTopDescription
-                                    description={translate('workspace.card.issueNewCard.cardName')}
-                                    title={card?.nameValuePairs?.cardTitle}
-                                    shouldShowRightIcon
-                                    onPress={() =>
-                                        Navigation.navigate(
-                                            isWorkspaceCardRhp
-                                                ? ROUTES.WORKSPACE_EXPENSIFY_CARD_NAME.getRoute(policyID, cardID, Navigation.getActiveRoute())
-                                                : ROUTES.EXPENSIFY_CARD_NAME.getRoute(policyID, cardID, Navigation.getActiveRoute()),
-                                        )
-                                    }
-                                />
-                            </OfflineWithFeedback>
-                            <MenuItem
-                                icon={Expensicons.MoneySearch}
-                                title={translate('workspace.common.viewTransactions')}
-                                style={styles.mt3}
-                                onPress={() => {
-                                    Navigation.navigate(
-                                        ROUTES.SEARCH_ROOT.getRoute({
-                                            query: buildCannedSearchQuery({type: CONST.SEARCH.DATA_TYPES.EXPENSE, status: CONST.SEARCH.STATUS.EXPENSE.ALL, cardID}),
-                                        }),
-                                    );
-                                }}
-                            />
-                            <MenuItem
-                                icon={Expensicons.Trashcan}
-                                title={translate('workspace.expensifyCard.deactivate')}
-                                style={styles.mb1}
-                                onPress={() => (isOffline ? setIsOfflineModalVisible(true) : setIsDeactivateModalVisible(true))}
-                            />
-                            <ConfirmModal
-                                title={translate('workspace.card.deactivateCardModal.deactivateCard')}
-                                isVisible={isDeactivateModalVisible}
-                                onConfirm={deactivateCard}
-                                onCancel={() => setIsDeactivateModalVisible(false)}
-                                shouldSetModalVisibility={false}
-                                prompt={translate('workspace.card.deactivateCardModal.deactivateConfirmation')}
-                                confirmText={translate('workspace.card.deactivateCardModal.deactivate')}
-                                cancelText={translate('common.cancel')}
-                                danger
-                            />
-                            <DecisionModal
-                                title={translate('common.youAppearToBeOffline')}
-                                prompt={translate('common.offlinePrompt')}
-                                isSmallScreenWidth={isSmallScreenWidth}
-                                onSecondOptionSubmit={() => setIsOfflineModalVisible(false)}
-                                secondOptionText={translate('common.buttonConfirm')}
-                                isVisible={isOfflineModalVisible}
-                                onClose={() => setIsOfflineModalVisible(false)}
-                            />
-                        </ScrollView>
-                    </>
-                )}
+                    <MenuItem
+                        label={translate('workspace.card.issueNewCard.cardholder')}
+                        title={displayName}
+                        icon={cardholder?.avatar ?? FallbackAvatar}
+                        iconType={CONST.ICON_TYPE_AVATAR}
+                        description={cardholder?.login}
+                        interactive={false}
+                    />
+                    <MenuItemWithTopDescription
+                        description={translate(isVirtual ? 'cardPage.virtualCardNumber' : 'cardPage.physicalCardNumber')}
+                        title={maskCard(card?.lastFourPAN)}
+                        interactive={false}
+                        titleStyle={styles.walletCardNumber}
+                    />
+                    <OfflineWithFeedback pendingAction={card?.pendingFields?.availableSpend}>
+                        <MenuItemWithTopDescription
+                            description={translate('cardPage.availableSpend')}
+                            title={formattedAvailableSpendAmount}
+                            interactive={false}
+                            titleStyle={styles.newKansasLarge}
+                        />
+                    </OfflineWithFeedback>
+                    <OfflineWithFeedback pendingAction={card?.nameValuePairs?.pendingFields?.unapprovedExpenseLimit}>
+                        <MenuItemWithTopDescription
+                            description={translate('workspace.expensifyCard.cardLimit')}
+                            title={formattedLimit}
+                            shouldShowRightIcon
+                            onPress={() =>
+                                Navigation.navigate(
+                                    isWorkspaceCardRhp
+                                        ? ROUTES.WORKSPACE_EXPENSIFY_CARD_LIMIT.getRoute(policyID, cardID, Navigation.getActiveRoute())
+                                        : ROUTES.EXPENSIFY_CARD_LIMIT.getRoute(policyID, cardID, Navigation.getActiveRoute()),
+                                )
+                            }
+                        />
+                    </OfflineWithFeedback>
+                    <OfflineWithFeedback pendingAction={card?.nameValuePairs?.pendingFields?.limitType}>
+                        <MenuItemWithTopDescription
+                            description={translate('workspace.card.issueNewCard.limitType')}
+                            title={translationForLimitType ? translate(translationForLimitType) : ''}
+                            shouldShowRightIcon
+                            onPress={() =>
+                                Navigation.navigate(
+                                    isWorkspaceCardRhp
+                                        ? ROUTES.WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE.getRoute(policyID, cardID, Navigation.getActiveRoute())
+                                        : ROUTES.EXPENSIFY_CARD_LIMIT_TYPE.getRoute(policyID, cardID, Navigation.getActiveRoute()),
+                                )
+                            }
+                        />
+                    </OfflineWithFeedback>
+                    <OfflineWithFeedback pendingAction={card?.nameValuePairs?.pendingFields?.cardTitle}>
+                        <MenuItemWithTopDescription
+                            description={translate('workspace.card.issueNewCard.cardName')}
+                            title={card?.nameValuePairs?.cardTitle}
+                            shouldShowRightIcon
+                            onPress={() =>
+                                Navigation.navigate(
+                                    isWorkspaceCardRhp
+                                        ? ROUTES.WORKSPACE_EXPENSIFY_CARD_NAME.getRoute(policyID, cardID, Navigation.getActiveRoute())
+                                        : ROUTES.EXPENSIFY_CARD_NAME.getRoute(policyID, cardID, Navigation.getActiveRoute()),
+                                )
+                            }
+                        />
+                    </OfflineWithFeedback>
+                    <MenuItem
+                        icon={Expensicons.MoneySearch}
+                        title={translate('workspace.common.viewTransactions')}
+                        style={styles.mt3}
+                        onPress={() => {
+                            Navigation.navigate(
+                                ROUTES.SEARCH_ROOT.getRoute({
+                                    query: buildCannedSearchQuery({type: CONST.SEARCH.DATA_TYPES.EXPENSE, status: CONST.SEARCH.STATUS.EXPENSE.ALL, cardID}),
+                                }),
+                            );
+                        }}
+                    />
+                    <MenuItem
+                        icon={Expensicons.Trashcan}
+                        title={translate('workspace.expensifyCard.deactivate')}
+                        style={styles.mb1}
+                        onPress={() => (isOffline ? setIsOfflineModalVisible(true) : setIsDeactivateModalVisible(true))}
+                    />
+                    <ConfirmModal
+                        title={translate('workspace.card.deactivateCardModal.deactivateCard')}
+                        isVisible={isDeactivateModalVisible}
+                        onConfirm={deactivateCard}
+                        onCancel={() => setIsDeactivateModalVisible(false)}
+                        shouldSetModalVisibility={false}
+                        prompt={translate('workspace.card.deactivateCardModal.deactivateConfirmation')}
+                        confirmText={translate('workspace.card.deactivateCardModal.deactivate')}
+                        cancelText={translate('common.cancel')}
+                        danger
+                    />
+                    <DecisionModal
+                        title={translate('common.youAppearToBeOffline')}
+                        prompt={translate('common.offlinePrompt')}
+                        isSmallScreenWidth={isSmallScreenWidth}
+                        onSecondOptionSubmit={() => setIsOfflineModalVisible(false)}
+                        secondOptionText={translate('common.buttonConfirm')}
+                        isVisible={isOfflineModalVisible}
+                        onClose={() => setIsOfflineModalVisible(false)}
+                    />
+                </ScrollView>
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx b/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
index 51e028ba7f437..1e552b9e5ba85 100644
--- a/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
@@ -87,7 +87,6 @@ function CardNameStep({policyID}: CardNameStepProps) {
                 style={[styles.mh5, styles.flexGrow1]}
                 enabledWhenOffline
                 addBottomSafeAreaPadding
-                shouldSubmitButtonStickToBottom
             >
                 <InputWrapper
                     InputComponent={TextInput}
diff --git a/src/pages/workspace/invoices/WorkspaceInvoicingDetailsName.tsx b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsName.tsx
index 772e9e5a8b55c..f8bb72f92090e 100644
--- a/src/pages/workspace/invoices/WorkspaceInvoicingDetailsName.tsx
+++ b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsName.tsx
@@ -61,7 +61,6 @@ function WorkspaceInvoicingDetailsName({route}: WorkspaceInvoicingDetailsNamePro
                     enabledWhenOffline
                     validate={validate}
                     addBottomSafeAreaPadding
-                    shouldSubmitButtonStickToBottom
                 >
                     <InputWrapper
                         InputComponent={TextInput}
diff --git a/src/pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite.tsx b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite.tsx
index 05cc84e11fbf7..3f565e0f425f1 100644
--- a/src/pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite.tsx
+++ b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite.tsx
@@ -84,7 +84,6 @@ function WorkspaceInvoicingDetailsWebsite({route}: WorkspaceInvoicingDetailsWebs
                     enabledWhenOffline
                     validate={validate}
                     addBottomSafeAreaPadding
-                    shouldSubmitButtonStickToBottom
                 >
                     <InputWrapper
                         InputComponent={TextInput}
diff --git a/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx b/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx
index b07b41c0eb55c..15503622fefc1 100644
--- a/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx
+++ b/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx
@@ -123,7 +123,6 @@ function WorkspaceCreateReportFieldsPage({
                     shouldValidateOnBlur={false}
                     disablePressOnEnter={!!modal?.isVisible}
                     addBottomSafeAreaPadding
-                    shouldSubmitButtonStickToBottom
                 >
                     {({inputValues}) => (
                         <View style={styles.mhn5}>
diff --git a/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx b/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx
index 8273da12dfe65..eae58340cfc73 100644
--- a/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx
+++ b/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx
@@ -70,7 +70,6 @@ function RulesMaxExpenseAgePage({
                     submitButtonText={translate('workspace.editor.save')}
                     enabledWhenOffline
                     addBottomSafeAreaPadding
-                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx b/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx
index 65351dd92618c..b8549c884acbe 100644
--- a/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx
+++ b/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx
@@ -65,7 +65,6 @@ function RulesMaxExpenseAmountPage({
                     submitButtonText={translate('workspace.editor.save')}
                     enabledWhenOffline
                     addBottomSafeAreaPadding
-                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx b/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx
index 526677409e76c..b30a408c0d09a 100644
--- a/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx
+++ b/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx
@@ -65,7 +65,6 @@ function RulesReceiptRequiredAmountPage({
                     submitButtonText={translate('workspace.editor.save')}
                     enabledWhenOffline
                     addBottomSafeAreaPadding
-                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/tags/EditTagPage.tsx b/src/pages/workspace/tags/EditTagPage.tsx
index 1b9bc87a5aa55..540a4167e9246 100644
--- a/src/pages/workspace/tags/EditTagPage.tsx
+++ b/src/pages/workspace/tags/EditTagPage.tsx
@@ -101,7 +101,6 @@ function EditTagPage({route}: EditTagPageProps) {
                     style={[styles.mh5, styles.flex1]}
                     enabledWhenOffline
                     addBottomSafeAreaPadding
-                    shouldSubmitButtonStickToBottom
                 >
                     <InputWrapper
                         InputComponent={TextInput}
diff --git a/src/pages/workspace/tags/TagGLCodePage.tsx b/src/pages/workspace/tags/TagGLCodePage.tsx
index b1c7922d66cb3..b9102d65f1784 100644
--- a/src/pages/workspace/tags/TagGLCodePage.tsx
+++ b/src/pages/workspace/tags/TagGLCodePage.tsx
@@ -82,7 +82,6 @@ function TagGLCodePage({route}: EditTagGLCodePageProps) {
                     style={[styles.mh5, styles.flex1]}
                     enabledWhenOffline
                     addBottomSafeAreaPadding
-                    shouldSubmitButtonStickToBottom
                 >
                     <InputWrapper
                         ref={inputCallbackRef}
diff --git a/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx b/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
index dbf45832126b3..00998896fb62c 100644
--- a/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
@@ -90,7 +90,6 @@ function WorkspaceCreateTagPage({route}: CreateTagPageProps) {
                     style={[styles.mh5, styles.flex1]}
                     enabledWhenOffline
                     addBottomSafeAreaPadding
-                    shouldSubmitButtonStickToBottom
                 >
                     <InputWrapper
                         InputComponent={TextInput}
diff --git a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
index f89d4d2471f15..2c1f9de18b380 100644
--- a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
@@ -89,7 +89,6 @@ function WorkspaceEditTagsPage({route}: WorkspaceEditTagsPageProps) {
                     submitButtonText={translate('common.save')}
                     enabledWhenOffline
                     addBottomSafeAreaPadding
-                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx b/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
index eae35e77a8278..bf6b8f6ca3e9c 100644
--- a/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
@@ -92,7 +92,6 @@ function WorkspaceCreateTaxPage({
                             shouldValidateOnBlur={false}
                             disablePressOnEnter={!!modal?.isVisible}
                             addBottomSafeAreaPadding
-                            shouldSubmitButtonStickToBottom
                         >
                             <View style={styles.mhn5}>
                                 <InputWrapper
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
index 7a80475b3329a..87b7ef8eff1e5 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
@@ -80,7 +80,6 @@ function WorkspaceTaxesSettingsCustomTaxName({
                     validate={validate}
                     onSubmit={submit}
                     addBottomSafeAreaPadding
-                    shouldSubmitButtonStickToBottom
                 >
                     <View style={styles.mb4}>
                         <InputWrapper

From b453f977496aa65ea2189cc192c93d59cae3871e Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Wed, 26 Feb 2025 12:24:32 +0100
Subject: [PATCH 23/51] fix: more screens

---
 .../workspace/companyCards/assignCard/CardSelectionStep.tsx   | 2 +-
 src/pages/workspace/taxes/NamePage.tsx                        | 4 +++-
 src/pages/workspace/taxes/ValuePage.tsx                       | 4 +++-
 src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx            | 4 +++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx b/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
index 7821ef967d0c4..de90df98d4fd4 100644
--- a/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
@@ -170,7 +170,7 @@ function CardSelectionStep({feed, policyID}: CardSelectionStepProps) {
                             <FormAlertWithSubmitButton
                                 buttonText={translate(isEditing ? 'common.confirm' : 'common.next')}
                                 onSubmit={submit}
-                                isAlertVisible={shouldShowError}
+                                    isAlertVisible={shouldShowError}
                                 containerStyles={[styles.ph5, !shouldShowError && styles.mt5]}
                                 message={translate('common.error.pleaseSelectOne')}
                                 buttonStyles={styles.mb5}
diff --git a/src/pages/workspace/taxes/NamePage.tsx b/src/pages/workspace/taxes/NamePage.tsx
index d886cc31b82b6..e2ff3d21a45c5 100644
--- a/src/pages/workspace/taxes/NamePage.tsx
+++ b/src/pages/workspace/taxes/NamePage.tsx
@@ -74,7 +74,8 @@ function NamePage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={NamePage.displayName}
             >
@@ -90,6 +91,7 @@ function NamePage({
                     onSubmit={submit}
                     enabledWhenOffline
                     validate={validate}
+                    addBottomSafeAreaPadding
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/taxes/ValuePage.tsx b/src/pages/workspace/taxes/ValuePage.tsx
index 8369e9c350183..197ea7db17c31 100644
--- a/src/pages/workspace/taxes/ValuePage.tsx
+++ b/src/pages/workspace/taxes/ValuePage.tsx
@@ -63,7 +63,8 @@ function ValuePage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={ValuePage.displayName}
             >
@@ -83,6 +84,7 @@ function ValuePage({
                     shouldHideFixErrorsAlert
                     submitFlexEnabled={false}
                     submitButtonStyles={[styles.mh5, styles.mt0]}
+                    addBottomSafeAreaPadding
                 >
                     <InputWrapper
                         InputComponent={AmountForm}
diff --git a/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx b/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx
index 04775ed67c16f..48f31cd1b8d4a 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx
@@ -68,7 +68,8 @@ function WorkspaceTaxCodePage({route}: WorkspaceTaxCodePageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
+                shouldKeyboardOffsetBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={WorkspaceTaxCodePage.displayName}
             >
@@ -84,6 +85,7 @@ function WorkspaceTaxCodePage({route}: WorkspaceTaxCodePageProps) {
                     onSubmit={setTaxCode}
                     enabledWhenOffline
                     validate={validate}
+                    addBottomSafeAreaPadding
                 >
                     <View style={styles.mb4}>
                         <InputWrapper

From ceeeaf6585f0bb9bbc0bd6511380fbd570a2a5f4 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Wed, 26 Feb 2025 14:41:55 +0100
Subject: [PATCH 24/51] fix: ScreenWrapper keyboard offset by default

---
 .../workspace/WorkspaceConfirmationPage.tsx   |  1 -
 .../workspace/WorkspaceInviteMessagePage.tsx  |  1 -
 src/pages/workspace/WorkspaceInvitePage.tsx   |  1 -
 src/pages/workspace/WorkspaceNamePage.tsx     |  1 -
 .../WorkspaceProfileDescriptionPage.tsx       |  1 -
 .../CategoryDescriptionHintPage.tsx           |  1 -
 .../CategoryFlagAmountsOverPage.tsx           |  1 -
 .../categories/CategoryGLCodePage.tsx         |  1 -
 .../categories/CategoryPayrollCodePage.tsx    |  1 -
 .../categories/CreateCategoryPage.tsx         |  1 -
 .../workspace/categories/EditCategoryPage.tsx |  1 -
 ...WorkspaceCompanyCardsListHeaderButtons.tsx |  4 +-
 .../companyCards/addNew/DetailsStep.tsx       |  1 -
 .../companyCards/assignCard/AssigneeStep.tsx  |  1 -
 .../assignCard/CardSelectionStep.tsx          | 55 +++++++++----------
 .../assignCard/TransactionStartDateStep.tsx   |  1 -
 .../expensifyCard/issueNew/CardNameStep.tsx   |  1 -
 .../WorkspaceInvoicingDetailsName.tsx         |  1 -
 .../WorkspaceInvoicingDetailsWebsite.tsx      |  1 -
 .../reportFields/CreateReportFieldsPage.tsx   |  1 -
 .../rules/RulesMaxExpenseAgePage.tsx          |  1 -
 .../rules/RulesMaxExpenseAmountPage.tsx       |  1 -
 .../rules/RulesReceiptRequiredAmountPage.tsx  |  1 -
 src/pages/workspace/tags/EditTagPage.tsx      |  1 -
 src/pages/workspace/tags/TagGLCodePage.tsx    |  1 -
 .../workspace/tags/WorkspaceCreateTagPage.tsx |  1 -
 .../workspace/tags/WorkspaceEditTagsPage.tsx  |  1 -
 src/pages/workspace/taxes/NamePage.tsx        |  1 -
 src/pages/workspace/taxes/ValuePage.tsx       |  1 -
 .../taxes/WorkspaceCreateTaxPage.tsx          |  1 -
 .../workspace/taxes/WorkspaceTaxCodePage.tsx  |  1 -
 .../WorkspaceTaxesSettingsCustomTaxName.tsx   |  1 -
 .../workflows/WorkspaceWorkflowsPayerPage.tsx |  3 +-
 ...orkspaceWorkflowsApprovalsApproverPage.tsx |  1 -
 ...paceWorkflowsApprovalsExpensesFromPage.tsx |  1 -
 35 files changed, 30 insertions(+), 64 deletions(-)

diff --git a/src/pages/workspace/WorkspaceConfirmationPage.tsx b/src/pages/workspace/WorkspaceConfirmationPage.tsx
index baabd312e85a9..5685d3def2d99 100644
--- a/src/pages/workspace/WorkspaceConfirmationPage.tsx
+++ b/src/pages/workspace/WorkspaceConfirmationPage.tsx
@@ -27,7 +27,6 @@ function WorkspaceConfirmationPage() {
     return (
         <ScreenWrapper
             enableEdgeToEdgeBottomSafeAreaPadding
-            shouldKeyboardOffsetBottomSafeAreaPadding
             shouldEnableMaxHeight
             testID={WorkspaceConfirmationPage.displayName}
         >
diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.tsx b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
index 1c91de1823afb..2ab193ce1c907 100644
--- a/src/pages/workspace/WorkspaceInviteMessagePage.tsx
+++ b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
@@ -176,7 +176,6 @@ function WorkspaceInviteMessagePage({policy, route, currentUserPersonalDetails}:
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 testID={WorkspaceInviteMessagePage.displayName}
                 shouldEnableMaxHeight
                 style={{marginTop: viewportOffsetTop}}
diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index 2be54f45008a2..279bfd8d324fc 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -308,7 +308,6 @@ function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
                 shouldUseCachedViewportHeight
                 testID={WorkspaceInvitePage.displayName}
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 onEntryTransitionEnd={() => setDidScreenTransitionEnd(true)}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/workspace/WorkspaceNamePage.tsx b/src/pages/workspace/WorkspaceNamePage.tsx
index 49ea2c2a250f5..8b4b70270eca5 100644
--- a/src/pages/workspace/WorkspaceNamePage.tsx
+++ b/src/pages/workspace/WorkspaceNamePage.tsx
@@ -63,7 +63,6 @@ function WorkspaceNamePage({policy}: Props) {
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={WorkspaceNamePage.displayName}
             >
diff --git a/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx b/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
index 6b5b52443ad36..f1b132b48c077 100644
--- a/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
+++ b/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
@@ -73,7 +73,6 @@ function WorkspaceProfileDescriptionPage({policy}: Props) {
             <ScreenWrapper
                 shouldEnableMaxHeight
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 testID={WorkspaceProfileDescriptionPage.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/workspace/categories/CategoryDescriptionHintPage.tsx b/src/pages/workspace/categories/CategoryDescriptionHintPage.tsx
index 2821ede505a83..039fdb1608241 100644
--- a/src/pages/workspace/categories/CategoryDescriptionHintPage.tsx
+++ b/src/pages/workspace/categories/CategoryDescriptionHintPage.tsx
@@ -44,7 +44,6 @@ function CategoryDescriptionHintPage({
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={CategoryDescriptionHintPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/categories/CategoryFlagAmountsOverPage.tsx b/src/pages/workspace/categories/CategoryFlagAmountsOverPage.tsx
index 0e3e46d35b03f..a5b2cd1e03272 100644
--- a/src/pages/workspace/categories/CategoryFlagAmountsOverPage.tsx
+++ b/src/pages/workspace/categories/CategoryFlagAmountsOverPage.tsx
@@ -55,7 +55,6 @@ function CategoryFlagAmountsOverPage({
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={CategoryFlagAmountsOverPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/categories/CategoryGLCodePage.tsx b/src/pages/workspace/categories/CategoryGLCodePage.tsx
index 9996f3157d366..c8857e5173bf8 100644
--- a/src/pages/workspace/categories/CategoryGLCodePage.tsx
+++ b/src/pages/workspace/categories/CategoryGLCodePage.tsx
@@ -57,7 +57,6 @@ function CategoryGLCodePage({route}: EditCategoryPageProps) {
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={CategoryGLCodePage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/categories/CategoryPayrollCodePage.tsx b/src/pages/workspace/categories/CategoryPayrollCodePage.tsx
index 69c0cb2b59f29..7877723c93b7e 100644
--- a/src/pages/workspace/categories/CategoryPayrollCodePage.tsx
+++ b/src/pages/workspace/categories/CategoryPayrollCodePage.tsx
@@ -57,7 +57,6 @@ function CategoryPayrollCodePage({route}: EditCategoryPageProps) {
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={CategoryPayrollCodePage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/categories/CreateCategoryPage.tsx b/src/pages/workspace/categories/CreateCategoryPage.tsx
index aa0a91f79617d..4c1919adfd2a1 100644
--- a/src/pages/workspace/categories/CreateCategoryPage.tsx
+++ b/src/pages/workspace/categories/CreateCategoryPage.tsx
@@ -41,7 +41,6 @@ function CreateCategoryPage({route}: CreateCategoryPageProps) {
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={CreateCategoryPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/categories/EditCategoryPage.tsx b/src/pages/workspace/categories/EditCategoryPage.tsx
index 85a5883977417..5598d68a95d64 100644
--- a/src/pages/workspace/categories/EditCategoryPage.tsx
+++ b/src/pages/workspace/categories/EditCategoryPage.tsx
@@ -71,7 +71,6 @@ function EditCategoryPage({route}: EditCategoryPageProps) {
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={EditCategoryPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx
index 42e1e08a6902c..1c19bce143888 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx
@@ -13,7 +13,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {checkIfFeedConnectionIsBroken, flatAllCardsList, getBankName, getCardFeedIcon, getCompanyFeeds, getCustomOrFormattedFeedName, isCustomFeed} from '@libs/CardUtils';
+import {checkIfFeedConnectionIsBroken, flatAllCardsList, getBankName, getCardFeedIcon, getCustomOrFormattedFeedName, isCustomFeed} from '@libs/CardUtils';
 import {getWorkspaceAccountID} from '@libs/PolicyUtils';
 import Navigation from '@navigation/Navigation';
 import variables from '@styles/variables';
@@ -47,8 +47,6 @@ function WorkspaceCompanyCardsListHeaderButtons({policyID, selectedFeed, shouldS
     const shouldChangeLayout = isMediumScreenWidth || shouldUseNarrowLayout;
     const formattedFeedName = getCustomOrFormattedFeedName(selectedFeed, cardFeeds?.settings?.companyCardNicknames);
     const isCommercialFeed = isCustomFeed(selectedFeed);
-    const companyFeeds = getCompanyFeeds(cardFeeds);
-    const currentFeedData = companyFeeds?.[selectedFeed];
     const bankName = getBankName(selectedFeed);
     const isSelectedFeedConnectionBroken = checkIfFeedConnectionIsBroken(allFeedsCards?.[`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${selectedFeed}`]);
 
diff --git a/src/pages/workspace/companyCards/addNew/DetailsStep.tsx b/src/pages/workspace/companyCards/addNew/DetailsStep.tsx
index 7732772e17591..e6cc3805e600f 100644
--- a/src/pages/workspace/companyCards/addNew/DetailsStep.tsx
+++ b/src/pages/workspace/companyCards/addNew/DetailsStep.tsx
@@ -170,7 +170,6 @@ function DetailsStep({policyID}: DetailsStepProps) {
         <ScreenWrapper
             testID={DetailsStep.displayName}
             enableEdgeToEdgeBottomSafeAreaPadding
-            shouldKeyboardOffsetBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
diff --git a/src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx b/src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx
index 2333a2d22e039..e2eb9f3bcbc8c 100644
--- a/src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx
@@ -178,7 +178,6 @@ function AssigneeStep({policy, feed}: AssigneeStepProps) {
             stepNames={CONST.COMPANY_CARD.STEP_NAMES}
             headerTitle={translate('workspace.companyCards.assignCard')}
             enableEdgeToEdgeBottomSafeAreaPadding
-            shouldKeyboardOffsetBottomSafeAreaPadding
         >
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.companyCards.whoNeedsCardAssigned')}</Text>
             <SelectionList
diff --git a/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx b/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
index de90df98d4fd4..4f6526f145987 100644
--- a/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
@@ -112,7 +112,6 @@ function CardSelectionStep({feed, policyID}: CardSelectionStepProps) {
             headerTitle={translate('workspace.companyCards.assignCard')}
             headerSubtitle={assigneeDisplayName}
             enableEdgeToEdgeBottomSafeAreaPadding
-            shouldKeyboardOffsetBottomSafeAreaPadding
         >
             {!cardListOptions.length ? (
                 <View style={[styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter, styles.ph5, styles.mb9, safeAreaPaddingBottomStyle]}>
@@ -149,34 +148,34 @@ function CardSelectionStep({feed, policyID}: CardSelectionStepProps) {
                             <View style={[styles.ph5, styles.mb5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
                                 <InteractiveStepSubHeader
                                     startStepIndex={1}
-                                        stepNames={CONST.COMPANY_CARD.STEP_NAMES}
-                                    />
-                                </View>
-                                <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mt3]}>{translate('workspace.companyCards.chooseCard')}</Text>
-                                <Text style={[styles.textSupporting, styles.ph5, styles.mv3]}>
-                                    {translate('workspace.companyCards.chooseCardFor', {
-                                        assignee: assigneeDisplayName,
-                                        feed: getBankName(feed),
-                                    })}
-                                </Text>
+                                    stepNames={CONST.COMPANY_CARD.STEP_NAMES}
+                                />
                             </View>
-                        }
-                        shouldShowTextInputAfterHeader
-                        shouldShowHeaderMessageAfterHeader
-                        includeSafeAreaPaddingBottom={false}
-                        shouldShowListEmptyContent={false}
-                        shouldUpdateFocusedIndex
-                        footerContent={
-                            <FormAlertWithSubmitButton
-                                buttonText={translate(isEditing ? 'common.confirm' : 'common.next')}
-                                onSubmit={submit}
-                                    isAlertVisible={shouldShowError}
-                                containerStyles={[styles.ph5, !shouldShowError && styles.mt5]}
-                                message={translate('common.error.pleaseSelectOne')}
-                                buttonStyles={styles.mb5}
-                            />
-                        }
-                    />
+                            <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mt3]}>{translate('workspace.companyCards.chooseCard')}</Text>
+                            <Text style={[styles.textSupporting, styles.ph5, styles.mv3]}>
+                                {translate('workspace.companyCards.chooseCardFor', {
+                                    assignee: assigneeDisplayName,
+                                    feed: getBankName(feed),
+                                })}
+                            </Text>
+                        </View>
+                    }
+                    shouldShowTextInputAfterHeader
+                    shouldShowHeaderMessageAfterHeader
+                    includeSafeAreaPaddingBottom={false}
+                    shouldShowListEmptyContent={false}
+                    shouldUpdateFocusedIndex
+                    footerContent={
+                        <FormAlertWithSubmitButton
+                            buttonText={translate(isEditing ? 'common.confirm' : 'common.next')}
+                            onSubmit={submit}
+                            isAlertVisible={shouldShowError}
+                            containerStyles={[styles.ph5, !shouldShowError && styles.mt5]}
+                            message={translate('common.error.pleaseSelectOne')}
+                            buttonStyles={styles.mb5}
+                        />
+                    }
+                />
             )}
         </InteractiveStepWrapper>
     );
diff --git a/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx b/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx
index f359e22b3dd34..111745a4fba6b 100644
--- a/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx
@@ -91,7 +91,6 @@ function TransactionStartDateStep() {
             headerTitle={translate('workspace.companyCards.assignCard')}
             headerSubtitle={assigneeDisplayName}
             enableEdgeToEdgeBottomSafeAreaPadding
-            shouldKeyboardOffsetBottomSafeAreaPadding
         >
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mt3]}>{translate('workspace.companyCards.chooseTransactionStartDate')}</Text>
             <Text style={[styles.textSupporting, styles.ph5, styles.mv3]}>{translate('workspace.companyCards.startDateDescription')}</Text>
diff --git a/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx b/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
index 1e552b9e5ba85..e79ed9d9d3062 100644
--- a/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
@@ -75,7 +75,6 @@ function CardNameStep({policyID}: CardNameStepProps) {
             handleBackButtonPress={handleBackButtonPress}
             startStepIndex={4}
             stepNames={CONST.EXPENSIFY_CARD.STEP_NAMES}
-            shouldKeyboardOffsetBottomSafeAreaPadding
             enableEdgeToEdgeBottomSafeAreaPadding
         >
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.giveItName')}</Text>
diff --git a/src/pages/workspace/invoices/WorkspaceInvoicingDetailsName.tsx b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsName.tsx
index f8bb72f92090e..62298a803fecd 100644
--- a/src/pages/workspace/invoices/WorkspaceInvoicingDetailsName.tsx
+++ b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsName.tsx
@@ -50,7 +50,6 @@ function WorkspaceInvoicingDetailsName({route}: WorkspaceInvoicingDetailsNamePro
                 shouldEnablePickerAvoiding={false}
                 shouldEnableMaxHeight
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
             >
                 <HeaderWithBackButton title={translate('workspace.invoices.companyName')} />
                 <FormProvider
diff --git a/src/pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite.tsx b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite.tsx
index 3f565e0f425f1..b315e12a13505 100644
--- a/src/pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite.tsx
+++ b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite.tsx
@@ -73,7 +73,6 @@ function WorkspaceInvoicingDetailsWebsite({route}: WorkspaceInvoicingDetailsWebs
                 shouldEnablePickerAvoiding={false}
                 shouldEnableMaxHeight
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
             >
                 <HeaderWithBackButton title={translate('workspace.invoices.companyWebsite')} />
                 <FormProvider
diff --git a/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx b/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx
index 15503622fefc1..3ebf1ae73deb0 100644
--- a/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx
+++ b/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx
@@ -103,7 +103,6 @@ function WorkspaceCreateReportFieldsPage({
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={styles.defaultModalContainer}
                 testID={WorkspaceCreateReportFieldsPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx b/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx
index eae58340cfc73..6c3ae19750b1a 100644
--- a/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx
+++ b/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx
@@ -52,7 +52,6 @@ function RulesMaxExpenseAgePage({
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={RulesMaxExpenseAgePage.displayName}
             >
diff --git a/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx b/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx
index b8549c884acbe..f450094978dae 100644
--- a/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx
+++ b/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx
@@ -47,7 +47,6 @@ function RulesMaxExpenseAmountPage({
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={RulesMaxExpenseAmountPage.displayName}
             >
diff --git a/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx b/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx
index b30a408c0d09a..c9d3549824881 100644
--- a/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx
+++ b/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx
@@ -48,7 +48,6 @@ function RulesReceiptRequiredAmountPage({
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableMaxHeight
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 testID={RulesReceiptRequiredAmountPage.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/workspace/tags/EditTagPage.tsx b/src/pages/workspace/tags/EditTagPage.tsx
index 540a4167e9246..c9542f526d61f 100644
--- a/src/pages/workspace/tags/EditTagPage.tsx
+++ b/src/pages/workspace/tags/EditTagPage.tsx
@@ -78,7 +78,6 @@ function EditTagPage({route}: EditTagPageProps) {
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={EditTagPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/tags/TagGLCodePage.tsx b/src/pages/workspace/tags/TagGLCodePage.tsx
index b9102d65f1784..55fbc3424f893 100644
--- a/src/pages/workspace/tags/TagGLCodePage.tsx
+++ b/src/pages/workspace/tags/TagGLCodePage.tsx
@@ -66,7 +66,6 @@ function TagGLCodePage({route}: EditTagGLCodePageProps) {
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={TagGLCodePage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx b/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
index 00998896fb62c..ca20cf7cc3db0 100644
--- a/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
@@ -73,7 +73,6 @@ function WorkspaceCreateTagPage({route}: CreateTagPageProps) {
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={WorkspaceCreateTagPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
index 2c1f9de18b380..c14ba8a9d4363 100644
--- a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
@@ -73,7 +73,6 @@ function WorkspaceEditTagsPage({route}: WorkspaceEditTagsPageProps) {
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={WorkspaceEditTagsPage.displayName}
             >
diff --git a/src/pages/workspace/taxes/NamePage.tsx b/src/pages/workspace/taxes/NamePage.tsx
index e2ff3d21a45c5..1a494562fcba0 100644
--- a/src/pages/workspace/taxes/NamePage.tsx
+++ b/src/pages/workspace/taxes/NamePage.tsx
@@ -75,7 +75,6 @@ function NamePage({
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={NamePage.displayName}
             >
diff --git a/src/pages/workspace/taxes/ValuePage.tsx b/src/pages/workspace/taxes/ValuePage.tsx
index 197ea7db17c31..b070ce7a09ef4 100644
--- a/src/pages/workspace/taxes/ValuePage.tsx
+++ b/src/pages/workspace/taxes/ValuePage.tsx
@@ -64,7 +64,6 @@ function ValuePage({
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={ValuePage.displayName}
             >
diff --git a/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx b/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
index bf6b8f6ca3e9c..1409311314781 100644
--- a/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
@@ -73,7 +73,6 @@ function WorkspaceCreateTaxPage({
             <ScreenWrapper
                 testID={WorkspaceCreateTaxPage.displayName}
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
             >
                 <FullPageNotFoundView
diff --git a/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx b/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx
index 48f31cd1b8d4a..d6740afb5c6c0 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx
@@ -69,7 +69,6 @@ function WorkspaceTaxCodePage({route}: WorkspaceTaxCodePageProps) {
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={WorkspaceTaxCodePage.displayName}
             >
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
index 87b7ef8eff1e5..c12d008d395ca 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
@@ -64,7 +64,6 @@ function WorkspaceTaxesSettingsCustomTaxName({
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={WorkspaceTaxesSettingsCustomTaxName.displayName}
                 style={styles.defaultModalContainer}
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
index 4b1666968b3bc..abda0e2c631d6 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
@@ -176,7 +176,7 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
                 onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
             >
                 <ScreenWrapper
-                    includeSafeAreaPaddingBottom={false}
+                    enableEdgeToEdgeBottomSafeAreaPadding
                     testID={WorkspaceWorkflowsPayerPage.displayName}
                 >
                     <HeaderWithBackButton
@@ -194,6 +194,7 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
                         onSelectRow={setPolicyAuthorizedPayer}
                         shouldSingleExecuteRowSelect
                         showScrollIndicator
+                        addBottomSafeAreaPadding
                     />
                 </ScreenWrapper>
             </FullPageNotFoundView>
diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx
index 5be8836e95342..1349aeb0f43b9 100644
--- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx
+++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx
@@ -254,7 +254,6 @@ function WorkspaceWorkflowsApprovalsApproverPage({policy, personalDetails, isLoa
             <ScreenWrapper
                 testID={WorkspaceWorkflowsApprovalsApproverPage.displayName}
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
             >
                 <FullPageNotFoundView
                     shouldShow={shouldShowNotFoundView}
diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx
index 0825f9d476449..73bfb20b048c8 100644
--- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx
+++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx
@@ -208,7 +208,6 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat
             <ScreenWrapper
                 testID={WorkspaceWorkflowsApprovalsExpensesFromPage.displayName}
                 enableEdgeToEdgeBottomSafeAreaPadding
-                shouldKeyboardOffsetBottomSafeAreaPadding
             >
                 <FullPageNotFoundView
                     shouldShow={shouldShowNotFoundView}

From 3c06a59e85b90afd4f2eab3ccbf45d97eba56ea7 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Wed, 26 Feb 2025 16:27:34 +0100
Subject: [PATCH 25/51] feat: migrate remaining workspace screens

---
 src/components/ConnectionLayout.tsx              | 16 ++++++++++++++--
 .../VerifyIdentity/VerifyIdentity.tsx            |  3 ++-
 src/pages/wallet/WalletStatementPage.tsx         |  4 ++--
 src/pages/workspace/WorkspaceInitialPage.tsx     |  3 ++-
 .../accounting/MultiConnectionSelectorPage.tsx   |  2 +-
 .../intacct/EnterSageIntacctCredentialsPage.tsx  |  3 ++-
 .../intacct/ExistingConnectionsPage.tsx          |  1 +
 .../intacct/SageIntacctPrerequisitesPage.tsx     |  6 +++++-
 .../intacct/advanced/SageIntacctAdvancedPage.tsx |  1 +
 .../intacct/export/SageIntacctExportPage.tsx     |  1 +
 .../SageIntacctNonReimbursableExpensesPage.tsx   |  1 +
 .../SageIntacctReimbursableExpensesPage.tsx      |  1 +
 .../import/SageIntacctAddUserDimensionPage.tsx   |  1 +
 .../import/SageIntacctEditUserDimensionsPage.tsx |  2 +-
 .../intacct/import/SageIntacctImportPage.tsx     |  1 +
 .../import/SageIntacctToggleMappingsPage.tsx     |  1 +
 .../import/SageIntacctUserDimensionsPage.tsx     |  2 +-
 .../NetSuiteExistingConnectionsPage.tsx          |  2 +-
 .../NetSuiteTokenInputPage.tsx                   |  2 +-
 .../netsuite/advanced/NetSuiteAdvancedPage.tsx   |  1 +
 .../netsuite/advanced/NetSuiteAutoSyncPage.tsx   |  2 +-
 .../export/NetSuiteExportConfigurationPage.tsx   |  1 +
 .../export/NetSuiteExportExpensesPage.tsx        |  1 +
 .../NetSuiteInvoiceItemPreferenceSelectPage.tsx  |  2 +-
 .../import/NetSuiteImportCustomFieldEdit.tsx     |  1 +
 .../NetSuiteCustomListSelectorModal.tsx          |  3 ++-
 .../NetSuiteImportAddCustomListContent.tsx       |  2 +-
 .../NetSuiteImportAddCustomSegmentContent.tsx    |  2 +-
 .../import/NetSuiteImportCustomFieldView.tsx     |  1 +
 .../NetSuiteImportCustomersOrProjectsPage.tsx    |  1 +
 .../netsuite/import/NetSuiteImportPage.tsx       |  1 +
 .../workspace/accounting/nsqs/NSQSSetupPage.tsx  |  3 ++-
 .../nsqs/advanced/NSQSAdvancedPage.tsx           |  1 +
 .../accounting/nsqs/import/NSQSCustomersPage.tsx |  1 +
 .../accounting/nsqs/import/NSQSImportPage.tsx    |  1 +
 .../qbd/QuickBooksDesktopSetupPage.tsx           | 10 ++++++++--
 .../qbd/RequireQuickBooksDesktopPage.tsx         |  3 ++-
 .../advanced/QuickbooksDesktopAdvancedPage.tsx   |  1 +
 ...booksDesktopCompanyCardExpenseAccountPage.tsx |  1 +
 ...esktopOutOfPocketExpenseConfigurationPage.tsx |  1 +
 .../QuickbooksDesktopChartOfAccountsPage.tsx     |  1 +
 .../qbd/import/QuickbooksDesktopClassesPage.tsx  |  1 +
 .../qbd/import/QuickbooksDesktopImportPage.tsx   |  1 +
 .../qbd/import/QuickbooksDesktopItemsPage.tsx    |  1 +
 .../qbo/advanced/QuickbooksAdvancedPage.tsx      |  1 +
 .../QuickbooksCompanyCardExpenseAccountPage.tsx  |  1 +
 .../export/QuickbooksExportConfigurationPage.tsx |  1 +
 .../qbo/import/QuickbooksClassesPage.tsx         |  1 +
 .../qbo/import/QuickbooksCustomersPage.tsx       |  1 +
 .../qbo/import/QuickbooksImportPage.tsx          |  1 +
 .../qbo/import/QuickbooksLocationsPage.tsx       |  1 +
 .../qbo/import/QuickbooksTaxesPage.tsx           |  1 +
 .../reconciliation/CardReconciliationPage.tsx    |  7 +++++--
 .../ReconciliationAccountSettingsPage.tsx        |  1 +
 .../workspace/accounting/xero/XeroImportPage.tsx |  1 +
 .../xero/XeroTaxesConfigurationPage.tsx          |  1 +
 .../XeroTrackingCategoryConfigurationPage.tsx    |  1 +
 .../xero/advanced/XeroAdvancedPage.tsx           |  1 +
 .../xero/export/XeroExportConfigurationPage.tsx  |  1 +
 .../xero/import/XeroChartOfAccountsPage.tsx      |  1 +
 .../import/XeroCustomerConfigurationPage.tsx     |  1 +
 .../companyCards/BankConnection/index.native.tsx |  4 ++--
 .../assignCard/CardSelectionStep.tsx             |  2 +-
 .../distanceRates/PolicyDistanceRatesPage.tsx    |  3 ++-
 .../WorkspaceEditCardLimitTypePage.tsx           |  2 +-
 .../WorkspaceExpensifyCardBankAccounts.tsx       |  4 ++--
 .../WorkspaceSettlementAccountPage.tsx           |  3 ++-
 .../WorkspaceSettlementFrequencyPage.tsx         |  3 ++-
 .../members/WorkspaceOwnerChangeErrorPage.tsx    |  7 +++++--
 .../workspace/perDiem/EditPerDiemAmountPage.tsx  |  3 ++-
 .../perDiem/EditPerDiemCurrencyPage.tsx          |  3 ++-
 .../perDiem/EditPerDiemDestinationPage.tsx       |  3 ++-
 .../workspace/perDiem/EditPerDiemSubratePage.tsx |  3 ++-
 .../perDiem/WorkspacePerDiemDetailsPage.tsx      |  8 ++++++--
 .../workspace/perDiem/WorkspacePerDiemPage.tsx   |  3 ++-
 .../perDiem/WorkspacePerDiemSettingsPage.tsx     |  8 ++++++--
 .../InitialListValueSelectorModal.tsx            |  2 +-
 .../ReportFieldsInitialListValuePicker.tsx       |  1 +
 .../ReportFieldsAddListValuePage.tsx             |  3 ++-
 .../reportFields/ReportFieldsEditValuePage.tsx   |  3 ++-
 .../ReportFieldsInitialValuePage.tsx             |  3 ++-
 .../reportFields/ReportFieldsListValuesPage.tsx  |  3 ++-
 .../reportFields/ReportFieldsSettingsPage.tsx    |  2 +-
 .../ReportFieldsValueSettingsPage.tsx            |  2 +-
 .../rules/RulesAutoApproveReportsUnderPage.tsx   |  3 ++-
 .../rules/RulesAutoPayReportsUnderPage.tsx       |  3 ++-
 .../workspace/rules/RulesCustomNamePage.tsx      |  3 ++-
 src/pages/workspace/rules/RulesCustomPage.tsx    |  3 ++-
 .../rules/RulesRandomReportAuditPage.tsx         |  3 ++-
 .../workspace/tags/WorkspaceTagsSettingsPage.tsx |  2 +-
 90 files changed, 158 insertions(+), 57 deletions(-)

diff --git a/src/components/ConnectionLayout.tsx b/src/components/ConnectionLayout.tsx
index de61f368a9118..425ab5cb23208 100644
--- a/src/components/ConnectionLayout.tsx
+++ b/src/components/ConnectionLayout.tsx
@@ -3,6 +3,7 @@ import React, {useMemo} from 'react';
 import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
+import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddingStyle';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
@@ -70,6 +71,9 @@ type ConnectionLayoutProps = {
 
     /** Whether or not to block user from accessing the page */
     shouldBeBlocked?: boolean;
+
+    /** Whether to enable edge to edge bottom safe area padding logic */
+    enableEdgeToEdgeBottomSafeAreaPadding?: boolean;
 };
 
 type ConnectionLayoutContentProps = Pick<ConnectionLayoutProps, 'title' | 'titleStyle' | 'children' | 'titleAlreadyTranslated'>;
@@ -94,7 +98,7 @@ function ConnectionLayout({
     policyID,
     accessVariants,
     featureName,
-    contentContainerStyle,
+    contentContainerStyle: contentContainerStyleProp,
     titleStyle,
     shouldIncludeSafeAreaPaddingBottom,
     connectionName,
@@ -104,6 +108,7 @@ function ConnectionLayout({
     shouldLoadForEmptyConnection = false,
     onBackButtonPress = () => Navigation.goBack(),
     shouldBeBlocked = false,
+    enableEdgeToEdgeBottomSafeAreaPadding = false,
 }: ConnectionLayoutProps) {
     const {translate} = useLocalize();
 
@@ -124,6 +129,7 @@ function ConnectionLayout({
     );
 
     const shouldBlockByConnection = shouldLoadForEmptyConnection ? !isConnectionEmpty : isConnectionEmpty;
+    const contentContainerStyle = useBottomSafeSafeAreaPaddingStyle({addBottomSafeAreaPadding: enableEdgeToEdgeBottomSafeAreaPadding, style: contentContainerStyleProp});
 
     return (
         <AccessOrNotFoundWrapper
@@ -133,6 +139,7 @@ function ConnectionLayout({
             shouldBeBlocked={!!shouldBeBlocked || shouldBlockByConnection}
         >
             <ScreenWrapper
+                enableEdgeToEdgeBottomSafeAreaPadding={enableEdgeToEdgeBottomSafeAreaPadding}
                 includeSafeAreaPaddingBottom={!!shouldIncludeSafeAreaPaddingBottom}
                 shouldEnableMaxHeight
                 testID={displayName}
@@ -143,7 +150,12 @@ function ConnectionLayout({
                     onBackButtonPress={onBackButtonPress}
                 />
                 {shouldUseScrollView ? (
-                    <ScrollView contentContainerStyle={contentContainerStyle}>{renderSelectionContent}</ScrollView>
+                    <ScrollView
+                        contentContainerStyle={enableEdgeToEdgeBottomSafeAreaPadding ? undefined : contentContainerStyle}
+                        addBottomSafeAreaPadding={enableEdgeToEdgeBottomSafeAreaPadding}
+                    >
+                        {renderSelectionContent}
+                    </ScrollView>
                 ) : (
                     <View style={contentContainerStyle}>{renderSelectionContent}</View>
                 )}
diff --git a/src/pages/ReimbursementAccount/VerifyIdentity/VerifyIdentity.tsx b/src/pages/ReimbursementAccount/VerifyIdentity/VerifyIdentity.tsx
index 943f04d668405..b936c4faa3da5 100644
--- a/src/pages/ReimbursementAccount/VerifyIdentity/VerifyIdentity.tsx
+++ b/src/pages/ReimbursementAccount/VerifyIdentity/VerifyIdentity.tsx
@@ -55,8 +55,9 @@ function VerifyIdentity({onBackButtonPress}: VerifyIdentityProps) {
             handleBackButtonPress={onBackButtonPress}
             startStepIndex={2}
             stepNames={CONST.BANK_ACCOUNT.STEP_NAMES}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
-            <FullPageOfflineBlockingView>
+            <FullPageOfflineBlockingView addBottomSafeAreaPadding>
                 <ScrollView contentContainerStyle={styles.flex1}>
                     <Onfido
                         sdkToken={onfidoToken ?? ''}
diff --git a/src/pages/wallet/WalletStatementPage.tsx b/src/pages/wallet/WalletStatementPage.tsx
index 4a363e19e4903..aa974535839b3 100644
--- a/src/pages/wallet/WalletStatementPage.tsx
+++ b/src/pages/wallet/WalletStatementPage.tsx
@@ -89,7 +89,7 @@ function WalletStatementPage({route}: WalletStatementPageProps) {
     return (
         <ScreenWrapper
             shouldShowOfflineIndicator={false}
-            includeSafeAreaPaddingBottom={false}
+            enableEdgeToEdgeBottomSafeAreaPadding
             testID={WalletStatementPage.displayName}
         >
             <HeaderWithBackButton
@@ -98,7 +98,7 @@ function WalletStatementPage({route}: WalletStatementPageProps) {
                 isDownloading={isDownloading}
                 onDownloadButtonPress={processDownload}
             />
-            <FullPageOfflineBlockingView>
+            <FullPageOfflineBlockingView addBottomSafeAreaPadding>
                 <WalletStatementModal statementPageURL={url} />
             </FullPageOfflineBlockingView>
         </ScreenWrapper>
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 94a399a7a3222..74c52a6db8360 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -437,8 +437,9 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
             <FullPageNotFoundView
                 onBackButtonPress={Navigation.dismissModal}
                 onLinkPress={Navigation.goBackToHome}
-                shouldShow={shouldShowNotFoundPage}
+                shouldShow
                 subtitleKey={shouldShowPolicy ? 'workspace.common.notAuthorized' : undefined}
+                addBottomSafeAreaPadding
             >
                 <HeaderWithBackButton
                     title={policyName}
diff --git a/src/pages/workspace/accounting/MultiConnectionSelectorPage.tsx b/src/pages/workspace/accounting/MultiConnectionSelectorPage.tsx
index adaaf0d475daa..0906d98647cca 100644
--- a/src/pages/workspace/accounting/MultiConnectionSelectorPage.tsx
+++ b/src/pages/workspace/accounting/MultiConnectionSelectorPage.tsx
@@ -95,7 +95,7 @@ function MultiConnectionSelectorPage({policy, route}: MultiConnectionSelectorPag
         >
             <ScreenWrapper
                 testID={MultiConnectionSelectorPage.displayName}
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldShowOfflineIndicatorInWideScreen
             >
                 <HeaderWithBackButton title={translate(`workspace.multiConnectionSelector.title`, {connectionName: multiConnectionName})} />
diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
index 7ac4329c3a503..ab1762371f920 100644
--- a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -53,7 +53,7 @@ function EnterSageIntacctCredentialsPage({route}: SageIntacctPrerequisitesPagePr
     );
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnableMaxHeight
             testID={EnterSageIntacctCredentialsPage.displayName}
         >
@@ -70,6 +70,7 @@ function EnterSageIntacctCredentialsPage({route}: SageIntacctPrerequisitesPagePr
                 enabledWhenOffline
                 shouldValidateOnBlur
                 shouldValidateOnChange
+                addBottomSafeAreaPadding
             >
                 <Text style={[styles.textHeadlineH1, styles.pb5, styles.pt3]}>{translate('workspace.intacct.enterCredentials')}</Text>
                 {formItems.map((formItem, index) => (
diff --git a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
index 9829fc569f53c..379e4aae6965f 100644
--- a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
@@ -46,6 +46,7 @@ function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) {
 
     return (
         <ScreenWrapper
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicatorInWideScreen
             testID={ExistingConnectionsPage.displayName}
diff --git a/src/pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage.tsx b/src/pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage.tsx
index 56f11640ea7cc..8f1d5ffbd285e 100644
--- a/src/pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage.tsx
@@ -65,6 +65,7 @@ function SageIntacctPrerequisitesPage({route}: SageIntacctPrerequisitesPageProps
 
     return (
         <ScreenWrapper
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicatorInWideScreen
             testID={SageIntacctPrerequisitesPage.displayName}
@@ -85,7 +86,10 @@ function SageIntacctPrerequisitesPage({route}: SageIntacctPrerequisitesPageProps
                     shouldUseSingleExecution
                 />
 
-                <FixedFooter style={[styles.mtAuto]}>
+                <FixedFooter
+                    style={[styles.mtAuto]}
+                    addBottomSafeAreaPadding
+                >
                     <Button
                         success
                         text={translate('common.next')}
diff --git a/src/pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage.tsx b/src/pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage.tsx
index fa410a0e376b4..1b17911eba66a 100644
--- a/src/pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage.tsx
@@ -98,6 +98,7 @@ function SageIntacctAdvancedPage({policy}: WithPolicyProps) {
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {toggleSections.map((section) => (
                 <ToggleSettingOptionRow
diff --git a/src/pages/workspace/accounting/intacct/export/SageIntacctExportPage.tsx b/src/pages/workspace/accounting/intacct/export/SageIntacctExportPage.tsx
index 479f43a7bab2c..2a41106be334f 100644
--- a/src/pages/workspace/accounting/intacct/export/SageIntacctExportPage.tsx
+++ b/src/pages/workspace/accounting/intacct/export/SageIntacctExportPage.tsx
@@ -77,6 +77,7 @@ function SageIntacctExportPage({policy}: WithPolicyProps) {
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {sections.map((section) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage.tsx b/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage.tsx
index e45fedc51fc12..10700440856ae 100644
--- a/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage.tsx
@@ -130,6 +130,7 @@ function SageIntacctNonReimbursableExpensesPage({policy}: WithPolicyConnectionsP
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {menuItems
                 .filter((item) => !item.shouldHide)
diff --git a/src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx b/src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx
index 12265912fc9eb..a20183a886e8b 100644
--- a/src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx
@@ -107,6 +107,7 @@ function SageIntacctReimbursableExpensesPage({policy}: WithPolicyConnectionsProp
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {menuItems
                 .filter((item) => !item.shouldHide)
diff --git a/src/pages/workspace/accounting/intacct/import/SageIntacctAddUserDimensionPage.tsx b/src/pages/workspace/accounting/intacct/import/SageIntacctAddUserDimensionPage.tsx
index 3dc7a325650b1..7565b178205bf 100644
--- a/src/pages/workspace/accounting/intacct/import/SageIntacctAddUserDimensionPage.tsx
+++ b/src/pages/workspace/accounting/intacct/import/SageIntacctAddUserDimensionPage.tsx
@@ -59,6 +59,7 @@ function SageIntacctAddUserDimensionPage({policy}: WithPolicyProps) {
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_USER_DIMENSIONS.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <FormProvider
                 style={[styles.flexGrow1, styles.ph5]}
diff --git a/src/pages/workspace/accounting/intacct/import/SageIntacctEditUserDimensionsPage.tsx b/src/pages/workspace/accounting/intacct/import/SageIntacctEditUserDimensionsPage.tsx
index 6e09938514398..531320ca8c169 100644
--- a/src/pages/workspace/accounting/intacct/import/SageIntacctEditUserDimensionsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/import/SageIntacctEditUserDimensionsPage.tsx
@@ -74,10 +74,10 @@ function SageIntacctEditUserDimensionsPage({route}: SageIntacctEditUserDimension
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={styles.flex1}
             shouldUseScrollView={false}
-            shouldIncludeSafeAreaPaddingBottom
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_USER_DIMENSIONS.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <FormProvider
                 style={[styles.flexGrow1, styles.ph5]}
diff --git a/src/pages/workspace/accounting/intacct/import/SageIntacctImportPage.tsx b/src/pages/workspace/accounting/intacct/import/SageIntacctImportPage.tsx
index 92a2e86038750..aef63328e43a9 100644
--- a/src/pages/workspace/accounting/intacct/import/SageIntacctImportPage.tsx
+++ b/src/pages/workspace/accounting/intacct/import/SageIntacctImportPage.tsx
@@ -72,6 +72,7 @@ function SageIntacctImportPage({policy}: WithPolicyProps) {
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.intacct.expenseTypes')}
diff --git a/src/pages/workspace/accounting/intacct/import/SageIntacctToggleMappingsPage.tsx b/src/pages/workspace/accounting/intacct/import/SageIntacctToggleMappingsPage.tsx
index 67203416f4972..cb8f510383842 100644
--- a/src/pages/workspace/accounting/intacct/import/SageIntacctToggleMappingsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/import/SageIntacctToggleMappingsPage.tsx
@@ -81,6 +81,7 @@ function SageIntacctToggleMappingsPage({route}: SageIntacctToggleMappingsPagePro
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_IMPORT.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <Text style={[styles.flexRow, styles.alignItemsCenter, styles.w100, styles.mb5, styles.ph5]}>
                 <Text style={[styles.textNormal]}>{translate('workspace.intacct.toggleImportTitleFirstPart')}</Text>
diff --git a/src/pages/workspace/accounting/intacct/import/SageIntacctUserDimensionsPage.tsx b/src/pages/workspace/accounting/intacct/import/SageIntacctUserDimensionsPage.tsx
index aa7a86adfb26c..4c595ec5fc1a5 100644
--- a/src/pages/workspace/accounting/intacct/import/SageIntacctUserDimensionsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/import/SageIntacctUserDimensionsPage.tsx
@@ -38,9 +38,9 @@ function SageIntacctUserDimensionsPage({policy}: WithPolicyProps) {
             contentContainerStyle={[styles.flex1]}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
-            shouldIncludeSafeAreaPaddingBottom
             shouldUseScrollView={false}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_IMPORT.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {userDimensions?.length === 0 ? (
                 <View style={[styles.alignItemsCenter, styles.flex1, styles.justifyContentCenter]}>
diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteExistingConnectionsPage.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteExistingConnectionsPage.tsx
index 77b01ed436897..3d99db1eae7e6 100644
--- a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteExistingConnectionsPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteExistingConnectionsPage.tsx
@@ -56,7 +56,7 @@ function NetSuiteExistingConnectionsPage({route}: ExistingConnectionsPageProps)
             shouldLoadForEmptyConnection
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID))}
-            shouldIncludeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <View style={[styles.flex1]}>
                 <MenuItemList
diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx
index 18a6fe97322ce..571074abb5fb3 100644
--- a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx
@@ -78,7 +78,7 @@ function NetSuiteTokenInputPage({policy}: WithPolicyConnectionsProps) {
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             onBackButtonPress={handleBackButtonPress}
-            shouldIncludeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldLoadForEmptyConnection={isEmptyObject(policy?.connections?.[CONST.POLICY.CONNECTIONS.NAME.NETSUITE])}
             shouldBeBlocked={shouldPageBeBlocked}
         >
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
index 5d7df8b7a876f..3532ba6570d3e 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
@@ -274,6 +274,7 @@ function NetSuiteAdvancedPage({policy}: WithPolicyConnectionsProps) {
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {menuItems
                 .filter((item) => !item?.shouldHide)
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAutoSyncPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAutoSyncPage.tsx
index 2836b3d60075a..950d0a0ea7084 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAutoSyncPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAutoSyncPage.tsx
@@ -40,7 +40,7 @@ function NetSuiteAutoSyncPage({policy, route}: WithPolicyConnectionsProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={NetSuiteAutoSyncPage.displayName}
                 offlineIndicatorStyle={styles.mtAuto}
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportConfigurationPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportConfigurationPage.tsx
index 8a053b615790b..59cdbabe77770 100644
--- a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportConfigurationPage.tsx
@@ -210,6 +210,7 @@ function NetSuiteExportConfigurationPage({policy}: WithPolicyConnectionsProps) {
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {menuItems
                 .filter((item) => !item.shouldHide)
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPage.tsx
index ad92c53acad1f..b825b1fd2268c 100644
--- a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPage.tsx
@@ -107,6 +107,7 @@ function NetSuiteExportExpensesPage({policy}: WithPolicyConnectionsProps) {
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {menuItems
                 .filter((item) => !item.shouldHide)
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemPreferenceSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemPreferenceSelectPage.tsx
index bf2f1487fcd82..df4da3d7368a3 100644
--- a/src/pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemPreferenceSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemPreferenceSelectPage.tsx
@@ -66,7 +66,7 @@ function NetSuiteInvoiceItemPreferenceSelectPage({policy}: WithPolicyConnections
             policyID={policyID}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             shouldUseScrollView={false}
-            shouldIncludeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <OfflineWithFeedback
                 pendingAction={settingsPendingAction([CONST.NETSUITE_CONFIG.INVOICE_ITEM_PREFERENCE], config?.pendingFields)}
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx
index b90d8d1af11be..3ea862f40c5d3 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx
@@ -175,6 +175,7 @@ function NetSuiteImportCustomFieldEdit({
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             shouldBeBlocked={!customField || !PolicyUtils.isNetSuiteCustomFieldPropertyEditable(customField, fieldName)}
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldUseScrollView={false}
         >
             {renderMap[fieldName] || renderForm}
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
index 0f52f6a11d7c4..e8598b98baf8f 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
@@ -80,7 +80,7 @@ function NetSuiteCustomListSelectorModal({isVisible, currentCustomListValue, onC
             <ScreenWrapper
                 style={[styles.pb0]}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 testID={NetSuiteCustomListSelectorModal.displayName}
             >
                 <HeaderWithBackButton
@@ -98,6 +98,7 @@ function NetSuiteCustomListSelectorModal({isVisible, currentCustomListValue, onC
                     ListItem={RadioListItem}
                     isRowMultilineSupported
                     initiallyFocusedOptionKey={currentCustomListValue}
+                    addBottomSafeAreaPadding
                     shouldSingleExecuteRowSelect
                     shouldStopPropagation
                     shouldUseDynamicMaxToRenderPerBatch
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListContent.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListContent.tsx
index fa9b9af238e0c..c32c2fb1a14b0 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListContent.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListContent.tsx
@@ -116,7 +116,7 @@ function NetSuiteImportAddCustomListContent({policy, draftValues}: NetSuiteImpor
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             onBackButtonPress={handleBackButtonPress}
-            shouldIncludeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldUseScrollView={false}
         >
             <View style={[styles.ph5, styles.mb3, styles.mt3, {height: CONST.NETSUITE_FORM_STEPS_HEADER_HEIGHT}]}>
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentContent.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentContent.tsx
index 31ecdf8376960..91e60b08fd010 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentContent.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentContent.tsx
@@ -116,7 +116,7 @@ function NetSuiteImportAddCustomSegmentContent({policy, draftValues}: NetSuiteIm
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             onBackButtonPress={handleBackButtonPress}
-            shouldIncludeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldUseScrollView={false}
         >
             <View style={[styles.ph5, styles.mb3, styles.mt3, {height: CONST.NETSUITE_FORM_STEPS_HEADER_HEIGHT}]}>
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldView.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldView.tsx
index cb6513e785c1c..f825a3ed32822 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldView.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldView.tsx
@@ -94,6 +94,7 @@ function NetSuiteImportCustomFieldView({
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             shouldBeBlocked={!customField}
+            enableEdgeToEdgeBottomSafeAreaPadding
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_MAPPING.getRoute(policyID, importCustomField))}
         >
             {!!customField && (
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage.tsx
index 895ed6b637058..80ddaa3c2fb0f 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage.tsx
@@ -69,6 +69,7 @@ function NetSuiteImportCustomersOrProjectsPage({policy}: WithPolicyConnectionsPr
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <View style={[styles.ph5, styles.flexRow, styles.pb5]}>
                 <RenderHTML html={`<comment>${Parser.replace(translate(`workspace.netsuite.import.customersOrJobs.subtitle` as TranslationPaths))}</comment>`} />
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportPage.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportPage.tsx
index 0965be4bca81a..707f32d860509 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportPage.tsx
@@ -39,6 +39,7 @@ function NetSuiteImportPage({policy}: WithPolicyConnectionsProps) {
             contentContainerStyle={[styles.pb2]}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 wrapperStyle={[styles.mv3, styles.ph5]}
diff --git a/src/pages/workspace/accounting/nsqs/NSQSSetupPage.tsx b/src/pages/workspace/accounting/nsqs/NSQSSetupPage.tsx
index f3b578b6e064b..88ee17a9cf375 100644
--- a/src/pages/workspace/accounting/nsqs/NSQSSetupPage.tsx
+++ b/src/pages/workspace/accounting/nsqs/NSQSSetupPage.tsx
@@ -69,7 +69,7 @@ function NSQSSetupPage({policy}: WithPolicyConnectionsProps) {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnableMaxHeight
             testID={NSQSSetupPage.displayName}
         >
@@ -88,6 +88,7 @@ function NSQSSetupPage({policy}: WithPolicyConnectionsProps) {
                         enabledWhenOffline
                         shouldValidateOnBlur
                         shouldValidateOnChange
+                        addBottomSafeAreaPadding
                     >
                         <Text style={[styles.textHeadlineH1, styles.mb5]}>{translate('workspace.nsqs.setup.description')}</Text>
                         <InputWrapper
diff --git a/src/pages/workspace/accounting/nsqs/advanced/NSQSAdvancedPage.tsx b/src/pages/workspace/accounting/nsqs/advanced/NSQSAdvancedPage.tsx
index 0363e8da258af..85c82802ec867 100644
--- a/src/pages/workspace/accounting/nsqs/advanced/NSQSAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/nsqs/advanced/NSQSAdvancedPage.tsx
@@ -36,6 +36,7 @@ function NSQSAdvancedPage({policy}: WithPolicyProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={[styles.pb2, styles.ph5, styles.gap6]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NSQS}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <View>
                 <ToggleSettingOptionRow
diff --git a/src/pages/workspace/accounting/nsqs/import/NSQSCustomersPage.tsx b/src/pages/workspace/accounting/nsqs/import/NSQSCustomersPage.tsx
index 952864f09261f..7e4dd316ebe6d 100644
--- a/src/pages/workspace/accounting/nsqs/import/NSQSCustomersPage.tsx
+++ b/src/pages/workspace/accounting/nsqs/import/NSQSCustomersPage.tsx
@@ -45,6 +45,7 @@ function NSQSCustomersPage({policy}: WithPolicyProps) {
             contentContainerStyle={[styles.pb2, styles.ph5, styles.gap6]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NSQS}
             onBackButtonPress={policyID ? () => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NSQS_IMPORT.getRoute(policyID)) : undefined}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <RenderHTML html={`<comment>${Parser.replace(translate(`workspace.nsqs.import.importFields.customers.subtitle`))}</comment>`} />
             <View>
diff --git a/src/pages/workspace/accounting/nsqs/import/NSQSImportPage.tsx b/src/pages/workspace/accounting/nsqs/import/NSQSImportPage.tsx
index 372c5d387c62a..465352d955913 100644
--- a/src/pages/workspace/accounting/nsqs/import/NSQSImportPage.tsx
+++ b/src/pages/workspace/accounting/nsqs/import/NSQSImportPage.tsx
@@ -31,6 +31,7 @@ function NSQSImportPage({policy}: WithPolicyProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={[styles.pb2, styles.ph5, styles.gap6]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NSQS}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.nsqs.import.expenseCategories')}
diff --git a/src/pages/workspace/accounting/qbd/QuickBooksDesktopSetupPage.tsx b/src/pages/workspace/accounting/qbd/QuickBooksDesktopSetupPage.tsx
index a71d737987585..538b577ac234f 100644
--- a/src/pages/workspace/accounting/qbd/QuickBooksDesktopSetupPage.tsx
+++ b/src/pages/workspace/accounting/qbd/QuickBooksDesktopSetupPage.tsx
@@ -39,7 +39,9 @@ function RequireQuickBooksDesktopModal({route}: RequireQuickBooksDesktopModalPro
     const [codatSetupLink, setCodatSetupLink] = useState<string>('');
     const hasResultOfFetchingSetupLink = !!codatSetupLink || hasError;
 
-    const ContentWrapper = hasResultOfFetchingSetupLink ? ({children}: React.PropsWithChildren) => children : FullPageOfflineBlockingView;
+    const ContentWrapper = hasResultOfFetchingSetupLink
+        ? ({children}: React.PropsWithChildren) => children
+        : ({children}: React.PropsWithChildren) => <FullPageOfflineBlockingView addBottomSafeAreaPadding>{children}</FullPageOfflineBlockingView>;
 
     const fetchSetupLink = useCallback(() => {
         setHasError(false);
@@ -80,6 +82,7 @@ function RequireQuickBooksDesktopModal({route}: RequireQuickBooksDesktopModalPro
 
     return (
         <ScreenWrapper
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicatorInWideScreen
             testID={RequireQuickBooksDesktopModal.displayName}
@@ -131,7 +134,10 @@ function RequireQuickBooksDesktopModal({route}: RequireQuickBooksDesktopModalPro
                                 />
                             )}
                         </View>
-                        <FixedFooter style={[styles.mtAuto, styles.ph0]}>
+                        <FixedFooter
+                            style={[styles.mtAuto, styles.ph0]}
+                            addBottomSafeAreaPadding
+                        >
                             <Button
                                 success
                                 text={translate('common.done')}
diff --git a/src/pages/workspace/accounting/qbd/RequireQuickBooksDesktopPage.tsx b/src/pages/workspace/accounting/qbd/RequireQuickBooksDesktopPage.tsx
index b210148adbee7..88c091f59e954 100644
--- a/src/pages/workspace/accounting/qbd/RequireQuickBooksDesktopPage.tsx
+++ b/src/pages/workspace/accounting/qbd/RequireQuickBooksDesktopPage.tsx
@@ -24,6 +24,7 @@ function RequireQuickBooksDesktopModal({route}: RequireQuickBooksDesktopModalPro
 
     return (
         <ScreenWrapper
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicatorInWideScreen
             testID={RequireQuickBooksDesktopModal.displayName}
@@ -43,7 +44,7 @@ function RequireQuickBooksDesktopModal({route}: RequireQuickBooksDesktopModalPro
                     <Text style={[styles.textAlignCenter, styles.textSupporting, styles.textNormal, styles.pt3]}>{translate('workspace.qbd.requiredSetupDevice.body1')}</Text>
                     <Text style={[styles.textAlignCenter, styles.textSupporting, styles.textNormal, styles.pt4]}>{translate('workspace.qbd.requiredSetupDevice.body2')}</Text>
                 </View>
-                <FixedFooter>
+                <FixedFooter addBottomSafeAreaPadding>
                     <Button
                         success
                         text={translate('common.buttonConfirm')}
diff --git a/src/pages/workspace/accounting/qbd/advanced/QuickbooksDesktopAdvancedPage.tsx b/src/pages/workspace/accounting/qbd/advanced/QuickbooksDesktopAdvancedPage.tsx
index 298f261055050..ce97408810201 100644
--- a/src/pages/workspace/accounting/qbd/advanced/QuickbooksDesktopAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/qbd/advanced/QuickbooksDesktopAdvancedPage.tsx
@@ -54,6 +54,7 @@ function QuickbooksDesktopAdvancedPage({policy}: WithPolicyConnectionsProps) {
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {qbdToggleSettingItems.map((item) => (
                 <ToggleSettingOptionRow
diff --git a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopCompanyCardExpenseAccountPage.tsx b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopCompanyCardExpenseAccountPage.tsx
index 75ad8a86eff5a..7edd3f80bfeca 100644
--- a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopCompanyCardExpenseAccountPage.tsx
+++ b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopCompanyCardExpenseAccountPage.tsx
@@ -68,6 +68,7 @@ function QuickbooksDesktopCompanyCardExpenseAccountPage({policy}: WithPolicyConn
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXPORT.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {sections.map((section) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopOutOfPocketExpenseConfigurationPage.tsx b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopOutOfPocketExpenseConfigurationPage.tsx
index 1c0372aa8715c..4af5944390024 100644
--- a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopOutOfPocketExpenseConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopOutOfPocketExpenseConfigurationPage.tsx
@@ -97,6 +97,7 @@ function QuickbooksDesktopOutOfPocketExpenseConfigurationPage({policy}: WithPoli
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXPORT.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {sections.map((section, index) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopChartOfAccountsPage.tsx b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopChartOfAccountsPage.tsx
index 45335ad759bef..576c023172460 100644
--- a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopChartOfAccountsPage.tsx
+++ b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopChartOfAccountsPage.tsx
@@ -32,6 +32,7 @@ function QuickbooksDesktopChartOfAccountsPage({policy}: WithPolicyProps) {
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_IMPORT.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopClassesPage.tsx b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopClassesPage.tsx
index 4a9d459cf4bda..ae8730b360133 100644
--- a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopClassesPage.tsx
+++ b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopClassesPage.tsx
@@ -38,6 +38,7 @@ function QuickbooksDesktopClassesPage({policy}: WithPolicyProps) {
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_IMPORT.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopImportPage.tsx b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopImportPage.tsx
index c83ec9f85b1b2..1b080e85d9ae1 100644
--- a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopImportPage.tsx
+++ b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopImportPage.tsx
@@ -62,6 +62,7 @@ function QuickbooksDesktopImportPage({policy}: WithPolicyProps) {
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {sections.map((section) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopItemsPage.tsx b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopItemsPage.tsx
index 1bb2af69eda1b..2533bc98acc7d 100644
--- a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopItemsPage.tsx
+++ b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopItemsPage.tsx
@@ -30,6 +30,7 @@ function QuickbooksDesktopItemsPage({policy}: WithPolicyProps) {
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_IMPORT.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx b/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx
index 14be504611125..47d345478e96a 100644
--- a/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx
@@ -161,6 +161,7 @@ function QuickbooksAdvancedPage({policy}: WithPolicyConnectionsProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {qboToggleSettingItems.map((item) => (
                 <ToggleSettingOptionRow
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx
index ec0a235ad5403..cab06c18aef67 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx
@@ -56,6 +56,7 @@ function QuickbooksCompanyCardExpenseAccountPage({policy}: WithPolicyConnections
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {sections.map((section) => (
                 <OfflineWithFeedback pendingAction={settingsPendingAction(section.subscribedSettings, qboConfig?.pendingFields)}>
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage.tsx
index 21bd07d33bd5f..38b801bb60acb 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage.tsx
@@ -91,6 +91,7 @@ function QuickbooksExportConfigurationPage({policy}: WithPolicyConnectionsProps)
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {menuItems.map((menuItem) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksClassesPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksClassesPage.tsx
index c436f332a8c00..035d038d393ff 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksClassesPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksClassesPage.tsx
@@ -38,6 +38,7 @@ function QuickbooksClassesPage({policy}: WithPolicyProps) {
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksCustomersPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksCustomersPage.tsx
index 5518494151987..67ff74c6a466e 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksCustomersPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksCustomersPage.tsx
@@ -49,6 +49,7 @@ function QuickbooksCustomersPage({policy}: WithPolicyProps) {
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx
index d842a1580a1a2..0d394c031f6ca 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx
@@ -82,6 +82,7 @@ function QuickbooksImportPage({policy}: WithPolicyProps) {
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {sections.map((section) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksLocationsPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksLocationsPage.tsx
index 26916ca207ce3..063af05071b4d 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksLocationsPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksLocationsPage.tsx
@@ -60,6 +60,7 @@ function QuickbooksLocationsPage({policy}: WithPolicyProps) {
             contentContainerStyle={[[styles.pb2, styles.ph5]]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksTaxesPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksTaxesPage.tsx
index 94156cfce54c1..ee5e2833c80c1 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksTaxesPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksTaxesPage.tsx
@@ -31,6 +31,7 @@ function QuickbooksTaxesPage({policy}: WithPolicyProps) {
             contentContainerStyle={[[styles.pb2, styles.ph5]]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx b/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx
index 19429e147426c..eca8d00d58828 100644
--- a/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx
+++ b/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx
@@ -79,12 +79,15 @@ function CardReconciliationPage({policy, route}: CardReconciliationPageProps) {
             shouldBeBlocked={!shouldShow}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={CardReconciliationPage.displayName}
             >
                 <HeaderWithBackButton title={translate('workspace.accounting.cardReconciliation')} />
-                <ScrollView contentContainerStyle={styles.pb5}>
+                <ScrollView
+                    contentContainerStyle={styles.pb5}
+                    addBottomSafeAreaPadding
+                >
                     <ToggleSettingOptionRow
                         key={translate('workspace.accounting.continuousReconciliation')}
                         title={translate('workspace.accounting.continuousReconciliation')}
diff --git a/src/pages/workspace/accounting/reconciliation/ReconciliationAccountSettingsPage.tsx b/src/pages/workspace/accounting/reconciliation/ReconciliationAccountSettingsPage.tsx
index 9fb208fae4023..7e3a5aed947f5 100644
--- a/src/pages/workspace/accounting/reconciliation/ReconciliationAccountSettingsPage.tsx
+++ b/src/pages/workspace/accounting/reconciliation/ReconciliationAccountSettingsPage.tsx
@@ -71,6 +71,7 @@ function ReconciliationAccountSettingsPage({route}: ReconciliationAccountSetting
             connectionName={connectionName}
             shouldUseScrollView={false}
             onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_ACCOUNTING_CARD_RECONCILIATION.getRoute(policyID, connection))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <Text style={[styles.textNormal, styles.mb5, styles.ph5]}>{translate('workspace.accounting.chooseReconciliationAccount.chooseBankAccount')}</Text>
             <Text style={[styles.textNormal, styles.mb6, styles.ph5]}>
diff --git a/src/pages/workspace/accounting/xero/XeroImportPage.tsx b/src/pages/workspace/accounting/xero/XeroImportPage.tsx
index 87f4b3a8ac9a8..eab0794fbe213 100644
--- a/src/pages/workspace/accounting/xero/XeroImportPage.tsx
+++ b/src/pages/workspace/accounting/xero/XeroImportPage.tsx
@@ -69,6 +69,7 @@ function XeroImportPage({policy}: WithPolicyProps) {
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.xero.importDescription')}</Text>
 
diff --git a/src/pages/workspace/accounting/xero/XeroTaxesConfigurationPage.tsx b/src/pages/workspace/accounting/xero/XeroTaxesConfigurationPage.tsx
index cf695b57aa38b..ec65474306d10 100644
--- a/src/pages/workspace/accounting/xero/XeroTaxesConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/xero/XeroTaxesConfigurationPage.tsx
@@ -28,6 +28,7 @@ function XeroTaxesConfigurationPage({policy}: WithPolicyProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx b/src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx
index 898b4dc326bda..29d1a82f2cf19 100644
--- a/src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx
@@ -54,6 +54,7 @@ function XeroTrackingCategoryConfigurationPage({policy}: WithPolicyProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx b/src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx
index bb49e2a160eaa..62adfd41d02e0 100644
--- a/src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx
@@ -53,6 +53,7 @@ function XeroAdvancedPage({policy}: WithPolicyConnectionsProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 key={translate('workspace.accounting.autoSync')}
diff --git a/src/pages/workspace/accounting/xero/export/XeroExportConfigurationPage.tsx b/src/pages/workspace/accounting/xero/export/XeroExportConfigurationPage.tsx
index dad62ccb1848a..525b6240df3cc 100644
--- a/src/pages/workspace/accounting/xero/export/XeroExportConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/xero/export/XeroExportConfigurationPage.tsx
@@ -99,6 +99,7 @@ function XeroExportConfigurationPage({policy}: WithPolicyConnectionsProps) {
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {menuItems.map((menuItem) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/xero/import/XeroChartOfAccountsPage.tsx b/src/pages/workspace/accounting/xero/import/XeroChartOfAccountsPage.tsx
index 692c892e164e3..220ae312779a0 100644
--- a/src/pages/workspace/accounting/xero/import/XeroChartOfAccountsPage.tsx
+++ b/src/pages/workspace/accounting/xero/import/XeroChartOfAccountsPage.tsx
@@ -32,6 +32,7 @@ function XeroChartOfAccountsPage({policy}: WithPolicyProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <View style={[styles.flexRow, styles.mb4, styles.alignItemsCenter, styles.justifyContentBetween]}>
                 <View style={styles.flex1}>
diff --git a/src/pages/workspace/accounting/xero/import/XeroCustomerConfigurationPage.tsx b/src/pages/workspace/accounting/xero/import/XeroCustomerConfigurationPage.tsx
index 1d5c51642af59..570c205620258 100644
--- a/src/pages/workspace/accounting/xero/import/XeroCustomerConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/xero/import/XeroCustomerConfigurationPage.tsx
@@ -29,6 +29,7 @@ function XeroCustomerConfigurationPage({policy}: WithPolicyProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={[[styles.pb2, styles.ph5]]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/companyCards/BankConnection/index.native.tsx b/src/pages/workspace/companyCards/BankConnection/index.native.tsx
index c745fe5300edc..7f2826c044a81 100644
--- a/src/pages/workspace/companyCards/BankConnection/index.native.tsx
+++ b/src/pages/workspace/companyCards/BankConnection/index.native.tsx
@@ -118,7 +118,7 @@ function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnecti
         <ScreenWrapper
             testID={BankConnection.displayName}
             shouldShowOfflineIndicator={false}
-            includeSafeAreaPaddingBottom={false}
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
@@ -126,7 +126,7 @@ function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnecti
                 title={headerTitle}
                 onBackButtonPress={handleBackButtonPress}
             />
-            <FullPageOfflineBlockingView>
+            <FullPageOfflineBlockingView addBottomSafeAreaPadding>
                 {!!url && !isConnectionCompleted && (
                     <WebView
                         ref={webViewRef}
diff --git a/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx b/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
index 4f6526f145987..1c1053c85a809 100644
--- a/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
@@ -162,7 +162,7 @@ function CardSelectionStep({feed, policyID}: CardSelectionStepProps) {
                     }
                     shouldShowTextInputAfterHeader
                     shouldShowHeaderMessageAfterHeader
-                    includeSafeAreaPaddingBottom={false}
+                    addBottomSafeAreaPadding
                     shouldShowListEmptyContent={false}
                     shouldUpdateFocusedIndex
                     footerContent={
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
index 313f4ebdc1152..c35138f0e08a0 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
@@ -340,7 +340,7 @@ function PolicyDistanceRatesPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={PolicyDistanceRatesPage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
@@ -372,6 +372,7 @@ function PolicyDistanceRatesPage({
                 )}
                 {Object.values(customUnitRates).length > 0 && (
                     <SelectionListWithModal
+                        addBottomSafeAreaPadding
                         canSelectMultiple={canSelectMultiple}
                         turnOnSelectionModeOnLongPress
                         onTurnOnSelectionMode={(item) => item && toggleRate(item)}
diff --git a/src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx b/src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx
index 30fa313dcea4c..d06d44a5c2155 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx
@@ -165,7 +165,7 @@ function WorkspaceEditCardLimitTypePage({route}: WorkspaceEditCardLimitTypePageP
                     title={translate('workspace.card.issueNewCard.limitType')}
                     onBackButtonPress={goBack}
                 />
-                <FullPageOfflineBlockingView>
+                <FullPageOfflineBlockingView addBottomSafeAreaPadding>
                     <SelectionList
                         ListItem={RadioListItem}
                         onSelectRow={({value}) => setTypeSelected(value)}
diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx
index 8922052b78a0a..d37b9ff5926b4 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx
@@ -186,7 +186,7 @@ function WorkspaceExpensifyCardBankAccounts({route}: WorkspaceExpensifyCardBankA
         >
             <ScreenWrapper
                 testID={WorkspaceExpensifyCardBankAccounts.displayName}
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnablePickerAvoiding={false}
                 shouldShowOfflineIndicator={false}
             >
@@ -198,7 +198,7 @@ function WorkspaceExpensifyCardBankAccounts({route}: WorkspaceExpensifyCardBankA
                     />
                     {isInVerificationState && renderVerificationStateView()}
                     {!isInVerificationState && (
-                        <FullPageOfflineBlockingView>
+                        <FullPageOfflineBlockingView addBottomSafeAreaPadding>
                             <View style={styles.flex1}>
                                 <Text style={[styles.mh5, styles.mb3]}>{translate('workspace.expensifyCard.chooseExistingBank')}</Text>
                                 {renderBankOptions()}
diff --git a/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx
index 6ba68ba25fa7c..d59bf63955eb4 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx
@@ -90,7 +90,7 @@ function WorkspaceSettlementAccountPage({route}: WorkspaceSettlementAccountPageP
         >
             <ScreenWrapper
                 testID={WorkspaceSettlementAccountPage.displayName}
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableMaxHeight
             >
                 <HeaderWithBackButton
@@ -98,6 +98,7 @@ function WorkspaceSettlementAccountPage({route}: WorkspaceSettlementAccountPageP
                     onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_EXPENSIFY_CARD_SETTINGS.getRoute(policyID))}
                 />
                 <SelectionList
+                    addBottomSafeAreaPadding
                     sections={[{data}]}
                     ListItem={RadioListItem}
                     onSelectRow={({value}) => updateSettlementAccount(value ?? 0)}
diff --git a/src/pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage.tsx
index 52fa4c8890d03..a2a907f5e2fb1 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage.tsx
@@ -68,7 +68,7 @@ function WorkspaceSettlementFrequencyPage({route}: WorkspaceSettlementFrequencyP
         >
             <ScreenWrapper
                 testID={WorkspaceSettlementFrequencyPage.displayName}
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableMaxHeight
             >
                 <HeaderWithBackButton
@@ -82,6 +82,7 @@ function WorkspaceSettlementFrequencyPage({route}: WorkspaceSettlementFrequencyP
                     onSelectRow={({value}) => updateSettlementFrequency(value)}
                     shouldSingleExecuteRowSelect
                     initiallyFocusedOptionKey={selectedFrequency}
+                    addBottomSafeAreaPadding
                 />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/members/WorkspaceOwnerChangeErrorPage.tsx b/src/pages/workspace/members/WorkspaceOwnerChangeErrorPage.tsx
index 82ec34fd152f2..d3084c8b97e0d 100644
--- a/src/pages/workspace/members/WorkspaceOwnerChangeErrorPage.tsx
+++ b/src/pages/workspace/members/WorkspaceOwnerChangeErrorPage.tsx
@@ -39,7 +39,10 @@ function WorkspaceOwnerChangeErrorPage({route}: WorkspaceOwnerChangeSuccessPageP
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
             policyID={policyID}
         >
-            <ScreenWrapper testID={WorkspaceOwnerChangeErrorPage.displayName}>
+            <ScreenWrapper
+                testID={WorkspaceOwnerChangeErrorPage.displayName}
+                enableEdgeToEdgeBottomSafeAreaPadding
+            >
                 <HeaderWithBackButton
                     title={translate('workspace.changeOwner.changeOwnerPageTitle')}
                     onBackButtonPress={closePage}
@@ -59,7 +62,7 @@ function WorkspaceOwnerChangeErrorPage({route}: WorkspaceOwnerChangeSuccessPageP
                         {translate('workspace.changeOwner.errorDescriptionPartThree')}
                     </Text>
                 </View>
-                <FixedFooter>
+                <FixedFooter addBottomSafeAreaPadding>
                     <Button
                         success
                         large
diff --git a/src/pages/workspace/perDiem/EditPerDiemAmountPage.tsx b/src/pages/workspace/perDiem/EditPerDiemAmountPage.tsx
index 84667e2151ffa..ca7f9a6fe6d2c 100644
--- a/src/pages/workspace/perDiem/EditPerDiemAmountPage.tsx
+++ b/src/pages/workspace/perDiem/EditPerDiemAmountPage.tsx
@@ -77,7 +77,7 @@ function EditPerDiemAmountPage({route}: EditPerDiemAmountPageProps) {
             shouldBeBlocked={!policyID || !rateID || isEmptyObject(selectedRate) || isEmptyObject(selectedSubrate)}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={EditPerDiemAmountPage.displayName}
                 shouldEnableMaxHeight
@@ -93,6 +93,7 @@ function EditPerDiemAmountPage({route}: EditPerDiemAmountPageProps) {
                     submitButtonText={translate('common.save')}
                     style={[styles.mh5, styles.flex1]}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
                 >
                     <InputWrapper
                         ref={inputCallbackRef}
diff --git a/src/pages/workspace/perDiem/EditPerDiemCurrencyPage.tsx b/src/pages/workspace/perDiem/EditPerDiemCurrencyPage.tsx
index a12da5474f12f..c28289e404851 100644
--- a/src/pages/workspace/perDiem/EditPerDiemCurrencyPage.tsx
+++ b/src/pages/workspace/perDiem/EditPerDiemCurrencyPage.tsx
@@ -53,7 +53,7 @@ function EditPerDiemCurrencyPage({route}: EditPerDiemCurrencyPageProps) {
             shouldBeBlocked={!policyID || !rateID || isEmptyObject(selectedRate)}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 testID={EditPerDiemCurrencyPage.displayName}
             >
                 <HeaderWithBackButton
@@ -67,6 +67,7 @@ function EditPerDiemCurrencyPage({route}: EditPerDiemCurrencyPageProps) {
                     initiallySelectedCurrencyCode={selectedRate?.currency}
                     onSelect={editCurrency}
                     searchInputLabel={translate('common.search')}
+                    addBottomSafeAreaPadding
                 />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/perDiem/EditPerDiemDestinationPage.tsx b/src/pages/workspace/perDiem/EditPerDiemDestinationPage.tsx
index ccf8d635c1d42..d8b46997ffc04 100644
--- a/src/pages/workspace/perDiem/EditPerDiemDestinationPage.tsx
+++ b/src/pages/workspace/perDiem/EditPerDiemDestinationPage.tsx
@@ -72,7 +72,7 @@ function EditPerDiemDestinationPage({route}: EditPerDiemDestinationPageProps) {
             shouldBeBlocked={!policyID || !rateID || isEmptyObject(selectedRate)}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={EditPerDiemDestinationPage.displayName}
                 shouldEnableMaxHeight
@@ -88,6 +88,7 @@ function EditPerDiemDestinationPage({route}: EditPerDiemDestinationPageProps) {
                     submitButtonText={translate('common.save')}
                     style={[styles.mh5, styles.flex1]}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
                 >
                     <View style={styles.pb4}>
                         <Text style={[styles.sidebarLinkText, styles.optionAlternateText]}>
diff --git a/src/pages/workspace/perDiem/EditPerDiemSubratePage.tsx b/src/pages/workspace/perDiem/EditPerDiemSubratePage.tsx
index a1913159334b1..ec9a4c2bd0987 100644
--- a/src/pages/workspace/perDiem/EditPerDiemSubratePage.tsx
+++ b/src/pages/workspace/perDiem/EditPerDiemSubratePage.tsx
@@ -71,7 +71,7 @@ function EditPerDiemSubratePage({route}: EditPerDiemSubratePageProps) {
             shouldBeBlocked={!policyID || !rateID || isEmptyObject(selectedRate) || isEmptyObject(selectedSubrate)}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={EditPerDiemSubratePage.displayName}
                 shouldEnableMaxHeight
@@ -87,6 +87,7 @@ function EditPerDiemSubratePage({route}: EditPerDiemSubratePageProps) {
                     submitButtonText={translate('common.save')}
                     style={[styles.mh5, styles.flex1]}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
                 >
                     <InputWrapper
                         ref={inputCallbackRef}
diff --git a/src/pages/workspace/perDiem/WorkspacePerDiemDetailsPage.tsx b/src/pages/workspace/perDiem/WorkspacePerDiemDetailsPage.tsx
index be60e46c15649..8536c81ccc331 100644
--- a/src/pages/workspace/perDiem/WorkspacePerDiemDetailsPage.tsx
+++ b/src/pages/workspace/perDiem/WorkspacePerDiemDetailsPage.tsx
@@ -71,7 +71,7 @@ function WorkspacePerDiemDetailsPage({route}: WorkspacePerDiemDetailsPageProps)
             featureName={CONST.POLICY.MORE_FEATURES.ARE_PER_DIEM_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={WorkspacePerDiemDetailsPage.displayName}
             >
@@ -86,8 +86,12 @@ function WorkspacePerDiemDetailsPage({route}: WorkspacePerDiemDetailsPageProps)
                     cancelText={translate('common.cancel')}
                     danger
                 />
-                <FullPageBlockingView style={!isEmptyObject(selectedSubRate) ? styles.flexGrow1 : []}>
+                <FullPageBlockingView
+                    style={!isEmptyObject(selectedSubRate) ? styles.flexGrow1 : []}
+                    addBottomSafeAreaPadding
+                >
                     <ScrollView
+                        addBottomSafeAreaPadding
                         contentContainerStyle={styles.flexGrow1}
                         keyboardShouldPersistTaps="always"
                     >
diff --git a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
index 5b5bf3a19ea4e..b56e56c64f34b 100644
--- a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
+++ b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
@@ -364,7 +364,7 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_PER_DIEM_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={WorkspacePerDiemPage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
@@ -436,6 +436,7 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) {
                 )}
                 {hasVisibleSubRates && !isLoading && (
                     <SelectionListWithModal
+                        addBottomSafeAreaPadding
                         canSelectMultiple={canSelectMultiple}
                         turnOnSelectionModeOnLongPress
                         onTurnOnSelectionMode={(item) => item && toggleSubRate(item)}
diff --git a/src/pages/workspace/perDiem/WorkspacePerDiemSettingsPage.tsx b/src/pages/workspace/perDiem/WorkspacePerDiemSettingsPage.tsx
index aa016ccc23843..b23555d7cab27 100644
--- a/src/pages/workspace/perDiem/WorkspacePerDiemSettingsPage.tsx
+++ b/src/pages/workspace/perDiem/WorkspacePerDiemSettingsPage.tsx
@@ -60,13 +60,17 @@ function WorkspacePerDiemSettingsPage({route}: WorkspacePerDiemSettingsPageProps
             featureName={CONST.POLICY.MORE_FEATURES.ARE_PER_DIEM_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={WorkspacePerDiemSettingsPage.displayName}
             >
                 <HeaderWithBackButton title={translate('workspace.common.settings')} />
-                <FullPageBlockingView style={customUnit ? styles.flexGrow1 : []}>
+                <FullPageBlockingView
+                    style={customUnit ? styles.flexGrow1 : []}
+                    addBottomSafeAreaPadding
+                >
                     <ScrollView
+                        addBottomSafeAreaPadding
                         contentContainerStyle={styles.flexGrow1}
                         keyboardShouldPersistTaps="always"
                     >
diff --git a/src/pages/workspace/reportFields/InitialListValueSelector/InitialListValueSelectorModal.tsx b/src/pages/workspace/reportFields/InitialListValueSelector/InitialListValueSelectorModal.tsx
index fa6c5dc76bdbf..9f68b97ddcdd7 100644
--- a/src/pages/workspace/reportFields/InitialListValueSelector/InitialListValueSelectorModal.tsx
+++ b/src/pages/workspace/reportFields/InitialListValueSelector/InitialListValueSelectorModal.tsx
@@ -47,7 +47,7 @@ function InitialListValueSelectorModal({isVisible, currentValue, label, subtitle
             <ScreenWrapper
                 style={styles.pb0}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 testID={InitialListValueSelectorModal.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/workspace/reportFields/InitialListValueSelector/ReportFieldsInitialListValuePicker.tsx b/src/pages/workspace/reportFields/InitialListValueSelector/ReportFieldsInitialListValuePicker.tsx
index fcade7f74b8b7..8aebbc9a6cdf1 100644
--- a/src/pages/workspace/reportFields/InitialListValueSelector/ReportFieldsInitialListValuePicker.tsx
+++ b/src/pages/workspace/reportFields/InitialListValueSelector/ReportFieldsInitialListValuePicker.tsx
@@ -41,6 +41,7 @@ function ReportFieldsInitialListValuePicker({listValues, disabledOptions, value,
             ListItem={RadioListItem}
             onSelectRow={(item) => onValueChange(item.value)}
             initiallyFocusedOptionKey={listValueSections.at(0)?.data?.find((listValue) => listValue.isSelected)?.keyForList}
+            addBottomSafeAreaPadding
         />
     );
 }
diff --git a/src/pages/workspace/reportFields/ReportFieldsAddListValuePage.tsx b/src/pages/workspace/reportFields/ReportFieldsAddListValuePage.tsx
index ed2f834b6a19c..7bc332a27c286 100644
--- a/src/pages/workspace/reportFields/ReportFieldsAddListValuePage.tsx
+++ b/src/pages/workspace/reportFields/ReportFieldsAddListValuePage.tsx
@@ -76,7 +76,7 @@ function ReportFieldsAddListValuePage({
             shouldBeBlocked={PolicyUtils.hasAccountingConnections(policy)}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={styles.defaultModalContainer}
                 testID={ReportFieldsAddListValuePage.displayName}
                 shouldEnableMaxHeight
@@ -92,6 +92,7 @@ function ReportFieldsAddListValuePage({
                     validate={validate}
                     style={[styles.mh5, styles.flex1]}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
                 >
                     <InputWrapper
                         InputComponent={TextInput}
diff --git a/src/pages/workspace/reportFields/ReportFieldsEditValuePage.tsx b/src/pages/workspace/reportFields/ReportFieldsEditValuePage.tsx
index 214ac043622bb..873ea4d55b244 100644
--- a/src/pages/workspace/reportFields/ReportFieldsEditValuePage.tsx
+++ b/src/pages/workspace/reportFields/ReportFieldsEditValuePage.tsx
@@ -70,7 +70,7 @@ function ReportFieldsEditValuePage({
             shouldBeBlocked={PolicyUtils.hasAccountingConnections(policy)}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={styles.defaultModalContainer}
                 testID={ReportFieldsEditValuePage.displayName}
                 shouldEnableMaxHeight
@@ -86,6 +86,7 @@ function ReportFieldsEditValuePage({
                     validate={validate}
                     style={[styles.mh5, styles.flex1]}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
                 >
                     <InputWrapper
                         InputComponent={TextInput}
diff --git a/src/pages/workspace/reportFields/ReportFieldsInitialValuePage.tsx b/src/pages/workspace/reportFields/ReportFieldsInitialValuePage.tsx
index 14638116cb49e..4f86272f75ba4 100644
--- a/src/pages/workspace/reportFields/ReportFieldsInitialValuePage.tsx
+++ b/src/pages/workspace/reportFields/ReportFieldsInitialValuePage.tsx
@@ -103,7 +103,7 @@ function ReportFieldsInitialValuePage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={styles.defaultModalContainer}
                 testID={ReportFieldsInitialValuePage.displayName}
                 shouldEnableMaxHeight
@@ -120,6 +120,7 @@ function ReportFieldsInitialValuePage({
 
                 {isTextFieldType && (
                     <FormProvider
+                        addBottomSafeAreaPadding
                         formID={ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM}
                         onSubmit={submitForm}
                         submitButtonText={translate('common.save')}
diff --git a/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx b/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
index 0fe590974a6fd..ef7b1bd62835b 100644
--- a/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
+++ b/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
@@ -304,7 +304,7 @@ function ReportFieldsListValuesPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={styles.defaultModalContainer}
                 testID={ReportFieldsListValuesPage.displayName}
                 shouldEnableMaxHeight
@@ -339,6 +339,7 @@ function ReportFieldsListValuesPage({
                 )}
                 {!shouldShowEmptyState && (
                     <SelectionListWithModal
+                        addBottomSafeAreaPadding
                         canSelectMultiple={canSelectMultiple}
                         turnOnSelectionModeOnLongPress={!hasAccountingConnections}
                         onTurnOnSelectionMode={(item) => item && toggleValue(item)}
diff --git a/src/pages/workspace/reportFields/ReportFieldsSettingsPage.tsx b/src/pages/workspace/reportFields/ReportFieldsSettingsPage.tsx
index 401ca93fa9f93..308a8fe857d51 100644
--- a/src/pages/workspace/reportFields/ReportFieldsSettingsPage.tsx
+++ b/src/pages/workspace/reportFields/ReportFieldsSettingsPage.tsx
@@ -63,7 +63,7 @@ function ReportFieldsSettingsPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={ReportFieldsSettingsPage.displayName}
             >
diff --git a/src/pages/workspace/reportFields/ReportFieldsValueSettingsPage.tsx b/src/pages/workspace/reportFields/ReportFieldsValueSettingsPage.tsx
index 08b94fcc4aee8..df821e26ed234 100644
--- a/src/pages/workspace/reportFields/ReportFieldsValueSettingsPage.tsx
+++ b/src/pages/workspace/reportFields/ReportFieldsValueSettingsPage.tsx
@@ -94,7 +94,7 @@ function ReportFieldsValueSettingsPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 style={styles.defaultModalContainer}
                 testID={ReportFieldsValueSettingsPage.displayName}
             >
diff --git a/src/pages/workspace/rules/RulesAutoApproveReportsUnderPage.tsx b/src/pages/workspace/rules/RulesAutoApproveReportsUnderPage.tsx
index b256cf92c1d48..9030ac13643a9 100644
--- a/src/pages/workspace/rules/RulesAutoApproveReportsUnderPage.tsx
+++ b/src/pages/workspace/rules/RulesAutoApproveReportsUnderPage.tsx
@@ -43,7 +43,7 @@ function RulesAutoApproveReportsUnderPage({route}: RulesAutoApproveReportsUnderP
             shouldBeBlocked={!policy?.shouldShowAutoApprovalOptions || workflowApprovalsUnavailable}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={RulesAutoApproveReportsUnderPage.displayName}
             >
@@ -60,6 +60,7 @@ function RulesAutoApproveReportsUnderPage({route}: RulesAutoApproveReportsUnderP
                     }}
                     submitButtonText={translate('common.save')}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/rules/RulesAutoPayReportsUnderPage.tsx b/src/pages/workspace/rules/RulesAutoPayReportsUnderPage.tsx
index 053cf296b7d5e..108be833d4b6a 100644
--- a/src/pages/workspace/rules/RulesAutoPayReportsUnderPage.tsx
+++ b/src/pages/workspace/rules/RulesAutoPayReportsUnderPage.tsx
@@ -52,7 +52,7 @@ function RulesAutoPayReportsUnderPage({route}: RulesAutoPayReportsUnderPageProps
             shouldBeBlocked={!policy?.shouldShowAutoReimbursementLimitOption || autoPayApprovedReportsUnavailable}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={RulesAutoPayReportsUnderPage.displayName}
             >
@@ -70,6 +70,7 @@ function RulesAutoPayReportsUnderPage({route}: RulesAutoPayReportsUnderPageProps
                     }}
                     submitButtonText={translate('common.save')}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/rules/RulesCustomNamePage.tsx b/src/pages/workspace/rules/RulesCustomNamePage.tsx
index c58b1ea2e96c1..f09b03183e98f 100644
--- a/src/pages/workspace/rules/RulesCustomNamePage.tsx
+++ b/src/pages/workspace/rules/RulesCustomNamePage.tsx
@@ -58,7 +58,7 @@ function RulesCustomNamePage({route}: RulesCustomNamePageProps) {
             shouldBeBlocked={!policy?.shouldShowCustomReportTitleOption}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={RulesCustomNamePage.displayName}
             >
@@ -88,6 +88,7 @@ function RulesCustomNamePage({route}: RulesCustomNamePageProps) {
                     }}
                     submitButtonText={translate('common.save')}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
                 >
                     <InputWrapper
                         InputComponent={TextInput}
diff --git a/src/pages/workspace/rules/RulesCustomPage.tsx b/src/pages/workspace/rules/RulesCustomPage.tsx
index 20b3edc8b6f17..2528f8caa0ca2 100644
--- a/src/pages/workspace/rules/RulesCustomPage.tsx
+++ b/src/pages/workspace/rules/RulesCustomPage.tsx
@@ -47,7 +47,7 @@ function RulesCustomPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={RulesCustomPage.displayName}
             >
@@ -64,6 +64,7 @@ function RulesCustomPage({
                     }}
                     submitButtonText={translate('workspace.editor.save')}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/rules/RulesRandomReportAuditPage.tsx b/src/pages/workspace/rules/RulesRandomReportAuditPage.tsx
index 409b07c8582af..2f47c77ef97a5 100644
--- a/src/pages/workspace/rules/RulesRandomReportAuditPage.tsx
+++ b/src/pages/workspace/rules/RulesRandomReportAuditPage.tsx
@@ -41,7 +41,7 @@ function RulesRandomReportAuditPage({route}: RulesRandomReportAuditPageProps) {
             shouldBeBlocked={!policy?.shouldShowAutoApprovalOptions || workflowApprovalsUnavailable}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom
+                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={RulesRandomReportAuditPage.displayName}
             >
@@ -58,6 +58,7 @@ function RulesRandomReportAuditPage({route}: RulesRandomReportAuditPageProps) {
                     }}
                     submitButtonText={translate('common.save')}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
index ad94a06c84d28..738c3e8119870 100644
--- a/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
@@ -134,7 +134,7 @@ function WorkspaceTagsSettingsPage({route}: WorkspaceTagsSettingsPageProps) {
                         title={translate('common.settings')}
                         onBackButtonPress={() => Navigation.goBack(isQuickSettingsFlow ? ROUTES.SETTINGS_TAGS_ROOT.getRoute(policyID, backTo) : undefined)}
                     />
-                    {isOffline && isLoading ? <FullPageOfflineBlockingView>{getTagsSettings(policy)}</FullPageOfflineBlockingView> : getTagsSettings(policy)}
+                    {isOffline && isLoading ? <FullPageOfflineBlockingView addBottomSafeAreaPadding>{getTagsSettings(policy)}</FullPageOfflineBlockingView> : getTagsSettings(policy)}
                 </ScreenWrapper>
             )}
         </AccessOrNotFoundWrapper>

From 785b278223dccfc2ade615c70001fb764df489a7 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Wed, 26 Feb 2025 16:28:10 +0100
Subject: [PATCH 26/51] Update WorkspaceInitialPage.tsx

---
 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 74c52a6db8360..10e63f585cec2 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -437,7 +437,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
             <FullPageNotFoundView
                 onBackButtonPress={Navigation.dismissModal}
                 onLinkPress={Navigation.goBackToHome}
-                shouldShow
+                shouldShow={shouldShowNotFoundPage}
                 subtitleKey={shouldShowPolicy ? 'workspace.common.notAuthorized' : undefined}
                 addBottomSafeAreaPadding
             >

From 688b6fe7fee57b946261e4dbef9a8ec042c30cf9 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Wed, 26 Feb 2025 16:53:11 +0100
Subject: [PATCH 27/51] fix: minor issues

---
 src/components/FormAlertWithSubmitButton.tsx                | 6 +++++-
 src/pages/workspace/WorkspaceNamePage.tsx                   | 1 +
 .../workspace/companyCards/assignCard/AssigneeStep.tsx      | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/FormAlertWithSubmitButton.tsx b/src/components/FormAlertWithSubmitButton.tsx
index 3eb0b0abd508f..0c2d28e70c99d 100644
--- a/src/components/FormAlertWithSubmitButton.tsx
+++ b/src/components/FormAlertWithSubmitButton.tsx
@@ -68,6 +68,9 @@ type FormAlertWithSubmitButtonProps = {
      * This is needed for buttons that allow content to display under them.
      */
     shouldBlendOpacity?: boolean;
+
+    /** Whether to add a bottom padding to the button */
+    addButtonBottomPadding?: boolean;
 };
 
 function FormAlertWithSubmitButton({
@@ -90,9 +93,10 @@ function FormAlertWithSubmitButton({
     errorMessageStyle,
     enterKeyEventListenerPriority = 0,
     shouldBlendOpacity = false,
+    addButtonBottomPadding = true,
 }: FormAlertWithSubmitButtonProps) {
     const styles = useThemeStyles();
-    const style = [!footerContent ? {} : styles.mb3, buttonStyles];
+    const style = [footerContent && addButtonBottomPadding ? styles.mb3 : {}, buttonStyles];
 
     // Disable pressOnEnter for Android Native to avoid issues with the Samsung keyboard,
     // where pressing Enter saves the form instead of adding a new line in multiline input.
diff --git a/src/pages/workspace/WorkspaceNamePage.tsx b/src/pages/workspace/WorkspaceNamePage.tsx
index 8b4b70270eca5..cd2df9a914564 100644
--- a/src/pages/workspace/WorkspaceNamePage.tsx
+++ b/src/pages/workspace/WorkspaceNamePage.tsx
@@ -79,6 +79,7 @@ function WorkspaceNamePage({policy}: Props) {
                     validate={validate}
                     onSubmit={submit}
                     enabledWhenOffline
+                    addBottomSafeAreaPadding
                 >
                     <View style={styles.mb4}>
                         <InputWrapper
diff --git a/src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx b/src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx
index e2eb9f3bcbc8c..4e9dc2403c350 100644
--- a/src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx
@@ -196,9 +196,9 @@ function AssigneeStep({policy, feed}: AssigneeStepProps) {
                         buttonText={translate(isEditing ? 'common.confirm' : 'common.next')}
                         onSubmit={submit}
                         isAlertVisible={shouldShowError}
-                        containerStyles={[styles.ph5, !shouldShowError && styles.mt5]}
+                        containerStyles={[!shouldShowError && styles.mt5]}
+                        addButtonBottomPadding={false}
                         message={translate('common.error.pleaseSelectOne')}
-                        buttonStyles={styles.mb5}
                     />
                 }
             />

From c0bf666f62ac4bdea7a5c6a97261f95dcc06c981 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Wed, 26 Feb 2025 17:31:57 +0100
Subject: [PATCH 28/51] fix: remaining workspace issues

---
 .../netsuite/import/NetSuiteImportCustomFieldPage.tsx           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldPage.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldPage.tsx
index fa979cd7454c1..845c4f08f14c5 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldPage.tsx
@@ -118,7 +118,7 @@ function NetSuiteImportCustomFieldPage({
             contentContainerStyle={[styles.flex1]}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
-            shouldIncludeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT.getRoute(policyID))}
         >
             {data.length === 0 ? listEmptyComponent : listHeaderComponent}

From 68ffb79bbc5a8a895ff51998d07e2ead2acea158 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Wed, 26 Feb 2025 17:35:18 +0100
Subject: [PATCH 29/51] fix: use `useBottomSafeAreaPaddingStyle` hook in
 `CardSelectionStep`

---
 .../workspace/companyCards/assignCard/CardSelectionStep.tsx   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx b/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
index 1c1053c85a809..ea52a1f2de8f5 100644
--- a/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx
@@ -10,9 +10,9 @@ import SelectionList from '@components/SelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
+import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddingStyle';
 import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
-import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {setAssignCardStepAndData} from '@libs/actions/CompanyCards';
 import {getBankName, getCardFeedIcon, getFilteredCardList, maskCardNumber} from '@libs/CardUtils';
@@ -103,7 +103,7 @@ function CardSelectionStep({feed, policyID}: CardSelectionStepProps) {
         return cardListOptions.filter((option) => option.text.toLowerCase().includes(searchText));
     }, [searchText, cardListOptions]);
 
-    const {safeAreaPaddingBottomStyle} = useStyledSafeAreaInsets();
+    const safeAreaPaddingBottomStyle = useBottomSafeSafeAreaPaddingStyle();
 
     return (
         <InteractiveStepWrapper

From 7543e5421d5d48000f2a3d7c005b1194d2ef8b6d Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Wed, 26 Feb 2025 17:41:27 +0100
Subject: [PATCH 30/51] fix: more fixes

---
 .../accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx       | 1 -
 .../accounting/netsuite/advanced/NetSuiteCustomFormIDPage.tsx   | 2 +-
 src/pages/workspace/accounting/nsqs/export/NSQSExportPage.tsx   | 1 +
 src/pages/workspace/accounting/nsqs/import/NSQSProjectsPage.tsx | 1 +
 .../accounting/qbd/export/QuickbooksDesktopExportPage.tsx       | 1 +
 .../accounting/qbd/import/QuickbooksDesktopCustomersPage.tsx    | 1 +
 .../export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx    | 1 +
 .../accounting/qbo/import/QuickbooksChartOfAccountsPage.tsx     | 1 +
 8 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
index 3532ba6570d3e..1c6527177d544 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
@@ -264,7 +264,6 @@ function NetSuiteAdvancedPage({policy}: WithPolicyConnectionsProps) {
 
     return (
         <ConnectionLayout
-            shouldIncludeSafeAreaPaddingBottom
             displayName={NetSuiteAdvancedPage.displayName}
             headerTitle="workspace.accounting.advanced"
             headerSubtitle={config?.subsidiary ?? ''}
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage.tsx
index 71e1be953aceb..f56a8399e13f6 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage.tsx
@@ -73,7 +73,7 @@ function NetSuiteCustomFormIDPage({policy}: WithPolicyConnectionsProps) {
             contentContainerStyle={[styles.flex1]}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
-            shouldIncludeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
             shouldBeBlocked={!config?.customFormIDOptions?.enabled}
             shouldUseScrollView={false}
         >
diff --git a/src/pages/workspace/accounting/nsqs/export/NSQSExportPage.tsx b/src/pages/workspace/accounting/nsqs/export/NSQSExportPage.tsx
index 3eb1ea5a0f94f..a477cd9c45aff 100644
--- a/src/pages/workspace/accounting/nsqs/export/NSQSExportPage.tsx
+++ b/src/pages/workspace/accounting/nsqs/export/NSQSExportPage.tsx
@@ -48,6 +48,7 @@ function NSQSExportPage({policy}: WithPolicyProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NSQS}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <OfflineWithFeedback pendingAction={settingsPendingAction([CONST.NSQS_CONFIG.EXPORTER], nsqsConfig?.pendingFields)}>
                 <MenuItemWithTopDescription
diff --git a/src/pages/workspace/accounting/nsqs/import/NSQSProjectsPage.tsx b/src/pages/workspace/accounting/nsqs/import/NSQSProjectsPage.tsx
index bda13fa3a0082..acde989d6c817 100644
--- a/src/pages/workspace/accounting/nsqs/import/NSQSProjectsPage.tsx
+++ b/src/pages/workspace/accounting/nsqs/import/NSQSProjectsPage.tsx
@@ -45,6 +45,7 @@ function NSQSProjectsPage({policy}: WithPolicyProps) {
             contentContainerStyle={[styles.pb2, styles.ph5, styles.gap6]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NSQS}
             onBackButtonPress={policyID ? () => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NSQS_IMPORT.getRoute(policyID)) : undefined}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <RenderHTML html={`<comment>${Parser.replace(translate(`workspace.nsqs.import.importFields.projects.subtitle`))}</comment>`} />
             <View>
diff --git a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx
index ff85479521557..5e2a32642a3f0 100644
--- a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx
+++ b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx
@@ -84,6 +84,7 @@ function QuickbooksDesktopExportPage({policy}: WithPolicyConnectionsProps) {
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack()}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {menuItems.map((menuItem) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopCustomersPage.tsx b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopCustomersPage.tsx
index 3f7a9f1606c46..259b579c87e61 100644
--- a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopCustomersPage.tsx
+++ b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopCustomersPage.tsx
@@ -38,6 +38,7 @@ function QuickbooksDesktopCustomersPage({policy}: WithPolicyProps) {
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_IMPORT.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx
index 772b33bb88729..78e2a206db039 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx
@@ -88,6 +88,7 @@ function QuickbooksOutOfPocketExpenseConfigurationPage({policy}: WithPolicyConne
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {sections.map((section, index) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksChartOfAccountsPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksChartOfAccountsPage.tsx
index 73907cb166695..2840767f240c3 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksChartOfAccountsPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksChartOfAccountsPage.tsx
@@ -32,6 +32,7 @@ function QuickbooksChartOfAccountsPage({policy}: WithPolicyProps) {
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID))}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}

From f785d2d6560c713e390b3c17cd0379cab1be42a6 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Wed, 26 Feb 2025 17:56:24 +0100
Subject: [PATCH 31/51] fix: eslint errors

---
 .../settings/Wallet/ReportCardLostPage.tsx    | 18 ++--
 .../settings/Wallet/TransferBalancePage.tsx   | 86 +++++++------------
 src/pages/tasks/NewTaskPage.tsx               | 27 +++---
 3 files changed, 54 insertions(+), 77 deletions(-)

diff --git a/src/pages/settings/Wallet/ReportCardLostPage.tsx b/src/pages/settings/Wallet/ReportCardLostPage.tsx
index 34e6cd3732c98..64cb1c0422a80 100644
--- a/src/pages/settings/Wallet/ReportCardLostPage.tsx
+++ b/src/pages/settings/Wallet/ReportCardLostPage.tsx
@@ -13,16 +13,16 @@ import useLocalize from '@hooks/useLocalize';
 import usePrevious from '@hooks/usePrevious';
 import useSafeAreaPaddings from '@hooks/useSafeAreaPaddings';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {setErrors} from '@libs/actions/FormActions';
 import {requestValidateCodeAction} from '@libs/actions/User';
-import * as ErrorUtils from '@libs/ErrorUtils';
+import {getLatestErrorMessageField} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+import {getFormattedAddress} from '@libs/PersonalDetailsUtils';
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
+import {clearCardListErrors, requestReplacementExpensifyCard} from '@userActions/Card';
 import type {ReplacementReason} from '@userActions/Card';
-import * as CardActions from '@userActions/Card';
-import * as FormActions from '@userActions/FormActions';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -74,14 +74,14 @@ function ReportCardLostPage({
     const [shouldShowReasonError, setShouldShowReasonError] = useState(false);
 
     const physicalCard = cardList?.[cardID];
-    const validateError = ErrorUtils.getLatestErrorMessageField(physicalCard);
+    const validateError = getLatestErrorMessageField(physicalCard);
     const [isValidateCodeActionModalVisible, setIsValidateCodeActionModalVisible] = useState(false);
 
     const prevIsLoading = usePrevious(formData?.isLoading);
 
     const {paddingBottom} = useSafeAreaPaddings();
 
-    const formattedAddress = PersonalDetailsUtils.getFormattedAddress(privatePersonalDetails ?? {});
+    const formattedAddress = getFormattedAddress(privatePersonalDetails ?? {});
     const primaryLogin = account?.primaryLogin ?? '';
 
     useBeforeRemove(() => setIsValidateCodeActionModalVisible(false));
@@ -99,7 +99,7 @@ function ReportCardLostPage({
             return;
         }
 
-        FormActions.setErrors(ONYXKEYS.FORMS.REPORT_PHYSICAL_CARD_FORM, physicalCard?.errors ?? {});
+        setErrors(ONYXKEYS.FORMS.REPORT_PHYSICAL_CARD_FORM, physicalCard?.errors ?? {});
     }, [formData?.isLoading, physicalCard?.errors]);
 
     const handleValidateCodeEntered = useCallback(
@@ -107,7 +107,7 @@ function ReportCardLostPage({
             if (!physicalCard) {
                 return;
             }
-            CardActions.requestReplacementExpensifyCard(physicalCard.cardID, reason?.key as ReplacementReason, validateCode);
+            requestReplacementExpensifyCard(physicalCard.cardID, reason?.key as ReplacementReason, validateCode);
         },
         [physicalCard, reason?.key],
     );
@@ -198,7 +198,7 @@ function ReportCardLostPage({
                             sendValidateCode={sendValidateCode}
                             validateError={validateError}
                             clearError={() => {
-                                CardActions.clearCardListErrors(physicalCard.cardID);
+                                clearCardListErrors(physicalCard.cardID);
                             }}
                             onClose={() => setIsValidateCodeActionModalVisible(false)}
                             isVisible={isValidateCodeActionModalVisible}
diff --git a/src/pages/settings/Wallet/TransferBalancePage.tsx b/src/pages/settings/Wallet/TransferBalancePage.tsx
index 8c830964289a9..a3ef2f311a1ea 100644
--- a/src/pages/settings/Wallet/TransferBalancePage.tsx
+++ b/src/pages/settings/Wallet/TransferBalancePage.tsx
@@ -1,7 +1,6 @@
 import React, {useEffect} from 'react';
 import {View} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import ConfirmationPage from '@components/ConfirmationPage';
 import CurrentWalletBalance from '@components/CurrentWalletBalance';
@@ -16,43 +15,37 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useSafeAreaPaddings from '@hooks/useSafeAreaPaddings';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as CurrencyUtils from '@libs/CurrencyUtils';
-import * as ErrorUtils from '@libs/ErrorUtils';
+import {
+    dismissSuccessfulTransferBalancePage,
+    resetWalletTransferData,
+    saveWalletTransferAccountTypeAndID,
+    saveWalletTransferMethodType,
+    transferWalletBalance,
+} from '@libs/actions/PaymentMethods';
+import {convertToDisplayString} from '@libs/CurrencyUtils';
+import {getLatestErrorMessage} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import * as PaymentUtils from '@libs/PaymentUtils';
+import {calculateWalletTransferBalanceFee, formatPaymentMethods, hasExpensifyPaymentMethod} from '@libs/PaymentUtils';
 import variables from '@styles/variables';
-import * as PaymentMethods from '@userActions/PaymentMethods';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {BankAccountList, FundList, UserWallet, WalletTransfer} from '@src/types/onyx';
 import type PaymentMethod from '@src/types/onyx/PaymentMethod';
 import type {FilterMethodPaymentType} from '@src/types/onyx/WalletTransfer';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
-type TransferBalancePageOnyxProps = {
-    /** User's wallet information */
-    userWallet: OnyxEntry<UserWallet>;
-
-    /** List of bank accounts */
-    bankAccountList: OnyxEntry<BankAccountList>;
-
-    /** List of user's card objects */
-    fundList: OnyxEntry<FundList>;
-
-    /** Wallet balance transfer props */
-    walletTransfer: OnyxEntry<WalletTransfer>;
-};
-
-type TransferBalancePageProps = TransferBalancePageOnyxProps;
-
 const TRANSFER_TIER_NAMES: string[] = [CONST.WALLET.TIER_NAME.GOLD, CONST.WALLET.TIER_NAME.PLATINUM];
 
-function TransferBalancePage({bankAccountList, fundList, userWallet, walletTransfer}: TransferBalancePageProps) {
+function TransferBalancePage() {
     const styles = useThemeStyles();
     const {numberFormat, translate} = useLocalize();
     const {isOffline} = useNetwork();
     const {paddingBottom} = useSafeAreaPaddings();
+
+    const [userWallet] = useOnyx(ONYXKEYS.USER_WALLET);
+    const [walletTransfer] = useOnyx(ONYXKEYS.WALLET_TRANSFER);
+    const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
+    const [fundList] = useOnyx(ONYXKEYS.FUND_LIST);
     const paymentCardList = fundList ?? {};
 
     const paymentTypes = [
@@ -61,7 +54,7 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
             title: translate('transferAmountPage.instant'),
             description: translate('transferAmountPage.instantSummary', {
                 rate: numberFormat(CONST.WALLET.TRANSFER_METHOD_TYPE_FEE.INSTANT.RATE),
-                minAmount: CurrencyUtils.convertToDisplayString(CONST.WALLET.TRANSFER_METHOD_TYPE_FEE.INSTANT.MINIMUM_FEE),
+                minAmount: convertToDisplayString(CONST.WALLET.TRANSFER_METHOD_TYPE_FEE.INSTANT.MINIMUM_FEE),
             }),
             icon: Expensicons.Bolt,
             type: CONST.PAYMENT_METHODS.DEBIT_CARD,
@@ -79,7 +72,7 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
      * Get the selected/default payment method account for wallet transfer
      */
     function getSelectedPaymentMethodAccount(): PaymentMethod | undefined {
-        const paymentMethods = PaymentUtils.formatPaymentMethods(bankAccountList ?? {}, paymentCardList, styles);
+        const paymentMethods = formatPaymentMethods(bankAccountList ?? {}, paymentCardList, styles);
 
         const defaultAccount = paymentMethods.find((method) => method.isDefault);
         const selectedAccount = paymentMethods.find(
@@ -89,15 +82,15 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
     }
 
     function navigateToChooseTransferAccount(filterPaymentMethodType: FilterMethodPaymentType) {
-        PaymentMethods.saveWalletTransferMethodType(filterPaymentMethodType);
+        saveWalletTransferMethodType(filterPaymentMethodType);
 
         // If we only have a single option for the given paymentMethodType do not force the user to make a selection
-        const combinedPaymentMethods = PaymentUtils.formatPaymentMethods(bankAccountList ?? {}, paymentCardList, styles);
+        const combinedPaymentMethods = formatPaymentMethods(bankAccountList ?? {}, paymentCardList, styles);
 
         const filteredMethods = combinedPaymentMethods.filter((paymentMethod) => paymentMethod.accountType === filterPaymentMethodType);
         if (filteredMethods.length === 1) {
             const account = filteredMethods.at(0);
-            PaymentMethods.saveWalletTransferAccountTypeAndID(filterPaymentMethodType ?? '', account?.methodID?.toString() ?? '-1');
+            saveWalletTransferAccountTypeAndID(filterPaymentMethodType ?? '', account?.methodID?.toString() ?? '-1');
             return;
         }
 
@@ -106,14 +99,14 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
 
     useEffect(() => {
         // Reset to the default account when the page is opened
-        PaymentMethods.resetWalletTransferData();
+        resetWalletTransferData();
 
         const selectedAccount = getSelectedPaymentMethodAccount();
         if (!selectedAccount) {
             return;
         }
 
-        PaymentMethods.saveWalletTransferAccountTypeAndID(selectedAccount?.accountType ?? '', selectedAccount?.methodID?.toString() ?? '-1');
+        saveWalletTransferAccountTypeAndID(selectedAccount?.accountType ?? '', selectedAccount?.methodID?.toString() ?? '-1');
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we only want this effect to run on initial render
     }, []);
 
@@ -122,7 +115,7 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
             <ScreenWrapper testID={TransferBalancePage.displayName}>
                 <HeaderWithBackButton
                     title={translate('common.transferBalance')}
-                    onBackButtonPress={PaymentMethods.dismissSuccessfulTransferBalancePage}
+                    onBackButtonPress={dismissSuccessfulTransferBalancePage}
                 />
                 <ConfirmationPage
                     heading={translate('transferAmountPage.transferSuccess')}
@@ -133,7 +126,7 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
                     }
                     shouldShowButton
                     buttonText={translate('common.done')}
-                    onButtonPress={PaymentMethods.dismissSuccessfulTransferBalancePage}
+                    onButtonPress={dismissSuccessfulTransferBalancePage}
                 />
             </ScreenWrapper>
         );
@@ -143,13 +136,13 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
     const selectedPaymentType =
         selectedAccount && selectedAccount.accountType === CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT ? CONST.WALLET.TRANSFER_METHOD_TYPE.ACH : CONST.WALLET.TRANSFER_METHOD_TYPE.INSTANT;
 
-    const calculatedFee = PaymentUtils.calculateWalletTransferBalanceFee(userWallet?.currentBalance ?? 0, selectedPaymentType);
+    const calculatedFee = calculateWalletTransferBalanceFee(userWallet?.currentBalance ?? 0, selectedPaymentType);
     const transferAmount = userWallet?.currentBalance ?? 0 - calculatedFee;
     const isTransferable = transferAmount > 0;
     const isButtonDisabled = !isTransferable || !selectedAccount;
-    const errorMessage = ErrorUtils.getLatestErrorMessage(walletTransfer);
+    const errorMessage = getLatestErrorMessage(walletTransfer);
 
-    const shouldShowTransferView = PaymentUtils.hasExpensifyPaymentMethod(paymentCardList, bankAccountList ?? {}) && TRANSFER_TIER_NAMES.includes(userWallet?.tierName ?? '');
+    const shouldShowTransferView = hasExpensifyPaymentMethod(paymentCardList, bankAccountList ?? {}) && TRANSFER_TIER_NAMES.includes(userWallet?.tierName ?? '');
 
     return (
         <ScreenWrapper testID={TransferBalancePage.displayName}>
@@ -206,16 +199,16 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
                     )}
                     <View style={styles.ph5}>
                         <Text style={[styles.mt5, styles.mb3, styles.textLabelSupporting, styles.justifyContentStart]}>{translate('transferAmountPage.fee')}</Text>
-                        <Text style={[styles.justifyContentStart]}>{CurrencyUtils.convertToDisplayString(calculatedFee)}</Text>
+                        <Text style={[styles.justifyContentStart]}>{convertToDisplayString(calculatedFee)}</Text>
                     </View>
                 </ScrollView>
                 <View>
                     <FormAlertWithSubmitButton
                         buttonText={translate('transferAmountPage.transfer', {
-                            amount: isTransferable ? CurrencyUtils.convertToDisplayString(transferAmount) : '',
+                            amount: isTransferable ? convertToDisplayString(transferAmount) : '',
                         })}
                         isLoading={walletTransfer?.loading}
-                        onSubmit={() => selectedAccount && PaymentMethods.transferWalletBalance(selectedAccount)}
+                        onSubmit={() => selectedAccount && transferWalletBalance(selectedAccount)}
                         isDisabled={isButtonDisabled || isOffline}
                         message={errorMessage}
                         isAlertVisible={!isEmptyObject(errorMessage)}
@@ -229,17 +222,4 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
 
 TransferBalancePage.displayName = 'TransferBalancePage';
 
-export default withOnyx<TransferBalancePageProps, TransferBalancePageOnyxProps>({
-    userWallet: {
-        key: ONYXKEYS.USER_WALLET,
-    },
-    walletTransfer: {
-        key: ONYXKEYS.WALLET_TRANSFER,
-    },
-    bankAccountList: {
-        key: ONYXKEYS.BANK_ACCOUNT_LIST,
-    },
-    fundList: {
-        key: ONYXKEYS.FUND_LIST,
-    },
-})(TransferBalancePage);
+export default TransferBalancePage;
diff --git a/src/pages/tasks/NewTaskPage.tsx b/src/pages/tasks/NewTaskPage.tsx
index 70660698082c3..2eca52dcee764 100644
--- a/src/pages/tasks/NewTaskPage.tsx
+++ b/src/pages/tasks/NewTaskPage.tsx
@@ -14,14 +14,14 @@ import useLocalize from '@hooks/useLocalize';
 import useSafeAreaPaddings from '@hooks/useSafeAreaPaddings';
 import useThemeStyles from '@hooks/useThemeStyles';
 import blurActiveElement from '@libs/Accessibility/blurActiveElement';
-import * as LocalePhoneNumber from '@libs/LocalePhoneNumber';
+import {createTaskAndNavigate, dismissModalAndClearOutTaskInfo, getAssignee, getShareDestination, setShareDestinationValue} from '@libs/actions/Task';
+import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {NewTaskNavigatorParamList} from '@libs/Navigation/types';
-import * as OptionsListUtils from '@libs/OptionsListUtils';
-import * as ReportUtils from '@libs/ReportUtils';
+import {getPersonalDetailsForAccountIDs} from '@libs/OptionsListUtils';
+import {getDisplayNamesWithTooltips, isAllowedToComment} from '@libs/ReportUtils';
 import playSound, {SOUNDS} from '@libs/Sound';
-import * as TaskActions from '@userActions/Task';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -36,20 +36,17 @@ function NewTaskPage({route}: NewTaskPageProps) {
     const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const assignee = useMemo(() => TaskActions.getAssignee(task?.assigneeAccountID ?? -1, personalDetails), [task?.assigneeAccountID, personalDetails]);
-    const assigneeTooltipDetails = ReportUtils.getDisplayNamesWithTooltips(
-        OptionsListUtils.getPersonalDetailsForAccountIDs(task?.assigneeAccountID ? [task.assigneeAccountID] : [], personalDetails),
-        false,
-    );
+    const assignee = useMemo(() => getAssignee(task?.assigneeAccountID ?? -1, personalDetails), [task?.assigneeAccountID, personalDetails]);
+    const assigneeTooltipDetails = getDisplayNamesWithTooltips(getPersonalDetailsForAccountIDs(task?.assigneeAccountID ? [task.assigneeAccountID] : [], personalDetails), false);
     const shareDestination = useMemo(
-        () => (task?.shareDestination ? TaskActions.getShareDestination(task.shareDestination, reports, personalDetails) : undefined),
+        () => (task?.shareDestination ? getShareDestination(task.shareDestination, reports, personalDetails) : undefined),
         [task?.shareDestination, reports, personalDetails],
     );
     const parentReport = useMemo(() => (task?.shareDestination ? reports?.[`${ONYXKEYS.COLLECTION.REPORT}${task.shareDestination}`] : undefined), [reports, task?.shareDestination]);
     const [errorMessage, setErrorMessage] = useState('');
 
     const hasDestinationError = task?.skipConfirmation && !task?.parentReportID;
-    const isAllowedToCreateTask = useMemo(() => isEmptyObject(parentReport) || ReportUtils.isAllowedToComment(parentReport), [parentReport]);
+    const isAllowedToCreateTask = useMemo(() => isEmptyObject(parentReport) || isAllowedToComment(parentReport), [parentReport]);
 
     const {paddingBottom} = useSafeAreaPaddings();
 
@@ -74,7 +71,7 @@ function NewTaskPage({route}: NewTaskPageProps) {
         // this allows us to go ahead and set that report as the share destination
         // and disable the share destination selector
         if (task?.parentReportID) {
-            TaskActions.setShareDestinationValue(task.parentReportID);
+            setShareDestinationValue(task.parentReportID);
         }
     }, [task?.assignee, task?.assigneeAccountID, task?.description, task?.parentReportID, task?.shareDestination, task?.title]);
 
@@ -97,7 +94,7 @@ function NewTaskPage({route}: NewTaskPageProps) {
         }
 
         playSound(SOUNDS.DONE);
-        TaskActions.createTaskAndNavigate(
+        createTaskAndNavigate(
             parentReport?.reportID ?? '-1',
             task.title,
             task?.description ?? '',
@@ -115,7 +112,7 @@ function NewTaskPage({route}: NewTaskPageProps) {
         >
             <FullPageNotFoundView
                 shouldShow={!isAllowedToCreateTask}
-                onBackButtonPress={() => TaskActions.dismissModalAndClearOutTaskInfo()}
+                onBackButtonPress={() => dismissModalAndClearOutTaskInfo()}
                 shouldShowLink={false}
             >
                 <HeaderWithBackButton
@@ -162,7 +159,7 @@ function NewTaskPage({route}: NewTaskPageProps) {
                             <MenuItem
                                 label={assignee?.displayName ? translate('task.assignee') : ''}
                                 title={assignee?.displayName ?? ''}
-                                description={assignee?.displayName ? LocalePhoneNumber.formatPhoneNumber(assignee?.subtitle) : translate('task.assignee')}
+                                description={assignee?.displayName ? formatPhoneNumber(assignee?.subtitle) : translate('task.assignee')}
                                 icon={assignee?.icons}
                                 onPress={() => Navigation.navigate(ROUTES.NEW_TASK_ASSIGNEE.getRoute(backTo))}
                                 shouldShowRightIcon

From e6f97e7f9e2626bd91eded3b639e72208539a95c Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Thu, 6 Mar 2025 23:48:19 +0100
Subject: [PATCH 32/51] fix: WorkspaceMembersPage

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

diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index daf6d6d972ab7..8fc4349d53122 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -753,6 +753,7 @@ function WorkspaceMembersPage({personalDetails, route, policy, currentUserPerson
                             listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
                             listHeaderContent={shouldUseNarrowLayout ? <View style={[styles.pr5]}>{getHeaderContent()}</View> : null}
                             showScrollIndicator={false}
+                            addBottomSafeAreaPadding
                         />
                     </View>
                 </>

From 0e4a2fa4133e5dc9f081134eedf4e254cfcbf37c Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Mon, 24 Mar 2025 11:01:28 +0100
Subject: [PATCH 33/51] fix: don't apply bottom safe area padding twice in
 `ConnectionLayout`

---
 src/components/ConnectionLayout.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ConnectionLayout.tsx b/src/components/ConnectionLayout.tsx
index 425ab5cb23208..9ad83be9053b3 100644
--- a/src/components/ConnectionLayout.tsx
+++ b/src/components/ConnectionLayout.tsx
@@ -151,7 +151,7 @@ function ConnectionLayout({
                 />
                 {shouldUseScrollView ? (
                     <ScrollView
-                        contentContainerStyle={enableEdgeToEdgeBottomSafeAreaPadding ? undefined : contentContainerStyle}
+                        contentContainerStyle={contentContainerStyleProp}
                         addBottomSafeAreaPadding={enableEdgeToEdgeBottomSafeAreaPadding}
                     >
                         {renderSelectionContent}

From 060eb77560e40f3da9a4193a28a34f17b9076413 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Thu, 10 Apr 2025 11:28:06 +0200
Subject: [PATCH 34/51] fix: add edge-to-edge to CurrencyPicker modal

---
 src/components/CurrencyPicker.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/CurrencyPicker.tsx b/src/components/CurrencyPicker.tsx
index 735d7ac0d02ff..f41f5cd524adf 100644
--- a/src/components/CurrencyPicker.tsx
+++ b/src/components/CurrencyPicker.tsx
@@ -77,6 +77,7 @@ function CurrencyPicker({label, value, errorText, headerContent, excludeCurrenci
                 onBackdropPress={Navigation.dismissModal}
                 shouldUseModalPaddingStyle={false}
                 shouldHandleNavigationBack
+                enableEdgeToEdgeBottomSafeAreaPadding
             >
                 <ScreenWrapper
                     style={[styles.pb0]}
@@ -84,6 +85,7 @@ function CurrencyPicker({label, value, errorText, headerContent, excludeCurrenci
                     includeSafeAreaPaddingBottom
                     testID={CurrencyPicker.displayName}
                     shouldEnableMaxHeight
+                    enableEdgeToEdgeBottomSafeAreaPadding
                 >
                     <HeaderWithBackButton
                         title={label}
@@ -97,6 +99,7 @@ function CurrencyPicker({label, value, errorText, headerContent, excludeCurrenci
                             onSelect={updateInput}
                             searchInputLabel={translate('common.search')}
                             excludedCurrencies={excludeCurrencies}
+                            addBottomSafeAreaPadding
                         />
                     </BlockingComponent>
                 </ScreenWrapper>

From f5a75e1cd2f85ed37af086d987155a9073fbc9ac Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Thu, 10 Apr 2025 11:42:30 +0200
Subject: [PATCH 35/51] fix: apply padding top in modals with edge-to-edge

---
 src/components/CurrencyPicker.tsx |  2 --
 src/components/ScreenWrapper.tsx  | 13 ++++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/CurrencyPicker.tsx b/src/components/CurrencyPicker.tsx
index f41f5cd524adf..9875e2403d30b 100644
--- a/src/components/CurrencyPicker.tsx
+++ b/src/components/CurrencyPicker.tsx
@@ -81,8 +81,6 @@ function CurrencyPicker({label, value, errorText, headerContent, excludeCurrenci
             >
                 <ScreenWrapper
                     style={[styles.pb0]}
-                    includePaddingTop
-                    includeSafeAreaPaddingBottom
                     testID={CurrencyPicker.displayName}
                     shouldEnableMaxHeight
                     enableEdgeToEdgeBottomSafeAreaPadding
diff --git a/src/components/ScreenWrapper.tsx b/src/components/ScreenWrapper.tsx
index 15a97159e40cf..dc8263be573ed 100644
--- a/src/components/ScreenWrapper.tsx
+++ b/src/components/ScreenWrapper.tsx
@@ -305,14 +305,17 @@ function ScreenWrapper(
 
     const isSafeAreaTopPaddingApplied = includePaddingTop;
     const paddingTopStyle: StyleProp<ViewStyle> = useMemo(() => {
-        if (includePaddingTop && ignoreInsetsConsumption) {
-            return {paddingTop: unmodifiedPaddings.top};
+        if (!includePaddingTop) {
+            return {};
         }
-        if (includePaddingTop) {
+        if (enableEdgeToEdgeBottomSafeAreaPadding) {
             return {paddingTop};
         }
-        return {};
-    }, [ignoreInsetsConsumption, includePaddingTop, paddingTop, unmodifiedPaddings.top]);
+        if (ignoreInsetsConsumption) {
+            return {paddingTop: unmodifiedPaddings.top};
+        }
+        return {paddingTop};
+    }, [enableEdgeToEdgeBottomSafeAreaPadding, ignoreInsetsConsumption, includePaddingTop, paddingTop, unmodifiedPaddings.top]);
 
     const showBottomContent = enableEdgeToEdgeBottomSafeAreaPadding ? !!bottomContent : true;
     const edgeToEdgeBottomContentStyle = useBottomSafeSafeAreaPaddingStyle({addBottomSafeAreaPadding: true});

From d1736e9f72b1d6e5fd109f4681d9dc8ed93e78ea Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Thu, 10 Apr 2025 11:59:24 +0200
Subject: [PATCH 36/51] fix: enable edge-to-edge in address selection page

---
 src/components/AddressForm.tsx                                 | 1 +
 src/pages/AddressPage.tsx                                      | 2 +-
 .../settings/Profile/PersonalDetails/CountrySelectionPage.tsx  | 3 ++-
 .../settings/Profile/PersonalDetails/StateSelectionPage.tsx    | 3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/AddressForm.tsx b/src/components/AddressForm.tsx
index 908cfcbb9164d..1f75370a82aa9 100644
--- a/src/components/AddressForm.tsx
+++ b/src/components/AddressForm.tsx
@@ -161,6 +161,7 @@ function AddressForm({
             onSubmit={onSubmit}
             submitButtonText={submitButtonText}
             enabledWhenOffline
+            addBottomSafeAreaPadding
         >
             <View>
                 <InputWrapper
diff --git a/src/pages/AddressPage.tsx b/src/pages/AddressPage.tsx
index f58535a7e7223..6e9d10747a957 100644
--- a/src/pages/AddressPage.tsx
+++ b/src/pages/AddressPage.tsx
@@ -85,7 +85,7 @@ function AddressPage({title, address, updateAddress, isLoadingApp = true, backTo
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom
+            enableEdgeToEdgeBottomSafeAreaPadding
             testID={AddressPage.displayName}
         >
             <DelegateNoAccessWrapper accessDeniedVariants={[CONST.DELEGATE.DENIED_ACCESS_VARIANTS.DELEGATE]}>
diff --git a/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx b/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx
index a6353bffb12b4..95e7f1b8ed7fd 100644
--- a/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx
+++ b/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx
@@ -59,7 +59,7 @@ function CountrySelectionPage({route}: CountrySelectionPageProps) {
     return (
         <ScreenWrapper
             testID={CountrySelectionPage.displayName}
-            includeSafeAreaPaddingBottom={false}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <HeaderWithBackButton
                 title={translate('common.country')}
@@ -82,6 +82,7 @@ function CountrySelectionPage({route}: CountrySelectionPageProps) {
                 onChangeText={setSearchValue}
                 initiallyFocusedOptionKey={currentCountry}
                 shouldUseDynamicMaxToRenderPerBatch
+                addBottomSafeAreaPadding
             />
         </ScreenWrapper>
     );
diff --git a/src/pages/settings/Profile/PersonalDetails/StateSelectionPage.tsx b/src/pages/settings/Profile/PersonalDetails/StateSelectionPage.tsx
index 14a3248d2c80d..245dc1b07517e 100644
--- a/src/pages/settings/Profile/PersonalDetails/StateSelectionPage.tsx
+++ b/src/pages/settings/Profile/PersonalDetails/StateSelectionPage.tsx
@@ -69,7 +69,7 @@ function StateSelectionPage() {
     return (
         <ScreenWrapper
             testID={StateSelectionPage.displayName}
-            includeSafeAreaPaddingBottom={false}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <HeaderWithBackButton
                 // Label can be an empty string
@@ -103,6 +103,7 @@ function StateSelectionPage() {
                 initiallyFocusedOptionKey={currentState}
                 shouldUseDynamicMaxToRenderPerBatch
                 ListItem={RadioListItem}
+                addBottomSafeAreaPadding
             />
         </ScreenWrapper>
     );

From 2e9d464b665cce1e075cd7a5e3d37c9b360380e8 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Thu, 10 Apr 2025 15:03:21 +0200
Subject: [PATCH 37/51] fix: netsuite issues

---
 src/components/ConnectionLayout.tsx                        | 7 +++----
 src/components/SelectionScreen.tsx                         | 6 ++++++
 .../accounting/netsuite/NetSuiteSubsidiarySelector.tsx     | 1 +
 .../advanced/NetSuiteCollectionAccountSelectPage.tsx       | 1 +
 .../netsuite/advanced/NetSuiteCustomFormIDPage.tsx         | 3 ++-
 .../advanced/NetSuiteReimbursementAccountSelectPage.tsx    | 1 +
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/ConnectionLayout.tsx b/src/components/ConnectionLayout.tsx
index 9ad83be9053b3..de27a5a2edc2d 100644
--- a/src/components/ConnectionLayout.tsx
+++ b/src/components/ConnectionLayout.tsx
@@ -98,7 +98,7 @@ function ConnectionLayout({
     policyID,
     accessVariants,
     featureName,
-    contentContainerStyle: contentContainerStyleProp,
+    contentContainerStyle,
     titleStyle,
     shouldIncludeSafeAreaPaddingBottom,
     connectionName,
@@ -129,7 +129,6 @@ function ConnectionLayout({
     );
 
     const shouldBlockByConnection = shouldLoadForEmptyConnection ? !isConnectionEmpty : isConnectionEmpty;
-    const contentContainerStyle = useBottomSafeSafeAreaPaddingStyle({addBottomSafeAreaPadding: enableEdgeToEdgeBottomSafeAreaPadding, style: contentContainerStyleProp});
 
     return (
         <AccessOrNotFoundWrapper
@@ -140,7 +139,7 @@ function ConnectionLayout({
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding={enableEdgeToEdgeBottomSafeAreaPadding}
-                includeSafeAreaPaddingBottom={!!shouldIncludeSafeAreaPaddingBottom}
+                includeSafeAreaPaddingBottom={!enableEdgeToEdgeBottomSafeAreaPadding && !!shouldIncludeSafeAreaPaddingBottom}
                 shouldEnableMaxHeight
                 testID={displayName}
             >
@@ -151,7 +150,7 @@ function ConnectionLayout({
                 />
                 {shouldUseScrollView ? (
                     <ScrollView
-                        contentContainerStyle={contentContainerStyleProp}
+                        contentContainerStyle={contentContainerStyle}
                         addBottomSafeAreaPadding={enableEdgeToEdgeBottomSafeAreaPadding}
                     >
                         {renderSelectionContent}
diff --git a/src/components/SelectionScreen.tsx b/src/components/SelectionScreen.tsx
index dbeb829d7573b..81cff1ba360aa 100644
--- a/src/components/SelectionScreen.tsx
+++ b/src/components/SelectionScreen.tsx
@@ -109,6 +109,9 @@ type SelectionScreenProps<T = string> = {
 
     /** Callback to fire when the text input changes */
     onChangeText?: (text: string) => void;
+
+    /** Whether to enable edge-to-edge bottom safe area padding */
+    enableEdgeToEdgeBottomSafeAreaPadding?: boolean;
 };
 
 function SelectionScreen<T = string>({
@@ -139,6 +142,7 @@ function SelectionScreen<T = string>({
     onChangeText,
     shouldShowTextInput,
     shouldUpdateFocusedIndex = false,
+    enableEdgeToEdgeBottomSafeAreaPadding = false,
 }: SelectionScreenProps<T>) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -155,6 +159,7 @@ function SelectionScreen<T = string>({
         >
             <ScreenWrapper
                 includeSafeAreaPaddingBottom={!!errors && !isEmptyObject(errors)}
+                enableEdgeToEdgeBottomSafeAreaPadding={enableEdgeToEdgeBottomSafeAreaPadding}
                 testID={displayName}
             >
                 <HeaderWithBackButton
@@ -186,6 +191,7 @@ function SelectionScreen<T = string>({
                         shouldUpdateFocusedIndex={shouldUpdateFocusedIndex}
                         isAlternateTextMultilineSupported
                         listItemWrapperStyle={listItemWrapperStyle}
+                        addBottomSafeAreaPadding={enableEdgeToEdgeBottomSafeAreaPadding}
                     >
                         <ErrorMessageRow
                             errors={errors}
diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector.tsx
index f1f0a8c9aca99..e52066cd08bc0 100644
--- a/src/pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector.tsx
+++ b/src/pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector.tsx
@@ -97,6 +97,7 @@ function NetSuiteSubsidiarySelector({policy}: WithPolicyConnectionsProps) {
             errors={ErrorUtils.getLatestErrorField(netsuiteConfig ?? {}, CONST.NETSUITE_CONFIG.SUBSIDIARY)}
             errorRowStyles={[styles.ph5, styles.pv3]}
             onClose={() => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SUBSIDIARY)}
+            enableEdgeToEdgeBottomSafeAreaPadding
         />
     );
 }
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCollectionAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCollectionAccountSelectPage.tsx
index c30cc207d6a8b..bd7a76eaa3157 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCollectionAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCollectionAccountSelectPage.tsx
@@ -86,6 +86,7 @@ function NetSuiteCollectionAccountSelectPage({policy}: WithPolicyConnectionsProp
             errors={getLatestErrorField(config, CONST.NETSUITE_CONFIG.COLLECTION_ACCOUNT)}
             errorRowStyles={[styles.ph5, styles.pv3]}
             onClose={() => clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.COLLECTION_ACCOUNT)}
+            enableEdgeToEdgeBottomSafeAreaPadding
         />
     );
 }
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage.tsx
index a376568d731d8..28b2b7c9e5a6a 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage.tsx
@@ -73,9 +73,9 @@ function NetSuiteCustomFormIDPage({policy}: WithPolicyConnectionsProps) {
             contentContainerStyle={[styles.flex1]}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
-            enableEdgeToEdgeBottomSafeAreaPadding
             shouldBeBlocked={!config?.customFormIDOptions?.enabled}
             shouldUseScrollView={false}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <View style={[styles.flexGrow1, styles.ph5]}>
                 <FormProvider
@@ -87,6 +87,7 @@ function NetSuiteCustomFormIDPage({policy}: WithPolicyConnectionsProps) {
                     shouldValidateOnBlur
                     shouldValidateOnChange
                     shouldHideFixErrorsAlert
+                    addBottomSafeAreaPadding
                 >
                     <OfflineWithFeedback
                         pendingAction={settingsPendingAction([customFormIDKey], config?.pendingFields)}
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteReimbursementAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteReimbursementAccountSelectPage.tsx
index f3bd0bb568b59..829cc63786d17 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteReimbursementAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteReimbursementAccountSelectPage.tsx
@@ -86,6 +86,7 @@ function NetSuiteReimbursementAccountSelectPage({policy}: WithPolicyConnectionsP
             errors={getLatestErrorField(config, CONST.NETSUITE_CONFIG.REIMBURSEMENT_ACCOUNT_ID)}
             errorRowStyles={[styles.ph5, styles.pv3]}
             onClose={() => clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.REIMBURSEMENT_ACCOUNT_ID)}
+            enableEdgeToEdgeBottomSafeAreaPadding
         />
     );
 }

From f9538c487957a041b7c72f89cd77023ba2301466 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Thu, 10 Apr 2025 15:03:38 +0200
Subject: [PATCH 38/51] fix: sage issues

---
 .../intacct/import/SageIntacctUserDimensionsPage.tsx       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/accounting/intacct/import/SageIntacctUserDimensionsPage.tsx b/src/pages/workspace/accounting/intacct/import/SageIntacctUserDimensionsPage.tsx
index 4c595ec5fc1a5..b67b522918466 100644
--- a/src/pages/workspace/accounting/intacct/import/SageIntacctUserDimensionsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/import/SageIntacctUserDimensionsPage.tsx
@@ -85,7 +85,7 @@ function SageIntacctUserDimensionsPage({policy}: WithPolicyProps) {
                             <Text>{translate('workspace.intacct.detailedInstructionsRestOfSentence')}</Text>
                         </Text>
                     </View>
-                    <ScrollView>
+                    <ScrollView addBottomSafeAreaPadding>
                         {userDimensions.map((userDimension) => (
                             <OfflineWithFeedback
                                 key={userDimension.dimension}
@@ -107,7 +107,10 @@ function SageIntacctUserDimensionsPage({policy}: WithPolicyProps) {
                     </ScrollView>
                 </>
             )}
-            <FixedFooter style={[styles.mt5]}>
+            <FixedFooter
+                style={[styles.mt5]}
+                addBottomSafeAreaPadding
+            >
                 <Button
                     success
                     text={translate('workspace.intacct.addUserDefinedDimension')}

From 89f12878fd27f5c7a0207947342a24767ec3d267 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Thu, 10 Apr 2025 15:05:37 +0200
Subject: [PATCH 39/51] fix: xero issues

---
 .../accounting/xero/export/XeroBankAccountSelectPage.tsx         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/workspace/accounting/xero/export/XeroBankAccountSelectPage.tsx b/src/pages/workspace/accounting/xero/export/XeroBankAccountSelectPage.tsx
index 798ed02473d2f..e74742232d57d 100644
--- a/src/pages/workspace/accounting/xero/export/XeroBankAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/xero/export/XeroBankAccountSelectPage.tsx
@@ -96,6 +96,7 @@ function XeroBankAccountSelectPage({policy}: WithPolicyConnectionsProps) {
             errors={getLatestErrorField(config ?? {}, CONST.XERO_CONFIG.NON_REIMBURSABLE_ACCOUNT)}
             errorRowStyles={[styles.ph5, styles.pv3]}
             onClose={() => clearXeroErrorField(policyID, CONST.XERO_CONFIG.NON_REIMBURSABLE_ACCOUNT)}
+            enableEdgeToEdgeBottomSafeAreaPadding
         />
     );
 }

From ea7f122ba555dc433380e9844e17aeffd991291a Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Thu, 10 Apr 2025 15:12:42 +0200
Subject: [PATCH 40/51] Update
 NetSuiteExportExpensesPayableAccountSelectPage.tsx

---
 .../export/NetSuiteExportExpensesPayableAccountSelectPage.tsx    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPayableAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPayableAccountSelectPage.tsx
index 51d397a1ba2c9..ccdbd7bb3e18a 100644
--- a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPayableAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPayableAccountSelectPage.tsx
@@ -94,6 +94,7 @@ function NetSuiteExportExpensesPayableAccountSelectPage({policy}: WithPolicyConn
             errors={getLatestErrorField(config, currentSettingName)}
             errorRowStyles={[styles.ph5, styles.pv3]}
             onClose={() => clearNetSuiteErrorField(policyID, currentSettingName)}
+            enableEdgeToEdgeBottomSafeAreaPadding
         />
     );
 }

From 785a0fdf59d0ec0aac22428a14cba29d4a7a06ba Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Thu, 10 Apr 2025 16:08:37 +0200
Subject: [PATCH 41/51] fix: minor issues

---
 .../AmountPicker/AmountSelectorModal.tsx      |  9 +++--
 src/components/ScreenWrapper.tsx              | 36 ++++++++++++-------
 .../TextPicker/TextSelectorModal.tsx          |  4 ++-
 src/hooks/useSafeAreaPaddings.ts              |  8 ++---
 src/pages/workspace/WorkspaceInitialPage.tsx  |  2 +-
 src/pages/workspace/WorkspacesListPage.tsx    |  4 +--
 6 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/src/components/AmountPicker/AmountSelectorModal.tsx b/src/components/AmountPicker/AmountSelectorModal.tsx
index d8510aef04993..1954d0e5153e8 100644
--- a/src/components/AmountPicker/AmountSelectorModal.tsx
+++ b/src/components/AmountPicker/AmountSelectorModal.tsx
@@ -49,19 +49,22 @@ function AmountSelectorModal({value, description = '', onValueSelected, isVisibl
             onModalHide={onClose}
             hideModalContentWhileAnimating
             useNativeDriver
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ScreenWrapper
+                enableEdgeToEdgeBottomSafeAreaPadding
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
                 testID={AmountSelectorModal.displayName}
                 shouldEnableMaxHeight
-                style={[styles.pb0]}
             >
                 <HeaderWithBackButton
                     title={description}
                     onBackButtonPress={onClose}
                 />
-                <ScrollView contentContainerStyle={[styles.flexGrow1, styles.mb5]}>
+                <ScrollView
+                    contentContainerStyle={[styles.flexGrow1, styles.mb5]}
+                    addBottomSafeAreaPadding
+                >
                     <View style={styles.flex1}>
                         <AmountForm
                             // eslint-disable-next-line react/jsx-props-no-spreading
diff --git a/src/components/ScreenWrapper.tsx b/src/components/ScreenWrapper.tsx
index dc8263be573ed..bf3a455855156 100644
--- a/src/components/ScreenWrapper.tsx
+++ b/src/components/ScreenWrapper.tsx
@@ -169,10 +169,10 @@ function ScreenWrapper(
         shouldUseCachedViewportHeight = false,
         focusTrapSettings,
         bottomContent,
-        enableEdgeToEdgeBottomSafeAreaPadding = false,
-        shouldMobileOfflineIndicatorStickToBottom = enableEdgeToEdgeBottomSafeAreaPadding,
-        shouldKeyboardOffsetBottomSafeAreaPadding = enableEdgeToEdgeBottomSafeAreaPadding,
-        isOfflineIndicatorTranslucent = enableEdgeToEdgeBottomSafeAreaPadding,
+        enableEdgeToEdgeBottomSafeAreaPadding: enableEdgeToEdgeBottomSafeAreaPaddingProp,
+        shouldMobileOfflineIndicatorStickToBottom: shouldMobileOfflineIndicatorStickToBottomProp,
+        shouldKeyboardOffsetBottomSafeAreaPadding: shouldKeyboardOffsetBottomSafeAreaPaddingProp,
+        isOfflineIndicatorTranslucent: isOfflineIndicatorTranslucentProp,
     }: ScreenWrapperProps,
     ref: ForwardedRef<View>,
 ) {
@@ -195,7 +195,17 @@ function ScreenWrapper(
 
     const [isSingleNewDotEntry] = useOnyx(ONYXKEYS.IS_SINGLE_NEW_DOT_ENTRY);
 
-    const includeSafeAreaPaddingBottom = enableEdgeToEdgeBottomSafeAreaPadding ? false : includeSafeAreaPaddingBottomProp;
+    // When the `enableEdgeToEdgeBottomSafeAreaPadding` prop is explicitly set, we enable edge-to-edge mode.
+    const isUsingEdgeToEdgeMode = enableEdgeToEdgeBottomSafeAreaPaddingProp !== undefined;
+    const enableEdgeToEdgeBottomSafeAreaPadding = enableEdgeToEdgeBottomSafeAreaPaddingProp ?? false;
+
+    // We enable all of these flags by default, if we are using edge-to-edge mode.
+    const shouldMobileOfflineIndicatorStickToBottom = shouldMobileOfflineIndicatorStickToBottomProp ?? isUsingEdgeToEdgeMode;
+    const shouldKeyboardOffsetBottomSafeAreaPadding = shouldKeyboardOffsetBottomSafeAreaPaddingProp ?? isUsingEdgeToEdgeMode;
+    const isOfflineIndicatorTranslucent = isOfflineIndicatorTranslucentProp ?? isUsingEdgeToEdgeMode;
+
+    // We disable legacy bottom safe area padding handling, if we are using edge-to-edge mode.
+    const includeSafeAreaPaddingBottom = isUsingEdgeToEdgeMode ? false : includeSafeAreaPaddingBottomProp;
 
     // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout for a case where we want to show the offline indicator only on small screens
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
@@ -299,7 +309,7 @@ function ScreenWrapper(
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
-    const {insets, paddingTop, paddingBottom, safeAreaPaddingBottomStyle, unmodifiedPaddings} = useSafeAreaPaddings(enableEdgeToEdgeBottomSafeAreaPadding);
+    const {insets, paddingTop, paddingBottom, safeAreaPaddingBottomStyle, unmodifiedPaddings} = useSafeAreaPaddings(isUsingEdgeToEdgeMode);
     const navigationBarType = useMemo(() => StyleUtils.getNavigationBarType(insets), [StyleUtils, insets]);
     const isSoftKeyNavigation = navigationBarType === CONST.NAVIGATION_BAR_TYPE.SOFT_KEYS;
 
@@ -308,16 +318,16 @@ function ScreenWrapper(
         if (!includePaddingTop) {
             return {};
         }
-        if (enableEdgeToEdgeBottomSafeAreaPadding) {
+        if (isUsingEdgeToEdgeMode) {
             return {paddingTop};
         }
         if (ignoreInsetsConsumption) {
             return {paddingTop: unmodifiedPaddings.top};
         }
         return {paddingTop};
-    }, [enableEdgeToEdgeBottomSafeAreaPadding, ignoreInsetsConsumption, includePaddingTop, paddingTop, unmodifiedPaddings.top]);
+    }, [isUsingEdgeToEdgeMode, ignoreInsetsConsumption, includePaddingTop, paddingTop, unmodifiedPaddings.top]);
 
-    const showBottomContent = enableEdgeToEdgeBottomSafeAreaPadding ? !!bottomContent : true;
+    const showBottomContent = isUsingEdgeToEdgeMode ? !!bottomContent : true;
     const edgeToEdgeBottomContentStyle = useBottomSafeSafeAreaPaddingStyle({addBottomSafeAreaPadding: true});
     const legacyBottomContentStyle: StyleProp<ViewStyle> = useMemo(() => {
         const shouldUseUnmodifiedPaddings = includeSafeAreaPaddingBottom && ignoreInsetsConsumption;
@@ -334,8 +344,8 @@ function ScreenWrapper(
     }, [ignoreInsetsConsumption, includeSafeAreaPaddingBottom, paddingBottom, unmodifiedPaddings.bottom]);
 
     const bottomContentStyle = useMemo(
-        () => (enableEdgeToEdgeBottomSafeAreaPadding ? edgeToEdgeBottomContentStyle : legacyBottomContentStyle),
-        [enableEdgeToEdgeBottomSafeAreaPadding, edgeToEdgeBottomContentStyle, legacyBottomContentStyle],
+        () => (isUsingEdgeToEdgeMode ? edgeToEdgeBottomContentStyle : legacyBottomContentStyle),
+        [isUsingEdgeToEdgeMode, edgeToEdgeBottomContentStyle, legacyBottomContentStyle],
     );
 
     /**
@@ -354,7 +364,7 @@ function ScreenWrapper(
     }, [bottomContent, isOffline, isOfflineIndicatorTranslucent, isSoftKeyNavigation, styles.appBG, styles.navigationBarBG]);
 
     /** In edge-to-edge mode, we always want to apply the bottom safe area padding to the mobile offline indicator. */
-    const hasMobileOfflineIndicatorBottomSafeAreaPadding = enableEdgeToEdgeBottomSafeAreaPadding ? true : !includeSafeAreaPaddingBottom;
+    const hasMobileOfflineIndicatorBottomSafeAreaPadding = isUsingEdgeToEdgeMode ? enableEdgeToEdgeBottomSafeAreaPadding : !includeSafeAreaPaddingBottom;
 
     /**
      * This style includes the bottom safe area padding for the mobile offline indicator.
@@ -459,7 +469,7 @@ function ScreenWrapper(
                                     <>
                                         <OfflineIndicator
                                             style={[styles.pl5, offlineIndicatorStyle]}
-                                            addBottomSafeAreaPadding={enableEdgeToEdgeBottomSafeAreaPadding ? !bottomContent : true}
+                                            addBottomSafeAreaPadding={isUsingEdgeToEdgeMode ? !bottomContent : true}
                                         />
                                         {/* Since import state is tightly coupled to the offline state, it is safe to display it when showing offline indicator */}
                                         <ImportedStateIndicator />
diff --git a/src/components/TextPicker/TextSelectorModal.tsx b/src/components/TextPicker/TextSelectorModal.tsx
index 58886c84fa298..3fea21b7072c1 100644
--- a/src/components/TextPicker/TextSelectorModal.tsx
+++ b/src/components/TextPicker/TextSelectorModal.tsx
@@ -102,10 +102,11 @@ function TextSelectorModal({
             hideModalContentWhileAnimating
             useNativeDriver
             shouldUseModalPaddingStyle={false}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ScreenWrapper
+                enableEdgeToEdgeBottomSafeAreaPadding
                 includePaddingTop
-                includeSafeAreaPaddingBottom
                 testID={TextSelectorModal.displayName}
                 shouldEnableMaxHeight
             >
@@ -124,6 +125,7 @@ function TextSelectorModal({
                     style={[styles.mh5, styles.flex1]}
                     enabledWhenOffline
                     shouldHideFixErrorsAlert
+                    addBottomSafeAreaPadding
                 >
                     <View style={styles.pb4}>{!!subtitle && <Text style={[styles.sidebarLinkText, styles.optionAlternateText]}>{subtitle}</Text>}</View>
                     <InputWrapper
diff --git a/src/hooks/useSafeAreaPaddings.ts b/src/hooks/useSafeAreaPaddings.ts
index 9087cd52a3382..4c80856b0f90b 100644
--- a/src/hooks/useSafeAreaPaddings.ts
+++ b/src/hooks/useSafeAreaPaddings.ts
@@ -30,7 +30,7 @@ import useStyleUtils from './useStyleUtils';
  *     // Use these values to style your component accordingly
  * }
  */
-function useSafeAreaPaddings(enableEdgeToEdgeBottomSafeAreaPadding = false) {
+function useSafeAreaPaddings(isUsingEdgeToEdgeBottomSafeAreaPadding = false) {
     const StyleUtils = useStyleUtils();
     const insets = useSafeAreaInsets();
     const {paddingTop, paddingBottom} = useMemo(() => StyleUtils.getPlatformSafeAreaPadding(insets), [StyleUtils, insets]);
@@ -41,11 +41,11 @@ function useSafeAreaPaddings(enableEdgeToEdgeBottomSafeAreaPadding = false) {
 
     const adaptedPaddingBottom = isSafeAreaBottomPaddingApplied ? 0 : paddingBottom;
     const safeAreaPaddingBottomStyle = useMemo(
-        () => ({paddingBottom: enableEdgeToEdgeBottomSafeAreaPadding ? paddingBottom : adaptedPaddingBottom}),
-        [adaptedPaddingBottom, enableEdgeToEdgeBottomSafeAreaPadding, paddingBottom],
+        () => ({paddingBottom: isUsingEdgeToEdgeBottomSafeAreaPadding ? paddingBottom : adaptedPaddingBottom}),
+        [adaptedPaddingBottom, isUsingEdgeToEdgeBottomSafeAreaPadding, paddingBottom],
     );
 
-    if (enableEdgeToEdgeBottomSafeAreaPadding) {
+    if (isUsingEdgeToEdgeBottomSafeAreaPadding) {
         return {
             paddingTop,
             paddingBottom,
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index d12cc2bdb10cd..c3716a04d296a 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -432,7 +432,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
     return (
         <ScreenWrapper
             testID={WorkspaceInitialPage.displayName}
-            enableEdgeToEdgeBottomSafeAreaPadding
+            enableEdgeToEdgeBottomSafeAreaPadding={false}
             bottomContent={shouldShowBottomTab ? <BottomTabBar selectedTab={BOTTOM_TABS.SETTINGS} /> : null}
         >
             <FullPageNotFoundView
diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index 290736949c28c..e5590b1f37506 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -460,7 +460,7 @@ function WorkspacesListPage() {
                 testID={WorkspacesListPage.displayName}
                 shouldShowOfflineIndicatorInWideScreen
                 bottomContent={shouldUseNarrowLayout && <BottomTabBar selectedTab={BOTTOM_TABS.SETTINGS} />}
-                enableEdgeToEdgeBottomSafeAreaPadding
+                enableEdgeToEdgeBottomSafeAreaPadding={false}
             >
                 <HeaderWithBackButton
                     title={translate('common.workspaces')}
@@ -502,7 +502,7 @@ function WorkspacesListPage() {
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicatorInWideScreen
             testID={WorkspacesListPage.displayName}
-            enableEdgeToEdgeBottomSafeAreaPadding
+            enableEdgeToEdgeBottomSafeAreaPadding={false}
             bottomContent={shouldUseNarrowLayout && <BottomTabBar selectedTab={BOTTOM_TABS.SETTINGS} />}
         >
             <View style={styles.flex1}>

From cf625015fc536f545491a349b9677e7baefbe697 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Thu, 10 Apr 2025 19:24:19 +0200
Subject: [PATCH 42/51] fix: remove unused import

---
 src/components/ConnectionLayout.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ConnectionLayout.tsx b/src/components/ConnectionLayout.tsx
index de27a5a2edc2d..0bdbd1cfe6b95 100644
--- a/src/components/ConnectionLayout.tsx
+++ b/src/components/ConnectionLayout.tsx
@@ -3,7 +3,6 @@ import React, {useMemo} from 'react';
 import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
-import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddingStyle';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';

From 8edb70f6602ed89325cc26de08a63256ab163030 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Fri, 11 Apr 2025 09:39:36 +0200
Subject: [PATCH 43/51] Update NetSuiteExportExpensesVendorSelectPage.tsx

---
 .../netsuite/export/NetSuiteExportExpensesVendorSelectPage.tsx   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesVendorSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesVendorSelectPage.tsx
index a7440453da3f9..056f3040e85db 100644
--- a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesVendorSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesVendorSelectPage.tsx
@@ -84,6 +84,7 @@ function NetSuiteExportExpensesVendorSelectPage({policy}: WithPolicyConnectionsP
             errors={getLatestErrorField(config, CONST.NETSUITE_CONFIG.DEFAULT_VENDOR)}
             errorRowStyles={[styles.ph5, styles.pv3]}
             onClose={() => clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.DEFAULT_VENDOR)}
+            enableEdgeToEdgeBottomSafeAreaPadding
         />
     );
 }

From 50405cc4e30487a5e506c7c539ed7bf1130fec38 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Fri, 11 Apr 2025 09:39:53 +0200
Subject: [PATCH 44/51] fix: default edge to edge mode value

---
 src/components/ConnectionLayout.tsx |  2 +-
 src/components/Form/FormWrapper.tsx |  6 +++---
 src/components/Modal/BaseModal.tsx  | 10 +++++++---
 src/components/SelectionScreen.tsx  |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/ConnectionLayout.tsx b/src/components/ConnectionLayout.tsx
index 0bdbd1cfe6b95..d2e7bb3017f9b 100644
--- a/src/components/ConnectionLayout.tsx
+++ b/src/components/ConnectionLayout.tsx
@@ -107,7 +107,7 @@ function ConnectionLayout({
     shouldLoadForEmptyConnection = false,
     onBackButtonPress = () => Navigation.goBack(),
     shouldBeBlocked = false,
-    enableEdgeToEdgeBottomSafeAreaPadding = false,
+    enableEdgeToEdgeBottomSafeAreaPadding,
 }: ConnectionLayoutProps) {
     const {translate} = useLocalize();
 
diff --git a/src/components/Form/FormWrapper.tsx b/src/components/Form/FormWrapper.tsx
index 8d3ffc65afd70..d3fd2590f8b9d 100644
--- a/src/components/Form/FormWrapper.tsx
+++ b/src/components/Form/FormWrapper.tsx
@@ -115,11 +115,11 @@ function FormWrapper({
     }, [errors, formState?.errorFields, inputRefs]);
 
     // If either of `addBottomSafeAreaPadding` or `shouldSubmitButtonStickToBottom` is explicitly set,
-    // we expect that the user wants to use the new edge-to-edge bottom safe area padding handling.
+    // we expect that the user wants to use the new edge-to-edge mode.
     // In this case, we want to get and apply the padding unconditionnally.
-    const enableEdgeToEdgeBottomSafeAreaPadding = addBottomSafeAreaPadding !== undefined || shouldSubmitButtonStickToBottomProp !== undefined;
+    const isUsingEdgeToEdgeMode = addBottomSafeAreaPadding !== undefined || shouldSubmitButtonStickToBottomProp !== undefined;
     const shouldSubmitButtonStickToBottom = shouldSubmitButtonStickToBottomProp ?? false;
-    const {paddingBottom} = useSafeAreaPaddings(enableEdgeToEdgeBottomSafeAreaPadding);
+    const {paddingBottom} = useSafeAreaPaddings(isUsingEdgeToEdgeMode);
 
     // Same as above, if `addBottomSafeAreaPadding` is explicitly set true, we default to the new edge-to-edge bottom safe area padding handling.
     // If the paddingBottom is 0, it has already been applied to a parent component and we don't want to apply the padding again.
diff --git a/src/components/Modal/BaseModal.tsx b/src/components/Modal/BaseModal.tsx
index d93bd11004f62..b5d611a657212 100644
--- a/src/components/Modal/BaseModal.tsx
+++ b/src/components/Modal/BaseModal.tsx
@@ -78,11 +78,15 @@ function BaseModal(
         swipeThreshold = 150,
         swipeDirection,
         shouldPreventScrollOnFocus = false,
-        enableEdgeToEdgeBottomSafeAreaPadding = false,
+        enableEdgeToEdgeBottomSafeAreaPadding: enableEdgeToEdgeBottomSafeAreaPaddingProp,
         shouldApplySidePanelOffset = type === CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED,
     }: BaseModalProps,
     ref: React.ForwardedRef<View>,
 ) {
+    // When the `enableEdgeToEdgeBottomSafeAreaPadding` prop is explicitly set, we enable edge-to-edge mode.
+    const isUsingEdgeToEdgeMode = enableEdgeToEdgeBottomSafeAreaPaddingProp !== undefined;
+    const enableEdgeToEdgeBottomSafeAreaPadding = enableEdgeToEdgeBottomSafeAreaPaddingProp ?? false;
+
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -216,7 +220,7 @@ function BaseModal(
             shouldAddBottomSafeAreaMargin,
             shouldAddTopSafeAreaMargin,
             // enableEdgeToEdgeBottomSafeAreaPadding is used as a temporary solution to disable safe area bottom spacing on modals, to allow edge-to-edge content
-            shouldAddBottomSafeAreaPadding: !enableEdgeToEdgeBottomSafeAreaPadding && (!avoidKeyboard || !keyboardStateContextValue.isKeyboardActive) && shouldAddBottomSafeAreaPadding,
+            shouldAddBottomSafeAreaPadding: !isUsingEdgeToEdgeMode && (!avoidKeyboard || !keyboardStateContextValue.isKeyboardActive) && shouldAddBottomSafeAreaPadding,
             shouldAddTopSafeAreaPadding,
             modalContainerStyle,
             insets,
@@ -225,8 +229,8 @@ function BaseModal(
     }, [
         StyleUtils,
         avoidKeyboard,
-        enableEdgeToEdgeBottomSafeAreaPadding,
         insets,
+        isUsingEdgeToEdgeMode,
         keyboardStateContextValue.isKeyboardActive,
         modalContainerStyle,
         shouldAddBottomSafeAreaMargin,
diff --git a/src/components/SelectionScreen.tsx b/src/components/SelectionScreen.tsx
index 81cff1ba360aa..be4effec4ff8c 100644
--- a/src/components/SelectionScreen.tsx
+++ b/src/components/SelectionScreen.tsx
@@ -142,7 +142,7 @@ function SelectionScreen<T = string>({
     onChangeText,
     shouldShowTextInput,
     shouldUpdateFocusedIndex = false,
-    enableEdgeToEdgeBottomSafeAreaPadding = false,
+    enableEdgeToEdgeBottomSafeAreaPadding,
 }: SelectionScreenProps<T>) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();

From 72c38a852e455234051ca24779d357a27c8afd00 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Fri, 11 Apr 2025 12:01:01 +0200
Subject: [PATCH 45/51] refactor: simplify FormWrapper SubmitButton code and
 fix bottom safe area padding

---
 src/components/Form/FormWrapper.tsx | 39 ++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/components/Form/FormWrapper.tsx b/src/components/Form/FormWrapper.tsx
index d3fd2590f8b9d..b2d22cedfca91 100644
--- a/src/components/Form/FormWrapper.tsx
+++ b/src/components/Form/FormWrapper.tsx
@@ -8,6 +8,7 @@ import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
 import FormElement from '@components/FormElement';
 import ScrollView from '@components/ScrollView';
 import ScrollViewWithContext from '@components/ScrollViewWithContext';
+import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddingStyle';
 import useSafeAreaPaddings from '@hooks/useSafeAreaPaddings';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {getLatestErrorMessage} from '@libs/ErrorUtils';
@@ -48,6 +49,12 @@ type FormWrapperProps = ChildrenProps &
 
         /** Whether the submit button should stick to the bottom of the screen. */
         shouldSubmitButtonStickToBottom?: boolean;
+
+        /**
+         * Whether the button should have a background layer in the color of theme.appBG.
+         * This is needed for buttons that allow content to display under them.
+         */
+        shouldSubmitButtonBlendOpacity?: boolean;
     };
 
 function FormWrapper({
@@ -74,6 +81,7 @@ function FormWrapper({
     addBottomSafeAreaPadding,
     addOfflineIndicatorBottomSafeAreaPadding: addOfflineIndicatorBottomSafeAreaPaddingProp,
     shouldSubmitButtonStickToBottom: shouldSubmitButtonStickToBottomProp,
+    shouldSubmitButtonBlendOpacity = false,
 }: FormWrapperProps) {
     const styles = useThemeStyles();
     const formRef = useRef<RNScrollView>(null);
@@ -127,6 +135,16 @@ function FormWrapper({
     const shouldApplyBottomSafeAreaPadding = addBottomSafeAreaPadding ?? !isLegacyBottomSafeAreaPaddingAlreadyApplied;
     const addOfflineIndicatorBottomSafeAreaPadding = addOfflineIndicatorBottomSafeAreaPaddingProp ?? addBottomSafeAreaPadding === true;
 
+    // We need to add bottom safe are padding to the submit button when we don't use a scroll view or
+    // when the submit button is sticking to the bottom.
+    const addSubmitButtonBottomSafeAreaPadding = addBottomSafeAreaPadding && (!shouldUseScrollView || shouldSubmitButtonStickToBottom);
+    const submitButtonStylesWithBottomSafeAreaPadding = useBottomSafeSafeAreaPaddingStyle({
+        addBottomSafeAreaPadding: addSubmitButtonBottomSafeAreaPadding,
+        styleProperty: shouldSubmitButtonStickToBottom ? 'bottom' : 'paddingBottom',
+        additionalPaddingBottom: shouldSubmitButtonStickToBottom ? styles.pb5.paddingBottom : 0,
+        style: submitButtonStyles,
+    });
+
     const SubmitButton = useMemo(
         () =>
             isSubmitButtonVisible && (
@@ -142,23 +160,15 @@ function FormWrapper({
                     containerStyles={[
                         styles.mh0,
                         styles.mt5,
-                        submitFlexEnabled ? styles.flex1 : {},
-                        submitButtonStyles,
-                        shouldSubmitButtonStickToBottom
-                            ? [
-                                  styles.stickToBottom,
-                                  {
-                                      bottom: styles.pb5.paddingBottom + paddingBottom,
-                                  },
-                                  style,
-                              ]
-                            : {},
+                        submitFlexEnabled && styles.flex1,
+                        submitButtonStylesWithBottomSafeAreaPadding,
+                        shouldSubmitButtonStickToBottom && [styles.stickToBottom, style],
                     ]}
                     enabledWhenOffline={enabledWhenOffline}
                     isSubmitActionDangerous={isSubmitActionDangerous}
                     disablePressOnEnter={disablePressOnEnter}
                     enterKeyEventListenerPriority={1}
-                    shouldBlendOpacity={shouldSubmitButtonStickToBottom}
+                    shouldBlendOpacity={shouldSubmitButtonBlendOpacity}
                 />
             ),
         [
@@ -175,16 +185,15 @@ function FormWrapper({
             isSubmitDisabled,
             onFixTheErrorsLinkPressed,
             onSubmit,
-            paddingBottom,
             shouldHideFixErrorsAlert,
+            shouldSubmitButtonBlendOpacity,
             shouldSubmitButtonStickToBottom,
             style,
             styles.flex1,
             styles.mh0,
             styles.mt5,
-            styles.pb5.paddingBottom,
             styles.stickToBottom,
-            submitButtonStyles,
+            submitButtonStylesWithBottomSafeAreaPadding,
             submitButtonText,
             submitFlexEnabled,
         ],

From 3cd7566421959d04153934f19b19fca902fe572f Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Fri, 11 Apr 2025 12:01:55 +0200
Subject: [PATCH 46/51] fix: custom list and item flows

---
 .../NetSuiteImportAddCustomListContent.tsx                   | 1 -
 .../NetSuiteImportAddCustomSegmentContent.tsx                | 1 -
 .../substeps/ChooseCustomListStep.tsx                        | 1 +
 .../substeps/ChooseSegmentTypeStep.tsx                       | 1 +
 .../substeps/ConfirmCustomListStep.tsx                       | 5 ++++-
 .../substeps/ConfirmCustomSegmentList.tsx                    | 5 ++++-
 .../substeps/CustomListMappingStep.tsx                       | 1 +
 .../substeps/CustomSegmentInternalIdStep.tsx                 | 1 +
 .../substeps/CustomSegmentMappingStep.tsx                    | 1 +
 .../substeps/CustomSegmentNameStep.tsx                       | 1 +
 .../substeps/CustomSegmentScriptIdStep.tsx                   | 1 +
 .../substeps/TransactionFieldIDStep.tsx                      | 1 +
 12 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListContent.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListContent.tsx
index c32c2fb1a14b0..e04ff04e2494b 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListContent.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListContent.tsx
@@ -116,7 +116,6 @@ function NetSuiteImportAddCustomListContent({policy, draftValues}: NetSuiteImpor
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             onBackButtonPress={handleBackButtonPress}
-            enableEdgeToEdgeBottomSafeAreaPadding
             shouldUseScrollView={false}
         >
             <View style={[styles.ph5, styles.mb3, styles.mt3, {height: CONST.NETSUITE_FORM_STEPS_HEADER_HEIGHT}]}>
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentContent.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentContent.tsx
index 91e60b08fd010..195b0bcf172ba 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentContent.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentContent.tsx
@@ -116,7 +116,6 @@ function NetSuiteImportAddCustomSegmentContent({policy, draftValues}: NetSuiteIm
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             onBackButtonPress={handleBackButtonPress}
-            enableEdgeToEdgeBottomSafeAreaPadding
             shouldUseScrollView={false}
         >
             <View style={[styles.ph5, styles.mb3, styles.mt3, {height: CONST.NETSUITE_FORM_STEPS_HEADER_HEIGHT}]}>
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseCustomListStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseCustomListStep.tsx
index fa674b52782ca..15b7d694af59f 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseCustomListStep.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseCustomListStep.tsx
@@ -40,6 +40,7 @@ function ChooseCustomListStep({policy, onNext, isEditing, netSuiteCustomFieldFor
             submitFlexEnabled
             shouldUseScrollView
             shouldHideFixErrorsAlert
+            addBottomSafeAreaPadding
         >
             <Text style={[styles.mb3, styles.ph5, styles.textHeadlineLineHeightXXL]}>{translate(`workspace.netsuite.import.importCustomFields.customLists.addForm.listNameTitle`)}</Text>
             <InputWrapper
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseSegmentTypeStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseSegmentTypeStep.tsx
index 5077064cf6a06..d4900efc21bb3 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseSegmentTypeStep.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseSegmentTypeStep.tsx
@@ -54,6 +54,7 @@ function ChooseSegmentTypeStep({onNext, setCustomSegmentType, isEditing, netSuit
             shouldUseScrollView
             shouldHideFixErrorsAlert
             submitFlexEnabled={false}
+            addBottomSafeAreaPadding
         >
             <Text style={[styles.ph5, styles.textHeadlineLineHeightXXL, styles.mb3]}>
                 {translate(`workspace.netsuite.import.importCustomFields.customSegments.addForm.segmentRecordType`)}
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomListStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomListStep.tsx
index 44525875c271c..58398512ea35e 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomListStep.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomListStep.tsx
@@ -4,6 +4,7 @@ import Button from '@components/Button';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import Text from '@components/Text';
+import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddingStyle';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -16,6 +17,8 @@ function ConfirmCustomListStep({onMove, netSuiteCustomFieldFormValues: values, o
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
 
+    const bottomSafeAreaPaddingStyle = useBottomSafeSafeAreaPaddingStyle({addBottomSafeAreaPadding: true});
+
     const fieldNames = [INPUT_IDS.LIST_NAME, INPUT_IDS.TRANSACTION_FIELD_ID, INPUT_IDS.MAPPING];
 
     if (!values.mapping) {
@@ -23,7 +26,7 @@ function ConfirmCustomListStep({onMove, netSuiteCustomFieldFormValues: values, o
     }
 
     return (
-        <View style={[styles.flex1, styles.mt3]}>
+        <View style={[styles.flex1, styles.mt3, bottomSafeAreaPaddingStyle]}>
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mb3]}>{translate('workspace.common.letsDoubleCheck')}</Text>
             {fieldNames.map((fieldName, index) => (
                 <MenuItemWithTopDescription
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomSegmentList.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomSegmentList.tsx
index 73963a95d87bd..3414c7f12ff08 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomSegmentList.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomSegmentList.tsx
@@ -4,6 +4,7 @@ import Button from '@components/Button';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import Text from '@components/Text';
+import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddingStyle';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -19,12 +20,14 @@ function ConfirmCustomSegmentStep({onMove, customSegmentType, netSuiteCustomFiel
     const fieldNames = [INPUT_IDS.SEGMENT_NAME, INPUT_IDS.INTERNAL_ID, INPUT_IDS.SCRIPT_ID, INPUT_IDS.MAPPING];
     const {isOffline} = useNetwork();
 
+    const bottomSafeAreaPaddingStyle = useBottomSafeSafeAreaPaddingStyle({addBottomSafeAreaPadding: true});
+
     if (!values.mapping) {
         return <FullScreenLoadingIndicator />;
     }
 
     return (
-        <View style={styles.flex1}>
+        <View style={[styles.flex1, bottomSafeAreaPaddingStyle]}>
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mb3]}>{translate('workspace.common.letsDoubleCheck')}</Text>
             {fieldNames.map((fieldName, index) => (
                 <MenuItemWithTopDescription
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomListMappingStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomListMappingStep.tsx
index 6602b83bb1a78..7bf33a6c067b4 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomListMappingStep.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomListMappingStep.tsx
@@ -58,6 +58,7 @@ function CustomListMappingStep({importCustomField, customSegmentType, onNext, is
             enabledWhenOffline
             shouldHideFixErrorsAlert
             submitFlexEnabled={false}
+            addBottomSafeAreaPadding
         >
             <Text style={[styles.ph5, styles.textHeadlineLineHeightXXL, styles.mb3]}>{translate(titleKey as TranslationPaths)}</Text>
             <Text style={[styles.ph5, styles.mb3]}>{translate(`workspace.netsuite.import.importCustomFields.chooseOptionBelow`)}</Text>
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentInternalIdStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentInternalIdStep.tsx
index 6c9cf7ce24c09..1f0e627bd712c 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentInternalIdStep.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentInternalIdStep.tsx
@@ -60,6 +60,7 @@ function CustomSegmentInternalIdStep({customSegmentType, onNext, isEditing, netS
             submitFlexEnabled
             shouldUseScrollView
             shouldHideFixErrorsAlert
+            addBottomSafeAreaPadding
         >
             <View style={styles.ph5}>
                 <Text style={[styles.mb3, styles.textHeadlineLineHeightXXL]}>
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentMappingStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentMappingStep.tsx
index 6686d86850c35..607085f623b93 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentMappingStep.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentMappingStep.tsx
@@ -58,6 +58,7 @@ function CustomSegmentMappingStep({importCustomField, customSegmentType, onNext,
             shouldUseScrollView={false}
             shouldHideFixErrorsAlert
             submitFlexEnabled={false}
+            addBottomSafeAreaPadding
         >
             <Text style={[styles.ph5, styles.textHeadlineLineHeightXXL, styles.mb3]}>{translate(titleKey as TranslationPaths)}</Text>
             <Text style={[styles.ph5, styles.mb3]}>{translate(`workspace.netsuite.import.importCustomFields.chooseOptionBelow`)}</Text>
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentNameStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentNameStep.tsx
index b56c270f8eae5..d725cc9e46b0b 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentNameStep.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentNameStep.tsx
@@ -61,6 +61,7 @@ function CustomSegmentNameStep({customSegmentType, onNext, isEditing, customSegm
             submitFlexEnabled
             shouldUseScrollView
             shouldHideFixErrorsAlert
+            addBottomSafeAreaPadding
         >
             <View style={styles.ph5}>
                 <Text style={[styles.mb3, styles.textHeadlineLineHeightXXL]}>
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentScriptIdStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentScriptIdStep.tsx
index 72dba52d8307d..dffae1fcd2107 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentScriptIdStep.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentScriptIdStep.tsx
@@ -64,6 +64,7 @@ function CustomSegmentScriptIdStep({customSegmentType, onNext, isEditing, custom
             submitFlexEnabled
             shouldUseScrollView
             shouldHideFixErrorsAlert
+            addBottomSafeAreaPadding
         >
             <View style={styles.ph5}>
                 <Text style={[styles.mb3, styles.textHeadlineLineHeightXXL]}>
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/TransactionFieldIDStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/TransactionFieldIDStep.tsx
index e7a6ea88ec98b..64f900ca29060 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/TransactionFieldIDStep.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/TransactionFieldIDStep.tsx
@@ -57,6 +57,7 @@ function TransactionFieldIDStep({onNext, isEditing, netSuiteCustomFieldFormValue
             submitFlexEnabled
             shouldUseScrollView
             shouldHideFixErrorsAlert
+            addBottomSafeAreaPadding
         >
             <View style={styles.ph5}>
                 <Text style={[styles.mb3, styles.textHeadlineLineHeightXXL]}>{translate(`workspace.netsuite.import.importCustomFields.customLists.addForm.transactionFieldIDTitle`)}</Text>

From 128537cfd5b0300f69c7cd0f1966b04b77a7b706 Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Fri, 11 Apr 2025 12:03:01 +0200
Subject: [PATCH 47/51] refactor: make all ConnectionLayout and SelectionScreen
 edge-to-edge by default

---
 src/components/ConnectionLayout.tsx                    | 10 +++-------
 src/components/SelectionScreen.tsx                     |  9 ++-------
 .../workspace/accounting/PolicyAccountingPage.tsx      |  1 -
 .../intacct/EnterSageIntacctCredentialsPage.tsx        |  1 -
 .../accounting/intacct/ExistingConnectionsPage.tsx     |  1 -
 .../intacct/SageIntacctPrerequisitesPage.tsx           |  1 -
 .../intacct/advanced/SageIntacctAdvancedPage.tsx       |  1 -
 .../intacct/export/SageIntacctExportPage.tsx           |  1 -
 .../export/SageIntacctNonReimbursableExpensesPage.tsx  |  1 -
 .../export/SageIntacctReimbursableExpensesPage.tsx     |  1 -
 .../intacct/import/SageIntacctAddUserDimensionPage.tsx |  1 -
 .../import/SageIntacctEditUserDimensionsPage.tsx       |  1 -
 .../intacct/import/SageIntacctImportPage.tsx           |  1 -
 .../intacct/import/SageIntacctToggleMappingsPage.tsx   |  1 -
 .../intacct/import/SageIntacctUserDimensionsPage.tsx   |  1 -
 .../accounting/netsuite/NetSuiteSubsidiarySelector.tsx |  1 -
 .../NetSuiteExistingConnectionsPage.tsx                |  1 -
 .../NetSuiteTokenInput/NetSuiteTokenInputPage.tsx      |  1 -
 .../netsuite/advanced/NetSuiteAdvancedPage.tsx         |  1 -
 .../netsuite/advanced/NetSuiteAutoSyncPage.tsx         |  1 -
 .../advanced/NetSuiteCollectionAccountSelectPage.tsx   |  1 -
 .../netsuite/advanced/NetSuiteCustomFormIDPage.tsx     |  1 -
 .../NetSuiteReimbursementAccountSelectPage.tsx         |  1 -
 .../export/NetSuiteExportConfigurationPage.tsx         |  1 -
 .../netsuite/export/NetSuiteExportExpensesPage.tsx     |  1 -
 .../NetSuiteExportExpensesPayableAccountSelectPage.tsx |  1 -
 .../export/NetSuiteExportExpensesVendorSelectPage.tsx  |  1 -
 .../export/NetSuiteInvoiceItemPreferenceSelectPage.tsx |  1 -
 .../netsuite/import/NetSuiteImportCustomFieldEdit.tsx  |  1 -
 .../netsuite/import/NetSuiteImportCustomFieldPage.tsx  |  1 -
 .../netsuite/import/NetSuiteImportCustomFieldView.tsx  |  1 -
 .../import/NetSuiteImportCustomersOrProjectsPage.tsx   |  1 -
 .../accounting/netsuite/import/NetSuiteImportPage.tsx  |  1 -
 .../accounting/qbd/QuickBooksDesktopSetupPage.tsx      |  1 -
 .../accounting/qbd/RequireQuickBooksDesktopPage.tsx    |  1 -
 .../qbd/advanced/QuickbooksDesktopAdvancedPage.tsx     |  1 -
 .../QuickbooksDesktopCompanyCardExpenseAccountPage.tsx |  1 -
 .../qbd/export/QuickbooksDesktopExportPage.tsx         |  1 -
 ...booksDesktopOutOfPocketExpenseConfigurationPage.tsx |  1 -
 .../import/QuickbooksDesktopChartOfAccountsPage.tsx    |  1 -
 .../qbd/import/QuickbooksDesktopClassesPage.tsx        |  1 -
 .../qbd/import/QuickbooksDesktopCustomersPage.tsx      |  1 -
 .../qbd/import/QuickbooksDesktopImportPage.tsx         |  1 -
 .../qbd/import/QuickbooksDesktopItemsPage.tsx          |  1 -
 .../accounting/qbo/advanced/QuickbooksAdvancedPage.tsx |  1 -
 .../export/QuickbooksCompanyCardExpenseAccountPage.tsx |  1 -
 .../qbo/export/QuickbooksExportConfigurationPage.tsx   |  1 -
 .../QuickbooksOutOfPocketExpenseConfigurationPage.tsx  |  1 -
 .../qbo/import/QuickbooksChartOfAccountsPage.tsx       |  1 -
 .../accounting/qbo/import/QuickbooksClassesPage.tsx    |  1 -
 .../accounting/qbo/import/QuickbooksCustomersPage.tsx  |  1 -
 .../accounting/qbo/import/QuickbooksImportPage.tsx     |  1 -
 .../accounting/qbo/import/QuickbooksLocationsPage.tsx  |  1 -
 .../accounting/qbo/import/QuickbooksTaxesPage.tsx      |  1 -
 .../reconciliation/CardReconciliationPage.tsx          |  1 -
 .../ReconciliationAccountSettingsPage.tsx              |  1 -
 src/pages/workspace/accounting/xero/XeroImportPage.tsx |  1 -
 .../accounting/xero/XeroTaxesConfigurationPage.tsx     |  1 -
 .../xero/XeroTrackingCategoryConfigurationPage.tsx     |  1 -
 .../accounting/xero/advanced/XeroAdvancedPage.tsx      |  1 -
 .../xero/export/XeroBankAccountSelectPage.tsx          |  1 -
 .../xero/export/XeroExportConfigurationPage.tsx        |  1 -
 .../accounting/xero/import/XeroChartOfAccountsPage.tsx |  1 -
 .../xero/import/XeroCustomerConfigurationPage.tsx      |  1 -
 64 files changed, 5 insertions(+), 76 deletions(-)

diff --git a/src/components/ConnectionLayout.tsx b/src/components/ConnectionLayout.tsx
index d2e7bb3017f9b..3fe5bef760337 100644
--- a/src/components/ConnectionLayout.tsx
+++ b/src/components/ConnectionLayout.tsx
@@ -70,9 +70,6 @@ type ConnectionLayoutProps = {
 
     /** Whether or not to block user from accessing the page */
     shouldBeBlocked?: boolean;
-
-    /** Whether to enable edge to edge bottom safe area padding logic */
-    enableEdgeToEdgeBottomSafeAreaPadding?: boolean;
 };
 
 type ConnectionLayoutContentProps = Pick<ConnectionLayoutProps, 'title' | 'titleStyle' | 'children' | 'titleAlreadyTranslated'>;
@@ -107,7 +104,6 @@ function ConnectionLayout({
     shouldLoadForEmptyConnection = false,
     onBackButtonPress = () => Navigation.goBack(),
     shouldBeBlocked = false,
-    enableEdgeToEdgeBottomSafeAreaPadding,
 }: ConnectionLayoutProps) {
     const {translate} = useLocalize();
 
@@ -137,8 +133,8 @@ function ConnectionLayout({
             shouldBeBlocked={!!shouldBeBlocked || shouldBlockByConnection}
         >
             <ScreenWrapper
-                enableEdgeToEdgeBottomSafeAreaPadding={enableEdgeToEdgeBottomSafeAreaPadding}
-                includeSafeAreaPaddingBottom={!enableEdgeToEdgeBottomSafeAreaPadding && !!shouldIncludeSafeAreaPaddingBottom}
+                enableEdgeToEdgeBottomSafeAreaPadding
+                includeSafeAreaPaddingBottom={!!shouldIncludeSafeAreaPaddingBottom}
                 shouldEnableMaxHeight
                 testID={displayName}
             >
@@ -150,7 +146,7 @@ function ConnectionLayout({
                 {shouldUseScrollView ? (
                     <ScrollView
                         contentContainerStyle={contentContainerStyle}
-                        addBottomSafeAreaPadding={enableEdgeToEdgeBottomSafeAreaPadding}
+                        addBottomSafeAreaPadding
                     >
                         {renderSelectionContent}
                     </ScrollView>
diff --git a/src/components/SelectionScreen.tsx b/src/components/SelectionScreen.tsx
index be4effec4ff8c..ad77b6f38a0f3 100644
--- a/src/components/SelectionScreen.tsx
+++ b/src/components/SelectionScreen.tsx
@@ -109,9 +109,6 @@ type SelectionScreenProps<T = string> = {
 
     /** Callback to fire when the text input changes */
     onChangeText?: (text: string) => void;
-
-    /** Whether to enable edge-to-edge bottom safe area padding */
-    enableEdgeToEdgeBottomSafeAreaPadding?: boolean;
 };
 
 function SelectionScreen<T = string>({
@@ -142,7 +139,6 @@ function SelectionScreen<T = string>({
     onChangeText,
     shouldShowTextInput,
     shouldUpdateFocusedIndex = false,
-    enableEdgeToEdgeBottomSafeAreaPadding,
 }: SelectionScreenProps<T>) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -158,8 +154,7 @@ function SelectionScreen<T = string>({
             shouldBeBlocked={isConnectionEmpty || shouldBeBlocked}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={!!errors && !isEmptyObject(errors)}
-                enableEdgeToEdgeBottomSafeAreaPadding={enableEdgeToEdgeBottomSafeAreaPadding}
+                enableEdgeToEdgeBottomSafeAreaPadding
                 testID={displayName}
             >
                 <HeaderWithBackButton
@@ -191,7 +186,7 @@ function SelectionScreen<T = string>({
                         shouldUpdateFocusedIndex={shouldUpdateFocusedIndex}
                         isAlternateTextMultilineSupported
                         listItemWrapperStyle={listItemWrapperStyle}
-                        addBottomSafeAreaPadding={enableEdgeToEdgeBottomSafeAreaPadding}
+                        addBottomSafeAreaPadding={!errors || isEmptyObject(errors)}
                     >
                         <ErrorMessageRow
                             errors={errors}
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index d9b5511268af9..e260579367d70 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -525,7 +525,6 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
         >
             <ScreenWrapper
                 testID={PolicyAccountingPage.displayName}
-                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldShowOfflineIndicatorInWideScreen
             >
                 <HeaderWithBackButton
diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
index ab1762371f920..078c7e4c56185 100644
--- a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -53,7 +53,6 @@ function EnterSageIntacctCredentialsPage({route}: SageIntacctPrerequisitesPagePr
     );
     return (
         <ScreenWrapper
-            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnableMaxHeight
             testID={EnterSageIntacctCredentialsPage.displayName}
         >
diff --git a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
index 2e821d85f7384..9fc14d122d654 100644
--- a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
@@ -52,7 +52,6 @@ function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) {
 
     return (
         <ScreenWrapper
-            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicatorInWideScreen
             testID={ExistingConnectionsPage.displayName}
diff --git a/src/pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage.tsx b/src/pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage.tsx
index 19cfa80bd59f6..cde06d37c0d0c 100644
--- a/src/pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage.tsx
@@ -76,7 +76,6 @@ function SageIntacctPrerequisitesPage({route}: SageIntacctPrerequisitesPageProps
 
     return (
         <ScreenWrapper
-            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicatorInWideScreen
             testID={SageIntacctPrerequisitesPage.displayName}
diff --git a/src/pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage.tsx b/src/pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage.tsx
index 1b17911eba66a..fa410a0e376b4 100644
--- a/src/pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage.tsx
@@ -98,7 +98,6 @@ function SageIntacctAdvancedPage({policy}: WithPolicyProps) {
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {toggleSections.map((section) => (
                 <ToggleSettingOptionRow
diff --git a/src/pages/workspace/accounting/intacct/export/SageIntacctExportPage.tsx b/src/pages/workspace/accounting/intacct/export/SageIntacctExportPage.tsx
index b1816e8987684..9bbd0c3fadf44 100644
--- a/src/pages/workspace/accounting/intacct/export/SageIntacctExportPage.tsx
+++ b/src/pages/workspace/accounting/intacct/export/SageIntacctExportPage.tsx
@@ -77,7 +77,6 @@ function SageIntacctExportPage({policy}: WithPolicyProps) {
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {sections.map((section) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage.tsx b/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage.tsx
index bd14074890a3c..77a5ae68333e0 100644
--- a/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage.tsx
@@ -155,7 +155,6 @@ function SageIntacctNonReimbursableExpensesPage({policy}: WithPolicyConnectionsP
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {menuItems
                 .filter((item) => !item.shouldHide)
diff --git a/src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx b/src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx
index 6e5a3dfcc6750..3dd658fe8b698 100644
--- a/src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx
@@ -122,7 +122,6 @@ function SageIntacctReimbursableExpensesPage({policy}: WithPolicyConnectionsProp
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {menuItems
                 .filter((item) => !item.shouldHide)
diff --git a/src/pages/workspace/accounting/intacct/import/SageIntacctAddUserDimensionPage.tsx b/src/pages/workspace/accounting/intacct/import/SageIntacctAddUserDimensionPage.tsx
index 7565b178205bf..3dc7a325650b1 100644
--- a/src/pages/workspace/accounting/intacct/import/SageIntacctAddUserDimensionPage.tsx
+++ b/src/pages/workspace/accounting/intacct/import/SageIntacctAddUserDimensionPage.tsx
@@ -59,7 +59,6 @@ function SageIntacctAddUserDimensionPage({policy}: WithPolicyProps) {
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_USER_DIMENSIONS.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <FormProvider
                 style={[styles.flexGrow1, styles.ph5]}
diff --git a/src/pages/workspace/accounting/intacct/import/SageIntacctEditUserDimensionsPage.tsx b/src/pages/workspace/accounting/intacct/import/SageIntacctEditUserDimensionsPage.tsx
index 531320ca8c169..11c925e2e392b 100644
--- a/src/pages/workspace/accounting/intacct/import/SageIntacctEditUserDimensionsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/import/SageIntacctEditUserDimensionsPage.tsx
@@ -77,7 +77,6 @@ function SageIntacctEditUserDimensionsPage({route}: SageIntacctEditUserDimension
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_USER_DIMENSIONS.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <FormProvider
                 style={[styles.flexGrow1, styles.ph5]}
diff --git a/src/pages/workspace/accounting/intacct/import/SageIntacctImportPage.tsx b/src/pages/workspace/accounting/intacct/import/SageIntacctImportPage.tsx
index aef63328e43a9..92a2e86038750 100644
--- a/src/pages/workspace/accounting/intacct/import/SageIntacctImportPage.tsx
+++ b/src/pages/workspace/accounting/intacct/import/SageIntacctImportPage.tsx
@@ -72,7 +72,6 @@ function SageIntacctImportPage({policy}: WithPolicyProps) {
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.intacct.expenseTypes')}
diff --git a/src/pages/workspace/accounting/intacct/import/SageIntacctToggleMappingsPage.tsx b/src/pages/workspace/accounting/intacct/import/SageIntacctToggleMappingsPage.tsx
index cb8f510383842..67203416f4972 100644
--- a/src/pages/workspace/accounting/intacct/import/SageIntacctToggleMappingsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/import/SageIntacctToggleMappingsPage.tsx
@@ -81,7 +81,6 @@ function SageIntacctToggleMappingsPage({route}: SageIntacctToggleMappingsPagePro
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_IMPORT.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <Text style={[styles.flexRow, styles.alignItemsCenter, styles.w100, styles.mb5, styles.ph5]}>
                 <Text style={[styles.textNormal]}>{translate('workspace.intacct.toggleImportTitleFirstPart')}</Text>
diff --git a/src/pages/workspace/accounting/intacct/import/SageIntacctUserDimensionsPage.tsx b/src/pages/workspace/accounting/intacct/import/SageIntacctUserDimensionsPage.tsx
index b67b522918466..c1aa616bb788a 100644
--- a/src/pages/workspace/accounting/intacct/import/SageIntacctUserDimensionsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/import/SageIntacctUserDimensionsPage.tsx
@@ -40,7 +40,6 @@ function SageIntacctUserDimensionsPage({policy}: WithPolicyProps) {
             connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
             shouldUseScrollView={false}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_IMPORT.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {userDimensions?.length === 0 ? (
                 <View style={[styles.alignItemsCenter, styles.flex1, styles.justifyContentCenter]}>
diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector.tsx
index e52066cd08bc0..f1f0a8c9aca99 100644
--- a/src/pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector.tsx
+++ b/src/pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector.tsx
@@ -97,7 +97,6 @@ function NetSuiteSubsidiarySelector({policy}: WithPolicyConnectionsProps) {
             errors={ErrorUtils.getLatestErrorField(netsuiteConfig ?? {}, CONST.NETSUITE_CONFIG.SUBSIDIARY)}
             errorRowStyles={[styles.ph5, styles.pv3]}
             onClose={() => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SUBSIDIARY)}
-            enableEdgeToEdgeBottomSafeAreaPadding
         />
     );
 }
diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteExistingConnectionsPage.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteExistingConnectionsPage.tsx
index fcb8558abbfb0..03e783bd4adb1 100644
--- a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteExistingConnectionsPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteExistingConnectionsPage.tsx
@@ -56,7 +56,6 @@ function NetSuiteExistingConnectionsPage({route}: ExistingConnectionsPageProps)
             shouldLoadForEmptyConnection
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <View style={[styles.flex1]}>
                 <MenuItemList
diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx
index 1cbf8cefc3c9c..244906cdb6cde 100644
--- a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx
@@ -64,7 +64,6 @@ function NetSuiteTokenInputPage({policy}: WithPolicyConnectionsProps) {
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             onBackButtonPress={handleBackButtonPress}
-            enableEdgeToEdgeBottomSafeAreaPadding
             shouldLoadForEmptyConnection={isEmptyObject(policy?.connections?.[CONST.POLICY.CONNECTIONS.NAME.NETSUITE])}
             shouldBeBlocked={shouldPageBeBlocked}
         >
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
index 1c6527177d544..25a5de72adc49 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
@@ -273,7 +273,6 @@ function NetSuiteAdvancedPage({policy}: WithPolicyConnectionsProps) {
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {menuItems
                 .filter((item) => !item?.shouldHide)
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAutoSyncPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAutoSyncPage.tsx
index 950d0a0ea7084..a80f773f10d14 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAutoSyncPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAutoSyncPage.tsx
@@ -40,7 +40,6 @@ function NetSuiteAutoSyncPage({policy, route}: WithPolicyConnectionsProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                enableEdgeToEdgeBottomSafeAreaPadding
                 style={[styles.defaultModalContainer]}
                 testID={NetSuiteAutoSyncPage.displayName}
                 offlineIndicatorStyle={styles.mtAuto}
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCollectionAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCollectionAccountSelectPage.tsx
index bd7a76eaa3157..c30cc207d6a8b 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCollectionAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCollectionAccountSelectPage.tsx
@@ -86,7 +86,6 @@ function NetSuiteCollectionAccountSelectPage({policy}: WithPolicyConnectionsProp
             errors={getLatestErrorField(config, CONST.NETSUITE_CONFIG.COLLECTION_ACCOUNT)}
             errorRowStyles={[styles.ph5, styles.pv3]}
             onClose={() => clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.COLLECTION_ACCOUNT)}
-            enableEdgeToEdgeBottomSafeAreaPadding
         />
     );
 }
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage.tsx
index 28b2b7c9e5a6a..5271827419016 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage.tsx
@@ -75,7 +75,6 @@ function NetSuiteCustomFormIDPage({policy}: WithPolicyConnectionsProps) {
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             shouldBeBlocked={!config?.customFormIDOptions?.enabled}
             shouldUseScrollView={false}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <View style={[styles.flexGrow1, styles.ph5]}>
                 <FormProvider
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteReimbursementAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteReimbursementAccountSelectPage.tsx
index 829cc63786d17..f3bd0bb568b59 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteReimbursementAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteReimbursementAccountSelectPage.tsx
@@ -86,7 +86,6 @@ function NetSuiteReimbursementAccountSelectPage({policy}: WithPolicyConnectionsP
             errors={getLatestErrorField(config, CONST.NETSUITE_CONFIG.REIMBURSEMENT_ACCOUNT_ID)}
             errorRowStyles={[styles.ph5, styles.pv3]}
             onClose={() => clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.REIMBURSEMENT_ACCOUNT_ID)}
-            enableEdgeToEdgeBottomSafeAreaPadding
         />
     );
 }
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportConfigurationPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportConfigurationPage.tsx
index 55f0576c63282..722712adf84cf 100644
--- a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportConfigurationPage.tsx
@@ -214,7 +214,6 @@ function NetSuiteExportConfigurationPage({policy}: WithPolicyConnectionsProps) {
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {menuItems
                 .filter((item) => !item.shouldHide)
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPage.tsx
index 3003f01fae2c0..bdfdd86265915 100644
--- a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPage.tsx
@@ -135,7 +135,6 @@ function NetSuiteExportExpensesPage({policy}: WithPolicyConnectionsProps) {
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {menuItems
                 .filter((item) => !item.shouldHide)
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPayableAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPayableAccountSelectPage.tsx
index ccdbd7bb3e18a..51d397a1ba2c9 100644
--- a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPayableAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPayableAccountSelectPage.tsx
@@ -94,7 +94,6 @@ function NetSuiteExportExpensesPayableAccountSelectPage({policy}: WithPolicyConn
             errors={getLatestErrorField(config, currentSettingName)}
             errorRowStyles={[styles.ph5, styles.pv3]}
             onClose={() => clearNetSuiteErrorField(policyID, currentSettingName)}
-            enableEdgeToEdgeBottomSafeAreaPadding
         />
     );
 }
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesVendorSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesVendorSelectPage.tsx
index 056f3040e85db..a7440453da3f9 100644
--- a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesVendorSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesVendorSelectPage.tsx
@@ -84,7 +84,6 @@ function NetSuiteExportExpensesVendorSelectPage({policy}: WithPolicyConnectionsP
             errors={getLatestErrorField(config, CONST.NETSUITE_CONFIG.DEFAULT_VENDOR)}
             errorRowStyles={[styles.ph5, styles.pv3]}
             onClose={() => clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.DEFAULT_VENDOR)}
-            enableEdgeToEdgeBottomSafeAreaPadding
         />
     );
 }
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemPreferenceSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemPreferenceSelectPage.tsx
index eb8aa262e9c88..6cb61b29709a9 100644
--- a/src/pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemPreferenceSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemPreferenceSelectPage.tsx
@@ -75,7 +75,6 @@ function NetSuiteInvoiceItemPreferenceSelectPage({policy}: WithPolicyConnections
             policyID={policyID}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             shouldUseScrollView={false}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <OfflineWithFeedback
                 pendingAction={settingsPendingAction([CONST.NETSUITE_CONFIG.INVOICE_ITEM_PREFERENCE], config?.pendingFields)}
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx
index 571db96095dfb..1b26beb098703 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx
@@ -177,7 +177,6 @@ function NetSuiteImportCustomFieldEdit({
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             shouldBeBlocked={!customField || !isNetSuiteCustomFieldPropertyEditable(customField, fieldName)}
             shouldUseScrollView={false}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {renderMap[fieldName] || renderForm}
         </ConnectionLayout>
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldPage.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldPage.tsx
index 845c4f08f14c5..2bbcff955377b 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldPage.tsx
@@ -118,7 +118,6 @@ function NetSuiteImportCustomFieldPage({
             contentContainerStyle={[styles.flex1]}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
-            enableEdgeToEdgeBottomSafeAreaPadding
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT.getRoute(policyID))}
         >
             {data.length === 0 ? listEmptyComponent : listHeaderComponent}
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldView.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldView.tsx
index f825a3ed32822..cb6513e785c1c 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldView.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldView.tsx
@@ -94,7 +94,6 @@ function NetSuiteImportCustomFieldView({
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             shouldBeBlocked={!customField}
-            enableEdgeToEdgeBottomSafeAreaPadding
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_MAPPING.getRoute(policyID, importCustomField))}
         >
             {!!customField && (
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage.tsx
index 80ddaa3c2fb0f..895ed6b637058 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage.tsx
@@ -69,7 +69,6 @@ function NetSuiteImportCustomersOrProjectsPage({policy}: WithPolicyConnectionsPr
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <View style={[styles.ph5, styles.flexRow, styles.pb5]}>
                 <RenderHTML html={`<comment>${Parser.replace(translate(`workspace.netsuite.import.customersOrJobs.subtitle` as TranslationPaths))}</comment>`} />
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportPage.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportPage.tsx
index 707f32d860509..0965be4bca81a 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportPage.tsx
@@ -39,7 +39,6 @@ function NetSuiteImportPage({policy}: WithPolicyConnectionsProps) {
             contentContainerStyle={[styles.pb2]}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 wrapperStyle={[styles.mv3, styles.ph5]}
diff --git a/src/pages/workspace/accounting/qbd/QuickBooksDesktopSetupPage.tsx b/src/pages/workspace/accounting/qbd/QuickBooksDesktopSetupPage.tsx
index 538b577ac234f..4ae6eb167c889 100644
--- a/src/pages/workspace/accounting/qbd/QuickBooksDesktopSetupPage.tsx
+++ b/src/pages/workspace/accounting/qbd/QuickBooksDesktopSetupPage.tsx
@@ -82,7 +82,6 @@ function RequireQuickBooksDesktopModal({route}: RequireQuickBooksDesktopModalPro
 
     return (
         <ScreenWrapper
-            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicatorInWideScreen
             testID={RequireQuickBooksDesktopModal.displayName}
diff --git a/src/pages/workspace/accounting/qbd/RequireQuickBooksDesktopPage.tsx b/src/pages/workspace/accounting/qbd/RequireQuickBooksDesktopPage.tsx
index 88c091f59e954..c317674f66a7b 100644
--- a/src/pages/workspace/accounting/qbd/RequireQuickBooksDesktopPage.tsx
+++ b/src/pages/workspace/accounting/qbd/RequireQuickBooksDesktopPage.tsx
@@ -24,7 +24,6 @@ function RequireQuickBooksDesktopModal({route}: RequireQuickBooksDesktopModalPro
 
     return (
         <ScreenWrapper
-            enableEdgeToEdgeBottomSafeAreaPadding
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicatorInWideScreen
             testID={RequireQuickBooksDesktopModal.displayName}
diff --git a/src/pages/workspace/accounting/qbd/advanced/QuickbooksDesktopAdvancedPage.tsx b/src/pages/workspace/accounting/qbd/advanced/QuickbooksDesktopAdvancedPage.tsx
index ce97408810201..298f261055050 100644
--- a/src/pages/workspace/accounting/qbd/advanced/QuickbooksDesktopAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/qbd/advanced/QuickbooksDesktopAdvancedPage.tsx
@@ -54,7 +54,6 @@ function QuickbooksDesktopAdvancedPage({policy}: WithPolicyConnectionsProps) {
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {qbdToggleSettingItems.map((item) => (
                 <ToggleSettingOptionRow
diff --git a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopCompanyCardExpenseAccountPage.tsx b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopCompanyCardExpenseAccountPage.tsx
index 7edd3f80bfeca..75ad8a86eff5a 100644
--- a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopCompanyCardExpenseAccountPage.tsx
+++ b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopCompanyCardExpenseAccountPage.tsx
@@ -68,7 +68,6 @@ function QuickbooksDesktopCompanyCardExpenseAccountPage({policy}: WithPolicyConn
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXPORT.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {sections.map((section) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx
index 5e2a32642a3f0..ff85479521557 100644
--- a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx
+++ b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportPage.tsx
@@ -84,7 +84,6 @@ function QuickbooksDesktopExportPage({policy}: WithPolicyConnectionsProps) {
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack()}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {menuItems.map((menuItem) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopOutOfPocketExpenseConfigurationPage.tsx b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopOutOfPocketExpenseConfigurationPage.tsx
index 4af5944390024..1c0372aa8715c 100644
--- a/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopOutOfPocketExpenseConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/qbd/export/QuickbooksDesktopOutOfPocketExpenseConfigurationPage.tsx
@@ -97,7 +97,6 @@ function QuickbooksDesktopOutOfPocketExpenseConfigurationPage({policy}: WithPoli
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXPORT.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {sections.map((section, index) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopChartOfAccountsPage.tsx b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopChartOfAccountsPage.tsx
index 576c023172460..45335ad759bef 100644
--- a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopChartOfAccountsPage.tsx
+++ b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopChartOfAccountsPage.tsx
@@ -32,7 +32,6 @@ function QuickbooksDesktopChartOfAccountsPage({policy}: WithPolicyProps) {
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_IMPORT.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopClassesPage.tsx b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopClassesPage.tsx
index ae8730b360133..4a9d459cf4bda 100644
--- a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopClassesPage.tsx
+++ b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopClassesPage.tsx
@@ -38,7 +38,6 @@ function QuickbooksDesktopClassesPage({policy}: WithPolicyProps) {
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_IMPORT.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopCustomersPage.tsx b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopCustomersPage.tsx
index 259b579c87e61..3f7a9f1606c46 100644
--- a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopCustomersPage.tsx
+++ b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopCustomersPage.tsx
@@ -38,7 +38,6 @@ function QuickbooksDesktopCustomersPage({policy}: WithPolicyProps) {
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_IMPORT.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopImportPage.tsx b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopImportPage.tsx
index 1b080e85d9ae1..c83ec9f85b1b2 100644
--- a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopImportPage.tsx
+++ b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopImportPage.tsx
@@ -62,7 +62,6 @@ function QuickbooksDesktopImportPage({policy}: WithPolicyProps) {
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {sections.map((section) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopItemsPage.tsx b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopItemsPage.tsx
index 2533bc98acc7d..1bb2af69eda1b 100644
--- a/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopItemsPage.tsx
+++ b/src/pages/workspace/accounting/qbd/import/QuickbooksDesktopItemsPage.tsx
@@ -30,7 +30,6 @@ function QuickbooksDesktopItemsPage({policy}: WithPolicyProps) {
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_IMPORT.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx b/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx
index 47d345478e96a..14be504611125 100644
--- a/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx
@@ -161,7 +161,6 @@ function QuickbooksAdvancedPage({policy}: WithPolicyConnectionsProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {qboToggleSettingItems.map((item) => (
                 <ToggleSettingOptionRow
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx
index e9f8c6d6b79a4..968da7a2b0cb5 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx
@@ -61,7 +61,6 @@ function QuickbooksCompanyCardExpenseAccountPage({policy}: WithPolicyConnections
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
             onBackButtonPress={() => Navigation.goBack(backTo ?? ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {sections.map((section) => (
                 <OfflineWithFeedback pendingAction={settingsPendingAction(section.subscribedSettings, qboConfig?.pendingFields)}>
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage.tsx
index 5911f855f974d..eeabcbc74a6c4 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage.tsx
@@ -96,7 +96,6 @@ function QuickbooksExportConfigurationPage({policy}: WithPolicyConnectionsProps)
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {menuItems.map((menuItem) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx
index 24a90458500a8..fd603a5b26346 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx
@@ -115,7 +115,6 @@ function QuickbooksOutOfPocketExpenseConfigurationPage({policy}: WithPolicyConne
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
             onBackButtonPress={() => Navigation.goBack(backTo ?? ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {sections.map((section, index) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksChartOfAccountsPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksChartOfAccountsPage.tsx
index 2840767f240c3..73907cb166695 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksChartOfAccountsPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksChartOfAccountsPage.tsx
@@ -32,7 +32,6 @@ function QuickbooksChartOfAccountsPage({policy}: WithPolicyProps) {
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksClassesPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksClassesPage.tsx
index 035d038d393ff..c436f332a8c00 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksClassesPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksClassesPage.tsx
@@ -38,7 +38,6 @@ function QuickbooksClassesPage({policy}: WithPolicyProps) {
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksCustomersPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksCustomersPage.tsx
index 67ff74c6a466e..5518494151987 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksCustomersPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksCustomersPage.tsx
@@ -49,7 +49,6 @@ function QuickbooksCustomersPage({policy}: WithPolicyProps) {
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx
index 0d394c031f6ca..d842a1580a1a2 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx
@@ -82,7 +82,6 @@ function QuickbooksImportPage({policy}: WithPolicyProps) {
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {sections.map((section) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksLocationsPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksLocationsPage.tsx
index 063af05071b4d..26916ca207ce3 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksLocationsPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksLocationsPage.tsx
@@ -60,7 +60,6 @@ function QuickbooksLocationsPage({policy}: WithPolicyProps) {
             contentContainerStyle={[[styles.pb2, styles.ph5]]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksTaxesPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksTaxesPage.tsx
index ee5e2833c80c1..94156cfce54c1 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksTaxesPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksTaxesPage.tsx
@@ -31,7 +31,6 @@ function QuickbooksTaxesPage({policy}: WithPolicyProps) {
             contentContainerStyle={[[styles.pb2, styles.ph5]]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
             onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx b/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx
index 92e014d1cabf4..5e2624dbfda1b 100644
--- a/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx
+++ b/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx
@@ -80,7 +80,6 @@ function CardReconciliationPage({policy, route}: CardReconciliationPageProps) {
             shouldBeBlocked={!shouldShow}
         >
             <ScreenWrapper
-                enableEdgeToEdgeBottomSafeAreaPadding
                 shouldEnableMaxHeight
                 testID={CardReconciliationPage.displayName}
             >
diff --git a/src/pages/workspace/accounting/reconciliation/ReconciliationAccountSettingsPage.tsx b/src/pages/workspace/accounting/reconciliation/ReconciliationAccountSettingsPage.tsx
index 31375d76352b4..acce8ea75bca3 100644
--- a/src/pages/workspace/accounting/reconciliation/ReconciliationAccountSettingsPage.tsx
+++ b/src/pages/workspace/accounting/reconciliation/ReconciliationAccountSettingsPage.tsx
@@ -71,7 +71,6 @@ function ReconciliationAccountSettingsPage({route}: ReconciliationAccountSetting
             connectionName={connectionName}
             shouldUseScrollView={false}
             onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_ACCOUNTING_CARD_RECONCILIATION.getRoute(policyID, connection))}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <Text style={[styles.textNormal, styles.mb5, styles.ph5]}>{translate('workspace.accounting.chooseReconciliationAccount.chooseBankAccount')}</Text>
             <Text style={[styles.textNormal, styles.mb6, styles.ph5]}>
diff --git a/src/pages/workspace/accounting/xero/XeroImportPage.tsx b/src/pages/workspace/accounting/xero/XeroImportPage.tsx
index eab0794fbe213..87f4b3a8ac9a8 100644
--- a/src/pages/workspace/accounting/xero/XeroImportPage.tsx
+++ b/src/pages/workspace/accounting/xero/XeroImportPage.tsx
@@ -69,7 +69,6 @@ function XeroImportPage({policy}: WithPolicyProps) {
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.xero.importDescription')}</Text>
 
diff --git a/src/pages/workspace/accounting/xero/XeroTaxesConfigurationPage.tsx b/src/pages/workspace/accounting/xero/XeroTaxesConfigurationPage.tsx
index ec65474306d10..cf695b57aa38b 100644
--- a/src/pages/workspace/accounting/xero/XeroTaxesConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/xero/XeroTaxesConfigurationPage.tsx
@@ -28,7 +28,6 @@ function XeroTaxesConfigurationPage({policy}: WithPolicyProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx b/src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx
index 29d1a82f2cf19..898b4dc326bda 100644
--- a/src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx
@@ -54,7 +54,6 @@ function XeroTrackingCategoryConfigurationPage({policy}: WithPolicyProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}
diff --git a/src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx b/src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx
index 62adfd41d02e0..bb49e2a160eaa 100644
--- a/src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx
@@ -53,7 +53,6 @@ function XeroAdvancedPage({policy}: WithPolicyConnectionsProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 key={translate('workspace.accounting.autoSync')}
diff --git a/src/pages/workspace/accounting/xero/export/XeroBankAccountSelectPage.tsx b/src/pages/workspace/accounting/xero/export/XeroBankAccountSelectPage.tsx
index e74742232d57d..798ed02473d2f 100644
--- a/src/pages/workspace/accounting/xero/export/XeroBankAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/xero/export/XeroBankAccountSelectPage.tsx
@@ -96,7 +96,6 @@ function XeroBankAccountSelectPage({policy}: WithPolicyConnectionsProps) {
             errors={getLatestErrorField(config ?? {}, CONST.XERO_CONFIG.NON_REIMBURSABLE_ACCOUNT)}
             errorRowStyles={[styles.ph5, styles.pv3]}
             onClose={() => clearXeroErrorField(policyID, CONST.XERO_CONFIG.NON_REIMBURSABLE_ACCOUNT)}
-            enableEdgeToEdgeBottomSafeAreaPadding
         />
     );
 }
diff --git a/src/pages/workspace/accounting/xero/export/XeroExportConfigurationPage.tsx b/src/pages/workspace/accounting/xero/export/XeroExportConfigurationPage.tsx
index ac542e0177015..8bf7c2ff9ff35 100644
--- a/src/pages/workspace/accounting/xero/export/XeroExportConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/xero/export/XeroExportConfigurationPage.tsx
@@ -99,7 +99,6 @@ function XeroExportConfigurationPage({policy}: WithPolicyConnectionsProps) {
             contentContainerStyle={styles.pb2}
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             {menuItems.map((menuItem) => (
                 <OfflineWithFeedback
diff --git a/src/pages/workspace/accounting/xero/import/XeroChartOfAccountsPage.tsx b/src/pages/workspace/accounting/xero/import/XeroChartOfAccountsPage.tsx
index 220ae312779a0..692c892e164e3 100644
--- a/src/pages/workspace/accounting/xero/import/XeroChartOfAccountsPage.tsx
+++ b/src/pages/workspace/accounting/xero/import/XeroChartOfAccountsPage.tsx
@@ -32,7 +32,6 @@ function XeroChartOfAccountsPage({policy}: WithPolicyProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={[styles.pb2, styles.ph5]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <View style={[styles.flexRow, styles.mb4, styles.alignItemsCenter, styles.justifyContentBetween]}>
                 <View style={styles.flex1}>
diff --git a/src/pages/workspace/accounting/xero/import/XeroCustomerConfigurationPage.tsx b/src/pages/workspace/accounting/xero/import/XeroCustomerConfigurationPage.tsx
index 570c205620258..1d5c51642af59 100644
--- a/src/pages/workspace/accounting/xero/import/XeroCustomerConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/xero/import/XeroCustomerConfigurationPage.tsx
@@ -29,7 +29,6 @@ function XeroCustomerConfigurationPage({policy}: WithPolicyProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={[[styles.pb2, styles.ph5]]}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
-            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ToggleSettingOptionRow
                 title={translate('workspace.accounting.import')}

From 8406b69b7a73b47d377354cacc72b6dad47cc44c Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Fri, 11 Apr 2025 12:03:04 +0200
Subject: [PATCH 48/51] Update NetSuiteCustomListSelectorModal.tsx

---
 .../NetSuiteCustomListSelectorModal.tsx                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
index e8598b98baf8f..4708f488642ce 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
@@ -76,9 +76,9 @@ function NetSuiteCustomListSelectorModal({isVisible, currentCustomListValue, onC
             hideModalContentWhileAnimating
             useNativeDriver
             onBackdropPress={onBackdropPress}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <ScreenWrapper
-                style={[styles.pb0]}
                 includePaddingTop={false}
                 enableEdgeToEdgeBottomSafeAreaPadding
                 testID={NetSuiteCustomListSelectorModal.displayName}
@@ -98,10 +98,10 @@ function NetSuiteCustomListSelectorModal({isVisible, currentCustomListValue, onC
                     ListItem={RadioListItem}
                     isRowMultilineSupported
                     initiallyFocusedOptionKey={currentCustomListValue}
-                    addBottomSafeAreaPadding
                     shouldSingleExecuteRowSelect
                     shouldStopPropagation
                     shouldUseDynamicMaxToRenderPerBatch
+                    addBottomSafeAreaPadding
                 />
             </ScreenWrapper>
         </Modal>

From 1095824c3f26bb7268ebd24345dea235c7ba3dfa Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Fri, 11 Apr 2025 14:28:31 +0200
Subject: [PATCH 49/51] fix: linting errors

---
 src/components/Modal/BaseModal.tsx                          | 6 ++----
 .../NetSuiteCustomListSelectorModal.tsx                     | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/components/Modal/BaseModal.tsx b/src/components/Modal/BaseModal.tsx
index b5d611a657212..ab670e241267c 100644
--- a/src/components/Modal/BaseModal.tsx
+++ b/src/components/Modal/BaseModal.tsx
@@ -78,15 +78,13 @@ function BaseModal(
         swipeThreshold = 150,
         swipeDirection,
         shouldPreventScrollOnFocus = false,
-        enableEdgeToEdgeBottomSafeAreaPadding: enableEdgeToEdgeBottomSafeAreaPaddingProp,
+        enableEdgeToEdgeBottomSafeAreaPadding,
         shouldApplySidePanelOffset = type === CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED,
     }: BaseModalProps,
     ref: React.ForwardedRef<View>,
 ) {
     // When the `enableEdgeToEdgeBottomSafeAreaPadding` prop is explicitly set, we enable edge-to-edge mode.
-    const isUsingEdgeToEdgeMode = enableEdgeToEdgeBottomSafeAreaPaddingProp !== undefined;
-    const enableEdgeToEdgeBottomSafeAreaPadding = enableEdgeToEdgeBottomSafeAreaPaddingProp ?? false;
-
+    const isUsingEdgeToEdgeMode = enableEdgeToEdgeBottomSafeAreaPadding !== undefined;
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
index 4708f488642ce..89cd31e15456f 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
@@ -65,8 +65,6 @@ function NetSuiteCustomListSelectorModal({isVisible, currentCustomListValue, onC
         };
     }, [debouncedSearchValue, policy?.connections?.netsuite?.options?.data?.customLists, translate, currentCustomListValue]);
 
-    const styles = useThemeStyles();
-
     return (
         <Modal
             type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED}

From 386737dd666d0146c41461a78592acbeea7fafb0 Mon Sep 17 00:00:00 2001
From: Christoph Pader <christoph.pader@outlook.com>
Date: Fri, 11 Apr 2025 15:27:01 +0200
Subject: [PATCH 50/51] Update src/components/Form/FormWrapper.tsx
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Lucien Akchoté <lucien@expensify.com>
---
 src/components/Form/FormWrapper.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Form/FormWrapper.tsx b/src/components/Form/FormWrapper.tsx
index b2d22cedfca91..e3dd5da85aba2 100644
--- a/src/components/Form/FormWrapper.tsx
+++ b/src/components/Form/FormWrapper.tsx
@@ -135,7 +135,7 @@ function FormWrapper({
     const shouldApplyBottomSafeAreaPadding = addBottomSafeAreaPadding ?? !isLegacyBottomSafeAreaPaddingAlreadyApplied;
     const addOfflineIndicatorBottomSafeAreaPadding = addOfflineIndicatorBottomSafeAreaPaddingProp ?? addBottomSafeAreaPadding === true;
 
-    // We need to add bottom safe are padding to the submit button when we don't use a scroll view or
+    // We need to add bottom safe area padding to the submit button when we don't use a scroll view or
     // when the submit button is sticking to the bottom.
     const addSubmitButtonBottomSafeAreaPadding = addBottomSafeAreaPadding && (!shouldUseScrollView || shouldSubmitButtonStickToBottom);
     const submitButtonStylesWithBottomSafeAreaPadding = useBottomSafeSafeAreaPaddingStyle({

From 9ce4753ca783417c015609c8fffe338d25546f1b Mon Sep 17 00:00:00 2001
From: Christoph Pader <chris@margelo.com>
Date: Fri, 11 Apr 2025 16:51:31 +0200
Subject: [PATCH 51/51] fix: lint error

---
 .../NetSuiteCustomListSelectorModal.tsx                          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
index 89cd31e15456f..251576dd17a82 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
@@ -7,7 +7,6 @@ import SelectionList from '@components/SelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
 import useDebouncedState from '@hooks/useDebouncedState';
 import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
 import type {CustomListSelectorType} from '@pages/workspace/accounting/netsuite/types';
 import CONST from '@src/CONST';
 import type {Policy} from '@src/types/onyx';