Reuse existing QBD connection across workspaces

src/ROUTES.ts

@@ -1971,6 +1971,10 @@ const ROUTES = {
             return getUrlWithBackToParam(`workspaces/${policyID}/accounting/quickbooks-desktop/export` as const, backTo, false);
         },
     },
+    POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXISTING_CONNECTIONS: {
+        route: 'workspaces/:policyID/accounting/quickbooks-desktop/existing-connections',
+        getRoute: (policyID: string) => `workspaces/${policyID}/accounting/quickbooks-desktop/existing-connections` as const,
+    },
     POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_SETUP_MODAL: {
         route: 'workspaces/:policyID/accounting/quickbooks-desktop/setup-modal',
         getRoute: (policyID: string) => `workspaces/${policyID}/accounting/quickbooks-desktop/setup-modal` as const,

src/SCREENS.ts

@@ -563,6 +563,7 @@ const SCREENS = {
             QUICKBOOKS_DESKTOP_EXPORT_OUT_OF_POCKET_EXPENSES_SELECT: 'Workspace_Accounting_Quickbooks_Desktop_Export_Out_Of_Pocket_Expenses_Select',
             QUICKBOOKS_DESKTOP_EXPORT_OUT_OF_POCKET_EXPENSES_ACCOUNT_SELECT: 'Workspace_Accounting_Quickbooks_Desktop_Export_Out_Of_Pocket_Expenses_Account_Select',
             QUICKBOOKS_DESKTOP_EXPORT: 'Workspace_Accounting_Quickbooks_Desktop_Export',
+            QUICKBOOKS_DESKTOP_REUSE_EXISTING_CONNECTIONS: 'Policy_Accounting_Quickbooks_Desktop_Reuse_Existing_Connections',
             QUICKBOOKS_DESKTOP_SETUP_MODAL: 'Policy_Accounting_Quickbooks_Desktop_Setup_Modal',
             QUICKBOOKS_DESKTOP_SETUP_REQUIRED_DEVICE_MODAL: 'Policy_Accounting_Quickbooks_Desktop_Setup_Required_Device_Modal',
             QUICKBOOKS_DESKTOP_TRIGGER_FIRST_SYNC: 'Policy_Accounting_Quickbooks_Desktop_Trigger_First_Sync',

src/components/ConnectToQuickbooksDesktopFlow/index.tsx

@@ -1,19 +1,22 @@
 import {useEffect} from 'react';
-import {isMobile} from '@libs/Browser';
+import useHasPoliciesConnectedToQBD from '@hooks/useHasPoliciesConnectedToQBD';
 import Navigation from '@libs/Navigation/Navigation';
+import getQuickbooksDesktopSetupEntryRoute from '@pages/workspace/accounting/qbd/utils';
 import ROUTES from '@src/ROUTES';
 import type {ConnectToQuickbooksDesktopFlowProps} from './types';
 
-const isMobileWeb = isMobile();
-
 function ConnectToQuickbooksDesktopFlow({policyID}: ConnectToQuickbooksDesktopFlowProps) {
+    const hasPoliciesConnectedToQBD = useHasPoliciesConnectedToQBD();
+
     useEffect(() => {
-        if (isMobileWeb) {
-            Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_SETUP_REQUIRED_DEVICE_MODAL.getRoute(policyID));
-        } else {
-            Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_SETUP_MODAL.getRoute(policyID));
+        if (hasPoliciesConnectedToQBD) {
+            Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXISTING_CONNECTIONS.getRoute(policyID));
+            return;
         }
-    }, [policyID]);
+        Navigation.navigate(getQuickbooksDesktopSetupEntryRoute(policyID));
+        // Runs once on mount — re-running when hasPoliciesConnectedToQBD changes mid-flow would interrupt an in-progress setup.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
 
     return null;
 }

src/hooks/useAdminPoliciesConnectedToQBD.ts

@@ -0,0 +1,10 @@
+import ONYXKEYS from '@src/ONYXKEYS';
+import {adminPoliciesConnectedToQBDSelector} from '@src/selectors/Policy';
+import useOnyx from './useOnyx';
+
+function useAdminPoliciesConnectedToQBD() {
+    const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+    return adminPoliciesConnectedToQBDSelector(policies);
+}
+
+export default useAdminPoliciesConnectedToQBD;

src/hooks/useHasPoliciesConnectedToQBD.ts

@@ -0,0 +1,10 @@
+import ONYXKEYS from '@src/ONYXKEYS';
+import {hasPoliciesConnectedToQBDSelector} from '@src/selectors/Policy';
+import useOnyx from './useOnyx';
+
+function useHasPoliciesConnectedToQBD() {
+    const [hasPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: hasPoliciesConnectedToQBDSelector});
+    return hasPolicies ?? false;
+}
+
+export default useHasPoliciesConnectedToQBD;

src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx

@@ -419,7 +419,7 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.SETTINGS.WALLET.REPORT_VIRTUAL_CARD_FRAUD_CONFIRMATION]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/ReportVirtualCardFraudConfirmationPage').default,
     [SCREENS.SETTINGS.WALLET.CARD_ACTIVATE]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/ActivatePhysicalCardPage').default,
     [SCREENS.SETTINGS.WALLET.CARD_CHANGE_PIN]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/ExpensifyCardPage/ChangePINPage').default,
