From 0c1f040ff934795960eb6483a70f9b78038f99b9 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Sun, 23 Jun 2024 03:36:25 +0300
Subject: [PATCH 01/25] feat: added connect button

---
 .../ConnectToNetSuiteButton/index.tsx         | 56 +++++++++++++++++++
 .../ConnectToNetSuiteButton/types.ts          | 10 ++++
 .../accounting/PolicyAccountingPage.tsx       |  4 +-
 .../netsuite/NetSuiteSubsidiarySelector.tsx   |  2 +-
 .../netsuite/NetSuiteTokenInputPage.tsx       |  7 +++
 5 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 src/components/ConnectToNetSuiteButton/index.tsx
 create mode 100644 src/components/ConnectToNetSuiteButton/types.ts
 create mode 100644 src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx

diff --git a/src/components/ConnectToNetSuiteButton/index.tsx b/src/components/ConnectToNetSuiteButton/index.tsx
new file mode 100644
index 0000000000000..335d6811f4779
--- /dev/null
+++ b/src/components/ConnectToNetSuiteButton/index.tsx
@@ -0,0 +1,56 @@
+import React, {useState} from 'react';
+import Button from '@components/Button';
+import ConfirmModal from '@components/ConfirmModal';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {removePolicyConnection} from '@libs/actions/connections';
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {ConnectToNetSuiteButtonProps} from './types';
+
+function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeConnecting, integrationToDisconnect}: ConnectToNetSuiteButtonProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
+
+    const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
+
+    return (
+        <>
+            <Button
+                onPress={() => {
+                    if (shouldDisconnectIntegrationBeforeConnecting && integrationToDisconnect) {
+                        setIsDisconnectModalOpen(true);
+                        return;
+                    }
+
+                    Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_SUBSIDIARY_SELECTOR.getRoute(policyID));
+                }}
+                text={translate('workspace.accounting.setup')}
+                style={styles.justifyContentCenter}
+                small
+                isDisabled={isOffline}
+            />
+            {shouldDisconnectIntegrationBeforeConnecting && isDisconnectModalOpen && integrationToDisconnect && (
+                <ConfirmModal
+                    title={translate('workspace.accounting.disconnectTitle', integrationToDisconnect)}
+                    isVisible
+                    onConfirm={() => {
+                        removePolicyConnection(policyID, integrationToDisconnect);
+                        Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_SUBSIDIARY_SELECTOR.getRoute(policyID));
+                        setIsDisconnectModalOpen(false);
+                    }}
+                    onCancel={() => setIsDisconnectModalOpen(false)}
+                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.NETSUITE)}
+                    confirmText={translate('workspace.accounting.disconnect')}
+                    cancelText={translate('common.cancel')}
+                    danger
+                />
+            )}
+        </>
+    );
+}
+
+export default ConnectToNetSuiteButton;
diff --git a/src/components/ConnectToNetSuiteButton/types.ts b/src/components/ConnectToNetSuiteButton/types.ts
new file mode 100644
index 0000000000000..0e66b7b15eb62
--- /dev/null
+++ b/src/components/ConnectToNetSuiteButton/types.ts
@@ -0,0 +1,10 @@
+import type {PolicyConnectionName} from '@src/types/onyx/Policy';
+
+type ConnectToNetSuiteButtonProps = {
+    policyID: string;
+    shouldDisconnectIntegrationBeforeConnecting?: boolean;
+    integrationToDisconnect?: PolicyConnectionName;
+};
+
+// eslint-disable-next-line import/prefer-default-export
+export type {ConnectToNetSuiteButtonProps};
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index 746ff2b0cb82d..e69d8669a687f 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -41,6 +41,7 @@ import type {Policy, PolicyConnectionSyncProgress} from '@src/types/onyx';
 import type {PolicyConnectionName} from '@src/types/onyx/Policy';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
+import ConnectToNetSuiteButton from '@components/ConnectToNetSuiteButton';
 
 type MenuItemData = MenuItemProps & {pendingAction?: OfflineWithFeedbackProps['pendingAction']; errors?: OfflineWithFeedbackProps['errors']};
 
