diff options
Diffstat (limited to 'src/containers/layout/AppLayoutContainer.js')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 8e5b3d2ed..e4a9d60c3 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -67,9 +67,6 @@ export default class AppLayoutContainer extends Component { | |||
67 | const isLoadingServices = services.allServicesRequest.isExecuting | 67 | const isLoadingServices = services.allServicesRequest.isExecuting |
68 | && services.allServicesRequest.isExecutingFirstTime; | 68 | && services.allServicesRequest.isExecutingFirstTime; |
69 | 69 | ||
70 | // const isLoadingRecipes = recipes.allRecipesRequest.isExecuting | ||
71 | // && recipes.allRecipesRequest.isExecutingFirstTime; | ||
72 | |||
73 | if (isLoadingServices) { | 70 | if (isLoadingServices) { |
74 | return ( | 71 | return ( |
75 | <AppLoader /> | 72 | <AppLoader /> |
@@ -80,7 +77,7 @@ export default class AppLayoutContainer extends Component { | |||
80 | <Sidebar | 77 | <Sidebar |
81 | services={services.allDisplayed} | 78 | services={services.allDisplayed} |
82 | setActive={setActive} | 79 | setActive={setActive} |
83 | isAppMuted={Boolean(app.isSystemMuted) || Boolean(settings.all.isMuted)} | 80 | isAppMuted={settings.all.isAppMuted} |
84 | openSettings={openSettings} | 81 | openSettings={openSettings} |
85 | closeSettings={closeSettings} | 82 | closeSettings={closeSettings} |
86 | reorder={reorder} | 83 | reorder={reorder} |
@@ -90,6 +87,8 @@ export default class AppLayoutContainer extends Component { | |||
90 | deleteService={deleteService} | 87 | deleteService={deleteService} |
91 | updateService={updateService} | 88 | updateService={updateService} |
92 | toggleMuteApp={toggleMuteApp} | 89 | toggleMuteApp={toggleMuteApp} |
90 | showMessageBadgeWhenMutedSetting={settings.all.showMessageBadgeWhenMuted} | ||
91 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} | ||
93 | /> | 92 | /> |
94 | ); | 93 | ); |
95 | 94 | ||
@@ -100,7 +99,7 @@ export default class AppLayoutContainer extends Component { | |||
100 | setWebviewReference={setWebviewReference} | 99 | setWebviewReference={setWebviewReference} |
101 | openWindow={openWindow} | 100 | openWindow={openWindow} |
102 | reload={reload} | 101 | reload={reload} |
103 | isAppMuted={settings.all.isMuted || false} | 102 | isAppMuted={settings.all.isAppMuted} |
104 | update={updateService} | 103 | update={updateService} |
105 | /> | 104 | /> |
106 | ); | 105 | ); |