diff --git a/src/containers/CourseCard/components/RelatedProgramsBadge.jsx b/src/containers/CourseCard/components/RelatedProgramsBadge.jsx
index 8c94307..ec86a79 100644
--- a/src/containers/CourseCard/components/RelatedProgramsBadge.jsx
+++ b/src/containers/CourseCard/components/RelatedProgramsBadge.jsx
@@ -3,6 +3,7 @@ import React from 'react';
 import { Button, useToggle } from '@edx/paragon';
 import { Program } from '@edx/paragon/icons';
 
+import shapes from 'data/services/lms/shapes';
 import RelatedProgramsBadgeModal from 'containers/RelatedProgramsModal';
 
 export const RelatedProgramsBadge = ({ cardData }) => {
@@ -21,5 +22,8 @@ export const RelatedProgramsBadge = ({ cardData }) => {
     </>
   );
 };
+RelatedProgramsBadge.propTypes = {
+  cardData: shapes.courseRunCardData.isRequired,
+};
 
 export default RelatedProgramsBadge;
diff --git a/src/containers/EmailSettingsModal/hooks.js b/src/containers/EmailSettingsModal/hooks.js
index dc78a23..d42e5b9 100644
--- a/src/containers/EmailSettingsModal/hooks.js
+++ b/src/containers/EmailSettingsModal/hooks.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { StrictDict } from 'utils';
-import { thunkActions } from 'data/redux';
+// import { thunkActions } from 'data/redux';
 
 import * as module from './hooks';
 
@@ -20,7 +20,7 @@ export const modalHooks = ({
   const onToggle = React.useCallback(() => setToggleValue(!toggleValue), [toggleValue]);
   const save = React.useCallback(
     () => {
-      console.log("save email settings");
+      console.log('save email settings');
       closeModal();
     },
     [],
diff --git a/src/containers/RelatedProgramsModal/components/ProgramCard.jsx b/src/containers/RelatedProgramsModal/components/ProgramCard.jsx
index 09b83a9..ed8072f 100644
--- a/src/containers/RelatedProgramsModal/components/ProgramCard.jsx
+++ b/src/containers/RelatedProgramsModal/components/ProgramCard.jsx
@@ -4,7 +4,7 @@ import { useIntl } from 'react-intl';
 import {
   Badge,
   Card,
-  Hyperlink,
+  // Hyperlink,
   Icon,
 } from '@edx/paragon';
 import { Program } from '@edx/paragon/icons';
diff --git a/src/containers/RelatedProgramsModal/hooks.js b/src/containers/RelatedProgramsModal/hooks.js
index dc78a23..d42e5b9 100644
--- a/src/containers/RelatedProgramsModal/hooks.js
+++ b/src/containers/RelatedProgramsModal/hooks.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { StrictDict } from 'utils';
-import { thunkActions } from 'data/redux';
+// import { thunkActions } from 'data/redux';
 
 import * as module from './hooks';
 
@@ -20,7 +20,7 @@ export const modalHooks = ({
   const onToggle = React.useCallback(() => setToggleValue(!toggleValue), [toggleValue]);
   const save = React.useCallback(
     () => {
-      console.log("save email settings");
+      console.log('save email settings');
       closeModal();
     },
     [],
diff --git a/src/containers/UnenrollConfirmModal/hooks.js b/src/containers/UnenrollConfirmModal/hooks.js
index a806bc8..7d14e89 100644
--- a/src/containers/UnenrollConfirmModal/hooks.js
+++ b/src/containers/UnenrollConfirmModal/hooks.js
@@ -20,6 +20,14 @@ export const modalHooks = ({ closeModal, dispatch }) => {
 
   const confirm = React.useCallback(() => setIsConfirmed(true), []);
 
+  const close = () => {
+    closeModal();
+    setIsConfirmed(false);
+    setSelectedReason(null);
+    setSubmittedReason(null);
+    setCustomOption('');
+  };
+
   const reason = {
     value: submittedReason,
     skip: React.useCallback(() => setSubmittedReason('')),
@@ -42,7 +50,7 @@ export const modalHooks = ({ closeModal, dispatch }) => {
 
   const closeAndRefresh = React.useCallback(() => {
     dispatch(thunkActions.app.refreshList());
-    closeModal();
+    close();
   }, []);
 
   return {
@@ -50,6 +58,7 @@ export const modalHooks = ({ closeModal, dispatch }) => {
     confirm,
     reason,
     closeAndRefresh,
+    close,
   };
 };
 
diff --git a/src/containers/UnenrollConfirmModal/index.jsx b/src/containers/UnenrollConfirmModal/index.jsx
index 992f8eb..da33d71 100644
--- a/src/containers/UnenrollConfirmModal/index.jsx
+++ b/src/containers/UnenrollConfirmModal/index.jsx
@@ -30,6 +30,7 @@ export const UnenrollConfirmModal = ({
     confirm,
     reason,
     closeAndRefresh,
+    close,
   } = hooks({ dispatch, closeModal });
   const { formatMessage } = useIntl();
 
@@ -51,7 +52,7 @@ export const UnenrollConfirmModal = ({
             <h4>{formatMessage(messages.confirmHeader)}</h4>
             <p>{formatMessage(messages.confirmText)}</p>
             <ActionRow>
-              <Button variant="tertiary" onClick={closeModal}>
+              <Button variant="tertiary" onClick={close}>
                 {formatMessage(messages.confirmCancel)}
               </Button>
               <Button onClick={confirm}>
@@ -108,5 +109,4 @@ UnenrollConfirmModal.propTypes = {
   ]).isRequired,
 };
 
-
 export default UnenrollConfirmModal;