From 5573ab7e17400229dd5d79fa50808b38293872fc Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Thu, 23 Nov 2017 11:30:19 +0100
Subject: Add SettingsModel and fix issue with improper mobx data handling

---
 src/containers/layout/AppLayoutContainer.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/containers/layout')

diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 8e5b3d2ed..7c6ceccd6 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -67,20 +67,19 @@ export default class AppLayoutContainer extends Component {
     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={services.allDisplayed}
         setActive={setActive}
-        isAppMuted={Boolean(app.isSystemMuted) || Boolean(settings.all.isMuted)}
+        isAppMuted={isMuted}
         openSettings={openSettings}
         closeSettings={closeSettings}
         reorder={reorder}
@@ -100,7 +99,7 @@ export default class AppLayoutContainer extends Component {
         setWebviewReference={setWebviewReference}
         openWindow={openWindow}
         reload={reload}
-        isAppMuted={settings.all.isMuted || false}
+        isAppMuted={isMuted}
         update={updateService}
       />
     );
-- 
cgit v1.2.3-70-g09d2