From de04a99bf7d501fd93a17246f13cfbffa65a448a Mon Sep 17 00:00:00 2001
From: M M <cosmicray23@hotmail.com>
Date: Sun, 16 Jun 2024 13:49:25 -0700
Subject: [PATCH] Modified the AnnouncementsDualButtonWithIcon to handle
 closing the toast.

---
 .../AnnouncementsDualButtonWithIcon.jsx        | 12 +++++++++---
 Client/src/Components/Toast/index.jsx          | 18 ++++++++++--------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Client/src/Components/Announcements/AnnouncementsDualButtonWithIcon/AnnouncementsDualButtonWithIcon.jsx b/Client/src/Components/Announcements/AnnouncementsDualButtonWithIcon/AnnouncementsDualButtonWithIcon.jsx
index 574c255a0..bd2675f4c 100644
--- a/Client/src/Components/Announcements/AnnouncementsDualButtonWithIcon/AnnouncementsDualButtonWithIcon.jsx
+++ b/Client/src/Components/Announcements/AnnouncementsDualButtonWithIcon/AnnouncementsDualButtonWithIcon.jsx
@@ -1,5 +1,4 @@
 import "./announcementsDualButtonWithIcon.css";
-import React from "react";
 import CloseIcon from "@mui/icons-material/Close";
 import PropTypes from "prop-types";
 import { useTheme } from "@mui/material";
@@ -12,6 +11,7 @@ import { useTheme } from "@mui/material";
  * @param {string} props.body - The announcement body text content
  * @param {string} props.esc - The text for the escape button (usually "Close")
  * @param {string} props.primary - The text for the primary button
+ * @param {function} props.closeToast - Function to close the toast notification
  * @returns {JSX.Element} - Renders the announcement dual button with icon component
  */
 
@@ -21,6 +21,7 @@ const AnnouncementsDualButtonWithIcon = ({
   body,
   esc,
   primary,
+  closeToast,
 }) => {
   const theme = useTheme();
 
@@ -40,14 +41,18 @@ const AnnouncementsDualButtonWithIcon = ({
         {body && <div className="announcement-content-body">{body}</div>}
         {(esc || primary) && (
           <div className="announcement-content-controllers">
-            {esc && <div className="controllers-button-esc">{esc}</div>}
+            {esc && (
+              <div className="controllers-button-esc" onClick={closeToast}>
+                {esc}
+              </div>
+            )}
             {primary && (
               <div className="controllers-button-primary">{primary}</div>
             )}
           </div>
         )}
       </div>
-      <div className="announcement-close">
+      <div className="announcement-close" onClick={closeToast}>
         <CloseIcon style={{ fill: "#98A2B3" }} />
       </div>
     </div>
@@ -60,6 +65,7 @@ AnnouncementsDualButtonWithIcon.propTypes = {
   body: PropTypes.string,
   esc: PropTypes.string,
   primary: PropTypes.string,
+  closeToast: PropTypes.func.isRequired,
 };
 
 export default AnnouncementsDualButtonWithIcon;
diff --git a/Client/src/Components/Toast/index.jsx b/Client/src/Components/Toast/index.jsx
index f3a06bdb1..ceb7a6f60 100644
--- a/Client/src/Components/Toast/index.jsx
+++ b/Client/src/Components/Toast/index.jsx
@@ -7,14 +7,16 @@ import "./index.css";
 const ToastComponent = () => {
   const displayMsg = () => {
     toast(
-      <AnnouncementsDualButtonWithIcon
-        icon={<ComplexAlert theme="red" />}
-        subject="There was a problem with that action"
-        body="Lorem ipsum dolor sit amet consectetur adipisicing elit. Aliquid pariatur, ipsum dolor."
-        esc="Dismiss"
-        primary="Learn more"
-        dismiss={() => toast.dismiss()}
-      />,
+      ({ closeToast, toastProps }) => (
+        <AnnouncementsDualButtonWithIcon
+          icon={<ComplexAlert theme="red" />}
+          subject="There was a problem with that action"
+          body="Lorem ipsum dolor sit amet consectetur adipisicing elit. Aliquid pariatur, ipsum dolor."
+          esc="Dismiss"
+          primary="Learn more"
+          closeToast={closeToast}
+        />
+      ),
       { closeButton: false }
     );
   };