fix(App): App mute now disables notifications as well

meetfranz · Nov 29, 2017 · 0fa1caf · 0fa1caf
1 parent 0ca3912
commit 0fa1caf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
@@ -17,12 +17,12 @@ const messages = defineMessages({
     defaultMessage: '!!!Add new service',
   },
   mute: {
-    id: 'sidebar.mute',
-    defaultMessage: '!!!Disable audio',
+    id: 'sidebar.muteApp',
+    defaultMessage: '!!!Disable notifications & audio',
   },
   unmute: {
-    id: 'sidebar.unmute',
-    defaultMessage: '!!!Enable audio',
+    id: 'sidebar.unmuteApp',
+    defaultMessage: '!!!Enable notifications & audio',
   },
 });
 

diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
@@ -62,8 +62,8 @@
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "sidebar.settings": "Settings",
   "sidebar.addNewService": "Add new service",
-  "sidebar.mute": "Disable audio",
-  "sidebar.unmute": "Enable audio",
+  "sidebar.muteApp": "Disable notifications & audio",
+  "sidebar.unmuteApp": "Enable notifications & audio",
   "services.welcome": "Welcome to Franz",
   "services.getStarted": "Get started",
   "settings.account.headline": "Account",

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
@@ -150,6 +150,8 @@ export default class AppStore extends Store {
 
   // Actions
   @action _notify({ title, options, notificationId, serviceId = null }) {
+    if (this.stores.settings.all.isAppMuted) return;
+
     const notification = new window.Notification(title, options);
     notification.onclick = (e) => {
       if (serviceId) {