diff --git a/src/Components/DataTable/NormalTable.jsx b/src/Components/DataTable/NormalTable.jsx
index af3155f..a08a134 100644
--- a/src/Components/DataTable/NormalTable.jsx
+++ b/src/Components/DataTable/NormalTable.jsx
@@ -58,7 +58,6 @@ const NormalTable = ({
};
-
const handleCheckboxChange = (value) => {
if (radio) {
// If radio is true, select only one option
diff --git a/src/Components/Popups/ConfirmReversalPopups.jsx b/src/Components/Popups/ConfirmReversalPopups.jsx
new file mode 100644
index 0000000..b6e7183
--- /dev/null
+++ b/src/Components/Popups/ConfirmReversalPopups.jsx
@@ -0,0 +1,202 @@
+import {
+ Box,
+ Button,
+ Checkbox,
+ FormControl,
+ FormLabel,
+ Input,
+ Modal,
+ ModalBody,
+ ModalCloseButton,
+ ModalContent,
+ ModalFooter,
+ ModalHeader,
+ ModalOverlay,
+ Text,
+ Textarea,
+ useBoolean,
+} from "@chakra-ui/react";
+import React, { useEffect, useState } from "react";
+import PropTypes from "prop-types";
+
+import * as yup from "yup";
+import { yupResolver } from "@hookform/resolvers/yup";
+import { useForm } from "react-hook-form";
+import ReactQuill from "react-quill";
+
+export const conformModalSchema = yup.object().shape({
+ comment: yup
+ .string()
+ .min(2, "Minimum length should be 2 characters.")
+ .max(150, "Maximum length should be 150 characters.")
+ // .matches(/^[^\d]+$/, "Sponsor Name cannot contain numbers")
+ .required("Comment is required"),
+ subject: yup.string().notRequired(),
+ emailTemplate: yup.string().notRequired(),
+});
+
+const ConfirmReversalPopups = ({
+ isOpen,
+ onClose,
+ handleConfirm,
+ isLoading,
+}) => {
+ const {
+ watch,
+ register,
+ reset,
+ handleSubmit,
+ setValue,
+ formState: { errors },
+ } = useForm({
+ resolver: yupResolver(conformModalSchema),
+ mode: "all",
+ });
+
+ const [richTextValue, setRichTextValue] = useState("");
+
+ useEffect(() => {
+ 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 = {
+ toolbar: [
+ // [{ header: "1" }, { header: "2" },
+ // // { font: [] }
+ // ],
+ // [{ size: [] }],
+ ["bold", "italic", "underline", "strike", "blockquote"],
+ [{ list: "ordered" }, { list: "bullet" }],
+ ["clean"],
+ ],
+ };
+
+ return (
+
+
+
+ Approve
+
+ {
+ handleConfirm(data);
+ reset();
+ onClose();
+ })}
+ >
+
+
+ Comment
+
+ {errors.comment ? (
+
+ {errors.comment.message}
+
+ ) : (
+
+ Maximum length should be 150 characters. You have entered{" "}
+ {watch()?.comment?.length || 0} characters.
+
+ )}
+
+
+
+ Send an email to the user upon approval
+
+
+ {emailApproval && (
+
+
+
+ Subject
+
+
+
+
+
+ Message
+
+
+
+
+ )}
+
+
+
+
+
+
+
+
+ );
+};
+
+ConfirmReversalPopups.propTypes = {
+ isOpen: PropTypes.bool.isRequired,
+ onClose: PropTypes.func.isRequired,
+ handelApproved: PropTypes.func.isRequired,
+ isLoading: PropTypes.func.isRequired,
+ richTextValue: PropTypes.any.isRequired,
+ setRichTextValue: PropTypes.any.isRequired,
+};
+
+export default ConfirmReversalPopups;
diff --git a/src/Components/Popups/InitiateReversalPopups.jsx b/src/Components/Popups/InitiateReversalPopups.jsx
new file mode 100644
index 0000000..0a78a02
--- /dev/null
+++ b/src/Components/Popups/InitiateReversalPopups.jsx
@@ -0,0 +1,133 @@
+import {
+ Box,
+ Button,
+ FormControl,
+ FormLabel,
+ Modal,
+ ModalBody,
+ ModalCloseButton,
+ ModalContent,
+ ModalFooter,
+ ModalHeader,
+ ModalOverlay,
+ Text,
+ Textarea,
+} from "@chakra-ui/react";
+import React, { useEffect } from "react";
+import PropTypes from "prop-types";
+
+import * as yup from "yup";
+import { yupResolver } from "@hookform/resolvers/yup";
+import { useForm } from "react-hook-form";
+
+export const conformModalSchema = yup.object().shape({
+ comment: yup
+ .string()
+ .min(2, "Minimum length should be 2 characters.")
+ .max(150, "Maximum length should be 150 characters.")
+ // .matches(/^[^\d]+$/, "Sponsor Name cannot contain numbers")
+ .required("Comment is required"),
+});
+
+const InitiateReversalPopup = ({
+ isOpen,
+ onClose,
+ handelApproved,
+ isLoading,
+}) => {
+ const {
+ watch,
+ register,
+ reset,
+ handleSubmit,
+ formState: { errors },
+ } = useForm({
+ resolver: yupResolver(conformModalSchema),
+ mode: "all",
+ });
+
+ // Reset the form when the modal closes
+ useEffect(() => {
+ if (!isOpen) {
+ reset(); // Clear the form state
+ }
+ }, [isOpen, reset]);
+
+ return (
+
+
+
+ Reversal Reason
+
+ {
+ handelApproved(data);
+ reset();
+ onClose();
+ })}
+ >
+
+
+ Comment
+
+
+ {errors.comment ? (
+
+ {errors.comment.message}
+
+ ) : (
+
+ Maximum length should be 150 characters. You have entered{" "}
+ {watch()?.comment?.length || 0} characters.
+
+ )}
+
+
+
+
+
+
+
+
+
+ );
+};
+
+InitiateReversalPopup.propTypes = {
+ isOpen: PropTypes.bool.isRequired,
+ isLoading: PropTypes.bool.isRequired,
+ onClose: PropTypes.func.isRequired,
+ handelApproved: PropTypes.func.isRequired,
+};
+
+export default InitiateReversalPopup;
diff --git a/src/Components/Popups/RejectReversalPopups.jsx b/src/Components/Popups/RejectReversalPopups.jsx
new file mode 100644
index 0000000..23fc9dc
--- /dev/null
+++ b/src/Components/Popups/RejectReversalPopups.jsx
@@ -0,0 +1,132 @@
+import {
+ Box,
+ Button,
+ FormControl,
+ FormLabel,
+ Modal,
+ ModalBody,
+ ModalCloseButton,
+ ModalContent,
+ ModalFooter,
+ ModalHeader,
+ ModalOverlay,
+ Text,
+ Textarea,
+} from "@chakra-ui/react";
+import React, { useEffect } from "react";
+import PropTypes from "prop-types";
+
+import * as yup from "yup";
+import { yupResolver } from "@hookform/resolvers/yup";
+import { useForm } from "react-hook-form";
+
+export const conformModalSchema = yup.object().shape({
+ comment: yup
+ .string()
+ .min(2, "Minimum length should be 2 characters.")
+ .max(150, "Maximum length should be 150 characters.")
+ // .matches(/^[^\d]+$/, "Sponsor Name cannot contain numbers")
+ .required("Comment is required"),
+});
+
+const RejectReversalPopups = ({
+ isOpen,
+ onClose,
+ handelApproved,
+ isLoading,
+}) => {
+ const {
+ watch,
+ register,
+ reset,
+ handleSubmit,
+ formState: { errors },
+ } = useForm({
+ resolver: yupResolver(conformModalSchema),
+ mode: "all",
+ });
+
+ // Reset the form when the modal closes
+ useEffect(() => {
+ if (!isOpen) {
+ reset(); // Clear the form state
+ }
+ }, [isOpen, reset]);
+
+ return (
+
+
+
+ Reject
+
+ {
+ handelApproved(data);
+ reset();
+ onClose();
+ })}
+ >
+
+
+ Comment
+
+ {errors.comment ? (
+
+ {errors.comment.message}
+
+ ) : (
+
+ Maximum length should be 150 characters. You have entered{" "}
+ {watch()?.comment?.length || 0} characters.
+
+ )}
+
+
+
+
+
+
+
+
+
+ );
+};
+
+RejectReversalPopups.propTypes = {
+ isOpen: PropTypes.bool.isRequired,
+ onClose: PropTypes.func.isRequired,
+ handelApproved: PropTypes.func.isRequired,
+ isLoading: PropTypes.func.isRequired,
+};
+
+export default RejectReversalPopups;
diff --git a/src/Contexts/GlobalStateProvider.jsx b/src/Contexts/GlobalStateProvider.jsx
index b172727..4ecd2b8 100644
--- a/src/Contexts/GlobalStateProvider.jsx
+++ b/src/Contexts/GlobalStateProvider.jsx
@@ -6,7 +6,7 @@ import { v4 as uuidv4 } from "uuid";
import { TbClock2 } from "react-icons/tb";
import { CiWallet } from "react-icons/ci";
import { HiOutlineReceiptPercent } from "react-icons/hi2";
-import { IoMdQrScanner } from "react-icons/io";
+import { IoMdQrScanner } from "react-icons/io";
import { GrDocumentPdf } from "react-icons/gr";
import { AiOutlineFileGif } from "react-icons/ai";
@@ -1674,6 +1674,79 @@ const GlobalStateProvider = ({ children }) => {
},
]);
+ const [opportunities, setOpportunities] = useState([
+ {
+ id: 1,
+ Investors: "Blackstone",
+ amountRemaining: "10 %",
+ totalDealsize: "$ 520",
+ noViews: "50",
+ },
+ {
+ id: 2,
+ Investors: "Blackstone",
+ amountRemaining: "10 %",
+ totalDealsize: "$ 520",
+ noViews: "50",
+ },
+ {
+ id: 3,
+ Investors: "Blackstone",
+ amountRemaining: "10 %",
+ totalDealsize: "$ 520",
+ noViews: "50",
+ },
+ {
+ id: 4,
+ Investors: "Blackstone",
+ amountRemaining: "10 %",
+ totalDealsize: "$ 520",
+ noViews: "50",
+ },
+ {
+ id: 5,
+ Investors: "Blackstone",
+ amountRemaining: "10 %",
+ totalDealsize: "$ 520",
+ noViews: "50",
+ },
+ {
+ id: 6,
+ Investors: "Blackstone",
+ amountRemaining: "10 %",
+ totalDealsize: "$ 520",
+ noViews: "50",
+ },
+ {
+ id: 7,
+ Investors: "Blackstone",
+ amountRemaining: "10 %",
+ totalDealsize: "$ 520",
+ noViews: "50",
+ },
+ {
+ id: 8,
+ Investors: "Blackstone",
+ amountRemaining: "10 %",
+ totalDealsize: "$ 520",
+ noViews: "50",
+ },
+ {
+ id: 9,
+ Investors: "Blackstone",
+ amountRemaining: "10 %",
+ totalDealsize: "$ 520",
+ noViews: "50",
+ },
+ {
+ id: 10,
+ Investors: "Blackstone",
+ amountRemaining: "10 %",
+ totalDealsize: "$ 520",
+ noViews: "50",
+ },
+ ]);
+
const [InvestorWallet, setInvestorWallet] = useState(null);
// ==============[ prod state ]===============================
@@ -1767,6 +1840,8 @@ const GlobalStateProvider = ({ children }) => {
setIONAVDetail,
iOTransaction,
setIOTransaction,
+ opportunities,
+ setOpportunities,
}}
>
{children}
diff --git a/src/Images/dash_icon_1.svg b/src/Images/dash_icon_1.svg
new file mode 100644
index 0000000..d6ddeb7
--- /dev/null
+++ b/src/Images/dash_icon_1.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/Images/dash_icon_2.svg b/src/Images/dash_icon_2.svg
new file mode 100644
index 0000000..02736d2
--- /dev/null
+++ b/src/Images/dash_icon_2.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/Images/dash_icon_3.svg b/src/Images/dash_icon_3.svg
new file mode 100644
index 0000000..1592b46
--- /dev/null
+++ b/src/Images/dash_icon_3.svg
@@ -0,0 +1,7 @@
+
diff --git a/src/Images/dash_icon_3n.png b/src/Images/dash_icon_3n.png
new file mode 100644
index 0000000..07686be
Binary files /dev/null and b/src/Images/dash_icon_3n.png differ
diff --git a/src/Images/dash_icon_4.svg b/src/Images/dash_icon_4.svg
new file mode 100644
index 0000000..9a1efb8
--- /dev/null
+++ b/src/Images/dash_icon_4.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/Images/dash_icon_5.svg b/src/Images/dash_icon_5.svg
new file mode 100644
index 0000000..d548db0
--- /dev/null
+++ b/src/Images/dash_icon_5.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/Images/dash_icon_6.svg b/src/Images/dash_icon_6.svg
new file mode 100644
index 0000000..81207ec
--- /dev/null
+++ b/src/Images/dash_icon_6.svg
@@ -0,0 +1,5 @@
+
diff --git a/src/Images/dash_icon_6n.png b/src/Images/dash_icon_6n.png
new file mode 100644
index 0000000..4c6af97
Binary files /dev/null and b/src/Images/dash_icon_6n.png differ
diff --git a/src/Images/dash_icon_7.svg b/src/Images/dash_icon_7.svg
new file mode 100644
index 0000000..6c9d94b
--- /dev/null
+++ b/src/Images/dash_icon_7.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/Layout/DefaultLayout.jsx b/src/Layout/DefaultLayout.jsx
index f615b1e..f799b27 100644
--- a/src/Layout/DefaultLayout.jsx
+++ b/src/Layout/DefaultLayout.jsx
@@ -1,6 +1,5 @@
import React, { useContext, useEffect, useState } from "react";
import { CgProfile } from "react-icons/cg";
-import { useDispatch } from "react-redux";
import logoMiniDark from "../assets/favicon.png";
import logoMini from "../assets/logo-min.png";
import logoDark from "../assets/logo.png";
@@ -24,23 +23,26 @@ import {
Button,
Image,
Text,
- Tooltip
+ Tooltip,
} from "@chakra-ui/react";
import Cookies from "js-cookie"; // Import the Cookies library
import { GrManual } from "react-icons/gr";
import { HiOutlineChartSquareBar } from "react-icons/hi";
+import { HiOutlineBanknotes } from "react-icons/hi2";
import { LuContact } from "react-icons/lu";
import { MdNotificationsNone, MdOutlineAddChart } from "react-icons/md";
import {
+ RiAccountBoxLine,
RiBankLine,
RiExchangeBoxLine,
RiFileUserLine,
RiMoneyDollarBoxLine,
} from "react-icons/ri";
import {
+ TbLayoutDashboard,
TbListDetails,
TbReportMoney,
- TbTransactionDollar
+ TbTransactionDollar,
} from "react-icons/tb";
import { VscSymbolClass } from "react-icons/vsc";
import {
@@ -52,6 +54,7 @@ import {
useNavigate,
} from "react-router-dom";
import HeaderMain from "../Components/HeaderMain";
+import { isMaker } from "../Constants/Constants";
import GlobalStateContext from "../Contexts/GlobalStateContext";
import CreateRequest from "../Pages/Fawateer/CreateRequest";
import ApproveHistory from "../Pages/FawateerChecker/ApproveHistory/ApproveHistoryChecker";
@@ -139,6 +142,21 @@ const DashboardLayout = ({ isOnline }) => {
switch (true) {
case "/":
return "👋🏻 Hi, Admin";
+
+ // case path.startsWith("/"):
+ // return (z
+ //
+ // Dashboard
+ //
+ // );
+
+ case path.startsWith("/investment-opportunities"):
+ return (
+
+
+ dashboard / Open Opportunities
+
+ );
case path.startsWith("/sponser"):
return (
@@ -218,7 +236,7 @@ const DashboardLayout = ({ isOnline }) => {
return (
- Deposite Request
+ Deposit Request
);
@@ -241,21 +259,21 @@ const DashboardLayout = ({ isOnline }) => {
return (
- Withdrawal pending request
+ Withdrawal Pending Request
);
case path.startsWith("/withdraw-history"):
return (
- Withdrawal request
+ Withdrawal Request
);
case path.startsWith("/investor-request"):
return (
- Investor pending request
+ Investor Pending Request
);
case path.startsWith("/investor-history"):
@@ -269,16 +287,39 @@ const DashboardLayout = ({ isOnline }) => {
return (
- Deletion pending request
+ Deletion Pending Request
);
case path.startsWith("/deletion-history"):
return (
- Deletion request
+ Deletion Request
);
+
+ case path.startsWith("/bank-deposit-request"):
+ return (
+
+
+ Reversal Transaction / Deposit Request
+
+ );
+ case path.startsWith("/reversal-fawateer-deposit"):
+ return (
+
+
+ Reversal Transaction / Fawateer Deposit
+
+ );
+ case path.startsWith("/account-deletion-request"):
+ return (
+
+
+ Reversal Transaction / Account Deletion Request
+
+ );
+
case path.startsWith("/bank-investor"):
return (
@@ -297,7 +338,7 @@ const DashboardLayout = ({ isOnline }) => {
return (
- Push Notification
+ Push Notification
);
case path.startsWith("/contact"):
@@ -325,7 +366,7 @@ const DashboardLayout = ({ isOnline }) => {
return (
- Deletion pending request
+ Deletion Pending Request
);
case path.startsWith("/deletion-history"):
@@ -339,7 +380,7 @@ const DashboardLayout = ({ isOnline }) => {
return (
- Deletion pending request
+ Deletion Pending Request
);
case path.startsWith("/deletion-history"):
@@ -349,7 +390,7 @@ const DashboardLayout = ({ isOnline }) => {
Deletion request
);
- case path.startsWith("/subadmin"):
+ case path.startsWith("/subadmin"):
return (
@@ -385,7 +426,17 @@ const DashboardLayout = ({ isOnline }) => {
return ;
}
- const filteredNav = nav.map((item) => {
+ const _filteredNav = isMaker()
+ ? nav.filter(
+ (item) =>
+ item.title !== "REVERSAL TRANSACTION" &&
+ item.path !== "/bank-deposit-request" &&
+ item.path !== "/reversal-fawateer-deposit" &&
+ item.path !== "/account-deletion-request"
+ )
+ : nav;
+
+ const filteredNav = _filteredNav.map((item) => {
if (item.submenu) {
return {
...item,
@@ -395,6 +446,9 @@ const DashboardLayout = ({ isOnline }) => {
),
};
}
+ // if (item.title === "REVERSAL TRANSACTION" && item.type === "title") {
+ // }
+
return item;
});
@@ -515,10 +569,169 @@ const DashboardLayout = ({ isOnline }) => {
index={openIndex}
onChange={handleAccordionChange}
>
- {filteredNav.map(({ title, type, Icon, submenu, path }, index) => {
- if (type === "accordion") {
- return (
-
+ {filteredNav.map(
+ ({ title, type, Icon, submenu, path }, index) => {
+ if (type === "accordion") {
+ return (
+
+
+
+
+ {/* {Icon && title === "Admin" ? : } */}
+ {Icon && (
+
+ )}
+
+
+ {title}
+
+
+
+
+
+
+ {submenu?.map(
+ (
+ {
+ title: subMenuTitle,
+ path: link,
+ icon: SubIcon,
+ },
+ i
+ ) => (
+
+
+
+
+
+
+ {SubIcon && (
+
+ )}
+
+ {subMenuTitle === "Aprover Request"
+ ? data?.data?.role === "Maker"
+ ? "Create Request"
+ : "Aprover Request"
+ : subMenuTitle}
+
+
+
+
+ )
+ )}
+
+
+ );
+ } else if (type === "title") {
+ return (
+
+ {title}
+
+ );
+ } else if (type === "single") {
+ return (
{
placement="top-start"
color={"blue.800"}
>
-
- }
+
- {/* {Icon && title === "Admin" ? : } */}
- {Icon && (
-
- )}
-
-
- {title}
-
-
-
-
+ {title}
+
+
-
- {submenu?.map(
- (
- { title: subMenuTitle, path: link, icon: SubIcon },
- i
- ) => (
-
-
-
-
-
-
- {SubIcon && (
-
- )}
-
- {subMenuTitle === "Aprover Request"
- ? data?.data?.role === "Maker"
- ? "Create Request"
- : "Aprover Request"
- : subMenuTitle}
-
-
-
-
- )
- )}
-
-
- );
- } else if (type === "title") {
- return (
-
- {title}
-
- );
- } else if (type === "single") {
- return (
-
-
- {Icon && }
-
- {title}
-
-
-
- );
- } else {
- return null;
+ );
+ } else {
+ return null;
+ }
}
- })}
+ )}
diff --git a/src/Pages/AccountDeletion/DeletionHistory.jsx b/src/Pages/AccountDeletion/DeletionHistory.jsx
index 1108499..de621a3 100644
--- a/src/Pages/AccountDeletion/DeletionHistory.jsx
+++ b/src/Pages/AccountDeletion/DeletionHistory.jsx
@@ -7,6 +7,8 @@ import {
Input,
Text,
Tooltip,
+ useBoolean,
+ useDisclosure,
useToast,
} from "@chakra-ui/react";
import React, { useContext, useEffect, useState } from "react";
@@ -19,25 +21,37 @@ import { formatDate } from "../../Components/Functions/UTCConvertor";
import { CheckIcon, CloseIcon } from "@chakra-ui/icons";
import { useGetDeleteHistoryQuery } from "../../Services/delete.request.service";
import { TABLE_PAGINATION } from "../../Constants/Paginations";
+import InitiateReversalPopup from "../../Components/Popups/InitiateReversalPopups";
+import ToastBox from "../../Components/ToastBox";
+import { useCreateAccountDeletionReversalRequestMutation } from "../../Services/reversal.account.deletion.service";
+import { isMaker } from "../../Constants/Constants";
// import { formatDate } from "../../Components/Functions/UTCConvertor";
const DeletionHistory = () => {
const toast = useToast();
- const { slideFromRight, setDeleteHistory } =
- useContext(GlobalStateContext);
+ const { slideFromRight, setDeleteHistory } = useContext(GlobalStateContext);
const [deleteAlert, setDeleteAlert] = useState(false);
const [actionId, setActionId] = useState(false);
const [mouseEntered, setMouseEntered] = useState(false);
const [mouseEnteredId, setMouseEnteredId] = useState("");
-
-
- // =========================== [Use State] =============================
+ // =========================== [Use State] =============================
const [pageSize, setPageSize] = useState(TABLE_PAGINATION?.size);
const [currentPage, setCurrentPage] = useState(TABLE_PAGINATION?.page);
const [searchTerm, setSearchTerm] = useState("");
const [debouncedSearchTerm, setDebouncedSearchTerm] = useState("");
+ const [reversalId, setReversalId] = useState();
+ const {
+ isOpen: isOpenInRev,
+ onOpen: onOpenInRev,
+ onClose: onCloseInRev,
+ } = useDisclosure();
+ const [isReversalLoading, setIsReversalLoading] = useBoolean();
+
+ const [createAccountDeletionReversalRequest] =
+ useCreateAccountDeletionReversalRequestMutation();
+
// Debounce the search term to avoid making a request on every keystroke
useEffect(() => {
const handler = setTimeout(() => {
@@ -48,33 +62,33 @@ const DeletionHistory = () => {
};
}, [searchTerm]);
-
const {
data: deleteHistory,
isLoading,
- refetch
- } = useGetDeleteHistoryQuery({
- page: debouncedSearchTerm ? undefined : currentPage, // Omit pagination for search
- size: debouncedSearchTerm ? undefined : pageSize, // Omit pagination for search
- search: debouncedSearchTerm,
- },
- {
- skip: debouncedSearchTerm === "" && searchTerm !== "", // Skip if search is empty and it's not the initial request
- })
+ refetch,
+ } = useGetDeleteHistoryQuery(
+ {
+ page: debouncedSearchTerm ? undefined : currentPage, // Omit pagination for search
+ size: debouncedSearchTerm ? undefined : pageSize, // Omit pagination for search
+ search: debouncedSearchTerm,
+ },
+ {
+ skip: debouncedSearchTerm === "" && searchTerm !== "", // Skip if search is empty and it's not the initial request
+ }
+ );
const formatDate = (date) => {
- return new Date(date).toLocaleDateString('en-GB', {
- day: '2-digit',
- month: '2-digit',
- year: 'numeric',
+ return new Date(date).toLocaleDateString("en-GB", {
+ day: "2-digit",
+ month: "2-digit",
+ year: "numeric",
});
};
- // Use useEffect to refetch data when the component mounts
- useEffect(() => {
- refetch();
-}, [refetch]);
-
+ // Use useEffect to refetch data when the component mounts
+ useEffect(() => {
+ refetch();
+ }, [refetch]);
// ====================================================[Table Setup]================================================================
const tableHeadRow = [
@@ -85,7 +99,8 @@ const DeletionHistory = () => {
"Last Name",
"Country",
"Phone Number",
- "Status"
+ "Status",
+ isMaker() && "Reversal Action",
];
const extractedArray = deleteHistory?.data?.rows?.map((item, index) => ({
@@ -96,7 +111,7 @@ const DeletionHistory = () => {
as={"span"}
color={"gray.800"}
className="d-flex align-items-center web-text-small"
- fontWeight={'500'}
+ fontWeight={"500"}
>
{index + 1}.
@@ -107,7 +122,7 @@ const DeletionHistory = () => {
as={"span"}
color={"gray.600"}
className="d-flex align-items-center web-text-small"
- fontWeight={'500'}
+ fontWeight={"500"}
>
{formatDate(item.Requested_on)}
@@ -118,7 +133,7 @@ const DeletionHistory = () => {
as={"span"}
color={"gray.600"}
className="d-flex align-items-center web-text-small"
- fontWeight={'500'}
+ fontWeight={"500"}
>
{item.clientId}
@@ -129,7 +144,7 @@ const DeletionHistory = () => {
as={"span"}
color={"gray.800"}
className="d-flex align-items-center web-text-small"
- fontWeight={'500'}
+ fontWeight={"500"}
>
{item.firstName}
{/* {formatDate(item.charge)} */}
@@ -141,51 +156,77 @@ const DeletionHistory = () => {
as={"span"}
color={"gray.800"}
className="d-flex align-items-center web-text-small"
- fontWeight={'500'}
+ fontWeight={"500"}
>
{item.lastName}
),
- "Country": (
-
{item.country}
),
"Phone Number": (
-
{item.phoneNumber}
),
- "Status": (
-
{item.deletionStatus}
),
+ "Reversal Action": (
+
+ {item.deletionStatus === "Approved" ? (
+
+ {!item.isReversal ? (
+
+ ) : (
+ "Under process"
+ )}
+
+ ) : (
+ ""
+ )}
+
+ ),
}));
const handleDelete = () => {
- const deleteHistory = sponser.filter(
- (sponsor) => sponsor.id !== actionId
- );
+ const deleteHistory = sponser.filter((sponsor) => sponsor.id !== actionId);
setTimeout(() => {
setSponser(deleteHistory);
@@ -195,6 +236,45 @@ const DeletionHistory = () => {
setIsLoading(true);
};
+ const handleApproved = async (data) => {
+ setIsReversalLoading.on(); // Start loading
+ try {
+ const { error, data: responseData } =
+ await createAccountDeletionReversalRequest({
+ id: reversalId,
+ data,
+ });
+
+ if (error) {
+ throw error; // Explicitly handle the error
+ }
+
+ // Success: Perform necessary actions
+ refetch();
+ toast({
+ render: () => (
+
+ ),
+ });
+ onCloseInRev();
+ } catch (error) {
+ // Handle errors
+ toast({
+ render: () => (
+
+ ),
+ });
+ console.error("Error:", error);
+ } finally {
+ setIsReversalLoading.off(); // Ensure loading is toggled off
+ }
+ };
+
return (
@@ -244,6 +324,12 @@ const DeletionHistory = () => {
alertHandler={handleDelete}
isLoading={isLoading}
/>
+
);
};
diff --git a/src/Pages/AccountDeletion/DeletionRequest.jsx b/src/Pages/AccountDeletion/DeletionRequest.jsx
index c4f0f2e..f90c867 100644
--- a/src/Pages/AccountDeletion/DeletionRequest.jsx
+++ b/src/Pages/AccountDeletion/DeletionRequest.jsx
@@ -91,17 +91,17 @@ const DeletionRequest = () => {
// ====================================================[Table Setup]================================================================
const tableHeadRow = [
"Sr No.",
- "Requested on",
+ "Requested On",
"Client ID",
- "First name",
- "Last name",
+ "First Name",
+ "Last Name",
"Country",
- "Phone number",
+ "Phone Number",
"Status",
"Action"
];
- const extractedArray = filteredData?.map((item, index) => ({
+ const extractedArray = data?.data?.rows?.map((item, index) => ({
id: item?.id,
"Sr No.": (
{
{index + 1}.
),
- "Requested on": (
+ "Requested On": (
{
{item?.clientId}
),
- "First name": (
+ "First Name": (
{
{/* {formatDate(item.charge)} */}
),
- "Last name": (
+ "Last Name": (
{
),
- "Phone number": (
+ "Phone Number": (
{
- const toast = useToast()
+const DeletionRequestApprove = ({
+ isOpen,
+ onClose,
+ firstField,
+ id,
+ data: requestData,
+}) => {
+ const toast = useToast();
const [file, setFile] = useState();
- const [isBtnLoading , setIsBtnLoading] = useState(false)
- const [isBtnLoadingReject , setIsBtnLoadingReject] = useState(false)
- const [isReject , setIsReject] = useState(false)
+ const [isBtnLoading, setIsBtnLoading] = useState(false);
+ const [isBtnLoadingReject, setIsBtnLoadingReject] = useState(false);
+ const [isReject, setIsReject] = useState(false);
- const fileredData = requestData?.find((item)=> item?.id === id)
- const [ updateApproveRequest ] = useApproveDepositRequestMutation()
- const { data, isLoading } = useGetDeleteRequestByIdQuery(id, {
+ const fileredData = requestData?.find((item) => item?.id === id);
+ const [updateApproveRequest] = useApproveDepositRequestMutation();
+ const { data, isLoading } = useGetDeleteRequestByIdQuery(id, {
skip: !id,
});
-
const {
register,
reset,
+ watch,
handleSubmit,
formState: { errors },
} = useForm({
resolver: yupResolver(conformModalSchema),
+ mode: "all",
});
+ const { refetch } = useGetDeleteRequestQuery();
+
useEffect(() => {
reset({
- comment:fileredData?.comment
- })
-
-
- }, [requestData, id])
-
- const onSubmit = async(data) => {
- setIsBtnLoading(isReject?false:true)
- setIsBtnLoadingReject(isReject)
+ comment: fileredData?.comment,
+ });
+ }, [requestData, id]);
+
+ const onSubmit = async (data) => {
+ setIsBtnLoading(isReject ? false : true);
+ setIsBtnLoadingReject(isReject);
const approveReq = {
- adminComment:data?.adminComment,
- deletionStatus: isReject?"Reject": "Approved"
+ adminComment: data?.adminComment,
+ deletionStatus: isReject ? "Reject" : "Approved",
+ };
+
+ try {
+ const res = await updateApproveRequest({ id, data: approveReq });
+
+ if (res?.error) {
+ toast({
+ render: () => (
+
+ ),
+ });
+ heandleOnClose();
+ } else if (res?.data?.statusCode === 200) {
+ toast({
+ render: () => ,
+ });
+ refetch();
+ heandleOnClose();
+ }
+ } catch (error) {
+ console.log(error);
}
-
- try {
- const res = await updateApproveRequest({ id ,data:approveReq })
-
-
- if (res?.error) {
- toast({
- render: () => (
-
- ),
- });
- heandleOnClose()
- }else if(res?.data?.statusCode === 200) {
- toast({
- render: () => (
-
- ),
- });
- heandleOnClose()
- }
-
- } catch (error) {
-
- }
-
};
- const onReject = () => {
-
- }
-
-
+ const onReject = () => {};
useEffect(() => {
if (data) {
@@ -112,16 +124,20 @@ const DeletionRequestApprove = ({ isOpen, onClose, firstField, id, data:requestD
}
}, [data, reset]);
- const heandleOnClose = () =>{
- reset()
- onClose()
- setIsBtnLoading(false)
- setIsReject(false)
- setIsBtnLoadingReject(false)
- }
+ const heandleOnClose = () => {
+ reset();
+ onClose();
+ setIsBtnLoading(false);
+ setIsReject(false);
+ setIsBtnLoadingReject(false);
+ };
return (
-
+
@@ -133,7 +149,10 @@ const DeletionRequestApprove = ({ isOpen, onClose, firstField, id, data:requestD
- Investor Comment {fileredData?.currencyCode}
+
+ Investor Comment{" "}
+ {fileredData?.currencyCode}
+
{/*