6 files changed, 64 insertions, 29 deletions

diff --git a/src/components/ui/AppLoader/index.js b/src/components/ui/AppLoader/index.js
index 1b9d044f4..61053f6d1 100644
--- a/src/components/ui/AppLoader/index.js
+++ b/src/components/ui/AppLoader/index.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import injectSheet from 'react-jss';
+import injectSheet, { withTheme } from 'react-jss';
 import classnames from 'classnames';
 
 import FullscreenLoader from '../FullscreenLoader';
@@ -19,9 +19,10 @@ const textList = shuffleArray([
   'Traveling through space & time',
 ]);
 
-export default @injectSheet(styles) class AppLoader extends Component {
+export default @injectSheet(styles) @withTheme class AppLoader extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
+    theme: PropTypes.object.isRequired,
   }
 
   state = {
@@ -43,13 +44,14 @@ export default @injectSheet(styles) class AppLoader extends Component {
   }
 
   render() {
-    const { classes } = this.props;
+    const { classes, theme } = this.props;
     const { step } = this.state;
 
     return (
       <FullscreenLoader
         title="Franz"
         className={classes.component}
+        spinnerColor={theme.colorAppLoaderSpinner}
       >
         {textList.map((text, i) => (
           <span
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js
index e0a24a527..6ecf4d395 100644
--- a/src/components/ui/FullscreenLoader/index.js
+++ b/src/components/ui/FullscreenLoader/index.js
@@ -1,29 +1,56 @@
-import React from 'react';
-import injectSheet from 'react-jss';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import injectSheet, { withTheme } from 'react-jss';
 import classnames from 'classnames';
-import { inject } from 'mobx-react';
 
 import Loader from '../Loader';
 
 import styles from './styles';
 
-export default inject('stores')(injectSheet(styles)(({
-  stores, classes, className, title, children,
-}) => (
-  <div className={classes.wrapper}>
-    <div
-      className={classnames({
-        [`${classes.component}`]: true,
-        [`${className}`]: className,
-      })}
-    >
-      <h1 className={classes.title}>{title}</h1>
-      <Loader color={stores.settings.app.darkMode ? '#FFF' : '#000'} />
-      {children && (
-        <div className={classes.content}>
-          {children}
+export default @observer @withTheme @injectSheet(styles) class FullscreenLoader extends Component {
+  static propTypes = {
+    className: PropTypes.string,
+    title: PropTypes.string.isRequired,
+    classes: PropTypes.object.isRequired,
+    theme: PropTypes.object.isRequired,
+    spinnerColor: PropTypes.string,
+    children: PropTypes.node,
+  }
+
+  static defaultProps = {
+    className: null,
+    spinnerColor: null,
+    children: null,
+  }
+
+  render() {
+    const {
+      classes,
+      title,
+      children,
+      spinnerColor,
+      className,
+      theme,
+    } = this.props;
+
+    return (
+      <div className={classes.wrapper}>
+        <div
+          className={classnames({
+            [`${classes.component}`]: true,
+            [`${className}`]: className,
+          })}
+        >
+          <h1 className={classes.title}>{title}</h1>
+          <Loader color={spinnerColor || theme.colorFullscreenLoaderSpinner} />
+          {children && (
+            <div className={classes.content}>
+              {children}
+            </div>
+          )}
         </div>
-      )}
-    </div>
-  </div>
-)));
+      </div>
+    );
+  }
+}
diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js
index ab17199e5..3a3dbbe49 100644
--- a/src/components/ui/WebviewLoader/index.js
+++ b/src/components/ui/WebviewLoader/index.js
@@ -1,12 +1,13 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 
 import FullscreenLoader from '../FullscreenLoader';
 
 import styles from './styles';
 
-export default @injectSheet(styles) class WebviewLoader extends Component {
+export default @observer @injectSheet(styles) class WebviewLoader extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     classes: PropTypes.object.isRequired,
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 455df10d7..430b49b55 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -75,7 +75,9 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
 
     if (isLoadingFeatures || isLoadingServices) {
       return (
-        <AppLoader />
+        <ThemeProvider theme={ui.theme}>
+          <AppLoader />
+        </ThemeProvider>
       );
     }
 
diff --git a/src/theme/dark/index.js b/src/theme/dark/index.js
index aafa7cb27..fb1713184 100644
--- a/src/theme/dark/index.js
+++ b/src/theme/dark/index.js
@@ -8,5 +8,6 @@ export const colorBackgroundSubscriptionContainer = legacyStyles.themeBrandInfo;
 export const colorHeadline = legacyStyles.darkThemeTextColor;
 export const colorText = legacyStyles.darkThemeTextColor;
 
-// Webview Loader
+// Loader
+export const colorFullscreenLoaderSpinner = '#FFF';
 export const colorWebviewLoaderBackground = hexToRgba(legacyStyles.darkThemeGrayDarkest, 0.5);
diff --git a/src/theme/default/index.js b/src/theme/default/index.js
index 9640b1cb0..37827621c 100644
--- a/src/theme/default/index.js
+++ b/src/theme/default/index.js
@@ -23,5 +23,7 @@ export const colorSubscriptionContainerTitle = brandPrimary;
 export const colorSubscriptionContainerActionButtonBackground = brandPrimary;
 export const colorSubscriptionContainerActionButtonColor = '#FFF';
 
-// Webview Loader
+// Loader
+export const colorAppLoaderSpinner = '#FFF';
+export const colorFullscreenLoaderSpinner = legacyStyles.themeGrayDark;
 export const colorWebviewLoaderBackground = hexToRgba(legacyStyles.themeGrayLighter, 0.8);