From 9541886a2c1ea5f9e668677bcbd0cfa538c3d546 Mon Sep 17 00:00:00 2001
From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com>
Date: Wed, 3 Mar 2021 14:30:24 +0100
Subject: [PATCH] fix: download backup later in the change password process

---
 app/assets/javascripts/directives/views/passwordWizard.ts | 3 ++-
 app/assets/javascripts/services/bridge.ts                 | 2 +-
 app/assets/javascripts/ui_models/application.ts           | 5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/directives/views/passwordWizard.ts b/app/assets/javascripts/directives/views/passwordWizard.ts
index 934ebb1fe..4f0dfe8ee 100644
--- a/app/assets/javascripts/directives/views/passwordWizard.ts
+++ b/app/assets/javascripts/directives/views/passwordWizard.ts
@@ -173,12 +173,13 @@ class PasswordWizardCtrl extends PureViewCtrl<Props, State> implements PasswordW
   }
 
   async processPasswordChange() {
+    await this.application.downloadBackup();
     await this.setState({
       lockContinue: true,
       processing: true
     });
     await this.setFormDataState({
-      status: "Processing encryption keys..."
+      status: "Processing encryption keys…"
     });
     const newPassword = this.props.securityUpdate
       ? this.state.formData.currentPassword
diff --git a/app/assets/javascripts/services/bridge.ts b/app/assets/javascripts/services/bridge.ts
index 3466cf1fd..d68ab7916 100644
--- a/app/assets/javascripts/services/bridge.ts
+++ b/app/assets/javascripts/services/bridge.ts
@@ -18,5 +18,5 @@ export interface Bridge {
   onMajorDataChange(): void;
   onInitialDataLoad(): void;
   onSearch(text?: string): void;
-  downloadBackup(): void;
+  downloadBackup(): Promise<void>;
 }
diff --git a/app/assets/javascripts/ui_models/application.ts b/app/assets/javascripts/ui_models/application.ts
index 2bc8b2c66..9fa8d2caa 100644
--- a/app/assets/javascripts/ui_models/application.ts
+++ b/app/assets/javascripts/ui_models/application.ts
@@ -147,7 +147,6 @@ export class WebApplication extends SNApplication {
   }
 
   presentPasswordWizard(type: PasswordWizardType) {
-    this.bridge.downloadBackup();
     const scope = this.scope!.$new(true) as PasswordWizardScope;
     scope.type = type;
     scope.application = this;
@@ -157,6 +156,10 @@ export class WebApplication extends SNApplication {
     this.applicationElement.append(el);
   }
 
+  downloadBackup(): Promise<void> {
+    return this.bridge.downloadBackup();
+  }
+
   authenticationInProgress() {
     return this.currentAuthenticationElement != null;
   }