diff --git a/client/src/components/education/StrikeDetailsModal.tsx b/client/src/components/education/StrikeDetailsModal.tsx index f6c7872..9ac8cbc 100644 --- a/client/src/components/education/StrikeDetailsModal.tsx +++ b/client/src/components/education/StrikeDetailsModal.tsx @@ -56,6 +56,8 @@ export const StrikeDetailsModal = ({ setStrikeFields(strikeToEdit); setIsEditMode(true); return; + } else { + setIsEditMode(false); } resetForm(); }, [strikeToEdit]); @@ -111,6 +113,7 @@ export const StrikeDetailsModal = ({ onConfirmEdit(strikeFields); } else { onConfirmAdd(strikeFields); + resetForm(); } }; diff --git a/client/src/components/education/StrikesComponent.tsx b/client/src/components/education/StrikesComponent.tsx index 35d5b50..1e77ec9 100644 --- a/client/src/components/education/StrikesComponent.tsx +++ b/client/src/components/education/StrikesComponent.tsx @@ -67,6 +67,7 @@ export const StrikesComponent = () => { * Function to enable adding strikes. */ const onClickAdd = () => { + setStrikeToEdit(null); setIsModalOpen(true); }; diff --git a/client/src/components/education/StrikesList.tsx b/client/src/components/education/StrikesList.tsx index b7e5512..c8cd5aa 100644 --- a/client/src/components/education/StrikesList.tsx +++ b/client/src/components/education/StrikesList.tsx @@ -66,7 +66,6 @@ export const StrikesList: React.FC = ({ strikes, onClickEdit, alignItems="flex-start" disablePadding sx={{ - paddingBottom: 1, bgcolor: index % 2 === 0 ? '#f8f9fa' : 'background.paper', }} > @@ -95,7 +94,11 @@ export const StrikesList: React.FC = ({ strikes, onClickEdit, {formatDateForDisplay(strike.date)} } - secondary={{strike.comments}} + secondary={ + + {strike.comments} + + } /> {renderActions(strike.id)}