Merge pull request #109 from edenia/dev

Production Release
edenia · Jul 5, 2023 · ec61e1f · ec61e1f
2 parents c602eb4 + ffc34d7
commit ec61e1f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/...p/src/elections/components/ongoing-election-components/ongoing-round/round-info-panel.tsx b/...p/src/elections/components/ongoing-election-components/ongoing-round/round-info-panel.tsx
@@ -1,15 +1,15 @@
 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,
     VoteData,
 } 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
                 ) && (
                     <div>
-                        <MeetingLink
+                        {/* <MeetingLink
                             stage={stage}
                             roundIndex={roundIndex}
                             meetingStartTime={meetingStartTime}
                             electionConfig={electionConfig!}
-                        />
+                        /> */}
+                        {console.log({
+                            roundIndex,
+                            meetingStartTime,
+                            electionConfig,
+                        })}
+                        <Button target="_blank" href="https://t.me/Up_Vote_Bot">
+                            Go to Telegram
+                        </Button>
                     </div>
                 )}
                 {[RoundStage.Meeting, RoundStage.PostMeeting].includes(

diff --git a/...ections/components/ongoing-election-components/ongoing-round/round-info/consensometer.tsx b/...ections/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
@@ -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
@@ -28,7 +28,7 @@ export const MembersList = ({ searchValue }: Props) => {
         return <LoadingContainer />;
     }
 
-    if (isError) {
+    if (isError && data.length === 0) {
         return (
             <MessageContainer
                 title="Error loading member information"