Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e31147b
feat(accounting): add Intuit Enterprise Suite
ShridharGoel Aug 1, 2026
ef35707
feat(accounting): add sandbox connect option
ShridharGoel Aug 1, 2026
61e845e
refactor(accounting): separate display names
ShridharGoel Aug 1, 2026
5ffd639
feat(accounting): gate IES behind beta
ShridharGoel Aug 1, 2026
db8f9ef
refactor(accounting): clarify IES visibility
ShridharGoel Aug 1, 2026
b30df77
fix(accounting): resolve IES CI errors
ShridharGoel Aug 4, 2026
3faf98c
Merge remote-tracking branch 'origin/main' into codex/pr-97637-ci-fix
ShridharGoel Aug 4, 2026
6f38c2b
fix(localization): use Greek display names
ShridharGoel Aug 4, 2026
30e0a14
fix(localization): add Greek accounting labels
ShridharGoel Aug 4, 2026
91fbde0
test(accounting): update QBO setup arguments
ShridharGoel Aug 4, 2026
bfaaa28
Merge remote-tracking branch 'origin/main' into feat/ies-integration-…
ShridharGoel Aug 4, 2026
11c10b9
fix: guard QBO connection initialization
ShridharGoel Aug 4, 2026
3af7b5d
fix: separate QBO selection identity
ShridharGoel Aug 4, 2026
dc025f1
fix(accounting): limit sandbox connection menu
ShridharGoel Aug 4, 2026
bf928b5
fix(accounting): stop reopening connect popover
ShridharGoel Aug 4, 2026
f94f12b
fix(accounting): label IES sync progress
ShridharGoel Aug 4, 2026
227c79a
fix(accounting): prevent IES label flicker
ShridharGoel Aug 4, 2026
7a02216
fix(accounting): label IES settings
ShridharGoel Aug 4, 2026
6056247
fix(accounting): label IES imported data
ShridharGoel Aug 4, 2026
e3f019f
fix(accounting): stabilize IES UI updates
ShridharGoel Aug 4, 2026
127e5a8
fix(accounting): narrow IES route param type
ShridharGoel Aug 4, 2026
8340cfc
fix(accounting): resolve IES type errors
ShridharGoel Aug 4, 2026
7b2758b
Update BaseConnectToQuickbooksOnlineFlow.tsx
ShridharGoel Aug 4, 2026
62f83a3
fix(accounting): preserve translation key types
ShridharGoel Aug 5, 2026
44e1fc6
test(accounting): cover QBO connection flow
ShridharGoel Aug 5, 2026
3b2f8b2
fix(accounting): show IES connection labels
ShridharGoel Aug 5, 2026
15a4633
test(accounting): fix connection flow lint
ShridharGoel Aug 5, 2026
d3f35aa
test(accounting): use locale functions directly
ShridharGoel Aug 5, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/CONST/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1002,6 +1002,7 @@ const CONST = {
BULK_SUBMIT_APPROVE_PAY: 'bulkSubmitApprovePay',
VENDOR_MATCHING: 'vendorMatching',
RILLET: 'rillet',
INTUIT_ENTERPRISE_SUITE: 'intuitEnterpriseSuite',
RULES_REVAMP: 'rulesRevamp',
COMMUTER_EXCLUSIONS: 'commuterExclusions',
GLOBAL_REIMBURSEMENTS: 'globalReimbursements',
Expand Down Expand Up @@ -4280,6 +4281,9 @@ const CONST = {
},
},
CONNECTIONS: {
ACCOUNTING_INTEGRATION_ALIASES: {
INTUIT_ENTERPRISE_SUITE: 'intuitEnterpriseSuite',
},
NAME: {
// Here we will add other connections names when we add support for them
QBO: 'quickbooksOnline',
Expand Down
23 changes: 21 additions & 2 deletions src/ROUTES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2678,7 +2678,17 @@ const ROUTES = {
},
POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_SETUP: {
route: 'workspaces/:policyID/accounting/quickbooks-online/setup',
getRoute: (policyID: string) => `workspaces/${policyID}/accounting/quickbooks-online/setup` as const,
getRoute: (policyID: string, isIntuitEnterpriseSuite = false, isSandbox = false) => {
const params = new URLSearchParams();
if (isIntuitEnterpriseSuite) {
params.set('isIntuitEnterpriseSuite', 'true');
}
if (isSandbox) {
params.set('isSandbox', 'true');
}
const query = params.toString();
return `workspaces/${policyID}/accounting/quickbooks-online/setup${query ? `?${query}` : ''}` as const;
},
},
POLICY_ACCOUNTING_NETSUITE_TRAVEL_INVOICING_CONFIGURATION: {
route: 'workspaces/:policyID/accounting/netsuite/export/travel-invoicing',
Expand Down Expand Up @@ -2951,7 +2961,13 @@ const ROUTES = {
},
POLICY_ACCOUNTING: {
route: 'workspaces/:policyID/accounting',
getRoute: (policyID: string | undefined, newConnectionName?: ConnectionName, integrationToDisconnect?: ConnectionName, shouldDisconnectIntegrationBeforeConnecting?: boolean) => {
getRoute: (
policyID: string | undefined,
newConnectionName?: ConnectionName,
integrationToDisconnect?: ConnectionName,
shouldDisconnectIntegrationBeforeConnecting?: boolean,
isIntuitEnterpriseSuite?: boolean,
) => {
if (!policyID) {
Log.warn('Invalid policyID is used to build the POLICY_ACCOUNTING route');
}
Expand All @@ -2965,6 +2981,9 @@ const ROUTES = {
if (shouldDisconnectIntegrationBeforeConnecting !== undefined) {
queryParams += `&shouldDisconnectIntegrationBeforeConnecting=${shouldDisconnectIntegrationBeforeConnecting}`;
}
if (isIntuitEnterpriseSuite !== undefined) {
queryParams += `&isIntuitEnterpriseSuite=${isIntuitEnterpriseSuite}`;
}
}
return `workspaces/${policyID}/accounting${queryParams}` as const;
},
Expand Down
9 changes: 6 additions & 3 deletions src/components/AccountingConnectionConfirmationModal.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import useLocalize from '@hooks/useLocalize';

import CONST from '@src/CONST';
import type {ConnectionName} from '@src/types/onyx/Policy';

import React from 'react';
Expand All @@ -8,20 +9,22 @@ import ConfirmModal from './ConfirmModal';

type AccountingConnectionConfirmationModalProps = {
integrationToConnect: ConnectionName;
integrationDisplayName?: string;
onConfirm: () => void;
onCancel: () => void;
};

function AccountingConnectionConfirmationModal({integrationToConnect, onCancel, onConfirm}: AccountingConnectionConfirmationModalProps) {
function AccountingConnectionConfirmationModal({integrationToConnect, integrationDisplayName, onCancel, onConfirm}: AccountingConnectionConfirmationModalProps) {
const {translate} = useLocalize();
const connectionName = integrationDisplayName ?? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] ?? integrationToConnect;

return (
<ConfirmModal
title={translate('workspace.accounting.connectTitle', {connectionName: integrationToConnect})}
title={translate('workspace.accounting.connectTitle', {connectionName})}
isVisible
onConfirm={onConfirm}
onCancel={onCancel}
prompt={translate('workspace.accounting.connectPrompt', {connectionName: integrationToConnect})}
prompt={translate('workspace.accounting.connectPrompt', {connectionName})}
confirmText={translate('workspace.accounting.setup')}
cancelText={translate('common.cancel')}
success
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
/**
* Shared QuickBooks Online and Intuit Enterprise Suite connection flow.
* Development environments can select a production or sandbox connection before starting the platform-specific flow.
*/
import PopoverMenu from '@components/PopoverMenu';
Comment thread
ShridharGoel marked this conversation as resolved.
Resolved

import useEnvironment from '@hooks/useEnvironment';
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import usePopoverPosition from '@hooks/usePopoverPosition';

import {isAuthenticationError} from '@libs/actions/connections';

import {useAccountingState} from '@pages/workspace/accounting/AccountingContext';

import type {AnchorPosition} from '@styles/index';

import {enablePolicyTaxes} from '@userActions/Policy/Policy';

import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';

import React, {useEffect, useLayoutEffect, useRef, useState} from 'react';

import type {ConnectToQuickbooksOnlineFlowProps} from './types';

type BaseConnectToQuickbooksOnlineFlowProps = ConnectToQuickbooksOnlineFlowProps & {
onConnect: (isSandbox: boolean) => void;
};

const anchorAlignment = {
horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
};

function BaseConnectToQuickbooksOnlineFlow({policyID, isIntuitEnterpriseSuite, onConnect}: BaseConnectToQuickbooksOnlineFlowProps) {
const {environment} = useEnvironment();
const {translate} = useLocalize();
const {popoverAnchorRefs} = useAccountingState();
const {calculatePopoverPosition} = usePopoverPosition();
const icons = useMemoizedLazyExpensifyIcons(['LinkCopy']);
const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
const isAuthError = isAuthenticationError(policy, CONST.POLICY.CONNECTIONS.NAME.QBO);
const shouldShowConnectionOptions = !!isIntuitEnterpriseSuite && environment === CONST.ENVIRONMENT.DEV && !isAuthError;
const [isConnectionOptionsPopoverOpen, setIsConnectionOptionsPopoverOpen] = useState(shouldShowConnectionOptions);
const [connectionOptionsPopoverPosition, setConnectionOptionsPopoverPosition] = useState<AnchorPosition | null>(null);
const didInitialize = useRef(false);
const integrationKey = isIntuitEnterpriseSuite ? CONST.POLICY.CONNECTIONS.ACCOUNTING_INTEGRATION_ALIASES.INTUIT_ENTERPRISE_SUITE : CONST.POLICY.CONNECTIONS.NAME.QBO;
const connectionButtonRef = popoverAnchorRefs?.current?.[integrationKey];

const selectConnection = (isSandbox: boolean) => {
onConnect(isSandbox);
setIsConnectionOptionsPopoverOpen(false);
};

useEffect(() => {
Comment thread
ShridharGoel marked this conversation as resolved.
Resolved
if (didInitialize.current) {
return;
}
didInitialize.current = true;

// Since QBO doesn't support Taxes, we should disable them from the LHN when connecting to QBO
enablePolicyTaxes(policyID, false);
// Reconnect starts from the overflow menu, so there is no connection button to anchor this popover to.
if (!shouldShowConnectionOptions) {
onConnect(false);
}
}, [onConnect, policyID, shouldShowConnectionOptions]);

useLayoutEffect(() => {
if (!isConnectionOptionsPopoverOpen) {
return;
}
calculatePopoverPosition(connectionButtonRef, anchorAlignment).then(setConnectionOptionsPopoverPosition);
}, [isConnectionOptionsPopoverOpen, calculatePopoverPosition, connectionButtonRef]);

if (!connectionOptionsPopoverPosition) {
return null;
}

return (
<PopoverMenu
isVisible={isConnectionOptionsPopoverOpen}
onClose={() => setIsConnectionOptionsPopoverOpen(false)}
menuItems={[
{
icon: icons.LinkCopy,
text: translate('workspace.accounting.setup'),
onSelected: () => selectConnection(false),
},
{
icon: icons.LinkCopy,
text: translate('workspace.accounting.connectToSandbox'),
onSelected: () => selectConnection(true),
},
]}
anchorPosition={connectionOptionsPopoverPosition}
anchorAlignment={anchorAlignment}
anchorRef={connectionButtonRef}
/>
);
}

export default BaseConnectToQuickbooksOnlineFlow;
22 changes: 12 additions & 10 deletions src/components/ConnectToQuickbooksOnlineFlow/index.native.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@ import Navigation from '@libs/Navigation/Navigation';

import ROUTES from '@src/ROUTES';

import {useEffect} from 'react';

import type {ConnectToQuickbooksOnlineFlowProps} from './types';

function ConnectToQuickbooksOnlineFlow({policyID}: ConnectToQuickbooksOnlineFlowProps) {
useEffect(() => {
// On native the setup opens in an in-app WebView, so navigate to the setup page as a new screen.
// Taxes are disabled there (QBO doesn't support them) when the page mounts.
Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_SETUP.getRoute(policyID));
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
import BaseConnectToQuickbooksOnlineFlow from './BaseConnectToQuickbooksOnlineFlow';

return null;
function ConnectToQuickbooksOnlineFlow({policyID, isIntuitEnterpriseSuite}: ConnectToQuickbooksOnlineFlowProps) {
return (
<BaseConnectToQuickbooksOnlineFlow
policyID={policyID}
isIntuitEnterpriseSuite={isIntuitEnterpriseSuite}
onConnect={(isSandbox) => {
// On native the setup opens in an in-app WebView.
Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_SETUP.getRoute(policyID, isIntuitEnterpriseSuite, isSandbox));
}}
/>
);
}

export default ConnectToQuickbooksOnlineFlow;
27 changes: 13 additions & 14 deletions src/components/ConnectToQuickbooksOnlineFlow/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,24 @@ import useEnvironment from '@hooks/useEnvironment';
import {getQuickbooksOnlineSetupLink} from '@libs/actions/connections/QuickbooksOnline';

import {openLink} from '@userActions/Link';
import {enablePolicyTaxes} from '@userActions/Policy/Policy';

import {useEffect} from 'react';

import type {ConnectToQuickbooksOnlineFlowProps} from './types';

function ConnectToQuickbooksOnlineFlow({policyID}: ConnectToQuickbooksOnlineFlowProps) {
const {environmentURL} = useEnvironment();
import BaseConnectToQuickbooksOnlineFlow from './BaseConnectToQuickbooksOnlineFlow';

useEffect(() => {
// Since QBO doesn't support Taxes, we should disable them from the LHN when connecting to QBO
enablePolicyTaxes(policyID, false);
// On web the setup opens OldDot in a new browser tab. Open it inline here (within the connect click's
// user-gesture window) instead of navigating to a setup screen, otherwise the popup blocker stops the tab.
openLink(getQuickbooksOnlineSetupLink(policyID), environmentURL);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
function ConnectToQuickbooksOnlineFlow({policyID, isIntuitEnterpriseSuite}: ConnectToQuickbooksOnlineFlowProps) {
const {environmentURL} = useEnvironment();

return null;
return (
<BaseConnectToQuickbooksOnlineFlow
policyID={policyID}
isIntuitEnterpriseSuite={isIntuitEnterpriseSuite}
onConnect={(isSandbox) => {
// On web the setup opens OldDot in a new browser tab.
openLink(getQuickbooksOnlineSetupLink(policyID, isIntuitEnterpriseSuite, isSandbox), environmentURL);
}}
/>
);
}

export default ConnectToQuickbooksOnlineFlow;
1 change: 1 addition & 0 deletions src/components/ConnectToQuickbooksOnlineFlow/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type {PolicyConnectionName} from '@src/types/onyx/Policy';

type ConnectToQuickbooksOnlineFlowProps = {
policyID: string;
isIntuitEnterpriseSuite?: boolean;
shouldDisconnectIntegrationBeforeConnecting?: boolean;
integrationToDisconnect?: PolicyConnectionName;
};
Expand Down
Loading
Loading