aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/layout/AppLayout.js
diff options
context:
space:
mode:
authorLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-05-08 17:02:09 +0200
committerLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-05-08 17:02:09 +0200
commit1e38ec5e524c71ae89cd7d4956736494b8c13886 (patch)
tree73be43066ff504af701e1c201b209db09abdb302 /src/components/layout/AppLayout.js
parentfix debug message for announcement semver logic (diff)
downloadferdium-app-1e38ec5e524c71ae89cd7d4956736494b8c13886.tar.gz
ferdium-app-1e38ec5e524c71ae89cd7d4956736494b8c13886.tar.zst
ferdium-app-1e38ec5e524c71ae89cd7d4956736494b8c13886.zip
fix(Announcements): Fixes issue with rendering announcments in workspaces
Diffstat (limited to 'src/components/layout/AppLayout.js')
-rw-r--r--src/components/layout/AppLayout.js5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index d5febfaf4..fa83842a4 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -83,7 +83,6 @@ class AppLayout extends Component {
83 areRequiredRequestsLoading: PropTypes.bool.isRequired, 83 areRequiredRequestsLoading: PropTypes.bool.isRequired,
84 darkMode: PropTypes.bool.isRequired, 84 darkMode: PropTypes.bool.isRequired,
85 isDelayAppScreenVisible: PropTypes.bool.isRequired, 85 isDelayAppScreenVisible: PropTypes.bool.isRequired,
86 isAnnouncementVisible: PropTypes.bool.isRequired,
87 }; 86 };
88 87
89 static defaultProps = { 88 static defaultProps = {
@@ -117,7 +116,6 @@ class AppLayout extends Component {
117 areRequiredRequestsLoading, 116 areRequiredRequestsLoading,
118 darkMode, 117 darkMode,
119 isDelayAppScreenVisible, 118 isDelayAppScreenVisible,
120 isAnnouncementVisible,
121 } = this.props; 119 } = this.props;
122 120
123 const { intl } = this.context; 121 const { intl } = this.context;
@@ -197,12 +195,11 @@ class AppLayout extends Component {
197 {isDelayAppScreenVisible && (<DelayApp />)} 195 {isDelayAppScreenVisible && (<DelayApp />)}
198 <BasicAuth /> 196 <BasicAuth />
199 <ShareFranz /> 197 <ShareFranz />
200 {isAnnouncementVisible && (<AnnouncementScreen />)}
201 {services} 198 {services}
199 {children}
202 </div> 200 </div>
203 </div> 201 </div>
204 </div> 202 </div>
205 {children}
206 </div> 203 </div>
207 </ErrorBoundary> 204 </ErrorBoundary>
208 ); 205 );