Merge pull request #3865 from IntersectMBO/3132-title-wrong-on-live-voting-page

 (fix#3132): change titles from Governance Actions to Live Voting

Author: Ciabas

govtool/frontend/src/consts/navItems.tsx

@@ -45,7 +45,7 @@ export const NAV_ITEMS: Array<NavItem | NavMenuItem> = [
   },
   {
     dataTestId: "governance-actions",
-    label: i18n.t("govActions.title"),
+    label: i18n.t("govActions.categoryTitle"),
     childNavItems: [
       {
         dataTestId: "proposed-governance-actions-link",
@@ -56,7 +56,7 @@ export const NAV_ITEMS: Array<NavItem | NavMenuItem> = [
       {
         dataTestId: "governance-actions-link",
         navTo: PATHS.governanceActions,
-        label: i18n.t("govActions.navTitle"),
+        label: i18n.t("govActions.title"),
         newTabLink: null,
       },
       {
@@ -108,7 +108,7 @@ export const CONNECTED_NAV_ITEMS = [
   },
   {
     dataTestId: "governance-actions-link",
-    label: i18n.t("govActions.title"),
+    label: i18n.t("govActions.categoryTitle"),
     navTo: PATHS.dashboardGovernanceActions,
     activeIcon: ICONS.governanceActionsActiveIcon,
     icon: ICONS.governanceActionsIcon,
@@ -139,7 +139,7 @@ export const CONNECTED_NAV_ITEMS = [
       {
         dataTestId: "governance-actions-live-voting-link",
         label: i18n.t("govActions.liveVoting.title"),
-        navTo: OUTCOMES_PATHS.governanceActionsLiveVoting,
+        navTo: PATHS.dashboardGovernanceActions,
         activeIcon: ICONS.governanceActionsActiveIcon,
         icon: ICONS.governanceActionsIcon,
         newTabLink: null,

govtool/frontend/src/consts/paths.ts

@@ -49,5 +49,4 @@ export const USER_PATHS = {
 export const OUTCOMES_PATHS = {
   governanceActionsOutcomes: "/outcomes",
   governanceActionOutcomes: "/outcomes/governance_actions/:id",
-  governanceActionsLiveVoting: "/connected/governance_actions",
 };

govtool/frontend/src/i18n/locales/en.json

@@ -489,8 +489,8 @@
     "submittedDateWithEpoch": "Submitted: <0>{{date}}</0> <1>(Epoch {{epoch}})</1>",
     "supportingLinks": "Supporting links",
     "threshold": "Ratification Threshold",
-    "title": "Governance Actions",
-    "navTitle": "Live Voting",
+    "categoryTitle": "Governance Actions",
+    "title": "Live Voting",
     "toVote": "To vote",
     "viewDetails": "View Details",
     "viewDetailsAndVote": "View Details and Vote",

govtool/frontend/src/pages/Dashboard.tsx

@@ -53,6 +53,11 @@ export const Dashboard = () => {
 
       return proposalDiscussionNavItem ?? "";
     }
+
+    if (path.startsWith(PATHS.dashboardGovernanceActions)) {
+      return t("govActions.title");
+    }
+
     return findNavItem(CONNECTED_NAV_ITEMS, path) ?? "";
   };