Merge branch 'develop' into feature/multiple-selection

app/assets/javascripts/ui_models/app_state/account_menu_state.ts

@@ -2,12 +2,16 @@ import { action, makeObservable, observable } from "mobx";
 
 export class AccountMenuState {
   show = false;
+  signingOut = false;
 
   constructor() {
     makeObservable(this, {
       show: observable,
+      signingOut: observable,
+
       setShow: action,
       toggleShow: action,
+      setSigningOut: action,
     });
   }
 
@@ -15,6 +19,10 @@ export class AccountMenuState {
     this.show = show;
   }
 
+  setSigningOut = (signingOut: boolean): void => {
+    this.signingOut = signingOut;
+  }
+
   toggleShow = (): void => {
     this.show = !this.show;
   }

app/assets/javascripts/ui_models/app_state/search_options_state.ts

@@ -4,7 +4,7 @@ import { WebApplication } from "../application";
 
 export class SearchOptionsState {
   includeProtectedContents = false;
-  includeArchived = false;
+  includeArchived = true;
   includeTrashed = false;
 
   constructor(

app/assets/javascripts/ui_models/application.ts

@@ -52,7 +52,7 @@ export class WebApplication extends SNApplication {
     private $compile: angular.ICompileService,
     scope: angular.IScope,
     defaultSyncServerHost: string,
-    private bridge: Bridge,
+    public bridge: Bridge,
   ) {
     super(
       bridge.environment,
@@ -168,6 +168,11 @@ export class WebApplication extends SNApplication {
     return angular.element(document.getElementById(this.identifier)!);
   }
 
+  async signOutAndDeleteLocalBackups(): Promise<void> {
+    await this.bridge.deleteLocalBackups();
+    return this.signOut();
+  }
+
   presentPasswordModal(callback: () => void) {
     const scope = this.scope!.$new(true) as InputModalScope;
     scope.type = "password";