Merge pull request #1070 from openedx/sundass/INF-1415

fix: fix loading and margin issues
openedx · Jun 24, 2024 · 604845f · 604845f
2 parents 0ebc4eb + 751cdb1
commit 604845f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/notification-preferences/NotificationPreferenceApp.jsx b/src/notification-preferences/NotificationPreferenceApp.jsx
@@ -35,7 +35,7 @@ const NotificationPreferenceApp = ({ appId }) => {
     >
       <Collapsible.Trigger>
         <div className="d-flex align-items-center">
-          <span className="mr-auto preference-app font-weight-bold">
+          <span className={classNames('mr-auto preference-app font-weight-bold', { 'mb-2': !mobileView })}>
             {intl.formatMessage(messages.notificationAppTitle, { key: appId })}
           </span>
         </div>

diff --git a/src/notification-preferences/NotificationPreferences.jsx b/src/notification-preferences/NotificationPreferences.jsx
@@ -82,15 +82,15 @@ const NotificationPreferences = () => {
             {course?.name}
           </span>
         </div>
-        {!mobileView && (
+        {!mobileView && !isLoading && (
         <div className="d-flex flex-row justify-content-between float-right">
           <div className="d-flex">
             {Object.values(NOTIFICATION_CHANNELS).map((channel) => (
               <div className={classNames('d-flex flex-column channel-column')}>
                 <NavItem
                   id={channel}
                   key={channel}
-                  className={classNames('mb-3 header-label column-padding', {
+                  className={classNames('header-label column-padding', {
                     'pr-0': channel === NOTIFICATION_CHANNELS[NOTIFICATION_CHANNELS.length - 1],
                     'mr-2': channel === 'web',
                     'email-channel ': channel === 'email',