Skip to content

Commit 1b35175

Browse files
mjasikowskimjasikowski
authored
Merge pull request Expensify#89873 from Expensify/revert-88825-mj-83832-dr-workspace-categories-edit
2 parents b1ba0a2 + 767f8cd commit 1b35175

19 files changed

Lines changed: 157 additions & 188 deletions

‎src/ROUTES.ts‎

Lines changed: 4 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -298,51 +298,6 @@ const DYNAMIC_ROUTES = {
298298
path: 'category-edit',
299299
entryScreens: [SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
300300
},
301-
WORKSPACE_CATEGORY_SETTINGS: {
302-
path: 'category/:categoryName',
303-
entryScreens: [SCREENS.WORKSPACE.CATEGORIES],
304-
getRoute: (categoryName: string) => `category/${encodeURIComponent(categoryName)}` as const,
305-
},
306-
WORKSPACE_CATEGORY_EDIT: {
307-
path: 'edit',
308-
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS],
309-
},
310-
WORKSPACE_CATEGORY_PAYROLL_CODE: {
311-
path: 'payroll-code',
312-
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS],
313-
},
314-
WORKSPACE_CATEGORY_GL_CODE: {
315-
path: 'gl-code',
316-
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS],
317-
},
318-
WORKSPACE_CATEGORY_DEFAULT_TAX_RATE: {
319-
path: 'tax-rate',
320-
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
321-
},
322-
WORKSPACE_CATEGORY_FLAG_AMOUNTS_OVER: {
323-
path: 'flag-amounts',
324-
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
325-
},
326-
WORKSPACE_CATEGORY_DESCRIPTION_HINT: {
327-
path: 'description-hint',
328-
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
329-
},
330-
WORKSPACE_CATEGORY_REQUIRED_FIELDS: {
331-
path: 'required-fields',
332-
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
333-
},
334-
WORKSPACE_CATEGORY_APPROVER: {
335-
path: 'approver',
336-
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
337-
},
338-
WORKSPACE_CATEGORY_REQUIRE_RECEIPTS_OVER: {
339-
path: 'require-receipts-over',
340-
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
341-
},
342-
WORKSPACE_CATEGORY_REQUIRE_ITEMIZED_RECEIPTS_OVER: {
343-
path: 'require-itemized-receipts-over',
344-
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
345-
},
346301
NOTIFICATION_PREFERENCES: {
347302
path: 'notification-preferences',
348303
entryScreens: [SCREENS.REPORT_SETTINGS.ROOT, SCREENS.PROFILE_ROOT],
@@ -2404,6 +2359,10 @@ const ROUTES = {
24042359
return `workspaces/${policyID}/categories` as const;
24052360
},
24062361
},
2362+
WORKSPACE_CATEGORY_SETTINGS: {
2363+
route: 'workspaces/:policyID/category/:categoryName',
2364+
getRoute: (policyID: string, categoryName: string) => `workspaces/${policyID}/category/${encodeURIComponent(categoryName)}` as const,
2365+
},
24072366
WORKSPACE_UPGRADE: {
24082367
route: 'workspaces/:policyID?/upgrade/:featureName?',
24092368
getRoute: (policyID?: string, featureName?: string, backTo?: string) =>
@@ -2422,14 +2381,6 @@ const ROUTES = {
24222381
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
24232382
getRoute: (backTo?: string) => getUrlWithBackToParam(`workspaces/pay-and-downgrade` as const, backTo),
24242383
},
2425-
WORKSPACE_CATEGORIES_SETTINGS: {
2426-
route: 'workspaces/:policyID/categories/settings',
2427-
getRoute: (policyID: string) => `workspaces/${policyID}/categories/settings` as const,
2428-
},
2429-
WORKSPACE_CATEGORY_CREATE: {
2430-
route: 'workspaces/:policyID/categories/new',
2431-
getRoute: (policyID: string) => `workspaces/${policyID}/categories/new` as const,
2432-
},
24332384
WORKSPACE_CATEGORY_EDIT: {
24342385
route: 'workspaces/:policyID/category/:categoryName/edit',
24352386
getRoute: (policyID: string, categoryName: string) => `workspaces/${policyID}/category/${encodeURIComponent(categoryName)}/edit` as const,

‎src/SCREENS.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -782,11 +782,11 @@ const SCREENS = {
782782
NAME: 'Workspace_Overview_Name',
783783
CLIENT_ID: 'Workspace_Overview_Client_ID',
784784
CATEGORY_CREATE: 'Category_Create',
785-
DYNAMIC_CATEGORY_EDIT: 'Dynamic_Category_Edit',
786-
DYNAMIC_CATEGORY_PAYROLL_CODE: 'Dynamic_Category_Payroll_Code',
787-
DYNAMIC_CATEGORY_GL_CODE: 'Dynamic_Category_GL_Code',
788-
DYNAMIC_CATEGORY_SETTINGS: 'Dynamic_Category_Settings',
789785
DYNAMIC_CATEGORY_CREATE: 'Dynamic_Category_Create',
786+
CATEGORY_EDIT: 'Category_Edit',
787+
CATEGORY_PAYROLL_CODE: 'Category_Payroll_Code',
788+
CATEGORY_GL_CODE: 'Category_GL_Code',
789+
CATEGORY_SETTINGS: 'Category_Settings',
790790
CATEGORY_DEFAULT_TAX_RATE: 'Category_Default_Tax_Rate',
791791
CATEGORY_FLAG_AMOUNTS_OVER: 'Category_Flag_Amounts_Over',
792792
DYNAMIC_EXPENSE_LIMIT_TYPE_SELECTOR: 'Dynamic_Expense_Limit_Type_Selector',

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -316,12 +316,12 @@ const ChronosScheduleOOOModalStackNavigator = createModalStackNavigator<ChronosS
316316
const CategoriesModalStackNavigator = createModalStackNavigator({
317317
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/WorkspaceCategoriesSettingsPage').default,
318318
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CreateCategoryPage').default,
319-
[SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/DynamicEditCategoryPage').default,
320-
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/DynamicCategorySettingsPage').default,
319+
[SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/EditCategoryPage').default,
320+
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CategorySettingsPage').default,
321321
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_IMPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/ImportCategoriesPage').default,
322322
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_IMPORTED]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/ImportedCategoriesPage').default,
323-
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_PAYROLL_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/DynamicCategoryPayrollCodePage').default,
324-
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_GL_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/DynamicCategoryGLCodePage').default,
323+
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_PAYROLL_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CategoryPayrollCodePage').default,
324+
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_GL_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CategoryGLCodePage').default,
325325
});
326326

327327
const TagsModalStackNavigator = createModalStackNavigator({
@@ -524,7 +524,7 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
524524
[SCREENS.WORKSPACE.CLIENT_ID]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceOverviewClientIDPage').default,
525525
[SCREENS.WORKSPACE.SHARE]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceOverviewSharePage').default,
526526
[SCREENS.WORKSPACE.CURRENCY]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceOverviewCurrencyPage').default,
527-
[SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/DynamicCategorySettingsPage').default,
527+
[SCREENS.WORKSPACE.CATEGORY_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CategorySettingsPage').default,
528528
[SCREENS.WORKSPACE.CATEGORY_REQUIRED_FIELDS]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CategoryRequiredFieldsPage').default,
529529
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_OVERVIEW_ADDRESS]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceOverviewAddressPage').default,
530530
[SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_OVERVIEW_PLAN]: () => require<ReactComponentModule>('../../../../pages/workspace/DynamicWorkspaceOverviewPlanTypePage').default,
@@ -543,9 +543,9 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
543543
[SCREENS.WORKSPACE.OWNER_CHANGE_SUCCESS]: () => require<ReactComponentModule>('../../../../pages/workspace/members/WorkspaceOwnerChangeSuccessPage').default,
544544
[SCREENS.WORKSPACE.OWNER_CHANGE_ERROR]: () => require<ReactComponentModule>('../../../../pages/workspace/members/WorkspaceOwnerChangeErrorPage').default,
545545
[SCREENS.WORKSPACE.DYNAMIC_CATEGORY_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CreateCategoryPage').default,
546-
[SCREENS.WORKSPACE.DYNAMIC_CATEGORY_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/DynamicEditCategoryPage').default,
547-
[SCREENS.WORKSPACE.DYNAMIC_CATEGORY_PAYROLL_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/DynamicCategoryPayrollCodePage').default,
548-
[SCREENS.WORKSPACE.DYNAMIC_CATEGORY_GL_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/DynamicCategoryGLCodePage').default,
546+
[SCREENS.WORKSPACE.CATEGORY_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/EditCategoryPage').default,
547+
[SCREENS.WORKSPACE.CATEGORY_PAYROLL_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CategoryPayrollCodePage').default,
548+
[SCREENS.WORKSPACE.CATEGORY_GL_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CategoryGLCodePage').default,
549549
[SCREENS.WORKSPACE.CATEGORY_DEFAULT_TAX_RATE]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CategoryDefaultTaxRatePage').default,
550550
[SCREENS.WORKSPACE.CATEGORY_FLAG_AMOUNTS_OVER]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CategoryFlagAmountsOverPage').default,
551551
[SCREENS.WORKSPACE.DYNAMIC_EXPENSE_LIMIT_TYPE_SELECTOR]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/DynamicExpenseLimitTypeSelectorPage').default,

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
const oldRoutes: Record<string, string> = {
22
/* eslint-disable @typescript-eslint/naming-convention */
33
'/settings/*/category/*/edit': '/settings/$1/category/$2/category-edit',
4-
'/workspaces/*/category/*/payroll-code': '/workspaces/$1/categories/category/$2/payroll-code',
5-
'/workspaces/*/category/*/gl-code': '/workspaces/$1/categories/category/$2/gl-code',
6-
'/workspaces/*/category/*/edit': '/workspaces/$1/categories/category/$2/edit',
7-
'/workspaces/*/category/*': '/workspaces/$1/categories/category/$2',
84
'/settings/workspaces/*': '/workspaces/$1',
95
'/settings/workspaces': '/workspaces',
106
'/r/*/settings/name': '/r/$1/details/settings/name',

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,14 +198,13 @@ const WORKSPACE_TO_RHP: Partial<Record<keyof WorkspaceSplitNavigatorParamList, s
198198
],
199199
[SCREENS.WORKSPACE.CATEGORIES]: [
200200
SCREENS.WORKSPACE.DYNAMIC_CATEGORY_CREATE,
201-
SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS,
201+
SCREENS.WORKSPACE.CATEGORY_SETTINGS,
202202
SCREENS.WORKSPACE.DYNAMIC_CATEGORIES_IMPORT,
203203
SCREENS.WORKSPACE.DYNAMIC_CATEGORIES_IMPORTED,
204-
SCREENS.WORKSPACE.CATEGORIES_SETTINGS,
205204
SCREENS.WORKSPACE.DYNAMIC_CATEGORIES_SETTINGS,
206-
SCREENS.WORKSPACE.DYNAMIC_CATEGORY_EDIT,
207-
SCREENS.WORKSPACE.DYNAMIC_CATEGORY_GL_CODE,
208-
SCREENS.WORKSPACE.DYNAMIC_CATEGORY_PAYROLL_CODE,
205+
SCREENS.WORKSPACE.CATEGORY_EDIT,
206+
SCREENS.WORKSPACE.CATEGORY_GL_CODE,
207+
SCREENS.WORKSPACE.CATEGORY_PAYROLL_CODE,
209208
SCREENS.WORKSPACE.CATEGORY_DEFAULT_TAX_RATE,
210209
SCREENS.WORKSPACE.CATEGORY_FLAG_AMOUNTS_OVER,
211210
SCREENS.WORKSPACE.CATEGORY_DESCRIPTION_HINT,

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

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,9 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
981981
},
982982
},
983983
},
984-
[SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS]: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_SETTINGS.path,
984+
[SCREENS.WORKSPACE.CATEGORY_SETTINGS]: {
985+
path: ROUTES.WORKSPACE_CATEGORY_SETTINGS.route,
986+
},
985987
[SCREENS.WORKSPACE.UPGRADE]: {
986988
path: ROUTES.WORKSPACE_UPGRADE.route,
987989
},
@@ -1018,17 +1020,37 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
10181020
path: ROUTES.WORKSPACE_OWNER_CHANGE_CHECK.route,
10191021
},
10201022
[SCREENS.WORKSPACE.DYNAMIC_CATEGORY_CREATE]: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_CREATE.path,
1021-
[SCREENS.WORKSPACE.DYNAMIC_CATEGORY_EDIT]: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_EDIT.path,
1022-
[SCREENS.WORKSPACE.DYNAMIC_CATEGORY_PAYROLL_CODE]: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_PAYROLL_CODE.path,
1023-
[SCREENS.WORKSPACE.DYNAMIC_CATEGORY_GL_CODE]: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_GL_CODE.path,
1024-
[SCREENS.WORKSPACE.CATEGORY_DEFAULT_TAX_RATE]: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_DEFAULT_TAX_RATE.path,
1025-
[SCREENS.WORKSPACE.CATEGORY_FLAG_AMOUNTS_OVER]: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_FLAG_AMOUNTS_OVER.path,
1023+
[SCREENS.WORKSPACE.CATEGORY_EDIT]: {
1024+
path: ROUTES.WORKSPACE_CATEGORY_EDIT.route,
1025+
},
1026+
[SCREENS.WORKSPACE.CATEGORY_PAYROLL_CODE]: {
1027+
path: ROUTES.WORKSPACE_CATEGORY_PAYROLL_CODE.route,
1028+
},
1029+
[SCREENS.WORKSPACE.CATEGORY_GL_CODE]: {
1030+
path: ROUTES.WORKSPACE_CATEGORY_GL_CODE.route,
1031+
},
1032+
[SCREENS.WORKSPACE.CATEGORY_DEFAULT_TAX_RATE]: {
1033+
path: ROUTES.WORKSPACE_CATEGORY_DEFAULT_TAX_RATE.route,
1034+
},
1035+
[SCREENS.WORKSPACE.CATEGORY_FLAG_AMOUNTS_OVER]: {
1036+
path: ROUTES.WORKSPACE_CATEGORY_FLAG_AMOUNTS_OVER.route,
1037+
},
10261038
[SCREENS.WORKSPACE.DYNAMIC_EXPENSE_LIMIT_TYPE_SELECTOR]: DYNAMIC_ROUTES.EXPENSE_LIMIT_TYPE_SELECTOR.path,
1027-
[SCREENS.WORKSPACE.CATEGORY_DESCRIPTION_HINT]: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_DESCRIPTION_HINT.path,
1028-
[SCREENS.WORKSPACE.CATEGORY_APPROVER]: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_APPROVER.path,
1029-
[SCREENS.WORKSPACE.CATEGORY_REQUIRE_RECEIPTS_OVER]: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_REQUIRE_RECEIPTS_OVER.path,
1030-
[SCREENS.WORKSPACE.CATEGORY_REQUIRE_ITEMIZED_RECEIPTS_OVER]: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_REQUIRE_ITEMIZED_RECEIPTS_OVER.path,
1031-
[SCREENS.WORKSPACE.CATEGORY_REQUIRED_FIELDS]: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_REQUIRED_FIELDS.path,
1039+
[SCREENS.WORKSPACE.CATEGORY_DESCRIPTION_HINT]: {
1040+
path: ROUTES.WORKSPACE_CATEGORY_DESCRIPTION_HINT.route,
1041+
},
1042+
[SCREENS.WORKSPACE.CATEGORY_APPROVER]: {
1043+
path: ROUTES.WORKSPACE_CATEGORY_APPROVER.route,
1044+
},
1045+
[SCREENS.WORKSPACE.CATEGORY_REQUIRE_RECEIPTS_OVER]: {
1046+
path: ROUTES.WORKSPACE_CATEGORY_REQUIRE_RECEIPTS_OVER.route,
1047+
},
1048+
[SCREENS.WORKSPACE.CATEGORY_REQUIRE_ITEMIZED_RECEIPTS_OVER]: {
1049+
path: ROUTES.WORKSPACE_CATEGORY_REQUIRE_ITEMIZED_RECEIPTS_OVER.route,
1050+
},
1051+
[SCREENS.WORKSPACE.CATEGORY_REQUIRED_FIELDS]: {
1052+
path: ROUTES.WORKSPACE_CATEGORY_REQUIRED_FIELDS.route,
1053+
},
10321054
[SCREENS.WORKSPACE.CREATE_DISTANCE_RATE]: {
10331055
path: ROUTES.WORKSPACE_CREATE_DISTANCE_RATE.route,
10341056
},

‎src/libs/Navigation/types.ts‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,27 +348,33 @@ type SettingsNavigatorParamList = {
348348
// 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
349349
backTo?: Routes;
350350
};
351-
[SCREENS.WORKSPACE.DYNAMIC_CATEGORY_EDIT]: {
351+
[SCREENS.WORKSPACE.CATEGORY_EDIT]: {
352352
policyID: string;
353353
categoryName: string;
354+
// 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
355+
backTo?: Routes;
354356
};
355357
[SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_EDIT]: {
356358
policyID: string;
357359
categoryName: string;
358360
};
359-
[SCREENS.WORKSPACE.DYNAMIC_CATEGORY_PAYROLL_CODE]: {
361+
[SCREENS.WORKSPACE.CATEGORY_PAYROLL_CODE]: {
360362
policyID: string;
361363
categoryName: string;
364+
// 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
365+
backTo?: Routes;
362366
};
363367
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_PAYROLL_CODE]: {
364368
policyID: string;
365369
categoryName: string;
366370
// 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
367371
backTo?: Routes;
368372
};
369-
[SCREENS.WORKSPACE.DYNAMIC_CATEGORY_GL_CODE]: {
373+
[SCREENS.WORKSPACE.CATEGORY_GL_CODE]: {
370374
policyID: string;
371375
categoryName: string;
376+
// 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
377+
backTo?: Routes;
372378
};
373379
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_GL_CODE]: {
374380
policyID: string;
@@ -404,9 +410,11 @@ type SettingsNavigatorParamList = {
404410
policyID: string;
405411
categoryName: string;
406412
};
407-
[SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS]: {
413+
[SCREENS.WORKSPACE.CATEGORY_SETTINGS]: {
408414
policyID: string;
409415
categoryName: string;
416+
// 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
417+
backTo?: Routes;
410418
};
411419
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS]: {
412420
policyID: string;

0 commit comments

Comments
 (0)