aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers
diff options
context:
space:
mode:
authorLibravatar vantezzen <hello@vantezzen.io>2019-10-18 21:08:24 +0200
committerLibravatar vantezzen <hello@vantezzen.io>2019-10-18 21:08:24 +0200
commit964fdfbc1c937b9e190212c0762d2b1b93e2a38a (patch)
treed3cdd0572f514c4c8406270b27423b2eb8a4bef2 /src/containers
parentAdd info about teams only being availible on Franz servers (diff)
downloadferdium-app-964fdfbc1c937b9e190212c0762d2b1b93e2a38a.tar.gz
ferdium-app-964fdfbc1c937b9e190212c0762d2b1b93e2a38a.tar.zst
ferdium-app-964fdfbc1c937b9e190212c0762d2b1b93e2a38a.zip
Fix lint
Diffstat (limited to 'src/containers')
-rw-r--r--src/containers/settings/EditSettingsScreen.js3
-rw-r--r--src/containers/settings/TeamScreen.js2
2 files changed, 3 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
414 cacheSize, 414 cacheSize,
415 updateStatusTypes, 415 updateStatusTypes,
416 isClearingAllCache, 416 isClearingAllCache,
417 server,
418 lockingFeatureEnabled, 417 lockingFeatureEnabled,
419 } = app; 418 } = app;
420 const { 419 const {
@@ -441,7 +440,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
441 isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan} 440 isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan}
442 isTodosEnabled={todos.isFeatureActive} 441 isTodosEnabled={todos.isFeatureActive}
443 isWorkspaceEnabled={workspaces.isFeatureActive} 442 isWorkspaceEnabled={workspaces.isFeatureActive}
444 server={server || 'https://api.franzinfra.com'} 443 server={this.props.stores.settings.app.server}
445 lockingFeatureEnabled={lockingFeatureEnabled} 444 lockingFeatureEnabled={lockingFeatureEnabled}
446 noUpdates={this.props.stores.settings.app.noUpdates} 445 noUpdates={this.props.stores.settings.app.noUpdates}
447 hibernationEnabled={this.props.stores.settings.app.hibernate} 446 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';
4 4
5import UserStore from '../../stores/UserStore'; 5import UserStore from '../../stores/UserStore';
6import AppStore from '../../stores/AppStore'; 6import AppStore from '../../stores/AppStore';
7import SettingsStore from '../../stores/SettingsStore';
7 8
8import TeamDashboard from '../../components/settings/team/TeamDashboard'; 9import TeamDashboard from '../../components/settings/team/TeamDashboard';
9import ErrorBoundary from '../../components/util/ErrorBoundary'; 10import ErrorBoundary from '../../components/util/ErrorBoundary';
@@ -43,6 +44,7 @@ TeamScreen.wrappedComponent.propTypes = {
43 stores: PropTypes.shape({ 44 stores: PropTypes.shape({
44 user: PropTypes.instanceOf(UserStore).isRequired, 45 user: PropTypes.instanceOf(UserStore).isRequired,
45 app: PropTypes.instanceOf(AppStore).isRequired, 46 app: PropTypes.instanceOf(AppStore).isRequired,
47 settings: PropTypes.instanceOf(SettingsStore).isRequired,
46 }).isRequired, 48 }).isRequired,
47 actions: PropTypes.shape({ 49 actions: PropTypes.shape({
48 payment: PropTypes.shape({ 50 payment: PropTypes.shape({