Fix wallet restore dialog and continue disable check (#2744)

* fix wallet restore dialog and continue disable check

* Adds CHANGELOG

* Change _restore to action

Co-authored-by: Nikola Glumac <[email protected]>

Author: mchappell

CHANGELOG.md

@@ -14,7 +14,7 @@
 - Fixed issues relating to minimum window size in Daedalus ([PR 2719](https://github.com/input-output-hk/daedalus/pull/2719))
 - Updated "Trezor T" image shown on the "Pair a hardware wallet device" dialog ([PR 2712](https://github.com/input-output-hk/daedalus/pull/2712))
 - Fixed transaction timestamps localization ([PR 2702](https://github.com/input-output-hk/daedalus/pull/2702))
-- Small UI/UX Fixes ([PR 2685](https://github.com/input-output-hk/daedalus/pull/2685))
+- Small UI/UX Fixes ([PR 2685](https://github.com/input-output-hk/daedalus/pull/2685), [PR 2744](https://github.com/input-output-hk/daedalus/pull/2744))
 
 ### Chores
 

source/renderer/app/containers/wallet/dialogs/wallet-restore/StepConfigurationContainer.js

@@ -15,7 +15,6 @@ export default class ConfigurationDialogContainer extends Component<Props> {
 
   handleContinue = () => {
     this.props.actions.wallets.restoreWallet.trigger();
-    this.props.actions.wallets.restoreWalletEnd.trigger();
   };
 
   handleChange = (param: string, field: Object) =>
@@ -28,14 +27,19 @@ export default class ConfigurationDialogContainer extends Component<Props> {
     const { onClose, onBack, stores } = this.props;
     const { wallets, profile } = stores;
     const { currentLocale } = profile;
-    const { error, isExecuting } = wallets.restoreRequest;
-    const { walletName, spendingPassword, repeatPassword } = wallets;
+    const { error } = wallets.restoreRequest;
+    const {
+      walletName,
+      spendingPassword,
+      repeatPassword,
+      isRestoring,
+    } = wallets;
     const {
       error: certificateError,
     } = stores.wallets.getWalletRecoveryPhraseFromCertificateRequest;
     return (
       <ConfigurationDialog
-        isSubmitting={isExecuting}
+        isSubmitting={isRestoring}
         onClose={onClose}
         onContinue={this.handleContinue}
         onChange={this.handleChange}

source/renderer/app/containers/wallet/dialogs/wallet-restore/StepSuccessContainer.js

@@ -16,10 +16,10 @@ export default class SuccessDialogContainer extends Component<Props> {
   render() {
     const { stores, actions } = this.props;
     const { walletKindDaedalus, walletKindYoroi } = stores.wallets;
-    const { restoreWalletClose } = actions.wallets;
+    const { restoreWalletEnd } = actions.wallets;
     return (
       <SuccessDialog
-        onClose={() => restoreWalletClose.trigger()}
+        onClose={() => restoreWalletEnd.trigger()}
         walletKindDaedalus={walletKindDaedalus}
         walletKindYoroi={walletKindYoroi}
       />

source/renderer/app/stores/WalletsStore.js

@@ -172,6 +172,8 @@ export default class WalletsStore extends Store {
 
   /* ----------  Delete Wallet  ---------- */
   @observable isDeleting: boolean = false;
+  /* ----------  Restore Wallet  ---------- */
+  @observable isRestoring: boolean = false;
 
   /* ----------  Paper Wallet  ---------- */
   @observable createPaperWalletCertificateStep = 0;
@@ -404,6 +406,7 @@ export default class WalletsStore extends Store {
     const { restoredWallet } = this;
     if (restoredWallet) {
       await this._patchWalletRequestWithNewWallet(restoredWallet);
+      this.goToWalletRoute(restoredWallet.id);
       this.refreshWalletsData();
       this._restoreWalletResetRequests();
       this._restoreWalletResetData();
@@ -668,11 +671,12 @@ export default class WalletsStore extends Store {
     return unscrambledRecoveryPhrase;
   };
 
-  _restore = async () => {
+  @action _restore = async () => {
+    this.isRestoring = true;
+
     // Pause polling in order to avoid fetching data for wallet we are about to restore
     // so that we remain on the "Add wallet" screen until user closes the TADA screen
     await this._pausePolling();
-
     // Reset restore requests to clear previous errors
     this._restoreWalletResetRequests();
 
@@ -702,8 +706,11 @@ export default class WalletsStore extends Store {
         this.restoredWallet = restoredWallet;
         this.restoreWalletStep = 3;
       });
-    } catch (error) {
+    } finally {
       this._resumePolling();
+      runInAction('end wallet restore', () => {
+        this.isRestoring = false;
+      });
     }
   };