diff --git a/src/Components/Popups/RejectReversalPopups.jsx b/src/Components/Popups/RejectReversalPopups.jsx index 8fc8bf8..4bff86e 100644 --- a/src/Components/Popups/RejectReversalPopups.jsx +++ b/src/Components/Popups/RejectReversalPopups.jsx @@ -74,6 +74,7 @@ const RejectReversalPopups = ({ placeholder={"Enter your comments...."} rounded={"md"} resize={"none"} + mb={2} /> {errors.comments ? ( diff --git a/src/Pages/BankDepositRequest/BankDepositRequest.jsx b/src/Pages/BankDepositRequest/BankDepositRequest.jsx index 8cd0986..259dd61 100644 --- a/src/Pages/BankDepositRequest/BankDepositRequest.jsx +++ b/src/Pages/BankDepositRequest/BankDepositRequest.jsx @@ -33,6 +33,7 @@ import { useRejectbankDepositRequestMutation, } from "../../Services/bankdeposit.request.service"; import RejectReversalPopups from "../../Components/Popups/RejectReversalPopups"; +import ConfirmReversalPopups from "../../Components/Popups/ConfirmReversalPopups"; const formatDate = (date) => { return new Date(date).toLocaleDateString("en-GB", { @@ -331,8 +332,14 @@ const BankDepositRequest = () => { return ( - + {/* */} + { const toast = useToast(); @@ -38,7 +39,10 @@ import { useGetFawateerDepositMasterQuery } from "../../Services/reversal.fawate const [mouseEntered, setMouseEntered] = useState(false); const [mouseEnteredId, setMouseEnteredId] = useState(""); const [debouncedSearchTerm, setDebouncedSearchTerm] = useState(""); + const [isReversalLoading, setIsReversalLoading] = useBoolean(); + const [rejectFawateerRequest] = useRejectFawateerRequestMutation(); + const [pageSize, setPageSize] = useState(TABLE_PAGINATION?.size); const [currentPage, setCurrentPage] = useState(TABLE_PAGINATION?.page); @@ -110,15 +114,6 @@ import { useGetFawateerDepositMasterQuery } from "../../Services/reversal.fawate const searchLower = searchTerm.toLowerCase(); const nameMatches = name.toLowerCase().includes(searchLower); - // Filter by status - // const status = item.status; - // const statusLower = status ? "active" : "inactive"; - - // const statusMatches = - // statusFilter === "all" || - // (statusFilter === "active" && status === true) || - // (statusFilter === "inactive" && status === false); - return nameMatches; }); @@ -263,6 +258,44 @@ import { useGetFawateerDepositMasterQuery } from "../../Services/reversal.fawate }, 100); setIsLoading(true); }; + + const handleApproved = async (data) => { + setIsReversalLoading.on(); // Start loading + try { + const { error, data: responseData } = await rejectFawateerRequest({ + id: actionId, + data, + }); + + if (error) { + throw error; // Explicitly handle the error + } + + // Success: Perform necessary actions + refetch(); + toast({ + render: () => ( + + ), + }); + onRejectClose(); + } catch (error) { + // Handle errors + toast({ + render: () => ( + + ), + }); + console.error("Error:", error); + } finally { + setIsReversalLoading.off(); // Ensure loading is toggled off + } + }; return ( @@ -325,10 +358,11 @@ import { useGetFawateerDepositMasterQuery } from "../../Services/reversal.fawate id={actionId} // firstField={firstField} /> - );