diff --git a/src/pages-and-resources/discussions/app-config-form/apps/shared/blackout-dates/CollapseCardHeading.jsx b/src/pages-and-resources/discussions/app-config-form/apps/shared/blackout-dates/CollapseCardHeading.jsx index 23649f61d..428516047 100644 --- a/src/pages-and-resources/discussions/app-config-form/apps/shared/blackout-dates/CollapseCardHeading.jsx +++ b/src/pages-and-resources/discussions/app-config-form/apps/shared/blackout-dates/CollapseCardHeading.jsx @@ -16,7 +16,7 @@ const CollapseCardHeading = ({ return (
{badgeStatus && {badgeStatus}} -
{collapseHeadingText}
+
{collapseHeadingText}
); }; diff --git a/src/pages-and-resources/discussions/app-config-form/utils.js b/src/pages-and-resources/discussions/app-config-form/utils.js index fefab1c0e..b7f29d809 100644 --- a/src/pages-and-resources/discussions/app-config-form/utils.js +++ b/src/pages-and-resources/discussions/app-config-form/utils.js @@ -62,21 +62,21 @@ export const formatBlackoutDates = ({ ${mStartDate.format('MMMM D')} - ${mEndDate.format('D, YYYY')} `; - } else if (hasSameMonth && isTimeAvailable) { - formattedDate = ` - ${mStartDateTime.format('MMMM D, YYYY, h:mma')} - - ${mEndDateTime.format('MMMM D, YYYY, h:mma')} - `; - } else if (!hasSameMonth && hasSameYear) { + } else if (!hasSameMonth && hasSameYear && !isTimeAvailable) { formattedDate = ` ${mStartDate.format('MMMM D')} - ${mEndDate.format('MMMM D, YYYY')} `; - } else if (!hasSameMonth && !hasSameYear) { + } else if (!hasSameMonth && !hasSameYear && !isTimeAvailable) { formattedDate = ` ${mStartDate.format('MMMM D, YYYY')} - ${mEndDate.format('MMMM D, YYYY')} `; + } else { + formattedDate = ` + ${mStartDateTime.format('MMMM D, YYYY, h:mma')} - + ${mEndDateTime.format('MMMM D, YYYY, h:mma')} + `; } return formattedDate; };