3 files changed, 82 insertions, 20 deletions

diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index aa7f7952a..7c6ceccd6 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 {
@@ -61,42 +63,44 @@ export default class AppLayoutContainer extends Component {
     } = this.props.actions.ui;
 
     const { children } = this.props;
-    const allServices = services.enabled;
 
     const isLoadingServices = services.allServicesRequest.isExecuting
       && services.allServicesRequest.isExecutingFirstTime;
 
-    // const isLoadingRecipes = recipes.allRecipesRequest.isExecuting
-    //   && recipes.allRecipesRequest.isExecutingFirstTime;
-
     if (isLoadingServices) {
       return (
         <AppLoader />
       );
     }
 
+    const isMuted = settings.all.isAppMuted || app.isSystemMuted;
+
     const sidebar = (
       <Sidebar
-        services={allServices}
+        services={services.allDisplayed}
         setActive={setActive}
+        isAppMuted={isMuted}
         openSettings={openSettings}
         closeSettings={closeSettings}
         reorder={reorder}
         reload={reload}
         toggleNotifications={toggleNotifications}
+        toggleAudio={toggleAudio}
         deleteService={deleteService}
         updateService={updateService}
-        isPremiumUser={user.data.isPremium}
+        toggleMuteApp={toggleMuteApp}
       />
     );
 
     const servicesContainer = (
       <Services
-        // settings={allSettings}
-        services={allServices}
+        services={services.allDisplayed}
         handleIPCMessage={handleIPCMessage}
         setWebviewReference={setWebviewReference}
         openWindow={openWindow}
+        reload={reload}
+        isAppMuted={isMuted}
+        update={updateService}
       />
     );
 
@@ -130,7 +134,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 +143,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 +161,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,
+        },
       },
     };
 
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 6dc2175e1..62e255dab 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -7,7 +7,7 @@ import AppStore from '../../stores/AppStore';
 import SettingsStore from '../../stores/SettingsStore';
 import UserStore from '../../stores/UserStore';
 import Form from '../../lib/Form';
-import languages from '../../i18n/languages';
+import { APP_LOCALES } from '../../i18n/languages';
 import { gaPage } from '../../lib/analytics';
 import { DEFAULT_APP_SETTINGS } from '../../config';
 
@@ -39,6 +39,22 @@ const messages = defineMessages({
     id: 'settings.app.form.language',
     defaultMessage: '!!!Language',
   },
+  showDisabledServices: {
+    id: 'settings.app.form.showDisabledServices',
+    defaultMessage: '!!!Display disabled services tabs',
+  },
+  enableSpellchecking: {
+    id: 'settings.app.form.enableSpellchecking',
+    defaultMessage: '!!!Enable spell checking',
+  },
+  spellcheckingLanguage: {
+    id: 'settings.app.form.spellcheckingLanguage',
+    defaultMessage: '!!!Language for spell checking',
+  },
+  // spellcheckingAutomaticDetection: {
+  //   id: 'settings.app.form.spellcheckingAutomaticDetection',
+  //   defaultMessage: '!!!Detect language automatically',
+  // },
   beta: {
     id: 'settings.app.form.beta',
     defaultMessage: '!!!Include beta versions',
@@ -68,6 +84,9 @@ export default class EditSettingsScreen extends Component {
         runInBackground: settingsData.runInBackground,
         enableSystemTray: settingsData.enableSystemTray,
         minimizeToSystemTray: settingsData.minimizeToSystemTray,
+        showDisabledServices: settingsData.showDisabledServices,
+        enableSpellchecking: settingsData.enableSpellchecking,
+        // spellcheckingLanguage: settingsData.spellcheckingLanguage,
         locale: settingsData.locale,
         beta: settingsData.beta,
       },
@@ -84,14 +103,25 @@ export default class EditSettingsScreen extends Component {
     const { app, settings, user } = this.props.stores;
     const { intl } = this.context;
 
-    const options = [];
-    Object.keys(languages).forEach((key) => {
-      options.push({
+    const locales = [];
+    Object.keys(APP_LOCALES).forEach((key) => {
+      locales.push({
         value: key,
-        label: languages[key],
+        label: APP_LOCALES[key],
       });
     });
 
+    // const spellcheckerLocales = [{
+    //   value: 'auto',
+    //   label: intl.formatMessage(messages.spellcheckingAutomaticDetection),
+    // }];
+    // Object.keys(SPELLCHECKER_LOCALES).forEach((key) => {
+    //   spellcheckerLocales.push({
+    //     value: key,
+    //     label: SPELLCHECKER_LOCALES[key],
+    //   });
+    // });
+
     const config = {
       fields: {
         autoLaunchOnStart: {
@@ -119,10 +149,26 @@ export default class EditSettingsScreen extends Component {
           value: settings.all.minimizeToSystemTray,
           default: DEFAULT_APP_SETTINGS.minimizeToSystemTray,
         },
+        showDisabledServices: {
+          label: intl.formatMessage(messages.showDisabledServices),
+          value: settings.all.showDisabledServices,
+          default: DEFAULT_APP_SETTINGS.showDisabledServices,
+        },
+        enableSpellchecking: {
+          label: intl.formatMessage(messages.enableSpellchecking),
+          value: settings.all.enableSpellchecking,
+          default: DEFAULT_APP_SETTINGS.enableSpellchecking,
+        },
+        // spellcheckingLanguage: {
+        //   label: intl.formatMessage(messages.spellcheckingLanguage),
+        //   value: settings.all.spellcheckingLanguage,
+        //   options: spellcheckerLocales,
+        //   default: DEFAULT_APP_SETTINGS.spellcheckingLanguage,
+        // },
         locale: {
           label: intl.formatMessage(messages.language),
           value: app.locale,
-          options,
+          options: locales,
           default: DEFAULT_APP_SETTINGS.locale,
         },
         beta: {