Remove user type from signup

4 files changed, 23 insertions, 42 deletions

diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index d9b83eeb8..7724bb908 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -31,10 +31,10 @@ const messages = defineMessages({
     id: 'signup.email.label',
     defaultMessage: '!!!Email address',
   },
-  companyLabel: {
-    id: 'signup.company.label',
-    defaultMessage: '!!!Company',
-  },
+  // companyLabel: {
+  //   id: 'signup.company.label',
+  //   defaultMessage: '!!!Company',
+  // },
   passwordLabel: {
     id: 'signup.password.label',
     defaultMessage: '!!!Password',
@@ -79,20 +79,6 @@ export default @observer class Signup extends Component {
 
   form = new Form({
     fields: {
-      accountType: {
-        value: 'individual',
-        validators: [required],
-        options: [{
-          value: 'individual',
-          label: 'Individual',
-        }, {
-          value: 'non-profit',
-          label: 'Non-Profit',
-        }, {
-          value: 'company',
-          label: 'Company',
-        }],
-      },
       firstname: {
         label: this.context.intl.formatMessage(messages.firstnameLabel),
         value: '',
@@ -108,10 +94,6 @@ export default @observer class Signup extends Component {
         value: '',
         validators: [required, email],
       },
-      organization: {
-        label: this.context.intl.formatMessage(messages.companyLabel),
-        value: '', // TODO: make required when accountType: company
-      },
       password: {
         label: this.context.intl.formatMessage(messages.passwordLabel),
         value: '',
@@ -151,7 +133,6 @@ export default @observer class Signup extends Component {
                 In Dev Mode your data is not persistent. Please use the live app for accesing the production API.
               </Infobox>
             )}
-            <Radio field={form.$('accountType')} showLabel={false} />
             <div className="grid__row">
               <Input field={form.$('firstname')} focus />
               <Input field={form.$('lastname')} />
@@ -162,9 +143,6 @@ export default @observer class Signup extends Component {
               showPasswordToggle
               scorePassword
             />
-            {form.$('accountType').value === 'company' && (
-              <Input field={form.$('organization')} />
-            )}
             {error.code === 'email-duplicate' && (
               <p className="error-message center">{intl.formatMessage(messages.emailDuplicate)}</p>
             )}
diff --git a/src/components/subscription/TrialForm.js b/src/components/subscription/TrialForm.js
index 81b1c713c..9fe1c93b7 100644
--- a/src/components/subscription/TrialForm.js
+++ b/src/components/subscription/TrialForm.js
@@ -15,6 +15,10 @@ const messages = defineMessages({
     id: 'subscription.cta.activateTrial',
     defaultMessage: '!!!Yes, start the free Franz Professional trial',
   },
+  allOptionsButton: {
+    id: 'subscription.cta.allOptions',
+    defaultMessage: '!!!See all options',
+  },
   teaserHeadline: {
     id: 'settings.account.headlineTrialUpgrade',
     defaultMessage: '!!!Get the free 14 day Franz Professional Trial',
@@ -39,7 +43,12 @@ const messages = defineMessages({
 
 const styles = () => ({
   activateTrialButton: {
-    margin: [40, 0, 50],
+    margin: [40, 0, 10],
+  },
+  allOptionsButton: {
+    margin: [0, 0, 40],
+    background: 'none',
+    border: 'none',
   },
   keyTerms: {
     marginTop: 20,
@@ -50,6 +59,7 @@ export default @observer @injectSheet(styles) class TrialForm extends Component
   static propTypes = {
     activateTrial: PropTypes.func.isRequired,
     isActivatingTrial: PropTypes.bool.isRequired,
+    showAllOptions: PropTypes.func.isRequired,
     classes: PropTypes.object.isRequired,
   };
 
@@ -61,6 +71,7 @@ export default @observer @injectSheet(styles) class TrialForm extends Component
     const {
       isActivatingTrial,
       activateTrial,
+      showAllOptions,
       classes,
     } = this.props;
     const { intl } = this.context;
@@ -83,6 +94,12 @@ export default @observer @injectSheet(styles) class TrialForm extends Component
           onClick={activateTrial}
           stretch
         />
+        <Button
+          label={intl.formatMessage(messages.allOptionsButton)}
+          className={classes.allOptionsButton}
+          onClick={showAllOptions}
+          stretch
+        />
         <div className="subscription__premium-info">
           <H3>
             {intl.formatMessage(messages.includedFeatures)}
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 22f8f2595..7947de937 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -320,7 +320,6 @@
   "sidebar.openWorkspaceDrawer": "Open workspace drawer",
   "sidebar.settings": "Settings",
   "sidebar.unmuteApp": "Enable notifications & audio",
-  "signup.company.label": "Company",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
   "signup.firstname.label": "First Name",
@@ -366,4 +365,4 @@
   "workspaceDrawer.workspaceFeatureInfo": "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/messages/src/components/auth/Signup.json b/src/i18n/messages/src/components/auth/Signup.json
index a09745048..f97b936fc 100644
--- a/src/i18n/messages/src/components/auth/Signup.json
+++ b/src/i18n/messages/src/components/auth/Signup.json
@@ -52,19 +52,6 @@
     }
   },
   {
-    "id": "signup.company.label",
-    "defaultMessage": "!!!Company",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 34,
-      "column": 16
-    },
-    "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
     "id": "signup.password.label",
     "defaultMessage": "!!!Password",
     "file": "src/components/auth/Signup.js",