Skip to content

Commit 6cfefa9

Browse files
mjasikowskimjasikowski
authored
Revert "83862 migrate tags settings v2"
1 parent 7a4e5dd commit 6cfefa9

15 files changed

Lines changed: 148 additions & 122 deletions

File tree

‎src/ROUTES.ts‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -411,35 +411,13 @@ const DYNAMIC_ROUTES = {
411411
},
412412
SETTINGS_TAG_APPROVER: {
413413
path: 'tag-approver',
414-
entryScreens: [SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_SETTINGS],
414+
entryScreens: [SCREENS.SETTINGS_TAGS.SETTINGS_TAG_SETTINGS],
415415
},
416416
SETTINGS_TAG_LIST_VIEW: {
417417
path: 'tag-list/:orderWeight',
418418
entryScreens: [SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_ROOT],
419419
getRoute: (orderWeight: number) => `tag-list/${orderWeight}`,
420420
},
421-
SETTINGS_TAGS_EDIT: {
422-
path: 'tag-list-edit/:orderWeight',
423-
entryScreens: [SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_SETTINGS, SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_LIST_VIEW],
424-
getRoute: (orderWeight: number) => `tag-list-edit/${orderWeight}`,
425-
},
426-
SETTINGS_TAG_CREATE: {
427-
path: 'tag-new',
428-
entryScreens: [SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_ROOT],
429-
},
430-
SETTINGS_TAG_SETTINGS: {
431-
path: 'tag-settings/:orderWeight/:tagName',
432-
entryScreens: [SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_ROOT, SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_LIST_VIEW],
433-
getRoute: (orderWeight: number, tagName: string) => `tag-settings/${orderWeight}/${encodeURIComponent(tagName)}`,
434-
},
435-
SETTINGS_TAG_EDIT: {
436-
path: 'tag-edit',
437-
entryScreens: [SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_SETTINGS],
438-
},
439-
SETTINGS_TAG_GL_CODE: {
440-
path: 'tag-gl-code',
441-
entryScreens: [SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_SETTINGS],
442-
},
443421
DETAILS_CONSTANT_PICKER: {
444422
path: 'constant-picker',
445423
entryScreens: [SCREENS.DEBUG.REPORT, SCREENS.DEBUG.REPORT_ACTION, SCREENS.DEBUG.TRANSACTION, SCREENS.DEBUG.TRANSACTION_VIOLATION],
@@ -1618,6 +1596,36 @@ const ROUTES = {
16181596
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
16191597
getRoute: (policyID: string, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/tags/settings` as const, backTo),
16201598
},
1599+
SETTINGS_TAGS_EDIT: {
1600+
route: 'settings/:policyID/tags/:orderWeight/edit',
1601+
1602+
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
1603+
getRoute: (policyID: string, orderWeight: number, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/tags/${orderWeight}/edit` as const, backTo),
1604+
},
1605+
SETTINGS_TAG_CREATE: {
1606+
route: 'settings/:policyID/tags/new',
1607+
1608+
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
1609+
getRoute: (policyID: string, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/tags/new` as const, backTo),
1610+
},
1611+
SETTINGS_TAG_EDIT: {
1612+
route: 'settings/:policyID/tag/:orderWeight/:tagName/edit',
1613+
getRoute: (policyID: string, orderWeight: number, tagName: string, backTo = '') =>
1614+
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
1615+
getUrlWithBackToParam(`settings/${policyID}/tag/${orderWeight}/${encodeURIComponent(tagName)}/edit` as const, backTo),
1616+
},
1617+
SETTINGS_TAG_SETTINGS: {
1618+
route: 'settings/:policyID/tag/:orderWeight/:tagName',
1619+
getRoute: (policyID: string, orderWeight: number, tagName: string, backTo = '') =>
1620+
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
1621+
getUrlWithBackToParam(`settings/${policyID}/tag/${orderWeight}/${encodeURIComponent(tagName)}` as const, backTo),
1622+
},
1623+
SETTINGS_TAG_GL_CODE: {
1624+
route: 'settings/:policyID/tag/:orderWeight/:tagName/gl-code',
1625+
getRoute: (policyID: string, orderWeight: number, tagName: string, backTo = '') =>
1626+
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
1627+
getUrlWithBackToParam(`settings/${policyID}/tag/${orderWeight}/${encodeURIComponent(tagName)}/gl-code` as const, backTo),
1628+
},
16211629
SETTINGS_TAGS_IMPORT: {
16221630
route: 'settings/:policyID/tags/import',
16231631

‎src/SCREENS.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -467,13 +467,13 @@ const SCREENS = {
467467
SETTINGS_TAGS: {
468468
SETTINGS_TAGS_ROOT: 'Settings_Tags',
469469
SETTINGS_TAGS_SETTINGS: 'Settings_Tags_Settings',
470-
DYNAMIC_SETTINGS_TAGS_EDIT: 'Dynamic_Settings_Tags_Edit',
471-
DYNAMIC_SETTINGS_TAG_CREATE: 'Dynamic_Settings_Tag_Create',
472-
DYNAMIC_SETTINGS_TAG_EDIT: 'Dynamic_Settings_Tag_Edit',
473-
DYNAMIC_SETTINGS_TAG_SETTINGS: 'Dynamic_Settings_Tag_Settings',
470+
SETTINGS_TAGS_EDIT: 'Settings_Tags_Edit',
471+
SETTINGS_TAG_CREATE: 'Settings_Tag_Create',
472+
SETTINGS_TAG_EDIT: 'Settings_Tag_Edit',
473+
SETTINGS_TAG_SETTINGS: 'Settings_Tag_Settings',
474474
DYNAMIC_SETTINGS_TAG_APPROVER: 'Dynamic_Settings_Tag_Approver',
475475
DYNAMIC_SETTINGS_TAG_LIST_VIEW: 'Dynamic_Settings_Tag_List_View',
476-
DYNAMIC_SETTINGS_TAG_GL_CODE: 'Dynamic_Settings_Tag_GL_Code',
476+
SETTINGS_TAG_GL_CODE: 'Settings_Tag_GL_Code',
477477
SETTINGS_TAGS_IMPORT: 'Settings_Tags_Import',
478478
SETTINGS_TAGS_IMPORTED: 'Settings_Tags_Imported',
479479
},

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -347,16 +347,16 @@ const CategoriesModalStackNavigator = createModalStackNavigator({
347347

348348
const TagsModalStackNavigator = createModalStackNavigator({
349349
[SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceTagsSettingsPage').default,
350-
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAGS_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceEditTagsPage').default,
350+
[SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceEditTagsPage').default,
351351
[SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_IMPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/ImportTagsPage').default,
352352
[SCREENS.WORKSPACE.TAGS_IMPORT_OPTIONS]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/ImportTagsOptionsPage').default,
353353
[SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_IMPORTED]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/ImportedTagsPage').default,
354-
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/TagSettingsPage').default,
354+
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/TagSettingsPage').default,
355355
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_LIST_VIEW]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceViewTagsPage').default,
356-
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceCreateTagPage').default,
357-
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/EditTagPage').default,
356+
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceCreateTagPage').default,
357+
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/EditTagPage').default,
358358
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_APPROVER]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/TagApproverPage').default,
359-
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_GL_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/TagGLCodePage').default,
359+
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_GL_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/TagGLCodePage').default,
360360
});
361361

362362
const ExpensifyCardModalStackNavigator = createModalStackNavigator({

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ const oldRoutes: Record<string, string> = {
77
'/workspaces/*/overview/address': '/workspaces/$1/overview/workspace-address',
88
'/workspaces/*/categories/settings': '/workspaces/$1/categories/categories-settings',
99
'/workspaces/*/categories/new': '/workspaces/$1/categories/category-new',
10-
'/workspaces/*/tags/*/edit': '/settings/$1/tags/settings/tag-list-edit/$2',
11-
'/workspaces/*/tags/new': '/settings/$1/tags/tag-new',
12-
'/workspaces/*/tag/*/*/edit': '/settings/$1/tags/tag-settings/$2/$3/tag-edit',
13-
'/workspaces/*/tag/*/*/gl-code': '/settings/$1/tags/tag-settings/$2/$3/tag-gl-code',
14-
'/workspaces/*/tag/*/*': '/settings/$1/tags/tag-settings/$2/$3',
1510
'/workspaces/*/accounting/*/card-reconciliation/account': '/workspaces/$1/accounting/$2/card-reconciliation/account-reconciliation-settings',
1611
'/workspaces/*/connections/netsuite/export/invoice-item-preference/invoice-item/select': '/workspaces/$1/connections/netsuite/export/invoice-item-preference/select/invoice-item/select',
1712
'/workspaces/*/connections/xero/export/preferred-exporter/select': '/workspaces/$1/accounting/xero/export/xero-preferred-exporter/select',

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

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,13 +1521,35 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
15211521
[SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_SETTINGS]: {
15221522
path: ROUTES.SETTINGS_TAGS_SETTINGS.route,
15231523
},
1524-
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAGS_EDIT]: DYNAMIC_ROUTES.SETTINGS_TAGS_EDIT.path,
1525-
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_CREATE]: DYNAMIC_ROUTES.SETTINGS_TAG_CREATE.path,
1526-
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_EDIT]: DYNAMIC_ROUTES.SETTINGS_TAG_EDIT.path,
1527-
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_SETTINGS]: DYNAMIC_ROUTES.SETTINGS_TAG_SETTINGS.path,
1524+
[SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_EDIT]: {
1525+
path: ROUTES.SETTINGS_TAGS_EDIT.route,
1526+
parse: {
1527+
orderWeight: Number,
1528+
},
1529+
},
1530+
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_CREATE]: {
1531+
path: ROUTES.SETTINGS_TAG_CREATE.route,
1532+
},
1533+
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_EDIT]: {
1534+
path: ROUTES.SETTINGS_TAG_EDIT.route,
1535+
parse: {
1536+
orderWeight: Number,
1537+
},
1538+
},
1539+
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_SETTINGS]: {
1540+
path: ROUTES.SETTINGS_TAG_SETTINGS.route,
1541+
parse: {
1542+
orderWeight: Number,
1543+
},
1544+
},
15281545
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_APPROVER]: DYNAMIC_ROUTES.SETTINGS_TAG_APPROVER.path,
15291546
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_LIST_VIEW]: DYNAMIC_ROUTES.SETTINGS_TAG_LIST_VIEW.path,
1530-
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_GL_CODE]: DYNAMIC_ROUTES.SETTINGS_TAG_GL_CODE.path,
1547+
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_GL_CODE]: {
1548+
path: ROUTES.SETTINGS_TAG_GL_CODE.route,
1549+
parse: {
1550+
orderWeight: Number,
1551+
},
1552+
},
15311553
[SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_IMPORT]: {
15321554
path: ROUTES.SETTINGS_TAGS_IMPORT.route,
15331555
},

‎src/libs/Navigation/types.ts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -478,8 +478,10 @@ type SettingsNavigatorParamList = {
478478
// 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
479479
backTo?: Routes;
480480
};
481-
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_CREATE]: {
481+
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_CREATE]: {
482482
policyID: string;
483+
// 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
484+
backTo?: Routes;
483485
};
484486
[SCREENS.WORKSPACE.DISTANCE_RATE_DETAILS]: {
485487
policyID: string;
@@ -554,10 +556,12 @@ type SettingsNavigatorParamList = {
554556
backTo?: Routes;
555557
parentTagsFilter?: string;
556558
};
557-
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_SETTINGS]: {
559+
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_SETTINGS]: {
558560
policyID: string;
559561
orderWeight: number;
560562
tagName: string;
563+
// 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
564+
backTo?: Routes;
561565
parentTagsFilter?: string;
562566
};
563567
[SCREENS.WORKSPACE.TAG_LIST_VIEW]: {
@@ -576,9 +580,11 @@ type SettingsNavigatorParamList = {
576580
// 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
577581
backTo?: Routes;
578582
};
579-
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAGS_EDIT]: {
583+
[SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_EDIT]: {
580584
policyID: string;
581585
orderWeight: number;
586+
// 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
587+
backTo?: Routes;
582588
};
583589
[SCREENS.WORKSPACE.TAG_EDIT]: {
584590
policyID: string;
@@ -587,10 +593,12 @@ type SettingsNavigatorParamList = {
587593
// 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
588594
backTo?: Routes;
589595
};
590-
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_EDIT]: {
596+
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_EDIT]: {
591597
policyID: string;
592598
orderWeight: number;
593599
tagName: string;
600+
// 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
601+
backTo?: Routes;
594602
};
595603
[SCREENS.WORKSPACE.TAG_APPROVER]: {
596604
policyID: string;
@@ -611,10 +619,12 @@ type SettingsNavigatorParamList = {
611619
// 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
612620
backTo?: Routes;
613621
};
614-
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_GL_CODE]: {
622+
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_GL_CODE]: {
615623
policyID: string;
616624
orderWeight: number;
617625
tagName: string;
626+
// 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
627+
backTo?: Routes;
618628
};
619629
[SCREENS.SETTINGS.SUBSCRIPTION.SIZE]: {
620630
canChangeSize: 0 | 1;

‎src/pages/workspace/tags/EditTagPage.tsx‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
77
import ScreenWrapper from '@components/ScreenWrapper';
88
import TextInput from '@components/TextInput';
99
import useAutoFocusInput from '@hooks/useAutoFocusInput';
10-
import useDynamicBackPath from '@hooks/useDynamicBackPath';
1110
import useLocalize from '@hooks/useLocalize';
1211
import usePolicyData from '@hooks/usePolicyData';
1312
import useThemeStyles from '@hooks/useThemeStyles';
@@ -20,32 +19,30 @@ import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
2019
import {renamePolicyTag} from '@userActions/Policy/Tag';
2120
import CONST from '@src/CONST';
2221
import ONYXKEYS from '@src/ONYXKEYS';
23-
import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
22+
import ROUTES from '@src/ROUTES';
2423
import SCREENS from '@src/SCREENS';
2524
import INPUT_IDS from '@src/types/form/WorkspaceTagForm';
2625

2726
type EditTagPageProps =
2827
| PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAG_EDIT>
29-
| PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_EDIT>;
28+
| PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS_TAGS.SETTINGS_TAG_EDIT>;
3029

3130
function EditTagPage({route}: EditTagPageProps) {
32-
const {policyID} = route.params;
33-
const orderWeight = Number(route.params.orderWeight);
31+
const {backTo, policyID} = route.params;
3432
const policyData = usePolicyData(policyID);
3533
const {tags: policyTags} = policyData;
3634
const styles = useThemeStyles();
3735
const {translate} = useLocalize();
3836
const {inputCallbackRef} = useAutoFocusInput();
3937
const currentTagName = getCleanedTagName(route.params.tagName);
40-
const isQuickSettingsFlow = route.name === SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_EDIT;
41-
const backPath = useDynamicBackPath(DYNAMIC_ROUTES.SETTINGS_TAG_EDIT.path);
38+
const isQuickSettingsFlow = route.name === SCREENS.SETTINGS_TAGS.SETTINGS_TAG_EDIT;
4239

4340
const validate = useCallback(
4441
(values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {
4542
const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM> = {};
4643
const tagName = values.tagName.trim();
4744
const escapedTagName = escapeTagName(values.tagName.trim());
48-
const {tags} = getTagListByOrderWeight(policyTags, orderWeight);
45+
const {tags} = getTagListByOrderWeight(policyTags, route.params.orderWeight);
4946
if (!isRequiredFulfilled(tagName)) {
5047
errors.tagName = translate('workspace.tags.tagRequiredError');
5148
} else if (escapedTagName === '0') {
@@ -59,20 +56,24 @@ function EditTagPage({route}: EditTagPageProps) {
5956

6057
return errors;
6158
},
62-
[policyTags, orderWeight, currentTagName, translate],
59+
[policyTags, route.params.orderWeight, currentTagName, translate],
6360
);
6461

6562
const editTag = useCallback(
6663
(values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {
6764
const tagName = values.tagName.trim();
6865
// Do not call the API if the edited tag name is the same as the current tag name
6966
if (currentTagName !== tagName) {
70-
renamePolicyTag(policyData, {oldName: route.params.tagName, newName: values.tagName.trim()}, orderWeight);
67+
renamePolicyTag(policyData, {oldName: route.params.tagName, newName: values.tagName.trim()}, route.params.orderWeight);
7168
}
7269
Keyboard.dismiss();
73-
Navigation.goBack(isQuickSettingsFlow ? backPath : ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(policyID, orderWeight, route.params.tagName));
70+
Navigation.goBack(
71+
isQuickSettingsFlow
72+
? ROUTES.SETTINGS_TAG_SETTINGS.getRoute(policyID, route.params.orderWeight, route.params.tagName, backTo)
73+
: ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(policyID, route.params.orderWeight, route.params.tagName),
74+
);
7475
},
75-
[policyData, currentTagName, policyID, route.params.tagName, orderWeight, isQuickSettingsFlow, backPath],
76+
[policyData, currentTagName, policyID, route.params.tagName, route.params.orderWeight, isQuickSettingsFlow, backTo],
7677
);
7778

7879
return (
@@ -90,7 +91,11 @@ function EditTagPage({route}: EditTagPageProps) {
9091
<HeaderWithBackButton
9192
title={translate('workspace.tags.editTag')}
9293
onBackButtonPress={() =>
93-
Navigation.goBack(isQuickSettingsFlow ? backPath : ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(route?.params?.policyID, orderWeight, route.params.tagName))
94+
Navigation.goBack(
95+
isQuickSettingsFlow
96+
? ROUTES.SETTINGS_TAG_SETTINGS.getRoute(route?.params?.policyID, route.params.orderWeight, route.params.tagName, backTo)
97+
: ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(route?.params?.policyID, route.params.orderWeight, route.params.tagName),
98+
)
9499
}
95100
/>
96101
<FormProvider

0 commit comments

Comments
 (0)