WIP: announcement feature and workspace fixes

1 files changed, 25 insertions, 4 deletions

diff --git a/src/features/utils/FeatureStore.js b/src/features/utils/FeatureStore.js
index 66b66a104..48962561d 100644
--- a/src/features/utils/FeatureStore.js
+++ b/src/features/utils/FeatureStore.js
@@ -5,17 +5,38 @@ export class FeatureStore {
 
   _reactions = null;
 
-  _listenToActions(actions) {
-    if (this._actions) this._actions.forEach(a => a[0].off(a[1]));
+  _registerActions(actions) {
     this._actions = [];
     actions.forEach(a => this._actions.push(a));
+    this._startListeningToActions();
+  }
+
+  _startListeningToActions() {
+    this._stopListeningToActions();
     this._actions.forEach(a => a[0].listen(a[1]));
   }
 
-  _startReactions(reactions) {
-    if (this._reactions) this._reactions.forEach(r => r.stop());
+  _stopListeningToActions() {
+    this._actions.forEach(a => a[0].off(a[1]));
+  }
+
+  _registerReactions(reactions) {
     this._reactions = [];
     reactions.forEach(r => this._reactions.push(new Reaction(r)));
+    this._startReactions();
+  }
+
+  _startReactions() {
+    this._stopReactions();
     this._reactions.forEach(r => r.start());
   }
+
+  _stopReactions() {
+    this._reactions.forEach(r => r.stop());
+  }
+
+  stop() {
+    this._stopListeningToActions();
+    this._stopReactions();
+  }
 }