fix: deactivate themes when switching accounts

standardnotes · Feb 9, 2022 · d920bf6 · d920bf6
1 parent e43c8a6
commit d920bf6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/app/assets/javascripts/components/Footer.tsx b/app/assets/javascripts/components/Footer.tsx
@@ -527,7 +527,6 @@ export class Footer extends PureComponent<Props, State> {
                   className="sk-app-bar-item"
                 >
                   <div
-                    id="account-switcher-icon"
                     className={
                       (this.state.hasPasscode ? 'alone' : '') +
                       ' flex items-center'

diff --git a/app/assets/javascripts/services/themeManager.ts b/app/assets/javascripts/services/themeManager.ts
@@ -170,7 +170,7 @@ export class ThemeManager extends ApplicationService {
     );
   }
 
-  private deactivateAllThemes() {
+  public deactivateAllThemes() {
     const activeThemes = this.activeThemes.slice();
     for (const uuid of activeThemes) {
       this.deactivateTheme(uuid);

diff --git a/app/assets/javascripts/ui_models/application.ts b/app/assets/javascripts/ui_models/application.ts
@@ -73,6 +73,9 @@ export class WebApplication extends SNApplication {
   deinit(source: DeinitSource): void {
     super.deinit(source);
     try {
+      if (source === DeinitSource.AppGroupUnload) {
+        this.getThemeService().deactivateAllThemes();
+      }
       for (const service of Object.values(this.webServices)) {
         if ('deinit' in service) {
           service.deinit?.(source);

diff --git a/app/assets/stylesheets/_footer.scss b/app/assets/stylesheets/_footer.scss
@@ -44,14 +44,6 @@
   }
 }
 
-#account-switcher-icon {
-  // When this icon is alone in the footer bar, it is displayed with too little
-  // padding on the right, possibly due to the fact it is a raw SVG.
-  &.alone {
-    margin-right: 4px;
-  }
-}
-
 #account-panel,
 #sync-resolution-menu {
   width: 400px;