From 6f798e3ba9a7f565da022916e8e50546c0fb5cf2 Mon Sep 17 00:00:00 2001
From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com>
Date: Tue, 8 Sep 2020 18:01:05 +0200
Subject: [PATCH 1/2] fix: check backup file version first before importing

---
 app/assets/javascripts/directives/views/accountMenu.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/directives/views/accountMenu.js b/app/assets/javascripts/directives/views/accountMenu.js
index 71915f825..79878f480 100644
--- a/app/assets/javascripts/directives/views/accountMenu.js
+++ b/app/assets/javascripts/directives/views/accountMenu.js
@@ -346,7 +346,7 @@ class AccountMenuCtrl extends PureCtrl {
       if (!data) {
         return;
       }
-      const version = data?.auth_params?.version || data?.keyParams?.version;
+      const version = data.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 });

From 990b76324e7a220386d8cf6c0710896176beeb43 Mon Sep 17 00:00:00 2001
From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com>
Date: Tue, 8 Sep 2020 18:01:39 +0200
Subject: [PATCH 2/2] chore(version): 3.3.11

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ae96eea2e..9a10aedf7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.3.6",
+  "version": "3.3.11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f868aa8e3..4223224c7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.3.10",
+  "version": "3.3.11",
   "license": "AGPL-3.0-or-later",
   "repository": {
     "type": "git",