@@ -105,8 +106,7 @@ function accountingIntegrationData(
                 title: translate('workspace.accounting.netsuite'),
                 icon: Expensicons.NetSuiteSquare,
                 setupConnectionButton: (
-                    // TODO: Will be updated in the Token Input PR
-                    <ConnectToXeroButton
+                    <ConnectToNetSuiteButton
                         policyID={policyID}
                         shouldDisconnectIntegrationBeforeConnecting={isConnectedToIntegration}
                         integrationToDisconnect={integrationToDisconnect}
diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector.tsx
index b161cd0997fd8..0ff2359d6018c 100644
--- a/src/pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector.tsx
+++ b/src/pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector.tsx
@@ -83,7 +83,7 @@ function NetSuiteSubsidiarySelector({policy}: NetSuiteSubsidiarySelectorProps) {
                 onSelectRow={saveSelection}
                 shouldDebounceRowSelect
                 sections={[{data: sections}]}
-                initiallyFocusedOptionKey={netsuiteConfig?.subsidiary ?? sections?.[0].keyForList}
+                initiallyFocusedOptionKey={netsuiteConfig?.subsidiary ?? sections?.[0]?.keyForList}
                 isNestedInsideScrollView
             />
         </ConnectionLayout>
diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx
new file mode 100644
index 0000000000000..4f32ede90eb03
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx
@@ -0,0 +1,7 @@
+function NetSuiteTokenInputPage() {
+  return <>Token Input</>;
+}
+
+NetSuiteTokenInputPage.displayName = 'NetSuiteTokenInputPage';
+
+export default NetSuiteTokenInputPage;
\ No newline at end of file

From 221f0ef21d6c08c5bd570f37a738df7bc138dc38 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Sun, 23 Jun 2024 03:57:06 +0300
Subject: [PATCH 02/25] fix: add current integration name

---
 src/CONST.ts                                                | 5 +++++
 .../ConnectToQuickbooksOnlineButton/index.native.tsx        | 4 ++--
 src/components/ConnectToQuickbooksOnlineButton/index.tsx    | 4 ++--
 src/components/ConnectToXeroButton/index.native.tsx         | 2 +-
 src/components/ConnectToXeroButton/index.tsx                | 4 ++--
 src/languages/en.ts                                         | 6 +++++-
 src/languages/es.ts                                         | 6 +++++-
 7 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 8e44a09d45bbd..37f88e435cf79 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1807,6 +1807,11 @@ const CONST = {
                 XERO: 'xero',
                 NETSUITE: 'netsuite',
             },
+            NAME_MAP: {
+                netsuite: 'NetSuite',
+                quickbooksOnline: 'Quickbooks Online',
+                xero: 'Xero'
+            },
             SYNC_STAGE_NAME: {
                 STARTING_IMPORT_QBO: 'startingImportQBO',
                 STARTING_IMPORT_XERO: 'startingImportXero',
diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
index fbca4fbb5daeb..7a67eea4c9621 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
@@ -58,7 +58,7 @@ function ConnectToQuickbooksOnlineButton({
             />
             {shouldDisconnectIntegrationBeforeConnecting && integrationToDisconnect && isDisconnectModalOpen && (
                 <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', CONST.POLICY.CONNECTIONS.NAME.XERO)}
+                    title={translate('workspace.accounting.disconnectTitle', integrationToDisconnect)}
                     onConfirm={() => {
                         removePolicyConnection(policyID, integrationToDisconnect);
                         setIsDisconnectModalOpen(false);
@@ -66,7 +66,7 @@ function ConnectToQuickbooksOnlineButton({
                     }}
                     isVisible
                     onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.QBO)}
+                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.QBO, integrationToDisconnect)}
                     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 10c358ad79c03..044191f3cf77e 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
@@ -39,7 +39,7 @@ function ConnectToQuickbooksOnlineButton({policyID, shouldDisconnectIntegrationB
             />
             {shouldDisconnectIntegrationBeforeConnecting && integrationToDisconnect && isDisconnectModalOpen && (
                 <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', CONST.POLICY.CONNECTIONS.NAME.XERO)}
+                    title={translate('workspace.accounting.disconnectTitle', integrationToDisconnect)}
                     isVisible={isDisconnectModalOpen}
                     onConfirm={() => {
                         removePolicyConnection(policyID, integrationToDisconnect);
@@ -47,7 +47,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', CONST.POLICY.CONNECTIONS.NAME.QBO, integrationToDisconnect)}
                     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 11cafe2bdfbc4..3284f00744412 100644
--- a/src/components/ConnectToXeroButton/index.native.tsx
+++ b/src/components/ConnectToXeroButton/index.native.tsx
@@ -53,7 +53,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', integrationToDisconnect)}
                     onConfirm={() => {
                         removePolicyConnection(policyID, integrationToDisconnect);
                         setIsDisconnectModalOpen(false);
diff --git a/src/components/ConnectToXeroButton/index.tsx b/src/components/ConnectToXeroButton/index.tsx
index 5dd5541dd4387..4b939df44e1d5 100644
--- a/src/components/ConnectToXeroButton/index.tsx
+++ b/src/components/ConnectToXeroButton/index.tsx
@@ -36,7 +36,7 @@ function ConnectToXeroButton({policyID, shouldDisconnectIntegrationBeforeConnect
             />
             {shouldDisconnectIntegrationBeforeConnecting && isDisconnectModalOpen && integrationToDisconnect && (
                 <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', CONST.POLICY.CONNECTIONS.NAME.QBO)}
+                    title={translate('workspace.accounting.disconnectTitle', integrationToDisconnect)}
                     isVisible
                     onConfirm={() => {
                         removePolicyConnection(policyID, integrationToDisconnect);
@@ -44,7 +44,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', CONST.POLICY.CONNECTIONS.NAME.XERO, integrationToDisconnect)}
                     confirmText={translate('workspace.accounting.disconnect')}
                     cancelText={translate('common.cancel')}
                     danger
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 00f3229db7c95..249a39cc1c872 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2407,7 +2407,7 @@ 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',
-            netsuite: 'Net Suite',
+            netsuite: 'NetSuite',
             setup: 'Connect',
             lastSync: 'Last synced just now',
             import: 'Import',
@@ -2422,6 +2422,8 @@ export default {
                         return 'Disconnect QuickBooks Online';
                     case CONST.POLICY.CONNECTIONS.NAME.XERO:
                         return 'Disconnect Xero';
+                    case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
+                        return 'Disconnect NetSuite';
                     default: {
                         return 'Disconnect integration';
                     }
@@ -2433,6 +2435,8 @@ export default {
                         return "Can't connect to QuickBooks Online.";
                     case CONST.POLICY.CONNECTIONS.NAME.XERO:
                         return "Can't connect to Xero.";
+                    case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
+                        return "Can't connec to NetSuite";
                     default: {
                         return "Can't connect to integration.";
                     }
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 356c5e7538fb2..ad4055c9edb9f 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2411,7 +2411,7 @@ 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',
-            netsuite: 'Net Suite',
+            netsuite: 'NetSuite',
             setup: 'Configurar',
             lastSync: 'Recién sincronizado',
             import: 'Importar',
@@ -2426,6 +2426,8 @@ export default {
                         return 'Desconectar QuickBooks Online';
                     case CONST.POLICY.CONNECTIONS.NAME.XERO:
                         return 'Desconectar Xero';
+                    case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
+                        return 'Desconectar Netsuite';
                     default: {
                         return 'Desconectar integración';
                     }
@@ -2437,6 +2439,8 @@ export default {
                         return 'No se puede conectar a QuickBooks Online.';
                     case CONST.POLICY.CONNECTIONS.NAME.XERO:
                         return 'No se puede conectar a Xero';
+                    case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
+                        return 'No se puede conectar a NetSuite';
                     default: {
                         return 'No se ha podido conectar a la integración.';
                     }

From c30025725e95b1c29c14ba4e14ae14c8b7c7e033 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Sun, 23 Jun 2024 03:57:34 +0300
Subject: [PATCH 03/25] fix: disconnect prompt text

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

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 249a39cc1c872..28443e95bdea7 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2458,15 +2458,19 @@ export default {
             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?';
+                        return `Are you sure you want to disconnect ${currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]: 'existing integration'} 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?';
+                        return `Are you sure you want to disconnect ${currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]: 'existing integration'} to set up Xero?`;
+                    case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
+                        return `Are you sure you want to disconnect ${currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]: 'existing integration'} to set up NetSuite?`;
                     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?';
+                            case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
+                                return 'Are you sure you want to disconnect NetSuite?';
                             default: {
                                 return 'Are you sure you want to disconnect this integration?';
                             }
diff --git a/src/languages/es.ts b/src/languages/es.ts
index ad4055c9edb9f..588ef33d11df2 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2462,15 +2462,19 @@ export default {
             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?';
+                        return `¿Estás seguro de que quieres desconectar ${currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]: 'integración existente'} para configurar QuickBooks Online?`;
                     case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                        return '¿Estás seguro de que quieres desconectar QuickBooks Online para configurar Xero?';
+                        return `¿Estás seguro de que quieres desconectar ${currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]: 'integración existente'}  para configurar Xero?`;
+                    case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
+                        return `¿Estás seguro de que quieres desconectar ${currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]: 'integración existente'}  para configurar NetSuite?`;
                     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?';
+                            case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
+                                return '¿Estás seguro de que quieres desconectar NetSuite?';
                             default: {
                                 return '¿Estás seguro de que quieres desconectar integración?';
                             }

From 5f3f52638e603a8f5a9b3646a93050be22d8e13c Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Sun, 23 Jun 2024 03:58:24 +0300
Subject: [PATCH 04/25] fix: added current integration name

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

diff --git a/src/components/ConnectToNetSuiteButton/index.tsx b/src/components/ConnectToNetSuiteButton/index.tsx
index 335d6811f4779..6a6fd19749f5c 100644
--- a/src/components/ConnectToNetSuiteButton/index.tsx
+++ b/src/components/ConnectToNetSuiteButton/index.tsx
@@ -43,7 +43,7 @@ function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeCon
                         setIsDisconnectModalOpen(false);
                     }}
                     onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.NETSUITE)}
+                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.NETSUITE, integrationToDisconnect)}
                     confirmText={translate('workspace.accounting.disconnect')}
                     cancelText={translate('common.cancel')}
                     danger

From 2ecec4280c4a2761a048132d7be374d934bed22a Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Sun, 23 Jun 2024 03:59:38 +0300
Subject: [PATCH 05/25] fix: added comment

---
 src/components/ConnectToNetSuiteButton/index.tsx               | 3 +++
 .../workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/ConnectToNetSuiteButton/index.tsx b/src/components/ConnectToNetSuiteButton/index.tsx
index 6a6fd19749f5c..f4aac361e79e8 100644
--- a/src/components/ConnectToNetSuiteButton/index.tsx
+++ b/src/components/ConnectToNetSuiteButton/index.tsx
@@ -26,6 +26,7 @@ function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeCon
                         return;
                     }
 
+                    // Will be updated to new token input page
                     Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_SUBSIDIARY_SELECTOR.getRoute(policyID));
                 }}
                 text={translate('workspace.accounting.setup')}
@@ -39,6 +40,8 @@ function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeCon
                     isVisible
                     onConfirm={() => {
                         removePolicyConnection(policyID, integrationToDisconnect);
+
+                        // Will be updated to new token input page
                         Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_SUBSIDIARY_SELECTOR.getRoute(policyID));
                         setIsDisconnectModalOpen(false);
                     }}
diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx
index 4f32ede90eb03..6dd9ef89583c8 100644
--- a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx
@@ -1,5 +1,5 @@
 function NetSuiteTokenInputPage() {
-  return <>Token Input</>;
+  return <>NetSuite Token Input</>;
 }
 
 NetSuiteTokenInputPage.displayName = 'NetSuiteTokenInputPage';

From 4cd240da207377beb11a1f102670578f0fbe61e7 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Sun, 23 Jun 2024 04:15:37 +0300
Subject: [PATCH 06/25] refactor: lint fixes

---
 src/CONST.ts                                         |  2 +-
 src/languages/en.ts                                  | 10 +++++++---
 src/languages/es.ts                                  | 12 +++++++++---
 .../workspace/accounting/PolicyAccountingPage.tsx    |  2 +-
 .../accounting/netsuite/NetSuiteTokenInputPage.tsx   |  4 ++--
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 37f88e435cf79..0c08088c78ed5 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1810,7 +1810,7 @@ const CONST = {
             NAME_MAP: {
                 netsuite: 'NetSuite',
                 quickbooksOnline: 'Quickbooks Online',
-                xero: 'Xero'
+                xero: 'Xero',
             },
             SYNC_STAGE_NAME: {
                 STARTING_IMPORT_QBO: 'startingImportQBO',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 28443e95bdea7..2a8c1c4434499 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2458,11 +2458,15 @@ export default {
             disconnectPrompt: (integrationToConnect?: ConnectionName, currentIntegration?: ConnectionName): string => {
                 switch (integrationToConnect) {
                     case CONST.POLICY.CONNECTIONS.NAME.QBO:
-                        return `Are you sure you want to disconnect ${currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]: 'existing integration'} to set up QuickBooks Online?`;
+                        return `Are you sure you want to disconnect ${
+                            currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] : 'existing integration'
+                        } to set up QuickBooks Online?`;
                     case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                        return `Are you sure you want to disconnect ${currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]: 'existing integration'} to set up Xero?`;
+                        return `Are you sure you want to disconnect ${currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] : 'existing integration'} to set up Xero?`;
                     case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
-                        return `Are you sure you want to disconnect ${currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]: 'existing integration'} to set up NetSuite?`;
+                        return `Are you sure you want to disconnect ${
+                            currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] : 'existing integration'
+                        } to set up NetSuite?`;
                     default: {
                         switch (currentIntegration) {
                             case CONST.POLICY.CONNECTIONS.NAME.QBO:
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 588ef33d11df2..6f9b30ead99e7 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2462,11 +2462,17 @@ export default {
             disconnectPrompt: (integrationToConnect?: ConnectionName, currentIntegration?: ConnectionName): string => {
                 switch (integrationToConnect) {
                     case CONST.POLICY.CONNECTIONS.NAME.QBO:
-                        return `¿Estás seguro de que quieres desconectar ${currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]: 'integración existente'} para configurar QuickBooks Online?`;
+                        return `¿Estás seguro de que quieres desconectar ${
+                            currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] : 'integración existente'
+                        } para configurar QuickBooks Online?`;
                     case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                        return `¿Estás seguro de que quieres desconectar ${currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]: 'integración existente'}  para configurar Xero?`;
+                        return `¿Estás seguro de que quieres desconectar ${
+                            currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] : 'integración existente'
+                        }  para configurar Xero?`;
                     case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
-                        return `¿Estás seguro de que quieres desconectar ${currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]: 'integración existente'}  para configurar NetSuite?`;
+                        return `¿Estás seguro de que quieres desconectar ${
+                            currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] : 'integración existente'
+                        }  para configurar NetSuite?`;
                     default: {
                         switch (currentIntegration) {
                             case CONST.POLICY.CONNECTIONS.NAME.QBO:
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index e69d8669a687f..b09a298250d28 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -5,6 +5,7 @@ import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import CollapsibleSection from '@components/CollapsibleSection';
 import ConfirmModal from '@components/ConfirmModal';
+import ConnectToNetSuiteButton from '@components/ConnectToNetSuiteButton';
 import ConnectToQuickbooksOnlineButton from '@components/ConnectToQuickbooksOnlineButton';
 import ConnectToXeroButton from '@components/ConnectToXeroButton';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -41,7 +42,6 @@ import type {Policy, PolicyConnectionSyncProgress} from '@src/types/onyx';
 import type {PolicyConnectionName} from '@src/types/onyx/Policy';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
-import ConnectToNetSuiteButton from '@components/ConnectToNetSuiteButton';
 
 type MenuItemData = MenuItemProps & {pendingAction?: OfflineWithFeedbackProps['pendingAction']; errors?: OfflineWithFeedbackProps['errors']};
 
diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx
index 6dd9ef89583c8..7cce9d6427402 100644
--- a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx
@@ -1,7 +1,7 @@
 function NetSuiteTokenInputPage() {
-  return <>NetSuite Token Input</>;
+    return <>NetSuite Token Input</>;
 }
 
 NetSuiteTokenInputPage.displayName = 'NetSuiteTokenInputPage';
 
-export default NetSuiteTokenInputPage;
\ No newline at end of file
+export default NetSuiteTokenInputPage;

From ab7997e9035f9a44c57cc5a1b7d9eea0aa1ddb7d Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Tue, 25 Jun 2024 22:25:29 +0300
Subject: [PATCH 07/25] feat: create generic confirmation modal

---
 .../AccountingConnectionConfirmationModal.tsx | 32 ++++++++++
 src/languages/en.ts                           | 61 ++++++++-----------
 2 files changed, 58 insertions(+), 35 deletions(-)
 create mode 100644 src/components/AccountingConnectionConfirmationModal.tsx

diff --git a/src/components/AccountingConnectionConfirmationModal.tsx b/src/components/AccountingConnectionConfirmationModal.tsx
new file mode 100644
index 0000000000000..4b17443775075
--- /dev/null
+++ b/src/components/AccountingConnectionConfirmationModal.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import useLocalize from '@hooks/useLocalize';
+import type { ConnectionName } from '@src/types/onyx/Policy';
+import ConfirmModal from './ConfirmModal';
+
+type AccountingConnectionConfirmationModalProps = {
+  integrationToConnect: ConnectionName;
+  onConfirm: () => void;
+  onCancel: () => void;
+  isModalVisible: boolean;
+};
+
+function AccountingConnectionConfirmationModal({integrationToConnect, isModalVisible, onCancel, onConfirm}: AccountingConnectionConfirmationModalProps) {
+
+  const {translate} = useLocalize();
+
+  return (
+    <ConfirmModal
+        title={translate('workspace.accounting.connectOtherIntegrationTitle', integrationToConnect)}
+        isVisible={isModalVisible}
+        onConfirm={onConfirm}
+        onCancel={onCancel}
+        prompt={translate('workspace.accounting.connectOtherIntegrationPrompt', integrationToConnect)}
+        confirmText={translate('workspace.accounting.disconnect')}
+        cancelText={translate('common.cancel')}
+        danger
+    />
+  )
+}
+
+AccountingConnectionConfirmationModal.displayName = 'AccountingConnectionConfirmationModal';
+export default AccountingConnectionConfirmationModal;
\ No newline at end of file
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 4aab37c55795c..a0026a21f97c4 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2425,18 +2425,20 @@ export default {
             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';
-                    case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
-                        return 'Disconnect NetSuite';
-                    default: {
-                        return 'Disconnect integration';
-                    }
+                if (!integration || !CONST.POLICY.CONNECTIONS.NAME_MAP[integration]) {
+                    return `Disconnect integration`;
+                }
+                const integrationName = CONST.POLICY.CONNECTIONS.NAME_MAP[integration];
+                return `Disconnect ${integrationName}`;
+            },
+            connectOtherIntegrationTitle: (integrationToConnect?: ConnectionName): string => {
+                if (!integrationToConnect || !CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect]) {
+                    return `Connect accounting integration`;
                 }
+                const integrationName = CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect];
+                return `Connect ${integrationName}`;
             },
+
             syncError: (integration?: ConnectionName): string => {
                 switch (integration) {
                     case CONST.POLICY.CONNECTIONS.NAME.QBO:
@@ -2463,32 +2465,21 @@ 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 ${
-                            currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] : 'existing integration'
-                        } to set up QuickBooks Online?`;
-                    case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                        return `Are you sure you want to disconnect ${currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] : 'existing integration'} to set up Xero?`;
-                    case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
-                        return `Are you sure you want to disconnect ${
-                            currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] : 'existing integration'
-                        } to set up NetSuite?`;
-                    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?';
-                            case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
-                                return 'Are you sure you want to disconnect NetSuite?';
-                            default: {
-                                return 'Are you sure you want to disconnect this integration?';
-                            }
-                        }
-                    }
+            disconnectPrompt: (currentIntegration?: ConnectionName): string => {
+
+                if (!currentIntegration || !CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]) {
+                    return `Are you sure you want to disconnect this integration?`;
+                }
+                const integrationName = CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration];
+                return `Are you sure you want to disconnect ${integrationName}?`;
+            },
+            connectOtherIntegrationPrompt: (integrationToConnect?: ConnectionName): string => {
+
+                if (!integrationToConnect || !CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect]) {
+                    return `Are you sure you want to connect this accounting integration? This will remove any existing acounting connections.`;
                 }
+                const integrationName = CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect];
+                return `Are you sure you want to connect ${integrationName}? This will remove any existing acounting connections.`;
             },
             enterCredentials: 'Enter your credentials',
             connections: {

From 4a4783f5ab5446a3541cdab34ad6f2ef21a2a782 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Tue, 25 Jun 2024 22:26:30 +0300
Subject: [PATCH 08/25] refactor: use accounting confirmation modal

---
 .../ConnectToNetSuiteButton/index.tsx         | 25 ++++++-------------
 src/components/ConnectToXeroButton/index.tsx  | 19 +++++---------
 .../accounting/PolicyAccountingPage.tsx       |  2 +-
 3 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/src/components/ConnectToNetSuiteButton/index.tsx b/src/components/ConnectToNetSuiteButton/index.tsx
index f4aac361e79e8..d54522e945237 100644
--- a/src/components/ConnectToNetSuiteButton/index.tsx
+++ b/src/components/ConnectToNetSuiteButton/index.tsx
@@ -1,15 +1,15 @@
 import React, {useState} from 'react';
 import Button from '@components/Button';
-import ConfirmModal from '@components/ConfirmModal';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {removePolicyConnection} from '@libs/actions/connections';
 import Navigation from '@libs/Navigation/Navigation';
-import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
+import AccountingConnectionConfirmationModal from '@components/AccountingConnectionConfirmationModal';
 import type {ConnectToNetSuiteButtonProps} from './types';
 
+
 function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeConnecting, integrationToDisconnect}: ConnectToNetSuiteButtonProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -35,22 +35,11 @@ function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeCon
                 isDisabled={isOffline}
             />
             {shouldDisconnectIntegrationBeforeConnecting && isDisconnectModalOpen && integrationToDisconnect && (
-                <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', integrationToDisconnect)}
-                    isVisible
-                    onConfirm={() => {
-                        removePolicyConnection(policyID, integrationToDisconnect);
-
-                        // Will be updated to new token input page
-                        Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_SUBSIDIARY_SELECTOR.getRoute(policyID));
-                        setIsDisconnectModalOpen(false);
-                    }}
-                    onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.NETSUITE, integrationToDisconnect)}
-                    confirmText={translate('workspace.accounting.disconnect')}
-                    cancelText={translate('common.cancel')}
-                    danger
-                />
+                <AccountingConnectionConfirmationModal onConfirm={() => {
+                    removePolicyConnection(policyID, integrationToDisconnect);
+                    Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_SUBSIDIARY_SELECTOR.getRoute(policyID));
+                    setIsDisconnectModalOpen(false);
+                }}  integrationToConnect={CONST.POLICY.CONNECTIONS.NAME.NETSUITE} onCancel={() => setIsDisconnectModalOpen(false)} isModalVisible={isDisconnectModalOpen} integrationToDisconnect={integrationToDisconnect} />
             )}
         </>
     );
