2 files changed, 24 insertions, 7 deletions

diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index cd3251082..1b0f4d495 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -7,7 +7,7 @@ import RecipesStore from '../../stores/RecipesStore';
 import ServicesStore from '../../stores/ServicesStore';
 import UIStore from '../../stores/UIStore';
 import NewsStore from '../../stores/NewsStore';
-import UserStore from '../../stores/UserStore';
+import SettingsStore from '../../stores/SettingsStore';
 import RequestStore from '../../stores/RequestStore';
 import GlobalErrorStore from '../../stores/GlobalErrorStore';
 
@@ -29,8 +29,8 @@ export default class AppLayoutContainer extends Component {
       services,
       ui,
       news,
+      settings,
       globalError,
-      user,
       requests,
     } = this.props.stores;
 
@@ -43,6 +43,7 @@ export default class AppLayoutContainer extends Component {
       reorder,
       reload,
       toggleNotifications,
+      toggleAudio,
       deleteService,
       updateService,
     } = this.props.actions.service;
@@ -53,6 +54,7 @@ export default class AppLayoutContainer extends Component {
 
     const {
       installUpdate,
+      toggleMuteApp,
     } = this.props.actions.app;
 
     const {
@@ -78,14 +80,16 @@ export default class AppLayoutContainer extends Component {
       <Sidebar
         services={services.allDisplayed}
         setActive={setActive}
+        isAppMuted={app.isSystemMuted || settings.all.isMuted}
         openSettings={openSettings}
         closeSettings={closeSettings}
         reorder={reorder}
         reload={reload}
         toggleNotifications={toggleNotifications}
+        toggleAudio={toggleAudio}
         deleteService={deleteService}
         updateService={updateService}
-        isPremiumUser={user.data.isPremium}
+        toggleMuteApp={toggleMuteApp}
       />
     );
 
@@ -96,6 +100,7 @@ export default class AppLayoutContainer extends Component {
         setWebviewReference={setWebviewReference}
         openWindow={openWindow}
         reload={reload}
+        isAppMuted={settings.all.isMuted}
         update={updateService}
       />
     );
@@ -130,7 +135,7 @@ AppLayoutContainer.wrappedComponent.propTypes = {
     app: PropTypes.instanceOf(AppStore).isRequired,
     ui: PropTypes.instanceOf(UIStore).isRequired,
     news: PropTypes.instanceOf(NewsStore).isRequired,
-    user: PropTypes.instanceOf(UserStore).isRequired,
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
     requests: PropTypes.instanceOf(RequestStore).isRequired,
     globalError: PropTypes.instanceOf(GlobalErrorStore).isRequired,
   }).isRequired,
@@ -139,6 +144,7 @@ AppLayoutContainer.wrappedComponent.propTypes = {
       setActive: PropTypes.func.isRequired,
       reload: PropTypes.func.isRequired,
       toggleNotifications: PropTypes.func.isRequired,
+      toggleAudio: PropTypes.func.isRequired,
       handleIPCMessage: PropTypes.func.isRequired,
       setWebviewReference: PropTypes.func.isRequired,
       openWindow: PropTypes.func.isRequired,
@@ -156,7 +162,7 @@ AppLayoutContainer.wrappedComponent.propTypes = {
     }).isRequired,
     app: PropTypes.shape({
       installUpdate: PropTypes.func.isRequired,
-      healthCheck: PropTypes.func.isRequired,
+      toggleMuteApp: PropTypes.func.isRequired,
     }).isRequired,
     requests: PropTypes.shape({
       retryRequiredRequests: PropTypes.func.isRequired,
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 6c614b941..191ef447b 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -9,7 +9,6 @@ import ServicesStore from '../../stores/ServicesStore';
 import Form from '../../lib/Form';
 import { gaPage } from '../../lib/analytics';
 
-
 import ServiceError from '../../components/settings/services/ServiceError';
 import EditServiceForm from '../../components/settings/services/EditServiceForm';
 import { required, url, oneRequired } from '../../helpers/validation-helpers';
@@ -27,6 +26,10 @@ const messages = defineMessages({
     id: 'settings.service.form.enableNotification',
     defaultMessage: '!!!Enable Notifications',
   },
+  enableAudio: {
+    id: 'settings.service.form.enableAudio',
+    defaultMessage: '!!!Enable audio',
+  },
   team: {
     id: 'settings.service.form.team',
     defaultMessage: '!!!Team',
@@ -51,11 +54,14 @@ export default class EditServiceScreen extends Component {
     gaPage('Settings/Service/Edit');
   }
 
-  onSubmit(serviceData) {
+  onSubmit(data) {
     const { action } = this.props.router.params;
     const { recipes, services } = this.props.stores;
     const { createService, updateService } = this.props.actions.service;
 
+    const serviceData = data;
+    serviceData.isMuted = !serviceData.isMuted;
+
     if (action === 'edit') {
       updateService({ serviceId: services.activeSettings.id, serviceData });
     } else {
@@ -82,6 +88,11 @@ export default class EditServiceScreen extends Component {
           value: service.isNotificationEnabled,
           default: true,
         },
+        isMuted: {
+          label: intl.formatMessage(messages.enableAudio),
+          value: !service.isMuted,
+          default: true,
+        },
       },
     };