From a1727b1b1e92d96596f80934d20d3cb1daab1035 Mon Sep 17 00:00:00 2001
From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com>
Date: Mon, 7 Sep 2020 11:20:45 +0200
Subject: [PATCH] fix: show import error sooner

---
 .../javascripts/directives/views/accountMenu.js   | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/directives/views/accountMenu.js b/app/assets/javascripts/directives/views/accountMenu.js
index ad65243a6..71915f825 100644
--- a/app/assets/javascripts/directives/views/accountMenu.js
+++ b/app/assets/javascripts/directives/views/accountMenu.js
@@ -346,6 +346,12 @@ class AccountMenuCtrl extends PureCtrl {
       if (!data) {
         return;
       }
+      const version = data?.auth_params?.version || data?.keyParams?.version;
+      if (!protocolManager.supportedVersions().includes(version)) {
+        this.setState({ importData: null });
+        this.alertManager.alert({ text: STRING_IMPORT_FAILED_NEWER_BACKUP });
+        return;
+      }
       if (data.auth_params) {
         await this.setState({
           importData: {
@@ -378,15 +384,6 @@ class AccountMenuCtrl extends PureCtrl {
   }
 
   async performImport(data, password) {
-    if (
-      data.keyParams ||
-      (data.auth_params && Number(data.auth_params.version) > protocolManager.version())
-    ) {
-      this.setState({ importData: null });
-      this.alertManager.alert({ text: STRING_IMPORT_FAILED_NEWER_BACKUP });
-      return;
-    }
-
     await this.setState({
       importData: {
         ...this.state.importData,