Skip to content

Commit 43a6a1a

Browse files
mjasikowskimjasikowski
authored
Merge pull request Expensify#86624 from huult/83846-migrate-workspace-sage-intacct-part-2-v2
2 parents 2c5fc05 + ae8a4eb commit 43a6a1a

11 files changed

Lines changed: 67 additions & 85 deletions

‎src/ROUTES.ts‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,20 @@ const DYNAMIC_ROUTES = {
111111
path: 'visibility',
112112
entryScreens: [SCREENS.REPORT_SETTINGS.ROOT],
113113
},
114+
POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_DESTINATION: {
115+
path: 'destination',
116+
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES],
117+
},
118+
POLICY_ACCOUNTING_SAGE_INTACCT_DEFAULT_VENDOR: {
119+
path: 'default-vendor',
120+
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_REIMBURSABLE_EXPENSES, SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES],
121+
getRoute: (reimbursable: string) => getUrlWithParams('default-vendor', {reimbursable}),
122+
queryParams: ['reimbursable'],
123+
},
124+
POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT: {
125+
path: 'credit-card-account',
126+
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES],
127+
},
114128
POLICY_ACCOUNTING_XERO_EXPORT_BANK_ACCOUNT_SELECT: {
115129
path: 'bank-account-select',
116130
entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT],
@@ -3847,24 +3861,6 @@ const ROUTES = {
38473861
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
38483862
getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/accounting/sage-intacct/export/reimbursable/destination` as const, backTo),
38493863
},
3850-
POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_DESTINATION: {
3851-
route: 'workspaces/:policyID/accounting/sage-intacct/export/nonreimbursable/destination',
3852-
3853-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
3854-
getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/accounting/sage-intacct/export/nonreimbursable/destination` as const, backTo),
3855-
},
3856-
POLICY_ACCOUNTING_SAGE_INTACCT_DEFAULT_VENDOR: {
3857-
route: 'workspaces/:policyID/accounting/sage-intacct/export/:reimbursable/default-vendor',
3858-
getRoute: (policyID: string, reimbursable: string, backTo?: string) =>
3859-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
3860-
getUrlWithBackToParam(`workspaces/${policyID}/accounting/sage-intacct/export/${reimbursable}/default-vendor` as const, backTo),
3861-
},
3862-
POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT: {
3863-
route: 'workspaces/:policyID/accounting/sage-intacct/export/nonreimbursable/credit-card-account',
3864-
3865-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
3866-
getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/accounting/sage-intacct/export/nonreimbursable/credit-card-account` as const, backTo),
3867-
},
38683864
POLICY_ACCOUNTING_SAGE_INTACCT_ADVANCED: {
38693865
route: 'workspaces/:policyID/accounting/sage-intacct/advanced',
38703866
getRoute: (policyID: string | undefined) => {

‎src/SCREENS.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -644,9 +644,9 @@ const SCREENS = {
644644
SAGE_INTACCT_REIMBURSABLE_EXPENSES: 'Policy_Accounting_Sage_Intacct_Reimbursable_Expenses',
645645
SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES: 'Policy_Accounting_Sage_Intacct_Non_Reimbursable_Expenses',
646646
SAGE_INTACCT_REIMBURSABLE_DESTINATION: 'Policy_Accounting_Sage_Intacct_Reimbursable_Destination',
647-
SAGE_INTACCT_NON_REIMBURSABLE_DESTINATION: 'Policy_Accounting_Sage_Intacct_Non_Reimbursable_Destination',
648-
SAGE_INTACCT_DEFAULT_VENDOR: 'Policy_Accounting_Sage_Intacct_Default_Vendor',
649-
SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT: 'Policy_Accounting_Sage_Intacct_Non_Reimbursable_Credit_Card_Account',
647+
DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_DESTINATION: 'Dynamic_Policy_Accounting_Sage_Intacct_Non_Reimbursable_Destination',
648+
DYNAMIC_SAGE_INTACCT_DEFAULT_VENDOR: 'Dynamic_Policy_Accounting_Sage_Intacct_Default_Vendor',
649+
DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT: 'Dynamic_Policy_Accounting_Sage_Intacct_Non_Reimbursable_Credit_Card_Account',
650650
SAGE_INTACCT_ADVANCED: 'Policy_Accounting_Sage_Intacct_Advanced',
651651
SAGE_INTACCT_AUTO_SYNC: 'Policy_Accounting_Sage_Intacct_Auto_Sync',
652652
SAGE_INTACCT_ACCOUNTING_METHOD: 'Policy_Accounting_Sage_Intacct_Accounting_Method',

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -764,12 +764,12 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
764764
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage').default,
765765
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_REIMBURSABLE_DESTINATION]: () =>
766766
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesDestinationPage').default,
767-
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_DESTINATION]: () =>
768-
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesDestinationPage').default,
769-
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_DEFAULT_VENDOR]: () =>
770-
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctDefaultVendorPage').default,
771-
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT]: () =>
772-
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableCreditCardAccountPage').default,
767+
[SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_DESTINATION]: () =>
768+
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/DynamicSageIntacctNonReimbursableExpensesDestinationPage').default,
769+
[SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_DEFAULT_VENDOR]: () =>
770+
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/DynamicSageIntacctDefaultVendorPage').default,
771+
[SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT]: () =>
772+
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/DynamicSageIntacctNonReimbursableCreditCardAccountPage').default,
773773
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADVANCED]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage').default,
774774
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_AUTO_SYNC]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/advanced/SageIntacctAutoSyncPage').default,
775775
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ACCOUNTING_METHOD]: () =>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@ const WORKSPACE_TO_RHP: Partial<Record<keyof WorkspaceSplitNavigatorParamList, s
165165
SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_REIMBURSABLE_EXPENSES,
166166
SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES,
167167
SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_REIMBURSABLE_DESTINATION,
168-
SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_DESTINATION,
169-
SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_DEFAULT_VENDOR,
170-
SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT,
168+
SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_DESTINATION,
169+
SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_DEFAULT_VENDOR,
170+
SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT,
171171
SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADVANCED,
172172
SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_AUTO_SYNC,
173173
SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ACCOUNTING_METHOD,

‎src/libs/Navigation/linkingConfig/config.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -761,11 +761,10 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
761761
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_REIMBURSABLE_EXPENSES]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_REIMBURSABLE_EXPENSES.route},
762762
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES.route},
763763
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_REIMBURSABLE_DESTINATION]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_REIMBURSABLE_DESTINATION.route},
764-
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_DESTINATION]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_DESTINATION.route},
765-
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_DEFAULT_VENDOR]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_DEFAULT_VENDOR.route},
766-
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT]: {
767-
path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT.route,
768-
},
764+
[SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_DESTINATION]: DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_DESTINATION.path,
765+
[SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_DEFAULT_VENDOR]: DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_DEFAULT_VENDOR.path,
766+
[SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT]:
767+
DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT.path,
769768
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADVANCED]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ADVANCED.route},
770769
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_AUTO_SYNC]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_AUTO_SYNC.route},
771770
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ACCOUNTING_METHOD]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ACCOUNTING_METHOD.route},

‎src/libs/Navigation/types.ts‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1127,21 +1127,15 @@ type SettingsNavigatorParamList = {
11271127
// 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
11281128
backTo?: Routes;
11291129
};
1130-
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_DESTINATION]: {
1130+
[SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_DESTINATION]: {
11311131
policyID: string;
1132-
// 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
1133-
backTo?: Routes;
11341132
};
1135-
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_DEFAULT_VENDOR]: {
1133+
[SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_DEFAULT_VENDOR]: {
11361134
policyID: string;
11371135
reimbursable: string;
1138-
// 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
1139-
backTo?: Routes;
11401136
};
1141-
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT]: {
1137+
[SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT]: {
11421138
policyID: string;
1143-
// 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
1144-
backTo?: Routes;
11451139
};
11461140
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADVANCED]: {
11471141
policyID: string;

src/pages/workspace/accounting/intacct/export/SageIntacctDefaultVendorPage.tsx renamed to src/pages/workspace/accounting/intacct/export/DynamicSageIntacctDefaultVendorPage.tsx

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import RadioListItem from '@components/SelectionList/ListItem/RadioListItem';
66
import type {SelectorType} from '@components/SelectionScreen';
77
import SelectionScreen from '@components/SelectionScreen';
88
import Text from '@components/Text';
9+
import useDynamicBackPath from '@hooks/useDynamicBackPath';
910
import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
1011
import useLocalize from '@hooks/useLocalize';
1112
import usePolicy from '@hooks/usePolicy';
@@ -19,31 +20,28 @@ import type {SettingsNavigatorParamList} from '@navigation/types';
1920
import variables from '@styles/variables';
2021
import {updateSageIntacctDefaultVendor} from '@userActions/connections/SageIntacct';
2122
import CONST from '@src/CONST';
22-
import ROUTES from '@src/ROUTES';
23+
import {DYNAMIC_ROUTES} from '@src/ROUTES';
2324
import type SCREENS from '@src/SCREENS';
2425
import type {Connections} from '@src/types/onyx/Policy';
2526

26-
function SageIntacctDefaultVendorPage() {
27+
function DynamicSageIntacctDefaultVendorPage() {
2728
const styles = useThemeStyles();
2829
const {translate} = useLocalize();
2930

30-
const route = useRoute<PlatformStackRouteProp<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_DEFAULT_VENDOR>>();
31+
const route = useRoute<PlatformStackRouteProp<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_DEFAULT_VENDOR>>();
3132
const policyID = route.params.policyID;
3233
const policy = usePolicy(policyID);
3334
const {config} = policy?.connections?.intacct ?? {};
3435
const {export: exportConfig} = policy?.connections?.intacct?.config ?? {};
35-
const backTo = route.params.backTo;
36+
const backPath = useDynamicBackPath(DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_DEFAULT_VENDOR.path);
3637
const illustrations = useMemoizedLazyIllustrations(['Telescope']);
3738

38-
const isReimbursable = route.params.reimbursable === CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE;
39+
const reimbursableMode =
40+
route.params.reimbursable ?? (backPath.includes('/reimbursable') ? CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE : CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE.toLowerCase());
41+
const isReimbursable = reimbursableMode === CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE;
3942
const goBack = useCallback(() => {
40-
Navigation.goBack(
41-
backTo ??
42-
(isReimbursable
43-
? ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_REIMBURSABLE_EXPENSES.getRoute(policyID)
44-
: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES.getRoute(policyID)),
45-
);
46-
}, [backTo, policyID, isReimbursable]);
43+
Navigation.goBack(backPath);
44+
}, [backPath]);
4745

4846
let defaultVendor;
4947
let settingName: keyof Connections['intacct']['config']['export'];
@@ -118,4 +116,4 @@ function SageIntacctDefaultVendorPage() {
118116
);
119117
}
120118

121-
export default SageIntacctDefaultVendorPage;
119+
export default DynamicSageIntacctDefaultVendorPage;

src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableCreditCardAccountPage.tsx renamed to src/pages/workspace/accounting/intacct/export/DynamicSageIntacctNonReimbursableCreditCardAccountPage.tsx

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,36 @@
1-
import {useRoute} from '@react-navigation/native';
21
import React, {useCallback, useMemo} from 'react';
32
import BlockingView from '@components/BlockingViews/BlockingView';
43
import RadioListItem from '@components/SelectionList/ListItem/RadioListItem';
54
import type {SelectorType} from '@components/SelectionScreen';
65
import SelectionScreen from '@components/SelectionScreen';
6+
import useDynamicBackPath from '@hooks/useDynamicBackPath';
77
import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
88
import useLocalize from '@hooks/useLocalize';
99
import useThemeStyles from '@hooks/useThemeStyles';
1010
import {clearSageIntacctErrorField} from '@libs/actions/Policy/Policy';
1111
import {getLatestErrorField} from '@libs/ErrorUtils';
1212
import Navigation from '@libs/Navigation/Navigation';
13-
import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
14-
import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
1513
import {getSageIntacctCreditCards, settingsPendingAction} from '@libs/PolicyUtils';
1614
import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
1715
import withPolicyConnections from '@pages/workspace/withPolicyConnections';
1816
import variables from '@styles/variables';
1917
import {updateSageIntacctNonreimbursableExpensesExportAccount} from '@userActions/connections/SageIntacct';
2018
import CONST from '@src/CONST';
21-
import ROUTES from '@src/ROUTES';
22-
import type SCREENS from '@src/SCREENS';
19+
import {DYNAMIC_ROUTES} from '@src/ROUTES';
2320

24-
function SageIntacctNonReimbursableCreditCardAccountPage({policy}: WithPolicyConnectionsProps) {
21+
function DynamicSageIntacctNonReimbursableCreditCardAccountPage({policy}: WithPolicyConnectionsProps) {
2522
const styles = useThemeStyles();
2623
const {translate} = useLocalize();
2724

2825
const policyID = policy?.id;
2926
const {config} = policy?.connections?.intacct ?? {};
3027
const {export: exportConfig} = policy?.connections?.intacct?.config ?? {};
31-
const route = useRoute<PlatformStackRouteProp<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT>>();
32-
const backTo = route.params.backTo;
28+
const backPath = useDynamicBackPath(DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT.path);
3329
const illustrations = useMemoizedLazyIllustrations(['Telescope']);
3430

3531
const goBack = useCallback(() => {
36-
Navigation.goBack(backTo ?? (policyID && ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES.getRoute(policyID)));
37-
}, [backTo, policyID]);
32+
Navigation.goBack(backPath);
33+
}, [backPath]);
3834

3935
const creditCardSelectorOptions = useMemo<SelectorType[]>(() => getSageIntacctCreditCards(policy, exportConfig?.nonReimbursableAccount), [exportConfig?.nonReimbursableAccount, policy]);
4036

@@ -84,4 +80,4 @@ function SageIntacctNonReimbursableCreditCardAccountPage({policy}: WithPolicyCon
8480
);
8581
}
8682

87-
export default withPolicyConnections(SageIntacctNonReimbursableCreditCardAccountPage);
83+
export default withPolicyConnections(DynamicSageIntacctNonReimbursableCreditCardAccountPage);

0 commit comments

Comments
 (0)