aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers/layout
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2018-04-04 21:23:38 +0200
committerLibravatar GitHub <noreply@github.com>2018-04-04 21:23:38 +0200
commit1790b795238c2abe832285197cb88c0833bd98ca (patch)
tree89d4bc3632efc05822c0bec53a883b2d092bfd69 /src/containers/layout
parentFix typo [ci skip] (diff)
parentMerge branch 'master' into release/5.0.0-beta.18 (diff)
downloadferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.tar.gz
ferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.tar.zst
ferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.zip
5.0.0 beta.18v5.0.0-beta.18
Diffstat (limited to 'src/containers/layout')
-rw-r--r--src/containers/layout/AppLayoutContainer.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 075bd5e34..9212f809f 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -77,7 +77,7 @@ export default class AppLayoutContainer extends Component {
77 <Sidebar 77 <Sidebar
78 services={services.allDisplayed} 78 services={services.allDisplayed}
79 setActive={setActive} 79 setActive={setActive}
80 isAppMuted={settings.all.isAppMuted} 80 isAppMuted={settings.all.app.isAppMuted}
81 openSettings={openSettings} 81 openSettings={openSettings}
82 closeSettings={closeSettings} 82 closeSettings={closeSettings}
83 reorder={reorder} 83 reorder={reorder}
@@ -87,7 +87,7 @@ export default class AppLayoutContainer extends Component {
87 deleteService={deleteService} 87 deleteService={deleteService}
88 updateService={updateService} 88 updateService={updateService}
89 toggleMuteApp={toggleMuteApp} 89 toggleMuteApp={toggleMuteApp}
90 showMessageBadgeWhenMutedSetting={settings.all.showMessageBadgeWhenMuted} 90 showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted}
91 showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} 91 showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted}
92 /> 92 />
93 ); 93 );
@@ -99,13 +99,14 @@ export default class AppLayoutContainer extends Component {
99 setWebviewReference={setWebviewReference} 99 setWebviewReference={setWebviewReference}
100 openWindow={openWindow} 100 openWindow={openWindow}
101 reload={reload} 101 reload={reload}
102 isAppMuted={settings.all.isAppMuted} 102 isAppMuted={settings.all.app.isAppMuted}
103 update={updateService} 103 update={updateService}
104 /> 104 />
105 ); 105 );
106 106
107 return ( 107 return (
108 <AppLayout 108 <AppLayout
109 isFullScreen={app.isFullScreen}
109 isOnline={app.isOnline} 110 isOnline={app.isOnline}
110 showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar} 111 showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar}
111 appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED} 112 appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED}