diff --git a/src/Components/Popups/ConfirmReversalPopups.jsx b/src/Components/Popups/ConfirmReversalPopups.jsx index eb42ad4..7e43416 100644 --- a/src/Components/Popups/ConfirmReversalPopups.jsx +++ b/src/Components/Popups/ConfirmReversalPopups.jsx @@ -29,7 +29,7 @@ export const conformModalSchema = yup.object().shape({ .string() .min(2, "Minimum length should be 150 characters.") .max(150, "Maximum length should be 150 characters.") - .matches(/^[^\d]+$/, "Sponsor Name cannot contain numbers") + // .matches(/^[^\d]+$/, "Sponsor Name cannot contain numbers") .required("Comment is required"), subject: yup.string().notRequired(), emailTemplate: yup.string().notRequired(), @@ -59,6 +59,13 @@ const ConfirmReversalPopups = ({ setValue("emailTemplate", richTextValue); }, [richTextValue]); + // Reset the form when the modal closes + useEffect(() => { + if (!isOpen) { + reset(); // Clear the form state + } + }, [isOpen, reset]); + const [emailApproval, setEmailApproval] = useBoolean(false); const modules = { diff --git a/src/Components/Popups/InitiateReversalPopups.jsx b/src/Components/Popups/InitiateReversalPopups.jsx index 4d54734..7ac6fa5 100644 --- a/src/Components/Popups/InitiateReversalPopups.jsx +++ b/src/Components/Popups/InitiateReversalPopups.jsx @@ -13,7 +13,7 @@ import { Text, Textarea, } from "@chakra-ui/react"; -import React from "react"; +import React, { useEffect } from "react"; import PropTypes from "prop-types"; import * as yup from "yup"; @@ -25,7 +25,7 @@ export const conformModalSchema = yup.object().shape({ .string() .min(2, "Minimum length should be 150 characters.") .max(150, "Maximum length should be 150 characters.") - .matches(/^[^\d]+$/, "Sponsor Name cannot contain numbers") + // .matches(/^[^\d]+$/, "Sponsor Name cannot contain numbers") .required("Comment is required"), }); @@ -46,6 +46,13 @@ const InitiateReversalPopup = ({ mode: "all", }); + // Reset the form when the modal closes + useEffect(() => { + if (!isOpen) { + reset(); // Clear the form state + } + }, [isOpen, reset]); + return ( diff --git a/src/Components/Popups/RejectReversalPopups.jsx b/src/Components/Popups/RejectReversalPopups.jsx index 9df7924..03bca87 100644 --- a/src/Components/Popups/RejectReversalPopups.jsx +++ b/src/Components/Popups/RejectReversalPopups.jsx @@ -13,7 +13,7 @@ import { Text, Textarea, } from "@chakra-ui/react"; -import React from "react"; +import React, { useEffect } from "react"; import PropTypes from "prop-types"; import * as yup from "yup"; @@ -25,7 +25,7 @@ export const conformModalSchema = yup.object().shape({ .string() .min(2, "Minimum length should be 150 characters.") .max(150, "Maximum length should be 150 characters.") - .matches(/^[^\d]+$/, "Sponsor Name cannot contain numbers") + // .matches(/^[^\d]+$/, "Sponsor Name cannot contain numbers") .required("Comment is required"), }); @@ -46,6 +46,13 @@ const RejectReversalPopups = ({ mode: "all", }); + // Reset the form when the modal closes + useEffect(() => { + if (!isOpen) { + reset(); // Clear the form state + } + }, [isOpen, reset]); + return ( diff --git a/src/Layout/DefaultLayout.jsx b/src/Layout/DefaultLayout.jsx index ad60b68..c5475bc 100644 --- a/src/Layout/DefaultLayout.jsx +++ b/src/Layout/DefaultLayout.jsx @@ -302,7 +302,7 @@ const DashboardLayout = ({ isOnline }) => { return ( - Bank Deposit Request + Reversal Transaction / Deposit Request ); case path.startsWith("/reversal-fawateer-deposit"): @@ -733,6 +733,7 @@ const DashboardLayout = ({ isOnline }) => { } else if (type === "single") { return ( { } }, [data, reset]); + useEffect(() => { + if (!isOpen) { + reset(); + } + }, [isOpen, reset]); + const heandleOnClose = () =>{ reset() onClose() @@ -130,7 +136,7 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => { fontSize="sm" type="textarea" size="md" - placeholder={"Enter your checkerComment...."} + placeholder={"Enter your checker Comment...."} rounded={"md"} resize={"none"} maxLength={200} diff --git a/src/Pages/FawateerChecker/ApproveRequest/RequestRejectModal.jsx b/src/Pages/FawateerChecker/ApproveRequest/RequestRejectModal.jsx index 35f8873..7cad5bb 100644 --- a/src/Pages/FawateerChecker/ApproveRequest/RequestRejectModal.jsx +++ b/src/Pages/FawateerChecker/ApproveRequest/RequestRejectModal.jsx @@ -42,6 +42,13 @@ const RequestRejectModal = ({ isOpen, onClose, firstField ,id}) => { resolver: yupResolver(conformModalSchema), }); + useEffect(() => { + if (!isOpen) { + reset(); // Clear the form state + } + }, [isOpen, reset]); + + const [ rejectFawateer ] = useRejectCommentMutation() diff --git a/src/Routes/Nav.js b/src/Routes/Nav.js index a9d3484..e37c196 100644 --- a/src/Routes/Nav.js +++ b/src/Routes/Nav.js @@ -109,7 +109,7 @@ export const nav = [ title: "Fawateer Deposit", submenu: [ { - title: "Aprover Request", + title: "Approver Request", path: "/fawateer", icon: RiMoneyDollarBoxLine, },