From 4445a86ec3ac79cf899bd67fbf3ac00f348af705 Mon Sep 17 00:00:00 2001
From: Ryan Teguh <ryanteguh123@gmail.com>
Date: Sat, 14 Jun 2025 00:55:11 +0800
Subject: [PATCH 1/2] Fix: Remove extra bottom padding on accounting connection
 page

---
 .../accounting/intacct/EnterSageIntacctCredentialsPage.tsx       | 1 +
 .../accounting/intacct/SageIntacctPrerequisitesPage.tsx          | 1 +
 .../NetSuiteTokenInput/substeps/NetSuiteTokenInputForm.tsx       | 1 +
 .../workspace/accounting/qbd/RequireQuickBooksDesktopPage.tsx    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
index 078c7e4c56185..4bf66fb80a25d 100644
--- a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -55,6 +55,7 @@ function EnterSageIntacctCredentialsPage({route}: SageIntacctPrerequisitesPagePr
         <ScreenWrapper
             shouldEnableMaxHeight
             testID={EnterSageIntacctCredentialsPage.displayName}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <HeaderWithBackButton
                 title={translate('workspace.intacct.sageIntacctSetup')}
diff --git a/src/pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage.tsx b/src/pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage.tsx
index cde06d37c0d0c..b6ed63611c64f 100644
--- a/src/pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage.tsx
@@ -79,6 +79,7 @@ function SageIntacctPrerequisitesPage({route}: SageIntacctPrerequisitesPageProps
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicatorInWideScreen
             testID={SageIntacctPrerequisitesPage.displayName}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <HeaderWithBackButton
                 title={translate('workspace.intacct.sageIntacctSetup')}
diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/substeps/NetSuiteTokenInputForm.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/substeps/NetSuiteTokenInputForm.tsx
index 2233f8fca7ac7..d281ac338386a 100644
--- a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/substeps/NetSuiteTokenInputForm.tsx
+++ b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/substeps/NetSuiteTokenInputForm.tsx
@@ -63,6 +63,7 @@ function NetSuiteTokenInputForm({onNext, policyID}: SubStepWithPolicy) {
                 submitButtonText={translate('common.confirm')}
                 shouldValidateOnBlur
                 shouldValidateOnChange
+                addBottomSafeAreaPadding={false}
             >
                 {formInputs.map((formInput, index) => (
                     <View
diff --git a/src/pages/workspace/accounting/qbd/RequireQuickBooksDesktopPage.tsx b/src/pages/workspace/accounting/qbd/RequireQuickBooksDesktopPage.tsx
index c317674f66a7b..99788b278bc16 100644
--- a/src/pages/workspace/accounting/qbd/RequireQuickBooksDesktopPage.tsx
+++ b/src/pages/workspace/accounting/qbd/RequireQuickBooksDesktopPage.tsx
@@ -27,6 +27,7 @@ function RequireQuickBooksDesktopModal({route}: RequireQuickBooksDesktopModalPro
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicatorInWideScreen
             testID={RequireQuickBooksDesktopModal.displayName}
+            enableEdgeToEdgeBottomSafeAreaPadding
         >
             <HeaderWithBackButton
                 title={translate('workspace.qbd.qbdSetup')}

From 89fcf47fccf739f3a45e2cb23f6c30a32e233da7 Mon Sep 17 00:00:00 2001
From: Ryan Teguh <ryanteguh123@gmail.com>
Date: Sat, 14 Jun 2025 01:10:32 +0800
Subject: [PATCH 2/2] ESLint fix

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

diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
index 4bf66fb80a25d..8a1e0e947dc0b 100644
--- a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -11,7 +11,7 @@ import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {connectToSageIntacct} from '@libs/actions/connections/SageIntacct';
-import * as ErrorUtils from '@libs/ErrorUtils';
+import {addErrorMessage} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
@@ -45,7 +45,7 @@ function EnterSageIntacctCredentialsPage({route}: SageIntacctPrerequisitesPagePr
                 if (values[formItem]) {
                     return;
                 }
-                ErrorUtils.addErrorMessage(errors, formItem, translate('common.error.fieldRequired'));
+                addErrorMessage(errors, formItem, translate('common.error.fieldRequired'));
             });
             return errors;
         },