From 75fd91215a173eedef4e123a05e2c41d07e63ffe Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Wed, 12 Jun 2024 15:28:58 +0200
Subject: [PATCH 01/33] add connect to sage intacct button

---
 src/CONST.ts                                  | 12 +---
 .../ConnectToSageIntacctButton/index.tsx      | 66 +++++++++++++++++++
 src/languages/en.ts                           | 52 +++++++--------
 src/types/onyx/Policy.ts                      |  3 +
 4 files changed, 94 insertions(+), 39 deletions(-)
 create mode 100644 src/components/ConnectToSageIntacctButton/index.tsx

diff --git a/src/CONST.ts b/src/CONST.ts
index 26d9af6bb8b8..45763d4a3f8b 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -590,6 +590,8 @@ const CONST = {
     ONFIDO_TERMS_OF_SERVICE_URL: 'https://onfido.com/terms-of-service/',
     LIST_OF_RESTRICTED_BUSINESSES: 'https://community.expensify.com/discussion/6191/list-of-restricted-businesses',
     TRAVEL_TERMS_URL: `${USE_EXPENSIFY_URL}/travelterms`,
+    EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT: `${USE_EXPENSIFY_URL}/tools/integrations/downloadPackage`,
+    HOW_TO_CONNECT_TO_SAGE_INTACCT: 'https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Sage-Intacct#how-to-connect-to-sage-intacct',
 
     // Use Environment.getEnvironmentURL to get the complete URL with port number
     DEV_NEW_EXPENSIFY_URL: 'https://dev.new.expensify.com:',
@@ -1783,6 +1785,7 @@ const CONST = {
                 // Here we will add other connections names when we add support for them
                 QBO: 'quickbooksOnline',
                 XERO: 'xero',
+                SAGE_INTACCT: 'intacct',
             },
             SYNC_STAGE_NAME: {
                 STARTING_IMPORT_QBO: 'startingImportQBO',
@@ -4820,15 +4823,6 @@ const CONST = {
     },
 
     SUBSCRIPTION_SIZE_LIMIT: 20000,
-
-    PAYMENT_CARD_CURRENCY: {
-        USD: 'USD',
-        AUD: 'AUD',
-        GBP: 'GBP',
-        NZD: 'NZD',
-    },
-
-    SUBSCRIPTION_PRICE_FACTOR: 2,
     SUBSCRIPTION_POSSIBLE_COST_SAVINGS: {
         COLLECT_PLAN: 10,
         CONTROL_PLAN: 18,
diff --git a/src/components/ConnectToSageIntacctButton/index.tsx b/src/components/ConnectToSageIntacctButton/index.tsx
new file mode 100644
index 000000000000..1d781d9a62e4
--- /dev/null
+++ b/src/components/ConnectToSageIntacctButton/index.tsx
@@ -0,0 +1,66 @@
+import React, {useState} from 'react';
+import Button from '@components/Button';
+import ConfirmModal from '@components/ConfirmModal';
+import useEnvironment from '@hooks/useEnvironment';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {removePolicyConnection} from '@libs/actions/connections';
+import {getXeroSetupLink} from '@libs/actions/connections/ConnectToXero';
+import Navigation from '@libs/Navigation/Navigation';
+import * as Link from '@userActions/Link';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {PolicyConnectionName} from '@src/types/onyx/Policy';
+
+type ConnectToSageIntacctButtonProps = {
+    policyID: string;
+    shouldDisconnectIntegrationBeforeConnecting?: boolean;
+    integrationToDisconnect?: PolicyConnectionName;
+};
+
+function ConnectToXeroButton({policyID, shouldDisconnectIntegrationBeforeConnecting, integrationToDisconnect}: ConnectToSageIntacctButtonProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
+    const currentIntegration = translate('workspace.accounting.integrationName', integrationToDisconnect);
+    const integrationToConnect = translate('workspace.accounting.integrationName', CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT);
+
+    const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
+
+    return (
+        <>
+            <Button
+                onPress={() => {
+                    if (shouldDisconnectIntegrationBeforeConnecting && integrationToDisconnect) {
+                        setIsDisconnectModalOpen(true);
+                        return;
+                    }
+                    Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID));
+                }}
+                text={translate('workspace.accounting.setup')}
+                style={styles.justifyContentCenter}
+                small
+                isDisabled={isOffline}
+            />
+            {shouldDisconnectIntegrationBeforeConnecting && isDisconnectModalOpen && integrationToDisconnect && (
+                <ConfirmModal
+                    title={translate('workspace.accounting.disconnectTitle', currentIntegration)}
+                    isVisible
+                    onConfirm={() => {
+                        removePolicyConnection(policyID, integrationToDisconnect);
+                        setIsDisconnectModalOpen(false);
+                        Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID));
+                    }}
+                    onCancel={() => setIsDisconnectModalOpen(false)}
+                    prompt={translate('workspace.accounting.disconnectPrompt', integrationToConnect, currentIntegration)}
+                    confirmText={translate('workspace.accounting.disconnect')}
+                    cancelText={translate('common.cancel')}
+                    danger
+                />
+            )}
+        </>
+    );
+}
+
+export default ConnectToXeroButton;
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 1d1b5852f384..628732f741a9 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2172,6 +2172,12 @@ export default {
             noAccountsFound: 'No accounts found',
             noAccountsFoundDescription: 'Add the account in Xero and sync the connection again',
         },
+        intacct: {
+            sageIntacctSetup: 'Sage Intacct setup',
+            prerequisitesTitle: 'Before you connect...',
+            downloadExpensifyPackage: 'Download the Expensify package for Sage Intacct',
+            followSteps: 'Follow the steps in our How-to: Connect to Sage Intacct instructions',
+        },
         type: {
             free: 'Free',
             control: 'Control',
@@ -2392,6 +2398,19 @@ export default {
             subtitle: 'Connect to your accounting system to code transactions with your chart of accounts, auto-match payments, and keep your finances in sync.',
             qbo: 'Quickbooks Online',
             xero: 'Xero',
+            intacct: 'Sage Intacct',
+            integrationName: (integration?: ConnectionName): string => {
+                switch (integration) {
+                    case CONST.POLICY.CONNECTIONS.NAME.QBO:
+                        return 'Quickbooks Online';
+                    case CONST.POLICY.CONNECTIONS.NAME.XERO:
+                        return 'Xero';
+                    case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT:
+                        return 'Sage Intacct';
+                    default:
+                        return 'Integration';
+                }
+            },
             setup: 'Connect',
             lastSync: 'Last synced just now',
             import: 'Import',
@@ -2400,17 +2419,7 @@ export default {
             other: 'Other integrations',
             syncNow: 'Sync now',
             disconnect: 'Disconnect',
-            disconnectTitle: (integration?: ConnectionName): string => {
-                switch (integration) {
-                    case CONST.POLICY.CONNECTIONS.NAME.QBO:
-                        return 'Disconnect QuickBooks Online';
-                    case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                        return 'Disconnect Xero';
-                    default: {
-                        return 'Disconnect integration';
-                    }
-                }
-            },
+            disconnectTitle: (integration?: string): string => `Disconnect ${integration}`,
             syncError: (integration?: ConnectionName): string => {
                 switch (integration) {
                     case CONST.POLICY.CONNECTIONS.NAME.QBO:
@@ -2435,25 +2444,8 @@ export default {
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE]: 'Not imported',
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: 'Imported, displayed as report fields',
             },
-            disconnectPrompt: (integrationToConnect?: ConnectionName, currentIntegration?: ConnectionName): string => {
-                switch (integrationToConnect) {
-                    case CONST.POLICY.CONNECTIONS.NAME.QBO:
-                        return 'Are you sure you want to disconnect Xero to set up QuickBooks Online?';
-                    case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                        return 'Are you sure you want to disconnect QuickBooks Online to set up Xero?';
-                    default: {
-                        switch (currentIntegration) {
-                            case CONST.POLICY.CONNECTIONS.NAME.QBO:
-                                return 'Are you sure you want to disconnect QuickBooks Online?';
-                            case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                                return 'Are you sure you want to disconnect Xero?';
-                            default: {
-                                return 'Are you sure you want to disconnect this integration?';
-                            }
-                        }
-                    }
-                }
-            },
+            disconnectPrompt: (integrationToConnect?: string, currentIntegration?: string): string =>
+                `Are you sure you want to disconnect ${currentIntegration} to set up ${integrationToConnect}?`,
             enterCredentials: 'Enter your credentials',
             connections: {
                 syncStageName: (stage: PolicyConnectionSyncStage) => {
diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index ad8575a81829..f2fd3cfc756f 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -610,6 +610,9 @@ type Connections = {
 
     /** Xero integration connection */
     xero: Connection<XeroConnectionData, XeroConnectionConfig>;
+
+    /** Sage Intacct integration connection */
+    intacct: Connection<XeroConnectionData, XeroConnectionConfig>; // zmien na normalne dane do saga
 };
 
 /** Names of integration connections */

From 2baa77a87ab4560e77ce59f6727e0dde120000ac Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Wed, 12 Jun 2024 15:29:24 +0200
Subject: [PATCH 02/33] add intacct prerequisites screen

---
 src/ROUTES.ts                                 |  4 +
 src/SCREENS.ts                                |  1 +
 .../ModalStackNavigators/index.tsx            |  1 +
 .../FULL_SCREEN_TO_RHP_MAPPING.ts             |  1 +
 src/libs/Navigation/linkingConfig/config.ts   |  1 +
 src/libs/Navigation/types.ts                  |  3 +
 .../intacct/IntacctPrerequisitesPage.tsx      | 95 +++++++++++++++++++
 7 files changed, 106 insertions(+)
 create mode 100644 src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index ed20d388bb87..f4e0339312e6 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -910,6 +910,10 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/accounting/quickbooks-online/import/taxes',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-online/import/taxes` as const,
     },
+    POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/prerequisites',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/prerequisites` as const,
+    },
 } as const;
 
 /**
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 9f7277a0ad0f..832273ec2067 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -268,6 +268,7 @@ const SCREENS = {
             XERO_EXPORT_PREFERRED_EXPORTER_SELECT: 'Workspace_Accounting_Xero_Export_Preferred_Exporter_Select',
             XERO_BILL_PAYMENT_ACCOUNT_SELECTOR: 'Policy_Accounting_Xero_Bill_Payment_Account_Selector',
             XERO_EXPORT_BANK_ACCOUNT_SELECT: 'Policy_Accounting_Xero_Export_Bank_Account_Select',
+            SAGE_INTACCT_PREREQUISITES: 'Policy_Accounting_Sage_Intacct_Prerequisites',
         },
         INITIAL: 'Workspace_Initial',
         PROFILE: 'Workspace_Profile',
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index dea1fede3fe1..f2251fb4f8c8 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -322,6 +322,7 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
         require('../../../../pages/workspace/accounting/xero/export/XeroPreferredExporterSelectPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_PAYMENT_ACCOUNT_SELECTOR]: () =>
         require('../../../../pages/workspace/accounting/xero/advanced/XeroBillPaymentAccountSelectorPage').default as React.ComponentType,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: () => require('../../../../pages/workspace/accounting/intacct/IntacctPrerequisitesPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_FREQUENCY]: () => require('../../../../pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_MONTHLY_OFFSET]: () =>
         require('../../../../pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage').default as React.ComponentType,
diff --git a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
index f91d290639ff..c3144391db88 100755
--- a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
@@ -54,6 +54,7 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial<Record<FullScreenName, string[]>> = {
         SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_PREFERRED_EXPORTER_SELECT,
         SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_PAYMENT_ACCOUNT_SELECTOR,
         SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_BANK_ACCOUNT_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES,
     ],
     [SCREENS.WORKSPACE.TAXES]: [
         SCREENS.WORKSPACE.TAXES_SETTINGS,
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index bb002ec2c01f..baa8ef2129ef 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -348,6 +348,7 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.WORKSPACE.ACCOUNTING.XERO_INVOICE_ACCOUNT_SELECTOR]: {path: ROUTES.POLICY_ACCOUNTING_XERO_INVOICE_SELECTOR.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_PREFERRED_EXPORTER_SELECT]: {path: ROUTES.POLICY_ACCOUNTING_XERO_PREFERRED_EXPORTER_SELECT.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_PAYMENT_ACCOUNT_SELECTOR]: {path: ROUTES.POLICY_ACCOUNTING_XERO_BILL_PAYMENT_ACCOUNT_SELECTOR.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.route},
                         [SCREENS.WORKSPACE.DESCRIPTION]: {
                             path: ROUTES.WORKSPACE_PROFILE_DESCRIPTION.route,
                         },
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index e87f0380a2da..a0ff8e76d444 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -381,6 +381,9 @@ type SettingsNavigatorParamList = {
     [SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_PAYMENT_ACCOUNT_SELECTOR]: {
         policyID: string;
     };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: {
+        policyID: string;
+    };
     [SCREENS.GET_ASSISTANCE]: {
         backTo: Routes;
     };
diff --git a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
new file mode 100644
index 000000000000..90737e5a9863
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
@@ -0,0 +1,95 @@
+import React, {useMemo, useRef} from 'react';
+import {View} from 'react-native';
+// eslint-disable-next-line no-restricted-imports
+import type {GestureResponderEvent, Text as RNText} from 'react-native';
+import Button from '@components/Button';
+import FixedFooter from '@components/FixedFooter';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Expensicons from '@components/Icon/Expensicons';
+import LottieAnimations from '@components/LottieAnimations';
+import MenuItemList from '@components/MenuItemList';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Section from '@components/Section';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import * as ReportActionContextMenu from '@pages/home/report/ContextMenu/ReportActionContextMenu';
+import * as Link from '@userActions/Link';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function IntacctPrerequisitesPage() {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const popoverAnchor = useRef<View | RNText | null>(null);
+
+    const menuItems = useMemo(
+        () => [
+            {
+                translationKey: 'workspace.intacct.downloadExpensifyPackage',
+                icon: Expensicons.Download,
+                iconRight: Expensicons.NewWindow,
+                action: () => {
+                    Link.openExternalLink(CONST.EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT);
+                    return Promise.resolve();
+                },
+                onSecondaryInteraction: (event: GestureResponderEvent | MouseEvent) =>
+                    ReportActionContextMenu.showContextMenu(CONST.CONTEXT_MENU_TYPES.LINK, event, CONST.EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT, popoverAnchor.current),
+            },
+            {
+                translationKey: 'workspace.intacct.followSteps',
+                icon: Expensicons.Download,
+                iconRight: Expensicons.NewWindow,
+                action: () => {
+                    Link.openExternalLink(CONST.HOW_TO_CONNECT_TO_SAGE_INTACCT);
+                    return Promise.resolve();
+                },
+                onSecondaryInteraction: (event: GestureResponderEvent | MouseEvent) =>
+                    ReportActionContextMenu.showContextMenu(CONST.CONTEXT_MENU_TYPES.LINK, event, CONST.HOW_TO_CONNECT_TO_SAGE_INTACCT, popoverAnchor.current),
+            },
+        ],
+        [],
+    );
+
+    return (
+        <ScreenWrapper
+            shouldEnablePickerAvoiding={false}
+            shouldShowOfflineIndicatorInWideScreen
+            testID={IntacctPrerequisitesPage.displayName}
+        >
+            <HeaderWithBackButton
+                title={translate('workspace.intacct.sageIntacctSetup')}
+                shouldShowBackButton
+                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
+            />
+            <View style={[styles.flex1]}>
+                <Section
+                    title={translate('workspace.intacct.prerequisitesTitle')}
+                    illustration={LottieAnimations.Coin}
+                    titleStyles={styles.accountSettingsSectionTitle}
+                >
+                    <View style={[styles.flex1, styles.mt5]}>
+                        <MenuItemList
+                            menuItems={menuItems}
+                            shouldUseSingleExecution
+                        />
+                    </View>
+                </Section>
+
+                <FixedFooter style={[styles.mtAuto]}>
+                    <Button
+                        success
+                        text={translate('common.next')}
+                        onPress={() => {}}
+                        pressOnEnter
+                        large
+                    />
+                </FixedFooter>
+            </View>
+        </ScreenWrapper>
+    );
+}
+
+IntacctPrerequisitesPage.displayName = 'IntacctPrerequisitesPage';
+
+export default IntacctPrerequisitesPage;

From c223592de4877d78d5a6c2699c9dcd43a59f1f4c Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Thu, 13 Jun 2024 14:05:03 +0200
Subject: [PATCH 03/33] fix IntacctPrerequisitesPage styling

---
 assets/images/computer.svg                    | 216 ++++++++++++++++++
 .../sage-intacct-icon-square.svg              |  23 ++
 src/components/Icon/Expensicons.ts            |   2 +
 src/languages/en.ts                           |   2 +-
 .../accounting/PolicyAccountingPage.tsx       |  16 ++
 .../intacct/IntacctPrerequisitesPage.tsx      |  41 ++--
 src/styles/utils/spacing.ts                   |   4 +
 7 files changed, 284 insertions(+), 20 deletions(-)
 create mode 100644 assets/images/computer.svg
 create mode 100644 assets/images/integrationicons/sage-intacct-icon-square.svg

diff --git a/assets/images/computer.svg b/assets/images/computer.svg
new file mode 100644
index 000000000000..9c2628245eb1
--- /dev/null
+++ b/assets/images/computer.svg
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 273 188">
+  <defs>
+    <style>
+      .cls-1, .cls-2, .cls-3, .cls-4, .cls-5, .cls-6, .cls-7, .cls-8, .cls-9, .cls-10 {
+        stroke-width: 0px;
+      }
+
+      .cls-1, .cls-10 {
+        fill: #0164bf;
+      }
+
+      .cls-2 {
+        fill: #28736d;
+      }
+
+      .cls-3 {
+        fill: #8dc8ff;
+      }
+
+      .cls-4 {
+        fill: #99f6ff;
+      }
+
+      .cls-5 {
+        fill: #4ba6a6;
+      }
+
+      .cls-6 {
+        fill: #5be3aa;
+      }
+
+      .cls-7, .cls-11 {
+        fill: #50eef6;
+      }
+
+      .cls-8 {
+        fill: #4ed7de;
+      }
+
+      .cls-12 {
+        stroke-width: 1px;
+      }
+
+      .cls-12, .cls-13 {
+        fill: none;
+        stroke-linejoin: round;
+      }
+
+      .cls-12, .cls-13, .cls-11 {
+        stroke: #002140;
+        stroke-linecap: round;
+      }
+
+      .cls-13 {
+        stroke-width: 1px;
+      }
+
+      .cls-9 {
+        fill: #5ab0ff;
+      }
+
+      .cls-10 {
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <path class="cls-1" d="M221.627,31.19c0-1.683-1.373-3.06-3.056-3.06h-53.46c-1.68,0-3.056,1.377-3.056,3.06v36.503c0,1.683,1.376,3.06,3.056,3.06h53.46c1.683,0,3.056-1.377,3.056-3.06V31.19Z"/>
+  <path class="cls-8" d="M221.131,136.085c-4.57-4.09-9.11-5.1-9.777-5.233,1.967-.317,4.237-.497,6.857-.497,5.083,0,9.523,2.417,13.2,5.73h-10.28Z"/>
+  <path class="cls-7" d="M20.726,124.339c-.153-.097-.303-.2-.447-.307-.24-.18-.473-.37-.693-.576l1.193.9s-.037-.01-.05-.014h-.003v-.003Z"/>
+  <path class="cls-7" d="M21.313,127.286c.437-.587,1.097-.954,2.07-1.18-.57.363-1.503.84-2.07,1.18Z"/>
+  <path class="cls-8" d="M223.701,138.752c-.84-1.01-1.707-1.893-2.57-2.667h10.28c1.143,1.03,2.213,2.147,3.206,3.307-4.27-.307-7.916-.333-10.9-.23l-.016-.41Z"/>
+  <path class="cls-8" d="M214.984,141.495c-.356-.386-.74-.75-1.146-1.086l.176-.207s3.354-.817,9.704-1.04c2.983-.103,6.629-.077,10.899.23h.004c4.726,5.523,7.683,11.973,8.453,14.373,1.453,4.52-1.29,6.457-5.003,6.457h-11.947c-1.793,0-3.273-.127-4.543-.373l.02-.11c.487-7.75-2.903-14.207-6.617-18.244Z"/>
+  <path class="cls-8" d="M221.628,31.19c0-1.683-1.374-3.06-3.057-3.06h-53.459c-1.68,0-3.057,1.377-3.057,3.06v36.503c0,1.683,1.377,3.06,3.057,3.06h53.459c1.683,0,3.057-1.377,3.057-3.06V31.19ZM222.861,77.776h-62.579c-1.51,0-2.9-.54-3.984-1.437-1.396-1.153-2.29-2.897-2.29-4.837V27.22c0-3.45,2.824-6.273,6.274-6.273h62.579c1.403,0,2.703.467,3.75,1.25,1.53,1.147,2.527,2.973,2.527,5.023v44.283c0,3.45-2.824,6.273-6.277,6.273Z"/>
+  <path class="cls-7" d="M95.672,158.715h-35.52c-4.52,0-6.03-.86-10.333-4.733-4.307-3.877-28.416-26.05-28.416-26.05l-.38-.166c.083-.177.18-.337.287-.48h.003c.567-.34,1.5-.817,2.07-1.18,1.11-.254,2.633-.324,4.693-.324h104.623c4.343,0,7.846.56,10.846,2.137.717.377,1.403.81,2.067,1.307.646.483,1.823,1.49,3.326,2.826,6.517,5.79,19.2,17.757,21.647,20.207,1.036,1.036,1.816,1.92,2.396,2.763l-.243.25s.86,3.443-3.447,3.443h-41.759v-.43s-2.37-2.366-5.6-5.166c-2.187-1.897-4.52-3.227-9.04-3.227h-21.743c-3.873,0-4.09,2.367-1.29,4.52,2.797,2.153,5.813,4.303,5.813,4.303ZM101.269,129.872h-58.77c-6.183,0-6.73,2.493-4.463,5.17.18.213.377.427.59.64,2.153,2.153,3.713,3.597,5.517,5.253.63.577,1.29,1.18,2.017,1.85,2.8,2.584,5.813,3.447,10.98,3.447h89.766c6.027,0,8.193-.443,4.737-4.307-.39-.436-.764-.846-1.12-1.236-2.257-2.45-3.98-4.084-6.077-5.8-.703-.574-1.453-1.16-2.277-1.79-3.883-2.97-9.16-3.207-14.826-3.223-.507-.004-1.02-.004-1.533-.004h-24.54Z"/>
+  <path class="cls-2" d="M23.383,126.106c-.973.226-1.633.593-2.07,1.18h-.003c-.203.123-.36.23-.433.303-.05.05-.09.033-.13-.033.007-.124.01-.25.01-.377,0-.537-.077-1.263-.193-1.927-.003-.543.007-.963.007-.963,0,0,.057.017.157.05h.003c.063.047.127.087.193.127l.023.013c.85.51,1.793.877,2.803,1.057.083.056.133.106.133.143,0,.087-.2.243-.5.427Z"/>
+  <path class="cls-5" d="M99,48.5H25.236c-4.593,0-8.353,3.76-8.353,8.353v60.466c0,2.417,1.04,4.603,2.693,6.13l-3.757-2.83-4.55-3.423c-2.963-2.08-4.907-5.517-4.907-9.39v-54.246c0-6.307,5.157-11.463,11.463-11.463h71.717s7.52,4.95,9.457,6.403c-.407-.363.847.633,0,0Z"/>
+  <path class="cls-8" d="M199.968,138.912c0-.843.273-1.83.936-2.827h20.227c.863.774,1.73,1.657,2.57,2.667l.017.41c-6.35.223-9.704,1.04-9.704,1.04l-.176.207c-3.817-3.157-9.607-3.947-13.547-1.174h-.32c-.003-.103-.003-.21-.003-.323Z"/>
+  <path class="cls-2" d="M185.848,113.602c-1.427.41-2.95.607-4.5.607h-5.113c1.776-3.067,1.936-6.297-.16-9.363v-.377h2.69c1.553,0,2.75-.203,3.653-.637l.863.38c2.794,2.454,3.434,5.624,2.47,9.034l.097.356Z"/>
+  <path class="cls-7" d="M20.923,124.466c-.067-.04-.13-.08-.193-.124.013.004.033.01.05.014,0,0,.002,0,.007.003l.137.107Z"/>
+  <path class="cls-4" d="M127.342,129.875c5.666.017,10.943.254,14.826,3.224.824.63,1.574,1.216,2.277,1.79l-.123.15h-11.824l-5.156-4.954v-.21Z"/>
+  <path class="cls-8" d="M203.024,133.919c1-.73,2.28-1.41,3.894-1.977,1.263-.443,2.73-.816,4.43-1.09,0,0,0,.004.006,0,.667.134,5.207,1.143,9.777,5.233h-20.227c.484-.733,1.177-1.473,2.12-2.166Z"/>
+  <path class="cls-2" d="M176.075,104.846c2.096,3.066,1.936,6.296.16,9.363h-9.15c1.776-3.067,1.94-6.297-.16-9.363v-.377h9.15v.377Z"/>
+  <path class="cls-3" d="M200.904,136.085c-.663.997-.936,1.984-.936,2.827,0,.113,0,.22.003.327.017,2.933.33,3.396,3.063,6.13,3.23,3.23,9.85,9.203,9.85,9.203,2.917,2.677,4.827,4.527,8.697,5.277,1.27.246,2.75.373,4.543.373h11.947c3.713,0,6.456-1.937,5.003-6.457-.77-2.4-3.727-8.85-8.453-14.373h-.004c-.993-1.16-2.063-2.277-3.206-3.307h4.076c6.297,0,7.427.084,11.624,3.31,4.2,3.23,18.969,17.517,22.766,21.314,1.063,1.063,1.697,2.41,1.547,3.539-.164,1.274-1.32,2.27-3.97,2.27h-53.28c-6.616,0-9.04.97-14.69-3.713-5.653-4.68-17.276-15.496-21.473-19.533-1.236-1.187-1.826-2.3-1.936-3.273-.267-2.344,2.25-3.914,5.326-3.914h19.503Z"/>
+  <path class="cls-7" d="M23.749,125.536c-1.01-.18-1.953-.547-2.803-1.057l-.023-.013-.137-.107c.633.213,2.457.833,2.963,1.177Z"/>
+  <path class="cls-5" d="M20.61,128.766c-.513,2.74-2.323,4.763-4.48,4.763-1.307,0-2.487-.744-3.327-1.937-.807-1.143-1.303-2.696-1.303-4.413,0-3.277,1.81-5.973,4.133-6.313l.187-.247,3.757,2.83.01.007c.22.206.453.396.693.576.103.324.203.757.283,1.22.003.86.037,2.027.183,2.304-.017.416-.063.82-.137,1.21Z"/>
+  <path class="cls-7" d="M133.492,125.672H25.236c-.507,0-1.007-.046-1.487-.136-.507-.344-2.33-.964-2.963-1.177,0,0-.002,0-.007-.003l-1.193-.9-.01-.007c-1.653-1.527-2.693-3.713-2.693-6.13v-60.466c0-4.593,3.76-8.353,8.353-8.353h67.666c.527.463.157,6.527.157,8.073H30.69c-2.977,0-5.41,2.433-5.41,5.41v48.913c0,2.976,2.433,5.413,5.41,5.413h96.702c2.977,0,5.413-2.437,5.413-5.413v-48.913c0-2.977-2.436-5.41-5.413-5.41h-34.333c.02-.297.03-.62.03-.97,0-3.23-.187-5.003-.187-7.103.017.157,0-.167,0,0h40.59c1.58,0,3.06.443,4.323,1.213,2.413,1.47,4.03,4.127,4.03,7.14v60.466c0,4.597-3.756,8.353-8.353,8.353Z"/>
+  <path class="cls-6" d="M62.583,78.553c-1.35,0-2.16-1.057-2.16-2.877s.81-2.88,2.16-2.88,2.157,1.037,2.157,2.88-.81,2.877-2.157,2.877Z"/>
+  <path class="cls-2" d="M194.278,86.023c-3.07-1.777-6.297-1.937-9.367.163h-.12v-8.41h10.117v8.246h-.63Z"/>
+  <path class="cls-5" d="M156.162,76.509l-6.87-5.19c-1.87-1.583-3.06-3.943-3.06-6.57V23.61c0-4.737,3.873-8.61,8.61-8.61h59.799c2.247,0,3.847.887,5.833,2.29l6.244,4.767-.107.14c-1.047-.783-2.347-1.25-3.75-1.25h-62.579c-3.45,0-6.274,2.823-6.274,6.273v44.283c0,1.94.894,3.683,2.29,4.837l-.136.17Z"/>
+  <path class="cls-5" d="M20.563,125.252c.117.664.193,1.39.193,1.927,0,.127-.003.253-.01.377-.147-.277-.18-1.444-.183-2.304Z"/>
+  <path class="cls-4" d="M96.532,140.849h-12.057v-.214l-5.65-5.596h12.42l5.287,5.163v.647Z"/>
+  <path class="cls-5" d="M122.732,42.096c2.13,0,4.13.59,5.843,1.61l9.387,5.777-.144.23c-1.263-.77-2.743-1.213-4.323-1.213h-40.59c-.147-1.84-1.183-3.163-3.043-4.36-1.067-.687-2.137-1.373-3.17-2.043h36.043-.003Z"/>
+  <path class="cls-4" d="M111.602,140.849h-15.07v-.647l-5.287-5.163h14.976l5.38,5.38v.43Z"/>
+  <path class="cls-4" d="M143.702,146.232h-13.724v-.43l-5.156-4.953h13.723l5.157,4.953v.43Z"/>
+  <path class="cls-6" d="M95.409,77.483l.207-.953c.323.093.673.18,1.05.267l.9.203c.947.203,1.283.643,1.283,1.073,0,.613-.543.887-1.487.887-1.237,0-1.797-.453-1.953-1.477Z"/>
+  <path class="cls-4" d="M112.892,149.892c4.52,0,6.853,1.33,9.04,3.227,3.23,2.8,5.6,5.166,5.6,5.166v.43h-31.86s-3.017-2.15-5.813-4.303c-2.8-2.153-2.583-4.52,1.29-4.52h21.743Z"/>
+  <path class="cls-4" d="M150.348,140.849h-11.803l-6.046-5.81h11.823l.123-.15c2.097,1.716,3.82,3.35,6.077,5.8l-.174.16Z"/>
+  <path class="cls-6" d="M97.242,72.053c1.057,0,1.62.343,1.62,1.363h3.94v4.407h-.4c0-1.95-1.313-2.833-4.327-3.517l-.9-.2c-.947-.207-1.283-.617-1.283-1.047,0-.613.517-1.007,1.35-1.007Z"/>
+  <path class="cls-4" d="M58.726,129.872v.213l5.157,4.954h-12.35l-5.157-4.954v-.213h12.35Z"/>
+  <path class="cls-6" d="M74.679,78.689c-1.1,0-1.933-.633-2.133-2.25h7.666v-.47h.583v1.483h-4.207c-.157.607-.63,1.237-1.91,1.237Z"/>
+  <path class="cls-2" d="M157.938,114.209c1.774-3.067,1.937-6.297-.163-9.363v-.377h9.15v.377c2.1,3.066,1.936,6.296.16,9.363h-9.147Z"/>
+  <path class="cls-5" d="M21.023,127.766l.38.166s24.11,22.173,28.416,26.05c4.303,3.873,5.813,4.733,10.333,4.733h109.138c4.307,0,3.447-3.443,3.447-3.443l.243-.25c1.107,1.613,1.477,3.083,1.477,5.2v6.03c0,3.443-1.29,4.736-6.887,4.736H60.153c-7.537,0-9.473-1.51-13.563-4.953-.437-.367-.99-.84-1.633-1.393l-.02-.357c2.817-.173,3.16-1.066,3.16-2.986,0-2.15,0-2.797-1.613-4.304,0,0-.97-.863-3.337-2.8-2.37-1.936-3.23-1.72-6.46-1.72-1.953,0-4.067-.316-5.43.34l-.103-.196c-2.787-2.444-5.15-4.517-6.307-5.527-3.443-3.013-4.303-4.52-4.303-8.397v-7.75c0-.849.047-1.563.16-2.159.077-.387.18-.727.32-1.02Z"/>
+  <path class="cls-4" d="M38.036,135.042c-2.267-2.677-1.72-5.17,4.463-5.17h3.877v.213l5.157,4.954h-13.497v.003Z"/>
+  <path class="cls-2" d="M11.933,137.405c-4.09,0-4.737,3.66-1.723,6.887,3.013,3.23,6.673,6.677,9.687,9.257,3.013,2.583,4.413,2.476,6.567,2.476h5.703c2.583,0,3.23,5.06.217,5.06s.647,0-5.597,0-7.967-1.293-11.84-4.52c-3.877-3.23-4.09-4.09-8.827-8.396-4.737-4.307-4.09-6.027-4.09-9.257s3.013-7.32,7.533-7.32h3.24c.84,1.193,2.02,1.937,3.327,1.937,2.157,0,3.967-2.024,4.48-4.763l.093.02c-.113.596-.16,1.309-.16,2.159v6.46h-8.61Z"/>
+  <path class="cls-6" d="M56.433,70.123h.503v11.11h-.257l-3.937-5.737,3.69-5.373Z"/>
+  <path class="cls-2" d="M185.468,100.492l-.793-.09c.08-.526.116-1.106.116-1.746v-3.323h.12c3.07-2.097,6.297-1.937,9.367-.16h.63v5.424c0,2.136-.33,4.003-.92,5.61l-.344-.127c-1.59-3.363-4.28-5.473-8.176-5.587Z"/>
+  <path class="cls-4" d="M124.822,140.849h-13.22v-.43l-5.38-5.38h12.553l6.047,5.81Z"/>
+  <path class="cls-4" d="M86.172,129.872v.213l5.073,4.954h-12.42l-5.003-4.954v-.213h12.35Z"/>
+  <path class="cls-2" d="M148.788,114.209c1.777-3.067,1.937-6.297-.163-9.363v-.377h9.15v.377c2.1,3.066,1.937,6.296.163,9.363h-9.15Z"/>
+  <path class="cls-2" d="M148.938,132.052c-1.503-1.337-2.68-2.343-3.326-2.826-.664-.497-1.35-.93-2.067-1.307l.077-.147c1.776-1.613,3.873-1.613,10.009-1.613h39.717c7.426,0,8.233,1.29,13.4,5.166l.17.617c-1.614.567-2.894,1.247-3.894,1.977l-.15-.334c-3.39-2.746-3.553-2.906-8.073-2.906h-37.456c-4.684,0-7.75-.324-7.91,1.13l-.497.243Z"/>
+  <path class="cls-2" d="M141.845,104.469h6.78v.377c2.1,3.066,1.94,6.296.163,9.363h-6.943v-9.74Z"/>
+  <path class="cls-4" d="M127.342,130.085l5.156,4.954h-13.723l-5.156-4.954v-.213h12.19c.513,0,1.026,0,1.533.003v.21Z"/>
+  <path class="cls-4" d="M69.929,140.849h-12.35l-6.047-5.81h12.35l6.047,5.81Z"/>
+  <path class="cls-2" d="M184.911,86.186c3.07-2.1,6.297-1.94,9.367-.163h.63v9.15h-.63c-3.07-1.777-6.297-1.937-9.367.16h-.12v-9.146h.12Z"/>
+  <path class="cls-4" d="M75.086,146.232h-12.35v-.43l-5.157-4.953h12.35l5.157,4.953v.43Z"/>
+  <path class="cls-4" d="M101.269,129.872v.213l4.953,4.954h-14.976l-5.073-4.954v-.213h15.097Z"/>
+  <path class="cls-10" d="M30.69,56.573c-2.977,0-5.41,2.433-5.41,5.41v48.913c0,2.976,2.433,5.413,5.41,5.413h96.702c2.976,0,5.413-2.437,5.413-5.413v-48.913c0-2.977-2.437-5.41-5.413-5.41H30.69Z"/>
+  <path class="cls-8" d="M119.036,84.622c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.545,1.313-.336.336-.801.544-1.312.544h-7.512c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.337-.337.802-.544,1.313-.544h7.512Z"/>
+  <path class="cls-8" d="M119.036,92.931c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.545,1.313-.336.337-.801.544-1.312.544h-7.512c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.337-.337.802-.544,1.313-.544h7.512Z"/>
+  <path class="cls-8" d="M119.036,101.24c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.545,1.312-.336.337-.801.545-1.312.545h-7.512c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.977.544-1.313.337-.337.802-.544,1.313-.544h7.512Z"/>
+  <path class="cls-8" d="M105.326,84.622c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.313-.337.336-.802.544-1.313.544h-7.511c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.337-.337.802-.544,1.313-.544h7.511Z"/>
+  <path class="cls-8" d="M105.326,92.931c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.313-.337.337-.802.544-1.313.544h-7.511c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.337-.337.802-.544,1.313-.544h7.511Z"/>
+  <path class="cls-8" d="M105.326,101.24c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.312-.337.337-.802.545-1.313.545h-7.511c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.977.544-1.313.337-.337.802-.544,1.313-.544h7.511Z"/>
+  <path class="cls-8" d="M63.831,67.609c1.022,0,1.857.839,1.857,1.861,0,.507-.208.972-.544,1.309-.336.337-.802.548-1.313.548h-23.265c-1.022,0-1.857-.839-1.857-1.857,0-.511.208-.976.544-1.313.336-.341.802-.548,1.313-.548h23.265Z"/>
+  <path class="cls-8" d="M63.831,93.367c1.022,0,1.857.839,1.857,1.861,0,.507-.208.972-.544,1.309-.336.337-.802.548-1.313.548h-23.265c-1.022,0-1.857-.839-1.857-1.857,0-.511.208-.976.544-1.313.336-.341.802-.548,1.313-.548h23.265Z"/>
+  <path class="cls-8" d="M55.231,84.622c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.313-.336.336-.802.544-1.313.544h-14.665c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.336-.337.802-.544,1.313-.544h14.665Z"/>
+  <path class="cls-8" d="M55.231,101.24c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.312-.336.337-.802.545-1.313.545h-14.665c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.977.544-1.313.336-.337.802-.544,1.313-.544h14.665Z"/>
+  <path class="cls-12" d="M63.831,71.328h-23.265c-1.022,0-1.857-.839-1.857-1.857,0-.511.208-.976.544-1.313.336-.341.802-.548,1.313-.548h23.265c1.022,0,1.857.839,1.857,1.861,0,.507-.208.972-.544,1.309-.336.337-.802.548-1.313.548Z"/>
+  <path class="cls-12" d="M55.231,88.336h-14.665c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.336-.337.802-.544,1.313-.544h14.665c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.313-.336.336-.802.544-1.313.544Z"/>
+  <path class="cls-12" d="M63.831,97.085h-23.265c-1.022,0-1.857-.839-1.857-1.857,0-.511.208-.976.544-1.313.336-.341.802-.548,1.313-.548h23.265c1.022,0,1.857.839,1.857,1.861,0,.507-.208.972-.544,1.309-.336.337-.802.548-1.313.548Z"/>
+  <path class="cls-12" d="M55.231,104.954h-14.665c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.977.544-1.313.336-.337.802-.544,1.313-.544h14.665c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.312-.336.337-.802.545-1.313.545Z"/>
+  <path class="cls-12" d="M119.036,88.336h-7.512c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.337-.337.802-.544,1.313-.544h7.512c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.545,1.313-.336.336-.801.544-1.312.544Z"/>
+  <path class="cls-12" d="M119.036,104.954h-7.512c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.977.544-1.313.337-.337.802-.544,1.313-.544h7.512c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.545,1.312-.336.337-.801.545-1.312.545Z"/>
+  <path class="cls-12" d="M119.036,96.645h-7.512c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.337-.337.802-.544,1.313-.544h7.512c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.545,1.313-.336.337-.801.544-1.312.544Z"/>
+  <path class="cls-12" d="M105.326,88.336h-7.511c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.337-.337.802-.544,1.313-.544h7.511c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.313-.337.336-.802.544-1.313.544Z"/>
+  <path class="cls-12" d="M105.326,104.954h-7.511c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.977.544-1.313.337-.337.802-.544,1.313-.544h7.511c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.312-.337.337-.802.545-1.313.545Z"/>
+  <path class="cls-12" d="M105.326,96.645h-7.511c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.337-.337.802-.544,1.313-.544h7.511c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.313-.337.337-.802.544-1.313.544Z"/>
+  <path class="cls-12" d="M91.205,87.551h-2.933"/>
+  <path class="cls-12" d="M82.896,87.551h-2.933"/>
+  <path class="cls-12" d="M74.587,87.551h-2.933"/>
+  <path class="cls-12" d="M66.278,87.551h-2.933"/>
+  <path class="cls-12" d="M91.205,96.275h-2.933"/>
+  <path class="cls-12" d="M82.896,96.275h-2.933"/>
+  <path class="cls-12" d="M74.587,96.275h-2.933"/>
+  <path class="cls-12" d="M91.205,104.999h-2.933"/>
+  <path class="cls-12" d="M82.896,104.999h-2.933"/>
+  <path class="cls-12" d="M74.587,104.999h-2.933"/>
+  <path class="cls-12" d="M66.278,104.999h-2.933"/>
+  <path class="cls-12" d="M99.161,67.269h21.437"/>
+  <path class="cls-12" d="M99.161,71.423h21.437"/>
+  <path class="cls-12" d="M39.108,78.199h81.215"/>
+  <path class="cls-5" d="M32.383,161.085c3.013,0,2.367-5.06-.217-5.06h-2.367v-.323c0-1.613.57-2.457,1.457-2.887,1.363-.656,3.477-.34,5.43-.34,3.23,0,4.09-.216,6.46,1.72,2.367,1.937,3.337,2.8,3.337,2.8,1.613,1.507,1.613,2.154,1.613,4.304,0,1.919-.343,2.813-3.16,2.986-.343.02-.723.03-1.143.03h-6.673c-2.153,0-4.737-3.23-4.737-3.23Z"/>
+  <path class="cls-4" d="M129.978,146.232h-54.892v-.43l-5.157-4.953h54.893l5.156,4.953v.43Z"/>
+  <path class="cls-4" d="M138.545,140.849h-13.723l-6.047-5.81h13.723l6.047,5.81Z"/>
+  <path class="cls-4" d="M84.476,140.849h-14.547l-6.047-5.81h14.943l5.65,5.596v.214Z"/>
+  <path class="cls-4" d="M44.223,140.849h13.357l5.157,4.953v.43h-5.597c-5.167,0-8.18-.863-10.98-3.447-.727-.67-1.387-1.273-2.017-1.85l.08-.086Z"/>
+  <path class="cls-4" d="M38.41,135.039h13.123l6.047,5.81h-13.357l-.08.086c-1.803-1.656-3.363-3.1-5.517-5.253-.213-.213-.41-.427-.59-.64h.373v-.003Z"/>
+  <path class="cls-8" d="M199.971,139.239h.32c3.94-2.777,9.73-1.987,13.547,1.17.406.336.79.7,1.146,1.086,3.714,4.037,7.104,10.494,6.617,18.244l-.02.11c-3.87-.75-5.78-2.6-8.697-5.277,0,0-6.62-5.973-9.85-9.203-2.733-2.734-3.046-3.197-3.063-6.13Z"/>
+  <path class="cls-4" d="M73.822,129.872v.213l5.003,4.954h-14.943l-5.157-4.954v-.213h15.097Z"/>
+  <path class="cls-2" d="M182.418,103.832c1.313-.63,2.003-1.746,2.257-3.43l.793.09c3.897.114,6.587,2.224,8.177,5.587l.343.127c-1.453,3.963-4.5,6.36-8.14,7.396l-.097-.356c.964-3.41.324-6.58-2.47-9.034l-.863-.38Z"/>
+  <path class="cls-4" d="M113.619,129.872v.213l5.156,4.954h-12.553l-4.953-4.954v-.213h12.35Z"/>
+  <path class="cls-4" d="M151.641,141.925c3.457,3.864,1.29,4.307-4.736,4.307h-3.203v-.43l-5.157-4.953h11.803l.173-.16c.357.39.73.8,1.12,1.236Z"/>
+  <path class="cls-9" d="M271.49,164.258l-.08,6.504c-.213,1.22-1.38,2.163-3.956,2.163h-53.28c-6.616,0-9.04.967-14.69-3.713-5.653-4.684-17.276-15.5-21.473-19.537-.913-.876-1.473-1.71-1.75-2.48l-.186-.696v-6.5c.11.973.7,2.086,1.936,3.273,4.197,4.037,15.82,14.853,21.473,19.533,5.65,4.683,8.074,3.713,14.69,3.713h53.28c2.65,0,3.806-.996,3.97-2.27l.066.01Z"/>
+  <path class="cls-13" d="M231.411,136.085h4.076c6.297,0,7.427.084,11.624,3.31,4.2,3.23,18.969,17.517,22.766,21.314,1.063,1.063,1.697,2.41,1.547,3.539-.164,1.274-1.32,2.27-3.97,2.27h-53.28c-6.616,0-9.04.97-14.69-3.713-5.653-4.68-17.276-15.496-21.473-19.533-1.236-1.187-1.826-2.3-1.936-3.273-.267-2.344,2.25-3.914,5.326-3.914h19.503"/>
+  <path class="cls-13" d="M176.261,147.195c.277.77.837,1.604,1.75,2.48,4.197,4.037,15.82,14.853,21.473,19.537,5.65,4.68,8.074,3.713,14.69,3.713h53.28c2.576,0,3.743-.943,3.956-2.163l.08-6.504"/>
+  <path class="cls-13" d="M176.075,139.395v7.104"/>
+  <path class="cls-13" d="M93.059,56.573h34.333c2.976,0,5.413,2.433,5.413,5.41v48.913c0,2.976-2.437,5.413-5.413,5.413H30.69c-2.977,0-5.41-2.437-5.41-5.413v-48.913c0-2.977,2.433-5.41,5.41-5.41h62.369Z"/>
+  <path class="cls-13" d="M92.902,48.5h40.59c1.58,0,3.06.443,4.323,1.213,2.413,1.47,4.03,4.127,4.03,7.14v60.466c0,4.597-3.757,8.353-8.353,8.353H25.236c-.507,0-1.007-.046-1.487-.136-1.01-.18-1.953-.547-2.803-1.057"/>
+  <path class="cls-13" d="M19.576,123.449c-1.653-1.527-2.693-3.713-2.693-6.13v-60.466c0-4.593,3.76-8.353,8.353-8.353h67.764"/>
+  <path class="cls-13" d="M20.923,124.466c-.067-.04-.13-.08-.193-.124h-.003c-.153-.1-.303-.203-.447-.31-.24-.18-.473-.37-.693-.576"/>
+  <path class="cls-13" d="M122.732,42.096c2.13,0,4.13.59,5.843,1.61.004,0,.004.003.007.003"/>
+  <path class="cls-13" d="M138.635,49.9l-.677-.417-9.386-5.773"/>
+  <path class="cls-13" d="M58.842,42.096H17.826c-6.307,0-11.463,5.157-11.463,11.463v54.246c0,3.873,1.943,7.31,4.907,9.39l4.55,3.423,3.757,2.83.01.007,1.193.9s.003.003.007.003l.137.107.023.013.423.32"/>
+  <path class="cls-13" d="M122.732,42.096H58.5"/>
+  <path class="cls-13" d="M44.956,164.642c.643.553,1.197,1.026,1.633,1.393,4.09,3.443,6.027,4.953,13.563,4.953h107.418c5.597,0,6.887-1.293,6.887-4.736v-6.03c0-2.117-.37-3.587-1.477-5.2-.58-.843-1.36-1.727-2.396-2.763-2.447-2.45-15.13-14.417-21.647-20.207-1.503-1.336-2.68-2.343-3.326-2.826-.664-.497-1.35-.93-2.067-1.307-3-1.577-6.503-2.137-10.846-2.137H28.076c-2.06,0-3.583.07-4.693.324-.973.226-1.633.593-2.07,1.18h-.003c-.107.143-.203.303-.287.48-.14.293-.243.633-.32,1.02-.113.596-.16,1.31-.16,2.16v7.749c0,3.877.86,5.384,4.303,8.397,1.157,1.01,3.52,3.083,6.307,5.527"/>
+  <path class="cls-13" d="M21.403,127.932s24.11,22.173,28.416,26.05c4.303,3.873,5.813,4.733,10.333,4.733h109.139c4.307,0,3.447-3.443,3.447-3.443"/>
+  <path class="cls-13" d="M95.672,158.715s-3.017-2.15-5.813-4.303c-2.8-2.153-2.583-4.52,1.29-4.52h21.743c4.52,0,6.853,1.33,9.04,3.227,3.23,2.8,5.6,5.166,5.6,5.166"/>
+  <path class="cls-13" d="M143.702,146.232h3.203c6.027,0,8.193-.443,4.737-4.307-.39-.436-.764-.846-1.12-1.236-2.257-2.45-3.98-4.084-6.077-5.8-.703-.574-1.453-1.16-2.277-1.79-3.883-2.97-9.16-3.207-14.826-3.224-.507-.003-1.02-.003-1.533-.003H42.499c-6.183,0-6.73,2.493-4.463,5.17.18.213.377.427.59.64,2.153,2.153,3.713,3.597,5.517,5.253.63.577,1.29,1.18,2.017,1.85,2.8,2.584,5.813,3.447,10.98,3.447h86.563Z"/>
+  <path class="cls-13" d="M38.409,135.039h105.913"/>
+  <path class="cls-13" d="M44.223,140.849h106.125"/>
+  <path class="cls-13" d="M46.376,130.086l5.157,4.953,6.047,5.81,5.157,4.953"/>
+  <path class="cls-13" d="M58.726,130.086l5.157,4.953,6.047,5.81,5.157,4.953"/>
+  <path class="cls-13" d="M73.822,130.086l5.003,4.953,5.65,5.596"/>
+  <path class="cls-13" d="M86.172,130.086l5.073,4.953,5.287,5.163"/>
+  <path class="cls-13" d="M101.269,130.086l4.953,4.953,5.38,5.38"/>
+  <path class="cls-13" d="M113.619,130.086l5.156,4.953,6.047,5.81,5.156,4.953"/>
+  <path class="cls-13" d="M127.342,130.086l5.156,4.953,6.047,5.81,5.157,4.953"/>
+  <path class="cls-13" d="M20.28,124.032c.103.324.203.757.283,1.22.117.664.193,1.39.193,1.927,0,.127-.003.253-.01.377-.017.416-.063.82-.137,1.21-.513,2.739-2.323,4.763-4.48,4.763-1.307,0-2.487-.744-3.327-1.937-.807-1.143-1.303-2.696-1.303-4.413,0-3.277,1.81-5.973,4.133-6.313"/>
+  <path class="cls-13" d="M16.13,133.529h3.767"/>
+  <path class="cls-13" d="M12.576,131.592h-3.013c-4.52,0-7.533,4.09-7.533,7.32s-.647,4.95,4.09,9.257c4.737,4.306,4.95,5.166,8.827,8.396,3.873,3.227,5.597,4.52,11.84,4.52s2.583,0,5.597,0,2.367-5.06-.217-5.06h-5.703c-2.153,0-3.553.107-6.567-2.476-3.013-2.58-6.673-6.027-9.687-9.257-3.013-3.227-2.367-6.887,1.723-6.887h8.393"/>
+  <path class="cls-13" d="M12.816,131.592h-.013"/>
+  <path class="cls-13" d="M12.803,131.592h-.227"/>
+  <path class="cls-13" d="M29.8,155.702c0-1.613.57-2.457,1.457-2.887,1.363-.656,3.477-.34,5.43-.34,3.23,0,4.09-.216,6.46,1.72,2.367,1.937,3.337,2.8,3.337,2.8,1.613,1.507,1.613,2.154,1.613,4.304,0,1.919-.343,2.813-3.16,2.986-.343.02-.723.03-1.143.03h-6.673c-2.153,0-4.737-3.23-4.737-3.23"/>
+  <path class="cls-13" d="M141.952,104.469h36.813c1.553,0,2.75-.203,3.653-.637,1.313-.63,2.003-1.746,2.257-3.43.08-.526.116-1.106.116-1.746v-20.663"/>
+  <path class="cls-13" d="M141.845,114.209h39.503c1.55,0,3.073-.197,4.5-.607,3.64-1.036,6.686-3.433,8.14-7.396.59-1.607.92-3.474.92-5.61v-22.39"/>
+  <path class="cls-13" d="M226.611,22.197c1.53,1.147,2.527,2.973,2.527,5.023v44.283c0,3.45-2.824,6.273-6.277,6.273h-62.579c-1.51,0-2.9-.54-3.984-1.437-1.396-1.153-2.29-2.897-2.29-4.837V27.22c0-3.45,2.824-6.273,6.274-6.273h62.579c1.403,0,2.703.467,3.75,1.25Z"/>
+  <path class="cls-13" d="M156.162,76.509l-6.87-5.19c-1.87-1.583-3.06-3.943-3.06-6.57V23.61c0-4.737,3.873-8.61,8.61-8.61h59.799c2.247,0,3.847.887,5.833,2.29l6.244,4.767,1.083.827"/>
+  <path class="cls-13" d="M221.627,67.693c0,1.683-1.373,3.06-3.056,3.06h-53.46c-1.68,0-3.056-1.377-3.056-3.06V31.19c0-1.683,1.376-3.06,3.056-3.06h53.46c1.683,0,3.056,1.377,3.056,3.06v36.503Z"/>
+  <path class="cls-13" d="M148.625,104.846c2.1,3.066,1.94,6.296.163,9.363"/>
+  <path class="cls-13" d="M157.775,104.846c2.1,3.066,1.937,6.296.163,9.363"/>
+  <path class="cls-13" d="M166.925,104.846c2.1,3.066,1.936,6.296.16,9.363"/>
+  <path class="cls-13" d="M176.075,104.846c2.096,3.066,1.936,6.296.16,9.363"/>
+  <path class="cls-13" d="M183.281,104.212c2.794,2.454,3.434,5.624,2.47,9.034"/>
+  <path class="cls-13" d="M185.468,100.492c3.897.114,6.587,2.224,8.177,5.587"/>
+  <path class="cls-13" d="M184.911,95.332c3.07-2.097,6.297-1.937,9.367-.16"/>
+  <path class="cls-13" d="M184.911,86.186c3.07-2.1,6.297-1.94,9.367-.163"/>
+  <path class="cls-13" d="M211.348,130.852c-1.7.274-3.167.647-4.43,1.09-1.614.567-2.894,1.247-3.894,1.977-.943.693-1.636,1.433-2.12,2.166-.663.997-.936,1.984-.936,2.827,0,.113,0,.22.003.327.017,2.933.33,3.396,3.063,6.13,3.23,3.23,9.85,9.203,9.85,9.203,2.917,2.677,4.827,4.527,8.697,5.277,1.27.246,2.75.373,4.543.373h11.947c3.713,0,6.456-1.937,5.003-6.457-.77-2.4-3.727-8.85-8.453-14.373"/>
+  <path class="cls-13" d="M234.617,139.392c-.993-1.16-2.063-2.277-3.206-3.307-3.677-3.313-8.117-5.73-13.2-5.73-2.62,0-4.89.18-6.857.497"/>
+  <path class="cls-13" d="M200.291,139.235c3.94-2.773,9.73-1.983,13.547,1.174.406.336.79.7,1.146,1.086,3.714,4.037,7.103,10.494,6.617,18.244"/>
+  <path class="cls-13" d="M214.014,140.202s3.354-.817,9.704-1.04c2.983-.103,6.63-.077,10.9.23h.003c.02,0,.04.003.06.003"/>
+  <path class="cls-13" d="M211.271,130.839s.027,0,.077.013c0,0,0,.003.006,0,.667.133,5.207,1.143,9.777,5.233.863.774,1.73,1.657,2.57,2.667"/>
+  <path class="cls-13" d="M143.622,127.772c1.776-1.613,3.873-1.613,10.009-1.613h39.717c7.426,0,8.233,1.29,13.4,5.166"/>
+  <path class="cls-13" d="M202.875,133.585c-3.39-2.746-3.554-2.906-8.074-2.906h-37.456c-4.683,0-7.75-.323-7.91,1.13"/>
+  <path class="cls-11" d="M191.418,52.631l.332.295.332-.295,5.497-4.886c.825-.734.9-1.998.166-2.824-.734-.826-1.998-.9-2.824-.166l-1.171,1.041v-5.046c0-1.105-.895-2-2-2s-2,.895-2,2v5.046l-1.171-1.041c-.826-.734-2.09-.66-2.824.166-.734.826-.659,2.09.166,2.824l5.497,4.886ZM187.25,53.757c0-1.105-.895-2-2-2s-2,.895-2,2v4c0,1.104.895,2,2,2h13c1.105,0,2-.896,2-2v-4c0-1.105-.895-2-2-2s-2,.895-2,2v2h-9v-2Z"/>
+</svg>
\ No newline at end of file
diff --git a/assets/images/integrationicons/sage-intacct-icon-square.svg b/assets/images/integrationicons/sage-intacct-icon-square.svg
new file mode 100644
index 000000000000..33d86259a2d1
--- /dev/null
+++ b/assets/images/integrationicons/sage-intacct-icon-square.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 40 40">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #000;
+      }
+
+      .cls-1, .cls-2 {
+        stroke-width: 0px;
+      }
+
+      .cls-2 {
+        fill: #00d639;
+      }
+    </style>
+  </defs>
+  <rect class="cls-1" width="40" height="40"/>
+  <path class="cls-2" d="M9.094,12.5c1.752,0,3.176,1.212,3.209,2.898.016.475-.327.737-.704.737-.36,0-.671-.262-.688-.704-.016-.95-.819-1.654-1.834-1.654-.95,0-1.67.671-1.67,1.588,0,.999.671,1.441,2.063,1.948,1.49.54,2.849,1.179,2.849,3.078,0,1.654-1.294,2.98-3.094,2.98-1.768,0-3.225-1.244-3.225-2.931,0-1.048.508-1.785.999-1.785.426,0,.688.278.688.655,0,.327-.278.475-.278,1.064,0,1.048.851,1.719,1.817,1.719,1.015,0,1.686-.704,1.686-1.555,0-1.048-.671-1.49-2.063-1.981-1.555-.556-2.849-1.228-2.849-3.077,0-1.67,1.342-2.98,3.094-2.98Z"/>
+  <path class="cls-2" d="M16.239,23.371c-1.768,0-3.241-1.424-3.241-3.225,0-1.866,1.49-3.258,3.291-3.258,1.932,0,3.291,1.441,3.291,3.406v2.39c0,.409-.327.688-.704.688-.393,0-.72-.278-.72-.688v-2.341c0-1.294-.737-2.178-1.899-2.178-1.031,0-1.85.868-1.85,1.981,0,1.031.802,1.915,1.818,1.915.377,0,.54-.098.77-.098.311,0,.638.262.638.638,0,.507-.606.77-1.392.77Z"/>
+  <path class="cls-2" d="M23.613,28.25c-1.834,0-3.356-1.31-3.356-3.013,0-.573.327-.835.704-.835s.688.246.704.72c.016,1.064.868,1.85,1.932,1.85,1.13,0,1.866-.72,1.866-1.654,0-1.064-.818-1.506-2.21-1.948-1.621-.524-2.996-1.244-2.996-3.242,0-1.834,1.408-3.242,3.242-3.242,1.85,0,3.373,1.342,3.373,3.111,0,1.081-.442,1.916-1.048,1.916-.409,0-.688-.295-.688-.655,0-.377.327-.54.327-1.212,0-1.13-.884-1.883-1.948-1.883-1.031,0-1.85.786-1.85,1.817,0,1.162.835,1.654,2.21,2.112,1.588.524,2.996,1.179,2.996,3.094,0,1.719-1.359,3.061-3.258,3.061Z"/>
+  <path class="cls-2" d="M30.889,23.371c-1.834,0-3.34-1.441-3.34-3.241s1.457-3.242,3.258-3.242c1.818,0,3.193,1.261,3.193,2.865,0,.622-.442.999-1.162.999h-1.883c-.377,0-.655-.262-.655-.606,0-.327.278-.59.655-.59h1.408c.131,0,.229-.066.229-.196,0-.475-.606-1.212-1.736-1.212-1.048,0-1.899.9-1.899,1.981,0,1.097.868,1.965,1.948,1.965,1.244,0,1.654-.737,2.161-.737.426,0,.655.278.655.59,0,.295-.196.557-.688.868-.492.311-1.228.556-2.145.556Z"/>
+</svg>
\ No newline at end of file
diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts
index c3e50cff3178..b27cfbc7e091 100644
--- a/src/components/Icon/Expensicons.ts
+++ b/src/components/Icon/Expensicons.ts
@@ -99,6 +99,7 @@ import ImageCropSquareMask from '@assets/images/image-crop-square-mask.svg';
 import Inbox from '@assets/images/inbox.svg';
 import Info from '@assets/images/info.svg';
 import QBOSquare from '@assets/images/integrationicons/qbo-icon-square.svg';
+import SageIntacctSquare from '@assets/images/integrationicons/sage-intacct-icon-square.svg';
 import XeroSquare from '@assets/images/integrationicons/xero-icon-square.svg';
 import InvoiceGeneric from '@assets/images/invoice-generic.svg';
 import Invoice from '@assets/images/invoice.svg';
@@ -348,6 +349,7 @@ export {
     Workflows,
     Workspace,
     XeroSquare,
+    SageIntacctSquare as IntacctSquare,
     Zoom,
     Twitter,
     Youtube,
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 628732f741a9..22a9ecb83825 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2175,7 +2175,7 @@ export default {
         intacct: {
             sageIntacctSetup: 'Sage Intacct setup',
             prerequisitesTitle: 'Before you connect...',
-            downloadExpensifyPackage: 'Download the Expensify package for Sage Intacct',
+            downloadExpensifyPackage: 'Download the Expensify package for Sage Intacct',
             followSteps: 'Follow the steps in our How-to: Connect to Sage Intacct instructions',
         },
         type: {
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index bd7aa5cb4c1a..179ff1c525de 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -6,6 +6,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 import CollapsibleSection from '@components/CollapsibleSection';
 import ConfirmModal from '@components/ConfirmModal';
 import ConnectToQuickbooksOnlineButton from '@components/ConnectToQuickbooksOnlineButton';
+import ConnectToSageIntacctButton from '@components/ConnectToSageIntacctButton';
 import ConnectToXeroButton from '@components/ConnectToXeroButton';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
@@ -100,6 +101,21 @@ function accountingIntegrationData(
                 onExportPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_EXPORT.getRoute(policyID)),
                 onAdvancedPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_ADVANCED.getRoute(policyID)),
             };
+        case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT:
+            return {
+                title: translate('workspace.accounting.intacct'),
+                icon: Expensicons.IntacctSquare,
+                setupConnectionButton: (
+                    <ConnectToSageIntacctButton
+                        policyID={policyID}
+                        shouldDisconnectIntegrationBeforeConnecting={isConnectedToIntegration}
+                        integrationToDisconnect={integrationToDisconnect}
+                    />
+                ),
+                onImportPagePress: () => {},
+                onExportPagePress: () => {},
+                onAdvancedPagePress: () => {},
+            };
         default:
             return undefined;
     }
diff --git a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
index 90737e5a9863..f018d879efff 100644
--- a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
@@ -2,21 +2,21 @@ import React, {useMemo, useRef} from 'react';
 import {View} from 'react-native';
 // eslint-disable-next-line no-restricted-imports
 import type {GestureResponderEvent, Text as RNText} from 'react-native';
+import Computer from '@assets/images/computer.svg';
 import Button from '@components/Button';
 import FixedFooter from '@components/FixedFooter';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
-import LottieAnimations from '@components/LottieAnimations';
+import ImageSVG from '@components/ImageSVG';
 import MenuItemList from '@components/MenuItemList';
 import ScreenWrapper from '@components/ScreenWrapper';
-import Section from '@components/Section';
+import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ReportActionContextMenu from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import * as Link from '@userActions/Link';
 import CONST from '@src/CONST';
-import ROUTES from '@src/ROUTES';
 
 function IntacctPrerequisitesPage() {
     const {translate} = useLocalize();
@@ -26,26 +26,32 @@ function IntacctPrerequisitesPage() {
     const menuItems = useMemo(
         () => [
             {
-                translationKey: 'workspace.intacct.downloadExpensifyPackage',
+                title: translate('workspace.intacct.downloadExpensifyPackage'),
+                key: 'workspace.intacct.downloadExpensifyPackage',
                 icon: Expensicons.Download,
                 iconRight: Expensicons.NewWindow,
+                shouldShowRightIcon: true,
                 action: () => {
                     Link.openExternalLink(CONST.EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT);
                     return Promise.resolve();
                 },
                 onSecondaryInteraction: (event: GestureResponderEvent | MouseEvent) =>
                     ReportActionContextMenu.showContextMenu(CONST.CONTEXT_MENU_TYPES.LINK, event, CONST.EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT, popoverAnchor.current),
+                numberOfLinesTitle: 2,
             },
             {
-                translationKey: 'workspace.intacct.followSteps',
-                icon: Expensicons.Download,
+                title: translate('workspace.intacct.followSteps'),
+                key: 'workspace.intacct.followSteps',
+                icon: Expensicons.Task,
                 iconRight: Expensicons.NewWindow,
+                shouldShowRightIcon: true,
                 action: () => {
                     Link.openExternalLink(CONST.HOW_TO_CONNECT_TO_SAGE_INTACCT);
                     return Promise.resolve();
                 },
                 onSecondaryInteraction: (event: GestureResponderEvent | MouseEvent) =>
                     ReportActionContextMenu.showContextMenu(CONST.CONTEXT_MENU_TYPES.LINK, event, CONST.HOW_TO_CONNECT_TO_SAGE_INTACCT, popoverAnchor.current),
+                numberOfLinesTitle: 3,
             },
         ],
         [],
@@ -60,21 +66,18 @@ function IntacctPrerequisitesPage() {
             <HeaderWithBackButton
                 title={translate('workspace.intacct.sageIntacctSetup')}
                 shouldShowBackButton
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
+                onBackButtonPress={() => Navigation.goBack()}
             />
             <View style={[styles.flex1]}>
-                <Section
-                    title={translate('workspace.intacct.prerequisitesTitle')}
-                    illustration={LottieAnimations.Coin}
-                    titleStyles={styles.accountSettingsSectionTitle}
-                >
-                    <View style={[styles.flex1, styles.mt5]}>
-                        <MenuItemList
-                            menuItems={menuItems}
-                            shouldUseSingleExecution
-                        />
-                    </View>
-                </Section>
+                <View style={{width: 'auto', height: 188}}>
+                    <ImageSVG src={Computer} />
+                </View>
+
+                <Text style={[styles.textHeadlineH1, styles.p5, styles.pb6]}>{translate('workspace.intacct.prerequisitesTitle')}</Text>
+                <MenuItemList
+                    menuItems={menuItems}
+                    shouldUseSingleExecution
+                />
 
                 <FixedFooter style={[styles.mtAuto]}>
                     <Button
diff --git a/src/styles/utils/spacing.ts b/src/styles/utils/spacing.ts
index c963594684cb..812e2362e0b2 100644
--- a/src/styles/utils/spacing.ts
+++ b/src/styles/utils/spacing.ts
@@ -369,6 +369,10 @@ export default {
         padding: 20,
     },
 
+    pb6: {
+        padding: 24,
+    },
+
     p8: {
         padding: 32,
     },

From f17c09fd5984d081b996be9252c06874b45b9f0a Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Thu, 13 Jun 2024 17:04:12 +0200
Subject: [PATCH 04/33] add EnterSageIntacctCredentialsPage screen

---
 src/ONYXKEYS.ts                               |   2 +
 src/ROUTES.ts                                 |   4 +
 src/SCREENS.ts                                |   1 +
 src/languages/en.ts                           |   3 +
 .../ModalStackNavigators/index.tsx            |   2 +
 .../FULL_SCREEN_TO_RHP_MAPPING.ts             |   1 +
 src/libs/Navigation/linkingConfig/config.ts   |   1 +
 src/libs/Navigation/types.ts                  |   3 +
 .../EnterSageIntacctCredentialsPage.tsx       | 115 ++++++++++++++++++
 .../intacct/IntacctPrerequisitesPage.tsx      |  11 +-
 src/types/form/SageIntactCredentialsForm.ts   |  22 ++++
 src/types/form/index.ts                       |   1 +
 12 files changed, 164 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
 create mode 100644 src/types/form/SageIntactCredentialsForm.ts

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 0d22d3714fe6..276f283aa43c 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -486,6 +486,7 @@ const ONYXKEYS = {
         NEW_CHAT_NAME_FORM_DRAFT: 'newChatNameFormDraft',
         SUBSCRIPTION_SIZE_FORM: 'subscriptionSizeForm',
         SUBSCRIPTION_SIZE_FORM_DRAFT: 'subscriptionSizeFormDraft',
+        SAGE_INTACCT_CREDENTIALS_FORM: 'sageIntacctCredentialsForm',
     },
 } as const;
 
@@ -545,6 +546,7 @@ type OnyxFormValuesMapping = {
     [ONYXKEYS.FORMS.WORKSPACE_TAX_VALUE_FORM]: FormTypes.WorkspaceTaxValueForm;
     [ONYXKEYS.FORMS.NEW_CHAT_NAME_FORM]: FormTypes.NewChatNameForm;
     [ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM]: FormTypes.SubscriptionSizeForm;
+    [ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM]: FormTypes.SageIntactCredentialsForm;
 };
 
 type OnyxFormDraftValuesMapping = {
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index f4e0339312e6..6c317ee12070 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -914,6 +914,10 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/accounting/sage-intacct/prerequisites',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/prerequisites` as const,
     },
+    POLICY_ACCOUNTING_ENTER_SAGE_INTACCT_CREDENTIALS: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/enter-credentials',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/enter-credentials` as const,
+    },
 } as const;
 
 /**
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 832273ec2067..5b6cd51f5eee 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -269,6 +269,7 @@ const SCREENS = {
             XERO_BILL_PAYMENT_ACCOUNT_SELECTOR: 'Policy_Accounting_Xero_Bill_Payment_Account_Selector',
             XERO_EXPORT_BANK_ACCOUNT_SELECT: 'Policy_Accounting_Xero_Export_Bank_Account_Select',
             SAGE_INTACCT_PREREQUISITES: 'Policy_Accounting_Sage_Intacct_Prerequisites',
+            ENTER_SAGE_INTACCT_CREDENTIALS: 'Policy_Enter_Sage_Intacct_Credentials',
         },
         INITIAL: 'Workspace_Initial',
         PROFILE: 'Workspace_Profile',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 22a9ecb83825..31889639c3dd 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -340,6 +340,8 @@ export default {
         shared: 'Shared',
         drafts: 'Drafts',
         finished: 'Finished',
+        companyID: 'Company ID',
+        userID: 'User ID',
     },
     location: {
         useCurrent: 'Use current location',
@@ -2177,6 +2179,7 @@ export default {
             prerequisitesTitle: 'Before you connect...',
             downloadExpensifyPackage: 'Download the Expensify package for Sage Intacct',
             followSteps: 'Follow the steps in our How-to: Connect to Sage Intacct instructions',
+            enterCredentials: 'Enter your Sage Intacct credentials',
         },
         type: {
             free: 'Free',
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index f2251fb4f8c8..74cb2686637d 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -323,6 +323,8 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_PAYMENT_ACCOUNT_SELECTOR]: () =>
         require('../../../../pages/workspace/accounting/xero/advanced/XeroBillPaymentAccountSelectorPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: () => require('../../../../pages/workspace/accounting/intacct/IntacctPrerequisitesPage').default as React.ComponentType,
+    [SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: () =>
+        require('../../../../pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_FREQUENCY]: () => require('../../../../pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_MONTHLY_OFFSET]: () =>
         require('../../../../pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage').default as React.ComponentType,
diff --git a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
index c3144391db88..cd632970b200 100755
--- a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
@@ -55,6 +55,7 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial<Record<FullScreenName, string[]>> = {
         SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_PAYMENT_ACCOUNT_SELECTOR,
         SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_BANK_ACCOUNT_SELECT,
         SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES,
+        SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS,
     ],
     [SCREENS.WORKSPACE.TAXES]: [
         SCREENS.WORKSPACE.TAXES_SETTINGS,
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index baa8ef2129ef..7744a6a2df22 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -349,6 +349,7 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_PREFERRED_EXPORTER_SELECT]: {path: ROUTES.POLICY_ACCOUNTING_XERO_PREFERRED_EXPORTER_SELECT.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_PAYMENT_ACCOUNT_SELECTOR]: {path: ROUTES.POLICY_ACCOUNTING_XERO_BILL_PAYMENT_ACCOUNT_SELECTOR.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: {path: ROUTES.POLICY_ACCOUNTING_ENTER_SAGE_INTACCT_CREDENTIALS.route},
                         [SCREENS.WORKSPACE.DESCRIPTION]: {
                             path: ROUTES.WORKSPACE_PROFILE_DESCRIPTION.route,
                         },
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index a0ff8e76d444..1fd8609eee92 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -384,6 +384,9 @@ type SettingsNavigatorParamList = {
     [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: {
         policyID: string;
     };
+    [SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: {
+        policyID: string;
+    };
     [SCREENS.GET_ASSISTANCE]: {
         backTo: Routes;
     };
diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
new file mode 100644
index 000000000000..c0f45fdda59f
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -0,0 +1,115 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import TextInput from '@components/TextInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/SageIntactCredentialsForm';
+
+type IntacctPrerequisitesPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES>;
+
+function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const policyID = route.params.policyID; // this will be used for connecting to Sage Intacct
+
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const updateDisplayName = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM>) => {
+        // here we call ConnectToSageIntacct API command
+        Navigation.goBack();
+    }, []);
+
+    const validate = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM>) => {
+        const errors: FormInputErrors<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM> = {};
+
+        if (!values.companyID) {
+            ErrorUtils.addErrorMessage(errors, 'companyID', 'personalDetails.error.hasInvalidCharacter'); // dodać nazwy
+        }
+
+        if (!values.userID) {
+            ErrorUtils.addErrorMessage(errors, 'userID', 'personalDetails.error.hasInvalidCharacter'); // dodać nazwy
+        }
+
+        if (!values.password) {
+            ErrorUtils.addErrorMessage(errors, 'password', 'personalDetails.error.hasInvalidCharacter'); // dodać nazwy
+        }
+        return errors;
+    }, []);
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+            testID={EnterSageIntacctCredentialsPage.displayName}
+        >
+            <HeaderWithBackButton
+                title={translate('workspace.intacct.sageIntacctSetup')}
+                onBackButtonPress={() => Navigation.goBack()}
+            />
+            <FormProvider
+                style={[styles.flexGrow1, styles.ph5]}
+                formID={ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM}
+                validate={validate}
+                onSubmit={updateDisplayName}
+                submitButtonText={translate('common.confirm')}
+                enabledWhenOffline
+                shouldValidateOnBlur
+                shouldValidateOnChange
+            >
+                <Text style={[styles.textHeadlineH1, styles.pb5, styles.pt3]}>{translate('workspace.intacct.enterCredentials')}</Text>
+                <View style={styles.mb4}>
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        inputID={INPUT_IDS.COMPANY_ID}
+                        name="companyID"
+                        label={translate('common.companyID')}
+                        aria-label={translate('common.companyID')}
+                        role={CONST.ROLE.PRESENTATION}
+                        defaultValue=""
+                        spellCheck={false}
+                    />
+                </View>
+                <View style={styles.mb4}>
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        inputID={INPUT_IDS.USER_ID}
+                        name="userID"
+                        label={translate('common.userID')}
+                        aria-label={translate('common.userID')}
+                        role={CONST.ROLE.PRESENTATION}
+                        defaultValue=""
+                        spellCheck={false}
+                    />
+                </View>
+                <View style={styles.mb4}>
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        inputID={INPUT_IDS.PASSWORD}
+                        name="password"
+                        label={translate('common.password')}
+                        aria-label={translate('common.password')}
+                        role={CONST.ROLE.PRESENTATION}
+                        defaultValue=""
+                        spellCheck={false}
+                    />
+                </View>
+            </FormProvider>
+        </ScreenWrapper>
+    );
+}
+
+EnterSageIntacctCredentialsPage.displayName = 'EnterSageIntacctCredentialsPage';
+
+export default EnterSageIntacctCredentialsPage;
diff --git a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
index f018d879efff..59284f435050 100644
--- a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
@@ -1,3 +1,4 @@
+import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useMemo, useRef} from 'react';
 import {View} from 'react-native';
 // eslint-disable-next-line no-restricted-imports
@@ -14,14 +15,20 @@ import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import * as ReportActionContextMenu from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import * as Link from '@userActions/Link';
 import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
 
-function IntacctPrerequisitesPage() {
+type IntacctPrerequisitesPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES>;
+
+function IntacctPrerequisitesPage({route}: IntacctPrerequisitesPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const popoverAnchor = useRef<View | RNText | null>(null);
+    const policyID = route.params.policyID;
 
     const menuItems = useMemo(
         () => [
@@ -83,7 +90,7 @@ function IntacctPrerequisitesPage() {
                     <Button
                         success
                         text={translate('common.next')}
-                        onPress={() => {}}
+                        onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_ENTER_SAGE_INTACCT_CREDENTIALS.getRoute(policyID))}
                         pressOnEnter
                         large
                     />
diff --git a/src/types/form/SageIntactCredentialsForm.ts b/src/types/form/SageIntactCredentialsForm.ts
new file mode 100644
index 000000000000..b70a28fbda8c
--- /dev/null
+++ b/src/types/form/SageIntactCredentialsForm.ts
@@ -0,0 +1,22 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    COMPANY_ID: 'companyID',
+    USER_ID: 'userID',
+    PASSWORD: 'password',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type SageIntactCredentialsForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.COMPANY_ID]: string;
+        [INPUT_IDS.USER_ID]: string;
+        [INPUT_IDS.PASSWORD]: string;
+    }
+>;
+
+export type {SageIntactCredentialsForm};
+export default INPUT_IDS;
diff --git a/src/types/form/index.ts b/src/types/form/index.ts
index d56ab69d6a4e..33485a4b0580 100644
--- a/src/types/form/index.ts
+++ b/src/types/form/index.ts
@@ -52,4 +52,5 @@ export type {WalletAdditionalDetailsForm} from './WalletAdditionalDetailsForm';
 export type {NewChatNameForm} from './NewChatNameForm';
 export type {WorkForm} from './WorkForm';
 export type {SubscriptionSizeForm} from './SubscriptionSizeForm';
+export type {SageIntactCredentialsForm} from './SageIntactCredentialsForm';
 export type {default as Form} from './Form';

From 78e810d9ea2149e941705d713d72c768bd5decf6 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Mon, 17 Jun 2024 11:45:06 +0200
Subject: [PATCH 05/33] add ExistingConnectionsPage

---
 src/ROUTES.ts                                 |  4 +
 src/SCREENS.ts                                |  1 +
 .../ConnectToSageIntacctButton/index.tsx      | 88 +++++++++++++++++--
 src/languages/en.ts                           |  3 +
 .../ModalStackNavigators/index.tsx            |  1 +
 .../FULL_SCREEN_TO_RHP_MAPPING.ts             |  1 +
 src/libs/Navigation/linkingConfig/config.ts   |  1 +
 src/libs/Navigation/types.ts                  |  3 +
 src/libs/PolicyUtils.ts                       |  5 ++
 .../accounting/PolicyAccountingPage.tsx       |  3 +-
 .../intacct/ExistingConnectionsPage.tsx       | 65 ++++++++++++++
 .../intacct/IntacctPrerequisitesPage.tsx      |  2 +-
 12 files changed, 166 insertions(+), 11 deletions(-)
 create mode 100644 src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 6c317ee12070..4b25ed11155f 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -918,6 +918,10 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/accounting/sage-intacct/enter-credentials',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/enter-credentials` as const,
     },
+    POLICY_ACCOUNTING_EXISTING_SAGE_INTACCT_CONNECTIONS: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/exisitng-connections',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/exisitng-connections` as const,
+    },
 } as const;
 
 /**
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 5b6cd51f5eee..58884458f504 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -270,6 +270,7 @@ const SCREENS = {
             XERO_EXPORT_BANK_ACCOUNT_SELECT: 'Policy_Accounting_Xero_Export_Bank_Account_Select',
             SAGE_INTACCT_PREREQUISITES: 'Policy_Accounting_Sage_Intacct_Prerequisites',
             ENTER_SAGE_INTACCT_CREDENTIALS: 'Policy_Enter_Sage_Intacct_Credentials',
+            EXISTING_SAGE_INTACCT_CONNECTIONS: 'Policy_Existing_Sage_Intacct_Connections',
         },
         INITIAL: 'Workspace_Initial',
         PROFILE: 'Workspace_Profile',
diff --git a/src/components/ConnectToSageIntacctButton/index.tsx b/src/components/ConnectToSageIntacctButton/index.tsx
index 1d781d9a62e4..c5840015538a 100644
--- a/src/components/ConnectToSageIntacctButton/index.tsx
+++ b/src/components/ConnectToSageIntacctButton/index.tsx
@@ -1,15 +1,20 @@
-import React, {useState} from 'react';
+import React, {useRef, useState} from 'react';
+import type {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import ConfirmModal from '@components/ConfirmModal';
-import useEnvironment from '@hooks/useEnvironment';
+import * as Expensicons from '@components/Icon/Expensicons';
+import PopoverMenu from '@components/PopoverMenu';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
 import {removePolicyConnection} from '@libs/actions/connections';
-import {getXeroSetupLink} from '@libs/actions/connections/ConnectToXero';
 import Navigation from '@libs/Navigation/Navigation';
-import * as Link from '@userActions/Link';
+import {getPolicyConnectedToSageIntacct} from '@libs/PolicyUtils';
+import type {AnchorPosition} from '@styles/index';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {PolicyConnectionName} from '@src/types/onyx/Policy';
 
@@ -19,7 +24,7 @@ type ConnectToSageIntacctButtonProps = {
     integrationToDisconnect?: PolicyConnectionName;
 };
 
-function ConnectToXeroButton({policyID, shouldDisconnectIntegrationBeforeConnecting, integrationToDisconnect}: ConnectToSageIntacctButtonProps) {
+function ConnectToSageIntacctButton({policyID, shouldDisconnectIntegrationBeforeConnecting, integrationToDisconnect}: ConnectToSageIntacctButtonProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
@@ -28,6 +33,31 @@ function ConnectToXeroButton({policyID, shouldDisconnectIntegrationBeforeConnect
 
     const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
 
+    const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+    const hasPoliciesConnectedToSageIntacct = !!getPolicyConnectedToSageIntacct(policies);
+    const {isSmallScreenWidth} = useWindowDimensions();
+    const [isReuseConnectionsPopoverOpen, setIsReuseConnectionsPopoverOpen] = useState(false);
+    const [reuseConnectionPopoverPosition, setReuseConnectionPopoverPosition] = useState<AnchorPosition>({horizontal: 0, vertical: 0});
+    const threeDotsMenuContainerRef = useRef<View>(null);
+    const connectionOptions = [
+        {
+            icon: Expensicons.LinkCopy,
+            text: translate('workspace.intacct.createNewConnection'),
+            onSelected: () => {
+                Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID));
+                setIsReuseConnectionsPopoverOpen(false);
+            },
+        },
+        {
+            icon: Expensicons.Copy,
+            text: translate('workspace.intacct.reuseExitingConnection'),
+            onSelected: () => {
+                Navigation.navigate(ROUTES.POLICY_ACCOUNTING_EXISTING_SAGE_INTACCT_CONNECTIONS.getRoute(policyID));
+                setIsReuseConnectionsPopoverOpen(false);
+            },
+        },
+    ];
+
     return (
         <>
             <Button
@@ -36,12 +66,42 @@ function ConnectToXeroButton({policyID, shouldDisconnectIntegrationBeforeConnect
                         setIsDisconnectModalOpen(true);
                         return;
                     }
-                    Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID));
+                    if (!hasPoliciesConnectedToSageIntacct) {
+                        Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID));
+                        return;
+                    }
+                    if (!isSmallScreenWidth) {
+                        threeDotsMenuContainerRef.current?.measureInWindow((x, y, width, height) => {
+                            setReuseConnectionPopoverPosition({
+                                horizontal: x + width,
+                                vertical: y + height,
+                            });
+                        });
+                    }
+                    setIsReuseConnectionsPopoverOpen(true);
                 }}
                 text={translate('workspace.accounting.setup')}
                 style={styles.justifyContentCenter}
                 small
                 isDisabled={isOffline}
+                ref={threeDotsMenuContainerRef}
+            />
+            <PopoverMenu
+                isVisible={isReuseConnectionsPopoverOpen}
+                onClose={() => {
+                    setIsReuseConnectionsPopoverOpen(false);
+                }}
+                withoutOverlay
+                menuItems={connectionOptions}
+                onItemSelected={(item) => {
+                    if (!item?.onSelected) {
+                        return;
+                    }
+                    item.onSelected();
+                }}
+                anchorPosition={reuseConnectionPopoverPosition}
+                anchorAlignment={{horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT, vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP}}
+                anchorRef={threeDotsMenuContainerRef}
             />
             {shouldDisconnectIntegrationBeforeConnecting && isDisconnectModalOpen && integrationToDisconnect && (
                 <ConfirmModal
@@ -50,7 +110,19 @@ function ConnectToXeroButton({policyID, shouldDisconnectIntegrationBeforeConnect
                     onConfirm={() => {
                         removePolicyConnection(policyID, integrationToDisconnect);
                         setIsDisconnectModalOpen(false);
-                        Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID));
+                        if (!hasPoliciesConnectedToSageIntacct) {
+                            Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID));
+                            return;
+                        }
+                        if (!isSmallScreenWidth) {
+                            threeDotsMenuContainerRef.current?.measureInWindow((x, y, width, height) => {
+                                setReuseConnectionPopoverPosition({
+                                    horizontal: x + width,
+                                    vertical: y + height,
+                                });
+                            });
+                        }
+                        setIsReuseConnectionsPopoverOpen(true);
                     }}
                     onCancel={() => setIsDisconnectModalOpen(false)}
                     prompt={translate('workspace.accounting.disconnectPrompt', integrationToConnect, currentIntegration)}
@@ -63,4 +135,4 @@ function ConnectToXeroButton({policyID, shouldDisconnectIntegrationBeforeConnect
     );
 }
 
-export default ConnectToXeroButton;
+export default ConnectToSageIntacctButton;
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 31889639c3dd..f78bc7a705c1 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2180,6 +2180,9 @@ export default {
             downloadExpensifyPackage: 'Download the Expensify package for Sage Intacct',
             followSteps: 'Follow the steps in our How-to: Connect to Sage Intacct instructions',
             enterCredentials: 'Enter your Sage Intacct credentials',
+            createNewConnection: 'Create new connection',
+            reuseExitingConnection: 'Reuse existing connection',
+            existingConnections: 'Existing connections',
         },
         type: {
             free: 'Free',
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 74cb2686637d..56ca197f9e9b 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -325,6 +325,7 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: () => require('../../../../pages/workspace/accounting/intacct/IntacctPrerequisitesPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: () =>
         require('../../../../pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage').default as React.ComponentType,
+    [SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS]: () => require('../../../../pages/workspace/accounting/intacct/ExistingConnectionsPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_FREQUENCY]: () => require('../../../../pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_MONTHLY_OFFSET]: () =>
         require('../../../../pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage').default as React.ComponentType,
diff --git a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
index cd632970b200..a34b1b3a7665 100755
--- a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
@@ -56,6 +56,7 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial<Record<FullScreenName, string[]>> = {
         SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_BANK_ACCOUNT_SELECT,
         SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES,
         SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS,
+        SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS,
     ],
     [SCREENS.WORKSPACE.TAXES]: [
         SCREENS.WORKSPACE.TAXES_SETTINGS,
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index 7744a6a2df22..371d8499ec21 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -350,6 +350,7 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_PAYMENT_ACCOUNT_SELECTOR]: {path: ROUTES.POLICY_ACCOUNTING_XERO_BILL_PAYMENT_ACCOUNT_SELECTOR.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: {path: ROUTES.POLICY_ACCOUNTING_ENTER_SAGE_INTACCT_CREDENTIALS.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS]: {path: ROUTES.POLICY_ACCOUNTING_EXISTING_SAGE_INTACCT_CONNECTIONS.route},
                         [SCREENS.WORKSPACE.DESCRIPTION]: {
                             path: ROUTES.WORKSPACE_PROFILE_DESCRIPTION.route,
                         },
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 1fd8609eee92..82e373f2df1c 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -387,6 +387,9 @@ type SettingsNavigatorParamList = {
     [SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: {
         policyID: string;
     };
+    [SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS]: {
+        policyID: string;
+    };
     [SCREENS.GET_ASSISTANCE]: {
         backTo: Routes;
     };
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index ab7c71c5be3e..ee2b1af51bd0 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -461,6 +461,10 @@ function getXeroBankAccountsWithDefaultSelect(policy: Policy | undefined, select
     }));
 }
 
+function getPolicyConnectedToSageIntacct(policies: OnyxCollection<Policy>): Policy[] {
+    return Object.values(policies ?? {}).filter<Policy>((policy): policy is Policy => policy !== null && policy && !!policy?.connections?.intacct);
+}
+
 /**
  * Sort the workspaces by their name, while keeping the selected one at the beginning.
  * @param workspace1 Details of the first workspace to be compared.
@@ -528,6 +532,7 @@ export {
     findCurrentXeroOrganization,
     getCurrentXeroOrganizationName,
     getXeroBankAccountsWithDefaultSelect,
+    getPolicyConnectedToSageIntacct,
     getCustomUnit,
     getCustomUnitRate,
     sortWorkspacesBySelected,
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index 179ff1c525de..cff711f195d2 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -143,11 +143,10 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
     const accountingIntegrations = Object.values(CONST.POLICY.CONNECTIONS.NAME).filter((name) => !(name === CONST.POLICY.CONNECTIONS.NAME.XERO && !canUseXeroIntegration));
     const connectedIntegration = accountingIntegrations.find((integration) => !!policy?.connections?.[integration]) ?? connectionSyncProgress?.connectionName;
     const policyID = policy?.id ?? '';
-    const successfulDate = policy?.connections?.quickbooksOnline?.lastSync?.successfulDate;
+    const successfulDate = connectedIntegration ? policy?.connections?.[connectedIntegration]?.lastSync?.successfulDate : undefined;
     const formattedDate = useMemo(() => (successfulDate ? new Date(successfulDate) : new Date()), [successfulDate]);
 
     const policyConnectedToXero = connectedIntegration === CONST.POLICY.CONNECTIONS.NAME.XERO;
-
     const tenants = useMemo(() => getXeroTenants(policy), [policy]);
     const currentXeroOrganization = findCurrentXeroOrganization(tenants, policy?.connections?.xero?.config?.tenantID);
     const currentXeroOrganizationName = useMemo(() => getCurrentXeroOrganizationName(policy), [policy]);
diff --git a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
new file mode 100644
index 000000000000..177360b147ac
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
@@ -0,0 +1,65 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import {formatDistanceToNow} from 'date-fns';
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import MenuItemList from '@components/MenuItemList';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import {getPolicyConnectedToSageIntacct} from '@libs/PolicyUtils';
+import * as ReportUtils from '@libs/ReportUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+
+type ExistingConnectionsPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS>;
+
+function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+    const policiesConnectedToSageIntacct = getPolicyConnectedToSageIntacct(policies);
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const policyID = route.params.policyID; // we'll need this when connecting to policy
+
+    const menuItemsBetter = policiesConnectedToSageIntacct.map((policy) => {
+        const lastSuccessfulSyncDate = policy.connections?.intacct.lastSync?.successfulDate;
+        const formattedDate = lastSuccessfulSyncDate ? new Date(lastSuccessfulSyncDate) : undefined;
+        const date = formattedDate ? formatDistanceToNow(formattedDate, {addSuffix: true}) : undefined;
+        return {
+            title: policy.name,
+            key: policy.id,
+            icon: policy.avatarURL ? policy.avatarURL : ReportUtils.getDefaultWorkspaceAvatar(policy.name),
+            iconType: policy.avatarURL ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_WORKSPACE,
+            description: date ? `Sage Intacct - Last synced ${date}` : 'Sage Intacct',
+        };
+    });
+
+    return (
+        <ScreenWrapper
+            shouldEnablePickerAvoiding={false}
+            shouldShowOfflineIndicatorInWideScreen
+            testID={ExistingConnectionsPage.displayName}
+        >
+            <HeaderWithBackButton
+                title={translate('workspace.intacct.existingConnections')}
+                shouldShowBackButton
+                onBackButtonPress={() => Navigation.goBack()}
+            />
+            <View style={[styles.flex1]}>
+                <MenuItemList
+                    menuItems={menuItemsBetter}
+                    shouldUseSingleExecution
+                />
+            </View>
+        </ScreenWrapper>
+    );
+}
+
+ExistingConnectionsPage.displayName = 'IntacctPrerequisitesPage';
+
+export default ExistingConnectionsPage;
diff --git a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
index 59284f435050..c38a6d20b989 100644
--- a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
@@ -61,7 +61,7 @@ function IntacctPrerequisitesPage({route}: IntacctPrerequisitesPageProps) {
                 numberOfLinesTitle: 3,
             },
         ],
-        [],
+        [translate],
     );
 
     return (

From 9464001ab57fd4409a1f9db0d72536b294e0cbb9 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Mon, 17 Jun 2024 11:55:54 +0200
Subject: [PATCH 06/33] add spanish translations

---
 src/languages/es.ts | 58 ++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/languages/es.ts b/src/languages/es.ts
index ad2748a25fa2..0fa5b21f5eb4 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -331,6 +331,8 @@ export default {
         shared: 'Compartidos',
         drafts: 'Borradores',
         finished: 'Finalizados',
+        companyID: 'Empresa ID',
+        userID: 'Usuario ID',
     },
     connectionComplete: {
         title: 'Conexión Completa',
@@ -2211,6 +2213,16 @@ export default {
             noAccountsFound: 'No se ha encontrado ninguna cuenta',
             noAccountsFoundDescription: 'Añade la cuenta en Xero y sincroniza de nuevo la conexión',
         },
+        intacct: {
+            sageIntacctSetup: 'Sage Intacct configuración',
+            prerequisitesTitle: 'Antes de conectar...',
+            downloadExpensifyPackage: 'Descargar el paquete Expensify para Sage Intacct',
+            followSteps: 'Siga los pasos de nuestras instrucciones Cómo: Instrucciones para conectarse a Sage Intacct',
+            enterCredentials: 'Introduzca sus credenciales de Sage Intacct',
+            createNewConnection: 'Crear una nueva conexión',
+            reuseExitingConnection: 'Reutilizar la conexión existente',
+            existingConnections: 'Conexiones existentes',
+        },
         type: {
             free: 'Gratis',
             control: 'Control',
@@ -2399,6 +2411,19 @@ export default {
             subtitle: 'Conecta a tu sistema de contabilidad para codificar transacciones con tu plan de cuentas, auto-cotejar pagos, y mantener tus finanzas sincronizadas.',
             qbo: 'Quickbooks Online',
             xero: 'Xero',
+            intacct: 'Sage Intacct',
+            integrationName: (integration?: ConnectionName): string => {
+                switch (integration) {
+                    case CONST.POLICY.CONNECTIONS.NAME.QBO:
+                        return 'Quickbooks Online';
+                    case CONST.POLICY.CONNECTIONS.NAME.XERO:
+                        return 'Xero';
+                    case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT:
+                        return 'Sage Intacct';
+                    default:
+                        return 'Integration';
+                }
+            },
             setup: 'Configurar',
             lastSync: 'Recién sincronizado',
             import: 'Importar',
@@ -2407,17 +2432,7 @@ export default {
             other: 'Otras integraciones',
             syncNow: 'Sincronizar ahora',
             disconnect: 'Desconectar',
-            disconnectTitle: (currentIntegration?: ConnectionName): string => {
-                switch (currentIntegration) {
-                    case CONST.POLICY.CONNECTIONS.NAME.QBO:
-                        return 'Desconectar QuickBooks Online';
-                    case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                        return 'Desconectar Xero';
-                    default: {
-                        return 'Desconectar integración';
-                    }
-                }
-            },
+            disconnectTitle: (integration?: string): string => `Desconectar ${integration}`,
             syncError: (integration?: ConnectionName): string => {
                 switch (integration) {
                     case CONST.POLICY.CONNECTIONS.NAME.QBO:
@@ -2442,25 +2457,8 @@ export default {
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE]: 'No importado',
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: 'Importado, mostrado como campo de informe',
             },
-            disconnectPrompt: (integrationToConnect?: ConnectionName, currentIntegration?: ConnectionName): string => {
-                switch (integrationToConnect) {
-                    case CONST.POLICY.CONNECTIONS.NAME.QBO:
-                        return '¿Estás seguro de que quieres desconectar Xero para configurar QuickBooks Online?';
-                    case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                        return '¿Estás seguro de que quieres desconectar QuickBooks Online para configurar Xero?';
-                    default: {
-                        switch (currentIntegration) {
-                            case CONST.POLICY.CONNECTIONS.NAME.QBO:
-                                return '¿Estás seguro de que quieres desconectar QuickBooks Online?';
-                            case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                                return '¿Estás seguro de que quieres desconectar Xero?';
-                            default: {
-                                return '¿Estás seguro de que quieres desconectar integración?';
-                            }
-                        }
-                    }
-                }
-            },
+            disconnectPrompt: (integrationToConnect?: string, currentIntegration?: string): string =>
+                `¿Estás seguro de que quieres desconectar ${currentIntegration} para configurar ${integrationToConnect}?`,
             enterCredentials: 'Ingresa tus credenciales',
             connections: {
                 syncStageName: (stage: PolicyConnectionSyncStage) => {

From fd120107c1dc2a42a216221e866d4f72242bdfc6 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Mon, 17 Jun 2024 12:28:03 +0200
Subject: [PATCH 07/33] clean up code

---
 src/CONST.ts                                        | 9 +++++++++
 src/components/ConnectToSageIntacctButton/index.tsx | 4 ++--
 src/libs/PolicyUtils.ts                             | 4 ++--
 src/types/onyx/Policy.ts                            | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index fd3f305be527..7aac1ad930ce 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -4828,6 +4828,15 @@ const CONST = {
     },
 
     SUBSCRIPTION_SIZE_LIMIT: 20000,
+
+    PAYMENT_CARD_CURRENCY: {
+        USD: 'USD',
+        AUD: 'AUD',
+        GBP: 'GBP',
+        NZD: 'NZD',
+    },
+
+    SUBSCRIPTION_PRICE_FACTOR: 2,
     SUBSCRIPTION_POSSIBLE_COST_SAVINGS: {
         COLLECT_PLAN: 10,
         CONTROL_PLAN: 18,
diff --git a/src/components/ConnectToSageIntacctButton/index.tsx b/src/components/ConnectToSageIntacctButton/index.tsx
index c5840015538a..070a6124d0cc 100644
--- a/src/components/ConnectToSageIntacctButton/index.tsx
+++ b/src/components/ConnectToSageIntacctButton/index.tsx
@@ -11,7 +11,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import {removePolicyConnection} from '@libs/actions/connections';
 import Navigation from '@libs/Navigation/Navigation';
-import {getPolicyConnectedToSageIntacct} from '@libs/PolicyUtils';
+import {getPoliciesConnectedToSageIntacct} from '@libs/PolicyUtils';
 import type {AnchorPosition} from '@styles/index';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -34,7 +34,7 @@ function ConnectToSageIntacctButton({policyID, shouldDisconnectIntegrationBefore
     const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
 
     const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
-    const hasPoliciesConnectedToSageIntacct = !!getPolicyConnectedToSageIntacct(policies);
+    const hasPoliciesConnectedToSageIntacct = !!getPoliciesConnectedToSageIntacct(policies);
     const {isSmallScreenWidth} = useWindowDimensions();
     const [isReuseConnectionsPopoverOpen, setIsReuseConnectionsPopoverOpen] = useState(false);
     const [reuseConnectionPopoverPosition, setReuseConnectionPopoverPosition] = useState<AnchorPosition>({horizontal: 0, vertical: 0});
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index ed6af71f33ca..1b4ee1948842 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -461,7 +461,7 @@ function getXeroBankAccountsWithDefaultSelect(policy: Policy | undefined, select
     }));
 }
 
-function getPolicyConnectedToSageIntacct(policies: OnyxCollection<Policy>): Policy[] {
+function getPoliciesConnectedToSageIntacct(policies: OnyxCollection<Policy>): Policy[] {
     return Object.values(policies ?? {}).filter<Policy>((policy): policy is Policy => policy !== null && policy && !!policy?.connections?.intacct);
 }
 
@@ -550,7 +550,7 @@ export {
     findCurrentXeroOrganization,
     getCurrentXeroOrganizationName,
     getXeroBankAccountsWithDefaultSelect,
-    getPolicyConnectedToSageIntacct,
+    getPoliciesConnectedToSageIntacct,
     getCustomUnit,
     getCustomUnitRate,
     sortWorkspacesBySelected,
diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index deb8b513ef04..ab520ed98269 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -612,7 +612,7 @@ type Connections = {
     xero: Connection<XeroConnectionData, XeroConnectionConfig>;
 
     /** Sage Intacct integration connection */
-    intacct: Connection<XeroConnectionData, XeroConnectionConfig>; // zmien na normalne dane do saga
+    intacct: Connection<XeroConnectionData, XeroConnectionConfig>; // for now I'm using XeroConfig as a placeholder, I'll add IntacctConnection and IntacctConnectionConfig in this task https://github.com/Expensify/App/issues/43533
 };
 
 /** Names of integration connections */

From b28456e980cfc0ef6eded2a7b4f51e43e54c0417 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Mon, 17 Jun 2024 14:12:31 +0200
Subject: [PATCH 08/33] fix type errors

---
 src/ONYXKEYS.ts                                      |  1 +
 src/libs/PolicyUtils.ts                              |  2 +-
 .../intacct/EnterSageIntacctCredentialsPage.tsx      | 12 +++++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 276f283aa43c..3c64aec680f2 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -487,6 +487,7 @@ const ONYXKEYS = {
         SUBSCRIPTION_SIZE_FORM: 'subscriptionSizeForm',
         SUBSCRIPTION_SIZE_FORM_DRAFT: 'subscriptionSizeFormDraft',
         SAGE_INTACCT_CREDENTIALS_FORM: 'sageIntacctCredentialsForm',
+        SAGE_INTACCT_CREDENTIALS_FORM_DRAFT: 'sageIntacctCredentialsFormDraft',
     },
 } as const;
 
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 1b4ee1948842..0111f032c53b 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -462,7 +462,7 @@ function getXeroBankAccountsWithDefaultSelect(policy: Policy | undefined, select
 }
 
 function getPoliciesConnectedToSageIntacct(policies: OnyxCollection<Policy>): Policy[] {
-    return Object.values(policies ?? {}).filter<Policy>((policy): policy is Policy => policy !== null && policy && !!policy?.connections?.intacct);
+    return Object.values(policies ?? {}).filter<Policy>((policy): policy is Policy => policy !== null && !!policy && !!policy?.connections?.intacct);
 }
 
 /**
diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
index c0f45fdda59f..ccb51396aa98 100644
--- a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -1,6 +1,7 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback} from 'react';
 import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
@@ -26,8 +27,9 @@ function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps)
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const policyID = route.params.policyID; // this will be used for connecting to Sage Intacct
 
+    const [sageIntacctCredentialsDraft] = useOnyx(ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM_DRAFT);
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const updateDisplayName = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM>) => {
+    const confirmCredentials = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM>) => {
         // here we call ConnectToSageIntacct API command
         Navigation.goBack();
     }, []);
@@ -62,7 +64,7 @@ function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps)
                 style={[styles.flexGrow1, styles.ph5]}
                 formID={ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM}
                 validate={validate}
-                onSubmit={updateDisplayName}
+                onSubmit={confirmCredentials}
                 submitButtonText={translate('common.confirm')}
                 enabledWhenOffline
                 shouldValidateOnBlur
@@ -77,7 +79,7 @@ function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps)
                         label={translate('common.companyID')}
                         aria-label={translate('common.companyID')}
                         role={CONST.ROLE.PRESENTATION}
-                        defaultValue=""
+                        defaultValue={sageIntacctCredentialsDraft?.[INPUT_IDS.COMPANY_ID]}
                         spellCheck={false}
                     />
                 </View>
@@ -89,7 +91,7 @@ function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps)
                         label={translate('common.userID')}
                         aria-label={translate('common.userID')}
                         role={CONST.ROLE.PRESENTATION}
-                        defaultValue=""
+                        defaultValue={sageIntacctCredentialsDraft?.[INPUT_IDS.USER_ID]}
                         spellCheck={false}
                     />
                 </View>
@@ -101,7 +103,7 @@ function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps)
                         label={translate('common.password')}
                         aria-label={translate('common.password')}
                         role={CONST.ROLE.PRESENTATION}
-                        defaultValue=""
+                        defaultValue={sageIntacctCredentialsDraft?.[INPUT_IDS.PASSWORD]}
                         spellCheck={false}
                     />
                 </View>

From 096f9dd8db5196c589b244fd43cead3db41aa5e9 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Mon, 17 Jun 2024 14:16:53 +0200
Subject: [PATCH 09/33] fix typo

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

diff --git a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
index 177360b147ac..31df1444d372 100644
--- a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
@@ -10,7 +10,7 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import {getPolicyConnectedToSageIntacct} from '@libs/PolicyUtils';
+import {getPoliciesConnectedToSageIntacct} from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -22,7 +22,7 @@ function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
-    const policiesConnectedToSageIntacct = getPolicyConnectedToSageIntacct(policies);
+    const policiesConnectedToSageIntacct = getPoliciesConnectedToSageIntacct(policies);
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const policyID = route.params.policyID; // we'll need this when connecting to policy
 

From f6c05283646a9f27309faf4a25b1ce91804b46b3 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Mon, 17 Jun 2024 15:27:46 +0200
Subject: [PATCH 10/33] fix error names

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

diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
index ccb51396aa98..6cd3375c28b9 100644
--- a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -38,15 +38,15 @@ function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps)
         const errors: FormInputErrors<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM> = {};
 
         if (!values.companyID) {
-            ErrorUtils.addErrorMessage(errors, 'companyID', 'personalDetails.error.hasInvalidCharacter'); // dodać nazwy
+            ErrorUtils.addErrorMessage(errors, 'companyID', 'common.error.fieldRequired');
         }
 
         if (!values.userID) {
-            ErrorUtils.addErrorMessage(errors, 'userID', 'personalDetails.error.hasInvalidCharacter'); // dodać nazwy
+            ErrorUtils.addErrorMessage(errors, 'userID', 'common.error.fieldRequired');
         }
 
         if (!values.password) {
-            ErrorUtils.addErrorMessage(errors, 'password', 'personalDetails.error.hasInvalidCharacter'); // dodać nazwy
+            ErrorUtils.addErrorMessage(errors, 'password', 'common.error.fieldRequired');
         }
         return errors;
     }, []);

From dc01b0b0b1d0a9606d11d532bbe6fa7072de1cef Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Mon, 17 Jun 2024 19:18:19 +0200
Subject: [PATCH 11/33] fix PR comments

---
 src/ROUTES.ts                                 |  4 +-
 .../ConnectToSageIntacctButton/index.tsx      |  2 +-
 src/languages/en.ts                           |  1 +
 src/languages/es.ts                           |  1 +
 src/libs/DateUtils.ts                         |  2 +-
 src/libs/Navigation/linkingConfig/config.ts   |  4 +-
 .../accounting/PolicyAccountingPage.tsx       | 13 +++--
 .../EnterSageIntacctCredentialsPage.tsx       | 51 ++++++-------------
 .../intacct/ExistingConnectionsPage.tsx       |  7 ++-
 .../intacct/IntacctPrerequisitesPage.tsx      |  2 +-
 10 files changed, 35 insertions(+), 52 deletions(-)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index f322e95e5d0c..392bb0554e99 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -912,11 +912,11 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/accounting/sage-intacct/prerequisites',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/prerequisites` as const,
     },
-    POLICY_ACCOUNTING_ENTER_SAGE_INTACCT_CREDENTIALS: {
+    POLICY_ACCOUNTING_SAGE_INTACCT_ENTER_CREDENTIALS: {
         route: 'settings/workspaces/:policyID/accounting/sage-intacct/enter-credentials',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/enter-credentials` as const,
     },
-    POLICY_ACCOUNTING_EXISTING_SAGE_INTACCT_CONNECTIONS: {
+    POLICY_ACCOUNTING_SAGE_INTACCT_EXISTING_CONNECTIONS: {
         route: 'settings/workspaces/:policyID/accounting/sage-intacct/exisitng-connections',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/exisitng-connections` as const,
     },
diff --git a/src/components/ConnectToSageIntacctButton/index.tsx b/src/components/ConnectToSageIntacctButton/index.tsx
index 070a6124d0cc..00e92e26047c 100644
--- a/src/components/ConnectToSageIntacctButton/index.tsx
+++ b/src/components/ConnectToSageIntacctButton/index.tsx
@@ -52,7 +52,7 @@ function ConnectToSageIntacctButton({policyID, shouldDisconnectIntegrationBefore
             icon: Expensicons.Copy,
             text: translate('workspace.intacct.reuseExitingConnection'),
             onSelected: () => {
-                Navigation.navigate(ROUTES.POLICY_ACCOUNTING_EXISTING_SAGE_INTACCT_CONNECTIONS.getRoute(policyID));
+                Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXISTING_CONNECTIONS.getRoute(policyID));
                 setIsReuseConnectionsPopoverOpen(false);
             },
         },
diff --git a/src/languages/en.ts b/src/languages/en.ts
index db3fbb57d1d7..207c7552bb59 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2182,6 +2182,7 @@ export default {
             createNewConnection: 'Create new connection',
             reuseExitingConnection: 'Reuse existing connection',
             existingConnections: 'Existing connections',
+            sageIntacctLastSync: ({formattedDate}) => `Sage Intacct - Last synced ${formattedDate}`,
         },
         type: {
             free: 'Free',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index fed53f2e59b8..477f9f0c242b 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2218,6 +2218,7 @@ export default {
             createNewConnection: 'Crear una nueva conexión',
             reuseExitingConnection: 'Reutilizar la conexión existente',
             existingConnections: 'Conexiones existentes',
+            sageIntacctLastSync: ({formattedDate}) => `Sage Intacct - Última sincronización ${formattedDate}`,
         },
         type: {
             free: 'Gratis',
diff --git a/src/libs/DateUtils.ts b/src/libs/DateUtils.ts
index b2817fa46438..421ce928111d 100644
--- a/src/libs/DateUtils.ts
+++ b/src/libs/DateUtils.ts
@@ -133,7 +133,7 @@ function getLocalDateFromDatetime(locale: Locale, datetime?: string, currentSele
         }
         return res;
     }
-    const parsedDatetime = new Date(`${datetime}Z`);
+    const parsedDatetime = new Date(datetime.length === 23 ? `${datetime}Z` : datetime);
     return utcToZonedTime(parsedDatetime, currentSelectedTimezone);
 }
 
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index 567adacb86c9..b16a6b238c20 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -338,8 +338,8 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_PREFERRED_EXPORTER_SELECT]: {path: ROUTES.POLICY_ACCOUNTING_XERO_PREFERRED_EXPORTER_SELECT.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_PAYMENT_ACCOUNT_SELECTOR]: {path: ROUTES.POLICY_ACCOUNTING_XERO_BILL_PAYMENT_ACCOUNT_SELECTOR.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.route},
-                        [SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: {path: ROUTES.POLICY_ACCOUNTING_ENTER_SAGE_INTACCT_CREDENTIALS.route},
-                        [SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS]: {path: ROUTES.POLICY_ACCOUNTING_EXISTING_SAGE_INTACCT_CONNECTIONS.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ENTER_CREDENTIALS.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXISTING_CONNECTIONS.route},
                         [SCREENS.WORKSPACE.DESCRIPTION]: {
                             path: ROUTES.WORKSPACE_PROFILE_DESCRIPTION.route,
                         },
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index 34958f4b08bb..304e9f2e6d76 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -1,4 +1,4 @@
-import {differenceInMinutes, formatDistanceToNow, isValid, parseISO} from 'date-fns';
+import {differenceInMinutes, isValid, parseISO} from 'date-fns';
 import React, {useEffect, useMemo, useRef, useState} from 'react';
 import {ActivityIndicator, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
@@ -124,7 +124,7 @@ function accountingIntegrationData(
 function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccountingPageProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
-    const {translate} = useLocalize();
+    const {translate, datetimeToRelative: getDatetimeToRelative} = useLocalize();
     const {isOffline} = useNetwork();
     const {canUseXeroIntegration} = usePermissions();
     const {isSmallScreenWidth, windowWidth} = useWindowDimensions();
@@ -144,7 +144,6 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
     const connectedIntegration = accountingIntegrations.find((integration) => !!policy?.connections?.[integration]) ?? connectionSyncProgress?.connectionName;
     const policyID = policy?.id ?? '-1';
     const successfulDate = connectedIntegration ? policy?.connections?.[connectedIntegration]?.lastSync?.successfulDate : undefined;
-    const formattedDate = useMemo(() => (successfulDate ? new Date(successfulDate) : new Date()), [successfulDate]);
 
     const policyConnectedToXero = connectedIntegration === CONST.POLICY.CONNECTIONS.NAME.XERO;
     const tenants = useMemo(() => getXeroTenants(policy), [policy]);
@@ -169,8 +168,12 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
     );
 
     useEffect(() => {
-        setDateTimeToRelative(formatDistanceToNow(formattedDate, {addSuffix: true}));
-    }, [formattedDate]);
+        if (successfulDate) {
+            setDateTimeToRelative(getDatetimeToRelative(successfulDate));
+            return;
+        }
+        setDateTimeToRelative('');
+    }, [getDatetimeToRelative, successfulDate]);
 
     const connectionsMenuItems: MenuItemData[] = useMemo(() => {
         if (isEmptyObject(policy?.connections) && !isSyncInProgress) {
diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
index 6cd3375c28b9..59fccdd3dd0f 100644
--- a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -34,6 +34,7 @@ function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps)
         Navigation.goBack();
     }, []);
 
+    const formItems = Object.values(INPUT_IDS);
     const validate = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM>) => {
         const errors: FormInputErrors<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM> = {};
 
@@ -71,42 +72,20 @@ function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps)
                 shouldValidateOnChange
             >
                 <Text style={[styles.textHeadlineH1, styles.pb5, styles.pt3]}>{translate('workspace.intacct.enterCredentials')}</Text>
-                <View style={styles.mb4}>
-                    <InputWrapper
-                        InputComponent={TextInput}
-                        inputID={INPUT_IDS.COMPANY_ID}
-                        name="companyID"
-                        label={translate('common.companyID')}
-                        aria-label={translate('common.companyID')}
-                        role={CONST.ROLE.PRESENTATION}
-                        defaultValue={sageIntacctCredentialsDraft?.[INPUT_IDS.COMPANY_ID]}
-                        spellCheck={false}
-                    />
-                </View>
-                <View style={styles.mb4}>
-                    <InputWrapper
-                        InputComponent={TextInput}
-                        inputID={INPUT_IDS.USER_ID}
-                        name="userID"
-                        label={translate('common.userID')}
-                        aria-label={translate('common.userID')}
-                        role={CONST.ROLE.PRESENTATION}
-                        defaultValue={sageIntacctCredentialsDraft?.[INPUT_IDS.USER_ID]}
-                        spellCheck={false}
-                    />
-                </View>
-                <View style={styles.mb4}>
-                    <InputWrapper
-                        InputComponent={TextInput}
-                        inputID={INPUT_IDS.PASSWORD}
-                        name="password"
-                        label={translate('common.password')}
-                        aria-label={translate('common.password')}
-                        role={CONST.ROLE.PRESENTATION}
-                        defaultValue={sageIntacctCredentialsDraft?.[INPUT_IDS.PASSWORD]}
-                        spellCheck={false}
-                    />
-                </View>
+                {formItems.map((formItem) => (
+                    <View style={styles.mb4}>
+                        <InputWrapper
+                            InputComponent={TextInput}
+                            inputID={formItem}
+                            name="companyID"
+                            label={translate(`common.${formItem}`)}
+                            aria-label={translate(`common.${formItem}`)}
+                            role={CONST.ROLE.PRESENTATION}
+                            defaultValue={sageIntacctCredentialsDraft?.[formItem]}
+                            spellCheck={false}
+                        />
+                    </View>
+                ))}
             </FormProvider>
         </ScreenWrapper>
     );
diff --git a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
index 31df1444d372..db19563a5a2c 100644
--- a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
@@ -19,7 +19,7 @@ import type SCREENS from '@src/SCREENS';
 type ExistingConnectionsPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS>;
 
 function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) {
-    const {translate} = useLocalize();
+    const {translate, datetimeToRelative} = useLocalize();
     const styles = useThemeStyles();
     const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
     const policiesConnectedToSageIntacct = getPoliciesConnectedToSageIntacct(policies);
@@ -28,14 +28,13 @@ function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) {
 
     const menuItemsBetter = policiesConnectedToSageIntacct.map((policy) => {
         const lastSuccessfulSyncDate = policy.connections?.intacct.lastSync?.successfulDate;
-        const formattedDate = lastSuccessfulSyncDate ? new Date(lastSuccessfulSyncDate) : undefined;
-        const date = formattedDate ? formatDistanceToNow(formattedDate, {addSuffix: true}) : undefined;
+        const date = lastSuccessfulSyncDate ? datetimeToRelative(lastSuccessfulSyncDate) : undefined;
         return {
             title: policy.name,
             key: policy.id,
             icon: policy.avatarURL ? policy.avatarURL : ReportUtils.getDefaultWorkspaceAvatar(policy.name),
             iconType: policy.avatarURL ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_WORKSPACE,
-            description: date ? `Sage Intacct - Last synced ${date}` : 'Sage Intacct',
+            description: date ? translate('workspace.intacct.sageIntacctLastSync', date) : translate('workspace.accounting.intacct'),
         };
     });
 
diff --git a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
index c38a6d20b989..8a4a6896bd99 100644
--- a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
@@ -90,7 +90,7 @@ function IntacctPrerequisitesPage({route}: IntacctPrerequisitesPageProps) {
                     <Button
                         success
                         text={translate('common.next')}
-                        onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_ENTER_SAGE_INTACCT_CREDENTIALS.getRoute(policyID))}
+                        onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ENTER_CREDENTIALS.getRoute(policyID))}
                         pressOnEnter
                         large
                     />

From 720e8a4d484541abb223609296955253a2f7aec1 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Tue, 18 Jun 2024 11:06:41 +0200
Subject: [PATCH 12/33] fix types

---
 .../workspace/accounting/intacct/ExistingConnectionsPage.tsx     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
index db19563a5a2c..f67eb7177a7e 100644
--- a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
@@ -1,5 +1,4 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import {formatDistanceToNow} from 'date-fns';
 import React from 'react';
 import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';

From 8f448b1e493982f2fd0cced8f878d6bf9ae3ee55 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Tue, 18 Jun 2024 11:40:59 +0200
Subject: [PATCH 13/33] clean up DateUtils

---
 src/libs/DateUtils.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/libs/DateUtils.ts b/src/libs/DateUtils.ts
index 421ce928111d..447cce064f6e 100644
--- a/src/libs/DateUtils.ts
+++ b/src/libs/DateUtils.ts
@@ -133,7 +133,15 @@ function getLocalDateFromDatetime(locale: Locale, datetime?: string, currentSele
         }
         return res;
     }
-    const parsedDatetime = new Date(datetime.length === 23 ? `${datetime}Z` : datetime);
+    let parsedDatetime;
+    try {
+        // in some cases we cannot add 'Z' to the date string
+        parsedDatetime = new Date(`${datetime}Z`);
+        parsedDatetime.toISOString(); // we need to call toISOString because it throws RangeError in case of an invalid date
+    } catch (e) {
+        parsedDatetime = new Date(datetime);
+    }
+
     return utcToZonedTime(parsedDatetime, currentSelectedTimezone);
 }
 

From 530a4072ecc4f24dde94315b44aae7e15028088e Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Tue, 18 Jun 2024 12:07:49 +0200
Subject: [PATCH 14/33] fix type errors

---
 src/libs/actions/Policy/Member.ts | 17 +++----
 src/libs/actions/Policy/Policy.ts | 78 ++++++++++++++++---------------
 src/libs/actions/Report.ts        | 22 ++++-----
 3 files changed, 57 insertions(+), 60 deletions(-)

diff --git a/src/libs/actions/Policy/Member.ts b/src/libs/actions/Policy/Member.ts
index fc28a01b043c..74d1831f32b9 100644
--- a/src/libs/actions/Policy/Member.ts
+++ b/src/libs/actions/Policy/Member.ts
@@ -247,8 +247,8 @@ function removeMembers(accountIDs: number[], policyID: string) {
             key: policyKey,
             value: {employeeList: optimisticMembersState},
         },
-        ...announceRoomMembers.onyxOptimisticData,
     ];
+    optimisticData.push(...announceRoomMembers.onyxOptimisticData);
 
     const successData: OnyxUpdate[] = [
         {
@@ -256,8 +256,8 @@ function removeMembers(accountIDs: number[], policyID: string) {
             key: policyKey,
             value: {employeeList: successMembersState},
         },
-        ...announceRoomMembers.onyxSuccessData,
     ];
+    successData.push(...announceRoomMembers.onyxSuccessData);
 
     const failureData: OnyxUpdate[] = [
         {
@@ -265,8 +265,8 @@ function removeMembers(accountIDs: number[], policyID: string) {
             key: policyKey,
             value: {employeeList: failureMembersState},
         },
-        ...announceRoomMembers.onyxFailureData,
     ];
+    failureData.push(...announceRoomMembers.onyxFailureData);
 
     const pendingChatMembers = ReportUtils.getPendingChatMembers(accountIDs, [], CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
 
@@ -551,10 +551,8 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccount
                 employeeList: optimisticMembersState,
             },
         },
-        ...newPersonalDetailsOnyxData.optimisticData,
-        ...membersChats.onyxOptimisticData,
-        ...announceRoomMembers.onyxOptimisticData,
     ];
+    optimisticData.push(...newPersonalDetailsOnyxData.optimisticData, ...membersChats.onyxOptimisticData, ...announceRoomMembers.onyxOptimisticData);
 
     const successData: OnyxUpdate[] = [
         {
@@ -564,10 +562,8 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccount
                 employeeList: successMembersState,
             },
         },
-        ...newPersonalDetailsOnyxData.finallyData,
-        ...membersChats.onyxSuccessData,
-        ...announceRoomMembers.onyxSuccessData,
     ];
+    successData.push(...newPersonalDetailsOnyxData.finallyData, ...membersChats.onyxSuccessData, ...announceRoomMembers.onyxSuccessData);
 
     const failureData: OnyxUpdate[] = [
         {
@@ -580,9 +576,8 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccount
                 employeeList: failureMembersState,
             },
         },
-        ...membersChats.onyxFailureData,
-        ...announceRoomMembers.onyxFailureData,
     ];
+    failureData.push(...membersChats.onyxFailureData, ...announceRoomMembers.onyxFailureData);
 
     const params: AddMembersToWorkspaceParams = {
         employees: JSON.stringify(logins.map((login) => ({email: login}))),
diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
index a6162051e6fd..ca13e0b6f2ea 100644
--- a/src/libs/actions/Policy/Policy.ts
+++ b/src/libs/actions/Policy/Policy.ts
@@ -2569,49 +2569,53 @@ function enablePolicyTaxes(policyID: string, enabled: boolean) {
     };
     const policy = getPolicy(policyID);
     const shouldAddDefaultTaxRatesData = (!policy?.taxRates || isEmptyObject(policy.taxRates)) && enabled;
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    tax: {
-                        trackingEnabled: enabled,
-                    },
-                    pendingFields: {
-                        tax: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                    },
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                tax: {
+                    trackingEnabled: enabled,
+                },
+                pendingFields: {
+                    tax: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                 },
             },
-            ...(shouldAddDefaultTaxRatesData ? taxRatesData.optimisticData ?? [] : []),
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    pendingFields: {
-                        tax: null,
-                    },
+        },
+    ];
+    optimisticData.push(...(shouldAddDefaultTaxRatesData ? taxRatesData.optimisticData ?? [] : []));
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingFields: {
+                    tax: null,
                 },
             },
-            ...(shouldAddDefaultTaxRatesData ? taxRatesData.successData ?? [] : []),
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    tax: {
-                        trackingEnabled: !enabled,
-                    },
-                    pendingFields: {
-                        tax: null,
-                    },
+        },
+    ];
+    successData.push(...(shouldAddDefaultTaxRatesData ? taxRatesData.successData ?? [] : []));
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                tax: {
+                    trackingEnabled: !enabled,
+                },
+                pendingFields: {
+                    tax: null,
                 },
             },
-            ...(shouldAddDefaultTaxRatesData ? taxRatesData.failureData ?? [] : []),
-        ],
+        },
+    ];
+    failureData.push(...(shouldAddDefaultTaxRatesData ? taxRatesData.failureData ?? [] : []));
+
+    const onyxData: OnyxData = {
+        optimisticData,
+        successData,
+        failureData,
     };
 
     const parameters: EnablePolicyTaxesParams = {policyID, enabled};
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 3e0443bed0a0..710e9edca281 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -2735,8 +2735,8 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: InvitedEmails
                 pendingChatMembers,
             },
         },
-        ...newPersonalDetailsOnyxData.optimisticData,
     ];
+    optimisticData.push(...newPersonalDetailsOnyxData.optimisticData);
 
     const successPendingChatMembers = report?.pendingChatMembers
         ? report?.pendingChatMembers?.filter(
@@ -2751,8 +2751,8 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: InvitedEmails
                 pendingChatMembers: successPendingChatMembers,
             },
         },
-        ...newPersonalDetailsOnyxData.finallyData,
     ];
+    successData.push(...newPersonalDetailsOnyxData.finallyData);
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -3366,17 +3366,15 @@ function completeOnboarding(
             value: {choice: engagementChoice},
         },
     ];
-    const successData: OnyxUpdate[] = [
-        ...tasksForSuccessData,
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetChatReportID}`,
-            value: {
-                [introductionCommentAction.reportActionID]: {pendingAction: null},
-                [textCommentAction.reportActionID]: {pendingAction: null},
-            },
+    const successData: OnyxUpdate[] = [...tasksForSuccessData];
+    successData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetChatReportID}`,
+        value: {
+            [introductionCommentAction.reportActionID]: {pendingAction: null},
+            [textCommentAction.reportActionID]: {pendingAction: null},
         },
-    ];
+    });
     let failureReport: Partial<Report> = {
         lastMessageTranslationKey: '',
         lastMessageText: '',

From 93b5aa0fed59da63f21024a6f9f72cd25107553c Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Tue, 18 Jun 2024 12:54:48 +0200
Subject: [PATCH 15/33] fix translations

---
 .../ConnectToQuickbooksOnlineButton/index.native.tsx   |  6 ++++--
 .../ConnectToQuickbooksOnlineButton/index.tsx          |  6 ++++--
 src/components/ConnectToSageIntacctButton/index.tsx    |  2 +-
 src/components/ConnectToXeroButton/index.native.tsx    |  6 ++++--
 src/components/ConnectToXeroButton/index.tsx           |  6 ++++--
 src/languages/en.ts                                    |  8 ++++++--
 src/languages/es.ts                                    |  8 ++++++--
 .../workspace/accounting/PolicyAccountingPage.tsx      | 10 ++++++----
 8 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
index fbca4fbb5dae..992c50d99766 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
@@ -36,6 +36,8 @@ function ConnectToQuickbooksOnlineButton({
     const webViewRef = useRef<WebView>(null);
     const [isWebViewOpen, setWebViewOpen] = useState(false);
     const {isOffline} = useNetwork();
+    const currentIntegration = translate('workspace.accounting.integrationName', integrationToDisconnect);
+    const integrationToConnect = translate('workspace.accounting.integrationName', CONST.POLICY.CONNECTIONS.NAME.QBO);
 
     const authToken = session?.authToken ?? null;
 
@@ -58,7 +60,7 @@ function ConnectToQuickbooksOnlineButton({
             />
             {shouldDisconnectIntegrationBeforeConnecting && integrationToDisconnect && isDisconnectModalOpen && (
                 <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', CONST.POLICY.CONNECTIONS.NAME.XERO)}
+                    title={translate('workspace.accounting.disconnectTitle', currentIntegration)}
                     onConfirm={() => {
                         removePolicyConnection(policyID, integrationToDisconnect);
                         setIsDisconnectModalOpen(false);
@@ -66,7 +68,7 @@ function ConnectToQuickbooksOnlineButton({
                     }}
                     isVisible
                     onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.QBO)}
+                    prompt={translate('workspace.accounting.disconnectPrompt', currentIntegration, integrationToConnect)}
                     confirmText={translate('workspace.accounting.disconnect')}
                     cancelText={translate('common.cancel')}
                     danger
diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
index 10c358ad79c0..ad254f83e122 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
@@ -17,6 +17,8 @@ function ConnectToQuickbooksOnlineButton({policyID, shouldDisconnectIntegrationB
     const {translate} = useLocalize();
     const {environmentURL} = useEnvironment();
     const {isOffline} = useNetwork();
+    const currentIntegration = translate('workspace.accounting.integrationName', integrationToDisconnect);
+    const integrationToConnect = translate('workspace.accounting.integrationName', CONST.POLICY.CONNECTIONS.NAME.QBO);
 
     const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
 
@@ -39,7 +41,7 @@ function ConnectToQuickbooksOnlineButton({policyID, shouldDisconnectIntegrationB
             />
             {shouldDisconnectIntegrationBeforeConnecting && integrationToDisconnect && isDisconnectModalOpen && (
                 <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', CONST.POLICY.CONNECTIONS.NAME.XERO)}
+                    title={translate('workspace.accounting.disconnectTitle', currentIntegration)}
                     isVisible={isDisconnectModalOpen}
                     onConfirm={() => {
                         removePolicyConnection(policyID, integrationToDisconnect);
@@ -47,7 +49,7 @@ function ConnectToQuickbooksOnlineButton({policyID, shouldDisconnectIntegrationB
                         setIsDisconnectModalOpen(false);
                     }}
                     onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.QBO)}
+                    prompt={translate('workspace.accounting.disconnectPrompt', currentIntegration, integrationToConnect)}
                     confirmText={translate('workspace.accounting.disconnect')}
                     cancelText={translate('common.cancel')}
                     danger
diff --git a/src/components/ConnectToSageIntacctButton/index.tsx b/src/components/ConnectToSageIntacctButton/index.tsx
index 00e92e26047c..3b40ea86e403 100644
--- a/src/components/ConnectToSageIntacctButton/index.tsx
+++ b/src/components/ConnectToSageIntacctButton/index.tsx
@@ -125,7 +125,7 @@ function ConnectToSageIntacctButton({policyID, shouldDisconnectIntegrationBefore
                         setIsReuseConnectionsPopoverOpen(true);
                     }}
                     onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', integrationToConnect, currentIntegration)}
+                    prompt={translate('workspace.accounting.disconnectPrompt', currentIntegration, integrationToConnect)}
                     confirmText={translate('workspace.accounting.disconnect')}
                     cancelText={translate('common.cancel')}
                     danger
diff --git a/src/components/ConnectToXeroButton/index.native.tsx b/src/components/ConnectToXeroButton/index.native.tsx
index 11cafe2bdfbc..7dd29fc3ea2c 100644
--- a/src/components/ConnectToXeroButton/index.native.tsx
+++ b/src/components/ConnectToXeroButton/index.native.tsx
@@ -32,6 +32,8 @@ function ConnectToXeroButton({policyID, session, shouldDisconnectIntegrationBefo
 
     const authToken = session?.authToken ?? null;
     const {isOffline} = useNetwork();
+    const currentIntegration = translate('workspace.accounting.integrationName', integrationToDisconnect);
+    const integrationToConnect = translate('workspace.accounting.integrationName', CONST.POLICY.CONNECTIONS.NAME.XERO);
 
     const renderLoading = () => <FullScreenLoadingIndicator />;
     const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
@@ -53,7 +55,7 @@ function ConnectToXeroButton({policyID, session, shouldDisconnectIntegrationBefo
             />
             {shouldDisconnectIntegrationBeforeConnecting && isDisconnectModalOpen && integrationToDisconnect && (
                 <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', CONST.POLICY.CONNECTIONS.NAME.QBO)}
+                    title={translate('workspace.accounting.disconnectTitle', currentIntegration)}
                     onConfirm={() => {
                         removePolicyConnection(policyID, integrationToDisconnect);
                         setIsDisconnectModalOpen(false);
@@ -61,7 +63,7 @@ function ConnectToXeroButton({policyID, session, shouldDisconnectIntegrationBefo
                     }}
                     isVisible
                     onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.XERO)}
+                    prompt={translate('workspace.accounting.disconnectPrompt', currentIntegration, integrationToConnect)}
                     confirmText={translate('workspace.accounting.disconnect')}
                     cancelText={translate('common.cancel')}
                     danger
diff --git a/src/components/ConnectToXeroButton/index.tsx b/src/components/ConnectToXeroButton/index.tsx
index 5dd5541dd438..4319c1b4c671 100644
--- a/src/components/ConnectToXeroButton/index.tsx
+++ b/src/components/ConnectToXeroButton/index.tsx
@@ -16,6 +16,8 @@ function ConnectToXeroButton({policyID, shouldDisconnectIntegrationBeforeConnect
     const {translate} = useLocalize();
     const {environmentURL} = useEnvironment();
     const {isOffline} = useNetwork();
+    const currentIntegration = translate('workspace.accounting.integrationName', integrationToDisconnect);
+    const integrationToConnect = translate('workspace.accounting.integrationName', CONST.POLICY.CONNECTIONS.NAME.XERO);
 
     const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
 
@@ -36,7 +38,7 @@ function ConnectToXeroButton({policyID, shouldDisconnectIntegrationBeforeConnect
             />
             {shouldDisconnectIntegrationBeforeConnecting && isDisconnectModalOpen && integrationToDisconnect && (
                 <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', CONST.POLICY.CONNECTIONS.NAME.QBO)}
+                    title={translate('workspace.accounting.disconnectTitle', currentIntegration)}
                     isVisible
                     onConfirm={() => {
                         removePolicyConnection(policyID, integrationToDisconnect);
@@ -44,7 +46,7 @@ function ConnectToXeroButton({policyID, shouldDisconnectIntegrationBeforeConnect
                         setIsDisconnectModalOpen(false);
                     }}
                     onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.XERO)}
+                    prompt={translate('workspace.accounting.disconnectPrompt', currentIntegration, integrationToConnect)}
                     confirmText={translate('workspace.accounting.disconnect')}
                     cancelText={translate('common.cancel')}
                     danger
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 207c7552bb59..81220949fa31 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2450,8 +2450,12 @@ export default {
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE]: 'Not imported',
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: 'Imported, displayed as report fields',
             },
-            disconnectPrompt: (integrationToConnect?: string, currentIntegration?: string): string =>
-                `Are you sure you want to disconnect ${currentIntegration} to set up ${integrationToConnect}?`,
+            disconnectPrompt: (currentIntegration?: string, integrationToConnect?: string): string => {
+                if (!integrationToConnect) {
+                    return `Are you sure you want to disconnect ${currentIntegration || 'this integration'}?`;
+                }
+                return `Are you sure you want to disconnect ${currentIntegration || 'this integration'} to set up ${integrationToConnect}`;
+            },
             enterCredentials: 'Enter your credentials',
             connections: {
                 syncStageName: (stage: PolicyConnectionSyncStage) => {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 477f9f0c242b..41d3083a8bc7 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2454,8 +2454,12 @@ export default {
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE]: 'No importado',
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: 'Importado, mostrado como campo de informe',
             },
-            disconnectPrompt: (integrationToConnect?: string, currentIntegration?: string): string =>
-                `¿Estás seguro de que quieres desconectar ${currentIntegration} para configurar ${integrationToConnect}?`,
+            disconnectPrompt: (currentIntegration?: string, integrationToConnect?: string): string => {
+                if (!integrationToConnect) {
+                    return `¿Estás seguro de que quieres desconectar ${currentIntegration || 'integración'}?`;
+                }
+                return `¿Estás seguro de que quieres desconectar ${currentIntegration || 'this integration'} para configurar ${integrationToConnect}`;
+            },
             enterCredentials: 'Ingresa tus credenciales',
             connections: {
                 syncStageName: (stage: PolicyConnectionSyncStage) => {
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index 304e9f2e6d76..e67388ee50e4 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -362,9 +362,11 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
                             childrenStyles={styles.pt5}
                         >
                             {connectionsMenuItems.map((menuItem) => (
-                                <OfflineWithFeedback pendingAction={menuItem.pendingAction}>
+                                <OfflineWithFeedback
+                                    pendingAction={menuItem.pendingAction}
+                                    key={menuItem.title}
+                                >
                                     <MenuItem
-                                        key={menuItem.title}
                                         brickRoadIndicator={menuItem.brickRoadIndicator}
                                         // eslint-disable-next-line react/jsx-props-no-spreading
                                         {...menuItem}
@@ -388,7 +390,7 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
                     </View>
                 </ScrollView>
                 <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', connectedIntegration)}
+                    title={translate('workspace.accounting.disconnectTitle', translate('workspace.accounting.integrationName', connectedIntegration))}
                     isVisible={isDisconnectModalOpen}
                     onConfirm={() => {
                         if (connectedIntegration) {
@@ -397,7 +399,7 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
                         setIsDisconnectModalOpen(false);
                     }}
                     onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', undefined, connectedIntegration)}
+                    prompt={translate('workspace.accounting.disconnectPrompt', translate('workspace.accounting.integrationName', connectedIntegration))}
                     confirmText={translate('workspace.accounting.disconnect')}
                     cancelText={translate('common.cancel')}
                     danger

From 277f57489421f7583352e0c8c14dab91d5de53e7 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Tue, 18 Jun 2024 12:57:52 +0200
Subject: [PATCH 16/33] fix translations

---
 src/languages/es.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/es.ts b/src/languages/es.ts
index 41d3083a8bc7..35fbfa329eef 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2458,7 +2458,7 @@ export default {
                 if (!integrationToConnect) {
                     return `¿Estás seguro de que quieres desconectar ${currentIntegration || 'integración'}?`;
                 }
-                return `¿Estás seguro de que quieres desconectar ${currentIntegration || 'this integration'} para configurar ${integrationToConnect}`;
+                return `¿Estás seguro de que quieres desconectar ${currentIntegration || 'integración'} para configurar ${integrationToConnect}`;
             },
             enterCredentials: 'Ingresa tus credenciales',
             connections: {

From 722ceedc349c2e69ce9e826220341f0170331ea2 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Tue, 18 Jun 2024 14:26:44 +0200
Subject: [PATCH 17/33] fix eslint

---
 src/languages/en.ts | 2 ++
 src/languages/es.ts | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 81220949fa31..2e1eb60f573e 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2452,8 +2452,10 @@ export default {
             },
             disconnectPrompt: (currentIntegration?: string, integrationToConnect?: string): string => {
                 if (!integrationToConnect) {
+                    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                     return `Are you sure you want to disconnect ${currentIntegration || 'this integration'}?`;
                 }
+                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                 return `Are you sure you want to disconnect ${currentIntegration || 'this integration'} to set up ${integrationToConnect}`;
             },
             enterCredentials: 'Enter your credentials',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 35fbfa329eef..ee715ad8c003 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2456,8 +2456,10 @@ export default {
             },
             disconnectPrompt: (currentIntegration?: string, integrationToConnect?: string): string => {
                 if (!integrationToConnect) {
+                    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                     return `¿Estás seguro de que quieres desconectar ${currentIntegration || 'integración'}?`;
                 }
+                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                 return `¿Estás seguro de que quieres desconectar ${currentIntegration || 'integración'} para configurar ${integrationToConnect}`;
             },
             enterCredentials: 'Ingresa tus credenciales',

From aa1ed19a0b0f3173127fc1b4597ed31f83877378 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Wed, 19 Jun 2024 13:56:36 +0200
Subject: [PATCH 18/33] fix PR comments

---
 src/CONST.ts                                        |  2 +-
 src/components/ConnectToSageIntacctButton/index.tsx |  2 +-
 src/languages/en.ts                                 |  2 +-
 src/languages/es.ts                                 |  2 +-
 src/libs/Permissions.ts                             |  4 ++--
 src/libs/PolicyUtils.ts                             |  2 +-
 src/libs/fileDownload/index.ts                      |  7 ++++++-
 .../intacct/EnterSageIntacctCredentialsPage.tsx     | 10 +++++++---
 .../accounting/intacct/ExistingConnectionsPage.tsx  |  3 ++-
 .../accounting/intacct/IntacctPrerequisitesPage.tsx | 13 ++++++-------
 src/styles/index.ts                                 |  5 +++++
 11 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 7aac1ad930ce..46793a5cb1d6 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -591,7 +591,7 @@ const CONST = {
     ONFIDO_TERMS_OF_SERVICE_URL: 'https://onfido.com/terms-of-service/',
     LIST_OF_RESTRICTED_BUSINESSES: 'https://community.expensify.com/discussion/6191/list-of-restricted-businesses',
     TRAVEL_TERMS_URL: `${USE_EXPENSIFY_URL}/travelterms`,
-    EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT: `${USE_EXPENSIFY_URL}/tools/integrations/downloadPackage`,
+    EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT: `https://www.expensify.com/tools/integrations/downloadPackage`,
     HOW_TO_CONNECT_TO_SAGE_INTACCT: 'https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Sage-Intacct#how-to-connect-to-sage-intacct',
 
     // Use Environment.getEnvironmentURL to get the complete URL with port number
diff --git a/src/components/ConnectToSageIntacctButton/index.tsx b/src/components/ConnectToSageIntacctButton/index.tsx
index 3b40ea86e403..0a2d77b4428f 100644
--- a/src/components/ConnectToSageIntacctButton/index.tsx
+++ b/src/components/ConnectToSageIntacctButton/index.tsx
@@ -34,7 +34,7 @@ function ConnectToSageIntacctButton({policyID, shouldDisconnectIntegrationBefore
     const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
 
     const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
-    const hasPoliciesConnectedToSageIntacct = !!getPoliciesConnectedToSageIntacct(policies);
+    const hasPoliciesConnectedToSageIntacct = !!getPoliciesConnectedToSageIntacct(policies).length;
     const {isSmallScreenWidth} = useWindowDimensions();
     const [isReuseConnectionsPopoverOpen, setIsReuseConnectionsPopoverOpen] = useState(false);
     const [reuseConnectionPopoverPosition, setReuseConnectionPopoverPosition] = useState<AnchorPosition>({horizontal: 0, vertical: 0});
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 2e1eb60f573e..11bac2c34cf0 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2182,7 +2182,7 @@ export default {
             createNewConnection: 'Create new connection',
             reuseExitingConnection: 'Reuse existing connection',
             existingConnections: 'Existing connections',
-            sageIntacctLastSync: ({formattedDate}) => `Sage Intacct - Last synced ${formattedDate}`,
+            sageIntacctLastSync: (formattedDate: string) => `Sage Intacct - Last synced ${formattedDate}`,
         },
         type: {
             free: 'Free',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index ee715ad8c003..79577af9f65e 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2218,7 +2218,7 @@ export default {
             createNewConnection: 'Crear una nueva conexión',
             reuseExitingConnection: 'Reutilizar la conexión existente',
             existingConnections: 'Conexiones existentes',
-            sageIntacctLastSync: ({formattedDate}) => `Sage Intacct - Última sincronización ${formattedDate}`,
+            sageIntacctLastSync: (formattedDate: string) => `Sage Intacct - Última sincronización ${formattedDate}`,
         },
         type: {
             free: 'Gratis',
diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 45551fe1cad9..323c994831e4 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -37,11 +37,11 @@ function canUseSpotnanaTravel(betas: OnyxEntry<Beta[]>): boolean {
 }
 
 function canUseAccountingIntegrations(betas: OnyxEntry<Beta[]>): boolean {
-    return !!betas?.includes(CONST.BETAS.ACCOUNTING_ON_NEW_EXPENSIFY) || canUseAllBetas(betas);
+    return true;
 }
 
 function canUseXeroIntegration(betas: OnyxEntry<Beta[]>): boolean {
-    return !!betas?.includes(CONST.BETAS.XERO_ON_NEW_EXPENSIFY) || canUseAllBetas(betas);
+    return true;
 }
 
 /**
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 0111f032c53b..8bc5036c1638 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -462,7 +462,7 @@ function getXeroBankAccountsWithDefaultSelect(policy: Policy | undefined, select
 }
 
 function getPoliciesConnectedToSageIntacct(policies: OnyxCollection<Policy>): Policy[] {
-    return Object.values(policies ?? {}).filter<Policy>((policy): policy is Policy => policy !== null && !!policy && !!policy?.connections?.intacct);
+    return Object.values(policies ?? {}).filter<Policy>((policy): policy is Policy => !!policy && !!policy?.connections?.intacct);
 }
 
 /**
diff --git a/src/libs/fileDownload/index.ts b/src/libs/fileDownload/index.ts
index 3bae37c2ed6b..8133b5e5d7d1 100644
--- a/src/libs/fileDownload/index.ts
+++ b/src/libs/fileDownload/index.ts
@@ -11,7 +11,12 @@ import type {FileDownload} from './types';
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const fileDownload: FileDownload = (url, fileName, successMessage = '', shouldOpenExternalLink = false) => {
     const resolvedUrl = tryResolveUrlFromApiRoot(url);
-    if (shouldOpenExternalLink || (!resolvedUrl.startsWith(ApiUtils.getApiRoot()) && !CONST.ATTACHMENT_LOCAL_URL_PREFIX.some((prefix) => resolvedUrl.startsWith(prefix)))) {
+    if (
+        shouldOpenExternalLink ||
+        (!resolvedUrl.startsWith(ApiUtils.getApiRoot()) &&
+            !CONST.ATTACHMENT_LOCAL_URL_PREFIX.some((prefix) => resolvedUrl.startsWith(prefix)) &&
+            url !== CONST.EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT)
+    ) {
         // Different origin URLs might pose a CORS issue during direct downloads.
         // Opening in a new tab avoids this limitation, letting the browser handle the download.
         Link.openExternalLink(url);
diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
index 59fccdd3dd0f..9107b5e4bf13 100644
--- a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -16,6 +16,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import INPUT_IDS from '@src/types/form/SageIntactCredentialsForm';
 
@@ -59,7 +60,7 @@ function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps)
         >
             <HeaderWithBackButton
                 title={translate('workspace.intacct.sageIntacctSetup')}
-                onBackButtonPress={() => Navigation.goBack()}
+                onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID))}
             />
             <FormProvider
                 style={[styles.flexGrow1, styles.ph5]}
@@ -73,16 +74,19 @@ function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps)
             >
                 <Text style={[styles.textHeadlineH1, styles.pb5, styles.pt3]}>{translate('workspace.intacct.enterCredentials')}</Text>
                 {formItems.map((formItem) => (
-                    <View style={styles.mb4}>
+                    <View
+                        style={styles.mb4}
+                        key={formItem}
+                    >
                         <InputWrapper
                             InputComponent={TextInput}
                             inputID={formItem}
-                            name="companyID"
                             label={translate(`common.${formItem}`)}
                             aria-label={translate(`common.${formItem}`)}
                             role={CONST.ROLE.PRESENTATION}
                             defaultValue={sageIntacctCredentialsDraft?.[formItem]}
                             spellCheck={false}
+                            secureTextEntry={formItem === INPUT_IDS.PASSWORD}
                         />
                     </View>
                 ))}
diff --git a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
index f67eb7177a7e..988fc72931fc 100644
--- a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
@@ -13,6 +13,7 @@ import {getPoliciesConnectedToSageIntacct} from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
 type ExistingConnectionsPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS>;
@@ -46,7 +47,7 @@ function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) {
             <HeaderWithBackButton
                 title={translate('workspace.intacct.existingConnections')}
                 shouldShowBackButton
-                onBackButtonPress={() => Navigation.goBack()}
+                onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID))}
             />
             <View style={[styles.flex1]}>
                 <MenuItemList
diff --git a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
index 8a4a6896bd99..0902b72f97ba 100644
--- a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
@@ -14,6 +14,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import fileDownload from '@libs/fileDownload';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import * as ReportActionContextMenu from '@pages/home/report/ContextMenu/ReportActionContextMenu';
@@ -38,9 +39,8 @@ function IntacctPrerequisitesPage({route}: IntacctPrerequisitesPageProps) {
                 icon: Expensicons.Download,
                 iconRight: Expensicons.NewWindow,
                 shouldShowRightIcon: true,
-                action: () => {
-                    Link.openExternalLink(CONST.EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT);
-                    return Promise.resolve();
+                onPress: () => {
+                    fileDownload('https://www.expensify.com/tools/integrations/downloadPackage', 'ExpensifyPackageForSageIntacct');
                 },
                 onSecondaryInteraction: (event: GestureResponderEvent | MouseEvent) =>
                     ReportActionContextMenu.showContextMenu(CONST.CONTEXT_MENU_TYPES.LINK, event, CONST.EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT, popoverAnchor.current),
@@ -52,9 +52,8 @@ function IntacctPrerequisitesPage({route}: IntacctPrerequisitesPageProps) {
                 icon: Expensicons.Task,
                 iconRight: Expensicons.NewWindow,
                 shouldShowRightIcon: true,
-                action: () => {
+                onPress: () => {
                     Link.openExternalLink(CONST.HOW_TO_CONNECT_TO_SAGE_INTACCT);
-                    return Promise.resolve();
                 },
                 onSecondaryInteraction: (event: GestureResponderEvent | MouseEvent) =>
                     ReportActionContextMenu.showContextMenu(CONST.CONTEXT_MENU_TYPES.LINK, event, CONST.HOW_TO_CONNECT_TO_SAGE_INTACCT, popoverAnchor.current),
@@ -75,8 +74,8 @@ function IntacctPrerequisitesPage({route}: IntacctPrerequisitesPageProps) {
                 shouldShowBackButton
                 onBackButtonPress={() => Navigation.goBack()}
             />
-            <View style={[styles.flex1]}>
-                <View style={{width: 'auto', height: 188}}>
+            <View style={styles.flex1}>
+                <View style={styles.computerIllustrationContainer}>
                     <ImageSVG src={Computer} />
                 </View>
 
diff --git a/src/styles/index.ts b/src/styles/index.ts
index e4b6bb7935bb..badecacb5686 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -4995,6 +4995,11 @@ const styles = (theme: ThemeColors) =>
             flex: 1,
         },
 
+        computerIllustrationContainer: {
+            width: 'auto',
+            height: 188,
+        },
+
         tripReservationIconContainer: {
             width: variables.avatarSizeNormal,
             height: variables.avatarSizeNormal,

From 1d85d001ec9c598150d88293e0fdaaf59130c369 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Wed, 19 Jun 2024 14:10:21 +0200
Subject: [PATCH 19/33] fix ComputerIllustration style

---
 .../workspace/accounting/intacct/IntacctPrerequisitesPage.tsx   | 2 +-
 src/styles/index.ts                                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
index 0902b72f97ba..a7ac48baf4fc 100644
--- a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
@@ -75,7 +75,7 @@ function IntacctPrerequisitesPage({route}: IntacctPrerequisitesPageProps) {
                 onBackButtonPress={() => Navigation.goBack()}
             />
             <View style={styles.flex1}>
-                <View style={styles.computerIllustrationContainer}>
+                <View style={[styles.alignSelfCenter, styles.computerIllustrationContainer]}>
                     <ImageSVG src={Computer} />
                 </View>
 
diff --git a/src/styles/index.ts b/src/styles/index.ts
index badecacb5686..96124f46b584 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -4996,7 +4996,7 @@ const styles = (theme: ThemeColors) =>
         },
 
         computerIllustrationContainer: {
-            width: 'auto',
+            width: 272,
             height: 188,
         },
 

From 29266a5f82cbafc7110b2ab01c1a512edf48487e Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Wed, 19 Jun 2024 14:25:26 +0200
Subject: [PATCH 20/33] fix PErmissions.ts

---
 src/libs/Permissions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index cdadc1ab44a6..77326629a331 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -41,11 +41,11 @@ function canUseSpotnanaTravel(betas: OnyxEntry<Beta[]>): boolean {
 }
 
 function canUseAccountingIntegrations(betas: OnyxEntry<Beta[]>): boolean {
-    return true;
+    return !betas?.includes(CONST.BETAS.ACCOUNTING_ON_NEW_EXPENSIFY) || canUseAllBetas(betas);
 }
 
 function canUseXeroIntegration(betas: OnyxEntry<Beta[]>): boolean {
-    return true;
+    return !betas?.includes(CONST.BETAS.XERO_ON_NEW_EXPENSIFY) || canUseAllBetas(betas);
 }
 
 /**

From 518dbce354b164e13c407041836304e55702ea7c Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Wed, 19 Jun 2024 14:28:23 +0200
Subject: [PATCH 21/33] fix Permissions.ts

---
 src/libs/Permissions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 77326629a331..7ef4c9325a14 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -41,11 +41,11 @@ function canUseSpotnanaTravel(betas: OnyxEntry<Beta[]>): boolean {
 }
 
 function canUseAccountingIntegrations(betas: OnyxEntry<Beta[]>): boolean {
-    return !betas?.includes(CONST.BETAS.ACCOUNTING_ON_NEW_EXPENSIFY) || canUseAllBetas(betas);
+    return !!betas?.includes(CONST.BETAS.ACCOUNTING_ON_NEW_EXPENSIFY) || canUseAllBetas(betas);
 }
 
 function canUseXeroIntegration(betas: OnyxEntry<Beta[]>): boolean {
-    return !betas?.includes(CONST.BETAS.XERO_ON_NEW_EXPENSIFY) || canUseAllBetas(betas);
+    return !!betas?.includes(CONST.BETAS.XERO_ON_NEW_EXPENSIFY) || canUseAllBetas(betas);
 }
 
 /**

From 7fccce5368be771b8ae672422595444b0225ee0b Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Tue, 25 Jun 2024 11:08:54 +0200
Subject: [PATCH 22/33] connect to BE

---
 .../ConnectPolicyToSageIntacctParams.ts       |  8 +++++
 src/libs/API/types.ts                         |  1 +
 src/libs/PolicyUtils.ts                       | 19 ++++++++++-
 src/libs/actions/connections/SageIntacct.ts   | 15 +++++++++
 .../accounting/PolicyAccountingPage.tsx       |  4 +--
 .../EnterSageIntacctCredentialsPage.tsx       | 16 +++++----
 .../intacct/ExistingConnectionsPage.tsx       | 16 +++++----
 .../intacct/IntacctPrerequisitesPage.tsx      |  2 +-
 src/types/onyx/Policy.ts                      | 33 ++++++++++++++++++-
 9 files changed, 96 insertions(+), 18 deletions(-)
 create mode 100644 src/libs/API/parameters/ConnectPolicyToSageIntacctParams.ts
 create mode 100644 src/libs/actions/connections/SageIntacct.ts

diff --git a/src/libs/API/parameters/ConnectPolicyToSageIntacctParams.ts b/src/libs/API/parameters/ConnectPolicyToSageIntacctParams.ts
new file mode 100644
index 000000000000..2ff49dd96bf3
--- /dev/null
+++ b/src/libs/API/parameters/ConnectPolicyToSageIntacctParams.ts
@@ -0,0 +1,8 @@
+type ConnectPolicyToSageIntacctParams = {
+    policyID: string;
+    intacctCompanyID?: string;
+    intacctUserID?: string;
+    intacctPassword?: string;
+};
+
+export default ConnectPolicyToSageIntacctParams;
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 92b6d7679418..4352c9f2ca33 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -462,6 +462,7 @@ const READ_COMMANDS = {
     CONNECT_POLICY_TO_XERO: 'ConnectPolicyToXero',
     SYNC_POLICY_TO_QUICKBOOKS_ONLINE: 'SyncPolicyToQuickbooksOnline',
     SYNC_POLICY_TO_XERO: 'SyncPolicyToXero',
+    CONNECT_POLICY_TO_SAGE_INTACCT: 'ConnectPolicyToSageIntacct',
     OPEN_REIMBURSEMENT_ACCOUNT_PAGE: 'OpenReimbursementAccountPage',
     OPEN_WORKSPACE_VIEW: 'OpenWorkspaceView',
     GET_MAPBOX_ACCESS_TOKEN: 'GetMapboxAccessToken',
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 8bc5036c1638..6a6202ae9697 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -7,7 +7,7 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {OnyxInputOrEntry, Policy, PolicyCategories, PolicyEmployeeList, PolicyTagList, PolicyTags, TaxRate} from '@src/types/onyx';
-import type {CustomUnit, PolicyFeatureName, Rate, Tenant} from '@src/types/onyx/Policy';
+import type {ConnectionLastSync, Connections, CustomUnit, NetSuiteConnection, PolicyFeatureName, Rate, Tenant} from '@src/types/onyx/Policy';
 import type PolicyEmployee from '@src/types/onyx/PolicyEmployee';
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
@@ -22,6 +22,11 @@ type WorkspaceDetails = {
     name: string;
 };
 
+type ConnectionWithLastSyncData = {
+    /** State of the last synchronization */
+    lastSync?: ConnectionLastSync;
+};
+
 let allPolicies: OnyxCollection<Policy>;
 
 Onyx.connect({
@@ -465,6 +470,17 @@ function getPoliciesConnectedToSageIntacct(policies: OnyxCollection<Policy>): Po
     return Object.values(policies ?? {}).filter<Policy>((policy): policy is Policy => !!policy && !!policy?.connections?.intacct);
 }
 
+// eslint-disable-next-line rulesdir/prefer-early-return
+function getIntegrationLastSuccessfulDate(connection?: Connections[keyof Connections]) {
+    if (!connection) {
+        return undefined;
+    }
+    if ((connection as NetSuiteConnection)?.lastSyncDate) {
+        return (connection as NetSuiteConnection)?.lastSyncDate;
+    }
+    return (connection as ConnectionWithLastSyncData)?.lastSync?.successfulDate;
+}
+
 /**
  * Sort the workspaces by their name, while keeping the selected one at the beginning.
  * @param workspace1 Details of the first workspace to be compared.
@@ -556,6 +572,7 @@ export {
     sortWorkspacesBySelected,
     removePendingFieldsFromCustomUnit,
     navigateWhenEnableFeature,
+    getIntegrationLastSuccessfulDate,
 };
 
 export type {MemberEmailsToAccountIDs};
diff --git a/src/libs/actions/connections/SageIntacct.ts b/src/libs/actions/connections/SageIntacct.ts
new file mode 100644
index 000000000000..1c5eeb93211f
--- /dev/null
+++ b/src/libs/actions/connections/SageIntacct.ts
@@ -0,0 +1,15 @@
+import * as API from '@libs/API';
+import type ConnectPolicyToSageIntacctParams from '@libs/API/parameters/ConnectPolicyToSageIntacctParams';
+import {READ_COMMANDS} from '@libs/API/types';
+
+function connectToSageIntacct(policyID: string, companyID?: string, userID?: string, password?: string) {
+    const parameters: ConnectPolicyToSageIntacctParams = {
+        policyID,
+        intacctCompanyID: companyID,
+        intacctUserID: userID,
+        intacctPassword: password,
+    };
+    API.read(READ_COMMANDS.CONNECT_POLICY_TO_SAGE_INTACCT, parameters, {});
+}
+
+export default connectToSageIntacct;
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index edd6561e525a..3ed111055a8a 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -29,7 +29,7 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import {hasSynchronizationError, removePolicyConnection, syncConnection} from '@libs/actions/connections';
-import {findCurrentXeroOrganization, getCurrentXeroOrganizationName, getXeroTenants} from '@libs/PolicyUtils';
+import {findCurrentXeroOrganization, getCurrentXeroOrganizationName, getIntegrationLastSuccessfulDate, getXeroTenants} from '@libs/PolicyUtils';
 import Navigation from '@navigation/Navigation';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
@@ -145,7 +145,7 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
     );
     const connectedIntegration = accountingIntegrations.find((integration) => !!policy?.connections?.[integration]) ?? connectionSyncProgress?.connectionName;
     const policyID = policy?.id ?? '-1';
-    const successfulDate = connectedIntegration ? policy?.connections?.[connectedIntegration]?.lastSync?.successfulDate : undefined;
+    const successfulDate = getIntegrationLastSuccessfulDate(connectedIntegration ? policy?.connections?.[connectedIntegration] : undefined);
 
     const policyConnectedToXero = connectedIntegration === CONST.POLICY.CONNECTIONS.NAME.XERO;
     const tenants = useMemo(() => getXeroTenants(policy), [policy]);
diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
index 9107b5e4bf13..9084056db7f4 100644
--- a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -11,6 +11,7 @@ import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import connectToSageIntacct from '@libs/actions/connections/SageIntacct';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
@@ -25,15 +26,16 @@ type IntacctPrerequisitesPageProps = StackScreenProps<SettingsNavigatorParamList
 function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const policyID = route.params.policyID; // this will be used for connecting to Sage Intacct
+    const policyID: string = route.params.policyID;
 
     const [sageIntacctCredentialsDraft] = useOnyx(ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM_DRAFT);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const confirmCredentials = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM>) => {
-        // here we call ConnectToSageIntacct API command
-        Navigation.goBack();
-    }, []);
+    const confirmCredentials = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM>) => {
+            connectToSageIntacct(policyID, values[INPUT_IDS.COMPANY_ID], values[INPUT_IDS.USER_ID], values[INPUT_IDS.PASSWORD]);
+            Navigation.goBack(ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID));
+        },
+        [policyID],
+    );
 
     const formItems = Object.values(INPUT_IDS);
     const validate = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM>) => {
diff --git a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
index 988fc72931fc..f08ee64f1c7e 100644
--- a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
@@ -7,6 +7,7 @@ import MenuItemList from '@components/MenuItemList';
 import ScreenWrapper from '@components/ScreenWrapper';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import connectToSageIntacct from '@libs/actions/connections/SageIntacct';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import {getPoliciesConnectedToSageIntacct} from '@libs/PolicyUtils';
@@ -23,10 +24,9 @@ function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) {
     const styles = useThemeStyles();
     const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
     const policiesConnectedToSageIntacct = getPoliciesConnectedToSageIntacct(policies);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const policyID = route.params.policyID; // we'll need this when connecting to policy
+    const policyID: string = route.params.policyID;
 
-    const menuItemsBetter = policiesConnectedToSageIntacct.map((policy) => {
+    const menuItems = policiesConnectedToSageIntacct.map((policy) => {
         const lastSuccessfulSyncDate = policy.connections?.intacct.lastSync?.successfulDate;
         const date = lastSuccessfulSyncDate ? datetimeToRelative(lastSuccessfulSyncDate) : undefined;
         return {
@@ -35,6 +35,10 @@ function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) {
             icon: policy.avatarURL ? policy.avatarURL : ReportUtils.getDefaultWorkspaceAvatar(policy.name),
             iconType: policy.avatarURL ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_WORKSPACE,
             description: date ? translate('workspace.intacct.sageIntacctLastSync', date) : translate('workspace.accounting.intacct'),
+            onPress: () => {
+                // waiting for backend for reusing existing connections
+                Navigation.goBack(ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID));
+            },
         };
     });
 
@@ -47,11 +51,11 @@ function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) {
             <HeaderWithBackButton
                 title={translate('workspace.intacct.existingConnections')}
                 shouldShowBackButton
-                onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID))}
+                onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID))}
             />
             <View style={[styles.flex1]}>
                 <MenuItemList
-                    menuItems={menuItemsBetter}
+                    menuItems={menuItems}
                     shouldUseSingleExecution
                 />
             </View>
@@ -59,6 +63,6 @@ function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) {
     );
 }
 
-ExistingConnectionsPage.displayName = 'IntacctPrerequisitesPage';
+ExistingConnectionsPage.displayName = 'ExistingConnectionsPage';
 
 export default ExistingConnectionsPage;
diff --git a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
index a7ac48baf4fc..8b5085c5ba82 100644
--- a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
@@ -29,7 +29,7 @@ function IntacctPrerequisitesPage({route}: IntacctPrerequisitesPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const popoverAnchor = useRef<View | RNText | null>(null);
-    const policyID = route.params.policyID;
+    const policyID: string = route.params.policyID;
 
     const menuItems = useMemo(
         () => [
diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index cc5311d7e962..d125543fd30d 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -949,6 +949,35 @@ type NetSuiteConnection = {
     tokenSecret: string;
 };
 
+/**
+ * Connection data for Sage Intacct
+ */
+// eslint-disable-next-line @typescript-eslint/ban-types
+type SageIntacctConnectionData = {};
+
+/**
+ * Connection config for Sage Intacct
+ */
+type SageIntacctConnectiosConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
+    /** Sage Intacct credentials */
+    credentials: {
+        /** Sage Intacct companyID */
+        companyID: string;
+
+        /** Sage Intacct password */
+        password: string;
+
+        /** Sage Intacct userID */
+        userID: string;
+    };
+
+    /** Collection of Sage Intacct config errors */
+    errors?: OnyxCommon.Errors;
+
+    /** Collection of form field errors  */
+    errorFields?: OnyxCommon.ErrorFields;
+}>;
+
 /** State of integration connection */
 type Connection<ConnectionData, ConnectionConfig> = {
     /** State of the last synchronization */
@@ -973,7 +1002,7 @@ type Connections = {
     netsuite: NetSuiteConnection;
 
     /** Sage Intacct integration connection */
-    intacct: Connection<XeroConnectionData, XeroConnectionConfig>; // for now I'm using XeroConfig as a placeholder, I'll add IntacctConnection and IntacctConnectionConfig in this task https://github.com/Expensify/App/issues/43533
+    intacct: Connection<SageIntacctConnectionData, SageIntacctConnectiosConfig>;
 };
 
 /** Names of integration connections */
@@ -1317,4 +1346,6 @@ export type {
     QBOReimbursableExportAccountType,
     QBOConnectionConfig,
     XeroTrackingCategory,
+    NetSuiteConnection,
+    ConnectionLastSync,
 };

From 9db4670d24acd4194c9ae5bec8c6a55281b5be9b Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Tue, 25 Jun 2024 13:13:56 +0200
Subject: [PATCH 23/33] add sync stage translations

---
 src/CONST.ts                                         |  6 ++++++
 src/languages/en.ts                                  | 12 ++++++++++++
 .../intacct/EnterSageIntacctCredentialsPage.tsx      |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 1024dd6eb768..ea461571fbce 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1852,6 +1852,12 @@ const CONST = {
                 NETSUITE_SYNC_UPDATE_DATA: 'netSuiteSyncUpdateConnectionData',
                 NETSUITE_SYNC_NETSUITE_REIMBURSED_REPORTS: 'netSuiteSyncNetSuiteReimbursedReports',
                 NETSUITE_SYNC_EXPENSIFY_REIMBURSED_REPORTS: 'netSuiteSyncExpensifyReimbursedReports',
+                SAGE_INTACCT_SYNC_CHECK_CONNECTION: 'intacctCheckConnection',
+                SAGE_INTACCT_SYNC_IMPORT_TITLE: 'intacctImportTitle',
+                SAGE_INTACCT_SYNC_IMPORT_DATA: 'intacctImportData',
+                SAGE_INTACCT_SYNC_IMPORT_EMPLOYEES: 'intacctImportEmployees',
+                SAGE_INTACCT_SYNC_IMPORT_DIMENSIONS: 'intacctImportDimensions',
+                SAGE_INTACCT_SYNC_IMPORT_SYNC_REIMBURSED_REPORTS: 'intacctImportSyncBillPayments',
             },
             SYNC_STAGE_TIMEOUT_MINUTES: 20,
         },
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 5d08983e5b9f..8956d8222e4a 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2562,6 +2562,18 @@ export default {
                             return 'Marking Expensify reports as reimbursed';
                         case 'netSuiteSyncExpensifyReimbursedReports':
                             return 'Marking NetSuite bills and invoices as paid';
+                        case 'intacctCheckConnection':
+                            return 'Checking Sage Intacct connection';
+                        case 'intacctImportTitle':
+                            return 'Importing Sage Intacct data';
+                        case 'intacctImportData':
+                            return 'Importing Sage Intacct data';
+                        case 'intacctImportEmployees':
+                            return 'Importing employees';
+                        case 'intacctImportDimensions':
+                            return 'Importing dimensions';
+                        case 'intacctImportSyncBillPayments':
+                            return 'Syncing reimbursed reports and bill payments';
                         default: {
                             return `Translation missing for stage: ${stage}`;
                         }
diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
index 9084056db7f4..09d049ad4fef 100644
--- a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -32,7 +32,7 @@ function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps)
     const confirmCredentials = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM>) => {
             connectToSageIntacct(policyID, values[INPUT_IDS.COMPANY_ID], values[INPUT_IDS.USER_ID], values[INPUT_IDS.PASSWORD]);
-            Navigation.goBack(ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID));
+            Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID));
         },
         [policyID],
     );

