Merge pull request #182 from ekonstantinidis/fix-redux-storage

Fix settings issue

Author: ekonstantinidis

src/js/store/configureStore.js

@@ -5,7 +5,7 @@ import * as storage from 'redux-storage';
 import createEngine from 'redux-storage-engine-localstorage';
 import filter from 'redux-storage-decorator-filter';
 
-import { checkAuth, fetchNotifications } from '../actions';
+import { checkAuth, fetchNotifications, UPDATE_SETTING } from '../actions';
 import authentication from '../middleware/authentication';
 import constants from '../utils/constants';
 import notifications from '../middleware/notifications';
@@ -14,7 +14,7 @@ import rootReducer from '../reducers';
 
 export default function configureStore(initialState) {
   const engine = filter(createEngine(constants.STORAGE_KEY), ['settings']);
-  const storageMiddleware = storage.createMiddleware(engine);
+  const storageMiddleware = storage.createMiddleware(engine, [], [UPDATE_SETTING]);
 
   const createStoreWithMiddleware = applyMiddleware(
     requests, // Should be passed before 'apiMiddleware'
@@ -26,14 +26,14 @@ export default function configureStore(initialState) {
 
   const store = createStoreWithMiddleware(rootReducer, initialState);
 
-  // Check if the user is logged in
-  store.dispatch(checkAuth());
-  const isLoggedIn = store.getState().auth.token !== null;
-
   // Load settings from localStorage
   const load = storage.createLoader(engine);
   load(store)
     .then(function (newState) {
+      // Check if the user is logged in
+      store.dispatch(checkAuth());
+      const isLoggedIn = store.getState().auth.token !== null;
+
       if (isLoggedIn) { store.dispatch(fetchNotifications()); }
     });