From 8448c964b6eee19f45d843ea765e2e3f049093bd Mon Sep 17 00:00:00 2001 From: huutech <20178761+huult@users.noreply.github.com> Date: Mon, 13 Apr 2026 17:45:37 +0700 Subject: [PATCH 1/2] migrate POLICY_ACCOUNTING_SAGE_INTACCT_AUTO_SYNC and POLICY_ACCOUNTING_SAGE_INTACCT_ACCOUNTING_METHOD --- src/ROUTES.ts | 27 ++++++------------- src/SCREENS.ts | 4 +-- .../ModalStackNavigators/index.tsx | 7 ++--- .../RELATIONS/WORKSPACE_TO_RHP.ts | 4 +-- src/libs/Navigation/linkingConfig/config.ts | 4 +-- src/libs/Navigation/types.ts | 6 +++++ ...ynamicSageIntacctAccountingMethodPage.tsx} | 25 ++++++++++------- .../advanced/SageIntacctAdvancedPage.tsx | 5 ++-- .../advanced/SageIntacctAutoSyncPage.tsx | 11 +++++++- .../advanced/SageIntacctAutoSyncPageBase.tsx | 5 ++-- 10 files changed, 55 insertions(+), 43 deletions(-) rename src/pages/workspace/accounting/intacct/advanced/{SageIntacctAccountingMethodPage.tsx => DynamicSageIntacctAccountingMethodPage.tsx} (81%) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 93afc48e0a97..67d5332474b0 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -161,6 +161,14 @@ const DYNAMIC_ROUTES = { path: 'credit-card-account', entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES], }, + POLICY_ACCOUNTING_SAGE_INTACCT_AUTO_SYNC: { + path: 'sage-intacct-autosync', + entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADVANCED], + }, + POLICY_ACCOUNTING_SAGE_INTACCT_ACCOUNTING_METHOD: { + path: 'sage-intacct-accounting-method', + entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_AUTO_SYNC], + }, POLICY_ACCOUNTING_XERO_EXPORT_BANK_ACCOUNT_SELECT: { path: 'bank-account-select', entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT], @@ -3881,25 +3889,6 @@ const ROUTES = { return `workspaces/${policyID}/accounting/sage-intacct/advanced/payment-account` as const; }, }, - POLICY_ACCOUNTING_SAGE_INTACCT_AUTO_SYNC: { - route: 'workspaces/:policyID/accounting/sage-intacct/advanced/autosync', - getRoute: (policyID: string | undefined, backTo?: string) => { - if (!policyID) { - Log.warn('Invalid policyID is used to build the POLICY_ACCOUNTING_SAGE_INTACCT_AUTO_SYNC route'); - } - // eslint-disable-next-line no-restricted-syntax - return getUrlWithBackToParam(`workspaces/${policyID}/accounting/sage-intacct/advanced/autosync` as const, backTo); - }, - }, - POLICY_ACCOUNTING_SAGE_INTACCT_ACCOUNTING_METHOD: { - route: 'workspaces/:policyID/accounting/sage-intacct/advanced/autosync/accounting-method', - getRoute: (policyID: string | undefined) => { - if (!policyID) { - Log.warn('Invalid policyID is used to build the POLICY_ACCOUNTING_SAGE_INTACCT_ACCOUNTING_METHOD route'); - } - return `workspaces/${policyID}/accounting/sage-intacct/advanced/autosync/accounting-method` as const; - }, - }, ADD_UNREPORTED_EXPENSE: { route: 'search/r/:reportID/add-unreported-expense/:backToReport?', getRoute: (reportID: string | undefined, backToReport?: string) => `search/r/${reportID}/add-unreported-expense/${backToReport ?? ''}` as const, diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 5fdccc4d6629..3b6b69a6d401 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -650,8 +650,8 @@ const SCREENS = { DYNAMIC_SAGE_INTACCT_DEFAULT_VENDOR: 'Dynamic_Policy_Accounting_Sage_Intacct_Default_Vendor', DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT: 'Dynamic_Policy_Accounting_Sage_Intacct_Non_Reimbursable_Credit_Card_Account', SAGE_INTACCT_ADVANCED: 'Policy_Accounting_Sage_Intacct_Advanced', - SAGE_INTACCT_AUTO_SYNC: 'Policy_Accounting_Sage_Intacct_Auto_Sync', - SAGE_INTACCT_ACCOUNTING_METHOD: 'Policy_Accounting_Sage_Intacct_Accounting_Method', + DYNAMIC_SAGE_INTACCT_AUTO_SYNC: 'Dynamic_Policy_Accounting_Sage_Intacct_Auto_Sync', + DYNAMIC_SAGE_INTACCT_ACCOUNTING_METHOD: 'Dynamic_Policy_Accounting_Sage_Intacct_Accounting_Method', SAGE_INTACCT_PAYMENT_ACCOUNT: 'Policy_Accounting_Sage_Intacct_Payment_Account', CARD_RECONCILIATION: 'Policy_Accounting_Card_Reconciliation', CARD_RECONCILIATION_QUICKBOOKS_DESKTOP_AUTO_SYNC: 'Policy_Accounting_Card_Reconciliation_Quickbooks_Desktop_Auto_Sync', diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index 61b05ad6474c..0dc460953b67 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -774,9 +774,10 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/workspace/accounting/intacct/export/DynamicSageIntacctNonReimbursableCreditCardAccountPage').default, [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADVANCED]: () => require('../../../../pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage').default, - [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_AUTO_SYNC]: () => require('../../../../pages/workspace/accounting/intacct/advanced/SageIntacctAutoSyncPage').default, - [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ACCOUNTING_METHOD]: () => - require('../../../../pages/workspace/accounting/intacct/advanced/SageIntacctAccountingMethodPage').default, + [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_AUTO_SYNC]: () => + require('../../../../pages/workspace/accounting/intacct/advanced/SageIntacctAutoSyncPage').default, + [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_ACCOUNTING_METHOD]: () => + require('../../../../pages/workspace/accounting/intacct/advanced/DynamicSageIntacctAccountingMethodPage').default, [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PAYMENT_ACCOUNT]: () => require('../../../../pages/workspace/accounting/intacct/advanced/SageIntacctPaymentAccountPage').default, [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION]: () => require('../../../../pages/workspace/accounting/reconciliation/CardReconciliationPage').default, diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts index 0fbbab59be1e..bc5c6613bfe6 100755 --- a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts +++ b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts @@ -170,8 +170,8 @@ const WORKSPACE_TO_RHP: Partial['config'] = { [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT]: DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT.path, [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADVANCED]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ADVANCED.route}, - [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_AUTO_SYNC]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_AUTO_SYNC.route}, - [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ACCOUNTING_METHOD]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ACCOUNTING_METHOD.route}, + [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_AUTO_SYNC]: DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_AUTO_SYNC.path, + [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_ACCOUNTING_METHOD]: DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ACCOUNTING_METHOD.path, [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PAYMENT_ACCOUNT]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PAYMENT_ACCOUNT.route}, [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION]: {path: ROUTES.WORKSPACE_ACCOUNTING_CARD_RECONCILIATION.route}, [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION_QUICKBOOKS_DESKTOP_AUTO_SYNC]: { diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index b1e24a50f063..c58807b449a4 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -1128,6 +1128,12 @@ type SettingsNavigatorParamList = { [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADVANCED]: { policyID: string; }; + [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_AUTO_SYNC]: { + policyID: string; + }; + [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_ACCOUNTING_METHOD]: { + policyID: string; + }; [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PAYMENT_ACCOUNT]: { policyID: string; }; diff --git a/src/pages/workspace/accounting/intacct/advanced/SageIntacctAccountingMethodPage.tsx b/src/pages/workspace/accounting/intacct/advanced/DynamicSageIntacctAccountingMethodPage.tsx similarity index 81% rename from src/pages/workspace/accounting/intacct/advanced/SageIntacctAccountingMethodPage.tsx rename to src/pages/workspace/accounting/intacct/advanced/DynamicSageIntacctAccountingMethodPage.tsx index 226315c5f954..40dcda1c4e9b 100644 --- a/src/pages/workspace/accounting/intacct/advanced/SageIntacctAccountingMethodPage.tsx +++ b/src/pages/workspace/accounting/intacct/advanced/DynamicSageIntacctAccountingMethodPage.tsx @@ -7,6 +7,7 @@ import type {ListItem} from '@components/SelectionList/types'; import SelectionScreen from '@components/SelectionScreen'; import type {SelectorType} from '@components/SelectionScreen'; import Text from '@components/Text'; +import useDynamicBackPath from '@hooks/useDynamicBackPath'; import useLocalize from '@hooks/useLocalize'; import useThemeStyles from '@hooks/useThemeStyles'; import {updateSageIntacctAccountingMethod} from '@libs/actions/connections/SageIntacct'; @@ -15,24 +16,24 @@ import {settingsPendingAction} from '@libs/PolicyUtils'; import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections'; import withPolicyConnections from '@pages/workspace/withPolicyConnections'; import CONST from '@src/CONST'; -import type {TranslationPaths} from '@src/languages/types'; -import ROUTES from '@src/ROUTES'; +import {DYNAMIC_ROUTES} from '@src/ROUTES'; type MenuListItem = ListItem & { value: ValueOf; }; -function SageIntacctAccountingMethodPage({policy}: WithPolicyConnectionsProps) { +function DynamicSageIntacctAccountingMethodPage({policy}: WithPolicyConnectionsProps) { const {translate} = useLocalize(); const policyID = policy?.id; const styles = useThemeStyles(); const config = policy?.connections?.intacct?.config; const accountingMethod = config?.export?.accountingMethod ?? COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH; + const backPath = useDynamicBackPath(DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ACCOUNTING_METHOD.path); const data: MenuListItem[] = Object.values(COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD).map((accountingMethodType) => ({ value: accountingMethodType, - text: translate(`workspace.sageIntacct.accountingMethods.values.${accountingMethodType}` as TranslationPaths), - alternateText: translate(`workspace.sageIntacct.accountingMethods.alternateText.${accountingMethodType}` as TranslationPaths), + text: translate(`workspace.sageIntacct.accountingMethods.values.${accountingMethodType}` as const), + alternateText: translate(`workspace.sageIntacct.accountingMethods.alternateText.${accountingMethodType}` as const), keyForList: `${accountingMethodType}`, isSelected: accountingMethod === accountingMethodType, })); @@ -49,19 +50,23 @@ function SageIntacctAccountingMethodPage({policy}: WithPolicyConnectionsProps) { [translate, styles.pb5, styles.ph5], ); + const goBack = useCallback(() => { + Navigation.goBack(backPath); + }, [backPath]); + const selectExpenseReportApprovalLevel = useCallback( (row: MenuListItem) => { if (row.value !== accountingMethod) { updateSageIntacctAccountingMethod(policyID, row.value, accountingMethod); } - Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_AUTO_SYNC.getRoute(policyID)); + goBack(); }, - [accountingMethod, policyID], + [accountingMethod, policyID, goBack], ); return ( Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_AUTO_SYNC.getRoute(policyID))} + onBackButtonPress={goBack} connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT} pendingAction={pendingAction} shouldBeBlocked={!config?.autoSync?.enabled} @@ -79,4 +84,4 @@ function SageIntacctAccountingMethodPage({policy}: WithPolicyConnectionsProps) { ); } -export default withPolicyConnections(SageIntacctAccountingMethodPage); +export default withPolicyConnections(DynamicSageIntacctAccountingMethodPage); diff --git a/src/pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage.tsx b/src/pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage.tsx index e589ca416711..1be408e20945 100644 --- a/src/pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage.tsx +++ b/src/pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage.tsx @@ -9,6 +9,7 @@ import useLocalize from '@hooks/useLocalize'; import useThemeStyles from '@hooks/useThemeStyles'; import {getLatestErrorField} from '@libs/ErrorUtils'; import {areSettingsInErrorFields, getCurrentSageIntacctEntityName, settingsPendingAction} from '@libs/PolicyUtils'; +import createDynamicRoute from '@navigation/helpers/dynamicRoutesUtils/createDynamicRoute'; import Navigation from '@navigation/Navigation'; import type {WithPolicyProps} from '@pages/workspace/withPolicy'; import withPolicy from '@pages/workspace/withPolicy'; @@ -22,7 +23,7 @@ import { import {clearSageIntacctErrorField} from '@userActions/Policy/Policy'; import CONST from '@src/CONST'; import type {TranslationPaths} from '@src/languages/types'; -import ROUTES from '@src/ROUTES'; +import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES'; import type {SageIntacctDataElement} from '@src/types/onyx/Policy'; function getReimbursedAccountName(bankAccounts: SageIntacctDataElement[], reimbursementAccountID?: string): string | undefined { @@ -103,7 +104,7 @@ function SageIntacctAdvancedPage({policy}: WithPolicyProps) { title={config?.autoSync?.enabled ? translate('common.enabled') : translate('common.disabled')} description={translate('workspace.accounting.autoSync')} shouldShowRightIcon - onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_AUTO_SYNC.getRoute(policyID))} + onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_AUTO_SYNC.path))} brickRoadIndicator={ areSettingsInErrorFields([CONST.SAGE_INTACCT_CONFIG.AUTO_SYNC, CONST.SAGE_INTACCT_CONFIG.ACCOUNTING_METHOD], config?.errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR diff --git a/src/pages/workspace/accounting/intacct/advanced/SageIntacctAutoSyncPage.tsx b/src/pages/workspace/accounting/intacct/advanced/SageIntacctAutoSyncPage.tsx index 455a17223307..76fd683ec50e 100644 --- a/src/pages/workspace/accounting/intacct/advanced/SageIntacctAutoSyncPage.tsx +++ b/src/pages/workspace/accounting/intacct/advanced/SageIntacctAutoSyncPage.tsx @@ -1,10 +1,19 @@ import React from 'react'; +import useDynamicBackPath from '@hooks/useDynamicBackPath'; import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections'; import withPolicyConnections from '@pages/workspace/withPolicyConnections'; +import {DYNAMIC_ROUTES} from '@src/ROUTES'; import SageIntacctAutoSyncPageBase from './SageIntacctAutoSyncPageBase'; function SageIntacctAutoSyncPage({policy}: WithPolicyConnectionsProps) { - return ; + const backPath = useDynamicBackPath(DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_AUTO_SYNC.path); + + return ( + + ); } export default withPolicyConnections(SageIntacctAutoSyncPage); diff --git a/src/pages/workspace/accounting/intacct/advanced/SageIntacctAutoSyncPageBase.tsx b/src/pages/workspace/accounting/intacct/advanced/SageIntacctAutoSyncPageBase.tsx index a56c6057b390..738300d473c9 100644 --- a/src/pages/workspace/accounting/intacct/advanced/SageIntacctAutoSyncPageBase.tsx +++ b/src/pages/workspace/accounting/intacct/advanced/SageIntacctAutoSyncPageBase.tsx @@ -10,11 +10,12 @@ import {updateSageIntacctAutoSync} from '@libs/actions/connections/SageIntacct'; import {getLatestErrorField} from '@libs/ErrorUtils'; import Navigation from '@libs/Navigation/Navigation'; import {settingsPendingAction} from '@libs/PolicyUtils'; +import createDynamicRoute from '@navigation/helpers/dynamicRoutesUtils/createDynamicRoute'; import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow'; import {clearSageIntacctErrorField} from '@userActions/Policy/Policy'; import CONST from '@src/CONST'; import type {TranslationPaths} from '@src/languages/types'; -import ROUTES from '@src/ROUTES'; +import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES'; import type {Route} from '@src/ROUTES'; import type {Policy} from '@src/types/onyx'; @@ -72,7 +73,7 @@ function SageIntacctAutoSyncPageBase({policy, navigateBackTo}: SageIntacctAutoSy } description={translate('workspace.sageIntacct.accountingMethods.label')} shouldShowRightIcon - onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ACCOUNTING_METHOD.getRoute(policyID))} + onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ACCOUNTING_METHOD.path))} /> )} From 2022bbf60a70bfdc378d7ef4ca39ebdee27a11d5 Mon Sep 17 00:00:00 2001 From: huutech <20178761+huult@users.noreply.github.com> Date: Mon, 13 Apr 2026 18:49:24 +0700 Subject: [PATCH 2/2] update entry screen --- src/ROUTES.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 67d5332474b0..53cc7deae2a6 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -167,7 +167,7 @@ const DYNAMIC_ROUTES = { }, POLICY_ACCOUNTING_SAGE_INTACCT_ACCOUNTING_METHOD: { path: 'sage-intacct-accounting-method', - entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_AUTO_SYNC], + entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.DYNAMIC_SAGE_INTACCT_AUTO_SYNC, SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION_SAGE_INTACCT_AUTO_SYNC], }, POLICY_ACCOUNTING_XERO_EXPORT_BANK_ACCOUNT_SELECT: { path: 'bank-account-select', @@ -178,7 +178,7 @@ const DYNAMIC_ROUTES = { entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT], }, POLICY_ACCOUNTING_XERO_AUTO_SYNC: { - path: 'autosync', + path: 'xero-autosync', entryScreens: [SCREENS.WORKSPACE.ACCOUNTING.XERO_ADVANCED, SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION], }, POLICY_ACCOUNTING_XERO_ACCOUNTING_METHOD: {