diff options
author | 2019-04-13 20:58:37 +0200 | |
---|---|---|
committer | 2019-04-13 20:58:37 +0200 | |
commit | 8e623e84cf21068561217a509c0761d524dfbc29 (patch) | |
tree | a83f307c3ce087169e3a1d55418fa78a71b7b4dc /src/containers | |
parent | Use store reactions (diff) | |
parent | Merge branch 'feature/announcements' into develop (diff) | |
download | ferdium-app-8e623e84cf21068561217a509c0761d524dfbc29.tar.gz ferdium-app-8e623e84cf21068561217a509c0761d524dfbc29.tar.zst ferdium-app-8e623e84cf21068561217a509c0761d524dfbc29.zip |
Merge branch 'develop' into chore/streamline-dashboard
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 2d855c78f..d2891a6a4 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -23,6 +23,7 @@ import { state as delayAppState } from '../../features/delayApp'; | |||
23 | import { workspaceActions } from '../../features/workspaces/actions'; | 23 | import { workspaceActions } from '../../features/workspaces/actions'; |
24 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; | 24 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; |
25 | import { workspaceStore } from '../../features/workspaces'; | 25 | import { workspaceStore } from '../../features/workspaces'; |
26 | import { announcementsStore } from '../../features/announcements'; | ||
26 | 27 | ||
27 | export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { | 28 | export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { |
28 | static defaultProps = { | 29 | static defaultProps = { |
@@ -135,6 +136,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
135 | isOnline={app.isOnline} | 136 | isOnline={app.isOnline} |
136 | showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar} | 137 | showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar} |
137 | appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED} | 138 | appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED} |
139 | nextAppReleaseVersion={app.nextAppReleaseVersion} | ||
138 | sidebar={sidebar} | 140 | sidebar={sidebar} |
139 | workspacesDrawer={workspacesDrawer} | 141 | workspacesDrawer={workspacesDrawer} |
140 | services={servicesContainer} | 142 | services={servicesContainer} |
@@ -149,6 +151,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
149 | areRequiredRequestsLoading={requests.areRequiredRequestsLoading} | 151 | areRequiredRequestsLoading={requests.areRequiredRequestsLoading} |
150 | darkMode={settings.all.app.darkMode} | 152 | darkMode={settings.all.app.darkMode} |
151 | isDelayAppScreenVisible={delayAppState.isDelayAppScreenVisible} | 153 | isDelayAppScreenVisible={delayAppState.isDelayAppScreenVisible} |
154 | isAnnouncementVisible={announcementsStore.isAnnouncementVisible} | ||
152 | > | 155 | > |
153 | {React.Children.count(children) > 0 ? children : null} | 156 | {React.Children.count(children) > 0 ? children : null} |
154 | </AppLayout> | 157 | </AppLayout> |