From 88bf2cdf2ca2f13db5b1ebb783fcb62d23ccbb84 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Thu, 27 Jun 2024 13:27:07 +0200
Subject: [PATCH 24/33] fix PR comments

---
 src/CONST.ts                                  |  3 +-
 src/ROUTES.ts                                 |  4 +-
 .../ConnectToSageIntacctButton/index.tsx      |  9 +--
 src/languages/en.ts                           |  2 +-
 src/languages/es.ts                           |  2 +-
 .../ConnectPolicyToSageIntacctParams.ts       |  6 +-
 src/libs/API/types.ts                         |  1 +
 .../ModalStackNavigators/index.tsx            |  6 +-
 src/libs/Permissions.ts                       |  2 +-
 src/libs/PolicyUtils.ts                       |  6 --
 src/libs/actions/Policy/Policy.ts             |  5 ++
 src/libs/actions/connections/SageIntacct.ts   | 14 ++--
 src/libs/actions/connections/index.ts         | 64 ++++++++++++-------
 src/libs/fileDownload/index.ts                |  1 +
 .../EnterSageIntacctCredentialsPage.tsx       | 30 ++++-----
 .../intacct/ExistingConnectionsPage.tsx       | 10 +--
 .../intacct/IntacctPrerequisitesPage.tsx      |  2 +-
 17 files changed, 90 insertions(+), 77 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 0a2b5427cc5a..cd1a2f117888 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -601,7 +601,8 @@ const CONST = {
     ONFIDO_TERMS_OF_SERVICE_URL: 'https://onfido.com/terms-of-service/',
     LIST_OF_RESTRICTED_BUSINESSES: 'https://community.expensify.com/discussion/6191/list-of-restricted-businesses',
     TRAVEL_TERMS_URL: `${USE_EXPENSIFY_URL}/travelterms`,
-    EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT: `https://www.expensify.com/tools/integrations/downloadPackage`,
+    EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT: 'https://www.expensify.com/tools/integrations/downloadPackage',
+    EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT_FILE_NAME: 'ExpensifyPackageForSageIntacct',
     HOW_TO_CONNECT_TO_SAGE_INTACCT: 'https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Sage-Intacct#how-to-connect-to-sage-intacct',
 
     // Use Environment.getEnvironmentURL to get the complete URL with port number
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index f58c10b43aed..eb0670a723d8 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -934,8 +934,8 @@ const ROUTES = {
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/enter-credentials` as const,
     },
     POLICY_ACCOUNTING_SAGE_INTACCT_EXISTING_CONNECTIONS: {
-        route: 'settings/workspaces/:policyID/accounting/sage-intacct/exisitng-connections',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/exisitng-connections` as const,
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/existing-connections',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/existing-connections` as const,
     },
 } as const;
 
