Update to react-connected-router v5

1 files changed, 6 insertions, 8 deletions

diff --git a/gui/packages/desktop/src/renderer/redux/store.js b/gui/packages/desktop/src/renderer/redux/store.js
index 7f28e94663..f3a2922808 100644
--- a/gui/packages/desktop/src/renderer/redux/store.js
+++ b/gui/packages/desktop/src/renderer/redux/store.js
@@ -56,8 +56,6 @@ export default function configureStore(
   initialState: ?ReduxState,
   routerHistory: History,
 ): ReduxStore {
-  const router = routerMiddleware(routerHistory);
-
   const actionCreators: { [string]: Function } = {
     ...accountActions,
     ...connectionActions,
@@ -76,10 +74,9 @@ export default function configureStore(
     support: supportReducer,
     version: versionReducer,
     userInterface: userInterfaceReducer,
+    router: connectRouter(routerHistory),
   };
 
-  const middlewares = [router];
-
   const composeEnhancers = (() => {
     const reduxCompose = window && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__;
     if (process.env.NODE_ENV === 'development' && reduxCompose) {
@@ -89,13 +86,14 @@ export default function configureStore(
   })();
 
   const enhancer: StoreEnhancer<ReduxState, ReduxAction, ReduxDispatch> = composeEnhancers(
-    applyMiddleware(...middlewares),
+    applyMiddleware(routerMiddleware(routerHistory)),
   );
+
   const rootReducer = combineReducers(reducers);
-  const rootReducerWithRouter = connectRouter(routerHistory)(rootReducer);
+
   if (initialState) {
-    return createStore(rootReducerWithRouter, initialState, enhancer);
+    return createStore(rootReducer, initialState, enhancer);
   } else {
-    return createStore(rootReducerWithRouter, enhancer);
+    return createStore(rootReducer, enhancer);
   }
 }