diff --git a/src/components/ConnectToXeroButton/index.tsx b/src/components/ConnectToXeroButton/index.tsx
index 4b939df44e1d5..69139f20eb761 100644
--- a/src/components/ConnectToXeroButton/index.tsx
+++ b/src/components/ConnectToXeroButton/index.tsx
@@ -1,6 +1,5 @@
 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';
@@ -9,8 +8,11 @@ import {removePolicyConnection} from '@libs/actions/connections';
 import {getXeroSetupLink} from '@libs/actions/connections/ConnectToXero';
 import * as Link from '@userActions/Link';
 import CONST from '@src/CONST';
+import AccountingConnectionConfirmationModal from '@components/AccountingConnectionConfirmationModal';
 import type {ConnectToXeroButtonProps} from './types';
 
+
+
 function ConnectToXeroButton({policyID, shouldDisconnectIntegrationBeforeConnecting, integrationToDisconnect}: ConnectToXeroButtonProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -35,20 +37,11 @@ function ConnectToXeroButton({policyID, shouldDisconnectIntegrationBeforeConnect
                 isDisabled={isOffline}
             />
             {shouldDisconnectIntegrationBeforeConnecting && isDisconnectModalOpen && integrationToDisconnect && (
-                <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', integrationToDisconnect)}
-                    isVisible
-                    onConfirm={() => {
-                        removePolicyConnection(policyID, integrationToDisconnect);
+                <AccountingConnectionConfirmationModal onConfirm={() => {
+                    removePolicyConnection(policyID, integrationToDisconnect);
                         Link.openLink(getXeroSetupLink(policyID), environmentURL);
                         setIsDisconnectModalOpen(false);
-                    }}
-                    onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.XERO, integrationToDisconnect)}
-                    confirmText={translate('workspace.accounting.disconnect')}
-                    cancelText={translate('common.cancel')}
-                    danger
-                />
+                }} integrationToConnect={CONST.POLICY.CONNECTIONS.NAME.XERO} onCancel={() => setIsDisconnectModalOpen(false)} isModalVisible={isDisconnectModalOpen} integrationToDisconnect={integrationToDisconnect} />
             )}
         </>
     );
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index 956e78d41cc9a..1854003e014dd 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -423,7 +423,7 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
                         setIsDisconnectModalOpen(false);
                     }}
                     onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', undefined, connectedIntegration)}
