Skip to content

Commit f4e9e1e

Browse files
authored
Merge pull request Emurgo#3257 from Emurgo/fix/YOEXT-692/catalyst-incorrect-info
[hot/4.22.300] fixing incorrect data used in voting store
2 parents c831071 + 0cc23f8 commit f4e9e1e

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

packages/yoroi-extension/app/containers/wallet/voting/VotingPageContent.js

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -164,21 +164,11 @@ class VotingPageContent extends Component<Props> {
164164
registrationStart: nextFund?.registrationStart,
165165
});
166166

167-
const fund = {
168-
id: 8,
169-
name: 'Fund9',
170-
registrationStart: '2021-01-27T11:00:00Z',
171-
registrationEnd: '2023-08-04T11:00:00Z',
172-
votingStart: '2021-08-11T11:00:00Z',
173-
votingEnd: '2023-08-25T11:00:00Z',
174-
votingPowerThreshold: '450',
175-
};
176-
177167
if (currentFund) {
178-
const isLate = new Date() >= new Date(Date.parse(fund.registrationEnd));
179-
const isEarly = new Date() <= new Date(Date.parse(fund.registrationStart));
180-
const isBeforeVoting = new Date() <= new Date(Date.parse(fund.votingStart));
181-
const isAfterVoting = new Date() >= new Date(Date.parse(fund.votingEnd));
168+
const isLate = new Date() >= new Date(Date.parse(currentFund.registrationEnd));
169+
const isEarly = new Date() <= new Date(Date.parse(currentFund.registrationStart));
170+
const isBeforeVoting = new Date() <= new Date(Date.parse(currentFund.votingStart));
171+
const isAfterVoting = new Date() >= new Date(Date.parse(currentFund.votingEnd));
182172
const isBetweenVoting = !isBeforeVoting && !isAfterVoting;
183173

184174
if (isEarly) {

packages/yoroi-extension/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/yoroi-extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "yoroi",
3-
"version": "4.22.200",
3+
"version": "4.22.300",
44
"description": "Cardano ADA wallet",
55
"scripts": {
66
"dev:build": "rimraf dev/ && babel-node scripts/build --type=debug",

0 commit comments

Comments
 (0)