Merge pull request #901 from openedx/sundas/INF-1086

fix: fixed preferences toggle unpredictable behavior
openedx · Oct 10, 2023 · 1257e81 · 1257e81
2 parents b08890b + 7f1c7b8
commit 1257e81
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/notification-preferences/NotificationPreferenceRow.jsx b/src/notification-preferences/NotificationPreferenceRow.jsx
@@ -11,15 +11,18 @@ import {
   selectPreference,
   selectPreferenceNonEditableChannels,
   selectSelectedCourseId,
+  selectNotificationPreferencesStatus,
 } from './data/selectors';
 import { updatePreferenceToggle } from './data/thunks';
+import { LOADING_STATUS } from '../constants';
 
 const NotificationPreferenceRow = ({ appId, preferenceName }) => {
   const dispatch = useDispatch();
   const intl = useIntl();
   const courseId = useSelector(selectSelectedCourseId());
   const preference = useSelector(selectPreference(appId, preferenceName));
   const nonEditable = useSelector(selectPreferenceNonEditableChannels(appId, preferenceName));
+  const preferencesStatus = useSelector(selectNotificationPreferencesStatus());
 
   const onToggle = useCallback((event) => {
     const {
@@ -73,7 +76,7 @@ const NotificationPreferenceRow = ({ appId, preferenceName }) => {
               name={channel}
               value={preference[channel]}
               onChange={onToggle}
-              disabled={nonEditable.includes(channel)}
+              disabled={nonEditable.includes(channel) || preferencesStatus === LOADING_STATUS}
             />
           </div>
         ))}

diff --git a/src/notification-preferences/data/reducers.js b/src/notification-preferences/data/reducers.js
@@ -102,6 +102,7 @@ const notificationPreferencesReducer = (state = defaultState, action = {}) => {
               ? { ...preference, [notificationChannel]: value }
               : preference
           )),
+          status: LOADING_STATUS,
         },
       };
     case Actions.UPDATE_APP_PREFERENCE:

diff --git a/src/notification-preferences/data/thunks.js b/src/notification-preferences/data/thunks.js
@@ -126,7 +126,7 @@ export const updatePreferenceToggle = (
         notificationApp,
         notificationType,
         notificationChannel,
-        value,
+        !value,
       ));
       const data = await patchPreferenceToggle(
         courseId,