From 5a3f445d9f65781fba60928b97b35104dae96d90 Mon Sep 17 00:00:00 2001
From: Angelo CG <angelocas13_8@hotmail.com>
Date: Fri, 30 Jun 2023 10:26:31 -0600
Subject: [PATCH 1/5] fix(webapp): added validation when aa not response

---
 packages/webapp/src/members/components/home/members-list.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 <LoadingContainer />;
     }
 
-    if (isError) {
+    if (isError && data.length === 0) {
         return (
             <MessageContainer
                 title="Error loading member information"

From ae9b19ebebc68e3be5c5d7fb1b3fb37f396d82cb Mon Sep 17 00:00:00 2001
From: Angelo CG <angelocas13_8@hotmail.com>
Date: Fri, 30 Jun 2023 14:57:03 -0600
Subject: [PATCH 2/5] feat(elections): changed zoom buttons by telegram bot
 link

---
 .../ongoing-round/round-info-panel.tsx                | 11 +++++++----
 packages/webapp/src/elections/utils.ts                |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

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..90661e95b 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,15 @@ export const RoundInfoPanel = ({
                     stage
                 ) && (
                     <div>
-                        <MeetingLink
+                        {/* <MeetingLink
                             stage={stage}
                             roundIndex={roundIndex}
                             meetingStartTime={meetingStartTime}
                             electionConfig={electionConfig!}
-                        />
+                        /> */}
+                        <Button target="_blank" href='https://t.me/Up_Vote_Bot'>
+                            Go to Telegram
+                        </Button>
                     </div>
                 )}
                 {[RoundStage.Meeting, RoundStage.PostMeeting].includes(
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 {

From 23afa28257da33324c42c7da17bafdc465192a23 Mon Sep 17 00:00:00 2001
From: Angelo CG <angelocas13_8@hotmail.com>
Date: Fri, 30 Jun 2023 15:35:42 -0600
Subject: [PATCH 3/5] fix(elections): fixed format file

---
 .../ongoing-round/round-info-panel.tsx                     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 90661e95b..e5f572800 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
@@ -42,7 +42,12 @@ export const RoundInfoPanel = ({
                             meetingStartTime={meetingStartTime}
                             electionConfig={electionConfig!}
                         /> */}
-                        <Button target="_blank" href='https://t.me/Up_Vote_Bot'>
+                        {console.log({
+                            roundIndex,
+                            meetingStartTime,
+                            electionConfig
+                        })}
+                        <Button target="_blank" href="https://t.me/Up_Vote_Bot">
                             Go to Telegram
                         </Button>
                     </div>

From cb5d5be38823c0f0ab7ed11316b618d5e29447bf Mon Sep 17 00:00:00 2001
From: Angelo CG <angelocas13_8@hotmail.com>
Date: Fri, 30 Jun 2023 15:36:40 -0600
Subject: [PATCH 4/5] fix(elections): fixed format file

---
 .../ongoing-round/round-info-panel.tsx                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 e5f572800..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
@@ -45,7 +45,7 @@ export const RoundInfoPanel = ({
                         {console.log({
                             roundIndex,
                             meetingStartTime,
-                            electionConfig
+                            electionConfig,
                         })}
                         <Button target="_blank" href="https://t.me/Up_Vote_Bot">
                             Go to Telegram

From d2a074582ff40e3a2e5877beb8c4fb6f15a3d509 Mon Sep 17 00:00:00 2001
From: Leister Francisco Alvarez Campos <leisterac.1997@gmail.com>
Date: Wed, 5 Jul 2023 11:29:37 -0600
Subject: [PATCH 5/5] fix(webapp): typo

---
 .../ongoing-round/round-info/consensometer.tsx                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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