Skip to content

Commit fc3d993

Browse files
committed
Show selected Sage Intacct travel payable account
1 parent 5e5ee79 commit fc3d993

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

src/ROUTES.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ const DYNAMIC_ROUTES = {
254254
},
255255
POLICY_ACCOUNTING_SAGE_INTACCT_TRAVEL_INVOICING_CONFIGURATION: {
256256
path: 'travel-invoicing',
257-
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT],
257+
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_EXPORT],
258258
},
259259
POLICY_ACCOUNTING_SAGE_INTACCT_TRAVEL_INVOICING_PAYABLE_ACCOUNT_SELECT: {
260260
path: 'payable-account',

src/pages/workspace/accounting/intacct/export/DynamicSageIntacctExportPage.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ function DynamicSageIntacctExportPage({policy}: WithPolicyProps) {
2626
const policyID = policy?.id;
2727
const backPath = useDynamicBackPath(DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT.path);
2828
const {export: exportConfig, pendingFields, errorFields} = policy?.connections?.intacct?.config ?? {};
29+
const exportPath = policyID ? `${ROUTES.POLICY_ACCOUNTING.getRoute(policyID)}/${DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT.path}` : undefined;
30+
const travelPayableAccount = policy?.connections?.intacct?.data?.creditCards?.find((account) => account.name === exportConfig?.travelInvoicingPayableAccountID);
2931

3032
const workspaceAccountID = useWorkspaceAccountID(policyID);
3133
const [cardSettings] = useOnyx(getTravelInvoicingCardSettingsKey(workspaceAccountID));
@@ -54,9 +56,11 @@ function DynamicSageIntacctExportPage({policy}: WithPolicyProps) {
5456
...(isTravelInvoicingEnabled
5557
? [
5658
{
57-
title: translate(`workspace.sageIntacct.nonReimbursableExpenses.values.${CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.CREDIT_CARD_CHARGE}`),
59+
title: travelPayableAccount?.name,
5860
description: translate('workspace.common.travelInvoicing'),
59-
action: !policyID ? undefined : () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_TRAVEL_INVOICING_CONFIGURATION.path)),
61+
action: !exportPath
62+
? undefined
63+
: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_TRAVEL_INVOICING_CONFIGURATION.path, exportPath)),
6064
subscribedSettings: [CONST.SAGE_INTACCT_CONFIG.TRAVEL_INVOICING_PAYABLE_ACCOUNT],
6165
},
6266
]

src/pages/workspace/accounting/intacct/export/DynamicSageIntacctTravelInvoicingConfigurationPage.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {areSettingsInErrorFields, settingsPendingAction} from '@libs/PolicyUtils
1111
import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
1212
import withPolicyConnections from '@pages/workspace/withPolicyConnections';
1313
import CONST from '@src/CONST';
14-
import {DYNAMIC_ROUTES} from '@src/ROUTES';
14+
import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
1515

1616
const payableAccountSetting = [CONST.SAGE_INTACCT_CONFIG.TRAVEL_INVOICING_PAYABLE_ACCOUNT];
1717

@@ -23,6 +23,7 @@ function DynamicSageIntacctTravelInvoicingConfigurationPage({policy}: WithPolicy
2323
const config = policy?.connections?.intacct?.config;
2424
const travelPayableAccount = policy?.connections?.intacct?.data?.creditCards?.find((account) => account.name === config?.export?.travelInvoicingPayableAccountID);
2525
const backPath = useDynamicBackPath(DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_TRAVEL_INVOICING_CONFIGURATION.path);
26+
const travelInvoicingPath = `${ROUTES.POLICY_ACCOUNTING.getRoute(policyID)}/${DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT.path}/${DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_TRAVEL_INVOICING_CONFIGURATION.path}`;
2627

2728
return (
2829
<ConnectionLayout
@@ -49,7 +50,9 @@ function DynamicSageIntacctTravelInvoicingConfigurationPage({policy}: WithPolicy
4950
<MenuItemWithTopDescription
5051
title={travelPayableAccount?.name}
5152
description={translate('workspace.sageIntacct.creditCardAccount')}
52-
onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_TRAVEL_INVOICING_PAYABLE_ACCOUNT_SELECT.path))}
53+
onPress={() =>
54+
Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_TRAVEL_INVOICING_PAYABLE_ACCOUNT_SELECT.path, travelInvoicingPath))
55+
}
5356
shouldShowRightIcon
5457
brickRoadIndicator={areSettingsInErrorFields(payableAccountSetting, config?.errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
5558
/>

0 commit comments

Comments
 (0)