Merge pull request #99 from edenia/fix/ui

edenia · Apr 8, 2023 · f64cca5 · f64cca5
2 parents 5a92acc + fa576a8
commit f64cca5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/...ages/webapp/src/elections/components/ongoing-election-components/ongoing-round/header.tsx b/...ages/webapp/src/elections/components/ongoing-election-components/ongoing-round/header.tsx
@@ -39,8 +39,8 @@ export const Header = ({
             }
             sublineComponent={
                 <Text size="sm" className="tracking-tight">
-                    {roundStartTime.format("LT")} -{" "}
-                    {roundEndTime.format("LT z")}
+                    {roundStartTime.utc().format("LT")} -{" "}
+                    {roundEndTime.utc().format("LT")} UTC
                 </Text>
             }
         >

diff --git a/...ges/webapp/src/elections/components/registration-election-components/video-upload-cta.tsx b/...ges/webapp/src/elections/components/registration-election-components/video-upload-cta.tsx
@@ -23,7 +23,8 @@ export const ElectionVideoUploadCTA = () => {
             <Heading size={3}>Election video upload service</Heading>
             <Text>
                 View and upload your meeting videos from the last election. All
-                election videos must be uploaded by {deadline.format("LLL z")}.
+                election videos must be uploaded by{" "}
+                {deadline.utc().format("LLL")} UTC.
             </Text>
             <Button
                 size="xs"

diff --git a/packages/webapp/src/members/components/withdraw-funds/next-disbursement-info.tsx b/packages/webapp/src/members/components/withdraw-funds/next-disbursement-info.tsx
@@ -16,8 +16,8 @@ export const NextDisbursementInfo = () => {
             return (
                 <Text>
                     Delegate funds are disbursed monthly. Check back on{" "}
-                    {nextDisbursementTime.format("LL")} after{" "}
-                    {nextDisbursementTime.format("LT z")} for your next
+                    {nextDisbursementTime.utc().format("LL")} UTC after{" "}
+                    {nextDisbursementTime.utc().format("LT")} UTC for your next
                     disbursement.
                 </Text>
             );

diff --git a/packages/webapp/src/pages/election/round-video-upload.tsx b/packages/webapp/src/pages/election/round-video-upload.tsx
@@ -280,7 +280,9 @@ const Header = ({
         winner && isValidDelegate(winner.account)
             ? `Delegate: ${winner.name}`
             : roundStartTime && roundEndTime
-            ? `${roundStartTime.format("LT")} - ${roundEndTime.format("LT z")}`
+            ? `${roundStartTime.utc().format("LT")} - ${roundEndTime
+                  .utc()
+                  .format("LT")} UTC`
             : "Consensus not achieved";
 
     return (

diff --git a/packages/webapp/src/pages/election/stats.tsx b/packages/webapp/src/pages/election/stats.tsx
@@ -138,9 +138,9 @@ const GlobalRoundHeader = ({ round }: GlobalRoundHeaderProps) => {
         }
     };
 
-    const subText = `${round.votingBegin.format(
-        "LT"
-    )} - ${round.votingEnd.format("LT z")}`;
+    const subText = `${round.votingBegin.utc().format("LT")} - ${round.votingEnd
+        .utc()
+        .format("LT")} UTC`;
 
     return (
         <RoundHeader