diff --git a/src/components/ZendeskFab/messages.js b/src/components/ZendeskFab/messages.js
index 7212bef..0178ebb 100644
--- a/src/components/ZendeskFab/messages.js
+++ b/src/components/ZendeskFab/messages.js
@@ -1,6 +1,6 @@
-import { StrictDict } from 'utils';
+import { defineMessages } from '@edx/frontend-platform/i18n';
 
-export const messages = StrictDict({
+const messages = defineMessages({
   supportTitle: {
     id: 'zendesk.supportTitle',
     description: 'Title for the support button',
diff --git a/src/containers/CourseCard/components/CourseCardActions/messages.js b/src/containers/CourseCard/components/CourseCardActions/messages.js
index c7d4c65..6c14f9b 100644
--- a/src/containers/CourseCard/components/CourseCardActions/messages.js
+++ b/src/containers/CourseCard/components/CourseCardActions/messages.js
@@ -1,6 +1,6 @@
-import { StrictDict } from 'utils';
+import { defineMessages } from '@edx/frontend-platform/i18n';
 
-export const messages = StrictDict({
+const messages = defineMessages({
   upgrade: {
     id: 'learner-dash.courseCard.actions.upgrade',
     description: 'Course card upgrade button text',
diff --git a/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/messages.js b/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/messages.js
index 7c1d397..e66cc60 100644
--- a/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/messages.js
+++ b/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/messages.js
@@ -1,6 +1,6 @@
-import { StrictDict } from 'utils';
+import { defineMessages } from '@edx/frontend-platform/i18n';
 
-export const messages = StrictDict({
+const messages = defineMessages({
   error: {
     id: 'learner-dash.courseCard.banners.credit.error',
     description: '',
diff --git a/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/views/messages.js b/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/views/messages.js
index 8f92a4e..45e7fd0 100644
--- a/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/views/messages.js
+++ b/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/views/messages.js
@@ -1,6 +1,6 @@
-import { StrictDict } from 'utils';
+import { defineMessages } from '@edx/frontend-platform/i18n';
 
-export const messages = StrictDict({
+const messages = defineMessages({
   approved: {
     id: 'learner-dash.courseCard.banners.credit.approved',
     description: '',
diff --git a/src/containers/CourseCard/components/CourseCardBanners/RelatedProgramsBanner/messages.js b/src/containers/CourseCard/components/CourseCardBanners/RelatedProgramsBanner/messages.js
index ce0307d..f624476 100644
--- a/src/containers/CourseCard/components/CourseCardBanners/RelatedProgramsBanner/messages.js
+++ b/src/containers/CourseCard/components/CourseCardBanners/RelatedProgramsBanner/messages.js
@@ -1,6 +1,6 @@
-import { StrictDict } from 'utils';
+import { defineMessages } from '@edx/frontend-platform/i18n';
 
-export const messages = StrictDict({
+const messages = defineMessages({
   relatedPrograms: {
     id: 'learner-dash.courseCard.banners.relatedPrograms',
     description: 'title for related programs banner',
diff --git a/src/containers/CourseCard/components/CourseCardBanners/messages.js b/src/containers/CourseCard/components/CourseCardBanners/messages.js
index 525f4b2..afd87c3 100644
--- a/src/containers/CourseCard/components/CourseCardBanners/messages.js
+++ b/src/containers/CourseCard/components/CourseCardBanners/messages.js
@@ -1,6 +1,6 @@
-import { StrictDict } from 'utils';
+import { defineMessages } from '@edx/frontend-platform/i18n';
 
-export const messages = StrictDict({
+const messages = defineMessages({
   auditAccessExpired: {
     id: 'learner-dash.courseCard.banners.auditAccessExpired',
     description: 'Audit access expiration banner message',
diff --git a/src/containers/CourseCard/components/CourseCardDetails/messages.js b/src/containers/CourseCard/components/CourseCardDetails/messages.js
index 3e5ee85..a096aeb 100644
--- a/src/containers/CourseCard/components/CourseCardDetails/messages.js
+++ b/src/containers/CourseCard/components/CourseCardDetails/messages.js
@@ -1,6 +1,6 @@
-import { StrictDict } from 'utils';
+import { defineMessages } from '@edx/frontend-platform/i18n';
 
-export const messages = StrictDict({
+const messages = defineMessages({
   accessExpired: {
     id: 'learner-dash.courseCard.CourseCardDetails.accessExpired',
     description: 'Course access expiration date message on course card for expired access.',
diff --git a/src/containers/CourseCard/components/CourseCardMenu/SocialShareMenu.test.jsx b/src/containers/CourseCard/components/CourseCardMenu/SocialShareMenu.test.jsx
index 979a978..fbcb8c2 100644
--- a/src/containers/CourseCard/components/CourseCardMenu/SocialShareMenu.test.jsx
+++ b/src/containers/CourseCard/components/CourseCardMenu/SocialShareMenu.test.jsx
@@ -21,6 +21,7 @@ jest.mock('tracking', () => ({
 }));
 
 jest.mock('@edx/frontend-platform/i18n', () => ({
+  ...jest.requireActual('@edx/frontend-platform/i18n'),
   useIntl: jest.fn().mockReturnValue({
     formatMessage: jest.requireActual('@edx/react-unit-test-utils').formatMessage,
   }),
diff --git a/src/containers/CourseCard/components/CourseCardMenu/index.test.jsx b/src/containers/CourseCard/components/CourseCardMenu/index.test.jsx
index e3050ff..1d7549d 100644
--- a/src/containers/CourseCard/components/CourseCardMenu/index.test.jsx
+++ b/src/containers/CourseCard/components/CourseCardMenu/index.test.jsx
@@ -12,6 +12,7 @@ import * as hooks from './hooks';
 import CourseCardMenu, { testIds } from '.';
 
 jest.mock('@edx/frontend-platform/i18n', () => ({
+  ...jest.requireActual('@edx/frontend-platform/i18n'),
   useIntl: jest.fn().mockReturnValue({
     formatMessage: jest.requireActual('@edx/react-unit-test-utils').formatMessage,
   }),
diff --git a/src/containers/CourseCard/components/CourseCardMenu/messages.js b/src/containers/CourseCard/components/CourseCardMenu/messages.js
index 023b38b..d01a6bc 100644
--- a/src/containers/CourseCard/components/CourseCardMenu/messages.js
+++ b/src/containers/CourseCard/components/CourseCardMenu/messages.js
@@ -1,6 +1,6 @@
-import { StrictDict } from 'utils';
+import { defineMessages } from '@edx/frontend-platform/i18n';
 
-export const messages = StrictDict({
+const messages = defineMessages({
   unenroll: {
     id: 'learner-dash.courseCardMenu.unenroll',
     description: 'Course unenroll menu button',
diff --git a/src/containers/CourseCard/messages.js b/src/containers/CourseCard/messages.js
index bc68cce..cc71fb1 100644
--- a/src/containers/CourseCard/messages.js
+++ b/src/containers/CourseCard/messages.js
@@ -1,6 +1,6 @@
-import { StrictDict } from 'utils';
+import { defineMessages } from '@edx/frontend-platform/i18n';
 
-export const messages = StrictDict({
+const messages = defineMessages({
   bannerAlt: {
     id: 'learner-dash.courseCard.bannerAlt',
     description: 'Course card banner alt-text',
diff --git a/src/containers/EmailSettingsModal/messages.js b/src/containers/EmailSettingsModal/messages.js
index 1112c94..8c97f06 100644
--- a/src/containers/EmailSettingsModal/messages.js
+++ b/src/containers/EmailSettingsModal/messages.js
@@ -1,7 +1,7 @@
 /* eslint-disable quotes */
-import { StrictDict } from 'utils';
+import { defineMessages } from '@edx/frontend-platform/i18n';
 
-export const messages = StrictDict({
+const messages = defineMessages({
   header: {
     id: 'learner-dash.emailSettings.header',
     description: 'Header for email settings modal',
diff --git a/src/containers/RelatedProgramsModal/messages.js b/src/containers/RelatedProgramsModal/messages.js
index 8120aab..257aada 100644
--- a/src/containers/RelatedProgramsModal/messages.js
+++ b/src/containers/RelatedProgramsModal/messages.js
@@ -1,7 +1,7 @@
 /* eslint-disable quotes */
-import { StrictDict } from 'utils';
+import { defineMessages } from '@edx/frontend-platform/i18n';
 
-export const messages = StrictDict({
+const messages = defineMessages({
   header: {
     id: 'learner-dash.relatedPrograms.header',
     description: 'Header for related settings modal',
diff --git a/src/containers/SelectSessionModal/messages.js b/src/containers/SelectSessionModal/messages.js
index 0ced95b..ae69fa7 100644
--- a/src/containers/SelectSessionModal/messages.js
+++ b/src/containers/SelectSessionModal/messages.js
@@ -1,7 +1,7 @@
 /* eslint-disable quotes */
-import { StrictDict } from 'utils';
+import { defineMessages } from '@edx/frontend-platform/i18n';
 
-export const messages = StrictDict({
+const messages = defineMessages({
   changeOrLeaveHeader: {
     id: 'learner-dash.selectSession.changeOrLeaveHeader',
     description: 'Header for session that allow leave option',
diff --git a/src/containers/UnenrollConfirmModal/components/messages.js b/src/containers/UnenrollConfirmModal/components/messages.js
index 2e2bee8..721032a 100644
--- a/src/containers/UnenrollConfirmModal/components/messages.js
+++ b/src/containers/UnenrollConfirmModal/components/messages.js
@@ -1,7 +1,7 @@
 /* eslint-disable quotes */
-import { StrictDict } from 'utils';
+import { defineMessages } from '@edx/frontend-platform/i18n';
 
-export const messages = StrictDict({
+const messages = defineMessages({
   confirmHeader: {
     id: 'learner-dash.unenrollConfirm.confirm.header',
     description: 'Header for confirm unenroll modal',
diff --git a/src/messages.js b/src/messages.js
index 5934551..3d60482 100644
--- a/src/messages.js
+++ b/src/messages.js
@@ -1,6 +1,6 @@
-import { StrictDict } from 'utils';
+import { defineMessages } from '@edx/frontend-platform/i18n';
 
-export const messages = StrictDict({
+const messages = defineMessages({
   loadingSR: {
     id: 'learner-dash.loadingSR',
     description: 'Page loading screen-reader text',