From 2cbff5982a2867ea27a27b9400836c76177cf7f0 Mon Sep 17 00:00:00 2001
From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com>
Date: Thu, 17 Sep 2020 15:16:58 +0200
Subject: [PATCH] fix: do not prompt for password with encrypted backup

---
 .../directives/views/accountMenu.ts           | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/directives/views/accountMenu.ts b/app/assets/javascripts/directives/views/accountMenu.ts
index d435099b6..37d3ef907 100644
--- a/app/assets/javascripts/directives/views/accountMenu.ts
+++ b/app/assets/javascripts/directives/views/accountMenu.ts
@@ -394,18 +394,22 @@ class AccountMenuCtrl extends PureViewCtrl<{}, AccountMenuState> {
           alertDialog({ text: STRING_UNSUPPORTED_BACKUP_FILE_VERSION });
           return;
         }
-        await this.setState({
-          importData: {
-            ...this.getState().importData,
-            requestPassword: true,
-            data: data
+        if (data.keyParams || data.auth_params) {
+          await this.setState({
+            importData: {
+              ...this.getState().importData,
+              requestPassword: true,
+              data,
+            }
+          });
+          const element = document.getElementById(
+            ELEMENT_ID_IMPORT_PASSWORD_INPUT
+          );
+          if (element) {
+            element.scrollIntoView(false);
           }
-        });
-        const element = document.getElementById(
-          ELEMENT_ID_IMPORT_PASSWORD_INPUT
-        );
-        if (element) {
-          element.scrollIntoView(false);
+        } else {
+          await this.performImport(data, undefined);
         }
       } else {
         await this.performImport(data, undefined);