Skip to content

Commit fb230d7

Browse files
committed
fix: add back ath
1 parent 092be95 commit fb230d7

3 files changed

Lines changed: 16 additions & 10 deletions

File tree

src/pages/workspace/accounting/netsuite/export/NetSuiteProvincialTaxPostingAccountSelectPage.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import BlockingView from '@components/BlockingViews/BlockingView';
33
import RadioListItem from '@components/SelectionList/ListItem/RadioListItem';
44
import type {SelectorType} from '@components/SelectionScreen';
55
import SelectionScreen from '@components/SelectionScreen';
6+
import useDynamicBackPath from '@hooks/useDynamicBackPath';
67
import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
78
import useLocalize from '@hooks/useLocalize';
89
import useThemeStyles from '@hooks/useThemeStyles';
@@ -15,14 +16,15 @@ import withPolicyConnections from '@pages/workspace/withPolicyConnections';
1516
import variables from '@styles/variables';
1617
import {clearNetSuiteErrorField} from '@userActions/Policy/Policy';
1718
import CONST from '@src/CONST';
18-
import ROUTES from '@src/ROUTES';
19+
import {DYNAMIC_ROUTES} from '@src/ROUTES';
1920

2021
function NetSuiteProvincialTaxPostingAccountSelectPage({policy}: WithPolicyConnectionsProps) {
2122
const styles = useThemeStyles();
2223
const {translate} = useLocalize();
2324
const illustrations = useMemoizedLazyIllustrations(['Telescope']);
2425

2526
const policyID = policy?.id;
27+
const backPath = useDynamicBackPath(DYNAMIC_ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.path);
2628

2729
const config = policy?.connections?.netsuite?.options.config;
2830
const {subsidiaryList} = policy?.connections?.netsuite?.options?.data ?? {};
@@ -40,9 +42,9 @@ function NetSuiteProvincialTaxPostingAccountSelectPage({policy}: WithPolicyConne
4042
if (config?.provincialTaxPostingAccount !== value && policyID) {
4143
updateNetSuiteProvincialTaxPostingAccount(policyID, value, config?.provincialTaxPostingAccount);
4244
}
43-
Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID));
45+
Navigation.goBack(backPath);
4446
},
45-
[policyID, config?.provincialTaxPostingAccount],
47+
[backPath, policyID, config?.provincialTaxPostingAccount],
4648
);
4749

4850
const listEmptyContent = useMemo(
@@ -69,7 +71,7 @@ function NetSuiteProvincialTaxPostingAccountSelectPage({policy}: WithPolicyConne
6971
listItem={RadioListItem}
7072
onSelectRow={updateTaxAccount}
7173
initiallyFocusedOptionKey={initiallyFocusedOptionKey}
72-
onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID))}
74+
onBackButtonPress={() => Navigation.goBack(backPath)}
7375
title="workspace.netsuite.journalEntriesProvTaxPostingAccount"
7476
listEmptyContent={listEmptyContent}
7577
connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}

src/pages/workspace/accounting/netsuite/export/NetSuiteTaxPostingAccountSelectPage.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import BlockingView from '@components/BlockingViews/BlockingView';
33
import RadioListItem from '@components/SelectionList/ListItem/RadioListItem';
44
import type {SelectorType} from '@components/SelectionScreen';
55
import SelectionScreen from '@components/SelectionScreen';
6+
import useDynamicBackPath from '@hooks/useDynamicBackPath';
67
import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
78
import useLocalize from '@hooks/useLocalize';
89
import usePermissions from '@hooks/usePermissions';
@@ -16,7 +17,7 @@ import withPolicyConnections from '@pages/workspace/withPolicyConnections';
1617
import variables from '@styles/variables';
1718
import {clearNetSuiteErrorField} from '@userActions/Policy/Policy';
1819
import CONST from '@src/CONST';
19-
import ROUTES from '@src/ROUTES';
20+
import {DYNAMIC_ROUTES} from '@src/ROUTES';
2021

2122
function NetSuiteTaxPostingAccountSelectPage({policy}: WithPolicyConnectionsProps) {
2223
const styles = useThemeStyles();
@@ -25,6 +26,7 @@ function NetSuiteTaxPostingAccountSelectPage({policy}: WithPolicyConnectionsProp
2526
const {isBetaEnabled} = usePermissions();
2627

2728
const policyID = policy?.id;
29+
const backPath = useDynamicBackPath(DYNAMIC_ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.path);
2830

2931
const config = policy?.connections?.netsuite?.options.config;
3032
const {subsidiaryList} = policy?.connections?.netsuite?.options?.data ?? {};
@@ -42,9 +44,9 @@ function NetSuiteTaxPostingAccountSelectPage({policy}: WithPolicyConnectionsProp
4244
if (config?.taxPostingAccount !== value && policyID) {
4345
updateNetSuiteTaxPostingAccount(policyID, value, config?.taxPostingAccount);
4446
}
45-
Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID));
47+
Navigation.goBack(backPath);
4648
},
47-
[policyID, config?.taxPostingAccount],
49+
[backPath, policyID, config?.taxPostingAccount],
4850
);
4951

5052
const listEmptyContent = useMemo(
@@ -71,7 +73,7 @@ function NetSuiteTaxPostingAccountSelectPage({policy}: WithPolicyConnectionsProp
7173
listItem={RadioListItem}
7274
onSelectRow={updateTaxAccount}
7375
initiallyFocusedOptionKey={initiallyFocusedOptionKey}
74-
onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID))}
76+
onBackButtonPress={() => Navigation.goBack(backPath)}
7577
title="workspace.netsuite.journalEntriesTaxPostingAccount"
7678
listEmptyContent={listEmptyContent}
7779
connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}

src/pages/workspace/accounting/netsuite/export/NetSuiteTravelInvoicingConfigurationPage.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ import type {ValueOf} from 'type-fest';
33
import ConnectionLayout from '@components/ConnectionLayout';
44
import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
55
import OfflineWithFeedback from '@components/OfflineWithFeedback';
6+
import useDynamicBackPath from '@hooks/useDynamicBackPath';
67
import useLocalize from '@hooks/useLocalize';
78
import useThemeStyles from '@hooks/useThemeStyles';
89
import {areSettingsInErrorFields, settingsPendingAction} from '@libs/PolicyUtils';
910
import Navigation from '@navigation/Navigation';
1011
import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
1112
import withPolicyConnections from '@pages/workspace/withPolicyConnections';
1213
import CONST from '@src/CONST';
13-
import ROUTES from '@src/ROUTES';
14+
import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
1415
import type {PendingAction} from '@src/types/onyx/OnyxCommon';
1516

1617
type NetSuiteSectionType = {
@@ -29,6 +30,7 @@ function NetSuiteTravelInvoicingConfigurationPage({policy}: WithPolicyConnection
2930
const styles = useThemeStyles();
3031

3132
const policyID = policy?.id ?? String(CONST.DEFAULT_NUMBER_ID);
33+
const backPath = useDynamicBackPath(DYNAMIC_ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.path);
3234
const config = policy?.connections?.netsuite?.options?.config;
3335

3436
const {payableList} = policy?.connections?.netsuite?.options?.data ?? {};
@@ -60,7 +62,7 @@ function NetSuiteTravelInvoicingConfigurationPage({policy}: WithPolicyConnection
6062
contentContainerStyle={styles.pb2}
6163
titleStyle={styles.ph5}
6264
connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
63-
onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID))}
65+
onBackButtonPress={() => Navigation.goBack(backPath)}
6466
>
6567
{sections.map((section) => (
6668
<OfflineWithFeedback

0 commit comments

Comments
 (0)