Merge branch 'develop' into feature/new-pricing

3 files changed, 7 insertions, 0 deletions

diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 27334c9a2..cf28b6bec 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -18,6 +18,7 @@ import announcements from '../features/announcements';
 import settingsWS from '../features/settingsWS';
 import serviceLimit from '../features/serviceLimit';
 import communityRecipes from '../features/communityRecipes';
+import todos from '../features/todos';
 
 import { DEFAULT_FEATURES_CONFIG } from '../config';
 
@@ -79,5 +80,6 @@ export default class FeaturesStore extends Store {
     settingsWS(this.stores, this.actions);
     serviceLimit(this.stores, this.actions);
     communityRecipes(this.stores, this.actions);
+    todos(this.stores, this.actions);
   }
 }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index e3b3fcf21..2fc543192 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -448,6 +448,9 @@ export default class ServicesStore extends Store {
           redirect: false,
         });
       }
+    } else if (channel === 'feature:todos') {
+      Object.assign(args[0].data, { serviceId });
+      this.actions.todos.handleHostMessage(args[0]);
     }
   }
 
diff --git a/src/stores/index.js b/src/stores/index.js
index c9ec77612..10dd56665 100644
--- a/src/stores/index.js
+++ b/src/stores/index.js
@@ -14,6 +14,7 @@ import { workspaceStore } from '../features/workspaces';
 import { announcementsStore } from '../features/announcements';
 import { serviceLimitStore } from '../features/serviceLimit';
 import { communityRecipesStore } from '../features/communityRecipes';
+import { todosStore } from '../features/todos';
 
 export default (api, actions, router) => {
   const stores = {};
@@ -35,6 +36,7 @@ export default (api, actions, router) => {
     announcements: announcementsStore,
     serviceLimit: serviceLimitStore,
     communityRecipes: communityRecipesStore,
+    todos: todosStore,
   });
   // Initialize all stores
   Object.keys(stores).forEach((name) => {