Merge branch 'develop' into feature/ddw-621-improve-currency-japanese…

…-translations
input-output-hk · Apr 5, 2021 · b76c679 · b76c679
2 parents 368df5e + 5fea82d
commit b76c679
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,19 @@
 Changelog
 =========
 
+## vNext
+
+### Chores
+
+- Updates Catalyst Fund4 dates ([PR 2495](https://github.com/input-output-hk/daedalus/pull/2495))
+- Updated `cardano-wallet` to revision `7df30796` ([PR 2495](https://github.com/input-output-hk/daedalus/pull/2495))
+
+## 4.0.4
+
+### Features
+
+- Added wallet rewards address display on the "Rewards" screen ([PR 2475](https://github.com/input-output-hk/daedalus/pull/2475))
+
 ## 4.0.3
 
 ### Features

diff --git a/nix/sources.json b/nix/sources.json
@@ -29,10 +29,10 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-wallet",
-        "rev": "1fbb9f46b483e9fef1d166b62e074778605cf794",
-        "sha256": "0bcnddpi14xg6csl4hf44x22d2gb86k8hibzqk52p077d1y2hbqp",
+        "rev": "7df30796be8bab3351467ecdee5e803f0969b177",
+        "sha256": "158w18wgxmqh2l224llw9vmyk0677k1ainm2qw3ja6mkdi37xns9",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-wallet/archive/1fbb9f46b483e9fef1d166b62e074778605cf794.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-wallet/archive/7df30796be8bab3351467ecdee5e803f0969b177.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "gitignore": {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {

diff --git a/source/renderer/app/config/stakingConfig.js b/source/renderer/app/config/stakingConfig.js
@@ -114,7 +114,7 @@ export const DELEGATION_ACTIONS: {
   QUIT: 'quit',
 };
 
-export const IS_GRID_REWARDS_VIEW_AVAILABLE = !isFlight || !isMainnet;
+export const IS_GRID_REWARDS_VIEW_AVAILABLE = !isMainnet && !isFlight;
 export const IS_RANKING_DATA_AVAILABLE = true;
 export const IS_SATURATION_DATA_AVAILABLE = true;
 

diff --git a/source/renderer/app/config/votingConfig.js b/source/renderer/app/config/votingConfig.js
@@ -7,10 +7,10 @@ export const VOTING_REGISTRATION_FEE_CALCULATION_AMOUNT = 1; // 1 ADA | unit: AD
 export const VOTING_REGISTRATION_PIN_CODE_LENGTH = 4;
 export const VOTING_REGISTRATION_MIN_TRANSACTION_CONFIRMATIONS = isDev ? 2 : 10;
 export const VOTING_REGISTRATION_TRANSACTION_POLLING_INTERVAL = 1000; // 1 second | unit: milliseconds
-export const VOTING_REGISTRATION_END_DATE = new Date('Apr 13, 2021, 19:00 UTC');
+export const VOTING_REGISTRATION_END_DATE = new Date('Apr 20, 2021, 19:00 UTC');
 export const VOTING_REGISTRATION_END_CHECK_INTERVAL = 3000; // 3 seconds | unit: milliseconds
 export const VOTING_REGISTRATION_CAST_START_DATE = new Date(
-  'Apr 15, 2021, 19:00 UTC'
+  'Apr 22, 2021, 19:00 UTC'
 );
 export const VOTING_REGISTRATION_CAST_END_DATE = new Date(
   'May 5, 2021, 19:00 UTC'