+                    prompt={translate('workspace.accounting.disconnectPrompt', connectedIntegration)}
                     confirmText={translate('workspace.accounting.disconnect')}
                     cancelText={translate('common.cancel')}
                     danger

From 6c84302621ee9b2a09859751cda7350396c18c69 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Tue, 25 Jun 2024 22:30:07 +0300
Subject: [PATCH 09/25] refactor: prettier fixes

---
 .../AccountingConnectionConfirmationModal.tsx | 39 +++++++++----------
 .../ConnectToNetSuiteButton/index.tsx         | 19 +++++----
 src/components/ConnectToXeroButton/index.tsx  | 16 +++++---
 3 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/src/components/AccountingConnectionConfirmationModal.tsx b/src/components/AccountingConnectionConfirmationModal.tsx
index 4b17443775075..6e8bc5a9fccf3 100644
--- a/src/components/AccountingConnectionConfirmationModal.tsx
+++ b/src/components/AccountingConnectionConfirmationModal.tsx
@@ -1,32 +1,31 @@
 import React from 'react';
 import useLocalize from '@hooks/useLocalize';
-import type { ConnectionName } from '@src/types/onyx/Policy';
+import type {ConnectionName} from '@src/types/onyx/Policy';
 import ConfirmModal from './ConfirmModal';
 
 type AccountingConnectionConfirmationModalProps = {
-  integrationToConnect: ConnectionName;
-  onConfirm: () => void;
-  onCancel: () => void;
-  isModalVisible: boolean;
+    integrationToConnect: ConnectionName;
+    onConfirm: () => void;
+    onCancel: () => void;
+    isModalVisible: boolean;
 };
 
 function AccountingConnectionConfirmationModal({integrationToConnect, isModalVisible, onCancel, onConfirm}: AccountingConnectionConfirmationModalProps) {
+    const {translate} = useLocalize();
 
-  const {translate} = useLocalize();
-
-  return (
-    <ConfirmModal
-        title={translate('workspace.accounting.connectOtherIntegrationTitle', integrationToConnect)}
-        isVisible={isModalVisible}
-        onConfirm={onConfirm}
-        onCancel={onCancel}
-        prompt={translate('workspace.accounting.connectOtherIntegrationPrompt', integrationToConnect)}
-        confirmText={translate('workspace.accounting.disconnect')}
-        cancelText={translate('common.cancel')}
-        danger
-    />
-  )
+    return (
+        <ConfirmModal
+            title={translate('workspace.accounting.connectOtherIntegrationTitle', integrationToConnect)}
+            isVisible={isModalVisible}
+            onConfirm={onConfirm}
+            onCancel={onCancel}
+            prompt={translate('workspace.accounting.connectOtherIntegrationPrompt', integrationToConnect)}
+            confirmText={translate('workspace.accounting.disconnect')}
+            cancelText={translate('common.cancel')}
+            danger
+        />
+    );
 }
 
 AccountingConnectionConfirmationModal.displayName = 'AccountingConnectionConfirmationModal';
-export default AccountingConnectionConfirmationModal;
\ No newline at end of file
+export default AccountingConnectionConfirmationModal;
diff --git a/src/components/ConnectToNetSuiteButton/index.tsx b/src/components/ConnectToNetSuiteButton/index.tsx
index d54522e945237..9c90e5163c1b9 100644
--- a/src/components/ConnectToNetSuiteButton/index.tsx
+++ b/src/components/ConnectToNetSuiteButton/index.tsx
@@ -1,4 +1,5 @@
 import React, {useState} from 'react';
+import AccountingConnectionConfirmationModal from '@components/AccountingConnectionConfirmationModal';
 import Button from '@components/Button';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
@@ -6,10 +7,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {removePolicyConnection} from '@libs/actions/connections';
 import Navigation from '@libs/Navigation/Navigation';
 import ROUTES from '@src/ROUTES';
-import AccountingConnectionConfirmationModal from '@components/AccountingConnectionConfirmationModal';
 import type {ConnectToNetSuiteButtonProps} from './types';
 
-
 function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeConnecting, integrationToDisconnect}: ConnectToNetSuiteButtonProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -35,11 +34,17 @@ function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeCon
                 isDisabled={isOffline}
             />
             {shouldDisconnectIntegrationBeforeConnecting && isDisconnectModalOpen && integrationToDisconnect && (
-                <AccountingConnectionConfirmationModal onConfirm={() => {
-                    removePolicyConnection(policyID, integrationToDisconnect);
-                    Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_SUBSIDIARY_SELECTOR.getRoute(policyID));
-                    setIsDisconnectModalOpen(false);
-                }}  integrationToConnect={CONST.POLICY.CONNECTIONS.NAME.NETSUITE} onCancel={() => setIsDisconnectModalOpen(false)} isModalVisible={isDisconnectModalOpen} integrationToDisconnect={integrationToDisconnect} />
+                <AccountingConnectionConfirmationModal
+                    onConfirm={() => {
+                        removePolicyConnection(policyID, integrationToDisconnect);
+                        Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_SUBSIDIARY_SELECTOR.getRoute(policyID));
+                        setIsDisconnectModalOpen(false);
+                    }}
+                    integrationToConnect={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+                    onCancel={() => setIsDisconnectModalOpen(false)}
+                    isModalVisible={isDisconnectModalOpen}
+                    integrationToDisconnect={integrationToDisconnect}
+                />
             )}
         </>
     );
diff --git a/src/components/ConnectToXeroButton/index.tsx b/src/components/ConnectToXeroButton/index.tsx
index 69139f20eb761..e32699a1d74a0 100644
--- a/src/components/ConnectToXeroButton/index.tsx
+++ b/src/components/ConnectToXeroButton/index.tsx
@@ -1,4 +1,5 @@
 import React, {useState} from 'react';
+import AccountingConnectionConfirmationModal from '@components/AccountingConnectionConfirmationModal';
 import Button from '@components/Button';
 import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
@@ -8,11 +9,8 @@ import {removePolicyConnection} from '@libs/actions/connections';
 import {getXeroSetupLink} from '@libs/actions/connections/ConnectToXero';
 import * as Link from '@userActions/Link';
 import CONST from '@src/CONST';
-import AccountingConnectionConfirmationModal from '@components/AccountingConnectionConfirmationModal';
 import type {ConnectToXeroButtonProps} from './types';
 
