4 files changed, 147 insertions, 7 deletions

diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.js
new file mode 100644
index 000000000..960ed7e33
--- /dev/null
+++ b/src/containers/auth/SetupAssistantScreen.js
@@ -0,0 +1,133 @@
+/* eslint-disable no-await-in-loop */
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { inject, observer } from 'mobx-react';
+
+import { sleep } from '../../helpers/async-helpers';
+import SetupAssistant from '../../components/auth/SetupAssistant';
+import ServicesStore from '../../stores/ServicesStore';
+import RecipesStore from '../../stores/RecipesStore';
+import { TODOS_RECIPE_ID } from '../../features/todos';
+import UserStore from '../../stores/UserStore';
+
+export default @inject('stores', 'actions') @observer class SetupAssistantScreen extends Component {
+  services = {
+    whatsapp: {
+      name: 'WhatsApp',
+      hasTeamId: false,
+    },
+    messenger: {
+      name: 'Messenger',
+      hasTeamId: false,
+    },
+    gmail: {
+      name: 'Gmail',
+      hasTeamId: false,
+    },
+    skype: {
+      name: 'Skype',
+      hasTeamId: false,
+    },
+    telegram: {
+      name: 'Telegram',
+      hasTeamId: false,
+    },
+    instagram: {
+      name: 'Instagram',
+      hasTeamId: false,
+    },
+    slack: {
+      name: 'Slack',
+      hasTeamId: true,
+    },
+    hangouts: {
+      name: 'Hangouts',
+      hasTeamId: false,
+    },
+    linkedin: {
+      name: 'LinkedIn',
+      hasTeamId: false,
+    },
+  }
+
+  state = {
+    isSettingUpServices: false,
+  }
+
+  async setupServices(serviceConfig) {
+    const { stores: { services, router, user } } = this.props;
+    console.log(serviceConfig);
+
+    this.setState({
+      isSettingUpServices: true,
+    });
+
+    // The store requests are not build for paralell requests so we need to finish one request after another
+    for (const config of serviceConfig) {
+      const serviceData = {
+        name: this.services[config.id].name,
+      };
+
+      if (config.team) {
+        serviceData.team = config.team;
+      }
+
+      await services._createService({
+        recipeId: config.id,
+        serviceData,
+        redirect: false,
+        skipCleanup: true,
+      });
+
+      await sleep(100);
+    }
+
+    // Add Franz ToDos
+    await services._createService({
+      recipeId: TODOS_RECIPE_ID,
+      serviceData: {
+        name: 'Franz ToDos',
+      },
+      redirect: false,
+      skipCleanup: true,
+    });
+
+    this.setState({
+      isSettingUpServices: false,
+    });
+
+    await sleep(100);
+
+    router.push(user.pricingRoute);
+  }
+
+  render() {
+    return (
+      <SetupAssistant
+        onSubmit={config => this.setupServices(config)}
+        services={this.services}
+        embed={false}
+        isSettingUpServices={this.state.isSettingUpServices}
+      />
+    );
+  }
+}
+
+SetupAssistantScreen.wrappedComponent.propTypes = {
+  stores: PropTypes.shape({
+    services: PropTypes.instanceOf(ServicesStore),
+    recipes: PropTypes.instanceOf(RecipesStore),
+    user: PropTypes.instanceOf(UserStore),
+  }).isRequired,
+  actions: PropTypes.shape({
+    user: PropTypes.shape({
+      invite: PropTypes.func.isRequired,
+    }).isRequired,
+    service: PropTypes.shape({
+      createService: PropTypes.func.isRequired,
+    }).isRequired,
+    recipe: PropTypes.shape({
+      install: PropTypes.func.isRequired,
+    }).isRequired,
+  }).isRequired,
+};
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index a4312d9de..d7e413bb9 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -116,6 +116,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
         isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen}
         showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted}
         showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted}
+        isTodosServiceActive={services.isTodosServiceActive || false}
       />
     );
 
@@ -131,6 +132,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
         update={updateService}
         userHasCompletedSignup={user.hasCompletedSignup}
         hasActivatedTrial={user.hasActivatedTrial}
+        isSpellcheckerEnabled={settings.app.enableSpellchecking}
       />
     );
 
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 6aeecaa6d..d92d3bc07 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -33,9 +33,9 @@ const messages = defineMessages({
     id: 'settings.service.form.enableService',
     defaultMessage: '!!!Enable service',
   },
-  disableHibernation: {
-    id: 'settings.service.form.disableHibernation',
-    defaultMessage: '!!!Disable hibernation',
+  enableHibernation: {
+    id: 'settings.service.form.enableHibernation',
+    defaultMessage: '!!!Enable hibernation',
   },
   enableNotification: {
     id: 'settings.service.form.enableNotification',
@@ -167,10 +167,10 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
           value: service.isEnabled,
           default: true,
         },
-        disableHibernation: {
-          label: intl.formatMessage(messages.disableHibernation),
-          value: action !== 'edit' ? false : service.disableHibernation,
-          default: false,
+        isHibernationEnabled: {
+          label: intl.formatMessage(messages.enableHibernation),
+          value: action !== 'edit' ? recipe.autoHibernate : service.isHibernationEnabled,
+          default: true,
         },
         isNotificationEnabled: {
           label: intl.formatMessage(messages.enableNotification),
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';
 import { DEFAULT_IS_FEATURE_ENABLED_BY_USER } from '../../features/todos';
 import WorkspacesStore from '../../features/workspaces/store';
 import { DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED } from '../../features/workspaces';
+import ServicesStore from '../../stores/ServicesStore';
 
 const messages = defineMessages({
   autoLaunchOnStart: {
@@ -587,6 +588,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       app,
       todos,
       workspaces,
+      services,
     } = this.props.stores;
     const {
       updateStatus,
@@ -628,6 +630,8 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           isUsingCustomTodoService={this.props.stores.todos.isUsingCustomTodoService}
           isNightlyEnabled={this.props.stores.settings.app.nightly}
           openProcessManager={() => this.openProcessManager()}
+          hasAddedTodosAsService={services.isTodosServiceAdded}
+          isOnline={app.isOnline}
         />
       </ErrorBoundary>
     );
@@ -639,6 +643,7 @@ EditSettingsScreen.wrappedComponent.propTypes = {
     app: PropTypes.instanceOf(AppStore).isRequired,
     user: PropTypes.instanceOf(UserStore).isRequired,
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
+    services: PropTypes.instanceOf(ServicesStore).isRequired,
     todos: PropTypes.instanceOf(TodosStore).isRequired,
     workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired,
   }).isRequired,