diff options
Diffstat (limited to 'src/containers/settings')
-rw-r--r-- | src/containers/settings/EditServiceScreen.js | 2 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 18 |
2 files changed, 7 insertions, 13 deletions
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index ef907dcb8..ddf7fab36 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js | |||
@@ -8,7 +8,6 @@ import UserStore from '../../stores/UserStore'; | |||
8 | import RecipesStore from '../../stores/RecipesStore'; | 8 | import RecipesStore from '../../stores/RecipesStore'; |
9 | import ServicesStore from '../../stores/ServicesStore'; | 9 | import ServicesStore from '../../stores/ServicesStore'; |
10 | import SettingsStore from '../../stores/SettingsStore'; | 10 | import SettingsStore from '../../stores/SettingsStore'; |
11 | import FeaturesStore from '../../stores/FeaturesStore'; | ||
12 | import Form from '../../lib/Form'; | 11 | import Form from '../../lib/Form'; |
13 | 12 | ||
14 | import ServiceError from '../../components/settings/services/ServiceError'; | 13 | import ServiceError from '../../components/settings/services/ServiceError'; |
@@ -445,7 +444,6 @@ EditServiceScreen.wrappedComponent.propTypes = { | |||
445 | recipes: PropTypes.instanceOf(RecipesStore).isRequired, | 444 | recipes: PropTypes.instanceOf(RecipesStore).isRequired, |
446 | services: PropTypes.instanceOf(ServicesStore).isRequired, | 445 | services: PropTypes.instanceOf(ServicesStore).isRequired, |
447 | settings: PropTypes.instanceOf(SettingsStore).isRequired, | 446 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
448 | features: PropTypes.instanceOf(FeaturesStore).isRequired, | ||
449 | }).isRequired, | 447 | }).isRequired, |
450 | router: PropTypes.instanceOf(RouterStore).isRequired, | 448 | router: PropTypes.instanceOf(RouterStore).isRequired, |
451 | actions: PropTypes.shape({ | 449 | actions: PropTypes.shape({ |
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 76c525045..64f5b2e01 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -339,14 +339,12 @@ class EditSettingsScreen extends Component { | |||
339 | }, | 339 | }, |
340 | }); | 340 | }); |
341 | 341 | ||
342 | if (workspaces.isFeatureActive) { | 342 | const { keepAllWorkspacesLoaded } = workspaces.settings; |
343 | const { keepAllWorkspacesLoaded } = workspaces.settings; | 343 | if ( |
344 | if ( | 344 | Boolean(keepAllWorkspacesLoaded) !== |
345 | Boolean(keepAllWorkspacesLoaded) !== | 345 | Boolean(settingsData.keepAllWorkspacesLoaded) |
346 | Boolean(settingsData.keepAllWorkspacesLoaded) | 346 | ) { |
347 | ) { | 347 | workspaceActions.toggleKeepAllWorkspacesLoadedSetting(); |
348 | workspaceActions.toggleKeepAllWorkspacesLoadedSetting(); | ||
349 | } | ||
350 | } | 348 | } |
351 | 349 | ||
352 | if (todos.isFeatureActive) { | 350 | if (todos.isFeatureActive) { |
@@ -696,7 +694,7 @@ class EditSettingsScreen extends Component { | |||
696 | } | 694 | } |
697 | 695 | ||
698 | render() { | 696 | render() { |
699 | const { app, todos, workspaces, services } = this.props.stores; | 697 | const { app, services } = this.props.stores; |
700 | const { | 698 | const { |
701 | updateStatus, | 699 | updateStatus, |
702 | updateStatusTypes, | 700 | updateStatusTypes, |
@@ -721,8 +719,6 @@ class EditSettingsScreen extends Component { | |||
721 | getCacheSize={() => app.cacheSize} | 719 | getCacheSize={() => app.cacheSize} |
722 | isClearingAllCache={isClearingAllCache} | 720 | isClearingAllCache={isClearingAllCache} |
723 | onClearAllCache={clearAllCache} | 721 | onClearAllCache={clearAllCache} |
724 | isTodosEnabled={todos.isFeatureActive} | ||
725 | isWorkspaceEnabled={workspaces.isFeatureActive} | ||
726 | lockingFeatureEnabled={lockingFeatureEnabled} | 722 | lockingFeatureEnabled={lockingFeatureEnabled} |
727 | automaticUpdates={this.props.stores.settings.app.automaticUpdates} | 723 | automaticUpdates={this.props.stores.settings.app.automaticUpdates} |
728 | isDarkmodeEnabled={this.props.stores.settings.app.darkMode} | 724 | isDarkmodeEnabled={this.props.stores.settings.app.darkMode} |