1 files changed, 45 insertions, 84 deletions

diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index cfaacd56e..0c2588c42 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -1,9 +1,9 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import injectSheet from 'react-jss';
-import { Infobox, Badge } from '@meetfranz/ui';
+import { Infobox } from '@meetfranz/ui';
 
 import { mdiCheckboxMarkedCircleOutline } from '@mdi/js';
 import Loader from '../../../components/ui/Loader';
@@ -11,10 +11,7 @@ import WorkspaceItem from './WorkspaceItem';
 import CreateWorkspaceForm from './CreateWorkspaceForm';
 import Request from '../../../stores/lib/Request';
 import Appear from '../../../components/ui/effects/Appear';
-import { workspaceStore } from '../index';
 import UIStore from '../../../stores/UIStore';
-import globalMessages from '../../../i18n/globalMessages';
-import UpgradeButton from '../../../components/ui/UpgradeButton';
 
 const messages = defineMessages({
   headline: {
@@ -64,12 +61,6 @@ const styles = () => ({
   appear: {
     height: 'auto',
   },
-  premiumAnnouncement: {
-    height: 'auto',
-  },
-  premiumAnnouncementContainer: {
-    display: 'flex',
-  },
   announcementHeadline: {
     marginBottom: 0,
   },
@@ -78,12 +69,6 @@ const styles = () => ({
     margin: [-8, 0, 0, 20],
     alignSelf: 'center',
   },
-  upgradeCTA: {
-    margin: [40, 'auto'],
-  },
-  proRequired: {
-    margin: [10, 0, 40],
-  },
 });
 
 @inject('stores') @injectSheet(styles) @observer
@@ -152,77 +137,53 @@ class WorkspacesDashboard extends Component {
             </Appear>
           )}
 
-          {workspaceStore.isPremiumUpgradeRequired && (
-            <div className={classes.premiumAnnouncement}>
-
-              <h1 className={classes.announcementHeadline}>{intl.formatMessage(messages.workspaceFeatureHeadline)}</h1>
-              <Badge className={classes.proRequired}>{intl.formatMessage(globalMessages.proRequired)}</Badge>
-              <div className={classes.premiumAnnouncementContainer}>
-                <div className={classes.premiumAnnouncementContent}>
-                  <p>{intl.formatMessage(messages.workspaceFeatureInfo)}</p>
-                  <UpgradeButton
-                    className={classes.upgradeCTA}
-                    gaEventInfo={{ category: 'Workspaces', event: 'upgrade' }}
-                    short
-                    requiresPro
-                  />
-                </div>
-                <img src={`https://cdn.franzinfra.com/announcements/assets/workspaces_${this.props.stores.ui.isDarkThemeActive ? 'dark' : 'light'}.png`} className={classes.teaserImage} alt="" />
-              </div>
-            </div>
-          )}
-
-          {!workspaceStore.isPremiumUpgradeRequired && (
+          {/* ===== Create workspace form ===== */}
+          <div className={classes.createForm}>
+            <CreateWorkspaceForm
+              isSubmitting={createWorkspaceRequest.isExecuting}
+              onSubmit={onCreateWorkspaceSubmit}
+            />
+          </div>
+          {getUserWorkspacesRequest.isExecuting ? (
+            <Loader />
+          ) : (
             <>
-              {/* ===== Create workspace form ===== */}
-              <div className={classes.createForm}>
-                <CreateWorkspaceForm
-                  isSubmitting={createWorkspaceRequest.isExecuting}
-                  onSubmit={onCreateWorkspaceSubmit}
-                />
-              </div>
-              {getUserWorkspacesRequest.isExecuting ? (
-                <Loader />
+              {/* ===== Workspace could not be loaded error ===== */}
+              {getUserWorkspacesRequest.error ? (
+                <Infobox
+                  icon="alert"
+                  type="danger"
+                  ctaLabel={intl.formatMessage(messages.tryReloadWorkspaces)}
+                  ctaLoading={getUserWorkspacesRequest.isExecuting}
+                  ctaOnClick={getUserWorkspacesRequest.retry}
+                >
+                  {intl.formatMessage(messages.workspacesRequestFailed)}
+                </Infobox>
               ) : (
                 <>
-                  {/* ===== Workspace could not be loaded error ===== */}
-                  {getUserWorkspacesRequest.error ? (
-                    <Infobox
-                      icon="alert"
-                      type="danger"
-                      ctaLabel={intl.formatMessage(messages.tryReloadWorkspaces)}
-                      ctaLoading={getUserWorkspacesRequest.isExecuting}
-                      ctaOnClick={getUserWorkspacesRequest.retry}
-                    >
-                      {intl.formatMessage(messages.workspacesRequestFailed)}
-                    </Infobox>
+                  {workspaces.length === 0 ? (
+                    <div className="align-middle settings__empty-state">
+                      {/* ===== Workspaces empty state ===== */}
+                      <p className="settings__empty-text">
+                        <span className="emoji">
+                          <img src="./assets/images/emoji/sad.png" alt="" />
+                        </span>
+                        {intl.formatMessage(messages.noServicesAdded)}
+                      </p>
+                    </div>
                   ) : (
-                    <>
-                      {workspaces.length === 0 ? (
-                        <div className="align-middle settings__empty-state">
-                          {/* ===== Workspaces empty state ===== */}
-                          <p className="settings__empty-text">
-                            <span className="emoji">
-                              <img src="./assets/images/emoji/sad.png" alt="" />
-                            </span>
-                            {intl.formatMessage(messages.noServicesAdded)}
-                          </p>
-                        </div>
-                      ) : (
-                        <table className={classes.table}>
-                          {/* ===== Workspaces list ===== */}
-                          <tbody>
-                            {workspaces.map(workspace => (
-                              <WorkspaceItem
-                                key={workspace.id}
-                                workspace={workspace}
-                                onItemClick={w => onWorkspaceClick(w)}
-                              />
-                            ))}
-                          </tbody>
-                        </table>
-                      )}
-                    </>
+                    <table className={classes.table}>
+                      {/* ===== Workspaces list ===== */}
+                      <tbody>
+                        {workspaces.map(workspace => (
+                          <WorkspaceItem
+                            key={workspace.id}
+                            workspace={workspace}
+                            onItemClick={w => onWorkspaceClick(w)}
+                          />
+                        ))}
+                      </tbody>
+                    </table>
                   )}
                 </>
               )}