Skip to content

83860 migrate workspace categories settings tags v5 #93654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
huult wants to merge 4 commits into
base: main
Choose a base branch
from
Open

83860 migrate workspace categories settings tags v5 #93654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
725efbc
migrate SETTINGS_CATEGORY_SETTINGS
huult Jun 15, 2026
7143630
migrate WORKSPACE_TAGS_SETTINGS
huult Jun 16, 2026
9e433a1
migrate WORKSPACE_TAG_CREATE
huult Jun 16, 2026
d3ce1cf
update old routes
huult Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions src/ROUTES.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,9 +468,14 @@ const DYNAMIC_ROUTES = {
getRoute: (country = '') => `country?country=${country}`,
queryParams: ['country'],
},
SETTINGS_CATEGORY_SETTINGS: {
path: 'category-settings/:categoryName',
Comment thread
huult marked this conversation as resolved.
entryScreens: [SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_ROOT],
getRoute: (categoryName: string) => `category-settings/${encodeURIComponent(categoryName)}` as const,
},
SETTINGS_CATEGORY_EDIT: {
path: 'category-edit',
entryScreens: [SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
entryScreens: [SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_SETTINGS],
},
SETTINGS_CATEGORIES_SETTINGS: {
path: 'manage-settings',
Expand Down Expand Up @@ -499,31 +504,31 @@ const DYNAMIC_ROUTES = {
},
WORKSPACE_CATEGORY_DEFAULT_TAX_RATE: {
path: 'tax-rate',
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_SETTINGS],
},
WORKSPACE_CATEGORY_FLAG_AMOUNTS_OVER: {
path: 'flag-amounts',
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_SETTINGS],
},
WORKSPACE_CATEGORY_DESCRIPTION_HINT: {
path: 'description-hint',
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_SETTINGS],
},
WORKSPACE_CATEGORY_REQUIRED_FIELDS: {
path: 'required-fields',
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_SETTINGS],
},
WORKSPACE_CATEGORY_APPROVER: {
path: 'approver',
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_SETTINGS],
},
WORKSPACE_CATEGORY_REQUIRE_RECEIPTS_OVER: {
path: 'require-receipts-over',
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_SETTINGS],
},
WORKSPACE_CATEGORY_REQUIRE_ITEMIZED_RECEIPTS_OVER: {
path: 'require-itemized-receipts-over',
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS],
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_SETTINGS],
},
NOTIFICATION_PREFERENCES: {
path: 'notification-preferences',
Expand Down Expand Up @@ -555,10 +560,18 @@ const DYNAMIC_ROUTES = {
path: 'categories-settings',
entryScreens: [SCREENS.WORKSPACE.CATEGORIES],
},
WORKSPACE_TAGS_SETTINGS: {
path: 'tags-settings',
Comment thread
huult marked this conversation as resolved.
entryScreens: [SCREENS.WORKSPACE.TAGS],
},
WORKSPACE_CATEGORY_CREATE: {
path: 'category-new',
entryScreens: [SCREENS.WORKSPACE.CATEGORIES],
},
WORKSPACE_TAG_CREATE: {
path: 'tag-create',
entryScreens: [SCREENS.WORKSPACE.TAGS],
},
SPEND_CATEGORY_SELECTOR: {
path: 'spend-category-selector/:groupID',
entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORIES_SETTINGS, SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORIES_SETTINGS],
Expand Down Expand Up @@ -1826,11 +1839,6 @@ const ROUTES = {

getRoute: (policyID: string, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/categories`, backTo),
},
SETTINGS_CATEGORY_SETTINGS: {
route: 'settings/:policyID/category/:categoryName',

getRoute: (policyID: string, categoryName: string, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/category/${encodeURIComponent(categoryName)}`, backTo),
},
SETTINGS_CATEGORIES_IMPORT: {
route: 'settings/:policyID/categories/import',

Expand Down Expand Up @@ -2561,14 +2569,6 @@ const ROUTES = {
return `workspaces/${policyID}/tags` as const;
},
},
WORKSPACE_TAG_CREATE: {
route: 'workspaces/:policyID/tags/new',
getRoute: (policyID: string) => `workspaces/${policyID}/tags/new` as const,
},
WORKSPACE_TAGS_SETTINGS: {
route: 'workspaces/:policyID/tags/settings',
getRoute: (policyID: string) => `workspaces/${policyID}/tags/settings` as const,
},
WORKSPACE_EDIT_TAGS: {
route: 'workspaces/:policyID/tags/:orderWeight/edit',

Expand Down
6 changes: 3 additions & 3 deletions src/SCREENS.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ const SCREENS = {
},

SETTINGS_CATEGORIES: {
SETTINGS_CATEGORY_SETTINGS: 'Settings_Category_Settings',
DYNAMIC_SETTINGS_CATEGORY_SETTINGS: 'Dynamic_Settings_Category_Settings',
DYNAMIC_SETTINGS_CATEGORIES_SETTINGS: 'Dynamic_Settings_Categories_Settings',
DYNAMIC_SETTINGS_CATEGORY_CREATE: 'Dynamic_Settings_Category_Create',
DYNAMIC_SETTINGS_CATEGORY_EDIT: 'Dynamic_Settings_Category_Edit',
Expand Down Expand Up @@ -782,7 +782,7 @@ const SCREENS = {
INVITE_MESSAGE_APPROVER: 'Workspace_Invite_Message_Approver',
CATEGORIES: 'Workspace_Categories',
TAGS: 'Workspace_Tags',
TAGS_SETTINGS: 'Tags_Settings',
DYNAMIC_TAGS_SETTINGS: 'Dynamic_Tags_Settings',
TAGS_EDIT: 'Tags_Edit',
TAGS_IMPORT: 'Tags_Import',
TAGS_IMPORT_MULTI_LEVEL_SETTINGS: 'Tags_Import_Multi_Level_Settings',
Expand All @@ -809,7 +809,7 @@ const SCREENS = {
TAXES_SETTINGS_FOREIGN_CURRENCY_DEFAULT: 'Workspace_Taxes_Settings_ForeignCurrency',
TAX_CREATE: 'Workspace_Tax_Create',
TAX_CREATE_VALUE: 'Workspace_Tax_Create_Value',
TAG_CREATE: 'Tag_Create',
DYNAMIC_TAG_CREATE: 'Dynamic_Tag_Create',
TAG_SETTINGS: 'Tag_Settings',
TAG_APPROVER: 'Tag_Approver',
TAG_LIST_VIEW: 'Tag_List_View',
Expand Down
6 changes: 3 additions & 3 deletions src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ const CategoriesModalStackNavigator = createModalStackNavigator({
require<ReactComponentModule>('../../../../pages/workspace/categories/DynamicWorkspaceCategoriesSettingsPage').default,
[SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/DynamicCreateCategoryPage').default,
[SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/DynamicEditCategoryPage').default,
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CategorySettingsPage').default,
[SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CategorySettingsPage').default,
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_IMPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/ImportCategoriesPage').default,
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_IMPORTED]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/ImportedCategoriesPage').default,
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_PAYROLL_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CategoryPayrollCodePage').default,
Expand Down Expand Up @@ -634,11 +634,11 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
[SCREENS.WORKSPACE.TAGS_IMPORT_MULTI_LEVEL_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/ImportMultiLevelTagsSettingsPage').default,
[SCREENS.WORKSPACE.TAGS_IMPORTED]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/ImportedTagsPage').default,
[SCREENS.WORKSPACE.TAGS_IMPORTED_MULTI_LEVEL]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/ImportedMultiLevelTagsPage').default,
[SCREENS.WORKSPACE.TAGS_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceTagsSettingsPage').default,
[SCREENS.WORKSPACE.DYNAMIC_TAGS_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceTagsSettingsPage').default,
[SCREENS.WORKSPACE.TAG_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/TagSettingsPage').default,
[SCREENS.WORKSPACE.TAG_LIST_VIEW]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceViewTagsPage').default,
[SCREENS.WORKSPACE.TAGS_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceEditTagsPage').default,
[SCREENS.WORKSPACE.TAG_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceCreateTagPage').default,
[SCREENS.WORKSPACE.DYNAMIC_TAG_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceCreateTagPage').default,
[SCREENS.WORKSPACE.TAG_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/EditTagPage').default,
[SCREENS.WORKSPACE.TAG_APPROVER]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/TagApproverPage').default,
[SCREENS.WORKSPACE.TAG_GL_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/TagGLCodePage').default,
Expand Down
2 changes: 2 additions & 0 deletions src/libs/Navigation/linkingConfig/OldRoutes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ const oldRoutes: Record<string, string> = {
'/workspaces/*/overview/address': '/workspaces/$1/overview/workspace-address',
'/workspaces/*/categories/settings': '/workspaces/$1/categories/categories-settings',
'/workspaces/*/categories/new': '/workspaces/$1/categories/category-new',
'/workspaces/*/tags/settings': '/workspaces/$1/tags/tags-settings',
'/workspaces/*/tags/new': '/workspaces/$1/tags/tag-create',
'/settings/*/categories/settings': '/settings/$1/categories/manage-settings',
'/settings/*/categories/new': '/settings/$1/categories/category-create',
'/workspaces/*/accounting/*/card-reconciliation/account': '/workspaces/$1/accounting/$2/card-reconciliation/account-reconciliation-settings',
Expand Down
6 changes: 3 additions & 3 deletions src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,9 @@ const WORKSPACE_TO_RHP: Partial<Record<keyof WorkspaceSplitNavigatorParamList, s
SCREENS.WORKSPACE.HR_MERGE_GROUPS,
],
[SCREENS.WORKSPACE.TAGS]: [
SCREENS.WORKSPACE.TAGS_SETTINGS,
SCREENS.WORKSPACE.DYNAMIC_TAGS_SETTINGS,
SCREENS.WORKSPACE.TAGS_EDIT,
SCREENS.WORKSPACE.TAG_CREATE,
SCREENS.WORKSPACE.DYNAMIC_TAG_CREATE,
SCREENS.WORKSPACE.TAG_SETTINGS,
SCREENS.WORKSPACE.TAG_EDIT,
SCREENS.WORKSPACE.TAG_LIST_VIEW,
Expand Down Expand Up @@ -261,7 +261,7 @@ const WORKSPACE_TO_RHP: Partial<Record<keyof WorkspaceSplitNavigatorParamList, s
SCREENS.WORKSPACE.DYNAMIC_CATEGORY_REQUIRE_ITEMIZED_RECEIPTS_OVER,
SCREENS.WORKSPACE.DYNAMIC_CATEGORY_REQUIRED_FIELDS,
SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_ROOT,
SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS,
SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_SETTINGS,
SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORIES_SETTINGS,
SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_CREATE,
SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_EDIT,
Expand Down
12 changes: 3 additions & 9 deletions src/libs/Navigation/linkingConfig/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,8 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
path: ROUTES.WORKSPACE_PAY_AND_DOWNGRADE.route,
},
[SCREENS.WORKSPACE.DYNAMIC_CATEGORIES_SETTINGS]: DYNAMIC_ROUTES.WORKSPACE_CATEGORIES_SETTINGS.path,
[SCREENS.WORKSPACE.DYNAMIC_TAGS_SETTINGS]: DYNAMIC_ROUTES.WORKSPACE_TAGS_SETTINGS.path,
[SCREENS.WORKSPACE.DYNAMIC_TAG_CREATE]: DYNAMIC_ROUTES.WORKSPACE_TAG_CREATE.path,
[SCREENS.WORKSPACE.DYNAMIC_CATEGORIES_IMPORT]: DYNAMIC_ROUTES.WORKSPACE_CATEGORIES_IMPORT.path,
[SCREENS.WORKSPACE.DYNAMIC_CATEGORIES_IMPORTED]: DYNAMIC_ROUTES.WORKSPACE_CATEGORIES_IMPORTED.path,
[SCREENS.WORKSPACE.DYNAMIC_SPEND_CATEGORY_SELECTOR]: DYNAMIC_ROUTES.SPEND_CATEGORY_SELECTOR.path,
Expand Down Expand Up @@ -1103,9 +1105,6 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
[SCREENS.WORKSPACE.DISTANCE_RATE_END_DATE_EDIT]: {
path: ROUTES.WORKSPACE_DISTANCE_RATE_END_DATE_EDIT.route,
},
[SCREENS.WORKSPACE.TAGS_SETTINGS]: {
path: ROUTES.WORKSPACE_TAGS_SETTINGS.route,
},
[SCREENS.WORKSPACE.TAGS_EDIT]: {
path: ROUTES.WORKSPACE_EDIT_TAGS.route,
parse: {
Expand All @@ -1127,9 +1126,6 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
[SCREENS.WORKSPACE.TAGS_IMPORTED_MULTI_LEVEL]: {
path: ROUTES.WORKSPACE_TAGS_IMPORTED_MULTI_LEVEL.route,
},
[SCREENS.WORKSPACE.TAG_CREATE]: {
path: ROUTES.WORKSPACE_TAG_CREATE.route,
},
[SCREENS.WORKSPACE.TAG_EDIT]: {
path: ROUTES.WORKSPACE_TAG_EDIT.route,
parse: {
Expand Down Expand Up @@ -1540,9 +1536,7 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
},
[SCREENS.RIGHT_MODAL.SETTINGS_CATEGORIES]: {
screens: {
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS]: {
path: ROUTES.SETTINGS_CATEGORY_SETTINGS.route,
},
[SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_SETTINGS]: DYNAMIC_ROUTES.SETTINGS_CATEGORY_SETTINGS.path,
[SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORIES_SETTINGS]: DYNAMIC_ROUTES.SETTINGS_CATEGORIES_SETTINGS.path,
[SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_CREATE]: DYNAMIC_ROUTES.SETTINGS_CATEGORY_CREATE.path,
[SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_EDIT]: DYNAMIC_ROUTES.SETTINGS_CATEGORY_EDIT.path,
Expand Down
12 changes: 3 additions & 9 deletions src/libs/Navigation/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,11 +413,9 @@ type SettingsNavigatorParamList = {
policyID: string;
categoryName: string;
};
[SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS]: {
[SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_SETTINGS]: {
policyID: string;
categoryName: string;
// 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
backTo?: Routes;
};
[SCREENS.WORKSPACE.DYNAMIC_CATEGORY_REQUIRED_FIELDS]: {
policyID: string;
Expand Down Expand Up @@ -468,10 +466,8 @@ type SettingsNavigatorParamList = {
// 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
backTo?: Routes;
};
[SCREENS.WORKSPACE.TAG_CREATE]: {
[SCREENS.WORKSPACE.DYNAMIC_TAG_CREATE]: {
policyID: string;
// 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
backTo?: Routes;
};
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_CREATE]: {
policyID: string;
Expand Down Expand Up @@ -504,10 +500,8 @@ type SettingsNavigatorParamList = {
policyID: string;
rateID: string;
};
[SCREENS.WORKSPACE.TAGS_SETTINGS]: {
[SCREENS.WORKSPACE.DYNAMIC_TAGS_SETTINGS]: {
policyID: string;
// 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
backTo?: Routes;
};
[SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_SETTINGS]: {
policyID: string;
Expand Down
16 changes: 14 additions & 2 deletions src/pages/workspace/categories/CategoryGLCodePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import useDynamicBackPath from '@hooks/useDynamicBackPath';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useThemeStyles from '@hooks/useThemeStyles';
import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {SettingsNavigatorParamList} from '@navigation/types';
Expand Down Expand Up @@ -58,7 +59,11 @@ function CategoryGLCodePage({route}: EditCategoryPageProps) {
if (newGLCode !== glCode) {
setPolicyCategoryGLCode(policyID, categoryName, newGLCode, policyCategories);
}
Navigation.goBack(isQuickSettingsFlow ? ROUTES.SETTINGS_CATEGORY_SETTINGS.getRoute(policyID, categoryName, backTo) : workspaceBackPath);
Navigation.goBack(
isQuickSettingsFlow
? createDynamicRoute(DYNAMIC_ROUTES.SETTINGS_CATEGORY_SETTINGS.getRoute(categoryName), ROUTES.SETTINGS_CATEGORIES_ROOT.getRoute(policyID, backTo))
: workspaceBackPath,
);
},
[glCode, isQuickSettingsFlow, policyID, categoryName, backTo, policyCategories, workspaceBackPath],
);
Expand All @@ -78,7 +83,14 @@ function CategoryGLCodePage({route}: EditCategoryPageProps) {
<HeaderWithBackButton
title={translate('workspace.categories.glCode')}
onBackButtonPress={() =>
Navigation.goBack(isQuickSettingsFlow ? ROUTES.SETTINGS_CATEGORY_SETTINGS.getRoute(route.params.policyID, route.params.categoryName, backTo) : workspaceBackPath)
Navigation.goBack(
isQuickSettingsFlow
? createDynamicRoute(
DYNAMIC_ROUTES.SETTINGS_CATEGORY_SETTINGS.getRoute(route.params.categoryName),
ROUTES.SETTINGS_CATEGORIES_ROOT.getRoute(route.params.policyID, backTo),
)
: workspaceBackPath,
)
}
/>
<FormProvider
Expand Down
Loading
Loading