diff --git a/src/course-checklist/CourseChecklist.jsx b/src/course-checklist/CourseChecklist.jsx
index a220cff8fa..f2de03d363 100644
--- a/src/course-checklist/CourseChecklist.jsx
+++ b/src/course-checklist/CourseChecklist.jsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { getConfig } from '@edx/frontend-platform';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { useIntl } from '@edx/frontend-platform/i18n';
 import { Helmet } from 'react-helmet';
 import { useDispatch, useSelector } from 'react-redux';
 import { Container, Stack } from '@openedx/paragon';
@@ -18,8 +18,8 @@ import ConnectionErrorAlert from '../generic/ConnectionErrorAlert';
 const CourseChecklist = ({
   courseId,
   // injected,
-  intl,
 }) => {
+  const intl = useIntl();
   const dispatch = useDispatch();
   const courseDetails = useModel('courseDetails', courseId);
   const enableQuality = getConfig().ENABLE_CHECKLIST_QUALITY === 'true';
@@ -98,7 +98,6 @@ const CourseChecklist = ({
 CourseChecklist.propTypes = {
   courseId: PropTypes.string.isRequired,
   // injected
-  intl: intlShape.isRequired,
 };
 
-export default injectIntl(CourseChecklist);
+export default CourseChecklist;
diff --git a/src/editors/containers/GameEditor/index.jsx b/src/editors/containers/GameEditor/index.jsx
index e14c3bad0f..87ea049133 100644
--- a/src/editors/containers/GameEditor/index.jsx
+++ b/src/editors/containers/GameEditor/index.jsx
@@ -13,7 +13,7 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 
 import { Spinner } from '@openedx/paragon';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { useIntl } from '@edx/frontend-platform/i18n';
 
 import EditorContainer from '../EditorContainer';
 // This 'module' self-import hack enables mocking during tests.
@@ -24,6 +24,7 @@ import * as module from '.';
 import { actions, selectors } from '../../data/redux';
 import { RequestKeys } from '../../data/constants/requests';
 
+
 export const hooks = {
   getContent: () => ({
     some: 'content',
@@ -40,9 +41,10 @@ export const thumbEditor = ({
   initializeEditor,
   exampleValue,
   // inject
-  intl,
-}) => (
-  <EditorContainer
+}) => {
+  const intl = useIntl();
+  return (
+    <EditorContainer
     getContent={module.hooks.getContent}
     onClose={onClose}
   >
@@ -70,7 +72,8 @@ export const thumbEditor = ({
         )}
     </div>
   </EditorContainer>
-);
+  )
+};
 thumbEditor.defaultProps = {
   blockValue: null,
   lmsEndpointUrl: null,
@@ -86,7 +89,6 @@ thumbEditor.propTypes = {
   blockFinished: PropTypes.bool.isRequired,
   initializeEditor: PropTypes.func.isRequired,
   // inject
-  intl: intlShape.isRequired,
 };
 
 export const mapStateToProps = (state) => ({
@@ -103,4 +105,4 @@ export const mapDispatchToProps = {
   // TODO fill with dispatches here if needed
 };
 
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(thumbEditor));
+export default connect(mapStateToProps, mapDispatchToProps)(thumbEditor);
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/index.jsx b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/index.jsx
index 0b76264217..7f635ba0e2 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/index.jsx
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/index.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { useIntl } from '@edx/frontend-platform/i18n';
 import { Form } from '@openedx/paragon';
 import PropTypes from 'prop-types';
 import SettingsOption from '../../SettingsOption';
@@ -12,8 +12,8 @@ export const RandomizationCard = ({
   defaultValue,
   updateSettings,
   // inject
-  intl,
 }) => {
+  const intl = useIntl();
   const curretRandomization = randomization || defaultValue;
   const { summary, handleChange } = useRandomizationSettingStatus({
     randomization: curretRandomization,
@@ -56,7 +56,6 @@ RandomizationCard.propTypes = {
   defaultValue: PropTypes.string.isRequired,
   randomization: PropTypes.string.isRequired,
   updateSettings: PropTypes.func.isRequired,
-  intl: intlShape.isRequired,
 };
 
-export default injectIntl(RandomizationCard);
+export default RandomizationCard;
diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/DurationWidget/index.jsx b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/DurationWidget/index.jsx
index 5975edf7ae..cafaae2ba3 100644
--- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/DurationWidget/index.jsx
+++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/DurationWidget/index.jsx
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 
 import { Col, Form } from '@openedx/paragon';
-import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
+import { FormattedMessage, useIntl } from '@edx/frontend-platform/i18n';
 
 import { actions, selectors } from '../../../../../../data/redux';
 import { keyStore } from '../../../../../../utils';
@@ -22,8 +22,8 @@ const DurationWidget = ({
   duration,
   updateField,
   // injected
-  intl,
 }) => {
+  const intl = useIntl();
   const {
     unsavedDuration,
     onBlur,
@@ -89,7 +89,6 @@ DurationWidget.propTypes = {
   duration: PropTypes.objectOf(PropTypes.number).isRequired,
   updateField: PropTypes.func.isRequired,
   // injected
-  intl: intlShape.isRequired,
 };
 
 export const mapStateToProps = (state) => ({
@@ -101,4 +100,4 @@ export const mapDispatchToProps = {
 };
 
 export const DurationWidgetInternal = DurationWidget; // For testing only
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(DurationWidget));
+export default connect(mapStateToProps, mapDispatchToProps)(DurationWidget);
diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/SocialShareWidget/index.jsx b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/SocialShareWidget/index.jsx
index 253d3bcbfe..2aa65c4cc6 100644
--- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/SocialShareWidget/index.jsx
+++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/SocialShareWidget/index.jsx
@@ -3,8 +3,7 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import {
   FormattedMessage,
-  injectIntl,
-  intlShape,
+  useIntl
 } from '@edx/frontend-platform/i18n';
 import {
   Hyperlink,
@@ -21,7 +20,6 @@ import * as hooks from './hooks';
  */
 const SocialShareWidget = ({
   // injected
-  intl,
   // redux
   allowVideoSharing,
   isLibrary,
@@ -30,6 +28,7 @@ const SocialShareWidget = ({
   videoSharingLearnMoreLink,
   updateField,
 }) => {
+  const intl = useIntl();
   const isSetByCourse = allowVideoSharing.level === 'course';
   const videoSharingEnabled = isLibrary ? videoSharingEnabledForAll : videoSharingEnabledForCourse;
   const learnMoreLink = videoSharingLearnMoreLink || 'https://docs.openedx.org/en/latest/educators/how-tos/course_development/social_sharing.html';
@@ -91,7 +90,6 @@ SocialShareWidget.defaultProps = {
 
 SocialShareWidget.propTypes = {
   // injected
-  intl: intlShape.isRequired,
   // redux
   allowVideoSharing: PropTypes.shape({
     level: PropTypes.string.isRequired,
@@ -117,4 +115,4 @@ export const mapDispatchToProps = (dispatch) => ({
 });
 
 export const SocialShareWidgetInternal = SocialShareWidget; // For testing only
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(SocialShareWidget));
+export default connect(mapStateToProps, mapDispatchToProps)(SocialShareWidget);
diff --git a/src/editors/sharedComponents/CodeEditor/index.jsx b/src/editors/sharedComponents/CodeEditor/index.jsx
index 8877fe4ba0..c3df5692bd 100644
--- a/src/editors/sharedComponents/CodeEditor/index.jsx
+++ b/src/editors/sharedComponents/CodeEditor/index.jsx
@@ -5,7 +5,7 @@ import {
   Button,
 } from '@openedx/paragon';
 
-import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { FormattedMessage, useIntl} from '@edx/frontend-platform/i18n';
 import messages from './messages';
 import './index.scss';
 
@@ -16,8 +16,8 @@ const CodeEditor = ({
   value,
   lang,
   // injected
-  intl,
 }) => {
+  const intl = useIntl();
   const DOMref = useRef();
   const btnRef = useRef();
   hooks.createCodeMirrorDomNode({
@@ -49,9 +49,8 @@ CodeEditor.propTypes = {
     PropTypes.shape({ current: PropTypes.any }),
   ]).isRequired,
   value: PropTypes.string.isRequired,
-  intl: intlShape.isRequired,
   lang: PropTypes.string.isRequired,
 };
 
 export const CodeEditorInternal = CodeEditor; // For testing only
-export default injectIntl(CodeEditor);
+export default CodeEditor;
diff --git a/src/export-page/export-footer/ExportFooter.jsx b/src/export-page/export-footer/ExportFooter.jsx
index 358bf474b0..94cacfd342 100644
--- a/src/export-page/export-footer/ExportFooter.jsx
+++ b/src/export-page/export-footer/ExportFooter.jsx
@@ -1,14 +1,13 @@
 import React from 'react';
-import {
-  injectIntl,
-  intlShape,
-} from '@edx/frontend-platform/i18n';
+import { useIntl } from '@edx/frontend-platform/i18n';
 import { Layout } from '@openedx/paragon';
 
 import messages from './messages';
 
-const ExportFooter = ({ intl }) => (
-  <footer className="mt-4 small">
+const ExportFooter = () => {
+  const intl = useIntl();
+  return (
+    <footer className="mt-4 small">
     <Layout
       lg={[{ span: 5 }, { span: 2 }, { span: 5 }]}
       md={[{ span: 5 }, { span: 2 }, { span: 5 }]}
@@ -40,10 +39,7 @@ const ExportFooter = ({ intl }) => (
       </Layout.Element>
     </Layout>
   </footer>
-);
-
-ExportFooter.propTypes = {
-  intl: intlShape.isRequired,
+  )
 };
 
-export default injectIntl(ExportFooter);
+export default ExportFooter;
diff --git a/src/files-and-videos/generic/FileMenu.jsx b/src/files-and-videos/generic/FileMenu.jsx
index 36ea4da174..69ceedad52 100644
--- a/src/files-and-videos/generic/FileMenu.jsx
+++ b/src/files-and-videos/generic/FileMenu.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { useIntl } from '@edx/frontend-platform/i18n';
 import {
   Dropdown,
   IconButton,
@@ -20,9 +20,10 @@ const FileMenu = ({
   id,
   fileType,
   // injected
-  intl,
-}) => (
-  <Dropdown data-testid={`file-menu-dropdown-${id}`}>
+}) => {
+  const intl = useIntl();
+  return (
+    <Dropdown data-testid={`file-menu-dropdown-${id}`}>
     <Dropdown.Toggle
       id={`file-menu-dropdown-${id}`}
       as={IconButton}
@@ -70,7 +71,8 @@ const FileMenu = ({
       </Dropdown.Item>
     </Dropdown.Menu>
   </Dropdown>
-);
+  )
+};
 
 FileMenu.propTypes = {
   externalUrl: PropTypes.string,
@@ -83,7 +85,6 @@ FileMenu.propTypes = {
   id: PropTypes.string.isRequired,
   fileType: PropTypes.string.isRequired,
   // injected
-  intl: intlShape.isRequired,
 };
 
 FileMenu.defaultProps = {
@@ -93,4 +94,4 @@ FileMenu.defaultProps = {
   portableUrl: null,
 };
 
-export default injectIntl(FileMenu);
+export default FileMenu;
diff --git a/src/files-and-videos/generic/UsageMetricsMessage.jsx b/src/files-and-videos/generic/UsageMetricsMessage.jsx
index 54ae6cfe82..f20b7b2170 100644
--- a/src/files-and-videos/generic/UsageMetricsMessage.jsx
+++ b/src/files-and-videos/generic/UsageMetricsMessage.jsx
@@ -1,4 +1,4 @@
-import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
+import { FormattedMessage, useIntl } from '@edx/frontend-platform/i18n';
 import { getConfig } from '@edx/frontend-platform';
 import PropTypes from 'prop-types';
 import {
@@ -17,8 +17,8 @@ const UsageMetricsMessage = ({
   usageLocations,
   error,
   // injected
-  intl,
 }) => {
+  const intl = useIntl();
   let usageMessage;
   if (usagePathStatus === RequestStatus.SUCCESSFUL) {
     usageMessage = isEmpty(usageLocations) ? (
@@ -66,7 +66,6 @@ UsageMetricsMessage.propTypes = {
   usageLocations: PropTypes.arrayOf(PropTypes.string).isRequired,
   error: PropTypes.arrayOf(PropTypes.string).isRequired,
   // injected
-  intl: intlShape.isRequired,
 };
 
-export default injectIntl(UsageMetricsMessage);
+export default UsageMetricsMessage;
diff --git a/src/generic/SaveFormConnectionErrorAlert.jsx b/src/generic/SaveFormConnectionErrorAlert.jsx
index fe40bcf21f..abbd50ee38 100644
--- a/src/generic/SaveFormConnectionErrorAlert.jsx
+++ b/src/generic/SaveFormConnectionErrorAlert.jsx
@@ -1,12 +1,14 @@
 import React from 'react';
-import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
+import { useIntl, FormattedMessage } from '@edx/frontend-platform/i18n';
 import { Alert } from '@openedx/paragon';
 import { getConfig } from '@edx/frontend-platform';
 
 import messages from '../messages';
 
-const SaveFormConnectionErrorAlert = ({ intl }) => (
-  <Alert variant="danger" data-testid="connectionErrorAlert">
+const SaveFormConnectionErrorAlert = () => {
+  const intl = useIntl();
+  retrun (
+    <Alert variant="danger" data-testid="connectionErrorAlert">
     <FormattedMessage
       id="authoring.alert.save.error.connection"
       defaultMessage="We encountered a technical error when applying changes. This might be a temporary issue, so please try again in a few minutes. If the problem persists, please go to the {supportLink} for help."
@@ -19,10 +21,8 @@ const SaveFormConnectionErrorAlert = ({ intl }) => (
       }}
     />
   </Alert>
-);
-
-SaveFormConnectionErrorAlert.propTypes = {
-  intl: intlShape.isRequired,
+  )
 };
 
-export default injectIntl(SaveFormConnectionErrorAlert);
+
+export default SaveFormConnectionErrorAlert;
diff --git a/src/generic/configure-modal/VisibilityTab.jsx b/src/generic/configure-modal/VisibilityTab.jsx
index 600f417a61..cd408c3ea9 100644
--- a/src/generic/configure-modal/VisibilityTab.jsx
+++ b/src/generic/configure-modal/VisibilityTab.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Alert, Form } from '@openedx/paragon';
-import { FormattedMessage, injectIntl, useIntl } from '@edx/frontend-platform/i18n';
+import { FormattedMessage, useIntl } from '@edx/frontend-platform/i18n';
 import messages from './messages';
 import { COURSE_BLOCK_NAMES } from '../../constants';
 
@@ -146,4 +146,4 @@ VisibilityTab.defaultProps = {
   isSelfPaced: false,
 };
 
-export default injectIntl(VisibilityTab);
+export default VisibilityTab;
diff --git a/src/pages-and-resources/discussions/app-list/AppCard.jsx b/src/pages-and-resources/discussions/app-list/AppCard.jsx
index 3fc9d2394e..b9215a4dc9 100644
--- a/src/pages-and-resources/discussions/app-list/AppCard.jsx
+++ b/src/pages-and-resources/discussions/app-list/AppCard.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { useSelector } from 'react-redux';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { useIntl } from '@edx/frontend-platform/i18n';
 import Responsive from 'react-responsive';
 import {
   Card, CheckboxControl, breakpoints,
@@ -12,8 +12,9 @@ import appMessages from '../app-config-form/messages';
 import FeaturesList from './FeaturesList';
 
 const AppCard = ({
-  app, onClick, intl, selected, features,
+  app, onClick, selected, features,
 }) => {
+  const intl = useIntl();
   const { canChangeProviders } = useSelector(state => state.courseDetail);
   const supportText = app.hasFullSupport
     ? intl.formatMessage(messages.appFullSupport)
@@ -72,8 +73,7 @@ AppCard.propTypes = {
   }).isRequired,
   onClick: PropTypes.func.isRequired,
   selected: PropTypes.bool.isRequired,
-  intl: intlShape.isRequired,
   features: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
 };
 
-export default injectIntl(AppCard);
+export default AppCard;
diff --git a/src/schedule-and-details/introducing-section/index.jsx b/src/schedule-and-details/introducing-section/index.jsx
index c221e0860c..32e8e21c55 100644
--- a/src/schedule-and-details/introducing-section/index.jsx
+++ b/src/schedule-and-details/introducing-section/index.jsx
@@ -1,8 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {
-  injectIntl,
-  intlShape,
+  useIntl,
   FormattedMessage,
 } from '@edx/frontend-platform/i18n';
 import { Form, Hyperlink } from '@openedx/paragon';
@@ -15,7 +14,6 @@ import ExtendedCourseDetails from './extended-course-details';
 import messages from './messages';
 
 const IntroducingSection = ({
-  intl,
   title,
   subtitle,
   duration,
@@ -34,6 +32,7 @@ const IntroducingSection = ({
   videoThumbnailImageAssetPath,
   onChange,
 }) => {
+  const intl = useIntl();
   const overviewHelpText = (
     <FormattedMessage
       id="course-authoring.schedule-section.introducing.course-overview.help-text"
@@ -182,7 +181,6 @@ IntroducingSection.defaultProps = {
 };
 
 IntroducingSection.propTypes = {
-  intl: intlShape.isRequired,
   title: PropTypes.string,
   subtitle: PropTypes.string,
   duration: PropTypes.string,
@@ -202,4 +200,4 @@ IntroducingSection.propTypes = {
   onChange: PropTypes.func.isRequired,
 };
 
-export default injectIntl(IntroducingSection);
+export default IntroducingSection;
diff --git a/src/studio-home/tabs-section/courses-tab/contact-administrator/index.jsx b/src/studio-home/tabs-section/courses-tab/contact-administrator/index.jsx
index ab809d8aed..efbf86eed9 100644
--- a/src/studio-home/tabs-section/courses-tab/contact-administrator/index.jsx
+++ b/src/studio-home/tabs-section/courses-tab/contact-administrator/index.jsx
@@ -3,14 +3,15 @@ import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import { Button, Card } from '@openedx/paragon';
 import { Add as AddIcon } from '@openedx/paragon/icons/es5';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { useIntl } from '@edx/frontend-platform/i18n';
 
 import { getStudioHomeData } from '../../../data/selectors';
 import messages from '../../../messages';
 
 const ContactAdministrator = ({
-  intl, hasAbilityToCreateCourse, showNewCourseContainer, onClickNewCourse,
+   hasAbilityToCreateCourse, showNewCourseContainer, onClickNewCourse,
 }) => {
+  const intl = useIntl();
   const { studioShortName } = useSelector(getStudioHomeData);
 
   return (
@@ -52,10 +53,9 @@ ContactAdministrator.defaultProps = {
 };
 
 ContactAdministrator.propTypes = {
-  intl: intlShape.isRequired,
   hasAbilityToCreateCourse: PropTypes.bool,
   showNewCourseContainer: PropTypes.bool.isRequired,
   onClickNewCourse: PropTypes.func.isRequired,
 };
 
-export default injectIntl(ContactAdministrator);
+export default ContactAdministrator;