1 files changed, 20 insertions, 3 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index c6724c20f..0756a05eb 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -181,7 +181,9 @@ export default class AppStore extends Store {
 
     this.locale = this._getDefaultLocale();
 
-    this._healthCheck();
+    setTimeout(() => {
+      this._healthCheck();
+    }, 1000);
 
     this.isSystemDarkModeEnabled = systemPreferences.isDarkMode();
 
@@ -227,20 +229,35 @@ export default class AppStore extends Store {
   }
 
   @computed get debugInfo() {
+    const settings = JSON.parse(JSON.stringify(this.stores.settings.app));
+    settings.lockedPassword = '******';
+
     return {
       host: {
         platform: process.platform,
         release: os.release(),
         screens: screen.getAllDisplays(),
       },
-      franz: {
+      ferdi: {
         version: app.getVersion(),
         electron: process.versions.electron,
         installedRecipes: this.stores.recipes.all.map(recipe => ({ id: recipe.id, version: recipe.version })),
         devRecipes: this.stores.recipePreviews.dev.map(recipe => ({ id: recipe.id, version: recipe.version })),
-        services: this.stores.services.all.map(service => ({ id: service.id, recipe: service.recipe.id })),
+        services: this.stores.services.all.map(service => ({
+          id: service.id,
+          recipe: service.recipe.id,
+          isAttached: service.isAttached,
+          isActive: service.isActive,
+          isEnabled: service.isEnabled,
+          isHibernating: service.isHibernating,
+          hasCrashed: service.hasCrashed,
+          isDarkModeEnabled: service.isDarkModeEnabled,
+        })),
+        messages: this.stores.globalError.messages,
         workspaces: this.stores.workspaces.workspaces.map(workspace => ({ id: workspace.id, services: workspace.services })),
         windowSettings: readJsonSync(path.join(app.getPath('userData'), 'window-state.json')),
+        settings,
+        features: this.stores.features.features,
         user: this.stores.user.data.id,
       },
     };