-    [SCREENS.SETTINGS.WALLET.CARD_CHANGE_PIN_ATM]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/ExpensifyCardPage/ChangePINATMPage').default,
+    [SCREENS.SETTINGS.WALLET.CARD_CHANGE_PIN_ATM]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/ExpensifyCardPage/ChangePINAtATMPage').default,
     [SCREENS.SETTINGS.WALLET.TRANSFER_BALANCE]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/TransferBalancePage').default,
     [SCREENS.SETTINGS.WALLET.CHOOSE_TRANSFER_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/ChooseTransferAccountPage').default,
     [SCREENS.SETTINGS.WALLET.IMPORT_TRANSACTIONS]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/ImportTransactionsPage').default,
@@ -616,6 +616,8 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
         require<ReactComponentModule>('../../../../pages/workspace/accounting/qbd/advanced/QuickbooksDesktopAutoSyncPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_ACCOUNTING_METHOD]: () =>
         require<ReactComponentModule>('../../../../pages/workspace/accounting/qbd/advanced/QuickbooksDesktopAccountingMethodPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_REUSE_EXISTING_CONNECTIONS]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/qbd/QuickbooksDesktopExistingConnectionsPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_SETUP_MODAL]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/qbd/QuickBooksDesktopSetupPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_SETUP_REQUIRED_DEVICE_MODAL]: () =>
         require<ReactComponentModule>('../../../../pages/workspace/accounting/qbd/RequireQuickBooksDesktopPage').default,

src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts

@@ -84,6 +84,7 @@ const WORKSPACE_TO_RHP: Partial<Record<keyof WorkspaceSplitNavigatorParamList, s
         SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_EXPORT_OUT_OF_POCKET_EXPENSES_ACCOUNT_SELECT,
         SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_EXPORT_OUT_OF_POCKET_EXPENSES_SELECT,
         SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_EXPORT,
+        SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_REUSE_EXISTING_CONNECTIONS,
         SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_SETUP_MODAL,
         SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_SETUP_REQUIRED_DEVICE_MODAL,
         SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_TRIGGER_FIRST_SYNC,

src/libs/Navigation/linkingConfig/config.ts

@@ -625,6 +625,9 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                             path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXPORT_OUT_OF_POCKET_EXPENSES_SELECT.route,
                         },
                         [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_EXPORT]: {path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXPORT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_REUSE_EXISTING_CONNECTIONS]: {
+                            path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXISTING_CONNECTIONS.route,
+                        },
                         [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_SETUP_MODAL]: {
                             path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_SETUP_MODAL.route,
                         },

src/libs/Navigation/types.ts

@@ -825,6 +825,9 @@ type SettingsNavigatorParamList = {
         // eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
         backTo?: Routes;
     };
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_REUSE_EXISTING_CONNECTIONS]: {
+        policyID: string;
+    };
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_SETUP_MODAL]: {
         policyID: string;
     };

src/libs/actions/connections/index.ts

@@ -312,6 +312,9 @@ function copyExistingPolicyConnection(connectedPolicyID: string, targetPolicyID:
         case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT:
             stageInProgress = CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.SAGE_INTACCT_SYNC_CHECK_CONNECTION;
             break;
+        case CONST.POLICY.CONNECTIONS.NAME.QBD:
+            stageInProgress = CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.STARTING_IMPORT_QBD;
+            break;
         default:
             stageInProgress = null;
     }

src/pages/settings/Wallet/ExpensifyCardPage/ChangePINATMPage.tsx → src/pages/settings/Wallet/ExpensifyCardPage/ChangePINAtATMPage.tsx

@@ -3,7 +3,7 @@ import OutcomeScreenBase from '@components/MultifactorAuthentication/components/
 import useLocalize from '@hooks/useLocalize';
 import variables from '@styles/variables';
 
