Refactor settingsWS Store to new FeatureStore

1 files changed, 5 insertions, 11 deletions

diff --git a/src/features/settingsWS/index.js b/src/features/settingsWS/index.js
index 4049ae814..2064d2973 100755
--- a/src/features/settingsWS/index.js
+++ b/src/features/settingsWS/index.js
@@ -1,10 +1,9 @@
-import { reaction, runInAction } from 'mobx';
+import { reaction } from 'mobx';
 import { SettingsWSStore } from './store';
-import state, { resetState } from './state';
 
 const debug = require('debug')('Franz:feature:settingsWS');
 
-let store = null;
+export const settingsStore = new SettingsWSStore();
 
 export default function initSettingsWebSocket(stores, actions) {
   const { features } = stores;
@@ -17,15 +16,10 @@ export default function initSettingsWebSocket(stores, actions) {
     (isEnabled) => {
       if (isEnabled) {
         debug('Initializing `settingsWS` feature');
-        store = new SettingsWSStore(stores, null, actions, state);
-        store.initialize();
-        runInAction(() => { state.isFeatureActive = true; });
-      } else if (store) {
+        settingsStore.start(stores, actions);
+      } else if (settingsStore) {
         debug('Disabling `settingsWS` feature');
-        runInAction(() => { state.isFeatureActive = false; });
-        store.teardown();
-        store = null;
-        resetState(); // Reset state to default
+        settingsStore.stop();
       }
     },
     {