Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DDW-376] Fix address validation on the Shelley QA and Staging networks #2218

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
98d2803
DDW-373 syncing animation on wallet dropdown
DeeJayElly Sep 28, 2020
05c794c
DDW-373 syncing animation on wallet dropdown
DeeJayElly Sep 28, 2020
53ce9f0
DDW-373 syncing animation on wallet dropdown - changelog
DeeJayElly Sep 28, 2020
e5140ad
DDW-373 syncing animation on wallet dropdown
DeeJayElly Sep 28, 2020
a33231e
DDW-373 syncing animation on wallet dropdown
DeeJayElly Sep 28, 2020
bca48b6
DDW-373 syncing animation on wallet dropdown
DeeJayElly Sep 28, 2020
442db65
DDW-373 syncing animation on wallet dropdown
DeeJayElly Sep 28, 2020
3c443c6
DDW-373 syncing animation on wallet dropdown
DeeJayElly Sep 28, 2020
b007aab
Merge branch 'develop' into chore/ddw-373-syncing-animation-on-wallet…
DeeJayElly Sep 29, 2020
3e45919
DDW-373 syncing animation on wallet dropdown - fixes
DeeJayElly Sep 29, 2020
cd34e9d
DDW-373 Syncing animation on wallet dropdown
DeeJayElly Sep 30, 2020
4a4a8f3
DDW-373 Syncing animation on wallet dropdown - fixes for step 3 failu…
DeeJayElly Sep 30, 2020
b4a577a
DDW-373 Syncing animation on wallet dropdown - fixes for step 3 failu…
DeeJayElly Sep 30, 2020
85c1527
DDW-373 Syncing animation on wallet dropdown - svg fix
DeeJayElly Oct 1, 2020
c550b9f
Merge branch 'develop' into chore/ddw-373-syncing-animation-on-wallet…
DeeJayElly Oct 1, 2020
dc89a85
DDW-373 Syncing animation on wallet dropdown - wallet name + jp trans…
DeeJayElly Oct 1, 2020
411c5d2
DDW-373 Syncing animation on wallet dropdown - wallet name + jp trans…
DeeJayElly Oct 2, 2020
67bbf4e
DDW-373 Syncing animation on wallet dropdown - fixes
DeeJayElly Oct 2, 2020
09b21e0
DDW-373 Syncing animation on wallet dropdown - fixes
DeeJayElly Oct 2, 2020
b027405
Merge branch 'develop' into chore/ddw-373-syncing-animation-on-wallet…
nikolaglumac Oct 5, 2020
1f4097b
[DDW-373] Update CHANGELOG
nikolaglumac Oct 5, 2020
da99c56
Merge branch 'develop' into chore/ddw-373-syncing-animation-on-wallet…
nikolaglumac Oct 5, 2020
9a9ef29
[DDW-373] Update CHANGELOG
nikolaglumac Oct 5, 2020
b3c787c
Merge branch 'develop' into chore/ddw-373-syncing-animation-on-wallet…
DeeJayElly Oct 7, 2020
95a5ed6
Merge remote-tracking branch 'origin/chore/ddw-373-syncing-animation-…
DeeJayElly Oct 7, 2020
5398c9f
Merge branch 'develop' into chore/ddw-373-syncing-animation-on-wallet…
DeeJayElly Oct 8, 2020
bc791b2
DDW-373 Syncing animation on wallet dropdown - fixes
DeeJayElly Oct 8, 2020
edf9aa5
Merge remote-tracking branch 'origin/chore/ddw-373-syncing-animation-…
DeeJayElly Oct 8, 2020
bef36db
DDW-373 Syncing animation on wallet dropdown - fixes for spinner
DeeJayElly Oct 8, 2020
25a6ee8
Merge branch 'develop' into chore/ddw-373-syncing-animation-on-wallet…
DeeJayElly Oct 14, 2020
45547e4
Merge branch 'develop' into chore/ddw-373-syncing-animation-on-wallet…
DeeJayElly Oct 14, 2020
ca2079e
Merge branch 'chore/ddw-373-syncing-animation-on-wallet-dropdown' of …
DeeJayElly Oct 14, 2020
28b704d
DDW-373 Syncing animation on wallet dropdown - fixes
DeeJayElly Oct 15, 2020
317d36a
DDW-373 Syncing animation on wallet dropdown - fixes
DeeJayElly Oct 15, 2020
e744141
DDW-373 Syncing animation on wallet dropdown - fixes
DeeJayElly Oct 15, 2020
9f0379a
DDW-373 Syncing animation on wallet dropdown - fixes
DeeJayElly Oct 15, 2020
25abca9
Merge branch 'develop' into chore/ddw-373-syncing-animation-on-wallet…
DeeJayElly Oct 15, 2020
9afe81a
DDW-373 Syncing animation on wallet dropdown - fixes
DeeJayElly Oct 15, 2020
eb99f66
Merge remote-tracking branch 'origin/chore/ddw-373-syncing-animation-…
DeeJayElly Oct 15, 2020
a939896
DDW-373 Syncing animation on wallet dropdown - fixes
DeeJayElly Oct 15, 2020
1fcf518
DDW-373 Syncing animation on wallet dropdown - fixes
DeeJayElly Oct 15, 2020
fa4b4ea
Merge branch 'chore/ddw-373-syncing-animation-on-wallet-dropdown' int…
DeeJayElly Oct 20, 2020
15cd743
Merge branch 'develop' of github.com:input-output-hk/daedalus into de…
DeeJayElly Oct 22, 2020
01c2adc
Merge branch 'develop' of github.com:input-output-hk/daedalus into de…
DeeJayElly Oct 27, 2020
1a647b5
DDW-376 - Fix address validation on shelley qa network
DeeJayElly Oct 27, 2020
1f5ecf7
DDW-376 - Fix address validation on shelley qa network
DeeJayElly Oct 27, 2020
f92eb5e
DDW-376 - Fixes for Shelley testnet QA validation for addresses
DeeJayElly Oct 28, 2020
7863ed8
Merge remote-tracking branch 'origin/fix/ddw-376-fix-address-validati…
DeeJayElly Oct 28, 2020
19da484
DDW-376 - Fix address validation on shelley qa network
DeeJayElly Oct 27, 2020
55a70f9
DDW-376 - Fix address validation on shelley qa network
DeeJayElly Oct 27, 2020
7af9350
Merge remote-tracking branch 'origin/fix/ddw-376-fix-address-validati…
DeeJayElly Oct 28, 2020
8580acf
[DDW-376] Merges develop
nikolaglumac Oct 29, 2020
0ccbec8
DDW-376 - Fix address validation on shelley qa network - staging
DeeJayElly Oct 29, 2020
fb8b598
Merge remote-tracking branch 'origin/fix/ddw-376-fix-address-validati…
DeeJayElly Oct 29, 2020
403fff3
[DDW-376] Merges develop
nikolaglumac Oct 29, 2020
9b3a5f0
[DDW-376] Merges develop, Runs stylelint
nikolaglumac Oct 29, 2020
6f37fda
[DDW-376] Adds Shelley QA SMASH server URL
nikolaglumac Oct 29, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
6 changes: 3 additions & 3 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -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/<owner>/<repo>/archive/<rev>.tar.gz"
},
"js-chain-libs": {
Expand Down
4 changes: 2 additions & 2 deletions source/common/types/cardano-node.types.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
2 changes: 1 addition & 1 deletion source/renderer/app/components/news/NewsFeed.scss
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@
.newsFeedNoFetchContainer {
align-items: center;
display: flex;
flex-grow: 1;
flex-direction: column;
flex-grow: 1;
height: 100%;
justify-content: center;

Expand Down