Skip to content

Commit 11c3200

Browse files
mjasikowskimjasikowski
authored
Merge pull request #89582 from huult/83862-migrate-tags-settings-v2
2 parents 326f70e + 21efa48 commit 11c3200

15 files changed

Lines changed: 122 additions & 148 deletions

File tree

‎src/ROUTES.ts‎

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -356,13 +356,35 @@ const DYNAMIC_ROUTES = {
356356
},
357357
SETTINGS_TAG_APPROVER: {
358358
path: 'tag-approver',
359-
entryScreens: [SCREENS.SETTINGS_TAGS.SETTINGS_TAG_SETTINGS],
359+
entryScreens: [SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_SETTINGS],
360360
},
361361
SETTINGS_TAG_LIST_VIEW: {
362362
path: 'tag-list/:orderWeight',
363363
entryScreens: [SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_ROOT],
364364
getRoute: (orderWeight: number) => `tag-list/${orderWeight}`,
365365
},
366+
SETTINGS_TAGS_EDIT: {
367+
path: 'tag-list-edit/:orderWeight',
368+
entryScreens: [SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_SETTINGS, SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_LIST_VIEW],
369+
getRoute: (orderWeight: number) => `tag-list-edit/${orderWeight}`,
370+
},
371+
SETTINGS_TAG_CREATE: {
372+
path: 'tag-new',
373+
entryScreens: [SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_ROOT],
374+
},
375+
SETTINGS_TAG_SETTINGS: {
376+
path: 'tag-settings/:orderWeight/:tagName',
377+
entryScreens: [SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_ROOT, SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_LIST_VIEW],
378+
getRoute: (orderWeight: number, tagName: string) => `tag-settings/${orderWeight}/${encodeURIComponent(tagName)}`,
379+
},
380+
SETTINGS_TAG_EDIT: {
381+
path: 'tag-edit',
382+
entryScreens: [SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_SETTINGS],
383+
},
384+
SETTINGS_TAG_GL_CODE: {
385+
path: 'tag-gl-code',
386+
entryScreens: [SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_SETTINGS],
387+
},
366388
DETAILS_CONSTANT_PICKER: {
367389
path: 'constant-picker',
368390
entryScreens: [SCREENS.DEBUG.REPORT, SCREENS.DEBUG.REPORT_ACTION, SCREENS.DEBUG.TRANSACTION, SCREENS.DEBUG.TRANSACTION_VIOLATION],
@@ -1530,36 +1552,6 @@ const ROUTES = {
15301552
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
15311553
getRoute: (policyID: string, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/tags/settings` as const, backTo),
15321554
},
1533-
SETTINGS_TAGS_EDIT: {
1534-
route: 'settings/:policyID/tags/:orderWeight/edit',
1535-
1536-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
1537-
getRoute: (policyID: string, orderWeight: number, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/tags/${orderWeight}/edit` as const, backTo),
1538-
},
1539-
SETTINGS_TAG_CREATE: {
1540-
route: 'settings/:policyID/tags/new',
1541-
1542-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
1543-
getRoute: (policyID: string, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/tags/new` as const, backTo),
1544-
},
1545-
SETTINGS_TAG_EDIT: {
1546-
route: 'settings/:policyID/tag/:orderWeight/:tagName/edit',
1547-
getRoute: (policyID: string, orderWeight: number, tagName: string, backTo = '') =>
1548-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
1549-
getUrlWithBackToParam(`settings/${policyID}/tag/${orderWeight}/${encodeURIComponent(tagName)}/edit` as const, backTo),
1550-
},
1551-
SETTINGS_TAG_SETTINGS: {
1552-
route: 'settings/:policyID/tag/:orderWeight/:tagName',
1553-
getRoute: (policyID: string, orderWeight: number, tagName: string, backTo = '') =>
1554-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
1555-
getUrlWithBackToParam(`settings/${policyID}/tag/${orderWeight}/${encodeURIComponent(tagName)}` as const, backTo),
1556-
},
1557-
SETTINGS_TAG_GL_CODE: {
1558-
route: 'settings/:policyID/tag/:orderWeight/:tagName/gl-code',
1559-
getRoute: (policyID: string, orderWeight: number, tagName: string, backTo = '') =>
1560-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
1561-
getUrlWithBackToParam(`settings/${policyID}/tag/${orderWeight}/${encodeURIComponent(tagName)}/gl-code` as const, backTo),
1562-
},
15631555
SETTINGS_TAGS_IMPORT: {
15641556
route: 'settings/:policyID/tags/import',
15651557

‎src/SCREENS.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -461,13 +461,13 @@ const SCREENS = {
461461
SETTINGS_TAGS: {
462462
SETTINGS_TAGS_ROOT: 'Settings_Tags',
463463
SETTINGS_TAGS_SETTINGS: 'Settings_Tags_Settings',
464-
SETTINGS_TAGS_EDIT: 'Settings_Tags_Edit',
465-
SETTINGS_TAG_CREATE: 'Settings_Tag_Create',
466-
SETTINGS_TAG_EDIT: 'Settings_Tag_Edit',
467-
SETTINGS_TAG_SETTINGS: 'Settings_Tag_Settings',
464+
DYNAMIC_SETTINGS_TAGS_EDIT: 'Dynamic_Settings_Tags_Edit',
465+
DYNAMIC_SETTINGS_TAG_CREATE: 'Dynamic_Settings_Tag_Create',
466+
DYNAMIC_SETTINGS_TAG_EDIT: 'Dynamic_Settings_Tag_Edit',
467+
DYNAMIC_SETTINGS_TAG_SETTINGS: 'Dynamic_Settings_Tag_Settings',
468468
DYNAMIC_SETTINGS_TAG_APPROVER: 'Dynamic_Settings_Tag_Approver',
469469
DYNAMIC_SETTINGS_TAG_LIST_VIEW: 'Dynamic_Settings_Tag_List_View',
470-
SETTINGS_TAG_GL_CODE: 'Settings_Tag_GL_Code',
470+
DYNAMIC_SETTINGS_TAG_GL_CODE: 'Dynamic_Settings_Tag_GL_Code',
471471
SETTINGS_TAGS_IMPORT: 'Settings_Tags_Import',
472472
SETTINGS_TAGS_IMPORTED: 'Settings_Tags_Imported',
473473
},

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

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

327327
const TagsModalStackNavigator = createModalStackNavigator({
328328
[SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceTagsSettingsPage').default,
329-
[SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceEditTagsPage').default,
329+
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAGS_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceEditTagsPage').default,
330330
[SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_IMPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/ImportTagsPage').default,
331331
[SCREENS.WORKSPACE.TAGS_IMPORT_OPTIONS]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/ImportTagsOptionsPage').default,
332332
[SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_IMPORTED]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/ImportedTagsPage').default,
333-
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/TagSettingsPage').default,
333+
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/TagSettingsPage').default,
334334
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_LIST_VIEW]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceViewTagsPage').default,
335-
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceCreateTagPage').default,
336-
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/EditTagPage').default,
335+
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceCreateTagPage').default,
336+
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/EditTagPage').default,
337337
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_APPROVER]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/TagApproverPage').default,
338-
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_GL_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/TagGLCodePage').default,
338+
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_GL_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/TagGLCodePage').default,
339339
});
340340

341341
const ExpensifyCardModalStackNavigator = createModalStackNavigator({

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ 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',
1015
'/workspaces/*/accounting/*/card-reconciliation/account': '/workspaces/$1/accounting/$2/card-reconciliation/account-reconciliation-settings',
1116
'/workspaces/*/connections/netsuite/export/invoice-item-preference/invoice-item/select': '/workspaces/$1/connections/netsuite/export/invoice-item-preference/select/invoice-item/select',
1217
'/workspaces/*/connections/quickbooks-online/advanced/autosync/accounting-method':

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

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

‎src/libs/Navigation/types.ts‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -478,10 +478,8 @@ 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.SETTINGS_TAG_CREATE]: {
481+
[SCREENS.SETTINGS_TAGS.DYNAMIC_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;
485483
};
486484
[SCREENS.WORKSPACE.DISTANCE_RATE_DETAILS]: {
487485
policyID: string;
@@ -556,12 +554,10 @@ type SettingsNavigatorParamList = {
556554
backTo?: Routes;
557555
parentTagsFilter?: string;
558556
};
559-
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_SETTINGS]: {
557+
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_SETTINGS]: {
560558
policyID: string;
561559
orderWeight: number;
562560
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;
565561
parentTagsFilter?: string;
566562
};
567563
[SCREENS.WORKSPACE.TAG_LIST_VIEW]: {
@@ -580,11 +576,9 @@ type SettingsNavigatorParamList = {
580576
// 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
581577
backTo?: Routes;
582578
};
583-
[SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_EDIT]: {
579+
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAGS_EDIT]: {
584580
policyID: string;
585581
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;
588582
};
589583
[SCREENS.WORKSPACE.TAG_EDIT]: {
590584
policyID: string;
@@ -593,12 +587,10 @@ type SettingsNavigatorParamList = {
593587
// 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
594588
backTo?: Routes;
595589
};
596-
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_EDIT]: {
590+
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_EDIT]: {
597591
policyID: string;
598592
orderWeight: number;
599593
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;
602594
};
603595
[SCREENS.WORKSPACE.TAG_APPROVER]: {
604596
policyID: string;
@@ -619,12 +611,10 @@ type SettingsNavigatorParamList = {
619611
// 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
620612
backTo?: Routes;
621613
};
622-
[SCREENS.SETTINGS_TAGS.SETTINGS_TAG_GL_CODE]: {
614+
[SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_GL_CODE]: {
623615
policyID: string;
624616
orderWeight: number;
625617
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;
628618
};
629619
[SCREENS.SETTINGS.SUBSCRIPTION.SIZE]: {
630620
canChangeSize: 0 | 1;

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

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ 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';
1011
import useLocalize from '@hooks/useLocalize';
1112
import usePolicyData from '@hooks/usePolicyData';
1213
import useThemeStyles from '@hooks/useThemeStyles';
@@ -19,30 +20,32 @@ import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
1920
import {renamePolicyTag} from '@userActions/Policy/Tag';
2021
import CONST from '@src/CONST';
2122
import ONYXKEYS from '@src/ONYXKEYS';
22-
import ROUTES from '@src/ROUTES';
23+
import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
2324
import SCREENS from '@src/SCREENS';
2425
import INPUT_IDS from '@src/types/form/WorkspaceTagForm';
2526

2627
type EditTagPageProps =
2728
| PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAG_EDIT>
28-
| PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS_TAGS.SETTINGS_TAG_EDIT>;
29+
| PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_EDIT>;
2930

3031
function EditTagPage({route}: EditTagPageProps) {
31-
const {backTo, policyID} = route.params;
32+
const {policyID} = route.params;
33+
const orderWeight = Number(route.params.orderWeight);
3234
const policyData = usePolicyData(policyID);
3335
const {tags: policyTags} = policyData;
3436
const styles = useThemeStyles();
3537
const {translate} = useLocalize();
3638
const {inputCallbackRef} = useAutoFocusInput();
3739
const currentTagName = getCleanedTagName(route.params.tagName);
38-
const isQuickSettingsFlow = route.name === SCREENS.SETTINGS_TAGS.SETTINGS_TAG_EDIT;
40+
const isQuickSettingsFlow = route.name === SCREENS.SETTINGS_TAGS.DYNAMIC_SETTINGS_TAG_EDIT;
41+
const backPath = useDynamicBackPath(DYNAMIC_ROUTES.SETTINGS_TAG_EDIT.path);
3942

4043
const validate = useCallback(
4144
(values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {
4245
const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM> = {};
4346
const tagName = values.tagName.trim();
4447
const escapedTagName = escapeTagName(values.tagName.trim());
45-
const {tags} = getTagListByOrderWeight(policyTags, route.params.orderWeight);
48+
const {tags} = getTagListByOrderWeight(policyTags, orderWeight);
4649
if (!isRequiredFulfilled(tagName)) {
4750
errors.tagName = translate('workspace.tags.tagRequiredError');
4851
} else if (escapedTagName === '0') {
@@ -56,24 +59,20 @@ function EditTagPage({route}: EditTagPageProps) {
5659

5760
return errors;
5861
},
59-
[policyTags, route.params.orderWeight, currentTagName, translate],
62+
[policyTags, orderWeight, currentTagName, translate],
6063
);
6164

6265
const editTag = useCallback(
6366
(values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {
6467
const tagName = values.tagName.trim();
6568
// Do not call the API if the edited tag name is the same as the current tag name
6669
if (currentTagName !== tagName) {
67-
renamePolicyTag(policyData, {oldName: route.params.tagName, newName: values.tagName.trim()}, route.params.orderWeight);
70+
renamePolicyTag(policyData, {oldName: route.params.tagName, newName: values.tagName.trim()}, orderWeight);
6871
}
6972
Keyboard.dismiss();
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-
);
73+
Navigation.goBack(isQuickSettingsFlow ? backPath : ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(policyID, orderWeight, route.params.tagName));
7574
},
76-
[policyData, currentTagName, policyID, route.params.tagName, route.params.orderWeight, isQuickSettingsFlow, backTo],
75+
[policyData, currentTagName, policyID, route.params.tagName, orderWeight, isQuickSettingsFlow, backPath],
7776
);
7877

7978
return (
@@ -91,11 +90,7 @@ function EditTagPage({route}: EditTagPageProps) {
9190
<HeaderWithBackButton
9291
title={translate('workspace.tags.editTag')}
9392
onBackButtonPress={() =>
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-
)
93+
Navigation.goBack(isQuickSettingsFlow ? backPath : ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(route?.params?.policyID, orderWeight, route.params.tagName))
9994
}
10095
/>
10196
<FormProvider

0 commit comments

Comments
 (0)