diff --git a/components/global/Button/Button.tsx b/components/global/Button/Button.tsx index 0d0b2949..8f00a040 100644 --- a/components/global/Button/Button.tsx +++ b/components/global/Button/Button.tsx @@ -25,8 +25,10 @@ interface ButtonAnchorProps size?: Size } -export const ButtonAnchor = ({ children, kind = 'secondary', size = 'normal', ...props }: ButtonAnchorProps) => ( - - {children} - +export const ButtonAnchor = React.forwardRef( + ({ children, kind = 'secondary', size = 'normal', ...props }, ref) => ( + + {children} + + ), ) diff --git a/components/global/Nav/Nav.context.tsx b/components/global/Nav/Nav.context.tsx index 8f31b450..cb3702ca 100644 --- a/components/global/Nav/Nav.context.tsx +++ b/components/global/Nav/Nav.context.tsx @@ -1,5 +1,4 @@ import React, { useContext } from 'react' -import { v4 as uuid } from 'uuid' type State = { expanded: boolean; id: string } type NavigationAction = 'toggle' | 'open' | 'close' @@ -20,7 +19,7 @@ function navigationReducer(state: State, action: NavigationAction) { } const NavigationProvider = ({ children }) => { - const componentId = React.useRef(`nav-${uuid()}`) + const componentId = React.useRef(`nav-component-id`) const [state, dispatch] = React.useReducer(navigationReducer, { expanded: false, id: componentId.current }) return ( diff --git a/pages/vote/landing.tsx b/pages/vote/landing.tsx index 827ece93..11003e21 100644 --- a/pages/vote/landing.tsx +++ b/pages/vote/landing.tsx @@ -8,6 +8,7 @@ import { PRIVACY_ACCEPTED } from '../../components/Voting/VoteConst' import Cookies from 'js-cookie' import { StyledButton, StyledHeader, StyledIntro, StyledLandingContainer } from '../../components/Voting/landing.styled' import { format } from 'date-fns' +import Link from 'next/link' type VoteLandingProps = { instance: string @@ -36,18 +37,21 @@ export default function VoteLanding({ instance, votingFinished }: VoteLandingPro "It's a draw!". - Once you've made your selection, two new options will appear. You can continue to vote on the options presented - for as long as you like - every vote will count towards formulating the best agenda possible for this year. + Once you've made your selection, two new options will appear. You can continue to vote on the options + presented for as long as you like - every vote will count towards formulating the best agenda possible for + this year. - Voting closes on {votingFinished}, so you have between now and then to have your say. You can leave and come back - any time until the closing day to get your votes in. + Voting closes on {votingFinished}, so you have between now and then to have your say. You can leave and come + back any time until the closing day to get your votes in. Happy Voting! By selecting '{BUTTON_LABEL}' I have read and accepted the{' '} - DDDPerth Privacy statement. + + DDDPerth Privacy statement. +