standardise defaultSettingsMiddleware.ts

faiqali1 · Aug 3, 2023 · 0c84cc0 · 0c84cc0
1 parent b1294d2
commit 0c84cc0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/redux/middleware/defaultSettingsMiddleware.ts b/src/redux/middleware/defaultSettingsMiddleware.ts
@@ -2,7 +2,7 @@
 import { Middleware } from 'redux';
 
 import { RootState } from '../RootState';
-import { setIsUsingDefaultSettings } from '../slices/defaultSettings';
+import { setIsUsingDefaultSettingsAction } from '../slices/defaultSettings';
 import SliceName from '../types/SliceName';
 
 import { RESET_SETTINGS_EVENT } from '@/redux/actions/reset-settings';
@@ -46,9 +46,11 @@ const DefaultSettingsMiddleware: Middleware<
   const { type } = action;
   // the moment any of the actions that change the settings has changed, it means we are no longer using the default settings
   if (OBSERVED_ACTIONS.includes(type)) {
-    storeAPI.dispatch({ type: setIsUsingDefaultSettings.type, payload: false });
+    // storeAPI.dispatch({ type: setIsUsingDefaultSettings.type, payload: false });
+    storeAPI.dispatch(setIsUsingDefaultSettingsAction(false));
   } else if (type === RESET_SETTINGS_EVENT) {
-    storeAPI.dispatch({ type: setIsUsingDefaultSettings.type, payload: true });
+    // storeAPI.dispatch({ type: setIsUsingDefaultSettings.type, payload: true });
+    storeAPI.dispatch(setIsUsingDefaultSettingsAction(true));
   }
   return next(action);
 };

diff --git a/src/redux/slices/defaultSettings.ts b/src/redux/slices/defaultSettings.ts
@@ -42,6 +42,11 @@ export const persistDefaultSettings = createAsyncThunk<void, string, { state: Ro
 
 export const { setIsUsingDefaultSettings } = defaultSettingsSlice.actions;
 
+export const setIsUsingDefaultSettingsAction = (isUsingDefaultSettings: boolean) => ({
+  type: setIsUsingDefaultSettings.type,
+  payload: isUsingDefaultSettings,
+});
+
 export default defaultSettingsSlice.reducer;
 
 export const selectIsUsingDefaultSettings = (state: RootState) =>