diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e0d675b13..fac5d09809 100644 --- 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 index 4e954cf189..918672c959 100644 --- 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 { isMainnet, isTestnet, isProduction, + isShelleyActivated, } = this.props; const componentClasses = classnames([styles.component, 'WalletAdd']); @@ -146,7 +148,10 @@ export default class WalletAdd extends Component { ? intl.formatMessage(messages.createDescriptionItn) : intl.formatMessage(messages.createDescription) } - isDisabled={isMaxNumberOfWalletsReached} + isDisabled={ + isMaxNumberOfWalletsReached || + (!isIncentivizedTestnet && !isShelleyActivated) + } /> { render() { const { actions, stores } = this.props; - const { wallets, walletMigration, uiDialogs } = stores; + const { networkStatus, wallets, walletMigration, uiDialogs } = stores; const { createWalletStep, createWalletUseNewProcess, @@ -39,9 +39,8 @@ export default class WalletAddPage extends Component { 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 { isMainnet={isMainnet} isTestnet={isTestnet} isProduction={isProduction} + isShelleyActivated={isShelleyActivated} /> {activeDialog} diff --git a/storybook/stories/wallets/addWallet/Add.stories.js b/storybook/stories/wallets/addWallet/Add.stories.js index bff7b200e1..142e7b4e86 100644 --- 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(