1 files changed, 49 insertions, 22 deletions

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>
+    );
+  }
+}