Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/UI #99

Merged
merged 13 commits into from
Apr 8, 2023
Original file line number Diff line number Diff line change
Expand Up @@ -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>
}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
);
Expand Down
4 changes: 3 additions & 1 deletion packages/webapp/src/pages/election/round-video-upload.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions packages/webapp/src/pages/election/stats.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down