diff --git a/src/components/icons/InsertLink.jsx b/src/components/icons/InsertLink.jsx
index 90b53b58f..52a55762e 100644
--- a/src/components/icons/InsertLink.jsx
+++ b/src/components/icons/InsertLink.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 
+// eslint-disable-next-line react/function-component-definition
 export default function InsertLink() {
   return (
     <svg
diff --git a/src/components/icons/Issue.jsx b/src/components/icons/Issue.jsx
index 94cb1a8eb..d7bacebc9 100644
--- a/src/components/icons/Issue.jsx
+++ b/src/components/icons/Issue.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 
+// eslint-disable-next-line react/function-component-definition
 export default function Issue() {
   return (
     <svg
diff --git a/src/components/icons/People.jsx b/src/components/icons/People.jsx
index a0e2fca9a..c0ed0115b 100644
--- a/src/components/icons/People.jsx
+++ b/src/components/icons/People.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 
+// eslint-disable-next-line react/function-component-definition
 export default function People() {
   return (
     <svg
diff --git a/src/components/icons/PushPin.jsx b/src/components/icons/PushPin.jsx
index bd6d98d54..87c5fe5f6 100644
--- a/src/components/icons/PushPin.jsx
+++ b/src/components/icons/PushPin.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 
+// eslint-disable-next-line react/function-component-definition
 export default function PushPin() {
   return (
     <svg
diff --git a/src/components/icons/Question.jsx b/src/components/icons/Question.jsx
index c35a96f6a..baf63ea78 100644
--- a/src/components/icons/Question.jsx
+++ b/src/components/icons/Question.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 
+// eslint-disable-next-line react/function-component-definition
 export default function Question() {
   return (
     <svg
diff --git a/src/components/icons/QuestionAnswer.jsx b/src/components/icons/QuestionAnswer.jsx
index 3146afe05..1bdb00fdb 100644
--- a/src/components/icons/QuestionAnswer.jsx
+++ b/src/components/icons/QuestionAnswer.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 
+// eslint-disable-next-line react/function-component-definition
 export default function QuestionAnswer() {
   return (
     <svg
diff --git a/src/components/icons/QuestionAnswerOutline.jsx b/src/components/icons/QuestionAnswerOutline.jsx
index f115c0317..4b7f083ad 100644
--- a/src/components/icons/QuestionAnswerOutline.jsx
+++ b/src/components/icons/QuestionAnswerOutline.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 
+// eslint-disable-next-line react/function-component-definition
 export default function QuestionAnswerOutline() {
   return (
     <svg
diff --git a/src/components/icons/StarFilled.jsx b/src/components/icons/StarFilled.jsx
index 1eff3ed0d..4ffb14bee 100644
--- a/src/components/icons/StarFilled.jsx
+++ b/src/components/icons/StarFilled.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 
+// eslint-disable-next-line react/function-component-definition
 export default function StarFilled() {
   return (
     <svg
diff --git a/src/components/icons/StarOutline.jsx b/src/components/icons/StarOutline.jsx
index 3e4fa3970..e484171ce 100644
--- a/src/components/icons/StarOutline.jsx
+++ b/src/components/icons/StarOutline.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 
+// eslint-disable-next-line react/function-component-definition
 export default function StarOutline() {
   return (
     <svg
diff --git a/src/components/icons/ThumbUpFilled.jsx b/src/components/icons/ThumbUpFilled.jsx
index 51f9c5555..3c01c904b 100644
--- a/src/components/icons/ThumbUpFilled.jsx
+++ b/src/components/icons/ThumbUpFilled.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 
+// eslint-disable-next-line react/function-component-definition
 export default function ThumbUpFilled() {
   return (
     <svg
diff --git a/src/components/icons/ThumbUpOutline.jsx b/src/components/icons/ThumbUpOutline.jsx
index b4c17c9c6..ff6147cde 100644
--- a/src/components/icons/ThumbUpOutline.jsx
+++ b/src/components/icons/ThumbUpOutline.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 
+// eslint-disable-next-line react/function-component-definition
 export default function ThumbUpOutline() {
   return (
     <svg
diff --git a/src/discussions/common/HoverCard.jsx b/src/discussions/common/HoverCard.jsx
index cd8ae29fd..090ffaf6e 100644
--- a/src/discussions/common/HoverCard.jsx
+++ b/src/discussions/common/HoverCard.jsx
@@ -17,7 +17,7 @@ import { postShape } from '../posts/post/proptypes';
 import ActionsDropdown from './ActionsDropdown';
 import { DiscussionContext } from './context';
 
-function HoverCard({
+const HoverCard = ({
   intl,
   commentOrPost,
   actionHandlers,
@@ -27,7 +27,7 @@ function HoverCard({
   onFollow,
   isClosedPost,
   endorseIcons,
-}) {
+}) => {
   const { enableInContextSidebar } = useContext(DiscussionContext);
   const userCanAddThreadInBlackoutDate = useUserCanAddThreadInBlackoutDate();
   return (
@@ -40,8 +40,10 @@ function HoverCard({
         <div className="d-flex">
           <Button
             variant="tertiary"
-            className={classNames('px-2.5 py-2 border-0 font-style text-gray-700 font-size-12',
-              { 'w-100': enableInContextSidebar })}
+            className={classNames(
+              'px-2.5 py-2 border-0 font-style text-gray-700 font-size-12',
+              { 'w-100': enableInContextSidebar },
+            )}
             onClick={() => handleResponseCommentButton()}
             disabled={isClosedPost}
             style={{ lineHeight: '20px' }}
@@ -107,7 +109,7 @@ function HoverCard({
       </div>
     </div>
   );
-}
+};
 
 HoverCard.propTypes = {
   intl: intlShape.isRequired,
@@ -118,6 +120,7 @@ HoverCard.propTypes = {
   onFollow: PropTypes.func,
   addResponseCommentButtonMessage: PropTypes.string.isRequired,
   isClosedPost: PropTypes.bool.isRequired,
+  // eslint-disable-next-line react/forbid-prop-types
   endorseIcons: PropTypes.objectOf(PropTypes.any),
 };
 
diff --git a/src/discussions/discussions-home/DiscussionContent.jsx b/src/discussions/discussions-home/DiscussionContent.jsx
index 3d2764d2d..a46e7c422 100644
--- a/src/discussions/discussions-home/DiscussionContent.jsx
+++ b/src/discussions/discussions-home/DiscussionContent.jsx
@@ -9,7 +9,7 @@ import { Routes } from '../../data/constants';
 import { PostCommentsView } from '../post-comments';
 import { PostEditor } from '../posts';
 
-function DiscussionContent() {
+const DiscussionContent = () => {
   const postEditorVisible = useSelector((state) => state.threads.postEditorVisible);
 
   return (
@@ -32,6 +32,6 @@ function DiscussionContent() {
       </div>
     </div>
   );
-}
+};
 
 export default injectIntl(DiscussionContent);
diff --git a/src/discussions/discussions-home/DiscussionsHome.jsx b/src/discussions/discussions-home/DiscussionsHome.jsx
index b0ed0668c..747baf33c 100644
--- a/src/discussions/discussions-home/DiscussionsHome.jsx
+++ b/src/discussions/discussions-home/DiscussionsHome.jsx
@@ -32,7 +32,7 @@ import DiscussionSidebar from './DiscussionSidebar';
 import useFeedbackWrapper from './FeedbackWrapper';
 import InformationBanner from './InformationBanner';
 
-export default function DiscussionsHome() {
+const DiscussionsHome = () => {
   const location = useLocation();
   const postActionBarRef = useRef(null);
   const postEditorVisible = useSelector(selectPostEditorVisible);
@@ -67,6 +67,7 @@ export default function DiscussionsHome() {
   }, [path]);
 
   return (
+    // eslint-disable-next-line react/jsx-no-constructed-context-values
     <DiscussionContext.Provider value={{
       page,
       courseId,
@@ -130,4 +131,6 @@ export default function DiscussionsHome() {
       {!enableInContextSidebar && <Footer />}
     </DiscussionContext.Provider>
   );
-}
+};
+
+export default DiscussionsHome;
diff --git a/src/discussions/learners/LearnersView.test.jsx b/src/discussions/learners/LearnersView.test.jsx
index 45631178c..44ef2ca8e 100644
--- a/src/discussions/learners/LearnersView.test.jsx
+++ b/src/discussions/learners/LearnersView.test.jsx
@@ -1,3 +1,4 @@
+/* eslint-disable default-param-last */
 import React from 'react';
 
 import {
@@ -200,7 +201,8 @@ describe('LearnersView', () => {
       username:
         ['learner-1', 'learner-2'],
     },
-  ])('should have a search bar with a clear button and \'$output\' results found text.',
+  ])(
+    'should have a search bar with a clear button and \'$output\' results found text.',
     async ({
       searchText, output, learnersCount, username,
     }) => {
@@ -226,7 +228,8 @@ describe('LearnersView', () => {
         expect(clearButton).toBeInTheDocument();
         expect(leaners).toHaveLength(learnersCount);
       });
-    });
+    },
+  );
 
   test('When click on the clear button it should move to a list of all learners.', async () => {
     await setUpLearnerMockResponse();
@@ -256,7 +259,8 @@ describe('LearnersView', () => {
     expect(learners).toHaveLength(3);
   });
 
-  it('should display reported and previously reported message by passing activeFlags or inactiveFlags',
+  it(
+    'should display reported and previously reported message by passing activeFlags or inactiveFlags',
     async () => {
       await setUpLearnerMockResponse(2, 2, 1, ['learner-1', 'learner-2'], '', 1, 1);
       await assignPrivilages(true);
@@ -273,7 +277,8 @@ describe('LearnersView', () => {
       expect(reportedIcon).toBeInTheDocument();
       expect(reported).toBeInTheDocument();
       expect(previouslyReported).toBeInTheDocument();
-    });
+    },
+  );
 
   it('should display load more button and display more learners by clicking on button.', async () => {
     await setUpLearnerMockResponse();
diff --git a/src/discussions/topics/utils.js b/src/discussions/topics/utils.js
index fcc3f9614..2eead336b 100644
--- a/src/discussions/topics/utils.js
+++ b/src/discussions/topics/utils.js
@@ -10,7 +10,7 @@ export default function countFilteredTopics(topicsSelector, provider) {
     ? item.name.toLowerCase().includes(query)
     : true
   ));
-  count += nonCoursewareTopicsList?.length;
+  count += nonCoursewareTopicsList?.length ?? 0;
   // Counting legacy topics
   if (provider === DiscussionProvider.LEGACY) {
     const categories = topicsSelector?.categoryIds;