From 53937fd58023ef800bd8ca1cd2b6d2d7bc891834 Mon Sep 17 00:00:00 2001
From: Markus Hatvan <markus_hatvan@aon.at>
Date: Fri, 12 Nov 2021 03:59:35 +0100
Subject: chore: update eslint deps to latest (#2213)

- update eslint deps to latest
- disable new react/function-component-definition rule
- fix/disable newly reported issues
---
 .../settings/settings/EditSettingsForm.js          |  6 +--
 src/components/settings/team/TeamDashboard.js      | 60 ++++++++++------------
 2 files changed, 29 insertions(+), 37 deletions(-)

(limited to 'src/components/settings')

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 7e86ea79a..9e8fb3cf5 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -412,10 +412,8 @@ class EditSettingsForm extends Component {
 
                 <Hr />
 
-                <>
-                  <Toggle field={form.$('keepAllWorkspacesLoaded')} />
-                  <Hr />
-                </>
+                <Toggle field={form.$('keepAllWorkspacesLoaded')} />
+                <Hr />
 
                 {!hasAddedTodosAsService && (
                   <>
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js
index 4a1a02571..38d124266 100644
--- a/src/components/settings/team/TeamDashboard.js
+++ b/src/components/settings/team/TeamDashboard.js
@@ -136,40 +136,34 @@ class TeamDashboard extends Component {
               </Infobox>
             )}
 
-            {!userInfoRequestFailed && (
+            {!userInfoRequestFailed && !isLoading && (
               <>
-                {!isLoading && (
-                  <>
-                    <>
-                      <h1
-                        className={classnames({
-                          [classes.headline]: true,
-                          [classes.headlineWithSpacing]: true,
-                        })}
-                      >
-                        {intl.formatMessage(messages.contentHeadline)}
-                      </h1>
-                      <div className={classes.container}>
-                        <div className={classes.content}>
-                          <p>{intl.formatMessage(messages.intro)}</p>
-                          <p>{intl.formatMessage(messages.copy)}</p>
-                        </div>
-                        <img
-                          className={classes.image}
-                          src="https://cdn.franzinfra.com/announcements/assets/teams.png"
-                          alt="Ferdi for Teams"
-                        />
-                      </div>
-                      <div className={classes.buttonContainer}>
-                        <Button
-                          label={intl.formatMessage(messages.manageButton)}
-                          onClick={openTeamManagement}
-                          className={classes.cta}
-                        />
-                      </div>
-                    </>
-                  </>
-                )}
+                <h1
+                  className={classnames({
+                    [classes.headline]: true,
+                    [classes.headlineWithSpacing]: true,
+                  })}
+                >
+                  {intl.formatMessage(messages.contentHeadline)}
+                </h1>
+                <div className={classes.container}>
+                  <div className={classes.content}>
+                    <p>{intl.formatMessage(messages.intro)}</p>
+                    <p>{intl.formatMessage(messages.copy)}</p>
+                  </div>
+                  <img
+                    className={classes.image}
+                    src="https://cdn.franzinfra.com/announcements/assets/teams.png"
+                    alt="Ferdi for Teams"
+                  />
+                </div>
+                <div className={classes.buttonContainer}>
+                  <Button
+                    label={intl.formatMessage(messages.manageButton)}
+                    onClick={openTeamManagement}
+                    className={classes.cta}
+                  />
+                </div>
               </>
             )}
           </div>
-- 
cgit v1.2.3-70-g09d2