10 files changed, 22 insertions, 43 deletions

diff --git a/src/components/ui/ActivateTrialButton/index.js b/src/components/ui/ActivateTrialButton/index.js
index e0637da90..340123c2f 100644
--- a/src/components/ui/ActivateTrialButton/index.js
+++ b/src/components/ui/ActivateTrialButton/index.js
@@ -5,7 +5,6 @@ import { defineMessages, intlShape } from 'react-intl';
 import classnames from 'classnames';
 
 import { Button } from '@meetfranz/forms';
-import { gaEvent } from '../../../lib/analytics';
 
 import UserStore from '../../../stores/UserStore';
 
@@ -63,25 +62,9 @@ class ActivateTrialButton extends Component {
   };
 
   handleCTAClick() {
-    const { actions, stores, gaEventInfo } = this.props;
-    const { hadSubscription } = stores.user.data;
-    // const { defaultTrialPlan } = stores.features.features;
-
-    let label = '';
-    if (!hadSubscription) {
-      // actions.user.activateTrial({ planId: defaultTrialPlan });
-
-      label = 'Start Trial';
-    } else {
-      label = 'Upgrade Account';
-    }
+    const { actions } = this.props;
 
     actions.ui.openSettings({ path: 'user' });
-
-    if (gaEventInfo) {
-      const { category, event } = gaEventInfo;
-      gaEvent(category, event, label);
-    }
   }
 
   render() {
diff --git a/src/components/ui/AppLoader/index.js b/src/components/ui/AppLoader/index.js
index b0c7fed7b..1fd247d17 100644
--- a/src/components/ui/AppLoader/index.js
+++ b/src/components/ui/AppLoader/index.js
@@ -9,14 +9,13 @@ import { shuffleArray } from '../../../helpers/array-helpers';
 import styles from './styles';
 
 const textList = shuffleArray([
-  'Looking for Sisi',
-  'Contacting the herald',
-  'Saddling the unicorn',
-  'Learning the Waltz',
-  'Visiting Horst & Grete',
-  'Twisting my moustache',
-  'Playing the trumpet',
-  'Traveling through space & time',
+  'Adding free features',
+  'Making application usable',
+  'Removing unproductive paywalls',
+  'Creating custom server software',
+  'Increasing productivity',
+  'Listening to our userbase',
+  'Fixing bugs',
 ]);
 
 export default @injectSheet(styles) @withTheme class AppLoader extends Component {
@@ -49,7 +48,7 @@ export default @injectSheet(styles) @withTheme class AppLoader extends Component
 
     return (
       <FullscreenLoader
-        title="Franz"
+        title="Ferdi"
         className={classes.component}
         spinnerColor={theme.colorAppLoaderSpinner}
       >
diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js
index ffc7f7051..e2d7cea83 100644
--- a/src/components/ui/Button.js
+++ b/src/components/ui/Button.js
@@ -69,7 +69,7 @@ export default @observer class Button extends Component {
           loaded={loaded}
           lines={10}
           scale={0.4}
-          color={buttonType !== 'secondary' ? '#FFF' : '#373a3c'}
+          color={buttonType !== 'secondary' ? '#FFF' : '#7367F0'}
           component="span"
         />
         {label}
diff --git a/src/components/ui/FullscreenLoader/styles.js b/src/components/ui/FullscreenLoader/styles.js
index 64d24e4ce..d516781a8 100644
--- a/src/components/ui/FullscreenLoader/styles.js
+++ b/src/components/ui/FullscreenLoader/styles.js
@@ -4,6 +4,7 @@ export default {
     alignItems: 'center',
     position: 'absolute',
     width: '100%',
+    background: 'linear-gradient( 135deg, #CE9FFC 10%, #7367F0 100%)',
   },
   component: {
     width: '100%',
diff --git a/src/components/ui/Input.js b/src/components/ui/Input.js
index 9b070c4df..4e3eb4ab8 100644
--- a/src/components/ui/Input.js
+++ b/src/components/ui/Input.js
@@ -68,7 +68,7 @@ export default @observer class Input extends Component {
 
     const { passwordScore } = this.state;
 
-    let type = field.type;
+    let { type } = field;
     if (type === 'password' && this.state.showPassword) {
       type = 'text';
     }
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js
index b88686d5e..5f729844b 100644
--- a/src/components/ui/Link.js
+++ b/src/components/ui/Link.js
@@ -25,6 +25,7 @@ export default @inject('stores') @observer class Link extends Component {
       className,
       activeClassName,
       strictFilter,
+      style,
     } = this.props;
     const { router } = stores;
 
@@ -44,6 +45,7 @@ export default @inject('stores') @observer class Link extends Component {
       <a
         href={router.history.createHref(to)}
         className={linkClasses}
+        style={style}
         onClick={e => this.onClick(e)}
       >
         {children}
@@ -65,6 +67,7 @@ Link.wrappedComponent.propTypes = {
   activeClassName: PropTypes.string,
   strictFilter: PropTypes.bool,
   target: PropTypes.string,
+  style: PropTypes.object,
 };
 
 Link.wrappedComponent.defaultProps = {
@@ -72,4 +75,5 @@ Link.wrappedComponent.defaultProps = {
   activeClassName: '',
   strictFilter: false,
   target: '',
+  style: {},
 };
diff --git a/src/components/ui/Loader.js b/src/components/ui/Loader.js
index f73296bb6..de8769b6c 100644
--- a/src/components/ui/Loader.js
+++ b/src/components/ui/Loader.js
@@ -16,7 +16,7 @@ export default class LoaderComponent extends Component {
     children: null,
     loaded: false,
     className: '',
-    color: '#373a3c',
+    color: '#7367F0',
   };
 
   render() {
diff --git a/src/components/ui/Modal/index.js b/src/components/ui/Modal/index.js
index 63d858c47..0af521452 100644
--- a/src/components/ui/Modal/index.js
+++ b/src/components/ui/Modal/index.js
@@ -41,6 +41,8 @@ export default @injectCSS(styles) class Modal extends Component {
       showClose,
     } = this.props;
 
+    const appRoot = document.getElementById('root');
+
     return (
       <ReactModal
         isOpen={isOpen}
@@ -53,6 +55,7 @@ export default @injectCSS(styles) class Modal extends Component {
         portal={portal}
         onRequestClose={close}
         shouldCloseOnOverlayClick={shouldCloseOnOverlayClick}
+        appElement={appRoot}
       >
         {showClose && close && (
           <button
diff --git a/src/components/ui/PremiumFeatureContainer/index.js b/src/components/ui/PremiumFeatureContainer/index.js
index 8d2746e22..7ba353be3 100644
--- a/src/components/ui/PremiumFeatureContainer/index.js
+++ b/src/components/ui/PremiumFeatureContainer/index.js
@@ -9,8 +9,7 @@ import { oneOrManyChildElements } from '../../../prop-types';
 import UserStore from '../../../stores/UserStore';
 
 import styles from './styles';
-import { gaEvent } from '../../../lib/analytics';
-import { FeatureStore } from '../../../features/utils/FeatureStore';
+import FeatureStore from '../../../stores/FeaturesStore';
 
 const messages = defineMessages({
   action: {
@@ -50,7 +49,6 @@ class PremiumFeatureContainer extends Component {
       actions,
       condition,
       stores,
-      gaEventInfo,
     } = this.props;
 
     const { intl } = this.context;
@@ -75,10 +73,6 @@ class PremiumFeatureContainer extends Component {
             type="button"
             onClick={() => {
               actions.ui.openSettings({ path: 'user' });
-              if (gaEventInfo) {
-                const { category, event, label } = gaEventInfo;
-                gaEvent(category, event, label);
-              }
             }}
           >
             {intl.formatMessage(messages.action)}
diff --git a/src/components/ui/UpgradeButton/index.js b/src/components/ui/UpgradeButton/index.js
index 73762f0bf..1b764bd90 100644
--- a/src/components/ui/UpgradeButton/index.js
+++ b/src/components/ui/UpgradeButton/index.js
@@ -4,7 +4,6 @@ import { inject, observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 
 import { Button } from '@meetfranz/forms';
-import { gaEvent } from '../../../lib/analytics';
 
 import UserStore from '../../../stores/UserStore';
 import ActivateTrialButton from '../ActivateTrialButton';
@@ -41,13 +40,9 @@ class UpgradeButton extends Component {
   };
 
   handleCTAClick() {
-    const { actions, gaEventInfo } = this.props;
+    const { actions } = this.props;
 
     actions.ui.openSettings({ path: 'user' });
-    if (gaEventInfo) {
-      const { category, event } = gaEventInfo;
-      gaEvent(category, event, 'Upgrade Account');
-    }
   }
 
   render() {