diff --git a/src/components/ConnectToSageIntacctButton/index.tsx b/src/components/ConnectToSageIntacctButton/index.tsx
index 0a2d77b4428f..da8b472abdbb 100644
--- a/src/components/ConnectToSageIntacctButton/index.tsx
+++ b/src/components/ConnectToSageIntacctButton/index.tsx
@@ -1,6 +1,5 @@
 import React, {useRef, useState} from 'react';
 import type {View} from 'react-native';
-import {useOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import ConfirmModal from '@components/ConfirmModal';
 import * as Expensicons from '@components/Icon/Expensicons';
@@ -10,11 +9,10 @@ import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import {removePolicyConnection} from '@libs/actions/connections';
+import {getPoliciesConnectedToSageIntacct} from '@libs/actions/Policy/Policy';
 import Navigation from '@libs/Navigation/Navigation';
-import {getPoliciesConnectedToSageIntacct} from '@libs/PolicyUtils';
 import type {AnchorPosition} from '@styles/index';
 import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {PolicyConnectionName} from '@src/types/onyx/Policy';
 
@@ -33,8 +31,7 @@ function ConnectToSageIntacctButton({policyID, shouldDisconnectIntegrationBefore
 
     const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
 
-    const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
-    const hasPoliciesConnectedToSageIntacct = !!getPoliciesConnectedToSageIntacct(policies).length;
+    const hasPoliciesConnectedToSageIntacct = !!getPoliciesConnectedToSageIntacct().length;
     const {isSmallScreenWidth} = useWindowDimensions();
     const [isReuseConnectionsPopoverOpen, setIsReuseConnectionsPopoverOpen] = useState(false);
     const [reuseConnectionPopoverPosition, setReuseConnectionPopoverPosition] = useState<AnchorPosition>({horizontal: 0, vertical: 0});
@@ -50,7 +47,7 @@ function ConnectToSageIntacctButton({policyID, shouldDisconnectIntegrationBefore
         },
         {
             icon: Expensicons.Copy,
-            text: translate('workspace.intacct.reuseExitingConnection'),
+            text: translate('workspace.intacct.reuseExistingConnection'),
             onSelected: () => {
                 Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXISTING_CONNECTIONS.getRoute(policyID));
                 setIsReuseConnectionsPopoverOpen(false);
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 3fb79773a8d4..a334a7c5f73a 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2197,7 +2197,7 @@ export default {
             followSteps: 'Follow the steps in our How-to: Connect to Sage Intacct instructions',
             enterCredentials: 'Enter your Sage Intacct credentials',
             createNewConnection: 'Create new connection',
-            reuseExitingConnection: 'Reuse existing connection',
+            reuseExistingConnection: 'Reuse existing connection',
             existingConnections: 'Existing connections',
             sageIntacctLastSync: (formattedDate: string) => `Sage Intacct - Last synced ${formattedDate}`,
         },
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 13d4b732cd6e..4324cb4e7d6d 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2233,7 +2233,7 @@ export default {
             followSteps: 'Siga los pasos de nuestras instrucciones Cómo: Instrucciones para conectarse a Sage Intacct',
             enterCredentials: 'Introduzca sus credenciales de Sage Intacct',
             createNewConnection: 'Crear una nueva conexión',
-            reuseExitingConnection: 'Reutilizar la conexión existente',
+            reuseExistingConnection: 'Reutilizar la conexión existente',
             existingConnections: 'Conexiones existentes',
             sageIntacctLastSync: (formattedDate: string) => `Sage Intacct - Última sincronización ${formattedDate}`,
         },
diff --git a/src/libs/API/parameters/ConnectPolicyToSageIntacctParams.ts b/src/libs/API/parameters/ConnectPolicyToSageIntacctParams.ts
index 2ff49dd96bf3..3b5cfc973e4d 100644
--- a/src/libs/API/parameters/ConnectPolicyToSageIntacctParams.ts
+++ b/src/libs/API/parameters/ConnectPolicyToSageIntacctParams.ts
@@ -1,8 +1,8 @@
 type ConnectPolicyToSageIntacctParams = {
     policyID: string;
-    intacctCompanyID?: string;
-    intacctUserID?: string;
-    intacctPassword?: string;
+    intacctCompanyID: string;
+    intacctUserID: string;
+    intacctPassword: string;
 };
 
 export default ConnectPolicyToSageIntacctParams;
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 19df597366fb..ed9cab9f449c 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -227,6 +227,7 @@ const WRITE_COMMANDS = {
     UPDATE_SUBSCRIPTION_ADD_NEW_USERS_AUTOMATICALLY: 'UpdateSubscriptionAddNewUsersAutomatically',
     UPDATE_SUBSCRIPTION_SIZE: 'UpdateSubscriptionSize',
     UPDATE_NETSUITE_SUBSIDIARY: 'UpdateNetSuiteSubsidiary',
+    CONNECT_POLICY_TO_SAGE_INTACCT: 'ConnectPolicyToSageIntacct',
 } as const;
 
 type WriteCommand = ValueOf<typeof WRITE_COMMANDS>;
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 62dfa02c6b5b..599ccda96315 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -319,10 +319,10 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_PAYMENT_ACCOUNT_SELECTOR]: () =>
         require<ReactComponentModule>('../../../../pages/workspace/accounting/xero/advanced/XeroBillPaymentAccountSelectorPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_SUBSIDIARY_SELECTOR]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector').default,
-    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: () => require('../../../../pages/workspace/accounting/intacct/IntacctPrerequisitesPage').default as React.ComponentType,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/IntacctPrerequisitesPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: () =>
-        require('../../../../pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS]: () => require('../../../../pages/workspace/accounting/intacct/ExistingConnectionsPage').default as React.ComponentType,
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/ExistingConnectionsPage').default,
     [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_FREQUENCY]: () => require<ReactComponentModule>('../../../../pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage').default,
     [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_MONTHLY_OFFSET]: () => require<ReactComponentModule>('../../../../pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage').default,
     [SCREENS.WORKSPACE.TAX_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/taxes/WorkspaceEditTaxPage').default,
diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 79936d498280..c2d885083c44 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -41,7 +41,7 @@ function canUseSpotnanaTravel(betas: OnyxEntry<Beta[]>): boolean {
 }
 
 function canUseNetSuiteIntegration(betas: OnyxEntry<Beta[]>): boolean {
-    return !!betas?.includes(CONST.BETAS.NETSUITE_ON_NEW_EXPENSIFY) || canUseAllBetas(betas);
+    return true;
 }
 
 function canUseReportFieldsFeature(betas: OnyxEntry<Beta[]>): boolean {
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index ee7a2d2c763b..37068a9a133f 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -471,11 +471,6 @@ function getXeroBankAccountsWithDefaultSelect(policy: Policy | undefined, select
     }));
 }
 
-function getPoliciesConnectedToSageIntacct(policies: OnyxCollection<Policy>): Policy[] {
-    return Object.values(policies ?? {}).filter<Policy>((policy): policy is Policy => !!policy && !!policy?.connections?.intacct);
-}
-
-// eslint-disable-next-line rulesdir/prefer-early-return
 function getIntegrationLastSuccessfulDate(connection?: Connections[keyof Connections]) {
     if (!connection) {
         return undefined;
@@ -572,7 +567,6 @@ export {
     findCurrentXeroOrganization,
     getCurrentXeroOrganizationName,
     getXeroBankAccountsWithDefaultSelect,
-    getPoliciesConnectedToSageIntacct,
     getCustomUnit,
     getCustomUnitRate,
     sortWorkspacesBySelected,
diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
index 5945c09d67af..d8042a52ff43 100644
--- a/src/libs/actions/Policy/Policy.ts
+++ b/src/libs/actions/Policy/Policy.ts
@@ -2943,6 +2943,10 @@ function setForeignCurrencyDefault(policyID: string, taxCode: string) {
     API.write(WRITE_COMMANDS.SET_POLICY_TAXES_FOREIGN_CURRENCY_DEFAULT, parameters, onyxData);
 }
 
+function getPoliciesConnectedToSageIntacct(): Policy[] {
+    return Object.values(allPolicies ?? {}).filter<Policy>((policy): policy is Policy => !!policy && !!policy?.connections?.intacct);
+}
+
 export {
     leaveWorkspace,
     addBillingCardAndRequestPolicyOwnerChange,
@@ -3006,6 +3010,7 @@ export {
     buildPolicyData,
     createPolicyExpenseChats,
     clearNetSuiteErrorField,
+    getPoliciesConnectedToSageIntacct,
 };
 
 export type {NewCustomUnit};
diff --git a/src/libs/actions/connections/SageIntacct.ts b/src/libs/actions/connections/SageIntacct.ts
index 1c5eeb93211f..9f944bd17273 100644
--- a/src/libs/actions/connections/SageIntacct.ts
+++ b/src/libs/actions/connections/SageIntacct.ts
@@ -1,15 +1,17 @@
 import * as API from '@libs/API';
 import type ConnectPolicyToSageIntacctParams from '@libs/API/parameters/ConnectPolicyToSageIntacctParams';
-import {READ_COMMANDS} from '@libs/API/types';
+import {WRITE_COMMANDS} from '@libs/API/types';
 
-function connectToSageIntacct(policyID: string, companyID?: string, userID?: string, password?: string) {
+type SageIntacctCredentials = {companyID: string; userID: string; password: string};
+
+function connectToSageIntacct(policyID: string, credentials: SageIntacctCredentials) {
     const parameters: ConnectPolicyToSageIntacctParams = {
         policyID,
-        intacctCompanyID: companyID,
-        intacctUserID: userID,
-        intacctPassword: password,
+        intacctCompanyID: credentials.companyID,
+        intacctUserID: credentials.userID,
+        intacctPassword: credentials.password,
     };
-    API.read(READ_COMMANDS.CONNECT_POLICY_TO_SAGE_INTACCT, parameters, {});
+    API.write(WRITE_COMMANDS.CONNECT_POLICY_TO_SAGE_INTACCT, parameters, {});
 }
 
 export default connectToSageIntacct;
diff --git a/src/libs/actions/connections/index.ts b/src/libs/actions/connections/index.ts
index d0c9fb762a4c..694c38064c61 100644
--- a/src/libs/actions/connections/index.ts
+++ b/src/libs/actions/connections/index.ts
@@ -1,13 +1,7 @@
 import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import * as API from '@libs/API';
-import type {
-    RemovePolicyConnectionParams,
-    SyncPolicyToQuickbooksOnlineParams,
-    SyncPolicyToXeroParams,
-    UpdateManyPolicyConnectionConfigurationsParams,
-    UpdatePolicyConnectionConfigParams,
-} from '@libs/API/parameters';
+import type {RemovePolicyConnectionParams, UpdateManyPolicyConnectionConfigurationsParams, UpdatePolicyConnectionConfigParams} from '@libs/API/parameters';
 import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import CONST from '@src/CONST';
@@ -122,6 +116,25 @@ function updatePolicyConnectionConfig<TConnectionName extends ConnectionName, TS
     API.write(WRITE_COMMANDS.UPDATE_POLICY_CONNECTION_CONFIG, parameters, {optimisticData, failureData, successData});
 }
 
+/**
+ * This method returns read command and stage in progres for a given accounting integration.
+ *
+ * @param policyID - ID of the policy for which the sync is needed
+ * @param connectionName - Name of the connection, QBO/Xero
+ */
+function getSyncConnectionParameters(connectionName: PolicyConnectionName) {
+    switch (connectionName) {
+        case CONST.POLICY.CONNECTIONS.NAME.QBO: {
+            return {readCommand: READ_COMMANDS.SYNC_POLICY_TO_QUICKBOOKS_ONLINE, stageInProgress: CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.STARTING_IMPORT_QBO};
+        }
+        case CONST.POLICY.CONNECTIONS.NAME.XERO: {
+            return {readCommand: READ_COMMANDS.SYNC_POLICY_TO_XERO, stageInProgress: CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.STARTING_IMPORT_XERO};
+        }
+        default:
+            return undefined;
+    }
+}
+
 /**
  * This method helps in syncing policy to the connected accounting integration.
  *
@@ -129,18 +142,26 @@ function updatePolicyConnectionConfig<TConnectionName extends ConnectionName, TS
  * @param connectionName - Name of the connection, QBO/Xero
  */
 function syncConnection(policyID: string, connectionName: PolicyConnectionName | undefined) {
-    const isQBOConnection = connectionName === CONST.POLICY.CONNECTIONS.NAME.QBO;
+    if (!connectionName) {
+        return;
+    }
+    const syncConnectionData = getSyncConnectionParameters(connectionName);
+
+    if (!syncConnectionData) {
+        return;
+    }
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policyID}`,
             value: {
-                stageInProgress: isQBOConnection ? CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.STARTING_IMPORT_QBO : CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.STARTING_IMPORT_XERO,
+                stageInProgress: syncConnectionData?.stageInProgress,
                 connectionName,
                 timestamp: new Date().toISOString(),
             },
         },
     ];
+
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.SET,
@@ -149,20 +170,17 @@ function syncConnection(policyID: string, connectionName: PolicyConnectionName |
         },
     ];
 
-    const parameters: SyncPolicyToQuickbooksOnlineParams | SyncPolicyToXeroParams = isQBOConnection
-        ? ({
-              policyID,
-              idempotencyKey: policyID,
-          } as SyncPolicyToQuickbooksOnlineParams)
-        : ({
-              policyID,
-              idempotencyKey: policyID,
-          } as SyncPolicyToXeroParams);
-
-    API.read(isQBOConnection ? READ_COMMANDS.SYNC_POLICY_TO_QUICKBOOKS_ONLINE : READ_COMMANDS.SYNC_POLICY_TO_XERO, parameters, {
-        optimisticData,
-        failureData,
-    });
+    API.read(
+        syncConnectionData.readCommand,
+        {
+            policyID,
+            idempotencyKey: policyID,
+        },
+        {
+            optimisticData,
+            failureData,
+        },
+    );
 }
 
 function updateManyPolicyConnectionConfigs<TConnectionName extends ConnectionName, TConfigUpdate extends Partial<Connections[TConnectionName]['config']>>(
diff --git a/src/libs/fileDownload/index.ts b/src/libs/fileDownload/index.ts
index 8133b5e5d7d1..b39e65a87f94 100644
--- a/src/libs/fileDownload/index.ts
+++ b/src/libs/fileDownload/index.ts
@@ -12,6 +12,7 @@ import type {FileDownload} from './types';
 const fileDownload: FileDownload = (url, fileName, successMessage = '', shouldOpenExternalLink = false) => {
     const resolvedUrl = tryResolveUrlFromApiRoot(url);
     if (
+        // we have two file download cases that we should allow 1. dowloading attachments 2. downloading Expensify package for Sage Intacct
         shouldOpenExternalLink ||
         (!resolvedUrl.startsWith(ApiUtils.getApiRoot()) &&
             !CONST.ATTACHMENT_LOCAL_URL_PREFIX.some((prefix) => resolvedUrl.startsWith(prefix)) &&
diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
index 09d049ad4fef..2dd9e14e78fa 100644
--- a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -31,29 +31,27 @@ function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps)
     const [sageIntacctCredentialsDraft] = useOnyx(ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM_DRAFT);
     const confirmCredentials = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM>) => {
-            connectToSageIntacct(policyID, values[INPUT_IDS.COMPANY_ID], values[INPUT_IDS.USER_ID], values[INPUT_IDS.PASSWORD]);
+            connectToSageIntacct(policyID, values);
             Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID));
         },
         [policyID],
     );
 
     const formItems = Object.values(INPUT_IDS);
-    const validate = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM>) => {
-        const errors: FormInputErrors<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM> = {};
-
-        if (!values.companyID) {
-            ErrorUtils.addErrorMessage(errors, 'companyID', 'common.error.fieldRequired');
-        }
-
-        if (!values.userID) {
-            ErrorUtils.addErrorMessage(errors, 'userID', 'common.error.fieldRequired');
-        }
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM>) => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM> = {};
 
-        if (!values.password) {
-            ErrorUtils.addErrorMessage(errors, 'password', 'common.error.fieldRequired');
-        }
-        return errors;
-    }, []);
+            formItems.forEach((formItem) => {
+                if (values[formItem]) {
+                    return;
+                }
+                ErrorUtils.addErrorMessage(errors, formItem, translate('common.error.fieldRequired'));
+            });
+            return errors;
+        },
+        [formItems],
+    );
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
diff --git a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
index f08ee64f1c7e..b71748f01cd7 100644
--- a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
@@ -1,19 +1,16 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React from 'react';
 import {View} from 'react-native';
-import {useOnyx} from 'react-native-onyx';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MenuItemList from '@components/MenuItemList';
 import ScreenWrapper from '@components/ScreenWrapper';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import connectToSageIntacct from '@libs/actions/connections/SageIntacct';
+import {getPoliciesConnectedToSageIntacct} from '@libs/actions/Policy/Policy';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import {getPoliciesConnectedToSageIntacct} from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
@@ -22,8 +19,7 @@ type ExistingConnectionsPageProps = StackScreenProps<SettingsNavigatorParamList,
 function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) {
     const {translate, datetimeToRelative} = useLocalize();
     const styles = useThemeStyles();
-    const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
-    const policiesConnectedToSageIntacct = getPoliciesConnectedToSageIntacct(policies);
+    const policiesConnectedToSageIntacct = getPoliciesConnectedToSageIntacct();
     const policyID: string = route.params.policyID;
 
     const menuItems = policiesConnectedToSageIntacct.map((policy) => {
@@ -32,7 +28,7 @@ function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) {
         return {
             title: policy.name,
             key: policy.id,
-            icon: policy.avatarURL ? policy.avatarURL : ReportUtils.getDefaultWorkspaceAvatar(policy.name),
+            icon: policy.avatarURL ?? ReportUtils.getDefaultWorkspaceAvatar(policy.name),
             iconType: policy.avatarURL ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_WORKSPACE,
             description: date ? translate('workspace.intacct.sageIntacctLastSync', date) : translate('workspace.accounting.intacct'),
             onPress: () => {
diff --git a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
index 8b5085c5ba82..72156e107cb2 100644
--- a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
@@ -40,7 +40,7 @@ function IntacctPrerequisitesPage({route}: IntacctPrerequisitesPageProps) {
                 iconRight: Expensicons.NewWindow,
                 shouldShowRightIcon: true,
                 onPress: () => {
-                    fileDownload('https://www.expensify.com/tools/integrations/downloadPackage', 'ExpensifyPackageForSageIntacct');
+                    fileDownload(CONST.EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT, CONST.EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT_FILE_NAME);
                 },
                 onSecondaryInteraction: (event: GestureResponderEvent | MouseEvent) =>
                     ReportActionContextMenu.showContextMenu(CONST.CONTEXT_MENU_TYPES.LINK, event, CONST.EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT, popoverAnchor.current),

From 73c44185f02996f50d1d7017fd728477a4124fac Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Thu, 27 Jun 2024 13:39:27 +0200
Subject: [PATCH 25/33] fix lint and typecheck

---
 src/libs/API/parameters/index.ts | 1 +
 src/libs/API/types.ts            | 2 +-
 src/libs/Permissions.ts          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index da4f1216016e..7cd9454bbcff 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -122,6 +122,7 @@ export type {default as AddMembersToWorkspaceParams} from './AddMembersToWorkspa
 export type {default as DeleteMembersFromWorkspaceParams} from './DeleteMembersFromWorkspaceParams';
 export type {default as OpenWorkspaceParams} from './OpenWorkspaceParams';
 export type {default as OpenWorkspaceViewParams} from './OpenWorkspaceViewParams';
+export type {default as ConnectPolicyToSageIntacctParams} from './ConnectPolicyToSageIntacctParams';
 export type {default as OpenWorkspaceReimburseViewParams} from './OpenWorkspaceReimburseViewParams';
 export type {default as OpenWorkspaceInvitePageParams} from './OpenWorkspaceInvitePageParams';
 export type {default as OpenWorkspaceMembersPageParams} from './OpenWorkspaceMembersPageParams';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index d6f6584c6483..53856ca6627d 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -456,6 +456,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.UPDATE_SUBSCRIPTION_AUTO_RENEW]: Parameters.UpdateSubscriptionAutoRenewParams;
     [WRITE_COMMANDS.UPDATE_SUBSCRIPTION_ADD_NEW_USERS_AUTOMATICALLY]: Parameters.UpdateSubscriptionAddNewUsersAutomaticallyParams;
     [WRITE_COMMANDS.UPDATE_SUBSCRIPTION_SIZE]: Parameters.UpdateSubscriptionSizeParams;
+    [WRITE_COMMANDS.CONNECT_POLICY_TO_SAGE_INTACCT]: Parameters.ConnectPolicyToSageIntacctParams;
 
     // Netsuite parameters
     [WRITE_COMMANDS.UPDATE_NETSUITE_SUBSIDIARY]: Parameters.UpdateNetSuiteSubsidiaryParams;
@@ -466,7 +467,6 @@ const READ_COMMANDS = {
     CONNECT_POLICY_TO_XERO: 'ConnectPolicyToXero',
     SYNC_POLICY_TO_QUICKBOOKS_ONLINE: 'SyncPolicyToQuickbooksOnline',
     SYNC_POLICY_TO_XERO: 'SyncPolicyToXero',
-    CONNECT_POLICY_TO_SAGE_INTACCT: 'ConnectPolicyToSageIntacct',
     OPEN_REIMBURSEMENT_ACCOUNT_PAGE: 'OpenReimbursementAccountPage',
     OPEN_WORKSPACE_VIEW: 'OpenWorkspaceView',
     GET_MAPBOX_ACCESS_TOKEN: 'GetMapboxAccessToken',
diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index c2d885083c44..79936d498280 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -41,7 +41,7 @@ function canUseSpotnanaTravel(betas: OnyxEntry<Beta[]>): boolean {
 }
 
 function canUseNetSuiteIntegration(betas: OnyxEntry<Beta[]>): boolean {
-    return true;
+    return !!betas?.includes(CONST.BETAS.NETSUITE_ON_NEW_EXPENSIFY) || canUseAllBetas(betas);
 }
 
 function canUseReportFieldsFeature(betas: OnyxEntry<Beta[]>): boolean {

From ef45f0ee328901f52e6405ce5dac77532e1d1a2d Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Thu, 27 Jun 2024 13:49:27 +0200
Subject: [PATCH 26/33] fix lint

---
 .../accounting/intacct/EnterSageIntacctCredentialsPage.tsx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
index 2dd9e14e78fa..11b44ea1597f 100644
--- a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -50,7 +50,7 @@ function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps)
             });
             return errors;
         },
-        [formItems],
+        [formItems, translate],
     );
     return (
         <ScreenWrapper

From 5ca6e4f4843695a4726de57ba1a47b6ee049d14a Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Thu, 27 Jun 2024 14:08:10 +0200
Subject: [PATCH 27/33] fix lint

---
 .../accounting/intacct/EnterSageIntacctCredentialsPage.tsx     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
index 11b44ea1597f..e5aad780b72c 100644
--- a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -1,7 +1,6 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback} from 'react';
 import {View} from 'react-native';
-import {useOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
@@ -28,7 +27,6 @@ function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps)
     const {translate} = useLocalize();
     const policyID: string = route.params.policyID;
 
-    const [sageIntacctCredentialsDraft] = useOnyx(ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM_DRAFT);
     const confirmCredentials = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM>) => {
             connectToSageIntacct(policyID, values);
@@ -84,7 +82,6 @@ function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps)
                             label={translate(`common.${formItem}`)}
                             aria-label={translate(`common.${formItem}`)}
                             role={CONST.ROLE.PRESENTATION}
-                            defaultValue={sageIntacctCredentialsDraft?.[formItem]}
                             spellCheck={false}
                             secureTextEntry={formItem === INPUT_IDS.PASSWORD}
                         />

From 6349f17569cfa9f73cd6f66268de6c3065bc27b9 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Thu, 27 Jun 2024 14:45:33 +0200
Subject: [PATCH 28/33] fix not showing avatars

---
 .../workspace/accounting/intacct/ExistingConnectionsPage.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
index b71748f01cd7..eaa63bbcaadb 100644
--- a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
@@ -28,7 +28,7 @@ function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) {
         return {
             title: policy.name,
             key: policy.id,
-            icon: policy.avatarURL ?? ReportUtils.getDefaultWorkspaceAvatar(policy.name),
+            icon: policy.avatarURL ? policy.avatarURL : ReportUtils.getDefaultWorkspaceAvatar(policy.name),
             iconType: policy.avatarURL ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_WORKSPACE,
             description: date ? translate('workspace.intacct.sageIntacctLastSync', date) : translate('workspace.accounting.intacct'),
             onPress: () => {

From ed9e7f8483d2649aea236b08703ffabd001623d9 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Thu, 27 Jun 2024 14:49:02 +0200
Subject: [PATCH 29/33] add displayNames to match standard

---
 .../accounting/intacct/EnterSageIntacctCredentialsPage.tsx      | 2 +-
 .../workspace/accounting/intacct/ExistingConnectionsPage.tsx    | 2 +-
 .../workspace/accounting/intacct/IntacctPrerequisitesPage.tsx   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
index e5aad780b72c..f9209045ab8c 100644
--- a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -92,6 +92,6 @@ function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps)
     );
 }
 
-EnterSageIntacctCredentialsPage.displayName = 'EnterSageIntacctCredentialsPage';
+EnterSageIntacctCredentialsPage.displayName = 'PolicyEnterSageIntacctCredentialsPage';
 
 export default EnterSageIntacctCredentialsPage;
diff --git a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
index eaa63bbcaadb..7e867d88285d 100644
--- a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
@@ -59,6 +59,6 @@ function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) {
     );
 }
 
-ExistingConnectionsPage.displayName = 'ExistingConnectionsPage';
+ExistingConnectionsPage.displayName = 'PolicyExistingConnectionsPage';
 
 export default ExistingConnectionsPage;
diff --git a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
index 72156e107cb2..eaf46392fb04 100644
--- a/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/IntacctPrerequisitesPage.tsx
@@ -99,6 +99,6 @@ function IntacctPrerequisitesPage({route}: IntacctPrerequisitesPageProps) {
     );
 }
 
-IntacctPrerequisitesPage.displayName = 'IntacctPrerequisitesPage';
+IntacctPrerequisitesPage.displayName = 'PolicyIntacctPrerequisitesPage';
 
 export default IntacctPrerequisitesPage;

From 984447a9866c295c72f4a9561092b525790fc614 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Fri, 28 Jun 2024 09:48:03 +0200
Subject: [PATCH 30/33] clean up sage intacct modules

---
 src/CONST.ts                                    |  2 +-
 .../index.native.tsx                            |  2 --
 .../ConnectToQuickbooksOnlineButton/index.tsx   |  2 --
 .../ConnectToSageIntacctButton/index.tsx        | 13 +++----------
 .../ConnectToXeroButton/index.native.tsx        |  2 --
 src/components/ConnectToXeroButton/index.tsx    |  2 --
 src/languages/en.ts                             | 12 ------------
 src/languages/es.ts                             | 14 ++------------
 .../accounting/PolicyAccountingPage.tsx         | 17 +----------------
 9 files changed, 7 insertions(+), 59 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 8ef303644d10..acd3b99a897f 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1802,7 +1802,7 @@ const CONST = {
                 netsuite: 'NetSuite',
                 quickbooksOnline: 'Quickbooks Online',
                 xero: 'Xero',
-                sageIntacct: 'Sage Intacct',
+                intacct: 'Sage Intacct',
             },
             SYNC_STAGE_NAME: {
                 STARTING_IMPORT_QBO: 'startingImportQBO',
diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
index 3c41a28c5df4..bd9b623bcfb4 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
@@ -36,8 +36,6 @@ function ConnectToQuickbooksOnlineButton({
     const webViewRef = useRef<WebView>(null);
     const [isWebViewOpen, setWebViewOpen] = useState(false);
     const {isOffline} = useNetwork();
-    const currentIntegration = translate('workspace.accounting.integrationName', integrationToDisconnect);
-    const integrationToConnect = translate('workspace.accounting.integrationName', CONST.POLICY.CONNECTIONS.NAME.QBO);
 
     const authToken = session?.authToken ?? null;
 
diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
index 37de36585d4d..71f1fba91187 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
@@ -17,8 +17,6 @@ function ConnectToQuickbooksOnlineButton({policyID, shouldDisconnectIntegrationB
     const {translate} = useLocalize();
     const {environmentURL} = useEnvironment();
     const {isOffline} = useNetwork();
-    const currentIntegration = translate('workspace.accounting.integrationName', integrationToDisconnect);
-    const integrationToConnect = translate('workspace.accounting.integrationName', CONST.POLICY.CONNECTIONS.NAME.QBO);
 
     const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
 
diff --git a/src/components/ConnectToSageIntacctButton/index.tsx b/src/components/ConnectToSageIntacctButton/index.tsx
index da8b472abdbb..460647838ec3 100644
--- a/src/components/ConnectToSageIntacctButton/index.tsx
+++ b/src/components/ConnectToSageIntacctButton/index.tsx
@@ -1,7 +1,7 @@
 import React, {useRef, useState} from 'react';
 import type {View} from 'react-native';
+import AccountingConnectionConfirmationModal from '@components/AccountingConnectionConfirmationModal';
 import Button from '@components/Button';
-import ConfirmModal from '@components/ConfirmModal';
 import * as Expensicons from '@components/Icon/Expensicons';
 import PopoverMenu from '@components/PopoverMenu';
 import useLocalize from '@hooks/useLocalize';
@@ -26,8 +26,6 @@ function ConnectToSageIntacctButton({policyID, shouldDisconnectIntegrationBefore
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
-    const currentIntegration = translate('workspace.accounting.integrationName', integrationToDisconnect);
-    const integrationToConnect = translate('workspace.accounting.integrationName', CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT);
 
     const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
 
@@ -101,9 +99,7 @@ function ConnectToSageIntacctButton({policyID, shouldDisconnectIntegrationBefore
                 anchorRef={threeDotsMenuContainerRef}
             />
             {shouldDisconnectIntegrationBeforeConnecting && isDisconnectModalOpen && integrationToDisconnect && (
-                <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', currentIntegration)}
-                    isVisible
+                <AccountingConnectionConfirmationModal
                     onConfirm={() => {
                         removePolicyConnection(policyID, integrationToDisconnect);
                         setIsDisconnectModalOpen(false);
@@ -121,11 +117,8 @@ function ConnectToSageIntacctButton({policyID, shouldDisconnectIntegrationBefore
                         }
                         setIsReuseConnectionsPopoverOpen(true);
                     }}
+                    integrationToConnect={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
                     onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', currentIntegration, integrationToConnect)}
-                    confirmText={translate('workspace.accounting.disconnect')}
-                    cancelText={translate('common.cancel')}
-                    danger
                 />
             )}
         </>
diff --git a/src/components/ConnectToXeroButton/index.native.tsx b/src/components/ConnectToXeroButton/index.native.tsx
index 286d25c93424..15fe201f2ac9 100644
--- a/src/components/ConnectToXeroButton/index.native.tsx
+++ b/src/components/ConnectToXeroButton/index.native.tsx
@@ -32,8 +32,6 @@ function ConnectToXeroButton({policyID, session, shouldDisconnectIntegrationBefo
 
     const authToken = session?.authToken ?? null;
     const {isOffline} = useNetwork();
-    const currentIntegration = translate('workspace.accounting.integrationName', integrationToDisconnect);
-    const integrationToConnect = translate('workspace.accounting.integrationName', CONST.POLICY.CONNECTIONS.NAME.XERO);
 
     const renderLoading = () => <FullScreenLoadingIndicator />;
     const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
diff --git a/src/components/ConnectToXeroButton/index.tsx b/src/components/ConnectToXeroButton/index.tsx
index 841d891602ca..fd8e7919bcb1 100644
--- a/src/components/ConnectToXeroButton/index.tsx
+++ b/src/components/ConnectToXeroButton/index.tsx
@@ -16,8 +16,6 @@ function ConnectToXeroButton({policyID, shouldDisconnectIntegrationBeforeConnect
     const {translate} = useLocalize();
     const {environmentURL} = useEnvironment();
     const {isOffline} = useNetwork();
-    const currentIntegration = translate('workspace.accounting.integrationName', integrationToDisconnect);
-    const integrationToConnect = translate('workspace.accounting.integrationName', CONST.POLICY.CONNECTIONS.NAME.XERO);
 
     const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
 
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 28f2ec965cd3..a9c844b1feb0 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2449,18 +2449,6 @@ export default {
             xero: 'Xero',
             netsuite: 'NetSuite',
             intacct: 'Sage Intacct',
-            integrationName: (integration?: ConnectionName): string => {
-                switch (integration) {
-                    case CONST.POLICY.CONNECTIONS.NAME.QBO:
-                        return 'Quickbooks Online';
-                    case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                        return 'Xero';
-                    case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT:
-                        return 'Sage Intacct';
-                    default:
-                        return 'Integration';
-                }
-            },
             setup: 'Connect',
             lastSync: 'Last synced just now',
             import: 'Import',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 2289a49038e3..0440209fd2ce 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2452,18 +2452,6 @@ export default {
             xero: 'Xero',
             netsuite: 'NetSuite',
             intacct: 'Sage Intacct',
-            integrationName: (integration?: ConnectionName): string => {
-                switch (integration) {
-                    case CONST.POLICY.CONNECTIONS.NAME.QBO:
-                        return 'Quickbooks Online';
-                    case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                        return 'Xero';
-                    case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT:
-                        return 'Sage Intacct';
-                    default:
-                        return 'Integration';
-                }
-            },
             setup: 'Configurar',
             lastSync: 'Recién sincronizado',
             import: 'Importar',
@@ -2609,6 +2597,8 @@ export default {
                             return 'Comprobando la conexión a Sage Intacct';
                         case 'intacctImportDimensions':
                             return 'Importando dimensiones';
+                        case 'intacctImportTitle':
+                            return 'Importando datos desde Sage Intacct';
                         default: {
                             return `Translation missing for stage: ${stage}`;
                         }
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index e98e0bf2f04a..50eb39b0f027 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -132,21 +132,6 @@ function accountingIntegrationData(
                 onExportPagePress: () => {},
                 onAdvancedPagePress: () => {},
             };
-        case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT:
-            return {
-                title: translate('workspace.accounting.intacct'),
-                icon: Expensicons.IntacctSquare,
-                setupConnectionButton: (
-                    <ConnectToSageIntacctButton
-                        policyID={policyID}
-                        shouldDisconnectIntegrationBeforeConnecting={isConnectedToIntegration}
-                        integrationToDisconnect={integrationToDisconnect}
-                    />
-                ),
-                onImportPagePress: () => {},
-                onExportPagePress: () => {},
-                onAdvancedPagePress: () => {},
-            };
         default:
             return undefined;
     }
@@ -450,7 +435,7 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
                     </View>
                 </ScrollView>
                 <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', translate('workspace.accounting.integrationName', connectedIntegration))}
+                    title={translate('workspace.accounting.disconnectTitle', connectedIntegration)}
                     isVisible={isDisconnectModalOpen}
                     onConfirm={() => {
                         if (connectedIntegration) {

From 3c0f992177dd13ba1b273f079da858d19fee4654 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Fri, 28 Jun 2024 11:20:22 +0200
Subject: [PATCH 31/33] fix lint

---
 src/languages/en.ts | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index a9c844b1feb0..94c2b889b047 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2597,14 +2597,6 @@ export default {
                             return 'Checking Sage Intacct connection';
                         case 'intacctImportTitle':
                             return 'Importing Sage Intacct data';
-                        case 'intacctImportData':
-                            return 'Importing Sage Intacct data';
-                        case 'intacctImportEmployees':
-                            return 'Importing employees';
-                        case 'intacctImportDimensions':
-                            return 'Importing dimensions';
-                        case 'intacctImportSyncBillPayments':
-                            return 'Syncing reimbursed reports and bill payments';
                         default: {
                             return `Translation missing for stage: ${stage}`;
                         }

From 173fcd8271ed179b3930eb701c73fe7436c321e9 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Fri, 28 Jun 2024 11:44:05 +0200
Subject: [PATCH 32/33] add key prop to stop console errors

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

diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index 50eb39b0f027..2813dedf5008 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -413,6 +413,7 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
                                 >
                                     <MenuItem
                                         brickRoadIndicator={menuItem.brickRoadIndicator}
+                                        key={menuItem.title}
                                         // eslint-disable-next-line react/jsx-props-no-spreading
                                         {...menuItem}
                                     />

From 510c45e8215a0854139b2f081f4de288c946405c Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Fri, 28 Jun 2024 14:22:41 +0200
Subject: [PATCH 33/33] fix navigation loop

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

diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
index f9209045ab8c..75f4cab3783d 100644
--- a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -30,7 +30,8 @@ function EnterSageIntacctCredentialsPage({route}: IntacctPrerequisitesPageProps)
     const confirmCredentials = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM>) => {
             connectToSageIntacct(policyID, values);
-            Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID));
+            Navigation.goBack();
+            Navigation.goBack();
         },
         [policyID],
     );