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

…unt-logic
input-output-hk · Aug 3, 2020 · e45ef29 · e45ef29
2 parents a83e29a + 6a0ff84
commit e45ef29
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ Changelog
 
 ## vNext
 
+### Features
+
+- Disabled creating Byron wallets ([PR 2126](https://github.com/input-output-hk/daedalus/pull/2126))
+
 ### Fixes
 
 - Improved wallet delegation error messages ([PR 2111](https://github.com/input-output-hk/daedalus/pull/2111))

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/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/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(