Merge branch 'develop' into fix/ddw-330-fix-wallet-delegation-min-amo…

…unt-logic
input-output-hk · Aug 3, 2020 · a83e29a · a83e29a
2 parents 52b7cf6 + 3ab7a42
commit a83e29a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ Changelog
 ### Fixes
 
 - Improved wallet delegation error messages ([PR 2111](https://github.com/input-output-hk/daedalus/pull/2111))
+- Fixed Daedalus logo animation on the "Loading" screen ([PR 2124](https://github.com/input-output-hk/daedalus/pull/2124))
+- Fixed text copy on the "Delegation center" screen ([PR 2125](https://github.com/input-output-hk/daedalus/pull/2125))
 
 ## 2.0.0
 

diff --git a/source/renderer/app/components/loading/syncing-connecting/LogosDisplay.scss b/source/renderer/app/components/loading/syncing-connecting/LogosDisplay.scss
@@ -27,12 +27,12 @@ $adaLogoWidth: 43px;
 }
 
 .daedalusLogo {
-  height: 135px;
-  margin: 0 114px;
-  width: 173px;
+  height: 140px;
+  margin: 0 110px;
+  width: 180px;
   svg {
-    height: 135px;
-    width: 173px;
+    height: 140px;
+    width: 180px;
   }
 }
 

diff --git a/source/renderer/app/components/widgets/splash/Splash.scss b/source/renderer/app/components/widgets/splash/Splash.scss
@@ -68,10 +68,10 @@
     z-index: 2000;
 
     .daedalusIcon {
-      height: 135px;
+      height: 140px;
       margin-bottom: 30px;
       object-fit: contain;
-      width: 173px;
+      width: 180px;
 
       svg {
         path {

diff --git a/source/renderer/app/i18n/locales/en-US.json b/source/renderer/app/i18n/locales/en-US.json
@@ -283,7 +283,7 @@
   "staking.delegationCenter.bodyTitle": "Wallets",
   "staking.delegationCenter.currentSlot": "Current slot",
   "staking.delegationCenter.delegate": "Delegate",
-  "staking.delegationCenter.description": "Changes to delegation preferences will take effect after both the current and next Cardano epochs have completed. Epochs on the Shelley Testnet last six hours. Any changes made now will take effect in {timeUntilFutureEpoch}.",
+  "staking.delegationCenter.description": "Changes to delegation preferences will take effect after both the current and next Cardano epochs have completed. Epochs on the Cardano mainnet last 5 days. Any changes made now will take effect in {timeUntilFutureEpoch}.",
   "staking.delegationCenter.epoch": "Epoch",
   "staking.delegationCenter.headingLeft": "Next Cardano epoch starts in",
   "staking.delegationCenter.headingRight": "Current Cardano epoch",

diff --git a/source/renderer/app/i18n/locales/ja-JP.json b/source/renderer/app/i18n/locales/ja-JP.json
@@ -283,7 +283,7 @@
   "staking.delegationCenter.bodyTitle": "ウォレット",
   "staking.delegationCenter.currentSlot": "現行スロット",
   "staking.delegationCenter.delegate": "委任する",
-  "staking.delegationCenter.description": "変更した委任設定は、現行の次のCardanoエポックが終了すると有効になります。Shelleyテストネットのエポックの継続時間は6時間です。今回の変更はすべて{timeUntilFutureEpoch}後に有効になります。",
+  "staking.delegationCenter.description": "変更した委任設定は、現行の次のCardanoエポックが終了すると有効になります。Cardanoメインネットにおける1エポックは5日です。今回の変更はすべて{timeUntilFutureEpoch}後に有効になります。",
   "staking.delegationCenter.epoch": "エポック",
   "staking.delegationCenter.headingLeft": "次のCardanoエポック開始まであと",
   "staking.delegationCenter.headingRight": "現在のCardanoエポック",