Merge pull request #38417 from Expensify/cmartins-fixCaret

Fix right caret and routes
Expensify · Mar 16, 2024 · f84219f · f84219f
2 parents 489eaa2 + 115730f
commit f84219f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
@@ -570,8 +570,8 @@ const ROUTES = {
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/categories/new` as const,
     },
     WORKSPACE_CATEGORY_EDIT: {
-        route: 'workspace/:policyID/categories/:categoryName/edit',
-        getRoute: (policyID: string, categoryName: string) => `workspace/${policyID}/categories/${encodeURIComponent(categoryName)}/edit` as const,
+        route: 'settings/workspaces/:policyID/categories/:categoryName/edit',
+        getRoute: (policyID: string, categoryName: string) => `settings/workspaces/${policyID}/categories/${encodeURIComponent(categoryName)}/edit` as const,
     },
     WORKSPACE_TAGS: {
         route: 'settings/workspaces/:policyID/tags',
@@ -606,12 +606,12 @@ const ROUTES = {
         getRoute: (policyID: string, accountID: number, backTo?: string) => getUrlWithBackToParam(`settings/workspaces/${policyID}/members/${accountID}/role-selection`, backTo),
     },
     WORKSPACE_DISTANCE_RATES: {
-        route: 'workspace/:policyID/distance-rates',
-        getRoute: (policyID: string) => `workspace/${policyID}/distance-rates` as const,
+        route: 'settings/workspaces/:policyID/distance-rates',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/distance-rates` as const,
     },
     WORKSPACE_CREATE_DISTANCE_RATE: {
-        route: 'workspace/:policyID/distance-rates/new',
-        getRoute: (policyID: string) => `workspace/${policyID}/distance-rates/new` as const,
+        route: 'settings/workspaces/:policyID/distance-rates/new',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/distance-rates/new` as const,
     },
     // Referral program promotion
     REFERRAL_DETAILS_MODAL: {

diff --git a/src/pages/workspace/categories/CategorySettingsPage.tsx b/src/pages/workspace/categories/CategorySettingsPage.tsx
@@ -80,6 +80,7 @@ function CategorySettingsPage({route, policyCategories}: CategorySettingsPagePro
                             title={policyCategory.name}
                             description={translate(`workspace.categories.categoryName`)}
                             onPress={navigateToEditCategory}
+                            shouldShowRightIcon
                         />
                     </View>
                 </ScreenWrapper>

diff --git a/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
@@ -76,6 +76,7 @@ function WorkspaceTagsSettingsPage({route, policyTags}: WorkspaceTagsSettingsPag
                                     title={policyTagName}
                                     description={translate(`workspace.tags.customTagName`)}
                                     onPress={() => Navigation.navigate(ROUTES.WORKSPACE_EDIT_TAGS.getRoute(route.params.policyID))}
+                                    shouldShowRightIcon
                                 />
                             </OfflineWithFeedback>
                         </View>