diff --git a/packages/webapp/src/elections/components/ongoing-election-components/ongoing-round/round-info-panel.tsx b/packages/webapp/src/elections/components/ongoing-election-components/ongoing-round/round-info-panel.tsx index bc1635a41..76b5a2aac 100644 --- a/packages/webapp/src/elections/components/ongoing-election-components/ongoing-round/round-info-panel.tsx +++ b/packages/webapp/src/elections/components/ongoing-election-components/ongoing-round/round-info-panel.tsx @@ -1,7 +1,7 @@ import React from "react"; import dayjs from "dayjs"; -import { Container, Heading, Text } from "_app/ui"; +import { Button, Container, Heading, Text } from "_app/ui"; import { ActiveStateConfigType, RoundStage, @@ -9,7 +9,7 @@ import { } from "elections/interfaces"; import { Consensometer } from "./round-info"; -import { MeetingLink } from "./round-info/meeting-link"; +// import { MeetingLink } from "./round-info/meeting-link"; import { VideoUploadButton } from "../video-upload-button"; interface RoundInfoPanelProps { @@ -36,12 +36,20 @@ export const RoundInfoPanel = ({ stage ) && (
- + /> */} + {console.log({ + roundIndex, + meetingStartTime, + electionConfig, + })} +
)} {[RoundStage.Meeting, RoundStage.PostMeeting].includes( diff --git a/packages/webapp/src/elections/components/ongoing-election-components/ongoing-round/round-info/consensometer.tsx b/packages/webapp/src/elections/components/ongoing-election-components/ongoing-round/round-info/consensometer.tsx index b386db2fa..512ed14c6 100644 --- a/packages/webapp/src/elections/components/ongoing-election-components/ongoing-round/round-info/consensometer.tsx +++ b/packages/webapp/src/elections/components/ongoing-election-components/ongoing-round/round-info/consensometer.tsx @@ -63,7 +63,7 @@ export const Consensometer = ({ voteData, className = "" }: Props) => { leadTally >= totalVotesRequiredForConsensus && !leaderIsVotingForSelf ) { - helpText = "Leader must vote for themself"; + helpText = "Leader Candidates must vote for themselves"; } else if (leadCandidates.length === 1) { helpText = `Leader needs ${ remainingVotesRequiredForConsensus > 1 diff --git a/packages/webapp/src/elections/utils.ts b/packages/webapp/src/elections/utils.ts index a330b6f89..7d8324da6 100644 --- a/packages/webapp/src/elections/utils.ts +++ b/packages/webapp/src/elections/utils.ts @@ -108,7 +108,7 @@ export const getRoundTimes = ( } => { const roundDurationSec = communityGlobals.election_round_time_sec; const roundEndTimeRaw = - currentElection.round_end ?? currentElection.seed.end_time; + currentElection?.round_end ?? currentElection?.seed?.end_time; const roundDurationMs = roundDurationSec * 1000; const roundEndTime = dayjs(roundEndTimeRaw + "Z"); return { diff --git a/packages/webapp/src/members/components/home/members-list.tsx b/packages/webapp/src/members/components/home/members-list.tsx index 8a08e9675..e59d271e3 100644 --- a/packages/webapp/src/members/components/home/members-list.tsx +++ b/packages/webapp/src/members/components/home/members-list.tsx @@ -28,7 +28,7 @@ export const MembersList = ({ searchValue }: Props) => { return ; } - if (isError) { + if (isError && data.length === 0) { return (