Fix lint

5 files changed, 32 insertions, 2 deletions

diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 3898d2b99..ddee82e45 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -414,7 +414,6 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       cacheSize,
       updateStatusTypes,
       isClearingAllCache,
-      server,
       lockingFeatureEnabled,
     } = app;
     const {
@@ -441,7 +440,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan}
           isTodosEnabled={todos.isFeatureActive}
           isWorkspaceEnabled={workspaces.isFeatureActive}
-          server={server || 'https://api.franzinfra.com'}
+          server={this.props.stores.settings.app.server}
           lockingFeatureEnabled={lockingFeatureEnabled}
           noUpdates={this.props.stores.settings.app.noUpdates}
           hibernationEnabled={this.props.stores.settings.app.hibernate}
diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js
index 1172125fe..d0196923a 100644
--- a/src/containers/settings/TeamScreen.js
+++ b/src/containers/settings/TeamScreen.js
@@ -4,6 +4,7 @@ import { inject, observer } from 'mobx-react';
 
 import UserStore from '../../stores/UserStore';
 import AppStore from '../../stores/AppStore';
+import SettingsStore from '../../stores/SettingsStore';
 
 import TeamDashboard from '../../components/settings/team/TeamDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
@@ -43,6 +44,7 @@ TeamScreen.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
     app: PropTypes.instanceOf(AppStore).isRequired,
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
     payment: PropTypes.shape({
diff --git a/src/i18n/apply-branding.js b/src/i18n/apply-branding.js
index 521186d08..1494ce923 100644
--- a/src/i18n/apply-branding.js
+++ b/src/i18n/apply-branding.js
@@ -12,6 +12,7 @@ const ignore = [
   'login.customServerQuestion',
   'settings.app.todoServerInfo',
   'settings.app.serverMoneyInfo',
+  'settings.team.teamsUnavailibleInfo',
 ];
 
 // Files to ignore when applying branding
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 66b41ac21..c9f5ac50c 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -3081,6 +3081,32 @@
           "column": 17,
           "line": 37
         }
+      },
+      {
+        "defaultMessage": "!!!Teams are unavailible",
+        "end": {
+          "column": 3,
+          "line": 44
+        },
+        "file": "src/components/settings/team/TeamDashboard.js",
+        "id": "settings.team.teamsUnavailible",
+        "start": {
+          "column": 20,
+          "line": 41
+        }
+      },
+      {
+        "defaultMessage": "!!!Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+        "end": {
+          "column": 3,
+          "line": 48
+        },
+        "file": "src/components/settings/team/TeamDashboard.js",
+        "id": "settings.team.teamsUnavailibleInfo",
+        "start": {
+          "column": 24,
+          "line": 45
+        }
       }
     ],
     "path": "src/components/settings/team/TeamDashboard.json"
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 6f28e2bfc..10f0b7c6f 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -356,6 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
+  "settings.team.teamsUnavailible": "Teams are unavailible",
+  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",