Merge branch 'develop' into feature/hash-routed

1 files changed, 23 insertions, 11 deletions

diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index a47ad7d5..02349e13 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -3,6 +3,8 @@ import objectPath from 'object-path'
 import localforage from 'localforage'
 import { throttle, each } from 'lodash'
 
+let loaded = false
+
 const defaultReducer = (state, paths) => (
   paths.length === 0 ? state : paths.reduce((substate, path) => {
     objectPath.set(substate, path, objectPath.get(state, path))
@@ -15,7 +17,11 @@ const defaultStorage = (() => {
 })()
 
 const defaultSetState = (key, state, storage) => {
-  return storage.setItem(key, state)
+  if (!loaded) {
+    console.log('waiting for old state to be loaded...')
+  } else {
+    return storage.setItem(key, state)
+  }
 }
 
 export default function createPersistedState ({
@@ -32,17 +38,23 @@ export default function createPersistedState ({
 } = {}) {
   return store => {
     getState(key, storage).then((savedState) => {
-      if (typeof savedState === 'object') {
-        // build user cache
-        const usersState = savedState.users || {}
-        usersState.usersObject = {}
-        const users = usersState.users || []
-        each(users, (user) => { usersState.usersObject[user.id] = user })
-        savedState.users = usersState
+      try {
+        if (typeof savedState === 'object') {
+          // build user cache
+          const usersState = savedState.users || {}
+          usersState.usersObject = {}
+          const users = usersState.users || []
+          each(users, (user) => { usersState.usersObject[user.id] = user })
+          savedState.users = usersState
 
-        store.replaceState(
-          merge({}, store.state, savedState)
-        )
+          store.replaceState(
+            merge({}, store.state, savedState)
+          )
+        }
+        loaded = true
+      } catch (e) {
+        console.log("Couldn't load state")
+        loaded = true
       }
     })