fix: solve rebase issues

Author: bra-i-am

src/editors/sharedComponents/TinyMceWidget/hooks.test.js

@@ -228,12 +228,13 @@ describe('TinyMceEditor hooks', () => {
         const actual = await module.replaceStaticWithAsset({ initialContent: content, learningContextId });
         expect(actual).toBeFalsy();
       });
-      it('does not convert static URLs with subdirectories but converts direct static files', () => {
+      it('does not convert static URLs with subdirectories but converts direct static files', async () => {
         const contentWithSubdirectory = '<img src="/static/images/placeholder-faculty.png"/><img src="/static/example.jpg"/>';
         const expected = `<img src="/static/images/placeholder-faculty.png"/><img src="/${baseAssetUrl}@example.jpg"/>`;
-        const actual = module.replaceStaticWithAsset({
+        const actual = await module.replaceStaticWithAsset({
           initialContent: contentWithSubdirectory,
           learningContextId,
+          validateAssetUrl: false,
         });
         expect(actual).toEqual(expected);
       });

src/schedule-and-details/index.jsx

@@ -9,6 +9,7 @@ import {
 } from '@openedx/paragon/icons';
 import { useIntl } from '@edx/frontend-platform/i18n';
 
+import { useCourseAuthoringContext } from '@src/CourseAuthoringContext';
 import Placeholder from '../editors/Placeholder';
 import { RequestStatus } from '../data/constants';
 import { useGetCourseDetails } from './data/apiHooks';
@@ -17,7 +18,6 @@ import InternetConnectionAlert from '../generic/internet-connection-alert';
 import { STATEFUL_BUTTON_STATES } from '../constants';
 import getPageHeadTitle from '../generic/utils';
 import { useScrollToHashElement } from '../hooks';
-import { useCourseAuthoringContext } from '@src/CourseAuthoringContext';
 import {
   fetchCourseSettingsQuery,
   updateCourseDetailsQuery,
@@ -42,15 +42,15 @@ import { useLoadValuesPrompt, useSaveValuesPrompt } from './hooks';
 
 const ScheduleAndDetails = () => {
   const intl = useIntl();
-  const courseDetails = useGetCourseDetails(courseId);
   const courseSettings = useSelector(getCourseSettings);
   const loadingSettingsStatus = useSelector(getLoadingSettingsStatus);
-  const isLoading = courseDetails.isLoading
-    || loadingSettingsStatus === RequestStatus.IN_PROGRESS;
-
   const { courseId, courseDetails: course } = useCourseAuthoringContext();
   document.title = getPageHeadTitle(course?.name || '', intl.formatMessage(messages.headingTitle));
 
+  const courseDetails = useGetCourseDetails(courseId);
+  const isLoading = courseDetails.isLoading
+  || loadingSettingsStatus === RequestStatus.IN_PROGRESS;
+
   const {
     platformName,
     isCreditCourse,