[DDW-341] Fixed shutdown messages priority, Enabled wallet creation a…

…nd restoration during syncing
input-output-hk · Aug 12, 2020 · 412e576 · 412e576
1 parent 71a2262
commit 412e576
Show file tree

Hide file tree

Showing 21 changed files with 148 additions and 279 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,12 +5,15 @@ Changelog
 
 ### Features
 
+- Enabled wallet creation regardless of the sync progress ([PR 2150](https://github.com/input-output-hk/daedalus/pull/2150))
+- Enabled restoration of "Shelley" wallets regardless of the sync progress ([PR 2150](https://github.com/input-output-hk/daedalus/pull/2150))
 - Enabled restoration of Yoroi "Shelley" wallets ([PR 2144](https://github.com/input-output-hk/daedalus/pull/2144))
 - Enabled "Send" screen for "Byron" wallets ([PR 2147](https://github.com/input-output-hk/daedalus/pull/2147))
 - Added SMASH support ([PR 2143](https://github.com/input-output-hk/daedalus/pull/2143))
 
 ### Fixes
 
+- Fixed display priority of Daedalus shutdown messages on the "Loading" screen ([PR 2150](https://github.com/input-output-hk/daedalus/pull/2150))
 - Fixed double loading spinner issue on stake pools list page ([PR 2144](https://github.com/input-output-hk/daedalus/pull/2144))
 - Fixed the Japanese translation for "Byron" wallet label ([PR 2147](https://github.com/input-output-hk/daedalus/pull/2147))
 - Fixed validation of spending passwords which include spaces ([PR 2147](https://github.com/input-output-hk/daedalus/pull/2147))

diff --git a/source/renderer/app/api/api.js b/source/renderer/app/api/api.js
@@ -102,7 +102,6 @@ import { REDEEM_ITN_REWARDS_AMOUNT } from '../config/stakingConfig';
 import {
   ADA_CERTIFICATE_MNEMONIC_LENGTH,
   WALLET_RECOVERY_PHRASE_WORD_COUNT,
-  LEGACY_WALLET_RECOVERY_PHRASE_WORD_COUNT,
 } from '../config/cryptoConfig';
 
 // Addresses Types
@@ -213,16 +212,10 @@ export default class AdaApi {
     this.config = config;
   }
 
-  getWallets = async (request: {
-    isShelleyActivated: boolean,
-  }): Promise<Array<Wallet>> => {
+  getWallets = async (): Promise<Array<Wallet>> => {
     logger.debug('AdaApi::getWallets called');
-    const { isShelleyActivated } = request;
     try {
-      const wallets: AdaWallets =
-        isIncentivizedTestnet || isShelleyActivated
-          ? await getWallets(this.config)
-          : [];
+      const wallets: AdaWallets = await getWallets(this.config);
       const legacyWallets: LegacyAdaWallets = await getLegacyWallets(
         this.config
       );
@@ -535,61 +528,70 @@ export default class AdaApi {
     }
   };
 
-  createWallet = async (request: {
-    walletDetails: CreateWalletRequest,
-    isShelleyActivated: boolean,
-  }): Promise<Wallet> => {
+  createWallet = async (request: CreateWalletRequest): Promise<Wallet> => {
     logger.debug('AdaApi::createWallet called', {
       parameters: filterLogData(request),
     });
-    const { walletDetails, isShelleyActivated } = request;
-    const { name, mnemonic, spendingPassword } = walletDetails;
+    const { name, mnemonic, spendingPassword } = request;
     try {
-      let wallet: AdaWallet;
       const walletInitData = {
         name,
         mnemonic_sentence: split(mnemonic, ' '),
         passphrase: spendingPassword,
       };
+      const wallet: AdaWallet = await createWallet(this.config, {
+        walletInitData,
+      });
+      logger.debug('AdaApi::createWallet success', { wallet });
+      return _createWalletFromServerData(wallet);
+    } catch (error) {
+      logger.error('AdaApi::createWallet error', { error });
+      throw new ApiError(error);
+    }
+  };
 
-      if (isIncentivizedTestnet || isShelleyActivated) {
-        wallet = await createWallet(this.config, {
-          walletInitData,
-        });
-        logger.debug('AdaApi::createWallet (Shelley) success', { wallet });
-      } else {
-        const legacyWallet: LegacyAdaWallet = await restoreByronWallet(
-          this.config,
-          { walletInitData },
-          'random'
-        );
-
-        // Generate address for the newly created Byron wallet
-        const { id: walletId } = legacyWallet;
-        const address: Address = await createByronWalletAddress(this.config, {
-          passphrase: spendingPassword,
-          walletId,
-        });
-        logger.debug('AdaApi::createAddress (Byron) success', { address });
-
-        const extraLegacyWalletProps = {
-          address_pool_gap: 0, // Not needed for legacy wallets
-          delegation: {
-            active: {
-              status: WalletDelegationStatuses.NOT_DELEGATING,
-            },
+  createLegacyWallet = async (
+    request: CreateWalletRequest
+  ): Promise<Wallet> => {
+    logger.debug('AdaApi::createLegacyWallet called', {
+      parameters: filterLogData(request),
+    });
+    const { name, mnemonic, spendingPassword } = request;
+    try {
+      const walletInitData = {
+        name,
+        mnemonic_sentence: split(mnemonic, ' '),
+        passphrase: spendingPassword,
+      };
+      const legacyWallet: LegacyAdaWallet = await restoreByronWallet(
+        this.config,
+        { walletInitData },
+        'random'
+      );
+      // Generate address for the newly created Byron wallet
+      const { id: walletId } = legacyWallet;
+      const address: Address = await createByronWalletAddress(this.config, {
+        passphrase: spendingPassword,
+        walletId,
+      });
+      logger.debug('AdaApi::createByronWalletAddress success', { address });
+      const extraLegacyWalletProps = {
+        address_pool_gap: 0, // Not needed for legacy wallets
+        delegation: {
+          active: {
+            status: WalletDelegationStatuses.NOT_DELEGATING,
           },
-          isLegacy: true,
-        };
-        wallet = {
-          ...legacyWallet,
-          ...extraLegacyWalletProps,
-        };
-        logger.debug('AdaApi::createWallet (Byron) success', { wallet });
-      }
+        },
+        isLegacy: true,
+      };
+      const wallet: AdaWallet = {
+        ...legacyWallet,
+        ...extraLegacyWalletProps,
+      };
+      logger.debug('AdaApi::createLegacyWallet success', { wallet });
       return _createWalletFromServerData(wallet);
     } catch (error) {
-      logger.error('AdaApi::createWallet error', { error });
+      logger.error('AdaApi::createLegacyWallet error', { error });
       throw new ApiError(error);
     }
   };
@@ -815,20 +817,11 @@ export default class AdaApi {
   isValidCertificateMnemonic = (mnemonic: string): boolean =>
     mnemonic.split(' ').length === ADA_CERTIFICATE_MNEMONIC_LENGTH;
 
-  getWalletRecoveryPhrase(request: {
-    isShelleyActivated: string,
-  }): Promise<Array<string>> {
-    const { isShelleyActivated } = request;
+  getWalletRecoveryPhrase(): Promise<Array<string>> {
     logger.debug('AdaApi::getWalletRecoveryPhrase called');
     try {
       const response: Promise<Array<string>> = new Promise(resolve =>
-        resolve(
-          generateAccountMnemonics(
-            isIncentivizedTestnet || isShelleyActivated
-              ? WALLET_RECOVERY_PHRASE_WORD_COUNT
-              : LEGACY_WALLET_RECOVERY_PHRASE_WORD_COUNT
-          )
-        )
+        resolve(generateAccountMnemonics(WALLET_RECOVERY_PHRASE_WORD_COUNT))
       );
       logger.debug('AdaApi::getWalletRecoveryPhrase success');
       return response;
@@ -1603,8 +1596,7 @@ export default class AdaApi {
   testReset = async (): Promise<void> => {
     logger.debug('AdaApi::testReset called');
     try {
-      // @TODO - pass isShelleyActivated parameter from E2E tests
-      const wallets = await this.getWallets({ isShelleyActivated: false });
+      const wallets = await this.getWallets();
       await Promise.all(
         wallets.map(wallet =>
           this.deleteWallet({

diff --git a/source/renderer/app/api/utils/patchAdaApi.js b/source/renderer/app/api/utils/patchAdaApi.js
@@ -216,11 +216,8 @@ export default (api: AdaApi) => {
     });
   });
 
-  api.getWallets = async (request: {
-    isShelleyActivated: boolean,
-  }): Promise<Array<Wallet>> => {
-    const { isShelleyActivated } = request;
-    const originalWallets = await originalGetWallets({ isShelleyActivated });
+  api.getWallets = async (): Promise<Array<Wallet>> => {
+    const originalWallets = await originalGetWallets();
     const modifiedWallets = originalWallets.map(
       (originalWallet: Wallet, index: number) => {
         const testingWallet = TESTING_WALLETS_DATA[index] || {};

diff --git a/source/renderer/app/components/loading/syncing-connecting/SyncingConnectingStatus.js b/source/renderer/app/components/loading/syncing-connecting/SyncingConnectingStatus.js
@@ -95,6 +95,7 @@ export default class SyncingConnectingStatus extends Component<Props> {
     const {
       cardanoNodeState,
       hasBeenConnected,
+      isVerifyingBlockchain,
       isTlsCertInvalid,
       isConnected,
     } = this.props;
@@ -137,6 +138,9 @@ export default class SyncingConnectingStatus extends Component<Props> {
     if (isTlsCertInvalid && isConnectingMessage) {
       return messages.tlsCertificateNotValidError;
     }
+    if (isVerifyingBlockchain && isConnectingMessage) {
+      return messages.verifyingBlockchain;
+    }
     return connectingMessage;
   };
 
@@ -148,7 +152,6 @@ export default class SyncingConnectingStatus extends Component<Props> {
       isNodeStopped,
       isTlsCertInvalid,
       hasLoadedCurrentLocale,
-      isVerifyingBlockchain,
       verificationProgress,
     } = this.props;
 
@@ -170,11 +173,9 @@ export default class SyncingConnectingStatus extends Component<Props> {
     return (
       <div className={componentStyles}>
         <h1 className={headlineStyles}>
-          {isVerifyingBlockchain
-            ? intl.formatMessage(messages.verifyingBlockchain, {
-                verificationProgress,
-              })
-            : intl.formatMessage(this._getConnectingMessage())}
+          {intl.formatMessage(this._getConnectingMessage(), {
+            verificationProgress,
+          })}
         </h1>
       </div>
     );

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

diff --git a/source/renderer/app/components/wallet/WalletBackupDialog.js b/source/renderer/app/components/wallet/WalletBackupDialog.js
@@ -18,7 +18,6 @@ type Props = {
   isTermRewardsAccepted: boolean,
   isValid: boolean,
   isSubmitting: boolean,
-  isShelleyActivated: boolean,
   recoveryPhrase: string,
   enteredPhrase: Array<string>,
   onCancelBackup: Function,
@@ -59,7 +58,6 @@ export default class WalletBackupDialog extends Component<Props> {
       onUpdateVerificationPhrase,
       onFinishBackup,
       onRestartBackup,
-      isShelleyActivated,
     } = this.props;
 
     if (currentStep === WALLET_BACKUP_STEPS.PRIVACY_WARNING) {
@@ -68,7 +66,6 @@ export default class WalletBackupDialog extends Component<Props> {
           canPhraseBeShown={canPhraseBeShown}
           isPrivacyNoticeAccepted={isPrivacyNoticeAccepted}
           countdownRemaining={countdownRemaining}
-          isShelleyActivated={isShelleyActivated}
           onAcceptPrivacyNotice={onAcceptPrivacyNotice}
           onCancelBackup={onCancelBackup}
           onContinue={onContinue}
@@ -81,7 +78,6 @@ export default class WalletBackupDialog extends Component<Props> {
           recoveryPhrase={recoveryPhrase}
           onStartWalletBackup={onStartWalletBackup}
           onCancelBackup={onCancelBackup}
-          isShelleyActivated={isShelleyActivated}
         />
       );
     }
@@ -94,7 +90,6 @@ export default class WalletBackupDialog extends Component<Props> {
           isTermRecoveryAccepted={isTermRecoveryAccepted}
           isTermRewardsAccepted={isTermRewardsAccepted}
           isValid={isValid}
-          isShelleyActivated={isShelleyActivated}
           isSubmitting={isSubmitting}
           onAcceptTermOffline={onAcceptTermOffline}
           onAcceptTermRecovery={onAcceptTermRecovery}

diff --git a/source/renderer/app/components/wallet/WalletCreateDialog.js b/source/renderer/app/components/wallet/WalletCreateDialog.js
@@ -24,15 +24,10 @@ import { FORM_VALIDATION_DEBOUNCE_WAIT } from '../../config/timingConfig';
 import { submitOnEnter } from '../../utils/form';
 
 const messages = defineMessages({
-  dialogTitleItn: {
-    id: 'wallet.create.dialog.title.itn',
-    defaultMessage: '!!!Create a new wallet',
-    description: 'Title "Create a new wallet" in the wallet create form.',
-  },
   dialogTitle: {
     id: 'wallet.create.dialog.title',
-    defaultMessage: '!!!Create a wallet',
-    description: 'Title "Create a wallet" in the wallet create form.',
+    defaultMessage: '!!!Create a new wallet',
+    description: 'Title "Create a new wallet" in the wallet create form.',
   },
   walletName: {
     id: 'wallet.create.dialog.name.label',
@@ -46,17 +41,11 @@ const messages = defineMessages({
     description:
       'Hint for the "Wallet Name" text input in the wallet create form.',
   },
-  createPersonalWalletItn: {
-    id: 'wallet.create.dialog.create.personal.wallet.button.label.itn',
-    defaultMessage: '!!!Create Shelley wallet',
-    description:
-      'Label for the "Create Shelley wallet" button on create wallet dialog.',
-  },
   createPersonalWallet: {
     id: 'wallet.create.dialog.create.personal.wallet.button.label',
-    defaultMessage: '!!!Create wallet',
+    defaultMessage: '!!!Create Shelley wallet',
     description:
-      'Label for the "Create wallet" button on create wallet dialog.',
+      'Label for the "Create Shelley wallet" button on create wallet dialog.',
   },
   passwordSectionLabel: {
     id: 'wallet.create.dialog.passwordSectionLabel',
@@ -88,10 +77,7 @@ const messages = defineMessages({
   },
 });
 
-const { isIncentivizedTestnet } = global;
-
 type Props = {
-  isShelleyActivated: boolean,
   onSubmit: Function,
   onCancel: Function,
 };
@@ -211,7 +197,7 @@ export default class WalletCreateDialog extends Component<Props, State> {
   render() {
     const { form } = this;
     const { intl } = this.context;
-    const { onCancel, isShelleyActivated } = this.props;
+    const { onCancel } = this.props;
     const { isSubmitting } = this.state;
     const dialogClasses = classnames([styles.component, 'WalletCreateDialog']);
 
@@ -225,11 +211,7 @@ export default class WalletCreateDialog extends Component<Props, State> {
       {
         className: isSubmitting ? styles.isSubmitting : null,
         disabled: !canSubmit,
-        label: this.context.intl.formatMessage(
-          isIncentivizedTestnet || isShelleyActivated
-            ? messages.createPersonalWalletItn
-            : messages.createPersonalWallet
-        ),
+        label: this.context.intl.formatMessage(messages.createPersonalWallet),
         primary: true,
         onClick: this.submit,
       },
@@ -238,11 +220,7 @@ export default class WalletCreateDialog extends Component<Props, State> {
     return (
       <Dialog
         className={dialogClasses}
-        title={intl.formatMessage(
-          isIncentivizedTestnet || isShelleyActivated
-            ? messages.dialogTitleItn
-            : messages.dialogTitle
-        )}
+        title={intl.formatMessage(messages.dialogTitle)}
         actions={actions}
         closeOnOverlayClick
         onClose={!isSubmitting ? onCancel : () => {}}