From 268ec01fcc66df04d70437850989e74fde151e5f Mon Sep 17 00:00:00 2001 From: Aleksandar Djordjevic Date: Thu, 29 Oct 2020 15:10:55 +0100 Subject: [PATCH] [DDW-376] Fix address validation on the Shelley QA and Staging networks (#2218) * DDW-373 syncing animation on wallet dropdown * DDW-373 syncing animation on wallet dropdown * DDW-373 syncing animation on wallet dropdown - changelog * DDW-373 syncing animation on wallet dropdown * DDW-373 syncing animation on wallet dropdown * DDW-373 syncing animation on wallet dropdown * DDW-373 syncing animation on wallet dropdown * DDW-373 syncing animation on wallet dropdown * DDW-373 syncing animation on wallet dropdown - fixes * DDW-373 Syncing animation on wallet dropdown * DDW-373 Syncing animation on wallet dropdown - fixes for step 3 failure dialog * DDW-373 Syncing animation on wallet dropdown - fixes for step 3 failure dialog * DDW-373 Syncing animation on wallet dropdown - svg fix * DDW-373 Syncing animation on wallet dropdown - wallet name + jp translations * DDW-373 Syncing animation on wallet dropdown - wallet name + jp translations * DDW-373 Syncing animation on wallet dropdown - fixes * DDW-373 Syncing animation on wallet dropdown - fixes * [DDW-373] Update CHANGELOG * [DDW-373] Update CHANGELOG * DDW-373 Syncing animation on wallet dropdown - fixes * DDW-373 Syncing animation on wallet dropdown - fixes for spinner * DDW-373 Syncing animation on wallet dropdown - fixes * DDW-373 Syncing animation on wallet dropdown - fixes * DDW-373 Syncing animation on wallet dropdown - fixes * DDW-373 Syncing animation on wallet dropdown - fixes * DDW-373 Syncing animation on wallet dropdown - fixes * DDW-373 Syncing animation on wallet dropdown - fixes * DDW-373 Syncing animation on wallet dropdown - fixes * DDW-376 - Fix address validation on shelley qa network * DDW-376 - Fix address validation on shelley qa network * DDW-376 - Fixes for Shelley testnet QA validation for addresses * DDW-376 - Fix address validation on shelley qa network * DDW-376 - Fix address validation on shelley qa network * DDW-376 - Fix address validation on shelley qa network - staging * [DDW-376] Merges develop, Runs stylelint * [DDW-376] Adds Shelley QA SMASH server URL Co-authored-by: Nikola Glumac --- CHANGELOG.md | 1 + nix/sources.json | 6 +++--- source/common/types/cardano-node.types.js | 4 ++-- source/renderer/app/components/news/NewsFeed.scss | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f96ffaf8d..67b33667bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Changelog ### Fixes +- Fixed Address validation on Shelley QA network ([PR 2218](https://github.com/input-output-hk/daedalus/pull/2218)) - Vertically centered empty news feed message ([PR 2216](https://github.com/input-output-hk/daedalus/pull/2216)) - Fixed the fix missing space in the App Update Overlay error message ([PR 2219](https://github.com/input-output-hk/daedalus/pull/2219)) diff --git a/nix/sources.json b/nix/sources.json index e56a1c4ab0..6763d71a05 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -66,10 +66,10 @@ "homepage": null, "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "f4790863d0d4e3f9018f012ec6575432c7952a48", - "sha256": "0jds3j5fqcwbgpmbddrp9cxia5mxz8kw7sqsw6jcq9bq5mv1x00d", + "rev": "e3759db64f898ab8b33a4f73d2f864ff76fa6987", + "sha256": "14ah4r49mi8sxw5yc2vqgvqpyy4sp8swyp1xz71da1r8y3j902my", "type": "tarball", - "url": "https://github.com/input-output-hk/iohk-nix/archive/f4790863d0d4e3f9018f012ec6575432c7952a48.tar.gz", + "url": "https://github.com/input-output-hk/iohk-nix/archive/e3759db64f898ab8b33a4f73d2f864ff76fa6987.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "js-chain-libs": { diff --git a/source/common/types/cardano-node.types.js b/source/common/types/cardano-node.types.js index 6ff255d174..81efd53b6e 100644 --- a/source/common/types/cardano-node.types.js +++ b/source/common/types/cardano-node.types.js @@ -145,10 +145,10 @@ export const TESTNET_MAGIC = [1097911063, 0]; export const ITN_MAGIC = 1; // Cardano Mainnet Candidate during the Shelley HF -export const SHELLEY_TESTNET_NETWORK_ID = [1, null]; +export const SHELLEY_TESTNET_NETWORK_ID = [1, 0, null]; // Cardano Staging network magic -export const STAGING_MAGIC = 633343913; +export const STAGING_MAGIC = [633343913, 1]; // Cardano Selfnode network magic export const SELFNODE_MAGIC = 459045235; diff --git a/source/renderer/app/components/news/NewsFeed.scss b/source/renderer/app/components/news/NewsFeed.scss index 91ba8b3271..0707af7ecc 100644 --- a/source/renderer/app/components/news/NewsFeed.scss +++ b/source/renderer/app/components/news/NewsFeed.scss @@ -106,8 +106,8 @@ .newsFeedNoFetchContainer { align-items: center; display: flex; - flex-grow: 1; flex-direction: column; + flex-grow: 1; height: 100%; justify-content: center;