Merge pull request #3259 from Emurgo/production

[pull] Latest Production to Develop after 4.22.300
Emurgo · Aug 10, 2023 · 45595fe · 45595fe
2 parents e34a4e8 + f4e9e1e
commit 45595fe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/packages/yoroi-extension/app/containers/wallet/voting/VotingPageContent.js b/packages/yoroi-extension/app/containers/wallet/voting/VotingPageContent.js
@@ -164,21 +164,11 @@ class VotingPageContent extends Component<Props> {
         registrationStart: nextFund?.registrationStart,
       });
 
-      const fund = {
-        id: 8,
-        name: 'Fund9',
-        registrationStart: '2021-01-27T11:00:00Z',
-        registrationEnd: '2023-08-04T11:00:00Z',
-        votingStart: '2021-08-11T11:00:00Z',
-        votingEnd: '2023-08-25T11:00:00Z',
-        votingPowerThreshold: '450',
-      };
-
       if (currentFund) {
-        const isLate = new Date() >= new Date(Date.parse(fund.registrationEnd));
-        const isEarly = new Date() <= new Date(Date.parse(fund.registrationStart));
-        const isBeforeVoting = new Date() <= new Date(Date.parse(fund.votingStart));
-        const isAfterVoting = new Date() >= new Date(Date.parse(fund.votingEnd));
+        const isLate = new Date() >= new Date(Date.parse(currentFund.registrationEnd));
+        const isEarly = new Date() <= new Date(Date.parse(currentFund.registrationStart));
+        const isBeforeVoting = new Date() <= new Date(Date.parse(currentFund.votingStart));
+        const isAfterVoting = new Date() >= new Date(Date.parse(currentFund.votingEnd));
         const isBetweenVoting = !isBeforeVoting && !isAfterVoting;
 
         if (isEarly) {

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yoroi",
-  "version": "4.22.200",
+  "version": "4.22.300",
   "description": "Cardano ADA wallet",
   "scripts": {
     "dev:build": "rimraf dev/ && babel-node scripts/build --type=debug",