fix: notification type selection issue in settings

fix #368, #369 and re #343
zidoro · Jul 3, 2023 · 04ddca1 · 04ddca1
1 parent c8c3c66
commit 04ddca1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/app/renderer/src/routes/Settings/FeatureSection.tsx b/app/renderer/src/routes/Settings/FeatureSection.tsx
@@ -6,7 +6,7 @@ import {
   AppStateTypes,
   setEnableProgressAnimation,
   SettingTypes,
-  setNotificationProperty,
+  setNotificationType,
   setEnableFullscreenBreak,
   setUseNativeTitlebar,
   setAutoStartWorkTime,
@@ -130,7 +130,7 @@ const FeatureSection: React.FC = () => {
 
   const onChangeNotificationProps = useCallback(
     (e: React.ChangeEvent<HTMLInputElement>) => {
-      dispatch(setNotificationProperty(e.target.value));
+      dispatch(setNotificationType(e.target.value));
     },
     [dispatch]
   );

diff --git a/app/renderer/src/routes/Timer/Control/Control.tsx b/app/renderer/src/routes/Timer/Control/Control.tsx
@@ -14,7 +14,7 @@ import {
   skipTimer,
   SPECIAL_BREAK,
   STAY_FOCUS,
-  togglenotificationSoundOn,
+  toggleNotificationSound,
 } from "store";
 import {
   StyledControl,
@@ -82,7 +82,7 @@ const Control: React.FC<Props> = ({ resetTimerAction }) => {
   ]);
 
   const onNotifacationSoundCallback = useCallback(() => {
-    dispatch(togglenotificationSoundOn());
+    dispatch(toggleNotificationSound());
   }, [dispatch]);
 
   const onToggleCompactCallback = useCallback(() => {

diff --git a/app/renderer/src/store/settings/actions.ts b/app/renderer/src/store/settings/actions.ts
@@ -26,7 +26,7 @@ export const setAlwaysOnTop = (
   };
 };
 
-export const togglenotificationSoundOn = () => {
+export const toggleNotificationSound = () => {
   return {
     type: TOGGLE_NOTIFICATION_SOUND,
   };
@@ -95,12 +95,12 @@ export const setUseNativeTitlebar = (
   };
 };
 
-export const setNotificationProperty = (
-  notificationProperty: string
+export const setNotificationType = (
+  notificationType: string
 ): SettingActionTypes => {
   return {
     type: SET_NOTIFICATION_PROPERTY,
-    payload: notificationProperty,
+    payload: notificationType,
   };
 };
 

diff --git a/app/renderer/src/store/settings/reducer.ts b/app/renderer/src/store/settings/reducer.ts
@@ -93,7 +93,7 @@ export const settingReducer = (
     case SET_NOTIFICATION_PROPERTY:
       return {
         ...state,
-        notificationProperty: action.payload,
+        notificationType: action.payload,
       };
     case CLOSE_TO_TRAY:
       return {