1 files changed, 4 insertions, 18 deletions
diff --git a/frontend/src/reducers.js b/frontend/src/reducers.js
index 097f9243..7e5fba26 100644
--- a/frontend/src/reducers.js
+++ b/frontend/src/reducers.js
@@ -1,28 +1,14 @@
-import { combineReducers } from 'redux-immutable'
-
-// react-router-redux immutable reducer
-import { fromJS } from 'immutable'
-import { LOCATION_CHANGE } from 'react-router-redux'
-
-const initialState = fromJS({
-  locationBeforeTransitions: null
-})
-
-const routerImmutableReducer = (state = initialState, action) => {
-  if (action.type === LOCATION_CHANGE) {
-    return state.set('locationBeforeTransitions', action.payload)
-  }
-
-  return state
-}
+import { combineReducers, routerReducer } from 'redux-seamless-immutable'
 
+import errorsReducer from './redux/errors'
 import gamesReducer from './redux/games'
 import playersReducer from './redux/players'
 
 export default function createReducer() {
   return combineReducers({
+    errors: errorsReducer,
     games: gamesReducer,
-    routing: routerImmutableReducer,
     players: playersReducer,
+    routing: routerReducer,
   })
 }