Skip to content
This repository was archived by the owner on Oct 11, 2024. It is now read-only.

Commit 37c8a38

Browse files
committed
fix governance time formatting +use local tz
1 parent 6d27d26 commit 37c8a38

File tree

5 files changed

+26
-11
lines changed

5 files changed

+26
-11
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
"mersenne-twister": "^1.1.0",
8484
"moment": "2.21.0",
8585
"moment-precise-range-plugin": "^1.3.0",
86+
"moment-timezone": "^0.5.33",
8687
"numeral": "^2.0.6",
8788
"polished": "^1.9.2",
8889
"query-string": "^6.0.0",
@@ -132,7 +133,6 @@
132133
"@babel/preset-env": "^7.5.5",
133134
"@babel/preset-react": "^7.0.0",
134135
"@mdx-js/loader": "^1.3.1",
135-
"@types/marked": "^1.2.2",
136136
"@mdx-js/react": "^1.3.1",
137137
"@types/accounting": "^0.4.1",
138138
"@types/algoliasearch": "^3.30.12",
@@ -144,6 +144,7 @@
144144
"@types/is-mobile": "0.3.0",
145145
"@types/jest": "^24.0.25",
146146
"@types/lodash": "4.14.104",
147+
"@types/marked": "^1.2.2",
147148
"@types/material-ui": "^0.20.0",
148149
"@types/mersenne-twister": "^1.1.2",
149150
"@types/node": "*",

ts/pages/governance/countdown.tsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import * as _ from 'lodash';
2-
import * as moment from 'moment';
2+
import * as moment from 'moment-timezone';
3+
require('moment-timezone');
4+
35
import * as React from 'react';
46

57
import { Paragraph } from 'ts/components/text';
@@ -23,9 +25,8 @@ interface TimeStructure {
2325
const now = moment();
2426

2527
export const Countdown: React.StatelessComponent<Props> = ({ startDate, endDate }) => {
26-
const pstOffset = '-0800';
27-
const startTime = startDate.utcOffset(pstOffset);
28-
const endTime = endDate.utcOffset(pstOffset);
28+
const startTime = startDate.local();
29+
const endTime = endDate.local();
2930
const isUpcoming = now.isBefore(startTime);
3031
const isOver = endTime.isBefore(now);
3132
let voteTextPrefix;
@@ -38,7 +39,9 @@ export const Countdown: React.StatelessComponent<Props> = ({ startDate, endDate
3839
}
3940
const timeToDisplay = isUpcoming ? startTime : endTime;
4041
const timeText = ` • ${getRelativeTime(timeToDisplay)}`;
41-
const voteText = `${voteTextPrefix} ${timeToDisplay.format('L LT')} PST ${timeText}`;
42+
const voteText = `${voteTextPrefix} ${timeToDisplay.format('L LT')} ${moment()
43+
.tz(moment.tz.guess())
44+
.format('z')} ${timeText}`;
4245

4346
// TODO convert to container component
4447
return (

ts/pages/governance/data.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { BigNumber } from '@0x/utils';
2-
import * as moment from 'moment';
2+
import * as moment from 'moment-timezone';
33

44
import { TallyInterface } from 'ts/types';
55

ts/pages/governance/governance.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { BigNumber } from '@0x/utils';
22
import * as _ from 'lodash';
3-
import moment from 'moment';
3+
import moment from 'moment-timezone';
44
import * as React from 'react';
55
import { RouteComponentProps } from 'react-router-dom';
66
import styled from 'styled-components';
@@ -70,9 +70,8 @@ export class Governance extends React.Component<RouteComponentProps<any>> {
7070
const { isVoteReceived, tally } = this.state;
7171

7272
const now = moment();
73-
const pstOffset = '-0800';
74-
const deadlineToVote = this._proposalData?.voteEndDate?.utcOffset(pstOffset);
75-
const voteStartDate = this._proposalData?.voteStartDate?.utcOffset(pstOffset);
73+
const deadlineToVote = this._proposalData?.voteEndDate?.local();
74+
const voteStartDate = this._proposalData?.voteStartDate?.local();
7675
const hasVoteEnded = deadlineToVote?.isBefore(now) || false;
7776
const hasVoteStarted = voteStartDate ? now.isAfter(voteStartDate) : false;
7877
const isVoteActive = hasVoteStarted && !hasVoteEnded;

yarn.lock

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12156,10 +12156,22 @@ moment-precise-range-plugin@^1.3.0:
1215612156
version "1.3.0"
1215712157
resolved "https://registry.yarnpkg.com/moment-precise-range-plugin/-/moment-precise-range-plugin-1.3.0.tgz#60ac075fdfd14689f6d102af751d171a80b4ab60"
1215812158

12159+
moment-timezone@^0.5.33:
12160+
version "0.5.33"
12161+
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c"
12162+
integrity sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==
12163+
dependencies:
12164+
moment ">= 2.9.0"
12165+
1215912166
1216012167
version "2.21.0"
1216112168
resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a"
1216212169

12170+
"moment@>= 2.9.0":
12171+
version "2.29.1"
12172+
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
12173+
integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
12174+
1216312175
moment@^2.10.2:
1216412176
version "2.24.0"
1216512177
resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"

0 commit comments

Comments
 (0)