diff --git a/source/renderer/app/config/sidebarConfig.ts b/source/renderer/app/config/sidebarConfig.ts index c6593901e4..5033a4113c 100644 --- a/source/renderer/app/config/sidebarConfig.ts +++ b/source/renderer/app/config/sidebarConfig.ts @@ -58,7 +58,7 @@ export const CATEGORIES_BY_NAME = { VOTING: { name: 'VOTING', icon: votingIcon, - route: ROUTES.VOTING.REGISTRATION, + route: ROUTES.VOTING.GOVERNANCE, tooltipTextId: 'voting', }, }; diff --git a/source/renderer/app/containers/voting/Voting.tsx b/source/renderer/app/containers/voting/Voting.tsx index c7f893e2fc..9bcae14f3e 100644 --- a/source/renderer/app/containers/voting/Voting.tsx +++ b/source/renderer/app/containers/voting/Voting.tsx @@ -36,29 +36,33 @@ class Voting extends Component { const { app } = this.props.stores; const { intl } = this.props; const navItems: Array = [ - { - id: ROUTES.VOTING.REGISTRATION, - label: intl.formatMessage(messages.votingTabCatalyst), - }, { id: ROUTES.VOTING.GOVERNANCE, label: intl.formatMessage(messages.votingTabGovernance), }, + { + id: ROUTES.VOTING.REGISTRATION, + label: intl.formatMessage(messages.votingTabCatalyst), + }, ]; const activeItem = navItems.find((item) => app.currentRoute === item.id); return (
- navItemId === activeItem.id} - onNavItemClick={(navItemId: string) => { - this.props.actions.router.goToRoute.trigger({ - route: navItemId, - }); - }} - /> + {environment.isMainnet || environment.isDev ? ( + + navItemId === activeItem.id + } + onNavItemClick={(navItemId: string) => { + this.props.actions.router.goToRoute.trigger({ + route: navItemId, + }); + }} + /> + ) : null}
{this.props.children}
diff --git a/source/renderer/app/stores/SidebarStore.ts b/source/renderer/app/stores/SidebarStore.ts index c641e58690..5972720221 100644 --- a/source/renderer/app/stores/SidebarStore.ts +++ b/source/renderer/app/stores/SidebarStore.ts @@ -130,8 +130,7 @@ export default class SidebarStore extends Store { [categories.STAKING_DELEGATION_COUNTDOWN.name]: false, [categories.STAKING.name]: true, [categories.SETTINGS.name]: true, - [categories.VOTING.name]: - isMainnet || isDev || environment.votingVisibleOverride, + [categories.VOTING.name]: true, [categories.NETWORK_INFO.name]: isFlight, }; const categoriesFilteredList: Array = list.filter(