1 files changed, 8 insertions, 3 deletions

diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 746775a7f..3ababe54a 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -5,6 +5,7 @@ import { defineMessages, intlShape } from 'react-intl';
 import { TitleBar } from 'electron-react-titlebar';
 
 import InfoBar from '../ui/InfoBar';
+import { Component as DelayApp } from '../../features/delayApp';
 import globalMessages from '../../i18n/globalMessages';
 
 import { isWindows } from '../../environment';
@@ -40,8 +41,7 @@ const messages = defineMessages({
   },
 });
 
-@observer
-export default class AppLayout extends Component {
+export default @observer class AppLayout extends Component {
   static propTypes = {
     isFullScreen: PropTypes.bool.isRequired,
     sidebar: PropTypes.element.isRequired,
@@ -58,6 +58,8 @@ export default class AppLayout extends Component {
     areRequiredRequestsSuccessful: PropTypes.bool.isRequired,
     retryRequiredRequests: PropTypes.func.isRequired,
     areRequiredRequestsLoading: PropTypes.bool.isRequired,
+    darkMode: PropTypes.bool.isRequired,
+    isDelayAppScreenVisible: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {
@@ -85,12 +87,14 @@ export default class AppLayout extends Component {
       areRequiredRequestsSuccessful,
       retryRequiredRequests,
       areRequiredRequestsLoading,
+      darkMode,
+      isDelayAppScreenVisible,
     } = this.props;
 
     const { intl } = this.context;
 
     return (
-      <div>
+      <div className={(darkMode ? 'theme__dark' : '')}>
         <div className="app">
           {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />}
           <div className="app__content">
@@ -151,6 +155,7 @@ export default class AppLayout extends Component {
                   </a>
                 </InfoBar>
               )}
+              {isDelayAppScreenVisible && (<DelayApp />)}
               {services}
             </div>
           </div>