Make Redux dev-tools work again

1 files changed, 11 insertions, 28 deletions

diff --git a/gui/src/renderer/redux/store.ts b/gui/src/renderer/redux/store.ts
index 92d85e4dbe..d9fb467e1c 100644
--- a/gui/src/renderer/redux/store.ts
+++ b/gui/src/renderer/redux/store.ts
@@ -1,16 +1,16 @@
-import { combineReducers, compose, createStore, Dispatch } from 'redux';
+import { combineReducers, createStore, Dispatch } from 'redux';
 
-import accountActions, { AccountAction } from './account/actions';
+import { AccountAction } from './account/actions';
 import accountReducer, { IAccountReduxState } from './account/reducers';
-import connectionActions, { ConnectionAction } from './connection/actions';
+import { ConnectionAction } from './connection/actions';
 import connectionReducer, { IConnectionReduxState } from './connection/reducers';
-import settingsActions, { SettingsAction } from './settings/actions';
+import { SettingsAction } from './settings/actions';
 import settingsReducer, { ISettingsReduxState } from './settings/reducers';
-import supportActions, { SupportAction } from './support/actions';
+import { SupportAction } from './support/actions';
 import supportReducer, { ISupportReduxState } from './support/reducers';
-import userInterfaceActions, { UserInterfaceAction } from './userinterface/actions';
+import { UserInterfaceAction } from './userinterface/actions';
 import userInterfaceReducer, { IUserInterfaceReduxState } from './userinterface/reducers';
-import versionActions, { VersionAction } from './version/actions';
+import { VersionAction } from './version/actions';
 import versionReducer, { IVersionReduxState } from './version/reducers';
 
 export interface IReduxState {
@@ -33,15 +33,6 @@ export type ReduxStore = ReturnType<typeof configureStore>;
 export type ReduxDispatch = Dispatch<ReduxAction>;
 
 export default function configureStore(initialState?: IReduxState) {
-  const actionCreators = {
-    ...accountActions,
-    ...connectionActions,
-    ...settingsActions,
-    ...supportActions,
-    ...versionActions,
-    ...userInterfaceActions,
-  };
-
   const reducers = {
     account: accountReducer,
     connection: connectionReducer,
@@ -51,21 +42,13 @@ export default function configureStore(initialState?: IReduxState) {
     userInterface: userInterfaceReducer,
   };
 
-  const composeEnhancers: typeof compose = (() => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const reduxCompose = window && (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__;
-    if (window.runningInDevelopment && reduxCompose) {
-      return reduxCompose({ actionCreators });
-    }
-    return compose;
-  })();
-
-  const enhancer = composeEnhancers();
   const rootReducer = combineReducers(reducers);
 
   if (initialState) {
-    return createStore(rootReducer, initialState, enhancer);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return createStore(rootReducer, initialState, (window as any).__REDUX_DEVTOOLS_EXTENSION__?.());
   } else {
-    return createStore(rootReducer, enhancer);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return createStore(rootReducer, (window as any).__REDUX_DEVTOOLS_EXTENSION__?.());
   }
 }