Add missing return statements in sendContactEmail (#2572)

* Add missing return statements in sendContactEmail

* Update error display to show Toast notification

* Clean up commented code

Author: Giolii

client/src/components/StaticPages/Contact.jsx

@@ -19,6 +19,7 @@ import * as analytics from "../../services/analytics";
 import Footer from "../Layout/Footer";
 import { useSiteContext } from "contexts/siteContext";
 import SEO from "../SEO";
+import { useToasterContext } from "contexts/toasterContext";
 
 const validationSchema = Yup.object().shape({
   name: Yup.string().required("Please enter your name"),
@@ -94,7 +95,7 @@ const Contact = () => {
 
   const [open, setOpen] = useState(false);
   const [submitted, setSubmitted] = useState(false);
-  const [submitError, setSubmitError] = useState("");
+  const {setToast} = useToasterContext()
   const handleOpen = () => setOpen(true);
   const handleClose = () => setOpen(false);
   const { isMobile } = useBreakpoints();
@@ -176,12 +177,13 @@ const Contact = () => {
                 sendContactForm(values)
                   .then(() => {
                     setSubmitted(true);
-                    setSubmitError("");
                     handleOpen();
                   })
                   .catch(() => {
-                    setSubmitError(
-                      "There was an error with your submission. Please try again."
+                    setToast({
+                      message:"There was an error with your submission. Please try again.",
+                      type:"error"
+                    }
                     );
                   });
               }}
@@ -270,17 +272,6 @@ const Contact = () => {
                     alignItems="center"
                     gap={isMobile ? 1 : 2}
                   >
-                    {submitError && (
-                      <Typography
-                        variant="subtitle2"
-                        color="error"
-                        sx={{
-                          marginTop: "-20px",
-                        }}
-                      >
-                        {submitError}
-                      </Typography>
-                    )}
                     <Button type="submit" disabled={!dirty || !isValid}>
                       Submit
                     </Button>

server/app/services/sendgrid-service.ts

@@ -472,9 +472,9 @@ const sendContactEmail = async ({
 
   return sgMail.send(msg, false, (err) => {
     if (err) {
-      Promise.reject("Sending contact form email failed.");
+      return Promise.reject("Sending contact form email failed.");
     }
-    Promise.resolve(true).then(() => {
+    return Promise.resolve(true).then(() => {
       if (email) {
         sendContactConfirmation({
           name,