Merge branch 'develop' into fix/ddw-331-update-api-request-breaking-c…

…hanges
input-output-hk · Aug 3, 2020 · 2f18ad3 · 2f18ad3
2 parents 64ce6c0 + 6a0ff84
commit 2f18ad3
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,17 @@
 Changelog
 =========
 
+## vNext
+
+### Features
+
+- Disabled creating Byron wallets ([PR 2126](https://github.com/input-output-hk/daedalus/pull/2126))
+
+### Fixes
+
+- 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
 
 ### Features

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/wallet/WalletAdd.js b/source/renderer/app/components/wallet/WalletAdd.js
@@ -100,6 +100,7 @@ type Props = {
   isMainnet: boolean,
   isTestnet: boolean,
   isProduction: boolean,
+  isShelleyActivated: boolean,
 };
 
 @observer
@@ -123,6 +124,7 @@ export default class WalletAdd extends Component<Props> {
       isMainnet,
       isTestnet,
       isProduction,
+      isShelleyActivated,
     } = this.props;
 
     const componentClasses = classnames([styles.component, 'WalletAdd']);
@@ -146,7 +148,10 @@ export default class WalletAdd extends Component<Props> {
                   ? intl.formatMessage(messages.createDescriptionItn)
                   : intl.formatMessage(messages.createDescription)
               }
-              isDisabled={isMaxNumberOfWalletsReached}
+              isDisabled={
+                isMaxNumberOfWalletsReached ||
+                (!isIncentivizedTestnet && !isShelleyActivated)
+              }
             />
             <BigButtonForDialogs
               className="joinWalletButton"

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/containers/wallet/WalletAddPage.js b/source/renderer/app/containers/wallet/WalletAddPage.js
@@ -31,17 +31,16 @@ export default class WalletAddPage extends Component<Props> {
 
   render() {
     const { actions, stores } = this.props;
-    const { wallets, walletMigration, uiDialogs } = stores;
+    const { networkStatus, wallets, walletMigration, uiDialogs } = stores;
     const {
       createWalletStep,
       createWalletUseNewProcess,
       restoreWalletStep,
       restoreWalletUseNewProcess,
       environment,
     } = wallets;
-
+    const { isShelleyActivated } = networkStatus;
     const { walletMigrationStep } = walletMigration;
-
     const { isMainnet, isTestnet, isProduction } = environment;
 
     const onCreateWallet = createWalletUseNewProcess
@@ -84,6 +83,7 @@ export default class WalletAddPage extends Component<Props> {
           isMainnet={isMainnet}
           isTestnet={isTestnet}
           isProduction={isProduction}
+          isShelleyActivated={isShelleyActivated}
         />
         {activeDialog}
       </Layout>

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エポック",

diff --git a/storybook/stories/wallets/addWallet/Add.stories.js b/storybook/stories/wallets/addWallet/Add.stories.js
@@ -26,6 +26,7 @@ storiesOf('Wallets|Add Wallet', module)
         onImport={() => {}}
         isMainnet={boolean('isMainnet', true)}
         isTestnet={boolean('isTestnet', false)}
+        isShelleyActivated={boolean('isShelleyActivated', true)}
         isProduction
         isIncentivizedTestnet={isIncentivizedTestnetTheme(props.currentTheme)}
         isMaxNumberOfWalletsReached={boolean(