refactor: refactor code

openedx · Dec 27, 2024 · 5228cc9 · 5228cc9
1 parent 2756568
commit 5228cc9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/src/account-settings/AccountSettingsPage.jsx b/src/account-settings/AccountSettingsPage.jsx
@@ -766,7 +766,6 @@ class AccountSettingsPage extends React.Component {
         </div>
         <div className="border border-light-700 my-6" />
         <NotificationSettings />
-        {this.props.showPreferences && <div className="border border-light-700 my-6" />}
         <div className="account-section mb-5" id="site-preferences" ref={this.navLinkRefs['#site-preferences']}>
           <h2 className="section-heading h4 mb-3">
             {this.props.intl.formatMessage(messages['account.settings.section.site.preferences'])}
@@ -970,7 +969,6 @@ AccountSettingsPage.propTypes = {
   navigate: PropTypes.func.isRequired,
   location: PropTypes.string.isRequired,
   disabledCountries: PropTypes.arrayOf(PropTypes.string),
-  showPreferences: PropTypes.bool,
 };
 
 AccountSettingsPage.defaultProps = {
@@ -998,7 +996,6 @@ AccountSettingsPage.defaultProps = {
   mostRecentVerifiedName: {},
   verifiedNameHistory: [],
   disabledCountries: [],
-  showPreferences: false,
 };
 
 export default withLocation(withNavigate(connect(accountSettingsPageSelector, {

diff --git a/src/account-settings/data/selectors.js b/src/account-settings/data/selectors.js
@@ -1,7 +1,6 @@
 import { createSelector, createStructuredSelector } from 'reselect';
 import { siteLanguageListSelector, siteLanguageOptionsSelector } from '../site-language';
 import { compareVerifiedNamesByCreatedDate } from '../../utils';
-import { selectShowPreferences } from '../../notification-preferences/data/selectors';
 
 export const storeName = 'accountSettings';
 
@@ -244,7 +243,6 @@ export const accountSettingsPageSelector = createSelector(
   mostRecentVerifiedNameSelector,
   sortedVerifiedNameHistorySelector,
   disabledCountriesSelector,
-  selectShowPreferences(),
   (
     accountSettings,
     siteLanguageOptions,
@@ -263,7 +261,6 @@ export const accountSettingsPageSelector = createSelector(
     mostRecentVerifiedName,
     verifiedNameHistory,
     disabledCountries,
-    showPreferences,
   ) => ({
     siteLanguageOptions,
     siteLanguage,
@@ -285,7 +282,6 @@ export const accountSettingsPageSelector = createSelector(
     mostRecentVerifiedName,
     verifiedNameHistory,
     disabledCountries,
-    showPreferences,
   }),
 );
 

diff --git a/src/notification-preferences/NotificationPreferenceColumn.jsx b/src/notification-preferences/NotificationPreferenceColumn.jsx
@@ -28,7 +28,7 @@ const NotificationPreferenceColumn = ({ appId, channel, appPreference }) => {
 
   const onToggle = useCallback((event, notificationType) => {
     const { name: notificationChannel } = event.target;
-    const appNotificationPreference = appPreferences.find(x => x.id === notificationType);
+    const appNotificationPreference = appPreferences.find(preference => preference.id === notificationType);
     const value = notificationChannel === 'email_cadence' && courseId ? event.target.innerText : event.target.checked;
     const emailCadence = notificationChannel === 'email_cadence' ? event.target.innerText : appNotificationPreference.emailCadence;
 

diff --git a/src/notification-preferences/NotificationSettings.jsx b/src/notification-preferences/NotificationSettings.jsx
@@ -44,6 +44,7 @@ const NotificationSettings = () => {
         </div>
         <NotificationCoursesDropdown />
         <NotificationPreferences courseId={courseId} />
+        <div className="border border-light-700 my-6" />
       </Container>
     )
   );