diff options
author | 2017-11-23 11:30:19 +0100 | |
---|---|---|
committer | 2017-11-23 11:30:19 +0100 | |
commit | 5573ab7e17400229dd5d79fa50808b38293872fc (patch) | |
tree | d1f933f081032a2bff4965033087f2ed2bfcecf9 /src/containers/layout | |
parent | test tweetdeck glitches (diff) | |
download | ferdium-app-5573ab7e17400229dd5d79fa50808b38293872fc.tar.gz ferdium-app-5573ab7e17400229dd5d79fa50808b38293872fc.tar.zst ferdium-app-5573ab7e17400229dd5d79fa50808b38293872fc.zip |
Add SettingsModel and fix issue with improper mobx data handling
Diffstat (limited to 'src/containers/layout')
-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..7c6ceccd6 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -67,20 +67,19 @@ 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 /> |
76 | ); | 73 | ); |
77 | } | 74 | } |
78 | 75 | ||
76 | const isMuted = settings.all.isAppMuted || app.isSystemMuted; | ||
77 | |||
79 | const sidebar = ( | 78 | const sidebar = ( |
80 | <Sidebar | 79 | <Sidebar |
81 | services={services.allDisplayed} | 80 | services={services.allDisplayed} |
82 | setActive={setActive} | 81 | setActive={setActive} |
83 | isAppMuted={Boolean(app.isSystemMuted) || Boolean(settings.all.isMuted)} | 82 | isAppMuted={isMuted} |
84 | openSettings={openSettings} | 83 | openSettings={openSettings} |
85 | closeSettings={closeSettings} | 84 | closeSettings={closeSettings} |
86 | reorder={reorder} | 85 | reorder={reorder} |
@@ -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={isMuted} |
104 | update={updateService} | 103 | update={updateService} |
105 | /> | 104 | /> |
106 | ); | 105 | ); |