diff --git a/CHANGELOG.md b/CHANGELOG.md index fa365abedd..8063c579e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Changelog ========= -## vNext +## 1.0.0-STN1 ### Features diff --git a/README.md b/README.md index 14388db7b9..d1a520da8f 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ Daedalus - Cryptocurrency Wallet 1. Run `yarn nix:staging` from `daedalus`. 2. Run `yarn dev` from the subsequent `nix-shell` -#### Shelley Friends & Family Testnet +#### Shelley Testnet 1. Run `yarn nix:shelley_ff` from `daedalus`. 2. Run `yarn dev` from the subsequent `nix-shell` diff --git a/gulpfile.js b/gulpfile.js index bf9a38a6f8..e5559026d5 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -142,6 +142,7 @@ gulp.task('prepare:themes:daedalus', () => 'source/renderer/app/themes/daedalus/incentivized-testnet.js', 'source/renderer/app/themes/daedalus/index.js', 'source/renderer/app/themes/daedalus/light-blue.js', + 'source/renderer/app/themes/daedalus/shelley-testnet.js', 'source/renderer/app/themes/daedalus/white.js', 'source/renderer/app/themes/daedalus/yellow.js', ]) diff --git a/installers/icons/ff.iconset/icon_1024x1024.png b/installers/icons/ff.iconset/icon_1024x1024.png index 2ffcf40e7e..fbf11a3d60 100644 Binary files a/installers/icons/ff.iconset/icon_1024x1024.png and b/installers/icons/ff.iconset/icon_1024x1024.png differ diff --git a/installers/icons/ff.iconset/icon_1024x1024@2x.png b/installers/icons/ff.iconset/icon_1024x1024@2x.png index 08494f6b0d..c9f4bc2d1f 100644 Binary files a/installers/icons/ff.iconset/icon_1024x1024@2x.png and b/installers/icons/ff.iconset/icon_1024x1024@2x.png differ diff --git a/installers/icons/ff.iconset/icon_128x128.png b/installers/icons/ff.iconset/icon_128x128.png index f674635333..382f42d580 100644 Binary files a/installers/icons/ff.iconset/icon_128x128.png and b/installers/icons/ff.iconset/icon_128x128.png differ diff --git a/installers/icons/ff.iconset/icon_128x128@2x.png b/installers/icons/ff.iconset/icon_128x128@2x.png index 7917d62863..f8a02c87b3 100644 Binary files a/installers/icons/ff.iconset/icon_128x128@2x.png and b/installers/icons/ff.iconset/icon_128x128@2x.png differ diff --git a/installers/icons/ff.iconset/icon_16x16.png b/installers/icons/ff.iconset/icon_16x16.png index bf8565a30a..609a8d1b4c 100644 Binary files a/installers/icons/ff.iconset/icon_16x16.png and b/installers/icons/ff.iconset/icon_16x16.png differ diff --git a/installers/icons/ff.iconset/icon_16x16@2x.png b/installers/icons/ff.iconset/icon_16x16@2x.png index ccf586ab22..0718f7523a 100644 Binary files a/installers/icons/ff.iconset/icon_16x16@2x.png and b/installers/icons/ff.iconset/icon_16x16@2x.png differ diff --git a/installers/icons/ff.iconset/icon_18x18.png b/installers/icons/ff.iconset/icon_18x18.png index 54f566901f..548a84a972 100644 Binary files a/installers/icons/ff.iconset/icon_18x18.png and b/installers/icons/ff.iconset/icon_18x18.png differ diff --git a/installers/icons/ff.iconset/icon_18x18@2x.png b/installers/icons/ff.iconset/icon_18x18@2x.png index 57d0a13e24..b753888191 100644 Binary files a/installers/icons/ff.iconset/icon_18x18@2x.png and b/installers/icons/ff.iconset/icon_18x18@2x.png differ diff --git a/installers/icons/ff.iconset/icon_19x19.png b/installers/icons/ff.iconset/icon_19x19.png index c0bb69b259..25ae60df99 100644 Binary files a/installers/icons/ff.iconset/icon_19x19.png and b/installers/icons/ff.iconset/icon_19x19.png differ diff --git a/installers/icons/ff.iconset/icon_19x19@2x.png b/installers/icons/ff.iconset/icon_19x19@2x.png index 58de23b1d6..c41a53eb29 100644 Binary files a/installers/icons/ff.iconset/icon_19x19@2x.png and b/installers/icons/ff.iconset/icon_19x19@2x.png differ diff --git a/installers/icons/ff.iconset/icon_22x22.png b/installers/icons/ff.iconset/icon_22x22.png index d54f01d74d..b00b8ef73d 100644 Binary files a/installers/icons/ff.iconset/icon_22x22.png and b/installers/icons/ff.iconset/icon_22x22.png differ diff --git a/installers/icons/ff.iconset/icon_22x22@2x.png b/installers/icons/ff.iconset/icon_22x22@2x.png index 4ef59f7213..b1946890c8 100644 Binary files a/installers/icons/ff.iconset/icon_22x22@2x.png and b/installers/icons/ff.iconset/icon_22x22@2x.png differ diff --git a/installers/icons/ff.iconset/icon_24x24.png b/installers/icons/ff.iconset/icon_24x24.png index c2ae0906ff..cbffa8fb07 100644 Binary files a/installers/icons/ff.iconset/icon_24x24.png and b/installers/icons/ff.iconset/icon_24x24.png differ diff --git a/installers/icons/ff.iconset/icon_24x24@2x.png b/installers/icons/ff.iconset/icon_24x24@2x.png index a2c0de7414..052afb8f16 100644 Binary files a/installers/icons/ff.iconset/icon_24x24@2x.png and b/installers/icons/ff.iconset/icon_24x24@2x.png differ diff --git a/installers/icons/ff.iconset/icon_256x256.png b/installers/icons/ff.iconset/icon_256x256.png index 6412efe3f1..4f9c405583 100644 Binary files a/installers/icons/ff.iconset/icon_256x256.png and b/installers/icons/ff.iconset/icon_256x256.png differ diff --git a/installers/icons/ff.iconset/icon_256x256@2x.png b/installers/icons/ff.iconset/icon_256x256@2x.png index b2f1ea6d3a..a984a6c15a 100644 Binary files a/installers/icons/ff.iconset/icon_256x256@2x.png and b/installers/icons/ff.iconset/icon_256x256@2x.png differ diff --git a/installers/icons/ff.iconset/icon_32x32.png b/installers/icons/ff.iconset/icon_32x32.png index 71071e32d7..55df05caa9 100644 Binary files a/installers/icons/ff.iconset/icon_32x32.png and b/installers/icons/ff.iconset/icon_32x32.png differ diff --git a/installers/icons/ff.iconset/icon_32x32@2x.png b/installers/icons/ff.iconset/icon_32x32@2x.png index 3cac724537..ed36de78ae 100644 Binary files a/installers/icons/ff.iconset/icon_32x32@2x.png and b/installers/icons/ff.iconset/icon_32x32@2x.png differ diff --git a/installers/icons/ff.iconset/icon_40x40.png b/installers/icons/ff.iconset/icon_40x40.png index abf0802ed6..c1ce2a6bdd 100644 Binary files a/installers/icons/ff.iconset/icon_40x40.png and b/installers/icons/ff.iconset/icon_40x40.png differ diff --git a/installers/icons/ff.iconset/icon_40x40@2x.png b/installers/icons/ff.iconset/icon_40x40@2x.png index ca089cfbf7..2cc45cf2e8 100644 Binary files a/installers/icons/ff.iconset/icon_40x40@2x.png and b/installers/icons/ff.iconset/icon_40x40@2x.png differ diff --git a/installers/icons/ff.iconset/icon_48x48.png b/installers/icons/ff.iconset/icon_48x48.png index b0d5ba2e5f..a43bfa7df7 100644 Binary files a/installers/icons/ff.iconset/icon_48x48.png and b/installers/icons/ff.iconset/icon_48x48.png differ diff --git a/installers/icons/ff.iconset/icon_48x48@2x.png b/installers/icons/ff.iconset/icon_48x48@2x.png index a6040e0863..42dea973fd 100644 Binary files a/installers/icons/ff.iconset/icon_48x48@2x.png and b/installers/icons/ff.iconset/icon_48x48@2x.png differ diff --git a/installers/icons/ff.iconset/icon_512x512.png b/installers/icons/ff.iconset/icon_512x512.png index 0001879d60..c1d0024646 100644 Binary files a/installers/icons/ff.iconset/icon_512x512.png and b/installers/icons/ff.iconset/icon_512x512.png differ diff --git a/installers/icons/ff.iconset/icon_512x512@2x.png b/installers/icons/ff.iconset/icon_512x512@2x.png index 1ec64b9221..bb8223a696 100644 Binary files a/installers/icons/ff.iconset/icon_512x512@2x.png and b/installers/icons/ff.iconset/icon_512x512@2x.png differ diff --git a/installers/icons/ff.iconset/icon_64x64.png b/installers/icons/ff.iconset/icon_64x64.png index c4c1cccee5..4b4327de38 100644 Binary files a/installers/icons/ff.iconset/icon_64x64.png and b/installers/icons/ff.iconset/icon_64x64.png differ diff --git a/installers/icons/ff.iconset/icon_64x64@2x.png b/installers/icons/ff.iconset/icon_64x64@2x.png index d83b3bf5b5..86c4a0e790 100644 Binary files a/installers/icons/ff.iconset/icon_64x64@2x.png and b/installers/icons/ff.iconset/icon_64x64@2x.png differ diff --git a/installers/icons/ff/1024x1024.png b/installers/icons/ff/1024x1024.png index 2ffcf40e7e..fbf11a3d60 100644 Binary files a/installers/icons/ff/1024x1024.png and b/installers/icons/ff/1024x1024.png differ diff --git a/installers/icons/ff/128x128.ico b/installers/icons/ff/128x128.ico index 679df7c5c7..2f7cf2d877 100644 Binary files a/installers/icons/ff/128x128.ico and b/installers/icons/ff/128x128.ico differ diff --git a/installers/icons/ff/128x128.png b/installers/icons/ff/128x128.png index f674635333..382f42d580 100644 Binary files a/installers/icons/ff/128x128.png and b/installers/icons/ff/128x128.png differ diff --git a/installers/icons/ff/16x16.ico b/installers/icons/ff/16x16.ico index 86b65b6201..5b56282b90 100644 Binary files a/installers/icons/ff/16x16.ico and b/installers/icons/ff/16x16.ico differ diff --git a/installers/icons/ff/16x16.png b/installers/icons/ff/16x16.png index bf8565a30a..609a8d1b4c 100644 Binary files a/installers/icons/ff/16x16.png and b/installers/icons/ff/16x16.png differ diff --git a/installers/icons/ff/18x18.ico b/installers/icons/ff/18x18.ico index c97f9657fc..35f657f2ed 100644 Binary files a/installers/icons/ff/18x18.ico and b/installers/icons/ff/18x18.ico differ diff --git a/installers/icons/ff/18x18.png b/installers/icons/ff/18x18.png index 54f566901f..548a84a972 100644 Binary files a/installers/icons/ff/18x18.png and b/installers/icons/ff/18x18.png differ diff --git a/installers/icons/ff/19x19.ico b/installers/icons/ff/19x19.ico index 1b79dd4dc3..0ef4f06a9e 100644 Binary files a/installers/icons/ff/19x19.ico and b/installers/icons/ff/19x19.ico differ diff --git a/installers/icons/ff/19x19.png b/installers/icons/ff/19x19.png index c0bb69b259..25ae60df99 100644 Binary files a/installers/icons/ff/19x19.png and b/installers/icons/ff/19x19.png differ diff --git a/installers/icons/ff/22x22.ico b/installers/icons/ff/22x22.ico index e7ccda85b9..49d135e124 100644 Binary files a/installers/icons/ff/22x22.ico and b/installers/icons/ff/22x22.ico differ diff --git a/installers/icons/ff/22x22.png b/installers/icons/ff/22x22.png index d54f01d74d..b00b8ef73d 100644 Binary files a/installers/icons/ff/22x22.png and b/installers/icons/ff/22x22.png differ diff --git a/installers/icons/ff/24x24.ico b/installers/icons/ff/24x24.ico index 5cd3723dde..23461f69c1 100644 Binary files a/installers/icons/ff/24x24.ico and b/installers/icons/ff/24x24.ico differ diff --git a/installers/icons/ff/24x24.png b/installers/icons/ff/24x24.png index c2ae0906ff..cbffa8fb07 100644 Binary files a/installers/icons/ff/24x24.png and b/installers/icons/ff/24x24.png differ diff --git a/installers/icons/ff/256x256.ico b/installers/icons/ff/256x256.ico index 001d63b3d5..a7d1d6743b 100644 Binary files a/installers/icons/ff/256x256.ico and b/installers/icons/ff/256x256.ico differ diff --git a/installers/icons/ff/256x256.png b/installers/icons/ff/256x256.png index 6412efe3f1..4f9c405583 100644 Binary files a/installers/icons/ff/256x256.png and b/installers/icons/ff/256x256.png differ diff --git a/installers/icons/ff/32x32.ico b/installers/icons/ff/32x32.ico index a12a0020be..b81dfe59ed 100644 Binary files a/installers/icons/ff/32x32.ico and b/installers/icons/ff/32x32.ico differ diff --git a/installers/icons/ff/32x32.png b/installers/icons/ff/32x32.png index 71071e32d7..55df05caa9 100644 Binary files a/installers/icons/ff/32x32.png and b/installers/icons/ff/32x32.png differ diff --git a/installers/icons/ff/40x40.ico b/installers/icons/ff/40x40.ico index 228aa95a4a..6718ab1f59 100644 Binary files a/installers/icons/ff/40x40.ico and b/installers/icons/ff/40x40.ico differ diff --git a/installers/icons/ff/40x40.png b/installers/icons/ff/40x40.png index abf0802ed6..c1ce2a6bdd 100644 Binary files a/installers/icons/ff/40x40.png and b/installers/icons/ff/40x40.png differ diff --git a/installers/icons/ff/48x48.ico b/installers/icons/ff/48x48.ico index ac6b293c54..05e1f597f5 100644 Binary files a/installers/icons/ff/48x48.ico and b/installers/icons/ff/48x48.ico differ diff --git a/installers/icons/ff/48x48.png b/installers/icons/ff/48x48.png index b0d5ba2e5f..a43bfa7df7 100644 Binary files a/installers/icons/ff/48x48.png and b/installers/icons/ff/48x48.png differ diff --git a/installers/icons/ff/512x512.png b/installers/icons/ff/512x512.png index 0001879d60..c1d0024646 100644 Binary files a/installers/icons/ff/512x512.png and b/installers/icons/ff/512x512.png differ diff --git a/installers/icons/ff/64x64.ico b/installers/icons/ff/64x64.ico index a31bf5e932..3eed65715c 100644 Binary files a/installers/icons/ff/64x64.ico and b/installers/icons/ff/64x64.ico differ diff --git a/installers/icons/ff/64x64.png b/installers/icons/ff/64x64.png index c4c1cccee5..4b4327de38 100644 Binary files a/installers/icons/ff/64x64.png and b/installers/icons/ff/64x64.png differ diff --git a/installers/icons/ff/ff.ico b/installers/icons/ff/ff.ico index 0797931da2..6f2beea5be 100644 Binary files a/installers/icons/ff/ff.ico and b/installers/icons/ff/ff.ico differ diff --git a/installers/icons/shelley_qa.iconset/icon_1024x1024.png b/installers/icons/shelley_qa.iconset/icon_1024x1024.png index 2ffcf40e7e..b7f4feb6da 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_1024x1024.png and b/installers/icons/shelley_qa.iconset/icon_1024x1024.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_1024x1024@2x.png b/installers/icons/shelley_qa.iconset/icon_1024x1024@2x.png index 08494f6b0d..92d0ae6c2b 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_1024x1024@2x.png and b/installers/icons/shelley_qa.iconset/icon_1024x1024@2x.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_128x128.png b/installers/icons/shelley_qa.iconset/icon_128x128.png index f674635333..32c8a3b56e 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_128x128.png and b/installers/icons/shelley_qa.iconset/icon_128x128.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_128x128@2x.png b/installers/icons/shelley_qa.iconset/icon_128x128@2x.png index 7917d62863..c8611533a7 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_128x128@2x.png and b/installers/icons/shelley_qa.iconset/icon_128x128@2x.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_16x16.png b/installers/icons/shelley_qa.iconset/icon_16x16.png index bf8565a30a..609a8d1b4c 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_16x16.png and b/installers/icons/shelley_qa.iconset/icon_16x16.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_16x16@2x.png b/installers/icons/shelley_qa.iconset/icon_16x16@2x.png index ccf586ab22..0718f7523a 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_16x16@2x.png and b/installers/icons/shelley_qa.iconset/icon_16x16@2x.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_18x18.png b/installers/icons/shelley_qa.iconset/icon_18x18.png index 54f566901f..548a84a972 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_18x18.png and b/installers/icons/shelley_qa.iconset/icon_18x18.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_18x18@2x.png b/installers/icons/shelley_qa.iconset/icon_18x18@2x.png index 57d0a13e24..b753888191 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_18x18@2x.png and b/installers/icons/shelley_qa.iconset/icon_18x18@2x.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_19x19.png b/installers/icons/shelley_qa.iconset/icon_19x19.png index c0bb69b259..25ae60df99 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_19x19.png and b/installers/icons/shelley_qa.iconset/icon_19x19.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_19x19@2x.png b/installers/icons/shelley_qa.iconset/icon_19x19@2x.png index 58de23b1d6..c41a53eb29 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_19x19@2x.png and b/installers/icons/shelley_qa.iconset/icon_19x19@2x.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_22x22.png b/installers/icons/shelley_qa.iconset/icon_22x22.png index d54f01d74d..b00b8ef73d 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_22x22.png and b/installers/icons/shelley_qa.iconset/icon_22x22.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_22x22@2x.png b/installers/icons/shelley_qa.iconset/icon_22x22@2x.png index 4ef59f7213..b1946890c8 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_22x22@2x.png and b/installers/icons/shelley_qa.iconset/icon_22x22@2x.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_24x24.png b/installers/icons/shelley_qa.iconset/icon_24x24.png index c2ae0906ff..cbffa8fb07 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_24x24.png and b/installers/icons/shelley_qa.iconset/icon_24x24.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_24x24@2x.png b/installers/icons/shelley_qa.iconset/icon_24x24@2x.png index a2c0de7414..052afb8f16 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_24x24@2x.png and b/installers/icons/shelley_qa.iconset/icon_24x24@2x.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_256x256.png b/installers/icons/shelley_qa.iconset/icon_256x256.png index 6412efe3f1..4b523cf2f2 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_256x256.png and b/installers/icons/shelley_qa.iconset/icon_256x256.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_256x256@2x.png b/installers/icons/shelley_qa.iconset/icon_256x256@2x.png index b2f1ea6d3a..512de4966e 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_256x256@2x.png and b/installers/icons/shelley_qa.iconset/icon_256x256@2x.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_32x32.png b/installers/icons/shelley_qa.iconset/icon_32x32.png index 71071e32d7..55df05caa9 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_32x32.png and b/installers/icons/shelley_qa.iconset/icon_32x32.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_32x32@2x.png b/installers/icons/shelley_qa.iconset/icon_32x32@2x.png index 3cac724537..ed36de78ae 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_32x32@2x.png and b/installers/icons/shelley_qa.iconset/icon_32x32@2x.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_40x40.png b/installers/icons/shelley_qa.iconset/icon_40x40.png index abf0802ed6..85cbeb2c6d 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_40x40.png and b/installers/icons/shelley_qa.iconset/icon_40x40.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_40x40@2x.png b/installers/icons/shelley_qa.iconset/icon_40x40@2x.png index ca089cfbf7..e8964ae999 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_40x40@2x.png and b/installers/icons/shelley_qa.iconset/icon_40x40@2x.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_48x48.png b/installers/icons/shelley_qa.iconset/icon_48x48.png index b0d5ba2e5f..cbb9886fdf 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_48x48.png and b/installers/icons/shelley_qa.iconset/icon_48x48.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_48x48@2x.png b/installers/icons/shelley_qa.iconset/icon_48x48@2x.png index a6040e0863..712e563675 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_48x48@2x.png and b/installers/icons/shelley_qa.iconset/icon_48x48@2x.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_512x512.png b/installers/icons/shelley_qa.iconset/icon_512x512.png index 0001879d60..d729c36a0f 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_512x512.png and b/installers/icons/shelley_qa.iconset/icon_512x512.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_512x512@2x.png b/installers/icons/shelley_qa.iconset/icon_512x512@2x.png index 1ec64b9221..eb776a3d77 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_512x512@2x.png and b/installers/icons/shelley_qa.iconset/icon_512x512@2x.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_64x64.png b/installers/icons/shelley_qa.iconset/icon_64x64.png index c4c1cccee5..9288c49c45 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_64x64.png and b/installers/icons/shelley_qa.iconset/icon_64x64.png differ diff --git a/installers/icons/shelley_qa.iconset/icon_64x64@2x.png b/installers/icons/shelley_qa.iconset/icon_64x64@2x.png index d83b3bf5b5..dac876633a 100644 Binary files a/installers/icons/shelley_qa.iconset/icon_64x64@2x.png and b/installers/icons/shelley_qa.iconset/icon_64x64@2x.png differ diff --git a/installers/icons/shelley_qa/1024x1024.png b/installers/icons/shelley_qa/1024x1024.png index 2ffcf40e7e..b7f4feb6da 100644 Binary files a/installers/icons/shelley_qa/1024x1024.png and b/installers/icons/shelley_qa/1024x1024.png differ diff --git a/installers/icons/shelley_qa/128x128.ico b/installers/icons/shelley_qa/128x128.ico index 679df7c5c7..336069460a 100644 Binary files a/installers/icons/shelley_qa/128x128.ico and b/installers/icons/shelley_qa/128x128.ico differ diff --git a/installers/icons/shelley_qa/128x128.png b/installers/icons/shelley_qa/128x128.png index f674635333..32c8a3b56e 100644 Binary files a/installers/icons/shelley_qa/128x128.png and b/installers/icons/shelley_qa/128x128.png differ diff --git a/installers/icons/shelley_qa/16x16.ico b/installers/icons/shelley_qa/16x16.ico index 86b65b6201..5b56282b90 100644 Binary files a/installers/icons/shelley_qa/16x16.ico and b/installers/icons/shelley_qa/16x16.ico differ diff --git a/installers/icons/shelley_qa/16x16.png b/installers/icons/shelley_qa/16x16.png index bf8565a30a..609a8d1b4c 100644 Binary files a/installers/icons/shelley_qa/16x16.png and b/installers/icons/shelley_qa/16x16.png differ diff --git a/installers/icons/shelley_qa/18x18.ico b/installers/icons/shelley_qa/18x18.ico index c97f9657fc..35f657f2ed 100644 Binary files a/installers/icons/shelley_qa/18x18.ico and b/installers/icons/shelley_qa/18x18.ico differ diff --git a/installers/icons/shelley_qa/18x18.png b/installers/icons/shelley_qa/18x18.png index 54f566901f..548a84a972 100644 Binary files a/installers/icons/shelley_qa/18x18.png and b/installers/icons/shelley_qa/18x18.png differ diff --git a/installers/icons/shelley_qa/19x19.ico b/installers/icons/shelley_qa/19x19.ico index 1b79dd4dc3..0ef4f06a9e 100644 Binary files a/installers/icons/shelley_qa/19x19.ico and b/installers/icons/shelley_qa/19x19.ico differ diff --git a/installers/icons/shelley_qa/19x19.png b/installers/icons/shelley_qa/19x19.png index c0bb69b259..25ae60df99 100644 Binary files a/installers/icons/shelley_qa/19x19.png and b/installers/icons/shelley_qa/19x19.png differ diff --git a/installers/icons/shelley_qa/22x22.ico b/installers/icons/shelley_qa/22x22.ico index e7ccda85b9..49d135e124 100644 Binary files a/installers/icons/shelley_qa/22x22.ico and b/installers/icons/shelley_qa/22x22.ico differ diff --git a/installers/icons/shelley_qa/22x22.png b/installers/icons/shelley_qa/22x22.png index d54f01d74d..b00b8ef73d 100644 Binary files a/installers/icons/shelley_qa/22x22.png and b/installers/icons/shelley_qa/22x22.png differ diff --git a/installers/icons/shelley_qa/24x24.ico b/installers/icons/shelley_qa/24x24.ico index 5cd3723dde..23461f69c1 100644 Binary files a/installers/icons/shelley_qa/24x24.ico and b/installers/icons/shelley_qa/24x24.ico differ diff --git a/installers/icons/shelley_qa/24x24.png b/installers/icons/shelley_qa/24x24.png index c2ae0906ff..cbffa8fb07 100644 Binary files a/installers/icons/shelley_qa/24x24.png and b/installers/icons/shelley_qa/24x24.png differ diff --git a/installers/icons/shelley_qa/256x256.ico b/installers/icons/shelley_qa/256x256.ico index 001d63b3d5..eabede1e4f 100644 Binary files a/installers/icons/shelley_qa/256x256.ico and b/installers/icons/shelley_qa/256x256.ico differ diff --git a/installers/icons/shelley_qa/256x256.png b/installers/icons/shelley_qa/256x256.png index 6412efe3f1..4b523cf2f2 100644 Binary files a/installers/icons/shelley_qa/256x256.png and b/installers/icons/shelley_qa/256x256.png differ diff --git a/installers/icons/shelley_qa/32x32.ico b/installers/icons/shelley_qa/32x32.ico index a12a0020be..b81dfe59ed 100644 Binary files a/installers/icons/shelley_qa/32x32.ico and b/installers/icons/shelley_qa/32x32.ico differ diff --git a/installers/icons/shelley_qa/32x32.png b/installers/icons/shelley_qa/32x32.png index 71071e32d7..55df05caa9 100644 Binary files a/installers/icons/shelley_qa/32x32.png and b/installers/icons/shelley_qa/32x32.png differ diff --git a/installers/icons/shelley_qa/40x40.ico b/installers/icons/shelley_qa/40x40.ico index 228aa95a4a..ab7736b2bf 100644 Binary files a/installers/icons/shelley_qa/40x40.ico and b/installers/icons/shelley_qa/40x40.ico differ diff --git a/installers/icons/shelley_qa/40x40.png b/installers/icons/shelley_qa/40x40.png index abf0802ed6..85cbeb2c6d 100644 Binary files a/installers/icons/shelley_qa/40x40.png and b/installers/icons/shelley_qa/40x40.png differ diff --git a/installers/icons/shelley_qa/48x48.ico b/installers/icons/shelley_qa/48x48.ico index ac6b293c54..06ff11565c 100644 Binary files a/installers/icons/shelley_qa/48x48.ico and b/installers/icons/shelley_qa/48x48.ico differ diff --git a/installers/icons/shelley_qa/48x48.png b/installers/icons/shelley_qa/48x48.png index b0d5ba2e5f..cbb9886fdf 100644 Binary files a/installers/icons/shelley_qa/48x48.png and b/installers/icons/shelley_qa/48x48.png differ diff --git a/installers/icons/shelley_qa/512x512.png b/installers/icons/shelley_qa/512x512.png index 0001879d60..d729c36a0f 100644 Binary files a/installers/icons/shelley_qa/512x512.png and b/installers/icons/shelley_qa/512x512.png differ diff --git a/installers/icons/shelley_qa/64x64.ico b/installers/icons/shelley_qa/64x64.ico index a31bf5e932..6ab00fae0f 100644 Binary files a/installers/icons/shelley_qa/64x64.ico and b/installers/icons/shelley_qa/64x64.ico differ diff --git a/installers/icons/shelley_qa/64x64.png b/installers/icons/shelley_qa/64x64.png index c4c1cccee5..9288c49c45 100644 Binary files a/installers/icons/shelley_qa/64x64.png and b/installers/icons/shelley_qa/64x64.png differ diff --git a/installers/icons/shelley_qa/shelley_qa.ico b/installers/icons/shelley_qa/shelley_qa.ico index 0797931da2..afe30765ed 100644 Binary files a/installers/icons/shelley_qa/shelley_qa.ico and b/installers/icons/shelley_qa/shelley_qa.ico differ diff --git a/nix/launcher-config.nix b/nix/launcher-config.nix index 79d58051c7..3dfa23baa0 100644 --- a/nix/launcher-config.nix +++ b/nix/launcher-config.nix @@ -66,7 +66,7 @@ let itn_rewards_v1 = "- Rewards v1"; staging = "Staging"; testnet = "Testnet"; - ff = "Friends and Family"; + ff = "Shelley Testnet"; shelley_qa = "Shelley QA"; }; unsupported = "Unsupported"; diff --git a/package.json b/package.json index e708b4a853..b70ae5dd20 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "daedalus", "productName": "Daedalus", - "version": "1.1.0", + "version": "1.0.0-STN1", "description": "Cryptocurrency Wallet", "main": "./dist/main/index.js", "scripts": { diff --git a/source/common/types/environment.types.js b/source/common/types/environment.types.js index eac7329b05..b95b2246f3 100644 --- a/source/common/types/environment.types.js +++ b/source/common/types/environment.types.js @@ -89,7 +89,7 @@ export const networkPrettyNames = { selfnode: 'Selfnode', staging: 'Staging', testnet: 'Testnet', - ff: 'Shelley Friends & Family Testnet', + ff: 'Shelley Testnet', shelley_qa: 'Shelley QA', development: 'Development', itn_rewards_v1: 'Incentivized Testnet v1 - Rewards', diff --git a/source/renderer/app/api/api.js b/source/renderer/app/api/api.js index fe08800931..4457977889 100644 --- a/source/renderer/app/api/api.js +++ b/source/renderer/app/api/api.js @@ -189,7 +189,7 @@ import { deleteTransaction } from './transactions/requests/deleteTransaction'; import { WALLET_BYRON_KINDS } from '../config/walletRestoreConfig'; import ApiError from '../domains/ApiError'; -const { isIncentivizedTestnet } = global; +const { isIncentivizedTestnet, isShelleyTestnet } = global; export default class AdaApi { config: RequestConfig; @@ -209,9 +209,9 @@ export default class AdaApi { const wallets: AdaWallets = isIncentivizedTestnet ? await getWallets(this.config) : []; - const legacyWallets: LegacyAdaWallets = await getLegacyWallets( - this.config - ); + const legacyWallets: LegacyAdaWallets = !isShelleyTestnet + ? await getLegacyWallets(this.config) + : []; logger.debug('AdaApi::getWallets success', { wallets, legacyWallets }); map(legacyWallets, legacyAdaWallet => { diff --git a/source/renderer/app/assets/images/themes/shelley-testnet.png b/source/renderer/app/assets/images/themes/shelley-testnet.png new file mode 100755 index 0000000000..244e61d257 Binary files /dev/null and b/source/renderer/app/assets/images/themes/shelley-testnet.png differ diff --git a/source/renderer/app/components/loading/syncing-connecting/SyncingConnecting.js b/source/renderer/app/components/loading/syncing-connecting/SyncingConnecting.js index a9de13f042..3d0fad65d3 100644 --- a/source/renderer/app/components/loading/syncing-connecting/SyncingConnecting.js +++ b/source/renderer/app/components/loading/syncing-connecting/SyncingConnecting.js @@ -46,6 +46,7 @@ type Props = { disableDownloadLogs: boolean, showNewsFeedIcon: boolean, isIncentivizedTestnet: boolean, + isShelleyTestnet: boolean, onIssueClick: Function, onOpenExternalLink: Function, onDownloadLogs: Function, @@ -173,6 +174,7 @@ export default class SyncingConnecting extends Component { onDownloadLogs, disableDownloadLogs, isIncentivizedTestnet, + isShelleyTestnet, isNodeResponding, isNodeSyncing, isNodeTimeCorrect, @@ -196,6 +198,7 @@ export default class SyncingConnecting extends Component { @@ -216,7 +219,9 @@ export default class SyncingConnecting extends Component { /> )} - {isIncentivizedTestnet && } + {isIncentivizedTestnet && !isShelleyTestnet && ( + + )} { isConnecting, isSyncing, isIncentivizedTestnet, + isShelleyTestnet, hasLoadedCurrentTheme, } = this.props; const componentStyles = classNames([ @@ -30,7 +32,7 @@ export default class SyncingConnectingBackground extends Component { ]); return (
- {isIncentivizedTestnet && ( + {isIncentivizedTestnet && !isShelleyTestnet && ( <>
{ render() { const { theme, selectTheme } = this.props; const { intl } = this.context; - const { isIncentivizedTestnet, isFlight, environment } = global; + const { + isIncentivizedTestnet, + isShelleyTestnet, + isFlight, + environment, + } = global; const { isDev } = environment; const themeIncentivizedTestnetClasses = classnames([ @@ -113,6 +125,11 @@ export default class DisplaySettings extends Component { styles.themeImageWrapper, ]); + const themeShelleyTestnetClasses = classnames([ + theme === THEMES.SHELLEY_TESTNET ? styles.active : styles.inactive, + styles.themeImageWrapper, + ]); + const themeYellowClasses = classnames([ theme === THEMES.YELLOW ? styles.active : styles.inactive, styles.themeImageWrapper, @@ -239,6 +256,22 @@ export default class DisplaySettings extends Component { {intl.formatMessage(messages.themeFlightCandidate)} )} + + {(isDev || isShelleyTestnet) && ( + + )}
); diff --git a/source/renderer/app/components/settings/menu/SettingsMenu.js b/source/renderer/app/components/settings/menu/SettingsMenu.js index 00d3ff616b..afc0589a89 100644 --- a/source/renderer/app/components/settings/menu/SettingsMenu.js +++ b/source/renderer/app/components/settings/menu/SettingsMenu.js @@ -31,6 +31,7 @@ const messages = defineMessages({ type Props = { isFlight: boolean, + isShelleyTestnet: boolean, isActiveItem: Function, onItemClick: Function, }; @@ -43,7 +44,12 @@ export default class SettingsMenu extends Component { render() { const { intl } = this.context; - const { onItemClick, isActiveItem, isFlight } = this.props; + const { + onItemClick, + isActiveItem, + isFlight, + isShelleyTestnet, + } = this.props; return (
@@ -54,7 +60,7 @@ export default class SettingsMenu extends Component { active={isActiveItem(ROUTES.SETTINGS.GENERAL)} className="general" /> - {!isFlight && ( + {!isFlight && !isShelleyTestnet && ( onItemClick(ROUTES.SETTINGS.DISPLAY)} diff --git a/source/renderer/app/components/sidebar/SidebarCategoryNetworkInfo.js b/source/renderer/app/components/sidebar/SidebarCategoryNetworkInfo.js index 15e020eadf..de91af156f 100644 --- a/source/renderer/app/components/sidebar/SidebarCategoryNetworkInfo.js +++ b/source/renderer/app/components/sidebar/SidebarCategoryNetworkInfo.js @@ -22,7 +22,7 @@ const messages = defineMessages({ }, ff: { id: 'test.environment.shelleyFfLabel', - defaultMessage: '!!!Shelley Friends & Family Testnet', + defaultMessage: '!!!Shelley Testnet', description: 'Label for ff with version.', }, shelley_qa: { diff --git a/source/renderer/app/components/splash/SplashNetworkSTN.js b/source/renderer/app/components/splash/SplashNetworkSTN.js new file mode 100644 index 0000000000..b78830e1ea --- /dev/null +++ b/source/renderer/app/components/splash/SplashNetworkSTN.js @@ -0,0 +1,74 @@ +// @flow +import React, { Component } from 'react'; +import { defineMessages, intlShape } from 'react-intl'; +import Splash from '../widgets/splash/Splash'; + +const messages = defineMessages({ + title: { + id: 'static.splash.network.title', + defaultMessage: '!!!Daedalus', + description: 'Daedalus', + }, + versionName: { + id: 'static.splash.network.stnVersionName', + defaultMessage: '!!!SHELLEY TESTNET', + description: 'SHELLEY TESTNET', + }, + stnDescription: { + id: 'static.splash.network.stnDescription', + defaultMessage: + '!!!This version of Daedalus has been created specifically for the use with the second phase of the Shelley Testnet.', + description: 'stnDescription on network splash screen', + }, + buttonLabel: { + id: 'static.splash.network.buttonLabel', + defaultMessage: '!!!I understand', + description: 'I understand', + }, + linkLabel: { + id: 'static.splash.network.linkLabel', + defaultMessage: '!!!Learn more', + description: 'Learn more', + }, + linkUrl: { + id: 'static.splash.network.stnLinkUrl', + defaultMessage: '!!!https://testnets.cardano.org/en/shelley/overview/', + description: '"Learn more" link URL on the STN network splash screen', + }, +}); + +type Props = { + onClose: Function, + openExternalLink: Function, + currentLocale: string, +}; + +export default class SplashNetworkSTN extends Component { + static contextTypes = { + intl: intlShape.isRequired, + }; + + render() { + const { intl } = this.context; + const { onClose, openExternalLink, currentLocale } = this.props; + const title = intl.formatMessage(messages.title); + const subTitle1 = intl.formatMessage(messages.versionName); + const description =

{intl.formatMessage(messages.stnDescription)}

; + const buttonLabel = intl.formatMessage(messages.buttonLabel); + const linkLabel = intl.formatMessage(messages.linkLabel); + const onLinkClick = () => + openExternalLink(intl.formatMessage(messages.linkUrl)); + + return ( + + ); + } +} diff --git a/source/renderer/app/components/wallet/WalletAdd.js b/source/renderer/app/components/wallet/WalletAdd.js index 6433d9c7d4..71586306d1 100644 --- a/source/renderer/app/components/wallet/WalletAdd.js +++ b/source/renderer/app/components/wallet/WalletAdd.js @@ -24,9 +24,9 @@ const messages = defineMessages({ }, createDescriptionItn: { id: 'wallet.add.dialog.create.description.itn', - defaultMessage: '!!!Create a new Rewards wallet', + defaultMessage: '!!!Create a new Shelley wallet', description: - 'Description for the "Create a new Rewards wallet" button on the wallet add dialog.', + 'Description for the "Create a new Shelley wallet" button on the wallet add dialog.', }, createDescription: { id: 'wallet.add.dialog.create.description', diff --git a/source/renderer/app/components/wallet/WalletCreateDialog.js b/source/renderer/app/components/wallet/WalletCreateDialog.js index 02624d5a55..258ba83deb 100644 --- a/source/renderer/app/components/wallet/WalletCreateDialog.js +++ b/source/renderer/app/components/wallet/WalletCreateDialog.js @@ -25,9 +25,9 @@ import { submitOnEnter } from '../../utils/form'; const messages = defineMessages({ dialogTitleItn: { id: 'wallet.create.dialog.title.itn', - defaultMessage: '!!!Create a new Rewards wallet', + defaultMessage: '!!!Create a new Shelley wallet', description: - 'Title "Create a new Rewards wallet" in the wallet create form.', + 'Title "Create a new Shelley wallet" in the wallet create form.', }, dialogTitle: { id: 'wallet.create.dialog.title', @@ -48,9 +48,9 @@ const messages = defineMessages({ }, createPersonalWalletItn: { id: 'wallet.create.dialog.create.personal.wallet.button.label.itn', - defaultMessage: '!!!Create Rewards wallet', + defaultMessage: '!!!Create Shelley wallet', description: - 'Label for the "Create Rewards wallet" button on create wallet dialog.', + 'Label for the "Create Shelley wallet" button on create wallet dialog.', }, createPersonalWallet: { id: 'wallet.create.dialog.create.personal.wallet.button.label', diff --git a/source/renderer/app/components/wallet/transactions/Transaction.js b/source/renderer/app/components/wallet/transactions/Transaction.js index 950250d22a..86626a0edf 100644 --- a/source/renderer/app/components/wallet/transactions/Transaction.js +++ b/source/renderer/app/components/wallet/transactions/Transaction.js @@ -118,6 +118,11 @@ const messages = defineMessages({ defaultMessage: '!!!to see these addresses.', description: 'Unresolved Input Addresses additional label.', }, + unresolvedInputAddressesLinkUnavailableLabel: { + id: 'wallet.transaction.unresolvedInputAddressesLinkUnavailableLabel', + defaultMessage: '!!!Cardano Explorer link currently unavailable.', + description: 'Unresolved Input Addresses link unavailable label.', + }, }); const stateTranslations = defineMessages({ @@ -268,7 +273,7 @@ export default class Transaction extends Component { currentTimeFormat, } = this.props; const { intl } = this.context; - + const { isShelleyTestnet } = global; const { showConfirmationDialog } = this.state; const isPendingTransaction = state === TransactionStates.PENDING; @@ -310,21 +315,31 @@ export default class Transaction extends Component { if (addresses.length > 0) { return includesUnresolvedAddresses(addresses) ? (
- - onOpenExternalLink(getUrlByType('tx', transactionId)) - } - label={intl.formatMessage( - messages.unresolvedInputAddressesLinkLabel - )} - skin={LinkSkin} - /> - - {intl.formatMessage( - messages.unresolvedInputAddressesAdditionalLabel - )} - + {isShelleyTestnet ? ( + + {intl.formatMessage( + messages.unresolvedInputAddressesLinkUnavailableLabel + )} + + ) : ( + <> + + onOpenExternalLink(getUrlByType('tx', transactionId)) + } + label={intl.formatMessage( + messages.unresolvedInputAddressesLinkLabel + )} + skin={LinkSkin} + /> + + {intl.formatMessage( + messages.unresolvedInputAddressesAdditionalLabel + )} + + + )}
) : ( addresses.map((address, addressIndex) => ( @@ -333,14 +348,18 @@ export default class Transaction extends Component { key={`${data.id}-from-${address || ''}-${addressIndex}`} className={styles.addressRow} > - - onOpenExternalLink(getUrlByType('address', address)) - } - label={address} - skin={LinkSkin} - /> + {isShelleyTestnet ? ( + {address} + ) : ( + + onOpenExternalLink(getUrlByType('address', address)) + } + label={address} + skin={LinkSkin} + /> + )}
)) ); @@ -406,27 +425,35 @@ export default class Transaction extends Component { key={`${data.id}-to-${address}-${addressIndex}`} className={styles.addressRow} > - - onOpenExternalLink(getUrlByType('address', address)) - } - label={address} - skin={LinkSkin} - /> + {isShelleyTestnet ? ( + {address} + ) : ( + + onOpenExternalLink(getUrlByType('address', address)) + } + label={address} + skin={LinkSkin} + /> + )} ))}

{intl.formatMessage(messages.transactionId)}

- - onOpenExternalLink(getUrlByType('tx', data.id)) - } - label={data.id} - skin={LinkSkin} - /> + {isShelleyTestnet ? ( + {data.id} + ) : ( + + onOpenExternalLink(getUrlByType('tx', data.id)) + } + label={data.id} + skin={LinkSkin} + /> + )}
{this.renderCancelPendingTxnContent()} diff --git a/source/renderer/app/components/wallet/wallet-restore/WalletTypeDialog.js b/source/renderer/app/components/wallet/wallet-restore/WalletTypeDialog.js index 867c0ec43f..b4e45ab146 100644 --- a/source/renderer/app/components/wallet/wallet-restore/WalletTypeDialog.js +++ b/source/renderer/app/components/wallet/wallet-restore/WalletTypeDialog.js @@ -53,7 +53,7 @@ const messages = defineMessages({ labelDaedalusWalletKindBalance12WordItn: { id: 'wallet.restore.dialog.step.walletKind.label.daedalusWalletKindBalance12Word.itn', - defaultMessage: '!!!12 words (Balance wallet)', + defaultMessage: '!!!12 words (legacy wallet)', description: 'Label for the "labelDaedalusWalletKindBalance12Word" ITN checkbox.', }, @@ -67,14 +67,14 @@ const messages = defineMessages({ labelDaedalusWalletKindReward15Word: { id: 'wallet.restore.dialog.step.walletKind.label.daedalusWalletKindReward15Word', - defaultMessage: '!!!15 words (Rewards wallet)', + defaultMessage: '!!!15 words', description: 'Label for the "labelDaedalusWalletKindReward15Word" checkbox.', }, labelDaedalusWalletKindBalance27WordItn: { id: 'wallet.restore.dialog.step.walletKind.label.daedalusWalletKindBalance27Word.itn', - defaultMessage: '!!!27 words - paper wallet (Balance wallet)', + defaultMessage: '!!!27 words - paper wallet (legacy wallet)', description: 'Label for the "labelDaedalusWalletKindBalance27Word" ITN checkbox.', }, @@ -93,7 +93,7 @@ const messages = defineMessages({ labelYoroiWalletKindBalance15Word: { id: 'wallet.restore.dialog.step.walletKind.label.yoroiWalletKindBalance15Word', - defaultMessage: '!!!15 words (Balance wallet)', + defaultMessage: '!!!15 words (legacy wallet)', description: 'Label for the "labelDaedalusWalletKindBalance15Word" checkbox.', }, @@ -160,7 +160,7 @@ type State = { [key: HardwareWalletAcceptance]: boolean, }; -const { isIncentivizedTestnet } = global; +const { isIncentivizedTestnet, isShelleyTestnet } = global; export default class WalletTypeDialog extends Component { static contextTypes = { @@ -195,6 +195,7 @@ export default class WalletTypeDialog extends Component { } return { key: kind, + disabled: isShelleyTestnet && kind.includes('Balance'), label: ( { walletKindYoroi, WALLET_KINDS.YOROI )} - {isIncentivizedTestnet && walletKind === WALLET_KINDS.HARDWARE && ( - - {this.getWalletKind( - WALLET_HARDWARE_KINDS, - messages.labelHardwareWalletKind, - walletKindHardware, - WALLET_KINDS.HARDWARE - )} -

- {intl.formatMessage(messages.hardwareWalletDisclaimer1)} -

-

- {intl.formatMessage(messages.hardwareWalletDisclaimer2)} -

- - this.toggleAcceptance('hardwareWalletAcceptance1') - } - checked={hardwareWalletAcceptance1} - skin={CheckboxSkin} - /> - - this.toggleAcceptance('hardwareWalletAcceptance2') - } - checked={hardwareWalletAcceptance2} - skin={CheckboxSkin} - /> -
- )} + {isIncentivizedTestnet && + !isShelleyTestnet && + walletKind === WALLET_KINDS.HARDWARE && ( + + {this.getWalletKind( + WALLET_HARDWARE_KINDS, + messages.labelHardwareWalletKind, + walletKindHardware, + WALLET_KINDS.HARDWARE + )} +

+ {intl.formatMessage(messages.hardwareWalletDisclaimer1)} +

+

+ + {intl.formatMessage(messages.hardwareWalletDisclaimer2)} + +

+ + this.toggleAcceptance('hardwareWalletAcceptance1') + } + checked={hardwareWalletAcceptance1} + skin={CheckboxSkin} + /> + + this.toggleAcceptance('hardwareWalletAcceptance2') + } + checked={hardwareWalletAcceptance2} + skin={CheckboxSkin} + /> +
+ )} ); diff --git a/source/renderer/app/components/widgets/WalletTestEnvironmentLabel.js b/source/renderer/app/components/widgets/WalletTestEnvironmentLabel.js index c723e72933..69bc14a85b 100644 --- a/source/renderer/app/components/widgets/WalletTestEnvironmentLabel.js +++ b/source/renderer/app/components/widgets/WalletTestEnvironmentLabel.js @@ -17,7 +17,7 @@ const messages = defineMessages({ }, ff: { id: 'test.environment.shelleyFfLabel', - defaultMessage: '!!!Shelley Friends & Family Testnet', + defaultMessage: '!!!Shelley Testnet', description: 'Label for ff with version.', }, shelley_qa: { diff --git a/source/renderer/app/components/widgets/splash/Splash.js b/source/renderer/app/components/widgets/splash/Splash.js index d7772e2a66..6bd1530bf5 100644 --- a/source/renderer/app/components/widgets/splash/Splash.js +++ b/source/renderer/app/components/widgets/splash/Splash.js @@ -14,10 +14,10 @@ type Props = { onLinkClick: Function, title: string, subTitle1: string, - subTitle2: string, + subTitle2?: string, description: Node, buttonLabel: string, - linkLabel: string, + linkLabel: boolean | string, isIncentivizedTestnetTheme?: boolean, backgroundImage?: string, }; @@ -54,7 +54,7 @@ export default class SplashNetwork extends Component {
{title}
{subTitle1}
-
{subTitle2}
+ {subTitle2 &&
{subTitle2}
}
{description}
- + {linkLabel && ( + + )} ); diff --git a/source/renderer/app/components/widgets/splash/Splash.scss b/source/renderer/app/components/widgets/splash/Splash.scss index 488b85b7c7..bba8fb7a54 100644 --- a/source/renderer/app/components/widgets/splash/Splash.scss +++ b/source/renderer/app/components/widgets/splash/Splash.scss @@ -96,7 +96,7 @@ font-size: 20px; letter-spacing: 1px; line-height: 1.2; - margin-bottom: 5px; + margin-bottom: 20px; } .subTitle2 { @@ -106,6 +106,7 @@ letter-spacing: 0.8px; line-height: 1.38; margin-bottom: 20px; + margin-top: -15px; text-transform: uppercase; } diff --git a/source/renderer/app/config/walletRestoreConfig.js b/source/renderer/app/config/walletRestoreConfig.js index 07334b31dd..91601e803a 100644 --- a/source/renderer/app/config/walletRestoreConfig.js +++ b/source/renderer/app/config/walletRestoreConfig.js @@ -9,7 +9,7 @@ import type { ImportWalletStep, } from '../types/walletRestoreTypes'; -const { isIncentivizedTestnet } = global; +const { isIncentivizedTestnet, isShelleyTestnet } = global; export const RESTORE_WALLET_STEPS: Array = [ 'type', @@ -23,16 +23,17 @@ export const IMPORT_WALLET_STEPS: EnumMap = { WALLET_SELECT_IMPORT: 'WalletSelectImport', }; -export const WALLET_KINDS: EnumMap = isIncentivizedTestnet - ? { - DAEDALUS: 'Daedalus', - YOROI: 'Yoroi', - HARDWARE: 'Hardware', - } - : { - DAEDALUS: 'Daedalus', - YOROI: 'Yoroi', - }; +export const WALLET_KINDS: EnumMap = + isIncentivizedTestnet && !isShelleyTestnet + ? { + DAEDALUS: 'Daedalus', + YOROI: 'Yoroi', + HARDWARE: 'Hardware', + } + : { + DAEDALUS: 'Daedalus', + YOROI: 'Yoroi', + }; export const WALLET_DAEDALUS_KINDS: EnumMap< string, diff --git a/source/renderer/app/containers/loading/SyncingConnectingPage.js b/source/renderer/app/containers/loading/SyncingConnectingPage.js index 03d71b1fec..56acf84016 100644 --- a/source/renderer/app/containers/loading/SyncingConnectingPage.js +++ b/source/renderer/app/containers/loading/SyncingConnectingPage.js @@ -13,7 +13,7 @@ export default class LoadingSyncingConnectingPage extends Component { static defaultProps = { stores: null, actions: null }; render() { - const { isIncentivizedTestnet, isFlight } = global; + const { isIncentivizedTestnet, isShelleyTestnet, isFlight } = global; const { stores } = this.props; const { cardanoNodeState, @@ -67,6 +67,7 @@ export default class LoadingSyncingConnectingPage extends Component { isNewAppVersionLoading={isNewAppVersionLoading} isNewAppVersionLoaded={isNewAppVersionLoaded} isIncentivizedTestnet={isIncentivizedTestnet} + isShelleyTestnet={isShelleyTestnet} onIssueClick={this.handleIssueClick} onOpenExternalLink={this.handleOpenExternalLink} onGetAvailableVersions={this.handleGetAvailableVersions} diff --git a/source/renderer/app/containers/settings/Settings.js b/source/renderer/app/containers/settings/Settings.js index 0e97a6bed6..b165269294 100644 --- a/source/renderer/app/containers/settings/Settings.js +++ b/source/renderer/app/containers/settings/Settings.js @@ -26,11 +26,12 @@ export default class Settings extends Component { }; render() { - const { isFlight } = global; + const { isFlight, isShelleyTestnet } = global; const { actions, children } = this.props; const menu = ( actions.router.goToRoute.trigger({ route })} isActiveItem={this.isActivePage} /> diff --git a/source/renderer/app/containers/splash/SplashNetworkPage.js b/source/renderer/app/containers/splash/SplashNetworkPage.js index 5e9e4f3c4f..babae7e726 100644 --- a/source/renderer/app/containers/splash/SplashNetworkPage.js +++ b/source/renderer/app/containers/splash/SplashNetworkPage.js @@ -2,6 +2,7 @@ import React, { Component } from 'react'; import { observer, inject } from 'mobx-react'; import type { InjectedProps } from '../../types/injectedPropsType'; +import SplashNetworkSTN from '../../components/splash/SplashNetworkSTN'; import SplashNetworkITN from '../../components/splash/SplashNetworkITN'; import SplashNetworkFlight from '../../components/splash/SplashNetworkFlight'; @@ -15,8 +16,20 @@ export default class SplashNetworkPage extends Component { render() { const { networkStatus: networkStatusActions } = this.props.actions; const { openExternalLink } = this.props.stores.app; - const { isIncentivizedTestnetTheme } = this.props.stores.profile; - const { isIncentivizedTestnet, isFlight } = global; + const { + isIncentivizedTestnetTheme, + currentLocale, + } = this.props.stores.profile; + const { isIncentivizedTestnet, isShelleyTestnet, isFlight } = global; + if (isShelleyTestnet) { + return ( + networkStatusActions.toggleSplash.trigger()} + openExternalLink={openExternalLink} + currentLocale={currentLocale} + /> + ); + } if (isIncentivizedTestnet) { return ( (Balance wallet)", + "defaultMessage": "!!!12 words (legacy wallet)", "description": "Label for the \"labelDaedalusWalletKindBalance12Word\" ITN checkbox.", "end": { "column": 3, @@ -9839,7 +9956,7 @@ } }, { - "defaultMessage": "!!!15 words (Rewards wallet)", + "defaultMessage": "!!!15 words", "description": "Label for the \"labelDaedalusWalletKindReward15Word\" checkbox.", "end": { "column": 3, @@ -9853,7 +9970,7 @@ } }, { - "defaultMessage": "!!!27 words - paper wallet (Balance wallet)", + "defaultMessage": "!!!27 words - paper wallet (legacy wallet)", "description": "Label for the \"labelDaedalusWalletKindBalance27Word\" ITN checkbox.", "end": { "column": 3, @@ -9895,7 +10012,7 @@ } }, { - "defaultMessage": "!!!15 words (Balance wallet)", + "defaultMessage": "!!!15 words (legacy wallet)", "description": "Label for the \"labelDaedalusWalletKindBalance15Word\" checkbox.", "end": { "column": 3, @@ -10209,8 +10326,8 @@ } }, { - "defaultMessage": "!!!Create a new Rewards wallet", - "description": "Description for the \"Create a new Rewards wallet\" button on the wallet add dialog.", + "defaultMessage": "!!!Create a new Shelley wallet", + "description": "Description for the \"Create a new Shelley wallet\" button on the wallet add dialog.", "end": { "column": 3, "line": 30 @@ -10368,8 +10485,8 @@ { "descriptors": [ { - "defaultMessage": "!!!Create a new Rewards wallet", - "description": "Title \"Create a new Rewards wallet\" in the wallet create form.", + "defaultMessage": "!!!Create a new Shelley wallet", + "description": "Title \"Create a new Shelley wallet\" in the wallet create form.", "end": { "column": 3, "line": 31 @@ -10424,8 +10541,8 @@ } }, { - "defaultMessage": "!!!Create Rewards wallet", - "description": "Label for the \"Create Rewards wallet\" button on create wallet dialog.", + "defaultMessage": "!!!Create Shelley wallet", + "description": "Label for the \"Create Shelley wallet\" button on create wallet dialog.", "end": { "column": 3, "line": 54 @@ -11388,7 +11505,7 @@ } }, { - "defaultMessage": "!!!Shelley Friends & Family Testnet", + "defaultMessage": "!!!Shelley Testnet", "description": "Label for ff with version.", "end": { "column": 3, @@ -12231,8 +12348,8 @@ } }, { - "defaultMessage": "!!!Shelley Friends & Family Testnet", - "description": "\"Shelley Friends & Family Testnet\" Cardano network", + "defaultMessage": "!!!Shelley Testnet", + "description": "\"Shelley Testnet\" Cardano network", "end": { "column": 3, "line": 197 @@ -12662,183 +12779,5 @@ } ], "path": "source/renderer/app/utils/paperWalletPdfGenerator.json" - }, - { - "descriptors": [ - { - "defaultMessage": "!!!Create", - "description": "Create label.", - "end": { - "column": 3, - "line": 36 - }, - "file": "storybook/stories/common/Widgets.stories.js", - "id": "global.labels.create", - "start": { - "column": 10, - "line": 32 - } - }, - { - "defaultMessage": "!!!Create a new wallet", - "description": "Create a new wallet description.", - "end": { - "column": 3, - "line": 41 - }, - "file": "storybook/stories/common/Widgets.stories.js", - "id": "wallet.add.dialog.create.description", - "start": { - "column": 19, - "line": 37 - } - }, - { - "defaultMessage": "!!!Join", - "description": "Join label.", - "end": { - "column": 3, - "line": 46 - }, - "file": "storybook/stories/common/Widgets.stories.js", - "id": "wallet.add.dialog.join.label", - "start": { - "column": 8, - "line": 42 - } - }, - { - "defaultMessage": "!!!Join a shared wallet", - "description": "Join a shared wallet description.", - "end": { - "column": 3, - "line": 51 - }, - "file": "storybook/stories/common/Widgets.stories.js", - "id": "wallet.add.dialog.join.description", - "start": { - "column": 20, - "line": 47 - } - }, - { - "defaultMessage": "!!!Import", - "description": "Import label.", - "end": { - "column": 3, - "line": 56 - }, - "file": "storybook/stories/common/Widgets.stories.js", - "id": "wallet.add.dialog.import.label", - "start": { - "column": 10, - "line": 52 - } - }, - { - "defaultMessage": "!!!Import wallets from an earlier version of Daedalus or the Daedalus state directory", - "description": "Import wallets from an earlier version of Daedalus or the Daedalus state directory description.", - "end": { - "column": 3, - "line": 63 - }, - "file": "storybook/stories/common/Widgets.stories.js", - "id": "wallet.add.dialog.import.description", - "start": { - "column": 24, - "line": 57 - } - }, - { - "defaultMessage": "!!!Recovery Phrase", - "description": "Recovery Phrase description.", - "end": { - "column": 3, - "line": 68 - }, - "file": "storybook/stories/common/Widgets.stories.js", - "id": "wallet.restore.dialog.mnemonicsStep", - "start": { - "column": 18, - "line": 64 - } - }, - { - "defaultMessage": "!!!Save", - "description": "Save description.", - "end": { - "column": 3, - "line": 73 - }, - "file": "storybook/stories/common/Widgets.stories.js", - "id": "global.labels.save", - "start": { - "column": 8, - "line": 69 - } - }, - { - "defaultMessage": "!!!Follow instructions and manually update", - "description": "Follow instructions and manually update description.", - "end": { - "column": 3, - "line": 78 - }, - "file": "storybook/stories/common/Widgets.stories.js", - "id": "manualUpdate.button.label", - "start": { - "column": 22, - "line": 74 - } - } - ], - "path": "storybook/stories/common/Widgets.stories.json" - }, - { - "descriptors": [ - { - "defaultMessage": "!!!Read More", - "description": "Read More button label.", - "end": { - "column": 3, - "line": 37 - }, - "file": "storybook/stories/news/AlertsOverlay.stories.js", - "id": "global.labels.readMore", - "start": { - "column": 12, - "line": 33 - } - }, - { - "defaultMessage": "!!!Failure Alert", - "description": "Failure Alert title.", - "end": { - "column": 3, - "line": 42 - }, - "file": "storybook/stories/news/AlertsOverlay.stories.js", - "id": "global.errors.failureAlert", - "start": { - "column": 16, - "line": 38 - } - }, - { - "defaultMessage": "!!!Content", - "description": "Content.", - "end": { - "column": 3, - "line": 47 - }, - "file": "storybook/stories/news/AlertsOverlay.stories.js", - "id": "static.dummy.markdown", - "start": { - "column": 11, - "line": 43 - } - } - ], - "path": "storybook/stories/news/AlertsOverlay.stories.json" } ] \ No newline at end of file diff --git a/source/renderer/app/i18n/locales/en-US.json b/source/renderer/app/i18n/locales/en-US.json index 9f9106e059..1edc622297 100755 --- a/source/renderer/app/i18n/locales/en-US.json +++ b/source/renderer/app/i18n/locales/en-US.json @@ -92,7 +92,7 @@ "environment.apiName.cardano": "Cardano", "environment.currency.ada": "Ada", "environment.network.development": "Development", - "environment.network.ff": "Shelley Friends & Family Testnet", + "environment.network.ff": "Shelley Testnet", "environment.network.itn_rewards_v1": "Incentivized Testnet v1 - Rewards", "environment.network.itn_selfnode": "ITN Selfnode", "environment.network.mainnet": "Mainnet", @@ -112,7 +112,6 @@ "global.duration.months": "months", "global.duration.seconds": "seconds", "global.duration.years": "years", - "global.errors.failureAlert": "Failure Alert", "global.errors.fieldIsRequired": "This field is required.", "global.errors.incompleteMnemonic": "Please enter all {expected} words.", "global.errors.invalidEmail": "Invalid email entered, please check.", @@ -128,7 +127,6 @@ "global.labels.close": "Close", "global.labels.create": "Create", "global.labels.filter": "Filter", - "global.labels.readMore": "Read More", "global.labels.remove": "Remove", "global.labels.reset": "Reset", "global.labels.save": "Save", @@ -253,6 +251,7 @@ "settings.display.themeNames.flightCandidate": "Flight Candidate", "settings.display.themeNames.incentivizedTestnet": "Incentivized Testnet", "settings.display.themeNames.lightBlue": "Light blue", + "settings.display.themeNames.shelleyTestnet": "Shelley Testnet", "settings.display.themeNames.white": "White", "settings.display.themeNames.yellow": "Yellow", "settings.menu.display.link.label": "Themes", @@ -418,7 +417,6 @@ "static.about.copyright": "Input Output HK Limited. Licensed under", "static.about.license": "Apache 2.0 license", "static.about.title": "Daedalus", - "static.dummy.markdown": "# h1 Heading\nUt consequat semper viverra nam libero justo laoreet sit. Sagittis vitae et leo duis. Eget nullam non nisi est sit amet facilisis magna etiam. Nisl tincidunt eget nullam non nisi est sit amet facilisis. Auctor neque vitae tempus quam pellentesque. Vel facilisis volutpat est velit egestas dui id ornare arcu.\n\n## h2 Heading\n\nConsequat mauris nunc congue nisi vitae suscipit. Dictum non consectetur a erat nam. Laoreet non curabitur gravida arcu ac tortor dignissim. Eu augue ut lectus arcu bibendum at. Facilisis gravida neque convallis a cras semper. Ut consequat semper viverra nam libero justo laoreet sit. Sagittis vitae et leo duis. Eget nullam non nisi est sit amet facilisis magna etiam. Nisl tincidunt eget nullam non nisi est sit amet facilisis. Auctor neque vitae tempus quam pellentesque. Vel facilisis volutpat est velit egestas dui id ornare arcu. Nam aliquam sem et tortor consequat id porta nibh venenatis.\n\nViverra nam libero justo laoreet sit amet. Pharetra diam sit amet nisl. Quam viverra orci sagittis eu. Rhoncus dolor purus non enim. Posuere urna nec tincidunt praesent semper feugiat. Suspendisse in est ante in nibh mauris cursus. Sit amet consectetur adipiscing elit duis. Tortor id aliquet lectus proin nibh nisl condimentum id. At in tellus integer feugiat scelerisque. Maecenas sed enim ut sem viverra aliquet. Pellentesque pulvinar pellentesque habitant morbi. Ultrices neque ornare aenean euismod elementum nisi quis eleifend. Praesent tristique magna sit amet purus gravida. Diam volutpat commodo sed egestas egestas. Ut placerat orci nulla pellentesque dignissim enim. Ultrices in iaculis nunc sed augue lacus viverra. Etiam sit amet nisl purus.\n\n## Typographic replacements\n\nEnable typographer option to see result.\n\n(c) (C) (r) (R) (tm) (TM) (p) (P) +-\n\ntest.. test... test..... test?..... test!....\n\n!!!!!! ???? ,, -- ---\n\n\"Smartypants, double quotes\" and 'single quotes'\n\n## Emphasis\n\n**This is bold text**\n\n__This is bold text__\n\n*This is italic text*\n\n_This is italic text_\n\n## Lists\n\nUnordered\n\n+ Create a list by starting a line with +, -, or *\n+ Sub-lists are made by indenting 2 spaces:\n+ Very easy!\n\nOrdered\n\n1. Lorem ipsum dolor sit amet\n2. Consectetur adipiscing elit\n3. Integer molestie lorem at massa\n\n\n1. You can use sequential numbers...\n1. ...or keep all the numbers as `1.`\n\n## Links\n\n[link text](http://dev.nodeca.com)\n\n[link with title](http://nodeca.github.io/pica/demo/ \"title text!\")\n\nAutoconverted link https://github.com/nodeca/pica (enable linkify to see)\n\n### [Subscript](https://github.com/markdown-it/markdown-it-sub) / [Superscript](https://github.com/markdown-it/markdown-it-sup)\n\n- 19^th^\n- H~2~O\n", "static.splash.network.buttonLabel": "I understand", "static.splash.network.flightDescription1": "Thank you for downloading the Daedalus Flight wallet! This version of Daedalus is specially created so users can test new features and we can squash usability bugs before pushing releases to the mainnet production version of the Daedalus wallet. ", "static.splash.network.flightDescription2": "Although Flight candidates are designed to test functionality, this is on the mainnet and will be using mainnet ada. Transactions made using Flight candidates will be real ada payments. If you are not a power user, we recommend you stick to using our stable, fully-tested production Daedalus wallet client. It is very important to note that transactions performed in Daedalus Flight are real and your funds will be transferred because the Cardano blockchain will be validating all transactions on mainnet.", @@ -433,6 +431,9 @@ "static.splash.network.itnNetworkName": "Rewards", "static.splash.network.itnVersionName": "INCENTIVIZED TESTNET v1", "static.splash.network.linkLabel": "Learn more", + "static.splash.network.stnDescription": "This version of Daedalus has been created specifically for the use with the second phase of the Shelley Testnet.", + "static.splash.network.stnLinkUrl": "https://testnets.cardano.org/en/shelley/overview/", + "static.splash.network.stnVersionName": "SHELLEY TESTNET", "static.splash.network.title": "Daedalus", "status.icons.checkYourInternetConnection": "Check your Internet connection", "status.icons.isNodeRespondingLoading": "Checking if Cardano node is responding", @@ -474,12 +475,12 @@ "test.environment.nightlyLabel": "Nightly", "test.environment.qaLabel": "QA", "test.environment.selfnodeLabel": "Selfnode", - "test.environment.shelleyFfLabel": "Shelley Friends & Family Testnet", + "test.environment.shelleyFfLabel": "Shelley Testnet", "test.environment.shelleyQaLabel": "Shelley QA", "test.environment.stagingLabel": "Staging", "test.environment.testnetLabel": "Testnet", "wallet.add.dialog.create.description": "Create a new wallet", - "wallet.add.dialog.create.description.itn": "Create a new Rewards wallet", + "wallet.add.dialog.create.description.itn": "Create a new Shelley wallet", "wallet.add.dialog.create.label": "Create", "wallet.add.dialog.import.description": "Import wallets from an earlier version of Daedalus or the Daedalus state directory", "wallet.add.dialog.import.label": "Import", @@ -507,7 +508,7 @@ "wallet.backup.recovery.phrase.entry.dialog.verification.instructions": "Verify your wallet recovery phrase by clicking words in the exact order you wrote them down.", "wallet.create.dialog.configStep": "Config", "wallet.create.dialog.create.personal.wallet.button.label": "Create wallet", - "wallet.create.dialog.create.personal.wallet.button.label.itn": "Create Rewards wallet", + "wallet.create.dialog.create.personal.wallet.button.label.itn": "Create Shelley wallet", "wallet.create.dialog.hashImageStep": "Hash & Image", "wallet.create.dialog.instructionsStep": "Instructions", "wallet.create.dialog.mnemonicsStep": "Mnemonics", @@ -520,7 +521,7 @@ "wallet.create.dialog.stepsCounter": "Step {currentStep} of {totalSteps}", "wallet.create.dialog.templateStep": "Template", "wallet.create.dialog.title": "Create a wallet", - "wallet.create.dialog.title.itn": "Create a new Rewards wallet", + "wallet.create.dialog.title.itn": "Create a new Shelley wallet", "wallet.create.dialog.validateStep": "Validate", "wallet.create.dialog.walletNameHint": "Enter wallet name", "wallet.hardware.hardwareWalletBegin": "To begin, connect and unlock your Hardware wallet Device", @@ -544,7 +545,7 @@ "wallet.legacy.badge.label": "Legacy", "wallet.legacy.notification.actionLearnMore": "Learn more", "wallet.legacy.notification.actionMove": "Move ada from this wallet", - "wallet.legacy.notification.addWallet": "!!!Create a new Rewards wallet", + "wallet.legacy.notification.addWallet": "Create a new Shelley wallet", "wallet.legacy.notification.addWalletTitle": "Create a new wallet", "wallet.legacy.notification.descriptionWithFunds": "{activeWalletName} is a legacy wallet. It does not support Shelley delegation features. To earn ada from delegating your stake, please move all funds from this wallet to a new, Shelley-compatible wallet. You can create a brand new wallet or move funds to one of the existing wallets.", "wallet.legacy.notification.descriptionWithNoFunds": "{activeWalletName} is a legacy wallet. It does not support Shelley delegation features. Move ada from this wallet to a Rewards wallet to delegate your testnet ada stake and earn rewards.", @@ -634,10 +635,10 @@ "wallet.restore.dialog.step.walletKind.hardwareWalletDisclaimer2": "We strongly recommend that you delete the Balance wallet which is restored from your hardware wallet once you have moved any funds into a Rewards wallet.", "wallet.restore.dialog.step.walletKind.label.daedalusWalletKind": "What kind of Daedalus wallet would you like to restore?", "wallet.restore.dialog.step.walletKind.label.daedalusWalletKindBalance12Word": "12 words", - "wallet.restore.dialog.step.walletKind.label.daedalusWalletKindBalance12Word.itn": "12 words (Balance wallet)", + "wallet.restore.dialog.step.walletKind.label.daedalusWalletKindBalance12Word.itn": "12 words (Byron legacy wallet)", "wallet.restore.dialog.step.walletKind.label.daedalusWalletKindBalance27Word": "27 words - paper wallet", - "wallet.restore.dialog.step.walletKind.label.daedalusWalletKindBalance27Word.itn": "27 words - paper wallet (Balance wallet)", - "wallet.restore.dialog.step.walletKind.label.daedalusWalletKindReward15Word": "15 words (Rewards wallet)", + "wallet.restore.dialog.step.walletKind.label.daedalusWalletKindBalance27Word.itn": "27 words - paper wallet (Byron legacy wallet)", + "wallet.restore.dialog.step.walletKind.label.daedalusWalletKindReward15Word": "15 words (Shelley wallet)", "wallet.restore.dialog.step.walletKind.label.hardwareWalletKind": "What kind of hardware wallet would you like to restore?", "wallet.restore.dialog.step.walletKind.label.hardwareWalletKindLedger": "12, 18 or 24 words - Ledger Nano S or Nano X (Balance wallet)", "wallet.restore.dialog.step.walletKind.label.hardwareWalletKindTrezor": "12, 18 or 24 words - Trezor (Balance wallet)", @@ -646,8 +647,8 @@ "wallet.restore.dialog.step.walletKind.label.walletKindHardware": "Hardware wallet", "wallet.restore.dialog.step.walletKind.label.walletKindYoroi": "Yoroi wallet", "wallet.restore.dialog.step.walletKind.label.yoroiWalletKind": "What kind of Yoroi wallet would you like to restore?", - "wallet.restore.dialog.step.walletKind.label.yoroiWalletKindBalance15Word": "15 words (Balance wallet)", - "wallet.restore.dialog.step.walletKind.label.yoroiWalletKindReward15Word": "15 words (Rewards wallet)", + "wallet.restore.dialog.step.walletKind.label.yoroiWalletKindBalance15Word": "15 words (Byron legacy wallet)", + "wallet.restore.dialog.step.walletKind.label.yoroiWalletKindReward15Word": "15 words (Shelley wallet)", "wallet.restore.dialog.stepsCounter": "Step {currentStep} of {totalSteps}", "wallet.restore.dialog.tab.title.certificate": "Daedalus paper wallet", "wallet.restore.dialog.tab.title.recoveryPhrase": "Daedalus wallet", @@ -816,6 +817,7 @@ "wallet.transaction.type.exchange": "Exchange", "wallet.transaction.unresolvedInputAddressesAdditionalLabel": "to see these addresses.", "wallet.transaction.unresolvedInputAddressesLinkLabel": "Open this transaction in Cardano explorer", + "wallet.transaction.unresolvedInputAddressesLinkUnavailableLabel": "Cardano Explorer link currently unavailable.", "wallet.transactions.no.transactions": "No transactions", "wallet.transferFunds.dialog1.continueLabel": "Continue", "wallet.transferFunds.dialog1.sourceWallet": "From legacy wallet", @@ -830,4 +832,4 @@ "wallet.transferFunds.dialog2.passphraseFieldPlaceholder": "Type your spending password", "wallet.transferFunds.dialog2.passphraseLabel": "Spending password", "wallet.transferFunds.dialog2.title": "Transfer funds from the legacy wallet" -} +} \ No newline at end of file diff --git a/source/renderer/app/i18n/locales/ja-JP.json b/source/renderer/app/i18n/locales/ja-JP.json index a1f755c010..ae8ad38214 100755 --- a/source/renderer/app/i18n/locales/ja-JP.json +++ b/source/renderer/app/i18n/locales/ja-JP.json @@ -92,7 +92,7 @@ "environment.apiName.cardano": "Cardano", "environment.currency.ada": "ADA", "environment.network.development": "開発", - "environment.network.ff": "Shelley Friends & Family Testnet", + "environment.network.ff": "Shelleyテストネット", "environment.network.itn_rewards_v1": "Incentivized Testnet v1 - Rewards", "environment.network.itn_selfnode": "ITN Selfnode", "environment.network.mainnet": "メインネット", @@ -112,7 +112,6 @@ "global.duration.months": "月", "global.duration.seconds": "秒", "global.duration.years": "年", - "global.errors.failureAlert": "障害警告", "global.errors.fieldIsRequired": "必須フィールドです", "global.errors.incompleteMnemonic": "{expected}語を入力して下さい。", "global.errors.invalidEmail": "入力されたメールアドレスは無効です。確認してください。", @@ -128,7 +127,6 @@ "global.labels.close": "閉じる", "global.labels.create": "作成", "global.labels.filter": "フィルター", - "global.labels.readMore": "続きを読む", "global.labels.remove": "削除", "global.labels.reset": "リセット", "global.labels.save": "保存する", @@ -253,6 +251,7 @@ "settings.display.themeNames.flightCandidate": "Flight候補版", "settings.display.themeNames.incentivizedTestnet": "インセンティブ付きテストネット", "settings.display.themeNames.lightBlue": "ライトブルー", + "settings.display.themeNames.shelleyTestnet": "Shelleyテストネット", "settings.display.themeNames.white": "ホワイト", "settings.display.themeNames.yellow": "イエロー", "settings.menu.display.link.label": "テーマ", @@ -418,7 +417,6 @@ "static.about.copyright": "Input Output HK Limited. Licensed under", "static.about.license": "Apache 2.0 license", "static.about.title": "Daedalus", - "static.dummy.markdown": "# 見出し 1\nある初期状態が与えられればその後の全ての状態量の変化が決定される系を力学系と呼ぶ。特に、決定論に従う力学系を扱うことを強調して決定論的力学系とも呼ばれる。カオス理論において研究されるカオスと呼ばれる複雑で確率的なランダムにも見える振る舞いは、この決定論的力学系に従って生み出されるものである。この点を強調するためカオス理論が取り扱うカオスを決定論的カオス(deterministic chaos)とも呼ぶ[3]。複雑で高次元の系ではなくとも、1次元離散方程式や3次元連続方程式のような非常に簡単な低次元の系からでも、確率的ランダムに相当する振る舞いが生起される点が決定論的カオスの特徴といえる。この用語は、カオス理論以前から存在するボルツマンにより導入された分子カオスと呼び分ける意味合いもある。ボルツマンによるカオスは確率論的乱雑さを表しており、カオス理論におけるカオスとは概念が異なる。\n## 見出し 2\nある初期状態が与えられればその後の全ての状態量の変化が決定される系を力学系と呼ぶ。特に、決定論に従う力学系を扱うことを強調して決定論的力学系とも呼ばれる。カオス理論において研究されるカオスと呼ばれる複雑で確率的なランダムにも見える振る舞いは、この決定論的力学系に従って生み出されるものである。この点を強調するためカオス理論が取り扱うカオスを決定論的カオス(deterministic chaos)とも呼ぶ[3]。複雑で高次元の系ではなくとも、1次元離散方程式や3次元連続方程式のような非常に簡単な低次元の系からでも、確率的ランダムに相当する振る舞いが生起される点が決定論的カオスの特徴といえる。この用語は、カオス理論以前から存在するボルツマンにより導入された分子カオスと呼び分ける意味合いもある。ボルツマンによるカオスは確率論的乱雑さを表しており、カオス理論におけるカオスとは概念が異なる。", "static.splash.network.buttonLabel": "了解しました", "static.splash.network.flightDescription1": "Daedalus Flightウォレットをダウンロードいただきありがとうございます。このDaedalusバージョンは、Daedalusウォレットの製品バージョンをメインネットへリリースする前に、ユーザーが新機能をテストし、開発チームが使用性に関するバグに対処するために特別に作成したバージョンです。", "static.splash.network.flightDescription2": "Flight候補版は機能性をテストするためにデザインされていますが、これはメインネットに接続されており、メインネットのADAを使用します。Flight候補版を使用して実行されるトランザクションでは実際のADAによる支払いが生じます。パワーユーザー以外は、完全にテスト済みの安定した製品版Daedalusウォレットの使用を継続することを推奨します。Daedalus Flightウォレットで実行されるトランザクションは実際のものであり、すべてのトランザクションはCardanoブロックチェーンにメインネット上で検証されるため、ユーザーの資金は実際に送金されるということを十分に理解してください。", @@ -433,6 +431,9 @@ "static.splash.network.itnNetworkName": "Rewards", "static.splash.network.itnVersionName": "INCENTIVIZED TESTNET v1", "static.splash.network.linkLabel": "もっと知る", + "static.splash.network.stnDescription": "このDaedalusバージョンは、Shelleyテストネット第2フェーズで使用するための専用バージョンです。", + "static.splash.network.stnLinkUrl": "https://testnets.cardano.org/en/shelley/overview/", + "static.splash.network.stnVersionName": "Shelleyテストネット", "static.splash.network.title": "Daedalus", "status.icons.checkYourInternetConnection": "インターネット接続を確認してください", "status.icons.isNodeRespondingLoading": "Cardanoノードの応答を確認しています", @@ -474,12 +475,12 @@ "test.environment.nightlyLabel": "Nightly", "test.environment.qaLabel": "QA", "test.environment.selfnodeLabel": "Selfnode", - "test.environment.shelleyFfLabel": "Shelley Friends & Family Testnet", + "test.environment.shelleyFfLabel": "Shelleyテストネット", "test.environment.shelleyQaLabel": "Shelley QA", "test.environment.stagingLabel": "ステージング", "test.environment.testnetLabel": "テストネット", "wallet.add.dialog.create.description": "ウォレットを新規作成する", - "wallet.add.dialog.create.description.itn": "報酬ウォレットを作成する", + "wallet.add.dialog.create.description.itn": "Shelleyウォレットを新規作成する", "wallet.add.dialog.create.label": "作成", "wallet.add.dialog.import.description": "Daedalusの前バージョンまたはDaedalusステータスディレクトリーからウォレットをインポートする", "wallet.add.dialog.import.label": "インポート", @@ -507,7 +508,7 @@ "wallet.backup.recovery.phrase.entry.dialog.verification.instructions": "書き留めた通りの正しい順に単語をクリックして、ウォレットの復元フレーズを検証してください。", "wallet.create.dialog.configStep": "!!!Config", "wallet.create.dialog.create.personal.wallet.button.label": "ウォレットを作成する", - "wallet.create.dialog.create.personal.wallet.button.label.itn": "報酬ウォレット作成する", + "wallet.create.dialog.create.personal.wallet.button.label.itn": "Shelleyウォレットを作成する", "wallet.create.dialog.hashImageStep": "!!!Hash & Image", "wallet.create.dialog.instructionsStep": "!!!Instructions", "wallet.create.dialog.mnemonicsStep": "!!!Mnemonics", @@ -520,7 +521,7 @@ "wallet.create.dialog.stepsCounter": "ステップ{currentStep}/{totalSteps}", "wallet.create.dialog.templateStep": "!!!Template", "wallet.create.dialog.title": "ウォレットを作成する", - "wallet.create.dialog.title.itn": "報酬ウォレットを作成する", + "wallet.create.dialog.title.itn": "Shelleyウォレットを新規作成する", "wallet.create.dialog.validateStep": "!!!Validate", "wallet.create.dialog.walletNameHint": "ウォレット名を入力してください", "wallet.hardware.hardwareWalletBegin": "!!!To begin, connect and unlock your Hardware wallet Device", @@ -544,7 +545,7 @@ "wallet.legacy.badge.label": "残高", "wallet.legacy.notification.actionLearnMore": "もっと知る", "wallet.legacy.notification.actionMove": "テストネット用ADAを移し替える", - "wallet.legacy.notification.addWallet": "報酬ウォレットを作成する", + "wallet.legacy.notification.addWallet": "Shelleyウォレットを新規作成する", "wallet.legacy.notification.addWalletTitle": "報酬ウォレットを作成してください", "wallet.legacy.notification.descriptionWithFunds": "!!!\"{transferWalletName}\"\" is a legacy wallet. It does not support Shelley delegation features. To earn ada from delegating your stake, please move all funds from this wallet to a new, Shelley-compatible wallet. You can create a brand new wallet or move funds to one of the existing wallets.", "wallet.legacy.notification.descriptionWithNoFunds": "!!!\"{transferWalletName}\"\" is a legacy wallet. It does not support Shelley delegation features. Move ada from this wallet to a Rewards wallet to delegate your testnet ada stake and earn rewards.", @@ -634,10 +635,10 @@ "wallet.restore.dialog.step.walletKind.hardwareWalletDisclaimer2": "ハードウェアウォレットから復元した残高ウォレットは、資金を報酬ウォレットに移したら直ちに削除することを強くお勧めします。", "wallet.restore.dialog.step.walletKind.label.daedalusWalletKind": "どのDaedalusウォレットを復元しますか", "wallet.restore.dialog.step.walletKind.label.daedalusWalletKindBalance12Word": "12語", - "wallet.restore.dialog.step.walletKind.label.daedalusWalletKindBalance12Word.itn": "12語 (残高ウォレット)", + "wallet.restore.dialog.step.walletKind.label.daedalusWalletKindBalance12Word.itn": "12語 (Byronレガシーウォレット)", "wallet.restore.dialog.step.walletKind.label.daedalusWalletKindBalance27Word": "27語 - ペーパーウォレット", - "wallet.restore.dialog.step.walletKind.label.daedalusWalletKindBalance27Word.itn": "27語 - ペーパーウォレット (残高ウォレット)", - "wallet.restore.dialog.step.walletKind.label.daedalusWalletKindReward15Word": "15語 (報酬ウォレット)", + "wallet.restore.dialog.step.walletKind.label.daedalusWalletKindBalance27Word.itn": "27語 - ペーパーウォレット (Byronレガシーウォレット)", + "wallet.restore.dialog.step.walletKind.label.daedalusWalletKindReward15Word": "15語 (Shelleyウォレット)", "wallet.restore.dialog.step.walletKind.label.hardwareWalletKind": "どのタイプのハードウェアウォレットを復元しますか", "wallet.restore.dialog.step.walletKind.label.hardwareWalletKindLedger": "12語、18語、または24語 - Ledger Nano SまたはNano X (残高ウォレット)", "wallet.restore.dialog.step.walletKind.label.hardwareWalletKindTrezor": "12語、18語、または24語 - Trezor (残高ウォレット)", @@ -646,8 +647,8 @@ "wallet.restore.dialog.step.walletKind.label.walletKindHardware": "ハードウェアウォレット", "wallet.restore.dialog.step.walletKind.label.walletKindYoroi": "Yoroiウォレット", "wallet.restore.dialog.step.walletKind.label.yoroiWalletKind": "どのタイプのYoroiウォレットを復元しますか", - "wallet.restore.dialog.step.walletKind.label.yoroiWalletKindBalance15Word": "15語 (残高ウォレット)", - "wallet.restore.dialog.step.walletKind.label.yoroiWalletKindReward15Word": "15語 (報酬ウォレット)", + "wallet.restore.dialog.step.walletKind.label.yoroiWalletKindBalance15Word": "15語 (Byronレガシーウォレット)", + "wallet.restore.dialog.step.walletKind.label.yoroiWalletKindReward15Word": "15語 (Shelleyウォレット)", "wallet.restore.dialog.stepsCounter": "ステップ{currentStep}/{totalSteps}", "wallet.restore.dialog.tab.title.certificate": "Daedalusペーパーウォレット", "wallet.restore.dialog.tab.title.recoveryPhrase": "Daedalusウォレット", @@ -816,6 +817,7 @@ "wallet.transaction.type.exchange": "換金", "wallet.transaction.unresolvedInputAddressesAdditionalLabel": "アドレスを表示する。", "wallet.transaction.unresolvedInputAddressesLinkLabel": "Cardanoエクスプローラーでこのトランザクションを開き", + "wallet.transaction.unresolvedInputAddressesLinkUnavailableLabel": "Cardanoエクスプローラーのリンクは現在使用できません。", "wallet.transactions.no.transactions": "トランザクションはありません", "wallet.transferFunds.dialog1.continueLabel": "続ける", "wallet.transferFunds.dialog1.sourceWallet": "送金元残高ウォレット", @@ -830,4 +832,4 @@ "wallet.transferFunds.dialog2.passphraseFieldPlaceholder": "送信時パスワードを入力してください", "wallet.transferFunds.dialog2.passphraseLabel": "送信時パスワード", "wallet.transferFunds.dialog2.title": "残高ウォレットの資金を移し替える" -} +} \ No newline at end of file diff --git a/source/renderer/app/stores/ProfileStore.js b/source/renderer/app/stores/ProfileStore.js index 40b9698dfc..6ab57f11b6 100644 --- a/source/renderer/app/stores/ProfileStore.js +++ b/source/renderer/app/stores/ProfileStore.js @@ -167,8 +167,9 @@ export default class ProfileStore extends Store { @computed get currentTheme(): string { // Default theme handling let systemValue; - if (global.isIncentivizedTestnet) { - // Force "Incentivized Testnet" as default theme for the Incentivized Testnet Daedalus version + if (global.isShelleyTestnet) { + systemValue = THEMES.SHELLEY_TESTNET; + } else if (global.isIncentivizedTestnet) { systemValue = THEMES.INCENTIVIZED_TESTNET; } else if (global.isFlight) { systemValue = THEMES.FLIGHT_CANDIDATE; diff --git a/source/renderer/app/stores/SidebarStore.js b/source/renderer/app/stores/SidebarStore.js index 12df8220ef..b9002a7d2d 100644 --- a/source/renderer/app/stores/SidebarStore.js +++ b/source/renderer/app/stores/SidebarStore.js @@ -72,11 +72,16 @@ export default class SidebarStore extends Store { } @action _configureCategories = () => { - const { isIncentivizedTestnet, isFlight, environment } = global; - if (isIncentivizedTestnet) { - this.CATEGORIES = sidebarConfig.CATEGORIES_WITHOUT_DELEGATION_COUNTDOWN; - } else if (isFlight) { + const { + isIncentivizedTestnet, + isShelleyTestnet, + isFlight, + environment, + } = global; + if (isShelleyTestnet || isFlight) { this.CATEGORIES = sidebarConfig.CATEGORIES; + } else if (isIncentivizedTestnet) { + this.CATEGORIES = sidebarConfig.CATEGORIES_WITHOUT_DELEGATION_COUNTDOWN; } else if (environment.isDev) { this.CATEGORIES = sidebarConfig.CATEGORIES_WITH_HARDWARE_WALLETS; } else { diff --git a/source/renderer/app/stores/StakingStore.js b/source/renderer/app/stores/StakingStore.js index 9888be8381..7033117419 100644 --- a/source/renderer/app/stores/StakingStore.js +++ b/source/renderer/app/stores/StakingStore.js @@ -39,7 +39,7 @@ export default class StakingStore extends Store { _delegationFeeCalculationWalletId: ?string = null; setup() { - if (global.isIncentivizedTestnet) { + if (global.isIncentivizedTestnet && !global.isShelleyTestnet) { // Set initial fetch interval to 1 second this.refreshPolling = setInterval( this.getStakePoolsData, diff --git a/source/renderer/app/themes/daedalus/dark-blue.js b/source/renderer/app/themes/daedalus/dark-blue.js index 281140bea1..ebdcbf876a 100644 --- a/source/renderer/app/themes/daedalus/dark-blue.js +++ b/source/renderer/app/themes/daedalus/dark-blue.js @@ -854,7 +854,7 @@ export const DARK_BLUE_THEME_OUTPUT = { '--theme-transactions-state-ok-background-color': '#274c2d', '--theme-transactions-state-pending-background-color': 'rgba(233, 244, 254, 0.3)', - '--theme-transactions-state-text-color': '#fafbfc', + '--theme-transactions-state-text-color': '#e9f4fe', '--theme-transactions-search-background-color': '#fafbfc', '--theme-transactions-icon-type-expend-background-color': '#4f5f7a', '--theme-transactions-icon-type-income-background-color': '#3b6956', diff --git a/source/renderer/app/themes/daedalus/flight-candidate.js b/source/renderer/app/themes/daedalus/flight-candidate.js index 9a4d3a00dd..6f18af8cef 100644 --- a/source/renderer/app/themes/daedalus/flight-candidate.js +++ b/source/renderer/app/themes/daedalus/flight-candidate.js @@ -833,7 +833,7 @@ export const FLIGHT_CANDIDATE_THEME_OUTPUT = { '--theme-transactions-state-ok-background-color': '#2cbb69', '--theme-transactions-state-pending-background-color': 'rgba(255, 255, 255, 0.5)', - '--theme-transactions-state-text-color': '#fafbfc', + '--theme-transactions-state-text-color': '#121326', '--theme-transactions-search-background-color': '#121326', '--theme-transactions-icon-type-expend-background-color': '#709cf0', '--theme-transactions-icon-type-income-background-color': '#2cbb69', diff --git a/source/renderer/app/themes/daedalus/index.js b/source/renderer/app/themes/daedalus/index.js index 270ef67da1..20a8112ed2 100644 --- a/source/renderer/app/themes/daedalus/index.js +++ b/source/renderer/app/themes/daedalus/index.js @@ -5,6 +5,7 @@ import { DARK_CARDANO_THEME_OUTPUT } from './dark-cardano'; import { FLIGHT_CANDIDATE_THEME_OUTPUT } from './flight-candidate'; import { INCENTIVIZED_TESTNET_THEME_OUTPUT } from './incentivized-testnet'; import { LIGHT_BLUE_THEME_OUTPUT } from './light-blue'; +import { SHELLEY_TESTNET_THEME_OUTPUT } from './shelley-testnet'; import { WHITE_THEME_OUTPUT } from './white'; import { YELLOW_THEME_OUTPUT } from './yellow'; @@ -15,6 +16,7 @@ export const EXISTING_THEME_OUTPUTS = [ ['flight-candidate.js', FLIGHT_CANDIDATE_THEME_OUTPUT], ['incentivized-testnet.js', INCENTIVIZED_TESTNET_THEME_OUTPUT], ['light-blue.js', LIGHT_BLUE_THEME_OUTPUT], + ['shelley-testnet.js', SHELLEY_TESTNET_THEME_OUTPUT], ['white.js', WHITE_THEME_OUTPUT], ['yellow.js', YELLOW_THEME_OUTPUT], ]; diff --git a/source/renderer/app/themes/daedalus/shelley-testnet.js b/source/renderer/app/themes/daedalus/shelley-testnet.js new file mode 100644 index 0000000000..f1e1549913 --- /dev/null +++ b/source/renderer/app/themes/daedalus/shelley-testnet.js @@ -0,0 +1,961 @@ +// @flow +import { createTheme } from '../utils/createTheme'; +import type { CreateThemeParams } from '../types'; + +// ==== shelley-testnet theme output for Daedalus and react-polymorph components === // +export const SHELLEY_TESTNET_THEME_OUTPUT = { + aboutWindow: { + '--theme-about-window-background-color': '#36374df5', + '--theme-about-window-header-bottom-border-color': '#ffffff4d', + '--theme-about-window-daedalus-icon-color': '#ffffff', + '--theme-about-window-cardano-icon-color': '#ffffff', + '--theme-about-window-title-varsion-color': '#ffffff', + '--theme-about-window-title-stroke-color': '#ffffff', + '--theme-about-window-content-color': '#ffffff', + '--theme-about-window-content-text-color': '#ffffff', + '--theme-about-window-content-bottom-border-color': '#ffffff4d', + '--theme-about-window-icon-close-button-color': '#fafbfc', + '--theme-about-window-icon-close-hover-background': 'rgba(0, 0, 0, 0.16)', + }, + backToTopButton: { + '--theme-back-to-top-button-background-color': '#3f404f', + '--theme-back-to-top-button-text-color': '#ffffff', + '--theme-back-to-top-button-box-shadow-color': 'rgba(0, 0, 0, 0.36)', + }, + automaticUpdate: { + '--theme-automatic-update-overlay-background-color': '#36374df5', + '--theme-automatic-update-overlay-button-background-color': '#313245', + '--theme-automatic-update-overlay-button-background-color-hover': '#ffffff', + '--theme-automatic-update-overlay-button-icon-color': '#ffffff', + '--theme-automatic-update-overlay-button-icon-color-hover': '#36374d', + '--theme-automatic-update-overlay-button-text-color-hover': '#36374d', + '--theme-automatic-update-overlay-button-border-color': '#ffffff', + '--theme-automatic-update-overlay-text-color': '#ffffffb3', + '--theme-automatic-update-overlay-text-highlight-color': '#ffffff', + '--theme-automatic-update-overlay-title-text-color': '#ffffff', + '--theme-automatic-update-overlay-button-label-color': '#ffffff', + '--theme-automatic-update-overlay-button-label-color-hover': '#000000', + '--theme-automatic-update-overlay-button-label-color-light': + 'rgba(255, 255, 255, 0.8)', + '--theme-automatic-update-overlay-close-button-color': '#fff', + '--theme-automatic-update-overlay-close-button-hover-background': + 'rgba(0, 0, 0, 0.1)', + }, + body: { + '--theme-main-body-background-color': '#121326', + '--theme-main-body-messages-color': '#ffffff', + }, + borderedBox: { + '--theme-bordered-box-background-color': '#1e1f31', + '--theme-bordered-box-border': '1px solid 1e1f31', + '--theme-bordered-box-text-color': '#ffffff', + }, + button: { + '--theme-button-spinner-color': '#121326', + '--theme-label-button-color': '#ffffff', + }, + buttonAttention: { + '--theme-button-attention-background-color': '#ea4c5b', + '--theme-button-attention-background-color-hover': '#ee707c', + '--theme-button-attention-background-color-active': '#a43540', + '--theme-button-attention-background-color-disabled': '#ea4c5b', + '--theme-button-attention-text-color': '#ffffff', + '--theme-button-attention-text-color-disabled': '#ffffff', + '--theme-button-attention-outline-color': '#f2949d', + }, + buttonDisclaimer: { + '--theme-button-disclaimer-background-color': '#ab1700', + '--theme-button-disclaimer-background-color-hover': '#fafbfc', + '--theme-button-disclaimer-background-color-active': '#fafbfc', + '--theme-button-disclaimer-background-color-disabled': + 'rgba(171, 23, 0, .3)', + '--theme-button-disclaimer-text-color-disabled': 'rgba(250, 251, 252, .3)', + '--theme-button-disclaimer-text-color': '#fafbfc', + '--theme-button-disclaimer-outline-color': 'rgba(250, 251, 252, .3)', + '--theme-button-disclaimer-border-color': '#fafbfc', + '--theme-button-disclaimer-border-color-disabled': + 'rgba(250, 251, 252, .3)', + }, + buttonFlat: { + '--theme-button-flat-background-color': 'rgba(255, 255, 255, 0.1)', + '--theme-button-flat-background-color-hover': 'rgba(255, 255, 255, 0.05)', + '--theme-button-flat-background-color-active': 'rgba(255, 255, 255, 0.12)', + '--theme-button-flat-background-color-disabled': 'rgba(255, 255, 255, 0.1)', + '--theme-button-flat-text-color-disabled': '#ffffff', + '--theme-button-flat-text-color': '#fff', + '--theme-button-flat-outline-color': 'rgba(94, 96, 102, 0.3)', + }, + buttonPrimary: { + '--theme-button-primary-background-color': '#898ee6', + '--theme-button-primary-background-color-hover': '#abaeed', + '--theme-button-primary-background-color-active': '#676ddf', + '--theme-button-primary-background-color-disabled': '#898ee6', + '--theme-button-primary-text-color-disabled': '#121326', + '--theme-button-primary-text-color': '#121326', + '--theme-button-primary-outline-color': 'rgba(255, 255, 255, 0.5)', + }, + connecting: { + '--theme-connecting-background-color': '#36374d', + '--theme-connecting-background-color1': 'rgba(54, 55, 77, 1)', + '--theme-connecting-background-color2': 'rgba(54, 55, 77, 0.91)', + '--theme-connecting-background-color3': 'rgba(54, 55, 77, 0.31)', + '--theme-connecting-background-color4': 'rgba(54, 55, 77, 0)', + '--theme-connecting-background-color5': 'rgba(54, 55, 77, 0)', + '--theme-connecting-background-color6': 'rgba(54, 55, 77, 0.31)', + '--theme-connecting-background-color7': 'rgba(54, 55, 77, 0.91)', + '--theme-connecting-background-color8': 'rgba(54, 55, 77, 1)', + '--theme-connecting-text-color': '#ffffff', + }, + dataMigration: { + '--theme-data-migration-layer-background-color': '#36374d', + '--theme-data-migration-layer-box-shadow-color': '#36374d', + '--theme-data-migration-layer-button-background-color': '#36374d', + '--theme-data-migration-layer-button-background-color-hover': '#ffffff', + '--theme-data-migration-layer-text-color': '#ffffff', + '--theme-data-migration-layer-text-color-hover': '#36374d', + '--theme-data-migration-layer-text-opacity-color': '#000000', + '--theme-data-migration-button-border-color': '#ffffff', + '--theme-data-migration-button-label-color': '#ffffff', + }, + delegationSetupWizard: { + '--theme-delegation-steps-activation-steps-indicator-color': '#ffffff', + '--theme-delegation-steps-success-description-color': '#ffffff', + '--theme-delegation-steps-success-tada-color': 'rgba(255, 255, 255, 1)', + '--theme-delegation-steps-choose-stake-pool-checkmark-icon-color': + 'rgba(255, 255, 255, 0.2)', + '--theme-delegation-steps-choose-stake-pool-delegated-pools-label-color': + '#ffffff', + '--theme-delegation-steps-choose-stake-pool-ticker-color': + 'rgba(255, 255, 255, 0.2)', + '--theme-delegation-steps-choose-stake-pool-select-box-placeholder-color': + 'rgba(255, 255, 255, 0.2)', + '--theme-delegation-steps-choose-stake-pool-selected-checkmark-icon-color': + '#ffffff', + '--theme-delegation-steps-choose-stake-pool-selected-ticker-color': + '#ffffff', + '--theme-delegation-steps-choose-stake-pool-thumb-background-color': + 'rgba(42, 43, 60, 1)', + '--theme-delegation-steps-choose-stake-pool-thumb-border-color': + 'rgba(255, 255, 255, 0.2)', + '--theme-delegation-steps-choose-stake-pool-title-color': '#ffffff', + '--theme-delegation-steps-choose-stake-pool-tooltip-arrow-color': + '#ffffffe6', + '--theme-delegation-steps-choose-stake-pool-tooltip-background-color': + '#ffffffe6', + '--theme-delegation-steps-choose-stake-pool-tooltip-box-shadow': + '0 5px 20px 0 rgba(0, 0, 0, 0.25)', + '--theme-delegation-steps-choose-stake-pool-tooltip-description-color': + '#ffffff', + '--theme-delegation-steps-choose-stake-pool-tooltip-ticker-color': + '#ffffff99', + '--theme-delegation-steps-choose-stake-pool-tooltip-table-label-color': + '#ffffff', + '--theme-delegation-steps-choose-stake-pool-tooltip-table-value-color': + '#ffffff', + '--theme-delegation-steps-choose-stake-pool-tooltip-title-color': '#ffffff', + '--theme-delegation-steps-choose-stake-pool-tooltip-url-color': '#85b6f9', + '--theme-delegation-steps-choose-wallet-custom-value-color': '#ffffff', + '--theme-delegation-steps-choose-wallet-description-color': '#ffffffcc', + '--theme-delegation-steps-choose-wallet-description-highlighted-color': + '#ffffff', + '--theme-delegation-steps-choose-wallet-error-message-color': '#ea4c5b', + '--theme-delegation-steps-choose-wallet-error-message-light-color': + '#ea4c5bb3', + '--theme-delegation-steps-choose-wallet-error-select-options-color': + '#ffffff', + '--theme-delegation-steps-choose-wallet-steps-indicator-color': '#ffffff', + '--theme-delegation-steps-confirmation-steps-indicator-color': '#ffffff', + '--theme-delegation-steps-confirmation-description-color': '#ffffffcc', + '--theme-delegation-steps-confirmation-fees-label-color': '#ffffff', + '--theme-delegation-steps-confirmation-fees-amount-color': '#ea4c5b', + '--theme-delegation-steps-intro-content-text-color': '#ffffffcc', + '--theme-delegation-steps-intro-divider-border-color': + 'rgba(255, 255, 255, 0.2)', + '--theme-delegation-steps-intro-link-color': '#36374d', + '--theme-delegation-steps-intro-list-label-color': '#ffffff', + '--theme-delegation-steps-intro-list-numbers-color': '#ffffff', + '--theme-delegation-steps-intro-list-optional-label-color': '#ffffff80', + '--theme-delegation-steps-not-available-description-text-color': + '#ffffffcc', + '--theme-delegation-steps-not-available-description-highlight-text-color': + '#ffffff', + '--theme-delegation-steps-not-available-icon-color': '#ffffff', + '--theme-delegation-steps-not-available-subtitle-text-color': '#ffffff', + }, + dialog: { + '--theme-dialog-choice-tabs-text-color': '#ffffff', + '--theme-dialog-choice-tabs-text-color-active': '#ffffff', + '--theme-dialog-choice-tabs-bottom-border-color-active': + 'rgba(255, 255, 255, 0.4)', + '--theme-dialog-big-button-background-color': 'rgba(255, 255, 255, 0.05)', + '--theme-dialog-big-button-border-color': 'none', + '--theme-dialog-big-button-label-color': 'rgba(255, 255, 255, 1)', + '--theme-dialog-big-button-description-color': 'rgba(255, 255, 255, 0.6)', + '--theme-dialog-set-wallet-password-background-color': + 'rgba(42, 43, 60, 0.96)', + '--theme-dialog-set-wallet-password-box-shadow': 'rgba(0, 0, 0, 0.25)', + '--theme-dialog-set-wallet-password-message-color': '#fff', + '--theme-dialog-set-wallet-password-title-color': '#fafbfc', + '--theme-dialog-set-wallet-password-button-background-color': + 'rgba(0, 0, 0, 0.1)', + '--theme-dialog-set-wallet-password-button-background-color-hover': '#fff', + '--theme-dialog-set-wallet-password-button-border-color': '#fafbfc', + '--theme-dialog-set-wallet-password-button-color': '#fff', + '--theme-dialog-set-wallet-password-button-color-hover': '#2a2b3c', + '--theme-dialog-title-color': '#ffffff', + '--theme-dialog-text-color': '#ffffff', + '--theme-dialog-border-color': 'rgba(255, 255, 255, 0.2)', + }, + errors: { + '--theme-color-error': '#ea4c5b', + }, + experimentalDataOverlay: { + '--theme-experimental-data-overlay-background-color': '#36374df5', + '--theme-experimental-data-overlay-button-background-color': + 'rgba(0, 0, 0, 0.1)', + '--theme-experimental-data-overlay-button-background-color-hover': '#fff', + '--theme-experimental-data-overlay-button-border-color': '#fff', + '--theme-experimental-data-overlay-button-text-color': '#fff', + '--theme-experimental-data-overlay-button-text-color-hover': '#2a2b3c', + '--theme-experimental-data-overlay-description-background-color': + 'rgba(0, 0, 0, 0.1)', + '--theme-experimental-data-overlay-description-color': + 'rgba(255, 255, 255, 0.7)', + '--theme-experimental-data-overlay-logo-fill-color': '#fff', + '--theme-experimental-data-overlay-title-color': '#fff', + }, + fonts: { + '--font-ultralight': 'NotoSans-ExtraLight, NotoSansCJKjp-Thin', + '--font-thin': 'NotoSans-Thin, NotoSansCJKjp-Thin', + '--font-light': 'NotoSans-Light, NotoSansCJKjp-Light', + '--font-regular': 'NotoSans-Regular, NotoSansCJKjp-Regular', + '--font-medium': 'NotoSans-Medium, NotoSansCJKjp-Medium', + '--font-semibold': 'NotoSans-SemiBold, NotoSansCJKjp-Medium', + '--font-bold': 'NotoSans-Bold, NotoSansCJKjp-Bold', + '--font-heavy': 'NotoSans-ExtraBold, NotoSansCJKjp-Black', + '--font-black': 'NotoSans-Black, NotoSansCJKjp-Black', + '--font-mono': 'SFMono-Light', + }, + hardwareWallet: { + '--theme-hardware-wallet-step-background-color': '#1e1f31', + '--theme-hardware-wallet-step-border-active-color': + 'rgba(255, 255, 255, 0.5)', + '--theme-hardware-wallet-step-border-color': '#1e1f31', + '--theme-hardware-wallet-step-color': '#ffffff', + '--theme-hardware-wallet-title-color': '#ffffff', + '--theme-hardware-wallet-message-color': '#ffffff', + }, + icon: { + '--theme-icon-nav-color': 'rgba(255, 255, 255, 0.6)', + '--theme-icon-nav-color-active': 'rgba(255, 255, 255, 1)', + '--theme-icon-sidebar-color': '#ffffff', + '--theme-icon-toggle-menu-color': '#ffffff', + '--theme-icon-node-update-notification-arrow-color': '#ffffff', + '--theme-icon-add-wallet-from-sidebar-color': '#ffffff', + '--theme-icon-ada-summary-wallet-amount-symbol-color': '#ffffff', + '--theme-icon-add-wallet-dialog-big-button-color': '#ffffff', + '--theme-icon-back-button-color': '#ffffff', + '--theme-icon-close-button-color': '#ffffff', + '--theme-icon-connecting-ada-api-logo-color': '#ffffff', + '--theme-icon-connecting-ada-logo-color': '#ffffff', + '--theme-icon-connecting-daedalus-logo-color': '#ffffff', + '--theme-icon-copy-address-color': '#ffffff', + '--theme-icon-delegation-center-no-wallets': '#ffffff', + '--theme-icon-file-upload-color': '#ffffff', + '--theme-icon-syncing-ada-api-logo-color': '#ffffff', + '--theme-icon-syncing-ada-logo-color': '#ffffff', + '--theme-icon-syncing-daedalus-logo-color': '#ffffff', + '--theme-icon-transactions-ada-symbol-color': '#ffffff', + '--theme-icon-transaction-type-color': '#fafbfc', + }, + input: { + '--theme-input-background-color': '#1e1f31', + '--theme-input-border-color': 'rgba(255, 255, 255, 0.3)', + '--theme-input-focus-border-color': 'rgba(255, 255, 255, 0.7)', + '--theme-input-hint-font': 'NotoSans-Regular, NotoSansCJKjp-Regular', + '--theme-input-label-color': '#ffffff', + '--theme-input-placeholder-color': 'rgba(255, 255, 255, 0.5)', + '--theme-input-remove-color-light': '#ea4c5b', + '--theme-input-right-floating-text-color': 'rgba(255, 255, 255, 0.5)', + '--theme-input-right-floating-text-success-color': 'rgba(255, 255, 255, 1)', + '--theme-input-text-color': '#ffffff', + }, + link: { + '--theme-link-main-color': '#898ee6', + }, + loading: { + '--theme-loading-background-color': '#121326', + '--theme-loading-no-disk-space-background-color': 'rgba(171, 23, 0, 0.94)', + '--theme-loading-no-disk-space-text-color': '#ffffff', + '--theme-loading-no-disk-space-attention-icon-color': '#ffffff', + '--theme-loading-status-icons-on-color': '#2dc06c', + '--theme-loading-status-icons-off-color': '#ea4c5b', + '--theme-loading-status-icons-unloaded-loading-color': '#ffffff', + '--theme-loading-status-icons-unloaded-syncing-color': '#ffffff', + '--theme-loading-status-icons-tooltip-color': '#56576b', + '--theme-loading-spinner-color': '#ffffff', + '--theme-loading-spinner-medium-color': '#ffffff', + }, + manualUpdate: { + '--theme-manual-update-overlay-background-color': '#36374df5', + '--theme-manual-update-overlay-button-background-color': '#313245', + '--theme-manual-update-overlay-button-background-color-hover': '#ffffff', + '--theme-manual-update-overlay-button-icon-color': '#ffffff', + '--theme-manual-update-overlay-button-icon-color-hover': '#36374d', + '--theme-manual-update-overlay-button-text-color-hover': '#36374d', + '--theme-manual-update-overlay-button-border-color': '#ffffff', + '--theme-manual-update-overlay-text-color': '#ffffffb3', + '--theme-manual-update-overlay-text-highlight-color': '#ffffff', + '--theme-manual-update-overlay-title-text-color': '#ffffff', + '--theme-manual-update-overlay-button-label-color': '#ffffff', + '--theme-manual-update-overlay-button-label-color-hover': '#000000', + }, + mnemonic: { + '--theme-backup-mnemonic-background-color': '#414251', + '--theme-mnemonic-background-color': 'rgba(255, 255, 255, 0.07)', + }, + modal: { + '--theme-modal-overlay-background-color': 'rgba(0, 0, 0, 0.4)', + }, + navDropdown: { + '--theme-nav-dropdown-item-text-color': '#ffffff', + '--theme-nav-dropdown-item-background-color': '#3f404f', + '--theme-nav-dropdown-item-background-color-hover': + 'rgba(255, 255, 255, 0.07)', + '--theme-nav-dropdown-item-color-hover': '#ffffff', + }, + navItem: { + '--theme-nav-item-background-color': '#2a2b3c', + '--theme-nav-item-background-color-active': 'rgba(255, 255, 255, 0.1)', + '--theme-nav-item-background-color-hover': '#afafb833', + '--theme-nav-item-text-color': 'rgba(255, 255, 255, 0.6)', + '--theme-nav-item-text-color-active': '#ffffff', + }, + network: { + '--theme-network-window-background-color': '#36374df5', + '--theme-network-window-text-color': '#ffffff', + '--theme-network-window-icon-close-hover-background': 'rgba(0, 0, 0, 0.16)', + '--theme-network-window-red-color': '#f06e05', + '--theme-network-window-green-color': '#05f079', + '--theme-network-window-white-color': '#ffffff', + '--theme-network-window-transparent-color': 'transparent', + '--theme-network-window-border-color': '#ffffffb3', + '--theme-network-window-button-text-color': '#ffffff', + '--theme-network-window-button-background-color': '#afafb866', + '--theme-network-window-button-background-color-hover': '#afafb899', + '--theme-network-window-button-background-color-active': '#afafb8cc', + }, + newsFeed: { + '--theme-news-feed-background-color': '#2a2b3c', + '--theme-news-feed-badge-background-color': '#ea4c5b', + '--theme-news-feed-badge-text-color': '#ffffff', + '--theme-news-feed-box-shadow-color': '-5px 0 20px 0 rgba(0, 0, 0, 0.25)', + '--theme-news-feed-header-background-color': '#20212e', + '--theme-news-feed-header-title-color': '#fafbfc', + '--theme-news-feed-icon-close-button-color': '#ffffff', + '--theme-news-feed-icon-close-hover-background-color': 'rgba(0, 0, 0, 0.1)', + '--theme-news-feed-icon-color': '#ffffff', + '--theme-news-feed-icon-color-connecting-screen': '#ffffff', + '--theme-news-feed-icon-color-syncing-screen': '#ffffff', + '--theme-news-feed-icon-dot-background-color': '#ea4c5b', + '--theme-news-feed-icon-toggle-hover-background-color': + 'rgba(0, 0, 0, 0.1)', + '--theme-news-feed-no-fetch-color': '#fafbfc', + }, + newsItem: { + '--theme-news-item-action-button-background-color': 'rgba(0, 0, 0, 0.1)', + '--theme-news-item-action-button-background-color-hover': '#ffffff', + '--theme-news-item-action-button-border-color': '#ffffff', + '--theme-news-item-action-button-color': '#ffffff', + '--theme-news-item-action-button-color-hover': '#2a2b3c', + '--theme-news-item-alert-background-color': 'rgba(242, 162, 24, 0.5)', + '--theme-news-item-announcement-background-color': + 'rgba(137, 142, 230, 0.2)', + '--theme-news-item-badge-color': '#ea4c5b', + '--theme-news-item-content-link-color': '#ffffff', + '--theme-news-item-info-background-color': 'rgba(0, 0, 0, 0.1)', + '--theme-news-item-title-color': '#ffffff', + }, + appUpdate: { + '--theme-node-update-background-color': '#121326', + '--theme-node-update-title-color': '#ffffff', + '--theme-node-update-message-color': '#ffffff', + '--theme-node-sync-info-message-background-color': '#56576b', + '--theme-node-sync-info-message-text-color': '#ffffff', + '--theme-node-sync-icon-color': '#fff', + '--theme-node-update-accept-button-background-color': '#36374d', + '--theme-node-update-accept-button-background-color-hover': '#5e5f71', + '--theme-node-update-accept-button-background-color-active': '#262736', + '--theme-node-update-deny-button-background-color': 'rgba(54, 55, 77, 0.3)', + '--theme-node-update-deny-button-background-color-hover': + 'rgba(94, 95, 113, 0.3)', + '--theme-node-update-deny-button-background-color-active': + 'rgba(38, 39, 54, 0.3)', + '--theme-node-update-deny-button-text-color': '#ffffff', + '--theme-node-update-button-text-color': '#ffffff', + }, + notification: { + '--theme-notification-message-background-color': '#36374df2', + '--theme-notification-message-text-color': '#ffffff', + '--theme-legacy-badge-background-color': '#ab1700', + '--theme-legacy-notification-background-color': '#ab2712', + '--theme-legacy-notification-learn-more-button-text-color': '#ffffff', + '--theme-legacy-notification-learn-more-button-background-color': + '#12132633', + '--theme-legacy-notification-learn-more-button-background-color-hover': + '#1213264d', + '--theme-legacy-notification-learn-more-button-background-color-active': + '#12132666', + '--theme-legacy-notification-move-button-text-color': '#ab1700', + '--theme-legacy-notification-move-button-background-color': '#fafbfc', + '--theme-legacy-notification-move-button-background-color-hover': + 'rgba(250, 251, 252, 0.9)', + '--theme-legacy-notification-move-button-background-color-active': + 'rgb(250, 251, 252, 0.8)', + '--theme-legacy-notification-title-color': '#ffffff', + '--theme-legacy-notification-description-color': '#ffffff', + '--theme-notification-message-checkmark-icon-color': '#fafbfc', + '--theme-notification-message-close-icon-color': '#fafbfc', + }, + paperWallet: { + '--theme-paper-wallet-create-certificate-dialog-explorer-link-color': + '#898ee6', + '--theme-paper-wallet-create-certificate-dialog-explorer-link-background-color': + 'rgba(255, 255, 255, 0.07)', + }, + progressBar: { + '--theme-progress-bar-background-color': 'rgba(255, 255, 255, 0.3)', + '--theme-progress-bar-foreground-color': 'rgba(255, 255, 255, 0.7)', + }, + receiveQRCode: { + '--theme-receive-qr-code-background-color': '#fff', + '--theme-receive-qr-code-foreground-color': '#000', + }, + reportIssue: { + '--theme-report-issue-button-background-color': '#898ee6', + '--theme-report-issue-button-background-color-hover': '#ffc64d', + '--theme-report-issue-button-background-color-active': '#e6a009', + '--theme-report-issue-connecting-background-color': + 'rgba(255, 255, 255, 0.05)', + '--theme-report-issue-connecting-text-color': '#ffffff', + '--theme-report-issue-icon-color': '#121326', + }, + rpAutocomplete: { + '--rp-autocomplete-bg-color': '#1e1f31', + '--rp-autocomplete-border': '1px solid rgba(255, 255, 255, 0.3)', + '--rp-autocomplete-border-color-opened': 'rgba(255, 255, 255, 0.7)', + '--rp-autocomplete-input-text-color': 'rgba(255, 255, 255, 0.7)', + '--rp-autocomplete-placeholder-color': 'rgba(255, 255, 255, 0.5)', + '--rp-autocomplete-selected-word-box-bg-color': '#898ee6', + '--rp-autocomplete-selected-word-text-color': '#121326', + '--rp-autocomplete-selected-words-font-family': + 'NotoSans-Regular, NotoSansCJKjp-Regular', + }, + rpBubble: { + '--rp-bubble-bg-color': '#1e1f31', + '--rp-bubble-border-color': 'rgba(255, 255, 255, 0.7)', + '--rp-bubble-border-radius': '2px', + '--rp-bubble-arrow-bg-color': '#343646', + '--rp-bubble-box-shadow': + '0 4px 16px 0 rgba(0, 0, 0, 0.4), 0 0 8px 0 rgba(0, 0, 0, 0.2)', + }, + rpButton: { + '--rp-button-bg-color': '#898ee6', + '--rp-button-bg-color-active': '#676ddf', + '--rp-button-bg-color-disabled': 'rgba(137, 142, 230, 0.3)', + '--rp-button-bg-color-hover': '#abaeed', + '--rp-button-font-family': 'NotoSans-Medium, NotoSansCJKjp-Medium', + '--rp-button-font-size': '14px', + '--rp-button-height': '50px', + '--rp-button-line-height': '20px', + '--rp-button-padding': '0', + '--rp-button-text-color': 'rgba(18, 19, 38, 1)', + '--rp-button-text-color-disabled': 'rgba(18, 19, 38, 0.5)', + '--rp-button-text-transform': 'none', + '--rp-button-width': '360px', + }, + rpCheckbox: { + '--rp-checkbox-border': '2px solid #898ee6', + '--rp-checkbox-border-color': 'rgba(255, 255, 255, 0.2)', + '--rp-checkbox-border-color-disabled': '#898ee666', + '--rp-checkbox-check-bg-color': '#898ee6', + '--rp-checkbox-check-icon-color': '#121326', + '--rp-checkbox-label-text-color': '#ffffff', + '--rp-checkbox-label-text-color-disabled': '#ffffff4d', + '--rp-checkbox-size': '22px', + }, + rpColors: { + '--rp-theme-color-error': '#ea4c5b', + }, + rpFonts: { + '--rp-theme-font-thin': 'NotoSans-Thin, NotoSansCJKjp-Thin', + '--rp-theme-font-light': 'NotoSans-Light, NotoSansCJKjp-Light', + '--rp-theme-font-medium': 'NotoSans-Medium, NotoSansCJKjp-Medium', + '--rp-theme-font-regular': 'NotoSans-Regular, NotoSansCJKjp-Regular', + '--rp-theme-font-bold': 'NotoSans-Bold, NotoSansCJKjp-Bold', + }, + rpFormfield: { + '--rp-formfield-bg-color-disabled': 'none', + '--rp-formfield-label-text-color': '#ffffff', + '--rp-formfield-label-text-color-disabled': '#ffffff', + '--rp-formfield-error-text-color': '#ea4c5b', + '--rp-formfield-error-text-opacity': '0.75', + }, + rpInput: { + '--rp-input-bg-color': '#1e1f31', + '--rp-input-bg-color-disabled': 'rgba(255, 255, 255, 0.05)', + '--rp-input-border-color': 'rgba(255, 255, 255, 0.3)', + '--rp-input-border-color-disabled': 'transparent', + '--rp-input-border-color-errored': '#ea4c5b', + '--rp-input-border-color-focus': 'rgba(255, 255, 255, 0.7)', + '--rp-input-line-height': '22px', + '--rp-input-padding': '12px 20px', + '--rp-input-placeholder-color': 'rgba(255, 255, 255, 0.5)', + '--rp-input-placeholder-color-disabled': 'rgba(255, 255, 255, 0.5)', + '--rp-input-text-color': '#ffffff', + '--rp-input-text-color-disabled': 'rgba(255, 255, 255, 0.5)', + }, + rpLink: { + '--rp-link-color': '#898ee6', + }, + rpModal: { + '--rp-modal-bg-color': '#1e1f31', + '--rp-modal-max-height': '90%', + '--rp-modal-overlay-bg-color': 'rgba(0, 0, 0, 0.4)', + }, + rpOptions: { + '--rp-option-bg-color': '#1e1f31', + '--rp-option-bg-color-highlighted': 'rgba(255, 255, 255, 0.07)', + '--rp-option-border-color': 'rgba(255, 255, 255, 0.7)', + '--rp-option-checkmark-color': 'rgba(255, 255, 255, 0.7)', + '--rp-option-line-height': '22px', + '--rp-option-text-color': '#ffffff', + '--rp-options-border-color': 'rgba(255, 255, 255, 0.7)', + '--rp-options-shadow': 'none', + }, + rpRadio: { + '--rp-radio-border': '2px solid #898ee6', + '--rp-radio-border-color': '#898ee6', + '--rp-radio-color': '#121326', + '--rp-radio-label-margin': '0 0 0 10px', + '--rp-radio-label-text-color': '#ffffff', + '--rp-radio-size': '22px', + }, + rpScrollBar: { + '--rp-scrollbar-thumb-bg-color:': 'rgba(255, 255, 255, 0.3)', + '--rp-scrollbar-thumb-bg-color-active': 'rgba(255, 255, 255, 0.5)', + '--rp-scrollbar-thumb-bg-color-hover': 'rgba(255, 255, 255, 0.5)', + }, + rpSelect: { + '--rp-select-arrow-bg-color': 'rgba(255, 255, 255, 0.3)', + '--rp-select-arrow-bg-color-open': 'rgba(255, 255, 255, 0.7)', + '--rp-select-input-bg-color': 'transparent', + '--rp-select-input-border-color': 'rgba(255, 255, 255, 0.3)', + '--rp-select-input-border-color-focus': 'rgba(255, 255, 255, 0.7)', + '--rp-select-input-text-color': '#ffffff', + '--rp-select-input-placeholder-color': 'rgba(255, 255, 255, 0.5)', + }, + rpStepper: { + '--rp-stepper-bullet-background-color-disabled': '#1e1f31', + '--rp-stepper-bullet-border-color': 'rgba(255, 255, 255, 0.1)', + '--rpstepper-bullet-height': '12px', + '--rpstepper-bullet-width': '12px', + '--rp-stepper-label-color': 'rgba(255, 255, 255, 1)', + '--rp-stepper-label-color-light': 'rgba(255, 255, 255, 0.3)', + '--rp-stepper-main-color': '#898ee6', + '--rp-stepper-main-color-light': '#898ee61a', + '--rpstepper-stepper-step-label-bottom-margin': '6px', + '--rpstepper-steps-bar-color-disabled': 'rgba(255, 255, 255, 0.1)', + '--rpstepper-steps-bar-top-position': '6px', + }, + rpSwitch: { + '--rp-switch-bg-color-off': 'rgba(137, 142, 230, 0.3)', + '--rp-switch-bg-color-on': '#898ee6', + '--rp-switch-label-margin': '0 30px 0 0', + '--rp-switch-label-opacity': '1', + '--rp-switch-label-text-color': '#ffffff', + '--rp-switch-label-width': '100%', + '--rp-switch-normal-border-radius': '2px', + '--rp-switch-opacity-off': '1', + '--rp-switch-root-margin': '0 0 30px 0', + '--rp-switch-tiny-border-radius': '1px', + '--rp-switch-thumb-bg-color': '#ffffff', + '--rp-switch-size': '22px', + }, + rpTextArea: { + '--rp-textarea-bg-color': '#121326', + '--rp-textarea-bg-color-disabled': 'rgba(255, 255, 255, 0.05)', + '--rp-textarea-border': '1px solid rgba(255, 255, 255, 0.3)', + '--rp-textarea-border-color-disabled': 'rgba(255, 255, 255, 0.05)', + '--rp-textarea-border-color-errored': '#ea4c5b', + '--rp-textarea-border-color-focus': 'rgba(255, 255, 255, 0.7)', + '--rp-textarea-border-radius': '2px', + '--rp-textarea-line-height': '20px', + '--rp-textarea-placeholder-color': 'rgba(255, 255, 255, 0.5)', + '--rp-textarea-resize': 'none', + '--rp-textarea-text-color': '#ffffff', + }, + rpTooltip: { + '--rp-tooltip-bg-color': '#56576b', + '--rp-tooltip-text-color': '#ffffff', + }, + scrollbar: { + '--theme-scrollbar-thumb-background': 'rgba(255, 255, 255, 0.3)', + }, + sendConfirmation: { + '--theme-send-confirmation-dialog-send-values-color': '#ea4c5b', + }, + settings: { + '--theme-settings-body-background-color': '#121326', + '--theme-settings-delete-button-legacy-background-color': '#414251', + '--theme-settings-delete-button-legacy-background-color-hover': '#414251', + '--theme-settings-pane-background-color': '#1e1f31', + '--theme-settings-pane-border': 'none', + '--theme-settings-menu-box-background-color': '#1e1f31', + '--theme-settings-menu-box-border': 'none', + '--theme-settings-menu-item-text-color': '#ffffff', + '--theme-settings-menu-item-text-color-active': '#ffffff', + '--theme-settings-menu-item-text-color-disabled': '#ffffff80', + '--theme-settings-menu-item-background-color-active': + 'rgba(255, 255, 255, 0.07)', + '--theme-settings-menu-item-left-border-color-active': '#898ee6', + '--theme-settings-theme-select-title-color': '#ffffff', + '--theme-settings-theme-select-border-color': 'rgba(255, 255, 255, 0.2)', + }, + sidebar: { + '--theme-sidebar-background-color': '#36374d', + '--theme-sidebar-category-background-color-hover': '#313245', + '--theme-sidebar-category-background-color-active': '#2b2c3e', + '--theme-sidebar-category-text-color': '#ffffff', + '--theme-sidebar-layout-shadow-color': 'rgba(0, 0, 0, 0.25)', + '--theme-sidebar-layout-topbar-shadow-color': 'rgba(0, 0, 0, 0.12)', + '--theme-sidebar-menu-background-color': '#2b2c3e', + '--theme-sidebar-menu-item-background-color-hover': 'rgba(32, 33, 46, 0.5)', + '--theme-sidebar-menu-item-background-color-active': '#20212e', + '--theme-sidebar-menu-item-wallet-name-color': '#ffffff', + '--theme-sidebar-menu-item-wallet-info-color': '#ffffff', + '--theme-sidebar-menu-add-button-background-color': '#20212e', + '--theme-sidebar-menu-add-button-background-color-active': '#20212ea8', + '--theme-sidebar-menu-add-button-background-color-hover': '#20212ea8', + '--theme-sidebar-menu-add-button-text-color': '#ffffff', + '--theme-sidebar-wallets-scrollbar-background-color': + 'rgba(255, 255, 255, 0.3)', + '--theme-sidebar-wallets-scrollbar-background-color-active': + 'rgba(255, 255, 255, 0.5)', + '--theme-sidebar-wallets-scrollbar-background-color-hover': + 'rgba(255, 255, 255, 0.5)', + '--theme-sidebar-category-networkInfo-background-color': '#898ee6', + '--theme-sidebar-category-networkInfo-text-color': '#121326', + }, + splash: { + '--theme-splash-network-background-color': 'rgba(42, 43, 60, 0.96)', + '--theme-splash-network-background-color1': 'rgba(18, 19, 38, 1)', + '--theme-splash-network-background-color2': 'rgba(18, 19, 38, 0.91)', + '--theme-splash-network-background-color3': 'rgba(18, 19, 38, 0.31)', + '--theme-splash-network-background-color4': 'rgba(18, 19, 38, 0)', + '--theme-splash-network-background-color5': 'rgba(18, 19, 38, 0)', + '--theme-splash-network-background-color6': 'rgba(18, 19, 38, 0.31)', + '--theme-splash-network-background-color7': 'rgba(18, 19, 38, 0.91)', + '--theme-splash-network-background-color8': 'rgba(18, 19, 38, 1)', + '--theme-splash-network-logo-fill-color': '#fff', + '--theme-splash-network-overlay-button-background-color': + 'rgba(0, 0, 0, 0.1)', + '--theme-splash-network-overlay-button-background-color-hover': '#fff', + '--theme-splash-network-overlay-button-border-color': '#fff', + '--theme-splash-network-overlay-button-text-color': '#fff', + '--theme-splash-network-overlay-button-text-color-hover': '#2a2b3c', + '--theme-splash-network-title-color': '#fff', + '--theme-splash-network-scrollbar-thumb-background': + 'rgba(255, 255, 255, 0.3)', + '--theme-splash-network-scrollbar-thumb-background-hover': + 'rgba(255, 255, 255, 0.5)', + '--theme-splash-network-subTitle1-color': '#898ee6', + '--theme-splash-network-subTitle2-color': '#898ee6', + '--theme-splash-network-description-background-color': 'rgba(0, 0, 0, 0.1)', + '--theme-splash-network-description-color': 'rgba(250, 251, 252, 0.7)', + '--theme-splash-network-description-bold-color': '#fff', + '--theme-splash-network-learn-more-color': '#fff', + }, + stakePools: { + '--theme-staking-stake-pools-title-color': '#ffffff', + '--theme-staking-stake-pools-search-button-color': '#ffffff', + '--theme-staking-stake-pool-background-color': 'rgba(42, 43, 60, 1)', + '--theme-staking-stake-pool-border-color': 'rgba(42, 43, 60, 1)', + '--theme-staking-stake-pool-glow-color': '#898ee64c', + '--theme-staking-stake-pools-search-icon-color': '#ffffff', + '--theme-staking-stake-pool-saturation-background-color': + 'rgba(255, 255, 255, 0.2)', + '--theme-staking-stake-pool-saturation-green-color': '#1ccc5d', + '--theme-staking-stake-pool-saturation-orange-color': '#ff8800', + '--theme-staking-stake-pool-saturation-red-color': '#ea4c5b', + '--theme-staking-stake-pool-saturation-yellow-color': '#ffcc00', + '--theme-staking-stake-pool-selected-background-color': '#5da377', + '--theme-staking-stake-pool-selected-checkmark-icon-color': '#ffffff', + '--theme-staking-stake-pool-selected-ticker-color': '#ffffff', + '--theme-staking-stake-pool-ticker-color': '#ffffff', + '--theme-staking-stake-pool-retirement-background-color': '#ea4c5b', + '--theme-staking-stake-pool-tooltip-background-color': + 'rgba(42, 43, 60, 0.98)', + '--theme-staking-stake-pool-tooltip-border-color': + 'rgba(255, 255, 255, 0.2)', + '--theme-staking-stake-pool-tooltip-shadow-color': 'rgba(0, 0, 0, 0.25)', + '--theme-staking-stake-pool-tooltip-text-color': '#ffffff', + '--theme-staking-stake-pool-tooltip-link-color': '#898ee6', + '--theme-staking-stake-pool-tooltip-table-title-color': '#ffffff', + '--theme-staking-stake-pool-tooltip-table-param-color': '#ffffff', + '--theme-staking-stake-pool-tooltip-retirement-text-color': '#fafbfc', + '--theme-staking-stake-pool-tooltip-retirement-background-color': '#ea4c5b', + '--theme-staking-stake-pool-tooltip-delegate-button-background-color': + '#898ee6', + '--theme-staking-stake-pool-tooltip-delegate-button-hover-background-color': + '#ffc64d', + '--theme-staking-stake-pool-tooltip-delegate-button-active-background-color': + '#ffc64d', + '--theme-staking-stake-pool-tooltip-delegate-button-text-color': + 'rgba(18, 19, 38, 1)', + '--theme-staking-stake-pool-tooltip-delegate-button-inverse-text-color': + 'rgba(18, 19, 38, 1)', + '--theme-staking-stake-pool-tooltip-delegate-button-border-color': + 'transparent', + '--theme-staking-progress-label-light': 'rgba(18, 19, 38, 1)', + '--theme-staking-stake-pools-search-clear-button-background-color': + 'rgba(255, 255, 255, 0.1)', + '--theme-staking-stake-pools-search-clear-button-color': '#ffffff', + '--theme-staking-stake-pools-search-clear-button-hover-background-color': + 'rgba(255, 255, 255, 0.05)', + '--theme-staking-stake-pool-tooltip-experimental-icon-background-color': + 'rgba(42, 43, 60, 0.98)', + '--theme-staking-stake-pool-tooltip-experimental-icon-lines-color': + 'rgba(255, 255, 255, 0.8)', + '--theme-staking-stake-pool-tooltip-neutral-background-color': + 'rgba(255, 255, 255, .1)', + '--theme-staking-stake-pool-tooltip-neutral-text-color': '#ffffff', + '--theme-staking-stake-pool-tooltip-experimental-icon-color': '#ffffff', + }, + staking: { + '--theme-staking-content-background-color': '#1e1f31', + '--theme-staking-content-border-color': '#1e1f31', + '--theme-staking-font-color-accent': '#ffffff', + '--theme-staking-font-color-regular': '#ffffff', + '--theme-staking-font-color-light': '#ffffffb3', + '--theme-staking-font-color-lighter': 'rgba(255, 255, 255, 0.5)', + '--theme-staking-table-head-background-color': 'rgba(255, 255, 255, 0.07)', + '--theme-staking-table-border-color': 'rgba(255, 255, 255, 0.2)', + '--theme-staking-link-color': '#898ee6', + '--theme-staking-link-color-light': 'rgba(137, 142, 230, 0.7)', + '--theme-staking-progress-bar-background-color': + 'rgba(255, 255, 255, 0.07)', + '--theme-staking-progress-stripe-dark-1-background-color': '#898ee6', + '--theme-staking-progress-stripe-dark-2-background-color': '#0da2a4', + '--theme-staking-table-body-highlighted-text-color': '#313245', + '--theme-staking-info-learn-more-button-text-color': 'rgba(18, 19, 38, 1)', + '--theme-staking-info-learn-more-icon-color': 'rgba(18, 19, 38, 1)', + '--theme-staking-learn-more-button-color': 'rgba(18, 19, 38, 1)', + '--theme-staking-learn-more-icon-color': 'rgba(18, 19, 38, 1)', + '--theme-staking-donut-ring-completed-color': 'rgba(234, 76, 91, 0.2)', + '--theme-staking-donut-ring-remaining-color': '#ea4c5b', + '--theme-staking-wallet-row-border-color': 'rgba(255, 255, 255, 0.2)', + '--theme-staking-dropdown-item-text-color-hover': '#ffffff', + '--theme-staking-dropdown-item-background-color': '#3f404f', + '--theme-staking-dropdown-item-background-color-hover': + 'rgba(255, 255, 255, 0.07)', + '--theme-staking-delegation-center-gear-icon-fill-color': '#ffffff80', + '--theme-staking-delegation-center-gear-icon-fill-color-active': '#ffffff', + '--theme-staking-delegation-center-no-wallets-instructions-color': + '#ffffff', + '--theme-staking-delegation-center-divider-border-color': + 'rgba(255, 255, 255, 0.2)', + '--theme-staking-delegation-center-fees-amount-color': '#ea4c5b', + '--theme-staking-countdown-widget-background-color': + 'rgba(255, 255, 255, 0.07)', + '--theme-staking-countdown-widget-delimeter-background-color': '#ffffff', + '--theme-staking-countdown-widget-field-label-color': + 'rgba(255, 255, 255, 0.7)', + '--theme-staking-countdown-widget-field-value-color': '#ffffff', + '--theme-staking-export-button-shadow-color': 'rgba(137, 142, 230, 0.18)', + '--theme-staking-export-button-color': 'rgba(18, 19, 38, 1)', + '--theme-staking-wallet-row-action-delegate-text-color': '#898ee6', + '--theme-staking-wallet-row-action-undelegate-text-color': '#ea4c5b', + '--theme-staking-wallet-row-ticker-background-color': + 'rgba(255, 255, 255, 0.07)', + '--theme-staking-wallet-row-ticker-text-color': '#ffffff', + '--theme-staking-wallet-row-ticker-ada-icon-fill-color': '#ffffff80', + }, + support: { + '--theme-support-settings-item-color': '#ffffff', + '--theme-support-settings-link-color': '#898ee6', + '--theme-support-settings-text-color': '#ffffff', + }, + syncing: { + '--theme-syncing-background-color': '#121326', + '--theme-syncing-background-color1': 'rgba(18, 19, 38, 1)', + '--theme-syncing-background-color2': 'rgba(18, 19, 38, 0.91)', + '--theme-syncing-background-color3': 'rgba(18, 19, 38, 0.31)', + '--theme-syncing-background-color4': 'rgba(18, 19, 38, 0)', + '--theme-syncing-background-color5': 'rgba(18, 19, 38, 0)', + '--theme-syncing-background-color6': 'rgba(18, 19, 38, 0.31)', + '--theme-syncing-background-color7': 'rgba(18, 19, 38, 0.91)', + '--theme-syncing-background-color8': 'rgba(18, 19, 38, 1)', + '--theme-syncing-text-color': '#ffffff', + }, + syncingConnecting: { + '--theme-syncing-connecting-title-color': '#fafbfc', + '--theme-syncing-connecting-subTitle1-color': '#f69ab2', + '--theme-syncing-connecting-subTitle2-color': '#fafbfc', + }, + systemError: { + '--theme-system-error-overlay-attention-icon-color': '#ffffff', + '--theme-system-error-overlay-background-color': 'rgba(171, 23, 0, 0.94)', + '--theme-system-error-overlay-support-link-icon-color': '#ffffff', + '--theme-system-error-overlay-text-color': '#ffffff', + }, + tabs: { + '--theme-choice-tabs-text-color': '#ffffff', + '--theme-choice-tabs-text-color-active': '#ffffff', + '--theme-choice-tabs-bottom-border-color-active': '#ffffff', + }, + testEnvironment: { + '--theme-test-environment-label-background-color': '#ab1700', + '--theme-test-environment-label-text-color': '#ffffff', + }, + topBar: { + '--theme-topbar-background-color': '#2a2b3c', + '--theme-topbar-layout-body-background-color': '#121326', + '--theme-topbar-wallet-name-color': '#ffffff', + '--theme-topbar-wallet-info-color': '#ffffff', + '--theme-topbar-logo-color': '#ffffff', + }, + transactions: { + '--theme-transactions-list-background-color': '#1e1f31', + '--theme-transactions-list-border-color': '1e1f31', + '--theme-transactions-list-group-date-color': '#ffffff', + '--theme-transactions-list-item-details-color': '#ffffff', + '--theme-transactions-state-ok-background-color': '#2cbb69', + '--theme-transactions-state-pending-background-color': + 'rgba(255, 255, 255, 0.5)', + '--theme-transactions-state-text-color': '#121326', + '--theme-transactions-search-background-color': '#121326', + '--theme-transactions-icon-type-expend-background-color': '#709cf0', + '--theme-transactions-icon-type-income-background-color': '#2cbb69', + '--theme-transactions-icon-type-exchange-background-color': '#10aca4', + '--theme-transactions-arrow-stroke-color': '#ffffff', + '--theme-transactions-icon-type-pending-regular-background-color': + 'rgba(255, 255, 255, 0.5)', + '--theme-transactions-icon-type-pending-warning-background-color': + 'rgba(236, 93, 107, 0.8)', + '--theme-transactions-state-pending-warning-background-color': '#ec5d6b', + '--theme-transactions-filter-button-shadow-color': + 'rgba(137, 142, 230, 0.18)', + '--theme-transactions-filter-button-color': 'rgba(18, 19, 38, 1)', + '--theme-transactions-date-picker-button-background-color': + 'rgba(255, 255, 255, 0.14)', + '--theme-transactions-date-picker-button-background-color-hover': + 'rgba(255, 255, 255, 0.07)', + '--theme-transactions-date-picker-button-color': '#ffffff', + '--theme-transactions-filter-modal-bg-color': '#3f404f', + '--theme-transactions-filter-date-picker-shadow': + '0 0 20px 0 rgba(0, 0, 0, 0.4)', + '--theme-transactions-filter-title-button-text-color': '#ffffff', + '--theme-transactions-filter-title-button-background-color': + 'rgba(255, 255, 255, 0.1)', + '--theme-transactions-filter-title-button-background-color-hover': + 'rgba(255, 255, 255, 0.05)', + '--theme-transactions-filter-title-button-background-color-active': + 'rgba(255, 255, 255, 0.12)', + }, + uploader: { + '--theme-uploader-text-color': '#ffffff', + '--theme-uploader-border-color': 'rgba(255, 255, 255, 0.3)', + }, + utxo: { + '--theme-utxo-background-color': 'rgba(255, 255, 255, 0.05)', + '--theme-utxo-title-text-color': '#ffffff', + '--theme-utxo-title-description-color': '#ffffffb3', + '--theme-utxo-bar-color': 'rgba(255, 255, 255, 0.5)', + '--theme-utxo-label-text-color': '#ffffff73', + '--theme-utxo-tick-text-color': '#ffffff73', + '--theme-utxo-cursor-background-color': 'rgba(255, 255, 255, 0.1)', + '--theme-utxo-tooltip-background-color': 'rgba(63, 64, 79, 0.9)', + '--theme-utxo-tooltip-shadow-color': 'rgba(0, 0, 0, 0.18)', + '--theme-utxo-tooltip-text-color': '#fff', + }, + recoveryPhrase: { + '--theme-recovery-phrase-normal-background-color': + 'rgba(255, 255, 255, .1)', + '--theme-recovery-phrase-normal-border-color': 'transparent', + '--theme-recovery-phrase-warning-background-color': + 'rgba(255, 255, 255, .1)', + '--theme-recovery-phrase-attention-background-color': + 'rgba(234, 76, 91, .2)', + '--theme-recovery-phrase-paper-wallet-background-color': + 'rgba(255, 255, 255, 0.1)', + '--theme-recovery-phrase-paper-wallet-question-background-color': + 'rgba(255, 255, 255, 0.3)', + '--theme-recovery-phrase-paper-wallet-question-text-color': '#343546', + '--theme-recovery-phrase-paper-wallet-text-color': + 'rgba(255, 255, 255, 0.8)', + }, + walletImportDialog: { + '--theme-wallet-import-background-color': 'rgba(42, 43, 60, 0.98)', + '--theme-wallet-import-button-background-color': 'rgba(0, 0, 0, 0.1)', + '--theme-wallet-import-button-border-color': '#fff', + '--theme-wallet-import-button-text-color': '#fff', + '--theme-wallet-import-button-text-color-hover': '#2a2b3c', + '--theme-wallet-import-checkbox-border': '2px solid #ffffff', + '--theme-wallet-import-checkbox-border-color': 'rgba(255, 255, 255, 1)', + '--theme-wallet-import-checkbox-border-color-disabled': '#fff', + '--theme-wallet-import-checkbox-check-bg-color': '#fff', + '--theme-wallet-import-checkbox-check-color': '#243e62', + '--theme-wallet-import-description-close-color': '#fafbfc', + '--theme-wallet-import-description-close-hover-background': + 'rgba(0, 0, 0, 0.16)', + '--theme-wallet-import-description-color': 'rgba(255, 255, 255, 0.7)', + '--theme-wallet-import-description-bold-color': '#fff', + '--theme-wallet-import-error-color': '#ea4c5b', + '--theme-wallet-import-input-background-color': '#313245', + '--theme-wallet-import-input-background-color-disabled': + 'rgba(255, 255, 255, 0.05)', + '--theme-wallet-import-input-border-color': 'rgba(255, 255, 255, 0.3)', + '--theme-wallet-import-stateFolder-border-color': + 'rgba(255, 255, 255, 0.5)', + '--theme-wallet-import-stateFolder-button-background-color': + 'rgba(255, 255, 255, 0.1)', + '--theme-wallet-import-stateFolder-button-background-color-hover': + 'rgba(255, 255, 255, 0.05)', + '--theme-wallet-import-stateFolder-button-background-color-active': + 'rgba(255, 255, 255, 0.12)', + '--theme-wallet-import-stateFolder-label-color': '#fff', + '--theme-wallet-import-title-color': '#fff', + }, + walletRestoreDialog: { + '--theme-wallet-restore-dialog-new-label-background-color': + 'rgba(255, 255, 255, 0.1)', + '--theme-wallet-restore-dialog-new-label-color': '#ffffff', + '--theme-wallet-restore-dialog-step-walletType-hardwareWalletDisclaimer-text-color': + '#ea4c5b', + }, + walletSettings: { + '--theme-wallet-settings-section-separator-color': + 'rgba(255, 255, 255, 0.15)', + }, + walletNotRespondingOverlay: { + '--theme-wallet-not-responding-background-color': '#36374df5', + '--theme-wallet-not-responding-button-background-color': '#313245', + '--theme-wallet-not-responding-button-background-color-hover': '#ffffff', + '--theme-wallet-not-responding-button-border-color': '#ffffff', + '--theme-wallet-not-responding-button-text-color': '#ffffff', + '--theme-wallet-not-responding-button-text-color-hover': '#2a2b3c', + '--theme-wallet-not-responding-description-background-color': '#313245', + '--theme-wallet-not-responding-description-text-color': + 'rgba(255, 255, 255, 0.7)', + '--theme-wallet-not-responding-icon-color': '#ffffff', + '--theme-wallet-not-responding-link-text-color': '#ffffff', + '--theme-wallet-not-responding-title-text-color': '#ffffff', + }, +}; + +const SHELLEY_TESTNET_THEME_PARAMS: CreateThemeParams = { + config: SHELLEY_TESTNET_THEME_OUTPUT, +}; + +export default createTheme(SHELLEY_TESTNET_THEME_PARAMS); diff --git a/source/renderer/app/themes/daedalus/white.js b/source/renderer/app/themes/daedalus/white.js index 2fcf7e49fc..7006256230 100644 --- a/source/renderer/app/themes/daedalus/white.js +++ b/source/renderer/app/themes/daedalus/white.js @@ -839,7 +839,7 @@ export const WHITE_THEME_OUTPUT = { '--theme-transactions-state-ok-background-color': 'rgba(0, 118, 0, 1);', '--theme-transactions-state-pending-background-color': 'rgba(45, 45, 45, 0.5)', - '--theme-transactions-state-text-color': '#fafbfc', + '--theme-transactions-state-text-color': '#ffffff', '--theme-transactions-search-background-color': '#f9f9f9', '--theme-transactions-icon-type-expend-background-color': '#84a2d2', '--theme-transactions-icon-type-income-background-color': '#2dc06c', diff --git a/source/renderer/app/themes/daedalus/yellow.js b/source/renderer/app/themes/daedalus/yellow.js index caa973a294..b8c0b91512 100644 --- a/source/renderer/app/themes/daedalus/yellow.js +++ b/source/renderer/app/themes/daedalus/yellow.js @@ -841,7 +841,7 @@ export const YELLOW_THEME_OUTPUT = { '--theme-transactions-state-ok-background-color': '#007600', '--theme-transactions-state-pending-background-color': 'rgba(45, 45, 45, 0.5)', - '--theme-transactions-state-text-color': '#fafbfc', + '--theme-transactions-state-text-color': '#ffffff', '--theme-transactions-search-background-color': '#f8f3ed', '--theme-transactions-icon-type-expend-background-color': '#84a2d2', '--theme-transactions-icon-type-income-background-color': '#2dc06c', diff --git a/source/renderer/app/themes/index.js b/source/renderer/app/themes/index.js index 169dac230a..9bee37c0e6 100644 --- a/source/renderer/app/themes/index.js +++ b/source/renderer/app/themes/index.js @@ -6,6 +6,7 @@ export const THEMES = { FLIGHT_CANDIDATE: 'flight-candidate', INCENTIVIZED_TESTNET: 'incentivized-testnet', LIGHT_BLUE: 'light-blue', + SHELLEY_TESTNET: 'shelley-testnet', YELLOW: 'yellow', WHITE: 'white', }; diff --git a/source/renderer/app/themes/overrides/RadioOverrides.scss b/source/renderer/app/themes/overrides/RadioOverrides.scss index 4458cb88a6..addea4a2a1 100644 --- a/source/renderer/app/themes/overrides/RadioOverrides.scss +++ b/source/renderer/app/themes/overrides/RadioOverrides.scss @@ -13,4 +13,8 @@ width: 8px; } } + + &.disabled { + opacity: 0.5; + } } diff --git a/source/renderer/app/themes/types.js b/source/renderer/app/themes/types.js index 2dfbf9a3e5..792fa29ec5 100644 --- a/source/renderer/app/themes/types.js +++ b/source/renderer/app/themes/types.js @@ -8,6 +8,7 @@ export type PendingThemesUpdates = { 'dark-cardano.js'?: Object, 'flight-candidate.js'?: Object, 'light-blue.js'?: Object, + 'shelley-testnet.js'?: Object, 'white.js'?: Object, 'yellow.js'?: Object, }; @@ -38,6 +39,7 @@ export type FindUpdatesParams = { darkCardano: Object, flightCandidate: Object, lightBlue: Object, + shelleyTestnet: Object, yellow: Object, white: Object, }; diff --git a/source/renderer/app/themes/utils/constants.js b/source/renderer/app/themes/utils/constants.js index 2a86c965d6..5a5b9a592c 100644 --- a/source/renderer/app/themes/utils/constants.js +++ b/source/renderer/app/themes/utils/constants.js @@ -22,11 +22,12 @@ export const DEFAULT_FONTS = { export const THEME_LOGGING_COLORS = { 'cardano.js': '#2cbb69', - 'dark-blue.js': '#2874A6', + 'dark-blue.js': '#2874a6', 'dark-cardano.js': '#1fc1c3', 'flight-candidate.js': '#ffb923', 'incentivized-testnet.js': '#f69ab2', - 'light-blue.js': '#33C4FF', + 'light-blue.js': '#33c4ff', + 'shelley-testnet.js': '#898ee6', 'white.js': '#29b595', 'yellow.js': '#fdcd68', }; @@ -150,6 +151,23 @@ const CREATE_LIGHT_BLUE_THEME_PARAMS: CreateThemeParams = { fonts: DEFAULT_FONTS, }; +const CREATE_SHELLEY_TESTNET_THEME_PARAMS: CreateThemeParams = { + colors: { + background: { + primary: '#121326', + secondary: '#36374d', + }, + border: 'rgba(255, 255, 255, 0.2)', + error: '#ea4c5b', + focus: 'rgba(255, 255, 255, 0.4)', + text: { + primary: '#ffffff', + secondary: '#000000', + }, + }, + fonts: DEFAULT_FONTS, +}; + const CREATE_WHITE_THEME_PARAMS: CreateThemeParams = { colors: { background: { @@ -191,6 +209,7 @@ export const CREATE_THEME_PARAMS = [ ['flight-candidate.js', CREATE_FLIGHT_CANDIDATE_THEME_PARAMS], ['incentivized-testnet.js', CREATE_INCENTIVIZED_TESTNET_THEME_PARAMS], ['light-blue.js', CREATE_LIGHT_BLUE_THEME_PARAMS], + ['shelley-testnet.js', CREATE_SHELLEY_TESTNET_THEME_PARAMS], ['white.js', CREATE_WHITE_THEME_PARAMS], ['yellow.js', CREATE_YELLOW_THEME_PARAMS], ]; diff --git a/storybook/stories/_support/config.js b/storybook/stories/_support/config.js index e0febcf1fd..16e5b6b77a 100644 --- a/storybook/stories/_support/config.js +++ b/storybook/stories/_support/config.js @@ -7,6 +7,7 @@ import flightCandidate from '../../../source/renderer/app/themes/daedalus/flight import white from '../../../source/renderer/app/themes/daedalus/white.js'; import yellow from '../../../source/renderer/app/themes/daedalus/yellow.js'; import incentivizedTestnet from '../../../source/renderer/app/themes/daedalus/incentivized-testnet.js'; +import shelleyTestnet from '../../../source/renderer/app/themes/daedalus/shelley-testnet.js'; export const themes = { Cardano: cardano, @@ -17,6 +18,7 @@ export const themes = { Yellow: yellow, White: white, IncentivizedTestnet: incentivizedTestnet, + ShelleyTestnet: shelleyTestnet, }; export const themeNames: Array = Object.keys(themes); export const themesIds = { @@ -28,6 +30,7 @@ export const themesIds = { Yellow: 'yellow', White: 'white', IncentivizedTestnet: 'incentivized-testnet', + ShelleyTestnet: 'shelley-testnet', }; export const locales = { diff --git a/storybook/stories/nodes/syncing/SyncingConnecting.stories.js b/storybook/stories/nodes/syncing/SyncingConnecting.stories.js index b44b15a103..6e2c79cff2 100644 --- a/storybook/stories/nodes/syncing/SyncingConnecting.stories.js +++ b/storybook/stories/nodes/syncing/SyncingConnecting.stories.js @@ -23,6 +23,7 @@ export const DefaultSyncingConnectingStory = (props: { )} hasBeenConnected={boolean('hasBeenConnected', false)} isFlight={false} + isShelleyTestnet={false} isConnected={boolean('isConnected', false)} isSynced={boolean('isSynced', false)} isConnecting={boolean('isConnecting', true)} @@ -65,6 +66,7 @@ export const ConnectivityIssuesSyncingConnectingStory = (props: { cardanoNodeState={CardanoNodeStates.RUNNING} hasBeenConnected isFlight={false} + isShelleyTestnet={false} isSynced={false} isConnecting isSyncing={false} @@ -105,6 +107,7 @@ export const LoadingWalletDataSyncingConnectingStory = (props: { cardanoNodeState={CardanoNodeStates.RUNNING} hasBeenConnected isFlight={false} + isShelleyTestnet={false} isSynced={false} isConnecting={false} isSyncing diff --git a/storybook/stories/settings/utils/SettingsWrapper.js b/storybook/stories/settings/utils/SettingsWrapper.js index da43943b92..134d4e6ee2 100644 --- a/storybook/stories/settings/utils/SettingsWrapper.js +++ b/storybook/stories/settings/utils/SettingsWrapper.js @@ -22,6 +22,7 @@ export default (story: Object, context: Object) => { const menu = ( pageNames[item])} isActiveItem={item => { const itemName = context.story