Merge pull request #38412 from Expensify/cmartins-fixCategoryBehavior

[CP Staging] Fix edit category (cherry picked from commit 4acd981)
Expensify · Mar 15, 2024 · 397f3d2 · 397f3d2
1 parent 0b6b396
commit 397f3d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
@@ -571,7 +571,7 @@ const ROUTES = {
     },
     WORKSPACE_CATEGORY_EDIT: {
         route: 'workspace/:policyID/categories/:categoryName/edit',
-        getRoute: (policyID: string, categoryName: string) => `workspace/${policyID}/categories/${encodeURI(categoryName)}/edit` as const,
+        getRoute: (policyID: string, categoryName: string) => `workspace/${policyID}/categories/${encodeURIComponent(categoryName)}/edit` as const,
     },
     WORKSPACE_TAGS: {
         route: 'settings/workspaces/:policyID/tags',

diff --git a/src/pages/workspace/categories/EditCategoryPage.tsx b/src/pages/workspace/categories/EditCategoryPage.tsx
@@ -27,12 +27,13 @@ type EditCategoryPageProps = WorkspaceEditCategoryPageOnyxProps & StackScreenPro
 function EditCategoryPage({route, policyCategories}: EditCategoryPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const currentCategoryName = decodeURIComponent(route.params.categoryName);
 
     const editCategory = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM>) => {
-            Policy.renamePolicyCategory(route.params.policyID, {oldName: route.params.categoryName, newName: values.categoryName});
+            Policy.renamePolicyCategory(route.params.policyID, {oldName: currentCategoryName, newName: values.categoryName});
         },
-        [route.params.categoryName, route.params.policyID],
+        [currentCategoryName, route.params.policyID],
     );
 
     return (
@@ -50,7 +51,7 @@ function EditCategoryPage({route, policyCategories}: EditCategoryPageProps) {
                     />
                     <CategoryForm
                         onSubmit={editCategory}
-                        categoryName={route.params.categoryName}
+                        categoryName={currentCategoryName}
                         policyCategories={policyCategories}
                     />
                 </ScreenWrapper>