diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-11-10 15:40:01 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2017-11-10 15:40:01 +0100 |
commit | f39e31af92f3ae6689697685d008f0487a5be351 (patch) | |
tree | c00654dbb28817cbfdca8223c1f86d38c706e163 /src/containers/layout | |
parent | feat(App): Respect System DoNotDisturb mode for service audio (diff) | |
parent | Merge pull request #248 from meetfranz/feature/192-display-disabled-services (diff) | |
download | ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.tar.gz ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.tar.zst ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.zip |
Merge branch 'develop' into feature/mute-service
# Conflicts:
# src/components/services/content/ServiceWebview.js
# src/components/services/content/Services.js
# src/components/services/tabs/TabItem.js
# src/containers/layout/AppLayoutContainer.js
Diffstat (limited to 'src/containers/layout')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 28b6a105f..1b0f4d495 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -63,7 +63,6 @@ export default class AppLayoutContainer extends Component { | |||
63 | } = this.props.actions.ui; | 63 | } = this.props.actions.ui; |
64 | 64 | ||
65 | const { children } = this.props; | 65 | const { children } = this.props; |
66 | const allServices = services.enabled; | ||
67 | 66 | ||
68 | const isLoadingServices = services.allServicesRequest.isExecuting | 67 | const isLoadingServices = services.allServicesRequest.isExecuting |
69 | && services.allServicesRequest.isExecutingFirstTime; | 68 | && services.allServicesRequest.isExecutingFirstTime; |
@@ -79,7 +78,7 @@ export default class AppLayoutContainer extends Component { | |||
79 | 78 | ||
80 | const sidebar = ( | 79 | const sidebar = ( |
81 | <Sidebar | 80 | <Sidebar |
82 | services={allServices} | 81 | services={services.allDisplayed} |
83 | setActive={setActive} | 82 | setActive={setActive} |
84 | isAppMuted={app.isSystemMuted || settings.all.isMuted} | 83 | isAppMuted={app.isSystemMuted || settings.all.isMuted} |
85 | openSettings={openSettings} | 84 | openSettings={openSettings} |
@@ -96,12 +95,13 @@ export default class AppLayoutContainer extends Component { | |||
96 | 95 | ||
97 | const servicesContainer = ( | 96 | const servicesContainer = ( |
98 | <Services | 97 | <Services |
99 | services={allServices} | 98 | services={services.allDisplayed} |
100 | handleIPCMessage={handleIPCMessage} | 99 | handleIPCMessage={handleIPCMessage} |
101 | setWebviewReference={setWebviewReference} | 100 | setWebviewReference={setWebviewReference} |
102 | openWindow={openWindow} | 101 | openWindow={openWindow} |
103 | reload={reload} | 102 | reload={reload} |
104 | isAppMuted={settings.all.isMuted} | 103 | isAppMuted={settings.all.isMuted} |
104 | update={updateService} | ||
105 | /> | 105 | /> |
106 | ); | 106 | ); |
107 | 107 | ||