1 files changed, 30 insertions, 36 deletions
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js
index 4a1a02571..802284051 100644
--- a/src/components/settings/team/TeamDashboard.js
+++ b/src/components/settings/team/TeamDashboard.js
@@ -90,8 +90,6 @@ const styles = {
  },
 };
-@injectSheet(styles)
-@observer
 class TeamDashboard extends Component {
  static propTypes = {
    isLoading: PropTypes.bool.isRequired,
@@ -136,40 +134,34 @@ class TeamDashboard extends Component {
              </Infobox>
            )}
-            {!userInfoRequestFailed && (
+            {!userInfoRequestFailed && !isLoading && (
              <>
-                {!isLoading && (
+                <h1
-                  <>
+                  className={classnames({
-                    <>
+                    [classes.headline]: true,
-                      <h1
+                    [classes.headlineWithSpacing]: true,
-                        className={classnames({
+                  })}
-                          [classes.headline]: true,
+                >
-                          [classes.headlineWithSpacing]: true,
+                  {intl.formatMessage(messages.contentHeadline)}
-                        })}
+                </h1>
-                      >
+                <div className={classes.container}>
-                        {intl.formatMessage(messages.contentHeadline)}
+                  <div className={classes.content}>
-                      </h1>
+                    <p>{intl.formatMessage(messages.intro)}</p>
-                      <div className={classes.container}>
+                    <p>{intl.formatMessage(messages.copy)}</p>
-                        <div className={classes.content}>
+                  </div>
-                          <p>{intl.formatMessage(messages.intro)}</p>
+                  <img
-                          <p>{intl.formatMessage(messages.copy)}</p>
+                    className={classes.image}
-                        </div>
+                    src="https://cdn.franzinfra.com/announcements/assets/teams.png"
-                        <img
+                    alt="Ferdi for Teams"
-                          className={classes.image}
+                  />
-                          src="https://cdn.franzinfra.com/announcements/assets/teams.png"
+                </div>
-                          alt="Ferdi for Teams"
+                <div className={classes.buttonContainer}>
-                        />
+                  <Button
-                      </div>
+                    label={intl.formatMessage(messages.manageButton)}
-                      <div className={classes.buttonContainer}>
+                    onClick={openTeamManagement}
-                        <Button
+                    className={classes.cta}
-                          label={intl.formatMessage(messages.manageButton)}
+                  />
-                          onClick={openTeamManagement}
+                </div>
-                          className={classes.cta}
-                        />
-                      </div>
-                    </>
-                  </>
-                )}
              </>
            )}
          </div>
@@ -203,4 +195,6 @@ class TeamDashboard extends Component {
  }
 }
-export default injectIntl(TeamDashboard);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(TeamDashboard)),
+);

diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js index 4a1a02571..802284051 100644 --- a/src/components/settings/team/TeamDashboard.js +++ b/src/components/settings/team/TeamDashboard.js
@@ -90,8 +90,6 @@ const styles = {
90	},	90	},
91	};	91	};
92		92
93	@injectSheet(styles)
94	@observer
95	class TeamDashboard extends Component {	93	class TeamDashboard extends Component {
96	static propTypes = {	94	static propTypes = {
97	isLoading: PropTypes.bool.isRequired,	95	isLoading: PropTypes.bool.isRequired,
@@ -136,40 +134,34 @@ class TeamDashboard extends Component {
136	</Infobox>	134	</Infobox>
137	)}	135	)}
138		136
139	{!userInfoRequestFailed && (	137	{!userInfoRequestFailed && !isLoading && (
140	<>	138	<>
141	{!isLoading && (	139	<h1
142	<>	140	className={classnames({
143	<>	141	[classes.headline]: true,
144	<h1	142	[classes.headlineWithSpacing]: true,
145	className={classnames({	143	})}
146	[classes.headline]: true,	144	>
147	[classes.headlineWithSpacing]: true,	145	{intl.formatMessage(messages.contentHeadline)}
148	})}	146	</h1>
149	>	147	<div className={classes.container}>
150	{intl.formatMessage(messages.contentHeadline)}	148	<div className={classes.content}>
151	</h1>	149	<p>{intl.formatMessage(messages.intro)}</p>
152	<div className={classes.container}>	150	<p>{intl.formatMessage(messages.copy)}</p>
153	<div className={classes.content}>	151	</div>
154	<p>{intl.formatMessage(messages.intro)}</p>	152	<img
155	<p>{intl.formatMessage(messages.copy)}</p>	153	className={classes.image}
156	</div>	154	src="https://cdn.franzinfra.com/announcements/assets/teams.png"
157	<img	155	alt="Ferdi for Teams"
158	className={classes.image}	156	/>
159	src="https://cdn.franzinfra.com/announcements/assets/teams.png"	157	</div>
160	alt="Ferdi for Teams"	158	<div className={classes.buttonContainer}>
161	/>	159	<Button
162	</div>	160	label={intl.formatMessage(messages.manageButton)}
163	<div className={classes.buttonContainer}>	161	onClick={openTeamManagement}
164	<Button	162	className={classes.cta}
165	label={intl.formatMessage(messages.manageButton)}	163	/>
166	onClick={openTeamManagement}	164	</div>
167	className={classes.cta}
168	/>
169	</div>
170	</>
171	</>
172	)}
173	</>	165	</>
174	)}	166	)}
175	</div>	167	</div>
@@ -203,4 +195,6 @@ class TeamDashboard extends Component {
203	}	195	}
204	}	196	}
205		197
206	export default injectIntl(TeamDashboard);	198	export default injectIntl(
		199	injectSheet(styles, { injectTheme: true })(observer(TeamDashboard)),
		200	);