[launcher] Set the new per-account encryption automatically for the n…

…ewly restored wallet (#3746)
decred · Apr 29, 2022 · 03d7110 · 03d7110
1 parent 037118b
commit 03d7110
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/app/components/views/GetStartedPage/SetupWallet/hooks.js b/app/components/views/GetStartedPage/SetupWallet/hooks.js
@@ -81,7 +81,13 @@ export const useWalletSetup = (settingUpWalletRef) => {
 
   const getStateComponent = useCallback(async () => {
     const ctx = current.context;
-    const { selectedWallet, error, passPhrase, isCreateNewWallet } = ctx;
+    const {
+      selectedWallet,
+      error,
+      passPhrase,
+      isCreateNewWallet,
+      isRestoreNewWallet
+    } = ctx;
     const { isWatchingOnly, isTrezor } = selectedWallet.value;
 
     let component, hasSoloTickets;
@@ -128,7 +134,7 @@ export const useWalletSetup = (settingUpWalletRef) => {
           if (
             passPhrase &&
             passPhrase != "" &&
-            isCreateNewWallet &&
+            (isCreateNewWallet || isRestoreNewWallet) &&
             !isProcessingManaged
           ) {
             return onSubmitAccountsPassphrase(passPhrase);

diff --git a/app/stateMachines/GetStartedStateMachine.js b/app/stateMachines/GetStartedStateMachine.js
@@ -17,6 +17,7 @@ export const getStartedMachine = Machine({
     error: null,
     availableWalletsError: null,
     isCreateNewWallet: null,
+    isRestoreNewWallet: null,
     isSPV: null,
     isAdvancedDaemon: null
   },
@@ -211,7 +212,11 @@ export const getStartedMachine = Machine({
                 isCreateNewWallet: (context, event) =>
                   !isUndefined(event.isNew)
                     ? event.isNew
-                    : context.isCreateNewWallet
+                    : context.isCreateNewWallet,
+                isRestoreNewWallet: (context, event) =>
+                  !isUndefined(event.isNew)
+                    ? !event.isNew
+                    : context.isRestoreNewWallet
               })
             },
             ERROR: {
@@ -362,6 +367,7 @@ export const getStartedMachine = Machine({
                   SetupWalletConfigMachine.withContext({
                     selectedWallet: ctx.selectedWallet,
                     isCreateNewWallet: ctx.isCreateNewWallet,
+                    isRestoreNewWallet: ctx.isRestoreNewWallet,
                     isWatchingOnly: ctx.selectedWallet.isWatchingOnly,
                     isTrezor: ctx.selectedWallet.isTrezor,
                     passPhrase: ctx.passPhrase