-
-
 function ConnectToXeroButton({policyID, shouldDisconnectIntegrationBeforeConnecting, integrationToDisconnect}: ConnectToXeroButtonProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -37,11 +35,17 @@ function ConnectToXeroButton({policyID, shouldDisconnectIntegrationBeforeConnect
                 isDisabled={isOffline}
             />
             {shouldDisconnectIntegrationBeforeConnecting && isDisconnectModalOpen && integrationToDisconnect && (
-                <AccountingConnectionConfirmationModal onConfirm={() => {
-                    removePolicyConnection(policyID, integrationToDisconnect);
+                <AccountingConnectionConfirmationModal
+                    onConfirm={() => {
+                        removePolicyConnection(policyID, integrationToDisconnect);
                         Link.openLink(getXeroSetupLink(policyID), environmentURL);
                         setIsDisconnectModalOpen(false);
-                }} integrationToConnect={CONST.POLICY.CONNECTIONS.NAME.XERO} onCancel={() => setIsDisconnectModalOpen(false)} isModalVisible={isDisconnectModalOpen} integrationToDisconnect={integrationToDisconnect} />
+                    }}
+                    integrationToConnect={CONST.POLICY.CONNECTIONS.NAME.XERO}
+                    onCancel={() => setIsDisconnectModalOpen(false)}
+                    isModalVisible={isDisconnectModalOpen}
+                    integrationToDisconnect={integrationToDisconnect}
+                />
             )}
         </>
     );

From abac11bdadb53b4bfb98b16fc2b5eb30b2ee1c5d Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Tue, 25 Jun 2024 22:32:42 +0300
Subject: [PATCH 10/25] refactor: clean up props

---
 src/components/AccountingConnectionConfirmationModal.tsx | 5 ++---
 src/components/ConnectToNetSuiteButton/index.tsx         | 3 +--
 src/components/ConnectToXeroButton/index.tsx             | 2 --
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/components/AccountingConnectionConfirmationModal.tsx b/src/components/AccountingConnectionConfirmationModal.tsx
index 6e8bc5a9fccf3..762eb9b62e006 100644
--- a/src/components/AccountingConnectionConfirmationModal.tsx
+++ b/src/components/AccountingConnectionConfirmationModal.tsx
@@ -7,16 +7,15 @@ type AccountingConnectionConfirmationModalProps = {
     integrationToConnect: ConnectionName;
     onConfirm: () => void;
     onCancel: () => void;
-    isModalVisible: boolean;
 };
 
-function AccountingConnectionConfirmationModal({integrationToConnect, isModalVisible, onCancel, onConfirm}: AccountingConnectionConfirmationModalProps) {
+function AccountingConnectionConfirmationModal({integrationToConnect, onCancel, onConfirm}: AccountingConnectionConfirmationModalProps) {
     const {translate} = useLocalize();
 
     return (
         <ConfirmModal
             title={translate('workspace.accounting.connectOtherIntegrationTitle', integrationToConnect)}
-            isVisible={isModalVisible}
+            isVisible
             onConfirm={onConfirm}
             onCancel={onCancel}
             prompt={translate('workspace.accounting.connectOtherIntegrationPrompt', integrationToConnect)}
diff --git a/src/components/ConnectToNetSuiteButton/index.tsx b/src/components/ConnectToNetSuiteButton/index.tsx
index 9c90e5163c1b9..e4b5a95fac8f5 100644
--- a/src/components/ConnectToNetSuiteButton/index.tsx
+++ b/src/components/ConnectToNetSuiteButton/index.tsx
@@ -7,6 +7,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {removePolicyConnection} from '@libs/actions/connections';
 import Navigation from '@libs/Navigation/Navigation';
 import ROUTES from '@src/ROUTES';
+import CONST from '@src/CONST';
 import type {ConnectToNetSuiteButtonProps} from './types';
 
 function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeConnecting, integrationToDisconnect}: ConnectToNetSuiteButtonProps) {
@@ -42,8 +43,6 @@ function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeCon
                     }}
                     integrationToConnect={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
                     onCancel={() => setIsDisconnectModalOpen(false)}
-                    isModalVisible={isDisconnectModalOpen}
-                    integrationToDisconnect={integrationToDisconnect}
                 />
             )}
         </>
diff --git a/src/components/ConnectToXeroButton/index.tsx b/src/components/ConnectToXeroButton/index.tsx
index e32699a1d74a0..fd8e7919bcb12 100644
--- a/src/components/ConnectToXeroButton/index.tsx
+++ b/src/components/ConnectToXeroButton/index.tsx
@@ -43,8 +43,6 @@ function ConnectToXeroButton({policyID, shouldDisconnectIntegrationBeforeConnect
                     }}
                     integrationToConnect={CONST.POLICY.CONNECTIONS.NAME.XERO}
                     onCancel={() => setIsDisconnectModalOpen(false)}
-                    isModalVisible={isDisconnectModalOpen}
-                    integrationToDisconnect={integrationToDisconnect}
                 />
             )}
         </>

From 432e443a34f2717cc716d0ca35021e557564a418 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Tue, 25 Jun 2024 22:40:00 +0300
Subject: [PATCH 11/25] refactor: clean up translations

---
 .../AccountingConnectionConfirmationModal.tsx |  2 +-
 src/languages/en.ts                           | 24 ++++---------------
 src/languages/es.ts                           | 19 ++++++---------
 3 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/src/components/AccountingConnectionConfirmationModal.tsx b/src/components/AccountingConnectionConfirmationModal.tsx
index 762eb9b62e006..f9a979a44c2b1 100644
--- a/src/components/AccountingConnectionConfirmationModal.tsx
+++ b/src/components/AccountingConnectionConfirmationModal.tsx
@@ -14,7 +14,7 @@ function AccountingConnectionConfirmationModal({integrationToConnect, onCancel,
 
     return (
         <ConfirmModal
-            title={translate('workspace.accounting.connectOtherIntegrationTitle', integrationToConnect)}
+            title={translate('workspace.accounting.connectTitle', integrationToConnect)}
             isVisible
             onConfirm={onConfirm}
             onCancel={onCancel}
diff --git a/src/languages/en.ts b/src/languages/en.ts
index a0026a21f97c4..1b83ed42e60a3 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2425,17 +2425,11 @@ export default {
             syncNow: 'Sync now',
             disconnect: 'Disconnect',
             disconnectTitle: (integration?: ConnectionName): string => {
-                if (!integration || !CONST.POLICY.CONNECTIONS.NAME_MAP[integration]) {
-                    return `Disconnect integration`;
-                }
-                const integrationName = CONST.POLICY.CONNECTIONS.NAME_MAP[integration];
+                const integrationName = integration && CONST.POLICY.CONNECTIONS.NAME_MAP[integration] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integration] : 'integration';
                 return `Disconnect ${integrationName}`;
             },
-            connectOtherIntegrationTitle: (integrationToConnect?: ConnectionName): string => {
-                if (!integrationToConnect || !CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect]) {
-                    return `Connect accounting integration`;
-                }
-                const integrationName = CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect];
+            connectTitle: (integrationToConnect?: ConnectionName): string => {
+                const integrationName = integrationToConnect &&  CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ?  CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect]: 'accounting integration';
                 return `Connect ${integrationName}`;
             },
 
@@ -2466,19 +2460,11 @@ export default {
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: 'Imported, displayed as report fields',
             },
             disconnectPrompt: (currentIntegration?: ConnectionName): string => {
-
-                if (!currentIntegration || !CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]) {
-                    return `Are you sure you want to disconnect this integration?`;
-                }
-                const integrationName = CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration];
+                const integrationName = currentIntegration && CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]: 'this integration';
                 return `Are you sure you want to disconnect ${integrationName}?`;
             },
             connectOtherIntegrationPrompt: (integrationToConnect?: ConnectionName): string => {
-
-                if (!integrationToConnect || !CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect]) {
-                    return `Are you sure you want to connect this accounting integration? This will remove any existing acounting connections.`;
-                }
-                const integrationName = CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect];
+                const integrationName = integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] : 'this accounting integration';
                 return `Are you sure you want to connect ${integrationName}? This will remove any existing acounting connections.`;
             },
             enterCredentials: 'Enter your credentials',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index ba8a1ae940696..0e715751a2c8b 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2428,18 +2428,13 @@ 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';
