Merge pull request #684 from gofractally/main

EdenOS Release 0.3.2
gofractally · Apr 6, 2022 · 349d268 · 349d268
2 parents 5e54b83 + a8b0637
commit 349d268
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 19 deletions.
diff --git a/packages/webapp/src/elections/components/ongoing-election-components/support-segment.tsx b/packages/webapp/src/elections/components/ongoing-election-components/support-segment.tsx
@@ -22,23 +22,30 @@ export const SupportSegment = () => {
                 </div>
             }
         >
-            {!isActiveMember && (
-                <Container>
-                    <Text>
-                        Sign in with your Eden member account to access the
-                        community room.
-                    </Text>
-                </Container>
-            )}
-            <Container className="flex justify-between sm:justify-start items-center space-x-4">
-                <ElectionCommunityRoomButton />
-                <Button
-                    type="link"
-                    href={ROUTES.ELECTION_STATS.href}
-                    target="_blank"
-                >
-                    Live results <OpensInNewTabIcon />
-                </Button>
+            <Container>
+                <div className="flex justify-between sm:justify-start items-center space-x-4">
+                    <ElectionCommunityRoomButton />
+                    <Button
+                        type="link"
+                        href={ROUTES.ELECTION_STATS.href}
+                        target="_blank"
+                    >
+                        Live results <OpensInNewTabIcon />
+                    </Button>
+                </div>
+                <Text className="mt-3" type="note">
+                    <span className="font-semibold text-gray-600">Note:</span>{" "}
+                    The{" "}
+                    <span className="font-semibold">Join community room</span>{" "}
+                    button will take you directly to a{" "}
+                    <span className="italic">Telegram message</span> in the
+                    private Eden Members Telegram group.{" "}
+                    <span className="underline">
+                        That Telegram message contains the Zoom link.
+                    </span>{" "}
+                    You must be a member of the Eden Members Telegram group to
+                    retrieve this Zoom link.
+                </Text>
             </Container>
         </Expander>
     );

diff --git a/packages/webapp/src/elections/components/ongoing-election-components/video-upload-button.tsx b/packages/webapp/src/elections/components/ongoing-election-components/video-upload-button.tsx
@@ -41,7 +41,7 @@ export const VideoUploadButton = ({ buttonType }: Props) => {
                 <div className="space-y-3">
                     <Text>
                         The election video upload service will open in a new
-                        browser tab. It is available during the 48 hours after
+                        browser tab. It is available during the 2 weeks after
                         the beginning of the election. Any election videos must
                         be uploaded during this period.
                     </Text>

diff --git a/packages/webapp/src/pages/election/round-video-upload.tsx b/packages/webapp/src/pages/election/round-video-upload.tsx
@@ -79,7 +79,7 @@ export const RoundVideoUploadPage = () => {
                                 is complete.
                             </Text>
                             <Text>
-                                Be patient, and remember you have 48 hours from
+                                Be patient, and remember you have 2 weeks from
                                 the beginning of the election to complete your
                                 election video uploads.
                             </Text>