3 files changed, 33 insertions, 71 deletions

diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 9c9543749..f2d3ca8c0 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -169,15 +169,9 @@ export default @observer class AccountDashboard extends Component {
                       {user.organization && `${user.organization}, `}
                       {user.email}
                       <br />
-                      {!user.isEnterprise && !user.isPremium && (
-                        <span className="badge badge">{intl.formatMessage(messages.accountTypeBasic)}</span>
-                      )}
                       {user.isPremium && (
                         <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span>
                       )}
-                      {user.isEnterprise && (
-                        <span className="badge badge--success">{intl.formatMessage(messages.accountTypeEnterprise)}</span>
-                      )}
                     </div>
                     <Link to="/settings/user/edit" className="button">
                       {intl.formatMessage(messages.accountEditButton)}
@@ -235,34 +229,7 @@ export default @observer class AccountDashboard extends Component {
                 )
               )}
 
-              {user.isEnterprise && (
-                <div className="account">
-                  <div className="account__box">
-                    <h2>{user.company.name}</h2>
-                    <p>
-                      Technical contact:&nbsp;
-                      <Link
-                        className="link"
-                        target="_blank"
-                        to={`mailto:${user.company.contact.technical}?subject=Franz`}
-                      >
-                        {user.company.contact.technical}
-                      </Link>
-                      <br />
-                      General contact:&nbsp;
-                      <Link
-                        className="link"
-                        target="_blank"
-                        to={`mailto:${user.company.contact.default}?subject=Franz`}
-                      >
-                        {user.company.contact.default}
-                      </Link>
-                    </p>
-                  </div>
-                </div>
-              )}
-
-              {!user.isEnterprise && !user.isPremium && (
+              {!user.isPremium && (
                 isLoadingPlans ? (
                   <Loader />
                 ) : (
@@ -277,27 +244,25 @@ export default @observer class AccountDashboard extends Component {
                 )
               )}
 
-              {!user.isEnterprise && (
-                <div className="account franz-form">
-                  <div className="account__box">
-                    <h2>{intl.formatMessage(messages.headlineDangerZone)}</h2>
-                    {!isDeleteAccountSuccessful && (
-                      <div className="account__subscription">
-                        <p>{intl.formatMessage(messages.deleteInfo)}</p>
-                        <Button
-                          label={intl.formatMessage(messages.deleteAccount)}
-                          buttonType="danger"
-                          onClick={() => deleteAccount()}
-                          loaded={!isLoadingDeleteAccount}
-                        />
-                      </div>
-                    )}
-                    {isDeleteAccountSuccessful && (
-                      <p>{intl.formatMessage(messages.deleteEmailSent)}</p>
-                    )}
+              <div className="account franz-form">
+                <div className="account__box">
+                  <h2>{intl.formatMessage(messages.headlineDangerZone)}</h2>
+                  {!isDeleteAccountSuccessful && (
+                  <div className="account__subscription">
+                    <p>{intl.formatMessage(messages.deleteInfo)}</p>
+                    <Button
+                      label={intl.formatMessage(messages.deleteAccount)}
+                      buttonType="danger"
+                      onClick={() => deleteAccount()}
+                      loaded={!isLoadingDeleteAccount}
+                    />
                   </div>
+                  )}
+                  {isDeleteAccountSuccessful && (
+                  <p>{intl.formatMessage(messages.deleteEmailSent)}</p>
+                  )}
                 </div>
-              )}
+              </div>
             </Fragment>
           )}
         </div>
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js
index 0e3ac6b10..f9b60dc52 100644
--- a/src/components/settings/user/EditUserForm.js
+++ b/src/components/settings/user/EditUserForm.js
@@ -3,15 +3,16 @@ import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import { Link } from 'react-router';
-
-// import { Link } from 'react-router';
+import { Input } from '@meetfranz/forms';
 
 import Form from '../../../lib/Form';
-import Input from '../../ui/Input';
+// import Input from '../../ui/Input';
 import Button from '../../ui/Button';
 import Radio from '../../ui/Radio';
 import Infobox from '../../ui/Infobox';
 
+console.log('input', Input);
+
 const messages = defineMessages({
   headline: {
     id: 'settings.account.headline',
@@ -39,13 +40,12 @@ const messages = defineMessages({
   },
 });
 
-export default @observer class EditServiceForm extends Component {
+export default @observer class EditUserForm extends Component {
   static propTypes = {
     status: MobxPropTypes.observableArray.isRequired,
     form: PropTypes.instanceOf(Form).isRequired,
     onSubmit: PropTypes.func.isRequired,
     isSaving: PropTypes.bool.isRequired,
-    isEnterprise: PropTypes.bool.isRequired,
   };
 
   static contextTypes = {
@@ -68,7 +68,6 @@ export default @observer class EditServiceForm extends Component {
       // user,
       status,
       form,
-      isEnterprise,
       isSaving,
     } = this.props;
     const { intl } = this.context;
@@ -98,23 +97,21 @@ export default @observer class EditServiceForm extends Component {
             )}
             <h2>{intl.formatMessage(messages.headlineAccount)}</h2>
             <div className="grid__row">
-              <Input field={form.$('firstname')} focus />
-              <Input field={form.$('lastname')} />
+              <Input {...form.$('firstname').bind()} focus />
+              <Input {...form.$('lastname').bind()} />
             </div>
-            <Input field={form.$('email')} />
-            {!isEnterprise && (
-              <Radio field={form.$('accountType')} />
-            )}
-            {!isEnterprise && form.$('accountType').value === 'company' && (
+            <Input {...form.$('email').bind()} />
+            <Radio field={form.$('accountType')} />
+            {form.$('accountType').value === 'company' && (
               <Input field={form.$('organization')} />
             )}
             <h2>{intl.formatMessage(messages.headlinePassword)}</h2>
             <Input
-              field={form.$('oldPassword')}
+              {...form.$('oldPassword').bind()}
               showPasswordToggle
             />
             <Input
-              field={form.$('newPassword')}
+              {...form.$('newPassword').bind()}
               showPasswordToggle
               scorePassword
             />
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index 188c2fc44..e3c5103da 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -1,5 +1,5 @@
 import { action, observable, computed } from 'mobx';
-import theme from '@meetfranz/theme';
+import * as theme from '@meetfranz/theme';
 
 import Store from './lib/Store';
 
@@ -23,10 +23,10 @@ export default class UIStore extends Store {
 
   @computed get theme() {
     if (this.stores.settings.all.app.darkMode) {
-      return theme('dark');
+      return theme.default('dark');
     }
 
-    return theme('default');
+    return theme.default('default');
   }
 
   // Actions