Merge branch 'release/3.6.1' into main

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

app/assets/javascripts/services/bridge.ts

@@ -18,5 +18,5 @@ export interface Bridge {
   onMajorDataChange(): void;
   onInitialDataLoad(): void;
   onSearch(text?: string): void;
-  downloadBackup(): void;
+  downloadBackup(): void | Promise<void>;
 }

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(): void | Promise<void> {
+    return this.bridge.downloadBackup();
+  }
+
   authenticationInProgress() {
     return this.currentAuthenticationElement != null;
   }

app/assets/stylesheets/_reach-sub.scss

@@ -28,6 +28,7 @@
   flex-basis: 0;
   min-width: 400px;
   max-width: 600px;
+  background: none;
 }
 
 [data-reach-dialog-content] .sk-modal-content,

app/assets/stylesheets/_stylekit-sub.scss

@@ -1,3 +1,7 @@
+:root {
+  --sn-stylekit-font-size-editor: 1.154rem;
+}
+
 .sn-component {
   .sk-notification {
     &.unpadded {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "license": "AGPL-3.0-or-later",
   "repository": {
     "type": "git",