fix: some refactor and fixes

Author: filippovskii09

src/course-home/dates-tab/DatesTab.jsx

@@ -4,6 +4,7 @@ import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { useIntl } from '@edx/frontend-platform/i18n';
 
 import { MAIN_CONTENT_ID } from '@src/constants';
+import { useScrollToContent } from '@src/generic/hooks';
 import messages from './messages';
 import Timeline from './timeline/Timeline';
 
@@ -14,7 +15,6 @@ import SuggestedScheduleHeader from '../suggested-schedule-messaging/SuggestedSc
 import ShiftDatesAlert from '../suggested-schedule-messaging/ShiftDatesAlert';
 import UpgradeToCompleteAlert from '../suggested-schedule-messaging/UpgradeToCompleteAlert';
 import UpgradeToShiftDatesAlert from '../suggested-schedule-messaging/UpgradeToShiftDatesAlert';
-import { useScrollToContent } from '../../generic/hooks';
 
 const DatesTab = () => {
   const intl = useIntl();

src/courseware/course/sequence/sequence-navigation/UnitButton.test.jsx

@@ -9,6 +9,7 @@ import {
   waitFor,
 } from '../../../../setupTest';
 import UnitButton from './UnitButton';
+import messages from './messages';
 
 describe('Unit Button', () => {
   let mockData;
@@ -112,7 +113,7 @@ describe('Unit Button', () => {
     const { container } = render(
       <>
         <UnitButton {...mockData} />
-        <button id="bookmark-button" type="button">Bookmark</button>
+        <button id="bookmark-button" type="button">{messages.bookmark.defaultMessage}</button>
       </>,
       { wrapWithRouter: true },
     );
@@ -136,7 +137,7 @@ describe('Unit Button', () => {
     const { container } = render(
       <>
         <UnitButton {...mockData} onClick={onClick} />
-        <button id="bookmark-button" type="button">Bookmark</button>
+        <button id="bookmark-button" type="button">{messages.bookmark.defaultMessage}</button>
       </>,
       { wrapWithRouter: true },
     );

src/courseware/course/sequence/sequence-navigation/messages.ts

@@ -16,6 +16,11 @@ const messages = defineMessages({
     defaultMessage: 'Previous',
     description: 'Button to return to the previous section',
   },
+  bookmark: {
+    id: 'learning.generic.bookmark',
+    defaultMessage: 'Bookmark',
+    description: 'Button text for bookmarking',
+  },
 });
 
 export default messages;

src/generic/hooks.test.jsx

@@ -63,7 +63,7 @@ describe('Hooks', () => {
     test('should scroll to target element and focus', async () => {
       render(<TestComponent />);
 
-      const skipLink = screen.getByRole('link', { name: /skip to content/i });
+      const skipLink = screen.getByRole('link', { name: new RegExp(messages.skipToContent.defaultMessage, 'i') });
       const targetContent = screen.getByTestId('target-content');
 
       targetContent.focus = jest.fn();
@@ -114,7 +114,7 @@ describe('Hooks', () => {
 
       render(<ComponentWithoutTarget />);
 
-      const skipLink = screen.getByRole('link', { name: /skip to content/i });
+      const skipLink = screen.getByRole('link', { name: new RegExp(messages.skipToContent.defaultMessage, 'i') });
 
       await userEvent.click(skipLink);