Skip to content

Commit a608f0f

Browse files
committed
fix: update the export back routes
1 parent 8fae0b2 commit a608f0f

4 files changed

Lines changed: 13 additions & 13 deletions

src/pages/workspace/accounting/qbd/export/DynamicQuickbooksDesktopCompanyCardExpenseAccountPage.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import ConnectionLayout from '@components/ConnectionLayout';
44
import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
55
import OfflineWithFeedback from '@components/OfflineWithFeedback';
66
import useAccordionAnimation from '@hooks/useAccordionAnimation';
7-
import useDynamicBackPath from '@hooks/useDynamicBackPath';
87
import useLocalize from '@hooks/useLocalize';
98
import useThemeStyles from '@hooks/useThemeStyles';
109
import {updateQuickbooksDesktopShouldAutoCreateVendor} from '@libs/actions/connections/QuickbooksDesktop';
@@ -30,7 +29,6 @@ function DynamicQuickbooksDesktopCompanyCardExpenseAccountPage({policy}: WithPol
3029
const nonReimbursableBillDefaultVendorObject = vendors?.find((vendor) => vendor.id === qbdConfig?.export?.nonReimbursableBillDefaultVendor);
3130
const nonReimbursable = qbdConfig?.export?.nonReimbursable;
3231
const nonReimbursableAccount = qbdConfig?.export?.nonReimbursableAccount;
33-
const backPath = useDynamicBackPath(DYNAMIC_ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_COMPANY_CARD_EXPENSE_ACCOUNT.path);
3432

3533
const accountName = useMemo(() => {
3634
const qbdReimbursableAccounts = getQBDReimbursableAccounts(policy?.connections?.quickbooksDesktop, nonReimbursable);
@@ -70,7 +68,9 @@ function DynamicQuickbooksDesktopCompanyCardExpenseAccountPage({policy}: WithPol
7068
contentContainerStyle={styles.pb2}
7169
titleStyle={styles.ph5}
7270
connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
73-
onBackButtonPress={() => Navigation.goBack(backPath)}
71+
onBackButtonPress={() =>
72+
Navigation.goBack(policyID ? createDynamicRoute(DYNAMIC_ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXPORT.path, ROUTES.POLICY_ACCOUNTING.getRoute(policyID)) : undefined)
73+
}
7474
>
7575
{sections.map((section) => (
7676
<OfflineWithFeedback

src/pages/workspace/accounting/qbd/export/QuickbooksDesktopExportDateSelectPage.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import useLocalize from '@hooks/useLocalize';
88
import useThemeStyles from '@hooks/useThemeStyles';
99
import {updateQuickbooksDesktopExportDate} from '@libs/actions/connections/QuickbooksDesktop';
1010
import {getLatestErrorField} from '@libs/ErrorUtils';
11+
import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
1112
import {settingsPendingAction} from '@libs/PolicyUtils';
1213
import Navigation from '@navigation/Navigation';
1314
import type {PlatformStackRouteProp} from '@navigation/PlatformStackNavigation/types';
@@ -28,8 +29,6 @@ function QuickbooksDesktopExportDateSelectPage({policy}: WithPolicyConnectionsPr
2829
const policyID = policy?.id;
2930
const qbdConfig = policy?.connections?.quickbooksDesktop?.config;
3031
const exportDate = qbdConfig?.export?.exportDate;
31-
const route = useRoute<PlatformStackRouteProp<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_EXPORT_DATE_SELECT>>();
32-
const backTo = route.params.backTo;
3332

3433
const data: CardListItem[] = useMemo(
3534
() =>
@@ -44,8 +43,8 @@ function QuickbooksDesktopExportDateSelectPage({policy}: WithPolicyConnectionsPr
4443
);
4544

4645
const goBack = useCallback(() => {
47-
Navigation.goBack(backTo ?? `${ROUTES.POLICY_ACCOUNTING.getRoute(policyID)}/${DYNAMIC_ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXPORT.path}`);
48-
}, [policyID, backTo]);
46+
Navigation.goBack(policyID ? createDynamicRoute(DYNAMIC_ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXPORT.path, ROUTES.POLICY_ACCOUNTING.getRoute(policyID)) : undefined);
47+
}, [policyID]);
4948

5049
const selectExportDate = useCallback(
5150
(row: CardListItem) => {

src/pages/workspace/accounting/qbd/export/QuickbooksDesktopOutOfPocketExpenseConfigurationPage.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import useLocalize from '@hooks/useLocalize';
88
import useThemeStyles from '@hooks/useThemeStyles';
99
import {updateQuickbooksDesktopMarkChecksToBePrinted} from '@libs/actions/connections/QuickbooksDesktop';
1010
import {getLatestErrorField} from '@libs/ErrorUtils';
11+
import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
1112
import {areSettingsInErrorFields, settingsPendingAction} from '@libs/PolicyUtils';
1213
import Navigation from '@navigation/Navigation';
1314
import type {PlatformStackRouteProp} from '@navigation/PlatformStackNavigation/types';
@@ -42,8 +43,6 @@ function QuickbooksDesktopOutOfPocketExpenseConfigurationPage({policy}: WithPoli
4243
const policyID = policy?.id;
4344
const qbdConfig = policy?.connections?.quickbooksDesktop?.config;
4445
const reimbursable = qbdConfig?.export.reimbursable;
45-
const route = useRoute<PlatformStackRouteProp<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_EXPORT_OUT_OF_POCKET_EXPENSES>>();
46-
const backTo = route.params?.backTo;
4746

4847
const [exportHintText, accountDescription, accountsList] = useMemo(() => {
4948
let hintText: string | undefined;
@@ -102,7 +101,9 @@ function QuickbooksDesktopOutOfPocketExpenseConfigurationPage({policy}: WithPoli
102101
contentContainerStyle={styles.pb2}
103102
titleStyle={styles.ph5}
104103
connectionName={CONST.POLICY.CONNECTIONS.NAME.QBD}
105-
onBackButtonPress={() => Navigation.goBack(backTo ?? `${ROUTES.POLICY_ACCOUNTING.getRoute(policyID)}/${DYNAMIC_ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXPORT.path}`)}
104+
onBackButtonPress={() =>
105+
Navigation.goBack(policyID ? createDynamicRoute(DYNAMIC_ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXPORT.path, ROUTES.POLICY_ACCOUNTING.getRoute(policyID)) : undefined)
106+
}
106107
>
107108
{sections.map((section, index) => (
108109
<OfflineWithFeedback

src/pages/workspace/accounting/qbd/export/QuickbooksDesktopPreferredExporterConfigurationPage.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import useLocalize from '@hooks/useLocalize';
88
import useThemeStyles from '@hooks/useThemeStyles';
99
import {updateQuickbooksDesktopPreferredExporter} from '@libs/actions/connections/QuickbooksDesktop';
1010
import {getLatestErrorField} from '@libs/ErrorUtils';
11+
import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
1112
import {getAdminEmployees, isExpensifyTeam, settingsPendingAction} from '@libs/PolicyUtils';
1213
import Navigation from '@navigation/Navigation';
1314
import type {PlatformStackRouteProp} from '@navigation/PlatformStackNavigation/types';
@@ -31,13 +32,12 @@ function QuickbooksDesktopPreferredExporterConfigurationPage({policy}: WithPolic
3132
const {login: currentUserLogin} = useCurrentUserPersonalDetails();
3233
const currentExporter = qbdConfig?.export?.exporter;
3334
const route = useRoute<PlatformStackRouteProp<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_DESKTOP_EXPORT_PREFERRED_EXPORTER>>();
34-
const backTo = route.params?.backTo;
3535

3636
const policyID = policy?.id;
3737

3838
const goBack = useCallback(() => {
39-
Navigation.goBack(backTo ?? `${ROUTES.POLICY_ACCOUNTING.getRoute(policyID)}/${DYNAMIC_ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXPORT.path}`);
40-
}, [policyID, backTo]);
39+
Navigation.goBack(policyID ? createDynamicRoute(DYNAMIC_ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_EXPORT.path, ROUTES.POLICY_ACCOUNTING.getRoute(policyID)) : undefined);
40+
}, [policyID]);
4141

4242
const data: CardListItem[] = useMemo(
4343
() =>

0 commit comments

Comments
 (0)