aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers/settings/EditSettingsScreen.js
diff options
context:
space:
mode:
authorLibravatar Amine El Mouafik <412895+kytwb@users.noreply.github.com>2021-02-08 10:34:45 +0100
committerLibravatar GitHub <noreply@github.com>2021-02-08 10:34:45 +0100
commit035002ceedf78d5ec73eabc0df7f06139939b967 (patch)
tree1c0d1e9531bae05fb65d70b9ea25baf404b74fe1 /src/containers/settings/EditSettingsScreen.js
parentdocs: add k0staa as a contributor (#1193) (diff)
downloadferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.tar.gz
ferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.tar.zst
ferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.zip
Synchronize with Franz 5.6.0 (#1033)
Co-authored-by: FranzBot <i18n@meetfranz.com> Co-authored-by: vantezzen <hello@vantezzen.io> Co-authored-by: Makazzz <makazzzpro@live.ca> Co-authored-by: Stefan Malzner <stefan@adlk.io> Co-authored-by: Amine Mouafik <amine@mouafik.fr>
Diffstat (limited to 'src/containers/settings/EditSettingsScreen.js')
-rw-r--r--src/containers/settings/EditSettingsScreen.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 097f0ed8b..148bb2c53 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -25,6 +25,7 @@ import globalMessages from '../../i18n/globalMessages';
25import { DEFAULT_IS_FEATURE_ENABLED_BY_USER } from '../../features/todos'; 25import { DEFAULT_IS_FEATURE_ENABLED_BY_USER } from '../../features/todos';
26import WorkspacesStore from '../../features/workspaces/store'; 26import WorkspacesStore from '../../features/workspaces/store';
27import { DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED } from '../../features/workspaces'; 27import { DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED } from '../../features/workspaces';
28import ServicesStore from '../../stores/ServicesStore';
28 29
29const messages = defineMessages({ 30const messages = defineMessages({
30 autoLaunchOnStart: { 31 autoLaunchOnStart: {
@@ -587,6 +588,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
587 app, 588 app,
588 todos, 589 todos,
589 workspaces, 590 workspaces,
591 services,
590 } = this.props.stores; 592 } = this.props.stores;
591 const { 593 const {
592 updateStatus, 594 updateStatus,
@@ -628,6 +630,8 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
628 isUsingCustomTodoService={this.props.stores.todos.isUsingCustomTodoService} 630 isUsingCustomTodoService={this.props.stores.todos.isUsingCustomTodoService}
629 isNightlyEnabled={this.props.stores.settings.app.nightly} 631 isNightlyEnabled={this.props.stores.settings.app.nightly}
630 openProcessManager={() => this.openProcessManager()} 632 openProcessManager={() => this.openProcessManager()}
633 hasAddedTodosAsService={services.isTodosServiceAdded}
634 isOnline={app.isOnline}
631 /> 635 />
632 </ErrorBoundary> 636 </ErrorBoundary>
633 ); 637 );
@@ -639,6 +643,7 @@ EditSettingsScreen.wrappedComponent.propTypes = {
639 app: PropTypes.instanceOf(AppStore).isRequired, 643 app: PropTypes.instanceOf(AppStore).isRequired,
640 user: PropTypes.instanceOf(UserStore).isRequired, 644 user: PropTypes.instanceOf(UserStore).isRequired,
641 settings: PropTypes.instanceOf(SettingsStore).isRequired, 645 settings: PropTypes.instanceOf(SettingsStore).isRequired,
646 services: PropTypes.instanceOf(ServicesStore).isRequired,
642 todos: PropTypes.instanceOf(TodosStore).isRequired, 647 todos: PropTypes.instanceOf(TodosStore).isRequired,
643 workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired, 648 workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired,
644 }).isRequired, 649 }).isRequired,