-                    case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
-                        return 'Desconectar Netsuite';
-                    default: {
-                        return 'Desconectar integración';
-                    }
-                }
+            disconnectTitle: (integration?: ConnectionName): string => {
+                const integrationName = integration && CONST.POLICY.CONNECTIONS.NAME_MAP[integration] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integration] : 'integración';
+                return `Desconectar ${integrationName}`;
+            },
+            connectTitle: (integrationToConnect?: ConnectionName): string => {
+                const integrationName = integrationToConnect &&  CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ?  CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect]: 'accounting integration';
+                return `Configurar ${integrationName}`;
             },
             syncError: (integration?: ConnectionName): string => {
                 switch (integration) {

From de1919dde36decb9eb0c021bcc1b1278f90c0297 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Tue, 25 Jun 2024 22:42:37 +0300
Subject: [PATCH 12/25] refactor: add es translations

---
 .../AccountingConnectionConfirmationModal.tsx |  2 +-
 src/languages/en.ts                           |  2 +-
 src/languages/es.ts                           | 35 ++++---------------
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/src/components/AccountingConnectionConfirmationModal.tsx b/src/components/AccountingConnectionConfirmationModal.tsx
index f9a979a44c2b1..7018920c04909 100644
--- a/src/components/AccountingConnectionConfirmationModal.tsx
+++ b/src/components/AccountingConnectionConfirmationModal.tsx
@@ -18,7 +18,7 @@ function AccountingConnectionConfirmationModal({integrationToConnect, onCancel,
             isVisible
             onConfirm={onConfirm}
             onCancel={onCancel}
-            prompt={translate('workspace.accounting.connectOtherIntegrationPrompt', integrationToConnect)}
+            prompt={translate('workspace.accounting.connectPrompt', integrationToConnect)}
             confirmText={translate('workspace.accounting.disconnect')}
             cancelText={translate('common.cancel')}
             danger
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 1b83ed42e60a3..530246742771b 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2463,7 +2463,7 @@ export default {
                 const integrationName = currentIntegration && CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]: 'this integration';
                 return `Are you sure you want to disconnect ${integrationName}?`;
             },
-            connectOtherIntegrationPrompt: (integrationToConnect?: ConnectionName): string => {
+            connectPrompt: (integrationToConnect?: ConnectionName): string => {
                 const integrationName = integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] : 'this accounting integration';
                 return `Are you sure you want to connect ${integrationName}? This will remove any existing acounting connections.`;
             },
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 0e715751a2c8b..b8287234b2ef0 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2462,34 +2462,13 @@ 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 ${
-                            currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] : 'integración existente'
-                        } para configurar QuickBooks Online?`;
-                    case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                        return `¿Estás seguro de que quieres desconectar ${
-                            currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] : 'integración existente'
-                        }  para configurar Xero?`;
-                    case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
-                        return `¿Estás seguro de que quieres desconectar ${
-                            currentIntegration ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] : 'integración existente'
-                        }  para configurar NetSuite?`;
-                    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?';
-                            case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
-                                return '¿Estás seguro de que quieres desconectar NetSuite?';
-                            default: {
-                                return '¿Estás seguro de que quieres desconectar integración?';
-                            }
-                        }
-                    }
-                }
+            disconnectPrompt: (currentIntegration?: ConnectionName): string => {
+                const integrationName = currentIntegration && CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]: 'integración';
+                return `¿Estás seguro de que quieres desconectar ${integrationName}?`;
+            },
+            connectPrompt: (integrationToConnect?: ConnectionName): string => {
+                const integrationName = integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] : 'this accounting integration';
+                return `Are you sure you want to connect ${integrationName}? This will remove any existing acounting connections.`;
             },
             enterCredentials: 'Ingresa tus credenciales',
             connections: {

From 499d31f6983294a3f7a5677c77774afe49cdcbc4 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Tue, 25 Jun 2024 22:46:48 +0300
Subject: [PATCH 13/25] refactor: run prettier

---
 .../AccountingConnectionConfirmationModal.tsx         |  4 ++--
 src/components/ConnectToNetSuiteButton/index.tsx      |  2 +-
 src/components/ConnectToXeroButton/index.native.tsx   | 11 +++--------
 src/languages/en.ts                                   |  9 ++++++---
 src/languages/es.ts                                   |  8 +++++---
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/AccountingConnectionConfirmationModal.tsx b/src/components/AccountingConnectionConfirmationModal.tsx
index 7018920c04909..c472f215b6df3 100644
--- a/src/components/AccountingConnectionConfirmationModal.tsx
+++ b/src/components/AccountingConnectionConfirmationModal.tsx
@@ -19,9 +19,9 @@ function AccountingConnectionConfirmationModal({integrationToConnect, onCancel,
             onConfirm={onConfirm}
             onCancel={onCancel}
             prompt={translate('workspace.accounting.connectPrompt', integrationToConnect)}
-            confirmText={translate('workspace.accounting.disconnect')}
+            confirmText={translate('workspace.accounting.setup')}
             cancelText={translate('common.cancel')}
-            danger
+            success
         />
     );
 }
diff --git a/src/components/ConnectToNetSuiteButton/index.tsx b/src/components/ConnectToNetSuiteButton/index.tsx
index e4b5a95fac8f5..17c5e5a0d5586 100644
--- a/src/components/ConnectToNetSuiteButton/index.tsx
+++ b/src/components/ConnectToNetSuiteButton/index.tsx
@@ -6,8 +6,8 @@ import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {removePolicyConnection} from '@libs/actions/connections';
 import Navigation from '@libs/Navigation/Navigation';
-import ROUTES from '@src/ROUTES';
 import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
 import type {ConnectToNetSuiteButtonProps} from './types';
 
 function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeConnecting, integrationToDisconnect}: ConnectToNetSuiteButtonProps) {
diff --git a/src/components/ConnectToXeroButton/index.native.tsx b/src/components/ConnectToXeroButton/index.native.tsx
index 3284f00744412..15fe201f2ac95 100644
--- a/src/components/ConnectToXeroButton/index.native.tsx
+++ b/src/components/ConnectToXeroButton/index.native.tsx
@@ -2,9 +2,9 @@ import React, {useRef, useState} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import {WebView} from 'react-native-webview';
+import AccountingConnectionConfirmationModal from '@components/AccountingConnectionConfirmationModal';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
 import Button from '@components/Button';
-import ConfirmModal from '@components/ConfirmModal';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Modal from '@components/Modal';
@@ -52,19 +52,14 @@ function ConnectToXeroButton({policyID, session, shouldDisconnectIntegrationBefo
                 isDisabled={isOffline}
             />
             {shouldDisconnectIntegrationBeforeConnecting && isDisconnectModalOpen && integrationToDisconnect && (
-                <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', integrationToDisconnect)}
+                <AccountingConnectionConfirmationModal
                     onConfirm={() => {
                         removePolicyConnection(policyID, integrationToDisconnect);
                         setIsDisconnectModalOpen(false);
                         setWebViewOpen(true);
                     }}
-                    isVisible
+                    integrationToConnect={CONST.POLICY.CONNECTIONS.NAME.XERO}
                     onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.XERO)}
-                    confirmText={translate('workspace.accounting.disconnect')}
-                    cancelText={translate('common.cancel')}
-                    danger
                 />
             )}
             <Modal
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 530246742771b..fdc0477c4a9e7 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2429,7 +2429,8 @@ export default {
                 return `Disconnect ${integrationName}`;
             },
             connectTitle: (integrationToConnect?: ConnectionName): string => {
-                const integrationName = integrationToConnect &&  CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ?  CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect]: 'accounting integration';
+                const integrationName =
+                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] : 'accounting integration';
                 return `Connect ${integrationName}`;
             },
 
@@ -2460,11 +2461,13 @@ export default {
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: 'Imported, displayed as report fields',
             },
             disconnectPrompt: (currentIntegration?: ConnectionName): string => {
-                const integrationName = currentIntegration && CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]: 'this integration';
+                const integrationName =
+                    currentIntegration && CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] : 'this integration';
                 return `Are you sure you want to disconnect ${integrationName}?`;
             },
             connectPrompt: (integrationToConnect?: ConnectionName): string => {
-                const integrationName = integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] : 'this accounting integration';
+                const integrationName =
+                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] : 'this accounting integration';
                 return `Are you sure you want to connect ${integrationName}? This will remove any existing acounting connections.`;
             },
             enterCredentials: 'Enter your credentials',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index b8287234b2ef0..3970a406e0ed6 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2433,7 +2433,8 @@ export default {
                 return `Desconectar ${integrationName}`;
             },
             connectTitle: (integrationToConnect?: ConnectionName): string => {
-                const integrationName = integrationToConnect &&  CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ?  CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect]: 'accounting integration';
+                const integrationName =
+                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] : 'accounting integration';
                 return `Configurar ${integrationName}`;
             },
             syncError: (integration?: ConnectionName): string => {
@@ -2463,11 +2464,12 @@ export default {
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: 'Importado, mostrado como campo de informe',
             },
             disconnectPrompt: (currentIntegration?: ConnectionName): string => {
-                const integrationName = currentIntegration && CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration]: 'integración';
+                const integrationName = currentIntegration && CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] : 'integración';
                 return `¿Estás seguro de que quieres desconectar ${integrationName}?`;
             },
             connectPrompt: (integrationToConnect?: ConnectionName): string => {
-                const integrationName = integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] : 'this accounting integration';
+                const integrationName =
+                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] : 'this accounting integration';
                 return `Are you sure you want to connect ${integrationName}? This will remove any existing acounting connections.`;
             },
             enterCredentials: 'Ingresa tus credenciales',

From c2829045b7c6a0903be53c86e174a95d68fe0fab Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Tue, 25 Jun 2024 22:49:30 +0300
Subject: [PATCH 14/25] refactor: use modal for qbo

---
 .../ConnectToQuickbooksOnlineButton/index.native.tsx  | 11 +++--------
 .../ConnectToQuickbooksOnlineButton/index.tsx         | 11 +++--------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
index 7a67eea4c9621..26de1072daaf2 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
@@ -2,9 +2,9 @@ import React, {useRef, useState} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import {WebView} from 'react-native-webview';
+import AccountingConnectionConfirmationModal from '@components/AccountingConnectionConfirmationModal';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
 import Button from '@components/Button';
-import ConfirmModal from '@components/ConfirmModal';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Modal from '@components/Modal';
@@ -57,19 +57,14 @@ function ConnectToQuickbooksOnlineButton({
                 isDisabled={isOffline}
             />
             {shouldDisconnectIntegrationBeforeConnecting && integrationToDisconnect && isDisconnectModalOpen && (
-                <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', integrationToDisconnect)}
+                <AccountingConnectionConfirmationModal
                     onConfirm={() => {
                         removePolicyConnection(policyID, integrationToDisconnect);
                         setIsDisconnectModalOpen(false);
                         setWebViewOpen(true);
                     }}
-                    isVisible
+                    integrationToConnect={CONST.POLICY.CONNECTIONS.NAME.XERO}
                     onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.QBO, integrationToDisconnect)}
-                    confirmText={translate('workspace.accounting.disconnect')}
-                    cancelText={translate('common.cancel')}
-                    danger
                 />
             )}
             {isWebViewOpen && (
diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
index 044191f3cf77e..e805d82995cde 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
@@ -1,6 +1,6 @@
 import React, {useState} from 'react';
+import AccountingConnectionConfirmationModal from '@components/AccountingConnectionConfirmationModal';
 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';
@@ -38,19 +38,14 @@ function ConnectToQuickbooksOnlineButton({policyID, shouldDisconnectIntegrationB
                 small
             />
             {shouldDisconnectIntegrationBeforeConnecting && integrationToDisconnect && isDisconnectModalOpen && (
-                <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', integrationToDisconnect)}
-                    isVisible={isDisconnectModalOpen}
+                <AccountingConnectionConfirmationModal
                     onConfirm={() => {
                         removePolicyConnection(policyID, integrationToDisconnect);
                         Link.openLink(getQuickBooksOnlineSetupLink(policyID), environmentURL);
                         setIsDisconnectModalOpen(false);
                     }}
+                    integrationToConnect={CONST.POLICY.CONNECTIONS.NAME.XERO}
                     onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.QBO, integrationToDisconnect)}
-                    confirmText={translate('workspace.accounting.disconnect')}
-                    cancelText={translate('common.cancel')}
-                    danger
                 />
             )}
         </>

From 14dfbdc7bc2f95d2b6c6c08cb00bc718844bed2a Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Tue, 25 Jun 2024 22:50:30 +0300
Subject: [PATCH 15/25] fix: integration name

---
 src/components/ConnectToQuickbooksOnlineButton/index.native.tsx | 2 +-
 src/components/ConnectToQuickbooksOnlineButton/index.tsx        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
index 26de1072daaf2..bd9b623bcfb4d 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
@@ -63,7 +63,7 @@ function ConnectToQuickbooksOnlineButton({
                         setIsDisconnectModalOpen(false);
                         setWebViewOpen(true);
                     }}
-                    integrationToConnect={CONST.POLICY.CONNECTIONS.NAME.XERO}
+                    integrationToConnect={CONST.POLICY.CONNECTIONS.NAME.QBO}
                     onCancel={() => setIsDisconnectModalOpen(false)}
                 />
             )}
diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
index e805d82995cde..71f1fba911878 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
@@ -44,7 +44,7 @@ function ConnectToQuickbooksOnlineButton({policyID, shouldDisconnectIntegrationB
                         Link.openLink(getQuickBooksOnlineSetupLink(policyID), environmentURL);
                         setIsDisconnectModalOpen(false);
                     }}
-                    integrationToConnect={CONST.POLICY.CONNECTIONS.NAME.XERO}
+                    integrationToConnect={CONST.POLICY.CONNECTIONS.NAME.QBO}
                     onCancel={() => setIsDisconnectModalOpen(false)}
                 />
             )}

From 32d85e8f7b129c9c91e82cf57bb42a45bfed6c79 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Tue, 25 Jun 2024 22:51:02 +0300
Subject: [PATCH 16/25] fix: rollback to danger for modal

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

diff --git a/src/components/AccountingConnectionConfirmationModal.tsx b/src/components/AccountingConnectionConfirmationModal.tsx
index c472f215b6df3..740002a413e6a 100644
--- a/src/components/AccountingConnectionConfirmationModal.tsx
+++ b/src/components/AccountingConnectionConfirmationModal.tsx
@@ -21,7 +21,7 @@ function AccountingConnectionConfirmationModal({integrationToConnect, onCancel,
             prompt={translate('workspace.accounting.connectPrompt', integrationToConnect)}
             confirmText={translate('workspace.accounting.setup')}
             cancelText={translate('common.cancel')}
-            success
+            danger
         />
     );
 }

From 0f6e35f621af8759d426481c2185123ec65a8821 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Thu, 27 Jun 2024 16:09:13 +0530
Subject: [PATCH 17/25] fix: update modal to success

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

diff --git a/src/components/AccountingConnectionConfirmationModal.tsx b/src/components/AccountingConnectionConfirmationModal.tsx
index 740002a413e6a..c472f215b6df3 100644
--- a/src/components/AccountingConnectionConfirmationModal.tsx
+++ b/src/components/AccountingConnectionConfirmationModal.tsx
@@ -21,7 +21,7 @@ function AccountingConnectionConfirmationModal({integrationToConnect, onCancel,
             prompt={translate('workspace.accounting.connectPrompt', integrationToConnect)}
             confirmText={translate('workspace.accounting.setup')}
             cancelText={translate('common.cancel')}
-            danger
+            success
         />
     );
 }

From db056354de474268498f76c2bb85069b585ced16 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Thu, 27 Jun 2024 16:13:00 +0530
Subject: [PATCH 18/25] fix: update content

---
 src/languages/es.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languages/es.ts b/src/languages/es.ts
index bbcf84a4f403f..a5b3a955db69e 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2444,7 +2444,7 @@ export default {
             connectTitle: (integrationToConnect?: ConnectionName): string => {
                 const integrationName =
                     integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] : 'accounting integration';
-                return `Configurar ${integrationName}`;
+                return `Conectar ${integrationName}`;
             },
             syncError: (integration?: ConnectionName): string => {
                 switch (integration) {
@@ -2478,8 +2478,8 @@ export default {
             },
             connectPrompt: (integrationToConnect?: ConnectionName): string => {
                 const integrationName =
-                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] : 'this accounting integration';
-                return `Are you sure you want to connect ${integrationName}? This will remove any existing acounting connections.`;
+                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] : 'esta integración contable';
+                return `¿Estás seguro de que quieres conectar a${integrationName}? Esto eliminará cualquier conexión contable existente.`;
             },
             enterCredentials: 'Ingresa tus credenciales',
             connections: {

From 4cfa7041750fb330a58533e209d4da8978409753 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Thu, 27 Jun 2024 16:14:45 +0530
Subject: [PATCH 19/25] fix: update spacing

---
 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 a5b3a955db69e..46e11a1ebab3d 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2479,7 +2479,7 @@ export default {
             connectPrompt: (integrationToConnect?: ConnectionName): string => {
                 const integrationName =
                     integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] : 'esta integración contable';
-                return `¿Estás seguro de que quieres conectar a${integrationName}? Esto eliminará cualquier conexión contable existente.`;
+                return `¿Estás seguro de que quieres conectar a ${integrationName}? Esto eliminará cualquier conexión contable existente.`;
             },
             enterCredentials: 'Ingresa tus credenciales',
             connections: {

From 8287fd511dbf596935270a3d51ba6e266262aa1e Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Thu, 27 Jun 2024 16:30:17 +0530
Subject: [PATCH 20/25] fix: remove unwanted file

---
 .../accounting/netsuite/NetSuiteTokenInputPage.tsx         | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx

diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx
deleted file mode 100644
index 7cce9d6427402..0000000000000
--- a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInputPage.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-function NetSuiteTokenInputPage() {
-    return <>NetSuite Token Input</>;
-}
-
-NetSuiteTokenInputPage.displayName = 'NetSuiteTokenInputPage';
-
-export default NetSuiteTokenInputPage;

From 0c17ae0c5ab350f0afe14747420e2592bc024a78 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Thu, 27 Jun 2024 22:06:50 +0530
Subject: [PATCH 21/25] docs: added todo

---
 src/components/ConnectToNetSuiteButton/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/ConnectToNetSuiteButton/index.tsx b/src/components/ConnectToNetSuiteButton/index.tsx
index 17c5e5a0d5586..fc948503a127e 100644
--- a/src/components/ConnectToNetSuiteButton/index.tsx
+++ b/src/components/ConnectToNetSuiteButton/index.tsx
@@ -26,7 +26,7 @@ function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeCon
                         return;
                     }
 
-                    // Will be updated to new token input page
+                    // TODO: Will be updated to new token input page
                     Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_SUBSIDIARY_SELECTOR.getRoute(policyID));
                 }}
                 text={translate('workspace.accounting.setup')}
@@ -38,6 +38,8 @@ function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeCon
                 <AccountingConnectionConfirmationModal
                     onConfirm={() => {
                         removePolicyConnection(policyID, integrationToDisconnect);
+
+                        // TODO: Will be updated to new token input page
                         Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_SUBSIDIARY_SELECTOR.getRoute(policyID));
                         setIsDisconnectModalOpen(false);
                     }}

From a6002314cafcfe9255a7bc7a554698c8028bb6e8 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Fri, 28 Jun 2024 02:23:38 +0530
Subject: [PATCH 22/25] fix: update copy and variable

---
 src/CONST.ts        |  2 +-
 src/languages/en.ts | 10 +++++-----
 src/languages/es.ts | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 2372fa89e531d..fb1c2a385d890 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1794,7 +1794,7 @@ const CONST = {
                 XERO: 'xero',
                 NETSUITE: 'netsuite',
             },
-            NAME_MAP: {
+            NAME_USER_FRIENDLY: {
                 netsuite: 'NetSuite',
                 quickbooksOnline: 'Quickbooks Online',
                 xero: 'Xero',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index a1eff1b94ea66..5995ccbbda4cc 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2435,12 +2435,12 @@ export default {
             syncNow: 'Sync now',
             disconnect: 'Disconnect',
             disconnectTitle: (integration?: ConnectionName): string => {
-                const integrationName = integration && CONST.POLICY.CONNECTIONS.NAME_MAP[integration] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integration] : 'integration';
+                const integrationName = integration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration] : 'integration';
                 return `Disconnect ${integrationName}`;
             },
             connectTitle: (integrationToConnect?: ConnectionName): string => {
                 const integrationName =
-                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] : 'accounting integration';
+                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] : 'accounting integration';
                 return `Connect ${integrationName}`;
             },
 
@@ -2451,7 +2451,7 @@ export default {
                     case CONST.POLICY.CONNECTIONS.NAME.XERO:
                         return "Can't connect to Xero.";
                     case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
-                        return "Can't connec to NetSuite";
+                        return "Can't connect to NetSuite.";
                     default: {
                         return "Can't connect to integration.";
                     }
@@ -2472,12 +2472,12 @@ export default {
             },
             disconnectPrompt: (currentIntegration?: ConnectionName): string => {
                 const integrationName =
-                    currentIntegration && CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] : 'this integration';
+                    currentIntegration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration] : 'this integration';
                 return `Are you sure you want to disconnect ${integrationName}?`;
             },
             connectPrompt: (integrationToConnect?: ConnectionName): string => {
                 const integrationName =
-                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] : 'this accounting integration';
+                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] : 'this accounting integration';
                 return `Are you sure you want to connect ${integrationName}? This will remove any existing acounting connections.`;
             },
             enterCredentials: 'Enter your credentials',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 46e11a1ebab3d..0d49640b615cf 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2438,12 +2438,12 @@ export default {
             syncNow: 'Sincronizar ahora',
             disconnect: 'Desconectar',
             disconnectTitle: (integration?: ConnectionName): string => {
-                const integrationName = integration && CONST.POLICY.CONNECTIONS.NAME_MAP[integration] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integration] : 'integración';
+                const integrationName = integration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration] : 'integración';
                 return `Desconectar ${integrationName}`;
             },
             connectTitle: (integrationToConnect?: ConnectionName): string => {
                 const integrationName =
-                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] : 'accounting integration';
+                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] : 'accounting integration';
                 return `Conectar ${integrationName}`;
             },
             syncError: (integration?: ConnectionName): string => {
@@ -2451,9 +2451,9 @@ export default {
                     case CONST.POLICY.CONNECTIONS.NAME.QBO:
                         return 'No se puede conectar a QuickBooks Online.';
                     case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                        return 'No se puede conectar a Xero';
+                        return 'No se puede conectar a Xero.';
                     case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
-                        return 'No se puede conectar a NetSuite';
+                        return 'No se puede conectar a NetSuite.';
                     default: {
                         return 'No se ha podido conectar a la integración.';
                     }
@@ -2473,12 +2473,12 @@ export default {
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: 'Importado como campos de informe',
             },
             disconnectPrompt: (currentIntegration?: ConnectionName): string => {
-                const integrationName = currentIntegration && CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] ? CONST.POLICY.CONNECTIONS.NAME_MAP[currentIntegration] : 'integración';
+                const integrationName = currentIntegration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration] : 'integración';
                 return `¿Estás seguro de que quieres desconectar ${integrationName}?`;
             },
             connectPrompt: (integrationToConnect?: ConnectionName): string => {
                 const integrationName =
-                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_MAP[integrationToConnect] : 'esta integración contable';
+                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] : 'esta integración contable';
                 return `¿Estás seguro de que quieres conectar a ${integrationName}? Esto eliminará cualquier conexión contable existente.`;
             },
             enterCredentials: 'Ingresa tus credenciales',

From 26fe29a7adaa87fe30cef488ba92257d5f35a8fd Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Fri, 28 Jun 2024 02:24:35 +0530
Subject: [PATCH 23/25] refactor: run prettier

---
 src/languages/en.ts | 12 +++++++++---
 src/languages/es.ts | 11 ++++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 5995ccbbda4cc..65cd504177641 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2440,7 +2440,9 @@ export default {
             },
             connectTitle: (integrationToConnect?: ConnectionName): string => {
                 const integrationName =
-                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] : 'accounting integration';
+                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
+                        ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
+                        : 'accounting integration';
                 return `Connect ${integrationName}`;
             },
 
@@ -2472,12 +2474,16 @@ export default {
             },
             disconnectPrompt: (currentIntegration?: ConnectionName): string => {
                 const integrationName =
-                    currentIntegration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration] : 'this integration';
+                    currentIntegration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration]
+                        ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration]
+                        : 'this integration';
                 return `Are you sure you want to disconnect ${integrationName}?`;
             },
             connectPrompt: (integrationToConnect?: ConnectionName): string => {
                 const integrationName =
-                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] : 'this accounting integration';
+                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
+                        ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
+                        : 'this accounting integration';
                 return `Are you sure you want to connect ${integrationName}? This will remove any existing acounting connections.`;
             },
             enterCredentials: 'Enter your credentials',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 0d49640b615cf..7022eb494e649 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2443,7 +2443,9 @@ export default {
             },
             connectTitle: (integrationToConnect?: ConnectionName): string => {
                 const integrationName =
-                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] : 'accounting integration';
+                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
+                        ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
+                        : 'accounting integration';
                 return `Conectar ${integrationName}`;
             },
             syncError: (integration?: ConnectionName): string => {
@@ -2473,12 +2475,15 @@ export default {
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: 'Importado como campos de informe',
             },
             disconnectPrompt: (currentIntegration?: ConnectionName): string => {
-                const integrationName = currentIntegration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration] : 'integración';
+                const integrationName =
+                    currentIntegration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration] : 'integración';
                 return `¿Estás seguro de que quieres desconectar ${integrationName}?`;
             },
             connectPrompt: (integrationToConnect?: ConnectionName): string => {
                 const integrationName =
-                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] : 'esta integración contable';
+                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
+                        ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
+                        : 'esta integración contable';
                 return `¿Estás seguro de que quieres conectar a ${integrationName}? Esto eliminará cualquier conexión contable existente.`;
             },
             enterCredentials: 'Ingresa tus credenciales',

From 05c92d0097cd2abc5d6a8dd0bc37fdcad19c17bb Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Fri, 28 Jun 2024 02:38:15 +0530
Subject: [PATCH 24/25] refactor: simplify condition with ??

---
 src/languages/en.ts | 18 ++++--------------
 src/languages/es.ts | 18 ++++--------------
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 65cd504177641..2ee2dcbb897c1 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2438,13 +2438,8 @@ export default {
                 const integrationName = integration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration] : 'integration';
                 return `Disconnect ${integrationName}`;
             },
-            connectTitle: (integrationToConnect?: ConnectionName): string => {
-                const integrationName =
-                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
-                        ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
-                        : 'accounting integration';
-                return `Connect ${integrationName}`;
-            },
+            connectTitle: (integrationToConnect: ConnectionName): string => `Connect ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
+                    ?? 'accounting integration'}`,
 
             syncError: (integration?: ConnectionName): string => {
                 switch (integration) {
@@ -2479,13 +2474,8 @@ export default {
                         : 'this integration';
                 return `Are you sure you want to disconnect ${integrationName}?`;
             },
-            connectPrompt: (integrationToConnect?: ConnectionName): string => {
-                const integrationName =
-                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
-                        ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
-                        : 'this accounting integration';
-                return `Are you sure you want to connect ${integrationName}? This will remove any existing acounting connections.`;
-            },
+            connectPrompt: (integrationToConnect: ConnectionName): string => `Are you sure you want to connect ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
+                    ?? 'this accounting integration'}? This will remove any existing acounting connections.`,
             enterCredentials: 'Enter your credentials',
             connections: {
                 syncStageName: (stage: PolicyConnectionSyncStage) => {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 7022eb494e649..90ef329d5c40d 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2441,13 +2441,8 @@ export default {
                 const integrationName = integration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration] : 'integración';
                 return `Desconectar ${integrationName}`;
             },
-            connectTitle: (integrationToConnect?: ConnectionName): string => {
-                const integrationName =
-                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
-                        ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
-                        : 'accounting integration';
-                return `Conectar ${integrationName}`;
-            },
+            connectTitle: (integrationToConnect?: ConnectionName): string => `Conectar ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
+                    ?? 'accounting integration'}`,
             syncError: (integration?: ConnectionName): string => {
                 switch (integration) {
                     case CONST.POLICY.CONNECTIONS.NAME.QBO:
@@ -2479,13 +2474,8 @@ export default {
                     currentIntegration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration] : 'integración';
                 return `¿Estás seguro de que quieres desconectar ${integrationName}?`;
             },
-            connectPrompt: (integrationToConnect?: ConnectionName): string => {
-                const integrationName =
-                    integrationToConnect && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
-                        ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
-                        : 'esta integración contable';
-                return `¿Estás seguro de que quieres conectar a ${integrationName}? Esto eliminará cualquier conexión contable existente.`;
-            },
+            connectPrompt: (integrationToConnect: ConnectionName): string => `¿Estás seguro de que quieres conectar a ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
+                ?? 'esta integración contable'}? Esto eliminará cualquier conexión contable existente.`,
             enterCredentials: 'Ingresa tus credenciales',
             connections: {
                 syncStageName: (stage: PolicyConnectionSyncStage) => {

From 6a3037cecf6eb566a095d94e0293f2df9c9d3950 Mon Sep 17 00:00:00 2001
From: Manan Jadhav <manan.jadhav@gmail.com>
Date: Fri, 28 Jun 2024 02:39:10 +0530
Subject: [PATCH 25/25] refactor: fix typo

---
 src/languages/en.ts | 9 +++++----
 src/languages/es.ts | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 2ee2dcbb897c1..18de34e385cb0 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2438,8 +2438,7 @@ export default {
                 const integrationName = integration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration] : 'integration';
                 return `Disconnect ${integrationName}`;
             },
-            connectTitle: (integrationToConnect: ConnectionName): string => `Connect ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
-                    ?? 'accounting integration'}`,
+            connectTitle: (integrationToConnect: ConnectionName): string => `Connect ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] ?? 'accounting integration'}`,
 
             syncError: (integration?: ConnectionName): string => {
                 switch (integration) {
@@ -2474,8 +2473,10 @@ export default {
                         : 'this integration';
                 return `Are you sure you want to disconnect ${integrationName}?`;
             },
-            connectPrompt: (integrationToConnect: ConnectionName): string => `Are you sure you want to connect ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
-                    ?? 'this accounting integration'}? This will remove any existing acounting connections.`,
+            connectPrompt: (integrationToConnect: ConnectionName): string =>
+                `Are you sure you want to connect ${
+                    CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] ?? 'this accounting integration'
+                }? This will remove any existing acounting connections.`,
             enterCredentials: 'Enter your credentials',
             connections: {
                 syncStageName: (stage: PolicyConnectionSyncStage) => {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 90ef329d5c40d..43c3ab6b591e8 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2441,8 +2441,7 @@ export default {
                 const integrationName = integration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration] : 'integración';
                 return `Desconectar ${integrationName}`;
             },
-            connectTitle: (integrationToConnect?: ConnectionName): string => `Conectar ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
-                    ?? 'accounting integration'}`,
+            connectTitle: (integrationToConnect: ConnectionName): string => `Conectar ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] ?? 'accounting integration'}`,
             syncError: (integration?: ConnectionName): string => {
                 switch (integration) {
                     case CONST.POLICY.CONNECTIONS.NAME.QBO:
@@ -2474,8 +2473,10 @@ export default {
                     currentIntegration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration] : 'integración';
                 return `¿Estás seguro de que quieres desconectar ${integrationName}?`;
             },
-            connectPrompt: (integrationToConnect: ConnectionName): string => `¿Estás seguro de que quieres conectar a ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect]
-                ?? 'esta integración contable'}? Esto eliminará cualquier conexión contable existente.`,
+            connectPrompt: (integrationToConnect: ConnectionName): string =>
+                `¿Estás seguro de que quieres conectar a ${
+                    CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] ?? 'esta integración contable'
+                }? Esto eliminará cualquier conexión contable existente.`,
             enterCredentials: 'Ingresa tus credenciales',
             connections: {
                 syncStageName: (stage: PolicyConnectionSyncStage) => {