-function ChangePINATMPage() {
+function ChangePINAtATMPage() {
     const {translate} = useLocalize();
 
     return (
@@ -18,6 +18,6 @@ function ChangePINATMPage() {
     );
 }
 
-ChangePINATMPage.displayName = 'ChangePINATMPage';
+ChangePINAtATMPage.displayName = 'ChangePINAtATMPage';
 
-export default ChangePINATMPage;
+export default ChangePINAtATMPage;

src/pages/workspace/accounting/AccountingContext/index.tsx

@@ -3,6 +3,7 @@ import type {RefObject} from 'react';
 import type {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import AccountingConnectionConfirmationModal from '@components/AccountingConnectionConfirmationModal';
+import useHasPoliciesConnectedToQBD from '@hooks/useHasPoliciesConnectedToQBD';
 import useHasPoliciesConnectedToSageIntacct from '@hooks/useHasPoliciesConnectedToSageIntacct';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
@@ -30,6 +31,7 @@ function AccountingContextProvider({children, policy}: AccountingContextProvider
     const policyID = policy?.id;
     const accountingIcons = useMemoizedLazyExpensifyIcons(['IntacctSquare', 'QBOSquare', 'XeroSquare', 'NetSuiteSquare', 'QBDSquare']);
     const hasPoliciesConnectedToSageIntacct = useHasPoliciesConnectedToSageIntacct();
+    const hasPoliciesConnectedToQBD = useHasPoliciesConnectedToQBD();
 
     const startIntegrationFlow = useCallback(
         (newActiveIntegration: ActiveIntegration) => {
@@ -41,7 +43,7 @@ function AccountingContextProvider({children, policy}: AccountingContextProvider
                 newActiveIntegration.name,
                 policyID,
                 translate,
-                hasPoliciesConnectedToSageIntacct,
+                {sageIntacct: hasPoliciesConnectedToSageIntacct, qbd: hasPoliciesConnectedToQBD},
                 undefined,
                 undefined,
                 newActiveIntegration.integrationToDisconnect,
@@ -61,7 +63,7 @@ function AccountingContextProvider({children, policy}: AccountingContextProvider
                 key: Math.random(),
             });
         },
-        [policy, policyID, translate, hasPoliciesConnectedToSageIntacct, accountingIcons],
+        [policy, policyID, translate, hasPoliciesConnectedToSageIntacct, hasPoliciesConnectedToQBD, accountingIcons],
     );
 
     const closeConfirmationModal = () => {
@@ -101,7 +103,7 @@ function AccountingContextProvider({children, policy}: AccountingContextProvider
             activeIntegration.name,
             policyID,
             translate,
-            hasPoliciesConnectedToSageIntacct,
+            {sageIntacct: hasPoliciesConnectedToSageIntacct, qbd: hasPoliciesConnectedToQBD},
             policy,
             activeIntegration.key,
             undefined,

src/pages/workspace/accounting/PolicyAccountingPage.tsx

@@ -21,6 +21,7 @@ import ThreeDotsMenu from '@components/ThreeDotsMenu';
 import type ThreeDotsMenuProps from '@components/ThreeDotsMenu/types';
 import useEnvironment from '@hooks/useEnvironment';
 import useExpensifyCardFeeds from '@hooks/useExpensifyCardFeeds';
+import useHasPoliciesConnectedToQBD from '@hooks/useHasPoliciesConnectedToQBD';
 import useHasPoliciesConnectedToSageIntacct from '@hooks/useHasPoliciesConnectedToSageIntacct';
 import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
@@ -74,6 +75,7 @@ type RouteParams = {
 function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
     useWorkspaceDocumentTitle(policy?.name, 'workspace.common.accounting');
     const hasPoliciesConnectedToSageIntacct = useHasPoliciesConnectedToSageIntacct();
+    const hasPoliciesConnectedToQBD = useHasPoliciesConnectedToQBD();
     const [connectionSyncProgress] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policy?.id}`);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const theme = useTheme();
@@ -301,7 +303,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
                         integration,
                         policyID,
                         translate,
-                        hasPoliciesConnectedToSageIntacct,
+                        {sageIntacct: hasPoliciesConnectedToSageIntacct, qbd: hasPoliciesConnectedToQBD},
                         undefined,
                         undefined,
                         undefined,
@@ -365,7 +367,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
             connectedIntegration,
             policyID,
             translate,
-            hasPoliciesConnectedToSageIntacct,
+            {sageIntacct: hasPoliciesConnectedToSageIntacct, qbd: hasPoliciesConnectedToQBD},
             policy,
             undefined,
             undefined,
@@ -499,6 +501,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
         popoverAnchorRefs,
         datetimeToRelative,
         hasPoliciesConnectedToSageIntacct,
+        hasPoliciesConnectedToQBD,
     ]);
 
     const otherIntegrationsItems = useMemo(() => {
@@ -514,7 +517,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
                     integration,
                     policyID,
                     translate,
-                    hasPoliciesConnectedToSageIntacct,
+                    {sageIntacct: hasPoliciesConnectedToSageIntacct, qbd: hasPoliciesConnectedToQBD},
                     undefined,
                     undefined,
                     undefined,
@@ -568,6 +571,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
         policyID,
         translate,
         hasPoliciesConnectedToSageIntacct,
+        hasPoliciesConnectedToQBD,
         styles.justifyContentCenter,
         styles.sectionMenuItemTopDescription,
         isOffline,

src/pages/workspace/accounting/qbd/QuickBooksDesktopSetupPage.tsx

@@ -140,7 +140,7 @@ function RequireQuickBooksDesktopModal({route}: RequireQuickBooksDesktopModalPro
             <HeaderWithBackButton
                 title={translate('workspace.qbd.qbdSetup')}
                 shouldShowBackButton
-                onBackButtonPress={() => Navigation.dismissModal()}
+                onBackButtonPress={() => Navigation.goBack()}
             />
             {hasResultOfFetchingSetupLink ? children : <FullPageOfflineBlockingView addBottomSafeAreaPadding>{children}</FullPageOfflineBlockingView>}
         </ScreenWrapper>