diff --git a/govtool/frontend/src/consts/navItems.tsx b/govtool/frontend/src/consts/navItems.tsx index 6274f7a33..e291728d1 100644 --- a/govtool/frontend/src/consts/navItems.tsx +++ b/govtool/frontend/src/consts/navItems.tsx @@ -45,7 +45,7 @@ export const NAV_ITEMS: Array = [ }, { 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 = [ { 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, diff --git a/govtool/frontend/src/consts/paths.ts b/govtool/frontend/src/consts/paths.ts index 94e16e0a4..0fbd60ef0 100644 --- a/govtool/frontend/src/consts/paths.ts +++ b/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", }; diff --git a/govtool/frontend/src/i18n/locales/en.json b/govtool/frontend/src/i18n/locales/en.json index 2e6013a9f..c8994b1f9 100644 --- a/govtool/frontend/src/i18n/locales/en.json +++ b/govtool/frontend/src/i18n/locales/en.json @@ -489,8 +489,8 @@ "submittedDateWithEpoch": "Submitted: <0>{{date}} <1>(Epoch {{epoch}})", "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", diff --git a/govtool/frontend/src/pages/Dashboard.tsx b/govtool/frontend/src/pages/Dashboard.tsx index 130e6b6fc..d34cbd877 100644 --- a/govtool/frontend/src/pages/Dashboard.tsx +++ b/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) ?? ""; };