Use 'DEFAULT_SERVICE_SETTINGS' to initialize service-state

2 files changed, 17 insertions, 12 deletions

diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 58aaebc69..63face219 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -344,9 +344,9 @@
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
-  "settings.service.form.enableMediaBadge": "Enable Media Play Indicator",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
   "settings.service.form.enableHibernation": "Enable hibernation",
+  "settings.service.form.enableMediaBadge": "Enable Media Play Indicator",
   "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableProgressbar": "Enable Progress bar",
   "settings.service.form.enableService": "Enable service",
@@ -492,4 +492,4 @@
   "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdium Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
-}
+}
\ No newline at end of file
diff --git a/src/models/Service.ts b/src/models/Service.ts
index e45909631..493620ba4 100644
--- a/src/models/Service.ts
+++ b/src/models/Service.ts
@@ -47,22 +47,23 @@ export default class Service {
 
   @observable order: number = DEFAULT_SERVICE_ORDER;
 
-  @observable isEnabled: boolean = true;
+  @observable isEnabled: boolean = DEFAULT_SERVICE_SETTINGS.isEnabled;
 
-  @observable isMuted: boolean = false;
+  @observable isMuted: boolean = DEFAULT_SERVICE_SETTINGS.isMuted;
 
   @observable team: string = '';
 
   @observable customUrl: string = '';
 
-  @observable isNotificationEnabled: boolean = true;
+  @observable isNotificationEnabled: boolean =
+    DEFAULT_SERVICE_SETTINGS.isNotificationEnabled;
 
-  @observable isBadgeEnabled: boolean = true;
+  @observable isBadgeEnabled: boolean = DEFAULT_SERVICE_SETTINGS.isBadgeEnabled;
 
   @observable isMediaBadgeEnabled: boolean =
     DEFAULT_SERVICE_SETTINGS.isMediaBadgeEnabled;
 
-  @observable trapLinkClicks: boolean = false;
+  @observable trapLinkClicks: boolean = DEFAULT_SERVICE_SETTINGS.trapLinkClicks;
 
   @observable isIndirectMessageBadgeEnabled: boolean = true;
 
@@ -74,9 +75,11 @@ export default class Service {
 
   @observable hasCrashed: boolean = false;
 
-  @observable isDarkModeEnabled: boolean = false;
+  @observable isDarkModeEnabled: boolean =
+    DEFAULT_SERVICE_SETTINGS.isDarkModeEnabled;
 
-  @observable isProgressbarEnabled: boolean = true;
+  @observable isProgressbarEnabled: boolean =
+    DEFAULT_SERVICE_SETTINGS.isProgressbarEnabled;
 
   @observable darkReaderSettings: DarkReaderInterface = {
     brightness: 100,
@@ -100,12 +103,14 @@ export default class Service {
 
   @observable isServiceAccessRestricted: boolean = false;
 
-  // todo is this used?
+  // TODO: is this used?
   @observable restrictionType = null;
 
-  @observable isHibernationEnabled: boolean = false;
+  @observable isHibernationEnabled: boolean =
+    DEFAULT_SERVICE_SETTINGS.isHibernationEnabled;
 
-  @observable isWakeUpEnabled: boolean = true;
+  @observable isWakeUpEnabled: boolean =
+    DEFAULT_SERVICE_SETTINGS.isWakeUpEnabled;
 
   @observable isHibernationRequested: boolean = false;