hot fix

src/Components/HeaderMain.jsx

@@ -13,9 +13,8 @@ import {
   Portal,
   Text,
   useColorMode,
-  useDisclosure,
 } from "@chakra-ui/react";
-import React, { useContext, useRef } from "react";
+import React, { useContext } from "react";
 import { Link, useNavigate } from "react-router-dom";
 import { IoMdDownload } from "react-icons/io";
 import * as XLSX from "xlsx";
@@ -24,7 +23,6 @@ import GlobalStateContext from "../Contexts/GlobalStateContext";
 import { MdOutlineDarkMode, MdOutlineLightMode } from "react-icons/md";
 import logoMini from "../assets/propic.png";
 import { BsBack } from "react-icons/bs";
-import ChangePassword from "../Pages/ChangePassword";
 
 const HeaderMain = ({
   link,
@@ -37,8 +35,6 @@ const HeaderMain = ({
 }) => {
   const navigate = useNavigate();
   const { colorMode, toggleColorMode } = useContext(GlobalStateContext);
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const firstField = useRef();
 
   return (
     <Box
@@ -70,11 +66,11 @@ const HeaderMain = ({
               <PopoverBody onClick={()=> navigate('/profile')} className="web-text-medium pointer link">
                 Profile
               </PopoverBody>
-              <Box onClick={onOpen}>
+              <Link to={"/help-and-support"}>
                 <PopoverBody className="web-text-medium pointer ">
-                  Change Password
+                  Help & Support
                 </PopoverBody>
-              </Box>
+              </Link>
               <PopoverFooter
                 onClick={logOutHandler}
                 className="web-text-medium pointer link"
@@ -116,11 +112,6 @@ const HeaderMain = ({
         {/* <Box onClick={() => toggleColorMode()} as="span" p={2} rounded={'lg'} className="link pointer">
           {colorMode === "light"?  <MdOutlineDarkMode /> :<MdOutlineLightMode />}
         </Box> */}
-        <ChangePassword
-          isOpen={isOpen}
-          onClose={onClose}
-          firstField={firstField}
-        />
       </Box>
     </Box>
   );

src/Components/Loaders/FullscreenLoaders.jsx

@@ -1,19 +1,18 @@
 import { Box, Spinner, Text } from "@chakra-ui/react";
 import React from "react";
-import "./FullscreenLoaders.css";
+import './FullscreenLoaders.css'
 
-const FullscreenLoaders = ({ height }) => {
+const FullscreenLoaders = ({height}) => {
   return (
     <Box
       display={"flex"}
       justifyContent={"center"}
-      flexDirection={"column"}
+      flexDirection={'column'}
       alignItems={"center"}
       w={"100%"}
-      h={height ? height : "100vh"}
+      h={height ? height: "100vh"}
       gap={4}
-    >
-      {/* <div className="dot-spinner">
+    ><div className="dot-spinner">
     <div className="dot-spinner__dot"></div>
     <div className="dot-spinner__dot"></div>
     <div className="dot-spinner__dot"></div>
@@ -22,17 +21,8 @@ const FullscreenLoaders = ({ height }) => {
     <div className="dot-spinner__dot"></div>
     <div className="dot-spinner__dot"></div>
     <div className="dot-spinner__dot"></div>
-</div> */}
-      {/* <Text color='#004717' fontSize={'md'} fontWeight={500}>Loading...</Text> */}
-      {/* <div className="spinner-grow" style={{backgroundColor:"#004118"}} role="status" /> */}
-
-      <Spinner
-        thickness="4px"
-        speed="0.65s"
-        emptyColor="#fff"
-        color="#004118"
-        size="lg"
-      />
+</div>
+  {/* <Text color='#004717' fontSize={'md'} fontWeight={500}>Loading...</Text> */}
     </Box>
   );
 };

src/Components/Loaders/Loader01.jsx

@@ -1,31 +1,19 @@
 import React from "react";
 import './FullscreenLoaders.css'
-import { Spinner } from "@chakra-ui/react";
 
 const Loader01 = () => {
   return (
-    // <div className="dot-spinner">
-    //   <div className="dot-spinner__dot"></div>
-    //   <div className="dot-spinner__dot"></div>
-    //   <div className="dot-spinner__dot"></div>
-    //   <div className="dot-spinner__dot"></div>
-    //   <div className="dot-spinner__dot"></div>
-    //   <div className="dot-spinner__dot"></div>
-    //   <div className="dot-spinner__dot"></div>
-    //   <div className="dot-spinner__dot"></div>
-    // </div>
 
-    // <div className="dot-spinner">
-    //   <div className="dot-spinner__dot"></div>
-    //   <div className="dot-spinner__dot"></div>
-    //   <div className="dot-spinner__dot"></div>
-    //   <div className="dot-spinner__dot"></div>
-    //   <div className="dot-spinner__dot"></div>
-    //   <div className="dot-spinner__dot"></div>
-    //   <div className="dot-spinner__dot"></div>
-    //   <div className="dot-spinner__dot"></div>
-    // </div>
-    <Spinner color='green.900' />
+    <div className="dot-spinner">
+      <div className="dot-spinner__dot"></div>
+      <div className="dot-spinner__dot"></div>
+      <div className="dot-spinner__dot"></div>
+      <div className="dot-spinner__dot"></div>
+      <div className="dot-spinner__dot"></div>
+      <div className="dot-spinner__dot"></div>
+      <div className="dot-spinner__dot"></div>
+      <div className="dot-spinner__dot"></div>
+    </div>
   );
 };
 

src/Components/RoleSwitchButton.jsx

@@ -1,66 +0,0 @@
-import { Box, Text } from "@chakra-ui/react";
-import React, { useRef } from "react";
-import audioClick from "../assets/click-151673.mp3";
-
-const RoleSwitchButton = ({ isSwitchOn, setIsSwitchOn }) => {
-
-  // const [isSwitchOn, setIsSwitchOn] = useState(false);
-
-//   const audio = useRef();
-
-  const switchOnChangeHandle = () => {
-    setIsSwitchOn(!isSwitchOn);
-    // if (audio.current) {
-    //   audio.current.play();
-    // }
-  };
-
-  return (
-    <Box display="flex" alignItems="center">
-      <Box
-        as="button"
-        display="flex"
-        justifyContent="normal"
-        alignItems="center"
-        // justifyContent={isSwitchOn ? "flex-end" : "flex-start"}
-        width="85px"
-        height="24px"
-        borderRadius="20px"
-        backgroundColor={isSwitchOn ? "#00ffcc" : "#b3ff99"}
-        onClick={switchOnChangeHandle}
-        position="relative"
-        fontSize="12px"
-        fontWeight="100"
-        transition="background-color 0.2s"
-        _before={{
-          content: '""',
-          position: "absolute",
-          width: "20px",
-          height: "20px",
-          borderRadius: "50%",
-          backgroundColor: "#fff",
-          boxShadow: "0 2px 4px rgba(0, 0, 0, 0.2)",
-          transform: isSwitchOn ? "translateX(61px)" : "translateX(0)",
-          transition: "transform 0.2s",
-          left:'2px',
-          top:'2px'
-        }}
-      >
-        <Text
-          fontWeight="500"
-          zIndex={1}
-          position="absolute"
-          mb={0}
-          color={isSwitchOn ? "#000" : "#000"}
-          left={isSwitchOn ? "10px" : "auto"}
-          right={isSwitchOn ? "auto" : "10px"}
-        >
-          {isSwitchOn ? "Maker" : "Checker"}
-        </Text>
-      </Box>
-      {/* <audio ref={audio} src={audioClick} /> */}
-    </Box>
-  );
-};
-
-export default RoleSwitchButton;

src/Constants/Constants.js

@@ -1,7 +1,6 @@
 
 import dns from "node:dns"
 import * as XLSX from 'xlsx';
-import CryptoJS from "crypto-js";
 
 
 export const generateSerialNumber = (index, currentPage, pageSize) => {
@@ -219,18 +218,4 @@ export function formatDateToYYYYMMDD(dateString) {
 
   // Combine the formatted parts
   return `${year}-${month}-${day}`;
-}
-
-
-// Encrypt a string
-export const encryptString = (text) => {
-  const ciphertext = CryptoJS.AES.encrypt(text, import.meta.env.VITE_ROLE_ENCRYPTION_KEY).toString();
-  return ciphertext;
-};
-
-// Decrypt a string
-export const decryptString = (ciphertext) => {
-  const bytes = CryptoJS.AES.decrypt(ciphertext, import.meta.env.VITE_ROLE_ENCRYPTION_KEY);
-  const originalText = bytes.toString(CryptoJS.enc.Utf8);
-  return originalText;
-};
+}

src/Contexts/GlobalStateProvider.jsx

@@ -1557,123 +1557,6 @@ const GlobalStateProvider = ({ children }) => {
     },
   ]);
 
-  const [approved, setApproved] = useState([
-    {
-      id: 1,
-      transactionDate: "02-Jan-24",
-      particulars: "Cash Reserve- Initated",
-      amount: "50,000.00",
-      Comments: "",
-      user: "Faisal",
-      entryDate: "02-Jan-24",
-    },
-    {
-      id: 2,
-      transactionDate: "12-Feb-24",
-      particulars: "Fees & Expense",
-      amount: "-22,000.00",
-      Comments: "",
-      user: "Faisal",
-      entryDate: "13-Feb-24",
-    },
-    {
-      id: 3,
-      transactionDate: "12-Feb-24",
-      particulars: "Distribution Received From Sponsor",
-      amount: "50,000.00",
-      Comments: "",
-      user: "Nawab",
-      entryDate: "24-Mar-24",
-    },
-    {
-      id: 4,
-      transactionDate: "28-Mar-24",
-      particulars: "Distribution Paid To Investors",
-      amount: "-40,000.00",
-      Comments: "",
-      user: "Faisal",
-      entryDate: "28-Mar-24",
-    },
-    {
-      id: 5,
-      transactionDate: "26-Jun-24",
-      particulars: "Distribution Received From Sponsor",
-      amount: "70,000.00",
-      Comments: "",
-      user: "Faisal",
-      entryDate: "27-Jun-24",
-    },
-    {
-      id: 6,
-      transactionDate: "28-Jun-24",
-      particulars: "Distribution Paid To Investors",
-      amount: "-60,000.00",
-      Comments: "",
-      user: "Nawab",
-      entryDate: "28-Jun-24",
-    },
-  ]);
-
-  const [iONAVDetail, setIONAVDetail] = useState([
-    {
-      id: 1,
-      valuationDate: "01-Jul-24",
-      nav: "1,229,750.00 ",
-      lastUpdate: "12.56",
-      investmentClose: "29.45",
-      updatedBy: "Nawab",
-      updatedOn: "01-Jul-24",
-    },
-    {
-      id: 2,
-      valuationDate: "25-Apr-24",
-      nav: "1,092,500.00",
-      lastUpdate: "15.00",
-      investmentClose: "15.00",
-      updatedBy: "Faisal",
-      updatedOn: "25-Apr-24",
-    },
-    {
-      id: 3,
-      valuationDate: "02-Jan-24",
-      nav: "950,000.00",
-      lastUpdate: "",
-      investmentClose: "",
-      updatedBy: "Faisal",
-      updatedOn: "02-Jan-24",
-    },
-  ]);
-
-  const [iOTransaction, setIOTransaction] = useState([
-    {
-      id: 1,
-      transactionName: "Amount Invested",
-      amount: "995,000",
-      createdBy: "Faisal",
-      createdOn: "27-Oct-24",
-      approvedBy: "Nawab",
-      approvedOn: "28-Oct-24",
-    },
-    {
-      id: 2,
-      transactionName: "Distribution To Sponser",
-      amount: "40,000",
-      createdBy: "Faisal",
-      createdOn: "30-Oct-24",
-      approvedBy: "Nawab",
-      approvedOn: "31-Oct-24",
-    },
-    {
-      id: 3,
-      transactionName: "Amount Invested",
-      amount: "995,000",
-      createdBy: "Faisal",
-      createdOn: "27-Oct-24",
-      approvedBy: "Nawab",
-      approvedOn: "28-Oct-24",
-    },
-  ]);
-
   const [InvestorWallet, setInvestorWallet] = useState(null);
 
   // ==============[ prod state ]===============================
@@ -1760,13 +1643,7 @@ const GlobalStateProvider = ({ children }) => {
         fawateerRequest,
         setFawateerRequest,
         approveHistory,
-        setApproveHistory,
-        approved,
-        setApproved,
-        iONAVDetail,
-        setIONAVDetail,
-        iOTransaction,
-        setIOTransaction,
+        setApproveHistory
       }}
     >
       {children}

src/Layout/DefaultLayout.jsx

@@ -15,12 +15,7 @@ import {
   TbTransactionDollar,
 } from "react-icons/tb";
 import { TbArrowBadgeRightFilled } from "react-icons/tb";
-import {
-  ArrowBackIcon,
-  ArrowLeftIcon,
-  ArrowRightIcon,
-  AtSignIcon,
-} from "@chakra-ui/icons";
+import { ArrowBackIcon, ArrowLeftIcon, ArrowRightIcon, AtSignIcon } from "@chakra-ui/icons";
 import {
   Link,
   NavLink,
@@ -88,7 +83,6 @@ import ApproveRequest from "../Pages/FawateerChecker/ApproveRequest/ApproveReque
 import ApproveHistoryMaker from "../Pages/FawateerChecker/ApproveHistory/ApproveHistoryMaker";
 import ApproveHistory from "../Pages/FawateerChecker/ApproveHistory/ApproveHistoryChecker";
 import { useProfileQuery } from "../Services/io.service";
-import SubAdmin from "../Pages/SubAdmin/SubAdmin";
 
 const DashboardLayout = ({ isOnline }) => {
   const userRole = localStorage.getItem("role");
@@ -171,24 +165,24 @@ const DashboardLayout = ({ isOnline }) => {
             <RiMoneyDollarBoxLine className="h4 m-0" /> Sponsor
           </span>
         );
-      case path.startsWith("/email"):
-        return (
-          <span className="d-flex align-items-end gap-2">
-            <AtSignIcon className="h4 m-0" /> Email Notifiation
-          </span>
-        );
+        case path.startsWith("/email"):
+          return (
+            <span className="d-flex align-items-end gap-2">
+              <AtSignIcon className="h4 m-0" /> Email Notifiation
+            </span>
+          );
       case path.startsWith("/investment-type"):
         return (
           <span className="d-flex align-items-end gap-2">
             <VscSymbolClass className="h4 m-0" /> Investment Type
           </span>
         );
-      case path.startsWith("/profile"):
-        return (
-          <span className="d-flex align-items-end gap-2">
-            <CgProfile className="h4 m-0" /> Profile
-          </span>
-        );
+        case path.startsWith("/profile"):
+          return (
+            <span className="d-flex align-items-end gap-2">
+              <CgProfile className="h4 m-0" /> Profile
+            </span>
+          );
       case path.startsWith("/exchange-rate"):
         return (
           <span className="d-flex align-items-end gap-2">
@@ -237,17 +231,17 @@ const DashboardLayout = ({ isOnline }) => {
         return (
           <span className="d-flex align-items-end gap-2">
             <RiMoneyDollarBoxLine className="h4 m-0 fw-normal" />
-            Deposit Pending Request
+            Deposit pending request
           </span>
         );
       case path.startsWith("/deposit-history"):
         return (
           <span className="d-flex align-items-end gap-2">
             <RiExchangeBoxLine className="h4 m-0 fw-normal" />
-            Deposite Request
+            Deposite request
           </span>
         );
-
+        
       case path.startsWith("/fawateer"):
         return (
           <span className="d-flex align-items-end gap-2">
@@ -255,13 +249,13 @@ const DashboardLayout = ({ isOnline }) => {
             Fawateer Deposit
           </span>
         );
-      case path.startsWith("/fawateer-history"):
-        return (
-          <span className="d-flex align-items-end gap-2">
-            <RiMoneyDollarBoxLine className="h4 m-0 fw-normal" />
-            Fawateer Deposit
-          </span>
-        );
+        case path.startsWith("/fawateer-history"):
+          return (
+            <span className="d-flex align-items-end gap-2">
+              <RiMoneyDollarBoxLine className="h4 m-0 fw-normal" />
+              Fawateer Deposit
+            </span>
+          );
 
       case path.startsWith("/withdraw-request"):
         return (
@@ -404,19 +398,6 @@ const DashboardLayout = ({ isOnline }) => {
     return <SplashScreen />;
   }
 
-  const filteredNav = nav.map((item) => {
-    if (item.submenu) {
-      return {
-        ...item,
-        submenu: item.submenu.filter(
-          (submenuItem) =>
-            !(!data?.data?.superAdmin && submenuItem.title === "Sub Admin")
-        ),
-      };
-    }
-    return item;
-  });
-
   return (
     <Box
       style={{
@@ -534,7 +515,7 @@ const DashboardLayout = ({ isOnline }) => {
               index={openIndex}
               onChange={handleAccordionChange}
             >
-              {filteredNav.map(({ title, type, Icon, submenu, path }, index) => {
+              {nav.map(({ title, type, Icon, submenu, path }, index) => {
                 if (type === "accordion") {
                   return (
                     <AccordionItem key={index} border={"none"}>
@@ -807,7 +788,6 @@ const AppContent = ({ data }) => {
           )
         }
       />
-
       <Route path="*" element={<NotFound />} />
     </Routes>
   );

src/Pages/AccountDeletion/InvestorComment.jsx

@@ -49,7 +49,7 @@ const InvestorComment = ({ isOpen, onClose }) => {
                   fontSize="sm"
                   type="textarea"
                   size="md"
-                  placeholder={"Enter your comment...."}
+                  placeholder={"Enter your comments...."}
                   rounded={"md"}
                   resize={"none"}
                 />

src/Pages/ChangePassword.jsx

@@ -1,233 +0,0 @@
-import {
-  Button,
-  DrawerFooter,
-  FormControl,
-  FormErrorMessage,
-  FormLabel,
-  Input,
-  InputGroup,
-  InputRightElement,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalHeader,
-  ModalOverlay,
-  Stack,
-  useToast,
-} from "@chakra-ui/react";
-import * as yup from "yup";
-import React, { useState, useContext } from "react";
-import { useForm } from "react-hook-form";
-import { yupResolver } from "@hookform/resolvers/yup";
-import CustomAlertDialog from "../Components/CustomAlertDialog";
-import ToastBox from "../Components/ToastBox";
-import { useUpdatePasswordMutation } from "../Services/change.password.service";
-import { all } from "axios";
-
-// Validation schema
-const passwordSchema = yup.object().shape({
-  oldPassword: yup.string().required("Current Password is required"),
-  newPassword: yup
-    .string()
-    .required("New Password is required")
-    .min(8, "Password must be at least 8 characters long")
-    .max(16, "Password must be at most 50 characters long")
-    .matches(/[A-Z]/, "Password must contain at least one uppercase letter")
-    .matches(/[a-z]/, "Password must contain at least one lowercase letter")
-    .matches(/[0-9]/, "Password must contain at least one number")
-    .matches(
-      /[@$!%*?&#]/,
-      "Password must contain at least one special character"
-    ),
-  confirmNewPassword: yup
-    .string()
-    .required("Confirm Password is required")
-    .oneOf([yup.ref("newPassword")], "Passwords must match"),
-});
-
-const ChangePassword = ({
-  isOpen,
-  onClose,
-  firstField,
-  actionId,
-  setActionId,
-}) => {
-  const [isLoading, setIsLoading] = useState(false);
-  const [alert, setAlert] = useState(false);
-  const [showCurrentPassword, setShowCurrentPassword] = useState(false);
-  const [showNewPassword, setShowNewPassword] = useState(false);
-  const [showConfirmPassword, setShowConfirmPassword] = useState(false);
-  const toast = useToast();
-
-  const [updatePassword] = useUpdatePasswordMutation();
-
-  // Form handling
-  const {
-    register,
-    handleSubmit,
-    reset,
-    formState: { errors },
-  } = useForm({
-    resolver: yupResolver(passwordSchema),
-    mode: "all",
-  });
-
-  // Form submit handler
-  const onSubmit = async (data) => {
-    setIsLoading(true);
-    try {
-      const res = await updatePassword(data); // Assuming API request works as expected
-      if (res?.data?.statusCode === 200) {
-        toast({
-          render: () => <ToastBox message={res?.data?.message} />,
-        });
-        handleClose();
-      } else if (res?.error) {
-        toast({
-          render: () => (
-            <ToastBox message={res?.error?.data?.message} status={"error"} />
-          ),
-        });
-      }
-    } catch (error) {
-      console.error(error);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  // Handle modal close
-  const handleClose = () => {
-    setAlert(false);
-    onClose();
-    reset();
-  };
-
-  return (
-    <>
-      <Modal isOpen={isOpen} onClose={onClose} initialFocusRef={firstField}>
-        <ModalOverlay />
-        <ModalContent>
-          <ModalHeader fontSize="md">Change Password</ModalHeader>
-          <ModalCloseButton />
-          <ModalBody pb={6}>
-            <Stack spacing={4}>
-              {/* Current Password */}
-              <FormControl isInvalid={errors.oldPassword}>
-                <FormLabel fontSize="sm" mb={1} fontWeight={500}>
-                  Current Password
-                </FormLabel>
-                <InputGroup size="sm">
-                  <Input
-                    {...register("oldPassword")}
-                    fontSize="sm"
-                    type={showCurrentPassword ? "text" : "password"}
-                    focusBorderColor="forestGreen.300"
-                  />
-                  <InputRightElement width="4.5rem">
-                    <Button
-                      h="1.5rem"
-                      size="xs"
-                      onClick={() => setShowCurrentPassword((prev) => !prev)}
-                    >
-                      {showCurrentPassword ? "Hide" : "Show"}
-                    </Button>
-                  </InputRightElement>
-                </InputGroup>
-                <FormErrorMessage>
-                  {errors.oldPassword?.message}
-                </FormErrorMessage>
-              </FormControl>
-
-              {/* New Password */}
-              <FormControl isInvalid={errors.newPassword}>
-                <FormLabel fontSize="sm" mb={1}>
-                  New Password
-                </FormLabel>
-                <InputGroup size="sm">
-                  <Input
-                    {...register("newPassword")}
-                    fontSize="sm"
-                    type={showNewPassword ? "text" : "password"}
-                    focusBorderColor="forestGreen.300"
-                  />
-                  <InputRightElement width="4.5rem">
-                    <Button
-                      h="1.5rem"
-                      size="xs"
-                      onClick={() => setShowNewPassword((prev) => !prev)}
-                    >
-                      {showNewPassword ? "Hide" : "Show"}
-                    </Button>
-                  </InputRightElement>
-                </InputGroup>
-                <FormErrorMessage>
-                  {errors.newPassword?.message}
-                </FormErrorMessage>
-              </FormControl>
-
-              {/* Confirm Password */}
-              <FormControl isInvalid={errors.confirmNewPassword}>
-                <FormLabel fontSize="sm" mb={1}>
-                  Confirm New Password
-                </FormLabel>
-                <InputGroup size="sm">
-                  <Input
-                    {...register("confirmNewPassword")}
-                    fontSize="sm"
-                    type={showConfirmPassword ? "text" : "password"}
-                    focusBorderColor="forestGreen.300"
-                  />
-                  <InputRightElement width="4.5rem">
-                    <Button
-                      h="1.5rem"
-                      size="xs"
-                      onClick={() => setShowConfirmPassword((prev) => !prev)}
-                    >
-                      {showConfirmPassword ? "Hide" : "Show"}
-                    </Button>
-                  </InputRightElement>
-                </InputGroup>
-                <FormErrorMessage>
-                  {errors.confirmNewPassword?.message}
-                </FormErrorMessage>
-              </FormControl>
-            </Stack>
-          </ModalBody>
-
-          <DrawerFooter mb={5}>
-            <Button
-              onClick={handleClose}
-              bg="#e0ebeb"
-              size="sm"
-              mr={3}
-              rounded={"sm"}
-            >
-              Cancel
-            </Button>
-            <Button
-              rounded={"sm"}
-              colorScheme="forestGreen"
-              size="sm"
-              onClick={() => setAlert(true)}
-              isLoading={isLoading}
-            >
-              Save
-            </Button>
-          </DrawerFooter>
-        </ModalContent>
-      </Modal>
-
-      <CustomAlertDialog
-        isOpen={alert}
-        onClose={() => setAlert(false)}
-        alertHandler={handleSubmit(onSubmit)}
-        message={"Are you sure you want to change the password?"}
-        isLoading={isLoading}
-      />
-    </>
-  );
-};
-
-export default ChangePassword;

src/Pages/Deposit/DepositRequest/DepositRequestApprove.jsx

@@ -4,7 +4,6 @@ import {
   Button,
   FormControl,
   FormErrorMessage,
-  FormHelperText,
   FormLabel,
   Input,
   Modal,
@@ -36,7 +35,7 @@ const FILE_TYPES = ["image/jpeg", "image/png", "image/gif"];
 
 export const conformModalSchema = yup.object().shape({
   investorAmount: yup.string().required("Investor amount is required"),
-  comment: yup.string().notRequired() .max(200, "Approve Comment cannot be more than 200 characters"),
+  comment: yup.string().notRequired(),
   supporting_FileName: yup.mixed().required("File is required"),
   // .test("fileType", "Unsupported File Format", (value) => {
   //   return value && FILE_TYPES.includes(value.type);
@@ -193,7 +192,7 @@ const DepositRequestApprove = ({
                 )}
               </FormControl>
               <FormControl mb={4}>
-                <FormLabel fontSize="sm">Comment</FormLabel>
+                <FormLabel fontSize="sm">Comments</FormLabel>
                 <Textarea
                   rows={5}
                   focusBorderColor="green.400"
@@ -202,19 +201,14 @@ const DepositRequestApprove = ({
                   fontSize="sm"
                   type="textarea"
                   size="sm"
-                  placeholder={"Enter your comment...."}
+                  placeholder={"Enter your comments...."}
                   resize={"none"}
-                  maxLength={200} 
                 />
                 {errors.comment && (
                   <Text fontSize="xs" color="red">
                     {errors.comment.message}
                   </Text>
                 )}
-                <FormHelperText fontSize="xs" color="gray.500">
-                    <Box as="span" me={1}>Maximum length should be 200 characters. You have entered </Box>
-                    {watch("comment")?.length || 0} characters.
-                  </FormHelperText>
               </FormControl>
             </ModalBody>
             <ModalFooter>

src/Pages/Deposit/DepositRequest/DepositRequestReject.jsx

@@ -2,7 +2,6 @@ import {
   Box,
   Button,
   FormControl,
-  FormHelperText,
   FormLabel,
   Input,
   Modal,
@@ -25,8 +24,7 @@ import { useDepositRejectMutation } from "../../../Services/deposit.request.serv
 import ToastBox from "../../../Components/ToastBox";
 
 export const conformModalSchema = yup.object().shape({
-  comments: yup.string().required("Comment is required") 
-  .max(200, "Approve Comment cannot be more than 200 characters"),
+  comments: yup.string().required("Comment is required"),
 });
 
 const DepositRequestReject = ({ isOpen, onClose, firstField ,id}) => {
@@ -37,7 +35,6 @@ const DepositRequestReject = ({ isOpen, onClose, firstField ,id}) => {
   const {
     register,
     reset,
-    watch,
     handleSubmit,
     formState: { errors },
   } = useForm({
@@ -124,20 +121,15 @@ const DepositRequestReject = ({ isOpen, onClose, firstField ,id}) => {
                 fontSize="sm"
                 type="textarea"
                 size="md"
-                placeholder={"Enter your comment...."}
+                placeholder={"Enter your comments...."}
                 rounded={"md"}
                 resize={"none"}
-                maxLength={200} 
               />
               {errors.comments && (
                 <Text fontSize="xs" color="red">
                   {errors.comments.message}
                 </Text>
               )}
-              <FormHelperText fontSize="xs" color="gray.500">
-                <Box as="span" me={1}>Maximum length should be 200 characters. You have entered </Box>
-                {watch("comments")?.length || 0} characters.
-              </FormHelperText>
             </FormControl>
           </ModalBody>
           <ModalFooter>

src/Pages/Fawateer/CreateRequest.jsx

@@ -1,27 +1,17 @@
 import React, { useState } from "react";
 import { OPACITY_ON_LOAD } from "../../Layout/animations";
+import { Box, Button, HStack, Input, InputGroup, InputRightAddon, Textarea, useDisclosure, Image, Icon, VStack, Text, useToast } from "@chakra-ui/react";
 import {
-  Box,
-  Button,
-  HStack,
-  Input,
-  InputGroup,
-  InputRightAddon,
-  Textarea,
-  useDisclosure,
-  Image,
-  Icon,
-  VStack,
-  Text,
-  useToast,
+  FormControl,
+  FormLabel,
+  FormHelperText,
 } from "@chakra-ui/react";
-import { FormControl, FormLabel, FormHelperText } from "@chakra-ui/react";
 import { DeleteIcon, Search2Icon } from "@chakra-ui/icons";
 import SelectInvestorModal from "./SelectInvestorModal";
 import { Controller, useForm } from "react-hook-form"; // Import useForm
 import { yupResolver } from "@hookform/resolvers/yup"; // Import resolver for Yup
 import * as Yup from "yup"; // Import Yup for validation
-import { motion } from "framer-motion"; // Import Framer Motion for animations
+import { motion } from 'framer-motion'; // Import Framer Motion for animations
 import { bytesToMB } from "../../Constants/Constants";
 import { useCreateFawateerRequestMutation } from "../../Services/fawateer.maker.service";
 import ToastBox from "../../Components/ToastBox";
@@ -33,67 +23,60 @@ const validationSchema = Yup.object().shape({
   investorName: Yup.string().required("Investor name is required"),
   clientId: Yup.string().required("Client ID is required"),
   transaction_date: Yup.date()
-    .required("Date is required")
-    .transform((value, originalValue) => {
-      return originalValue === "" ? null : value; // Convert empty strings to null
-    })
-    .typeError("Please enter a valid date")
-    .max(new Date(), "Date cannot be in the future"),
+  .required('Date is required')
+  .transform((value, originalValue) => {
+    return originalValue === "" ? null : value; // Convert empty strings to null
+  })
+  .typeError('Please enter a valid date').max(new Date(), "Date cannot be in the future"),
   transaction_amount: Yup.number()
-    .required("Transaction amount is required")
-    .transform((value, originalValue) => (originalValue === "" ? null : value)) // Convert empty strings to null
-    .typeError("Transaction amount must be a number") // Custom error message if it's not a number
-    .positive("Transaction amount must be greater than zero"),
+  .required("Transaction amount is required")
+  .transform((value, originalValue) => originalValue === "" ? null : value) // Convert empty strings to null
+  .typeError('Transaction amount must be a number') // Custom error message if it's not a number
+  .positive('Transaction amount must be greater than zero'),
   spportFile_path: Yup.mixed().required("Support file is required"),
-  makerComment: Yup.string()  .max(200, "Approve Comment cannot be more than 50 characters"),
+  makerComment: Yup.string(),
 });
 
 const CreateRequest = () => {
-  const toast = useToast();
-  const navigate = useNavigate();
+  const toast = useToast()
+  const navigate=useNavigate()
   const { isOpen, onOpen, onClose } = useDisclosure();
   const [selectedInvestor, setSelectorInvestor] = useState({});
   const [filePreview, setFilePreview] = useState(null); // State for previewing the file
   const [fileType, setFileType] = useState(null); // State to store file type for conditional rendering
-  const [isLoading, setIsLoading] = useState(false);
-  const [id, setId] = useState(null);
+  const[ isLoading, setIsLoading ] = useState(false)
+  const [id, setId ] = useState(null)
 
   // Initialize useForm with the resolver for Yup validation
-  const {
-    control,
-    register,
-    watch,
-    handleSubmit,
-    setValue,
-    reset,
-    formState: { errors },
-  } = useForm({
+  const {control, register, handleSubmit, setValue,reset, formState: { errors } } = useForm({
     resolver: yupResolver(validationSchema),
   });
 
-  const [creatFawaateerRequest] = useCreateFawateerRequestMutation();
+
+  const [ creatFawaateerRequest ] = useCreateFawateerRequestMutation()
+
 
   const onSubmit = async (data) => {
     console.log(data);
-    setIsLoading(true);
-
+    setIsLoading(true)
+  
     // Convert data to FormData
     const formData = new FormData();
-
-    // Append each field from the data object to the FormData
-    Object.keys(data).forEach((key) => {
-      if (key === "spportFile_path" && data[key] instanceof FileList) {
-        // Append the first file from FileList (assuming single file input)
-        formData.append(key, data[key][0]); // Append the file
-      } else {
-        formData.append(key, data[key]); // Append other fields
-      }
-    });
-
+    
+   // Append each field from the data object to the FormData
+   Object.keys(data).forEach((key) => {
+    if (key === "spportFile_path" && data[key] instanceof FileList) {
+      // Append the first file from FileList (assuming single file input)
+      formData.append(key, data[key][0]); // Append the file
+    } else {
+      formData.append(key, data[key]); // Append other fields
+    }
+  });
+  
     try {
       // Make the API call with formData
       const res = await creatFawaateerRequest({ data: formData, id });
-
+      
       if (res?.error) {
         toast({
           render: () => (
@@ -101,35 +84,39 @@ const CreateRequest = () => {
           ),
         });
         setIsLoading(false);
-        reset();
-        return;
+        reset()
+        return
       } else if (res?.data) {
-        toast({
-          render: () => <ToastBox message={res?.data?.message} />,
-        });
-        setIsLoading(false);
-        navigate("/fawateer-history");
-        return;
-      } else {
         toast({
           render: () => (
-            <ToastBox status={"error"} message={"Something went wrong"} />
+            <ToastBox message={res?.data?.message} />
           ),
         });
         setIsLoading(false);
-        return;
+        navigate('/fawateer-history')
+        return
+      } else {
+        toast({
+          render: () => (
+            <ToastBox status={'error'} message={"Something went wrong"} />
+          ),
+        });
+        setIsLoading(false);
+        return
       }
+  
     } catch (error) {
       console.error("Error:", error);
       toast({
         render: () => (
-          <ToastBox status={"error"} message={"An error occurred"} />
+          <ToastBox status={'error'} message={"An error occurred"} />
         ),
       });
       setIsLoading(false);
-      return;
+      return
     }
   };
+  
 
   // Handle file change and preview
   const handleFileChange = (e) => {
@@ -150,12 +137,15 @@ const CreateRequest = () => {
     }
   };
 
+
+
+
   return (
     <Box {...OPACITY_ON_LOAD} overflowY={"scroll"} height={"100vh"} pb={38}>
       <Box
         display={"flex"}
         justifyContent={"space-between"}
-        flexWrap={"wrap"}
+        flexWrap={'wrap'}
         alignItems={"center"}
         mt={5}
         px={4}
@@ -163,16 +153,11 @@ const CreateRequest = () => {
         onSubmit={handleSubmit(onSubmit)}
       >
         {/* Investor Name Field */}
-        <FormControl
-          isRequired
-          w={"49%"}
-          mb={2}
-          isInvalid={errors.investorName}
-        >
+        <FormControl isRequired w={"49%"} mb={2} isInvalid={errors.investorName}>
           <FormLabel textAlign={"left"} fontSize={"xs"} color={"gray.600"}>
             Investor name
           </FormLabel>
-          <InputGroup size="sm">
+          <InputGroup size='sm'>
             <Input
               bg={"#F5F8F6"}
               focusBorderColor="forestGreen.300"
@@ -185,24 +170,11 @@ const CreateRequest = () => {
               {...register("investorName")}
               _placeholder={{ fontSize: "sm" }}
             />
-            <InputRightAddon
-              gap={2}
-              color={"forestgreen.400"}
-              onClick={onOpen}
-              cursor={"pointer"}
-              fontWeight={600}
-              fontSize={"xs"}
-            >
+            <InputRightAddon gap={2} color={'forestgreen.400'} onClick={onOpen} cursor={'pointer'} fontWeight={600} fontSize={'xs'}>
               <Search2Icon /> Search
             </InputRightAddon>
           </InputGroup>
-          <FormHelperText
-            fontSize={"xs"}
-            fontWeight={500}
-            style={{ color: "red" }}
-          >
-            {errors.investorName?.message}
-          </FormHelperText>
+          <FormHelperText fontSize={'xs'} fontWeight={500} style={{ color: "red" }}>{errors.investorName?.message}</FormHelperText>
         </FormControl>
 
         {/* Client ID Field */}
@@ -221,13 +193,7 @@ const CreateRequest = () => {
             placeholder={"Client ID"}
             {...register("clientId")}
           />
-          <FormHelperText
-            fontSize={"xs"}
-            fontWeight={500}
-            style={{ color: "red" }}
-          >
-            {errors.clientId?.message}
-          </FormHelperText>
+          <FormHelperText fontSize={'xs'} fontWeight={500} style={{ color: "red" }}>{errors.clientId?.message}</FormHelperText>
         </FormControl>
 
         {/* Date Field */}
@@ -242,21 +208,10 @@ const CreateRequest = () => {
             fontSize={"sm"}
             rounded={"sm"}
             type={"date"}
-            max={new Date().toLocaleDateString("en-CA")} // Ensures max is in local timezone
-            {...register("transaction_date", {
-              setValueAs: (value) => {
-                // Convert date string to local timezone Date object
-                return value ? new Date(value) : undefined;
-              },
-            })}
+            max={new Date().toISOString().split("T")[0]} // Disable future dates
+            {...register("transaction_date")}
           />
-          <FormHelperText
-            fontSize={"xs"}
-            fontWeight={500}
-            style={{ color: "red" }}
-          >
-            {errors.transaction_date?.message}
-          </FormHelperText>
+          <FormHelperText fontSize={'xs'} fontWeight={500} style={{ color: "red" }}>{errors.transaction_date?.message}</FormHelperText>
         </FormControl>
 
         {/* Amount Field */}
@@ -265,35 +220,19 @@ const CreateRequest = () => {
             Amount (BHD)
           </FormLabel>
           <Controller
-            name="transaction_amount"
-            control={control}
-            render={({ field }) => (
-              <CurrencyInput
-                bg={"#F5F8F6"}
-                {...field}
-                textAlign={"right"}
-                fontSize={"sm"}
-                type="number"
-                size={"sm"}
-              />
-            )}
-          />
-          <FormHelperText
-            fontSize={"xs"}
-            fontWeight={500}
-            style={{ color: "red" }}
-          >
+                  name="transaction_amount"
+                  control={control}
+                  render={({ field }) => (
+                    <CurrencyInput bg={"#F5F8F6"} {...field} textAlign={'right'} fontSize={"sm"} type="number" size={"sm"} />
+                  )}
+                />
+          <FormHelperText fontSize={'xs'} fontWeight={500} style={{ color: "red" }}>
             {errors.transaction_amount?.message}
-          </FormHelperText>
+            </FormHelperText>
         </FormControl>
 
         {/* Support File Field with Preview */}
-        <FormControl
-          isRequired
-          w={"49%"}
-          mb={2}
-          isInvalid={errors.spportFile_path}
-        >
+        <FormControl  isRequired  w={"49%"} mb={2} isInvalid={errors.spportFile_path}>
           <FormLabel textAlign={"left"} fontSize={"xs"} color={"gray.600"}>
             Support file
           </FormLabel>
@@ -310,13 +249,7 @@ const CreateRequest = () => {
             {...register("spportFile_path")}
             // onChange={handleFileChange}
           />
-          <FormHelperText
-            fontSize={"xs"}
-            fontWeight={500}
-            style={{ color: "red" }}
-          >
-            {errors.spportFile_path?.message}
-          </FormHelperText>
+          <FormHelperText fontSize={'xs'} fontWeight={500} style={{ color: "red" }}>{errors.spportFile_path?.message}</FormHelperText>
 
           {/* Animated Preview */}
           {filePreview && fileType?.type.startsWith("image/") && (
@@ -326,55 +259,14 @@ const CreateRequest = () => {
               transition={{ duration: 0.5 }}
               style={{ marginTop: "10px" }}
             >
-              <Box
-                position={"relative"}
-                display={"flex"}
-                alignContent={"flex-end"}
-                gap={3}
-                mt={2}
-              >
-                <Image
-                  src={filePreview}
-                  alt="File preview"
-                  maxW={"150px"}
-                  borderRadius="md"
-                  boxShadow="md"
-                />
-                <Icon
-                  onClick={() => setFilePreview(null)}
-                  className="link"
-                  rounded={"md"}
-                  color={"red.700"}
-                  cursor={"pointer"}
-                  p={1.5}
-                  position={"absolute"}
-                  top={0}
-                  right={0}
-                  as={DeleteIcon}
-                  boxSize={7}
-                />
-                <VStack justifyItems={"flex-end"} alignItems={"flex-start"}>
-                  <Text as={"span"} color={"gray.600"} fontSize={"xs"}>
-                    File Name:{" "}
-                    <Text as={"span"} color={"GrayText"}>
-                      {" "}
-                      {fileType?.name}
-                    </Text>
-                  </Text>
-                  <Text as={"span"} color={"gray.600"} fontSize={"xs"}>
-                    File Size:{" "}
-                    <Text as={"span"} color={"GrayText"}>
-                      {" "}
-                      {bytesToMB(fileType?.size)} Mb
-                    </Text>
-                  </Text>
-                  <Text as={"span"} color={"gray.600"} fontSize={"xs"}>
-                    File Type:{" "}
-                    <Text as={"span"} color={"GrayText"}>
-                      {" "}
-                      {fileType?.type}
-                    </Text>
-                  </Text>
+              <Box  position={'relative'} display={'flex'} alignContent={'flex-end'} gap={3}   mt={2}>
+                <Image  src={filePreview} alt="File preview" maxW={"150px"} borderRadius="md" boxShadow="md" />
+                <Icon  onClick={()=> setFilePreview(null)} className="link" rounded={'md'} color={'red.700'} cursor={'pointer'} p={1.5}  position={'absolute'} top={0} right={0} as={DeleteIcon} boxSize={7} />
+                <VStack justifyItems={'flex-end'} alignItems={'flex-start'}>
+                  <Text as={'span'} color={'gray.600'} fontSize={'xs'}>File Name: <Text as={'span'} color={'GrayText'}> {fileType?.name}</Text></Text>
+                  <Text as={'span'} color={'gray.600'} fontSize={'xs'}>File Size: <Text as={'span'} color={'GrayText'}> {bytesToMB(fileType?.size)} Mb</Text></Text>
+                  <Text as={'span'} color={'gray.600'} fontSize={'xs'}>File Type: <Text as={'span'} color={'GrayText'}> {fileType?.type}</Text></Text>
+
                 </VStack>
               </Box>
             </motion.div>
@@ -382,7 +274,7 @@ const CreateRequest = () => {
         </FormControl>
 
         {/* Description Field */}
-        <FormControl w={"100%"} mb={2} isInvalid={errors.makerComment}>
+        <FormControl  w={"100%"} mb={2} isInvalid={errors.makerComment}>
           <FormLabel textAlign={"left"} fontSize={"xs"} color={"gray.600"}>
             Description
           </FormLabel>
@@ -394,26 +286,13 @@ const CreateRequest = () => {
             rounded={"sm"}
             placeholder={"Description"}
             {...register("makerComment")}
-            maxLength={200}
           />
-          <FormHelperText
-            fontSize={"xs"}
-            fontWeight={500}
-            style={{ color: "red" }}
-          >
-            {errors.makerComment?.message}
-          </FormHelperText>
-          <FormHelperText fontSize="xs" color="gray.500">
-            <Box as="span" me={1}>
-              Maximum length should be 200 characters. You have entered
-            </Box>
-            {watch("makerComment")?.length || 0} characters.
-          </FormHelperText>
+          <FormHelperText fontSize={'xs'} fontWeight={500} style={{ color: "red" }}>{errors.makerComment?.message}</FormHelperText>
         </FormControl>
 
         {/* Submit Button */}
-        <HStack mt={2} w={"100%"} justifyContent={"flex-end"}>
-          <Button
+        <HStack mt={2} w={'100%'} justifyContent={'flex-end'}>
+          <Button 
             colorScheme="forestGreen"
             size={"sm"}
             rounded={"sm"}
@@ -426,13 +305,7 @@ const CreateRequest = () => {
         </HStack>
       </Box>
 
-      <SelectInvestorModal
-        setId={setId}
-        setValue={setValue}
-        onClose={onClose}
-        isOpen={isOpen}
-        onOpen={onOpen}
-      />
+      <SelectInvestorModal setId={setId} setValue={setValue} onClose={onClose} isOpen={isOpen} onOpen={onOpen}/>
     </Box>
   );
 };

src/Pages/FawateerChecker/ApproveRequest/ApproveRequest.jsx

@@ -138,7 +138,7 @@ import RequestRejectModal from "./RequestRejectModal";
       "Deposit Date",
       "Deposit Amount (BHD)",
       "Support Image",
-      "Action", 
+      "Action",
     ];
   
   

src/Pages/ForgetPassword.jsx

@@ -1,134 +0,0 @@
-import {
-  Button,
-  DrawerFooter,
-  FormControl,
-  FormErrorMessage,
-  FormLabel,
-  Input,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalHeader,
-  ModalOverlay,
-  Stack,
-  useToast,
-} from "@chakra-ui/react";
-import * as yup from "yup";
-import React, { useState} from "react";
-import { useForm, Controller } from "react-hook-form";
-import { yupResolver } from "@hookform/resolvers/yup";
-import { useForgetPasswordMutation } from "../Services/forget.password.service";
-import ToastBox from "../Components/ToastBox";
-
-const validationSchema = yup.object().shape({
-  emailAddress: yup
-    .string()
-    .email("Invalid email format")
-    .required("Email, Phone, or Username is required"),
-});
-
-const ForgetPassword = ({ isOpen, onClose, firstField }) => {
-  const toast = useToast();
-  const [isLoading, setIsLoading] = useState(false);
-
-  const [forgetPassword] = useForgetPasswordMutation();
-
-  const {
-    control,
-    handleSubmit,
-    formState: { errors },
-  } = useForm({
-    resolver: yupResolver(validationSchema),
-  });
-
-  const onSubmit = async (formData) => {
-    
-    setIsLoading(true);
-    try {
-      const res = await forgetPassword(formData);
-      if (res?.data?.statusCode === 200) {
-        toast({
-          render: () => <ToastBox message={res?.data?.message} />,
-        });
-        handleClose();
-      } else if (res?.error?.status === 401) {
-        toast({
-          render: () => (
-            <ToastBox message={res?.error?.data?.message} status="error" />
-          ),
-        });
-        handleClose();
-      }
-    } catch (error) {
-      console.error(error);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  const handleClose = () => {
-    setIsLoading(false);
-    onClose();
-  };
-
-  return (
-    <Modal
-      isCentered
-      isOpen={isOpen}
-      onClose={handleClose}
-      initialFocusRef={firstField}
-    >
-      <ModalOverlay />
-      <ModalContent>
-        <form onSubmit={handleSubmit(onSubmit)}>
-          <ModalHeader fontSize="md">Forget Password</ModalHeader>
-          <ModalCloseButton />
-          <ModalBody pb={4}>
-            <Stack spacing={4}>
-              <FormControl isInvalid={errors.emailAddress}>
-                <FormLabel fontSize="sm" mb={3} fontWeight={500}>
-                  Email, Phone, or Username
-                </FormLabel>
-                <Controller
-                  name="emailAddress"
-                  control={control}
-                  render={({ field }) => (
-                    <Input
-                      {...field}
-                      size="md"
-                      fontSize="sm"
-                    focusBorderColor="forestGreen.300"
-                      rounded={4}
-                      type="text"
-                    />
-                  )}
-                />
-                <FormErrorMessage fontSize="xs" fontWeight={500}>
-                  {errors.emailAddress?.message}
-                </FormErrorMessage>
-              </FormControl>
-            </Stack>
-          </ModalBody>
-
-          <DrawerFooter mb={5}>
-            <Button
-              w="100%"
-              colorScheme="forestGreen" 
-              rounded="md"
-              size="md"
-              type="submit"
-              isLoading={isLoading}
-              fontWeight={400}
-              fontSize="sm"
-            >
-              Send Login Link
-            </Button>
-          </DrawerFooter>
-        </form>
-      </ModalContent>
-    </Modal>
-  );
-};
-
-export default ForgetPassword;

src/Pages/IO_Management/CreateIO/AddCashDetails.jsx

@@ -56,7 +56,7 @@ const AddCashDetails = ({ isOpen, onClose, firstField, actionId, setActionId, da
   const [updateVideoArtifacts] = useUpdateVideoArtifactsMutation()
   // const {
   //   data
-  // } = useGetArtifactsQuery(id) 
+  // } = useGetArtifactsQuery(id)
 
   const {
     control,
@@ -90,12 +90,12 @@ const AddCashDetails = ({ isOpen, onClose, firstField, actionId, setActionId, da
         toast({
           render: () => <ToastBox message={res?.error?.data?.message } status={"error"} />,
         });
+        setAlert(false);
       }
-      
 
     } catch (error) {
       console.log(error);
-      setIsLoading(false);
+
     }
 
   };

src/Pages/IO_Management/CreateIO/CreateIO.jsx

@@ -8,8 +8,8 @@ import IODetails from "./IODetails";
 import KeyMerits from "./KeyMerits";
 import IOArtifacts from "./IOArtifacts";
 import Investors from "./Investors";
-// import IOCashDetails from "./IOCashDetailsold";
-// import IONAVDetails from "./IONAVDetailsOld";
+import IOCashDetails from "./IOCashDetails";
+import IONAVDetails from "./IONAVDetails";
 import InvestmentDocument from "./InvestmentDocument"; // Ensure this is the correct import
 import ViewIOdataHeader from "../ViewIO/ViewIOdataHeader";
 import { useParams } from "react-router-dom";
@@ -17,9 +17,6 @@ import FullscreenLoaders from "../../../Components/Loaders/FullscreenLoaders";
 import { useGetIOprepopulateDataQuery } from "../../../Services/io.service";
 import UnderConstruction from "../../UnderConstruction";
 import Destribution from "./Destribution";
-import IOCashDetails from "./IOCashDetails/IOCashDetails";
-import IONAVDetails from "./IONAVDetails/IONAVDetails";
-import IOTransaction from "./IOTransaction/IOTransaction";
 
 const CreateIO = () => {
   const id = useParams()?.id;
@@ -78,11 +75,6 @@ const CreateIO = () => {
       Content: Destribution,
       isDisabled: id ? true : true,
     },
-    {
-      label: "IO Transaction",
-      Content: IOTransaction,
-      isDisabled: id ? true : true,
-    },
   ];
 
   const [tabs, setTabs] = useState(initialTabsState);
@@ -122,8 +114,7 @@ const CreateIO = () => {
             <Tab
               isDisabled={isDisabled}
               key={index}
-              fontSize={"xs"}
-              fontWeight={500}
+              fontSize={"sm"}
               _selected={{
                 color: "#004118",
                 borderBottom: "2px solid #38a169",

src/Pages/IO_Management/CreateIO/Destribution.jsx

@@ -1,49 +1,37 @@
-import React, { useContext, useEffect, useRef, useState } from "react";
-import GlobalStateContext from "../../../Contexts/GlobalStateContext";
-import {
-  Box,
-  HStack,
-  Input,
-  Text,
-  Table,
-  Tbody,
-  Th,
-  Tr,
-  Avatar,
-  useDisclosure,
-  Button,
-  Badge,
-} from "@chakra-ui/react";
-import { OPACITY_ON_LOAD } from "../../../Layout/animations";
-import Pagination from "../../../Components/Pagination";
-import NormalTable from "../../../Components/DataTable/NormalTable";
-import CustomAlertDialog from "../../../Components/CustomAlertDialog";
-import { formatDatee } from "../../../Components/FormField";
-import { AddIcon } from "@chakra-ui/icons";
-import AddIONav from "./AddIONav";
+import React, { useContext, useEffect, useRef, useState } from 'react'
+import GlobalStateContext from '../../../Contexts/GlobalStateContext';
+import { Box, HStack, Input,Text, Table, Tbody, Th, Tr, Avatar, useDisclosure,Button, Badge } from '@chakra-ui/react';
+import { OPACITY_ON_LOAD } from '../../../Layout/animations';
+import Pagination from '../../../Components/Pagination';
+import NormalTable from '../../../Components/DataTable/NormalTable';
+import CustomAlertDialog from '../../../Components/CustomAlertDialog';
+import { formatDatee } from '../../../Components/FormField';
+import { AddIcon } from '@chakra-ui/icons';
+import AddIONav from './AddIONav';
 
 const Destribution = () => {
   const { navDetails, setNavDetails, IODetails } =
     useContext(GlobalStateContext);
-  const firstField = useRef();
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const [searchTerm, setSearchTerm] = useState("");
-  const [isLoading, setIsLoading] = useState(true);
-  const [deleteAlert, setDeleteAlert] = useState(false);
-  const [actionId, setActionId] = useState(false);
-  const [mouseEntered, setMouseEntered] = useState(false);
-  const [mouseEnteredId, setMouseEnteredId] = useState("");
+    const firstField = useRef();
+    const { isOpen, onOpen, onClose } = useDisclosure();
+    const [searchTerm, setSearchTerm] = useState("");
+    const [isLoading, setIsLoading] = useState(true);
+    const [deleteAlert, setDeleteAlert] = useState(false);
+    const [actionId, setActionId] = useState(false);
+    const [mouseEntered, setMouseEntered] = useState(false);
+    const [mouseEnteredId, setMouseEnteredId] = useState("");
 
-  console.log(IODetails?.ioNAVHistory);
-
-  const formatDate = (date) => {
-    return new Date(date).toLocaleDateString("en-GB", {
-      day: "2-digit",
-      month: "2-digit",
-      year: "numeric",
-    });
-  };
 
+    console.log(IODetails?.ioNAVHistory);
+    
+    const formatDate = (date) => {
+      return new Date(date).toLocaleDateString('en-GB', {
+        day: '2-digit',
+        month: '2-digit',
+        year: 'numeric',
+      });
+    };
+    
   useEffect(() => {
     // Simulate loading
     const timer = setTimeout(() => {
@@ -54,38 +42,32 @@ const Destribution = () => {
     return () => clearTimeout(timer);
   }, []);
 
-  // Table setup
-  const tableHeadRow = [
-    // "Sr.No",
-    "Date",
-    "Amount",
-    "% of Investment",
-  ];
+    // Table setup
+    const tableHeadRow = [
+      // "Sr.No",
+      "Date",
+      "Amount",
+      "% of Investment"
+    ];
 
-  // Table filter
-  const filteredData = IODetails?.distributionToInvestor
-    ?.filter((item) => {
-      const name = item?.transactionAmount;
-      const searchLower = searchTerm.toLowerCase();
-      const nameMatches = name.toLowerCase().includes(searchLower);
-      return nameMatches;
-    })
-    .sort((b, a) => new Date(a.transactionDate) - new Date(b.transactionDate));
+      // Table filter
+  const filteredData = IODetails?.distributionToInvestor?.filter((item) => {
+    const name = item?.transactionAmount;
+    const searchLower = searchTerm.toLowerCase();
+    const nameMatches = name.toLowerCase().includes(searchLower);
+    return nameMatches;
+  }).sort((b, a) => new Date(a.transactionDate) - new Date(b.transactionDate));
 
-  const extractedArray = filteredData?.map((item, index) => ({
+  const  extractedArray=filteredData?.map((item, index) => ({
     id: item?.id,
-    "Sr.No": (
-      <Text
-        justifyContent={"start"}
-        as={"span"}
-        color={"teal.900"}
-        fontWeight={"500"}
-        className="d-flex align-items-start web-text-small"
-      >
-        {item?.id}
-      </Text>
-    ),
-    Date: (
+    "Sr.No":  <Text
+    justifyContent={"start"}
+    as={"span"}
+    color={"teal.900"}
+    fontWeight={"500"}
+    className="d-flex align-items-start web-text-small"
+  >{item?.id}</Text>,
+    "Date": (
       <Text
         justifyContent={"center"}
         as={"span"}
@@ -96,7 +78,7 @@ const Destribution = () => {
         {formatDate(item.transactionDate)}
       </Text>
     ),
-    Amount: (
+    "Amount": (
       <Text
         justifyContent={"center"}
         as={"span"}
@@ -104,13 +86,11 @@ const Destribution = () => {
         fontWeight={"500"}
         className="d-flex align-items-center web-text-small"
       >
-        <Badge ms={1} colorScheme="green" me={1}>
-          $
-        </Badge>
+        <Badge ms={1} colorScheme="green" me={1}>$</Badge>
         {`${parseFloat(item.transactionAmount || 0).toLocaleString(undefined, {
-          minimumFractionDigits: 2,
-          maximumFractionDigits: 2,
-        })}`}
+            minimumFractionDigits: 2,
+            maximumFractionDigits: 2,
+          })}`}
       </Text>
     ),
     "% of Investment": (
@@ -126,8 +106,12 @@ const Destribution = () => {
     ),
   }));
 
+
+
   const handleDelete = () => {
-    const updatedNav = navDetails.filter((sponsor) => sponsor.id !== actionId);
+    const updatedNav = navDetails.filter(
+      (sponsor) => sponsor.id !== actionId
+    );
 
     setTimeout(() => {
       setNavDetails(updatedNav);
@@ -137,11 +121,12 @@ const Destribution = () => {
     setIsLoading(true);
   };
 
+
   const Total = () => {
     return (
       <Table size="sm">
         <Tbody>
-          <Tr backgroundColor="gray.50">
+          <Tr  backgroundColor="gray.50">
             <Th
               textAlign={"center"}
               p={3}
@@ -162,13 +147,8 @@ const Destribution = () => {
               wordBreak="normal"
               overflowWrap="normal"
             >
-              <Badge ms={1} colorScheme="green" me={1}>
-                $
-              </Badge>
-              {IODetails?.total_distributeToInvestor_amt?.toLocaleString(
-                undefined,
-                { minimumFractionDigits: 2, maximumFractionDigits: 2 }
-              )}
+              
+            <Badge ms={1} colorScheme="green" me={1}>$</Badge>{IODetails?.total_distributeToInvestor_amt?.toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}
             </Th>
             <Th
               textAlign={"center"}
@@ -187,52 +167,62 @@ const Destribution = () => {
     );
   };
 
-  return (
-    <Box {...OPACITY_ON_LOAD} pb={0}>
-      <Box bg="white.500">
-        <HStack
-          display={"flex"}
-          justifyContent={"space-between"}
-          pb={3}
-          spacing="24px"
-        >
-          <Input
-            type="search"
-            width={300}
-            placeholder="Search..."
-            size="sm"
-            rounded="sm"
-            focusBorderColor="green.500"
-            value={searchTerm}
-            onChange={(e) => setSearchTerm(e.target.value)}
-          />
-        </HStack>
-      </Box>
 
-      <NormalTable
-        centered={true}
-        emptyMessage={`We don't have any Sponers`}
-        tableHeadRow={tableHeadRow}
-        data={extractedArray}
-        isLoading={isLoading}
-        viewActionId={actionId}
-        setViewActionId={setActionId}
-        total={<Total />}
-        setMouseEnteredId={setMouseEnteredId}
-        setMouseEntered={setMouseEntered}
-      />
 
-      <CustomAlertDialog
-        onClose={() => setDeleteAlert(false)}
-        isOpen={deleteAlert}
-        message={"Are you sure you want to delete sponers?"}
-        alertHandler={handleDelete}
-        isLoading={isLoading}
-      />
 
-      <AddIONav isOpen={isOpen} onClose={onClose} firstField={firstField} />
+  return (<Box {...OPACITY_ON_LOAD} pb={0}>
+    <Box bg="white.500">
+      <HStack
+        display={"flex"}
+        justifyContent={"space-between"}
+        pb={3}
+        spacing="24px"
+      >
+        <Input
+          type="search"
+          width={300}
+          placeholder="Search..."
+          size="sm"
+          rounded="sm"
+          focusBorderColor="green.500"
+          value={searchTerm}
+          onChange={(e) => setSearchTerm(e.target.value)}
+        />
+
+      </HStack>
     </Box>
-  );
-};
 
-export default Destribution;
+    <NormalTable
+      centered={true}
+      emptyMessage={`We don't have any Sponers`}
+      tableHeadRow={tableHeadRow}
+      data={extractedArray} 
+      isLoading={isLoading}
+      viewActionId={actionId}
+      setViewActionId={setActionId}
+      total={<Total/>}
+      setMouseEnteredId={setMouseEnteredId}
+      setMouseEntered={setMouseEntered}
+    />
+
+    <CustomAlertDialog
+      onClose={() => setDeleteAlert(false)}
+      isOpen={deleteAlert}
+      message={"Are you sure you want to delete sponers?"}
+      alertHandler={handleDelete}
+      isLoading={isLoading}
+    />
+
+
+
+<AddIONav 
+          isOpen={isOpen}
+          onClose={onClose}
+          firstField={firstField} />
+
+
+  </Box>
+  )
+}
+
+export default Destribution

src/Pages/IO_Management/CreateIO/IOArtifacts.jsx

@@ -116,7 +116,7 @@ const IOArtifacts = ({ enableNextTab, index, data }) => {
         setDeleteAlertVideo(false);
         setIsLoadingBtn(false);
         toast({
-          render: () => <ToastBox message={res?.data?.message} status="success" />,
+          render: () => <ToastBox message={res?.data?.message} status="error" />,
         });
       }
     } catch (error) {
@@ -134,7 +134,7 @@ const IOArtifacts = ({ enableNextTab, index, data }) => {
         setDeleteAlertImage(false);
         setIsLoadingBtn(false);
         toast({
-          render: () => <ToastBox message={res?.data?.message} status="success" />,
+          render: () => <ToastBox message={res?.data?.message} status="error" />,
         });
 
       }
@@ -372,7 +372,7 @@ const sortedDataVideo = [...(IObyID?.data?.artifactsVideo || [])]?.sort(
           Manage IO Images
         </Box>
         <HStack>
- 
+
 
           {IObyID?.data?.artifactsImage?.length !== 0 &&<SetDisplayOrderIOArtifactsImages data={sortedDataImage} />}
           <Button

src/Pages/IO_Management/CreateIO/IOArtifactsVideo.jsx

@@ -10,7 +10,6 @@ import {
   DrawerOverlay,
   FormControl,
   FormErrorMessage,
-  FormHelperText,
   FormLabel,
   Input,
   Stack,
@@ -27,8 +26,7 @@ import { useParams } from "react-router-dom";
 import ToastBox from "../../../Components/ToastBox";
 
 const investmentVideoSchema = yup.object().shape({
-  artifactName: yup.string().required("Artifact name is required")
-  .max(50, "Approve Comment cannot be more than 50 characters"),
+  artifactName: yup.string().required("Artifact name is required"),
   artifactStreamingURL: yup.string()
     .required("Artifact streaming URL is required")
     .url("Invalid URL format"),
@@ -154,25 +152,21 @@ const IOArtifactsAdd = ({ isOpen, onClose, firstField, actionId, setActionId, da
 
           <DrawerBody>
             <Stack spacing={4}>
-              <FormControl isInvalid={errors.artifactName} isRequired>
+              <FormControl isInvalid={errors.artifactName}  isRequired={true}>
                 <FormLabel fontSize={"sm"}>Artifact Name</FormLabel>
                 <Controller
                   name="artifactName"
                   control={control}
                   render={({ field }) => (
-                    <Input {...field} fontSize={"sm"} type="text" size={"sm"} maxLength={50}  />
+                    <Input {...field} fontSize={"sm"} type="text" size={"sm"} />
                   )}
                 />
                 <FormErrorMessage fontSize={"xs"} fontWeight={500}>
                   {errors.artifactName?.message}
                 </FormErrorMessage>
-                <FormHelperText fontSize="xs" color="gray.500">
-                    <Box as="span" me={1}>Maximum length should be 50 characters. You have entered </Box>
-                    {watch("artifactName")?.length || 0} characters.
-                  </FormHelperText>
               </FormControl>
 
-              <FormControl isInvalid={errors.artifactStreamingURL} isRequired>
+              <FormControl isInvalid={errors.artifactStreamingURL}  isRequired={true}>
                 <FormLabel fontSize={"sm"}>Artifact Streaming URL</FormLabel>
                 <Controller
                   name="artifactStreamingURL"
@@ -217,7 +211,7 @@ const IOArtifactsAdd = ({ isOpen, onClose, firstField, actionId, setActionId, da
         isOpen={alert}
         onClose={() => setAlert(false)}
         alertHandler={handleSave}
-        message={"Are you sure you want to update this artifact?"}
+        message={"Are you sure you want to add this artifact?"}
         isLoading={isLoading}
       />
     </>

src/Pages/IO_Management/CreateIO/IOCashDetails.jsx

@@ -29,7 +29,7 @@ import { exportToExcel, exportToExcelNew } from "../../../Constants/Constants";
 
 const formatDate = (date) => new Date(date).toLocaleDateString(); // Simple date formatter
 
-const IOCashDetailsOld = () => {
+const IOCashDetails = () => {
   const toast = useToast();
   const firstField = useRef();
   const { isOpen, onOpen, onClose } = useDisclosure();
@@ -75,7 +75,7 @@ const IOCashDetailsOld = () => {
     "Update by ",
     "Update On",
   ];
-
+ 
   const handleUpdateStatus = debounce((id) => {
     setCaseDetails((prevSponser) =>
       prevSponser.map((sponsor) =>
@@ -134,9 +134,9 @@ const IOCashDetailsOld = () => {
         </Badge>
         {/* {parseFloat(item.transactionAmount || 0).toLocaleString()} */}
         {`${parseFloat(item.transactionAmount || 0).toLocaleString(undefined, {
-          minimumFractionDigits: 2,
-          maximumFractionDigits: 2,
-        })}`}
+            minimumFractionDigits: 2,
+            maximumFractionDigits: 2,
+          })}`}
       </Text>
     ),
     Comments: (
@@ -180,6 +180,8 @@ const IOCashDetailsOld = () => {
     ),
   }));
 
+
+
   const customHeaders = [
     { label: "Date", key: "transactionDate" },
     { label: "Transaction type", key: "transactionType" },
@@ -190,12 +192,12 @@ const IOCashDetailsOld = () => {
     // Add more headers as needed
   ];
 
-  const ioCashExporteDetails = IODetails?.ioCashHistory?.map((item, index) => ({
-    Date: item?.transactionDate,
+  const ioCashExporteDetails = IODetails?.ioCashHistory?.map((item, index) =>({
+    "Date": item?.transactionDate,
     "Transaction type": item?.transactionType,
-    Amount: parseFloat(item?.transactionAmount) || 0,
-    Comments: item?.comments,
-  }));
+    "Amount":parseFloat(item?.transactionAmount) || 0,
+    "Comments": item?.comments
+  }))
 
   console.log(ioCashExporteDetails);
 
@@ -310,7 +312,8 @@ const IOCashDetailsOld = () => {
             onChange={(e) => setSearchTerm(e.target.value)}
           />
 
-          <HStack display={"flex"} alignItems={"center"}>
+
+<HStack display={"flex"} alignItems={"center"}>
             <Button
               onClick={() =>
                 exportToExcelNew(ioCashExporteDetails, "IO Cash History")
@@ -321,24 +324,25 @@ const IOCashDetailsOld = () => {
               variant={"outline"}
               rounded={"sm"}
               fontSize={"xs"}
+              
               isDisabled={ioCashExporteDetails?.length === 0}
             >
               Export xls
             </Button>
 
-            {IODetails?.isInvestedAmount ? (
-              <Button
-                onClick={onOpen}
-                leftIcon={<AddIcon />}
-                colorScheme="forestGreen"
-                size={"sm"}
-                rounded={"sm"}
-                fontSize={"xs"}
-              >
-                Add IO Cash
-              </Button>
-            ) : null}
-          </HStack>
+          {IODetails?.isInvestedAmount ? (
+            <Button
+              onClick={onOpen}
+              leftIcon={<AddIcon />}
+              colorScheme="forestGreen"
+              size={"sm"}
+              rounded={"sm"}
+              fontSize={"xs"}
+            >
+              Add IO Cash
+            </Button>
+          ) : null}
+        </HStack>
         </HStack>
       </Box>
 
@@ -372,4 +376,4 @@ const IOCashDetailsOld = () => {
   );
 };
 
-export default IOCashDetailsOld;
+export default IOCashDetails;

src/Pages/IO_Management/CreateIO/IOCashDetails/AddCaseDetails.jsx

@@ -1,263 +0,0 @@
-import {
-  Box,
-  Button,
-  Drawer,
-  DrawerBody,
-  DrawerCloseButton,
-  DrawerContent,
-  DrawerFooter,
-  DrawerHeader,
-  DrawerOverlay,
-  FormControl,
-  FormErrorMessage,
-  FormHelperText,
-  FormLabel,
-  Input,
-  Select,
-  Stack,
-  Textarea,
-  useToast,
-} from "@chakra-ui/react";
-import * as yup from "yup";
-import React, { useState, useEffect, useContext } from "react";
-import { useForm, Controller } from "react-hook-form";
-import { yupResolver } from "@hookform/resolvers/yup";
-import { v4 as uuidv4 } from "uuid";
-import { useParams } from "react-router-dom";
-import CustomAlertDialog from "../../../../Components/CustomAlertDialog";
-import { useCreateIoCashMutation, useCreateVideoArtifactsMutation, useUpdateVideoArtifactsMutation } from "../../../../Services/io.service";
-import ToastBox from "../../../../Components/ToastBox";
-import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-import CurrencyInput from "../../../../Components/CurrencyInput";
-
-const cashDetails = yup.object().shape({
-  transactionDate: yup.string().required("Date is required"),
-  ioTransType_xid: yup.number().required("Cash transaction is required"),
-  transactionAmount: yup.number().required("Transaction Amount is required"),
-  comments: yup.string().notRequired()
-  .max(200, "Approve Comment cannot be more than 200 characters"),
-});
-
-const AddCaseDetails = ({ isOpen, onClose, firstField, actionId, setActionId, data, setActiveTab }) => {
-  const params = useParams() 
-  const id = params?.id
-  const [file, setFile] = useState("");
-  const [fileName, setFileName] = useState("");
-  const [isLoading, setIsLoading] = useState(false)
-  const [alert, setAlert] = useState(false);
-  const toast = useToast();
-
-  console.log(isOpen);
-  
-
-
-
-  // ======================[ Cotext Api ]
-  const { IODetails } = useContext(GlobalStateContext);
-  const found = data?.find((item) => item?.id === actionId);
-
-
-  const [createArtifactsVideo] = useCreateVideoArtifactsMutation()
-  const [updateVideoArtifacts] = useUpdateVideoArtifactsMutation()
-  // const {
-  //   data
-  // } = useGetArtifactsQuery(id) 
-
-  const {
-    control,
-    handleSubmit,
-    watch,
-    reset,
-    formState: { errors },
-  } = useForm({
-    resolver: yupResolver(cashDetails),
-  });
-
-
-  const [createIoCash] = useCreateIoCashMutation()
-
-
-  const onSubmit = async (data) => {
-
-    setIsLoading(true)
-
-    try {
-
-      const res = await createIoCash({ data, id })
-      if (res?.data) {
-        setIsLoading(false);
-        toast({
-          render: () => <ToastBox message={res?.data?.message} />,
-        });
-        handleClose()
-        setActiveTab(1)
-      }else if(res?.error){
-        setIsLoading(false);
-        toast({
-          render: () => <ToastBox message={res?.error?.data?.message } status={"error"} />,
-        });
-      }
-
-    } catch (error) {
-      console.log(error);
-      setIsLoading(false);
-    }
-
-  };
-
-
-
-  const handleConfirm = () => {
-    handleSubmit(onSubmit)();
-  };
-
-  const handleSave = () => {
-    handleSubmit(onSubmit)();
-  };
-
-  const handleClose = () => {
-    setAlert(false)
-    onClose()
-    reset({
-      transactionAmount:""
-    })
-  }
-
-  return (
-    <>
-      <Drawer
-        size={"md"}
-        isOpen={isOpen}
-        placement="right"
-        initialFocusRef={firstField}
-        onClose={handleClose}
-      >
-        <DrawerOverlay />
-        <DrawerContent>
-          <DrawerCloseButton />
-          <DrawerHeader fontSize={"sm"}>IO Cash Details</DrawerHeader>
-
-          <DrawerBody>
-            <Stack spacing={4}>
-              <FormControl isInvalid={errors.transactionDate} isRequired> 
-                <FormLabel fontSize={"sm"}>Date Selection</FormLabel>
-                <Controller
-                  name="transactionDate"
-                  control={control}
-                  render={({ field }) => (
-                    <Input 
-                    focusBorderColor="forestGreen.300" {...field} fontSize={"sm"} type="date" size={"sm"} />
-                  )}
-                />
-                <FormErrorMessage fontSize={"xs"} fontWeight={500}>
-                  {errors.transactionDate?.message}
-                </FormErrorMessage>
-              </FormControl>
-
-
-              <FormControl isInvalid={errors.ioTransType_xid} isRequired>
-                <FormLabel fontSize={"sm"}>Cash transaction</FormLabel>
-                <Controller
-                  name="ioTransType_xid"
-                  control={control}
-                  render={({ field }) => (
-                    <Select
-                      {...field}
-                      placeholder="Select an option"
-                      fontSize={"sm"}
-                      size={"sm"}
-                      focusBorderColor="forestGreen.300"
-                    >
-                      {IODetails?.ioCashTransaction?.map(({ id, transactionName }) => (
-                        <option key={id} value={id}>
-                          {transactionName}
-                        </option>
-                      ))}
-                    </Select>
-                  )}
-                />
-                <FormErrorMessage fontSize={"xs"} fontWeight={500}>
-                  {errors.ioTransType_xid?.message}
-                </FormErrorMessage>
-              </FormControl>
-
-
-
-
-              <FormControl isInvalid={errors.transactionAmount} isRequired>
-                <FormLabel fontSize={"sm"}>Transaction Amount</FormLabel>
-                <Controller
-                  name="transactionAmount"
-                  control={control}
-                  render={({ field }) => (
-                    <CurrencyInput {...field} textAlign={'right'} fontSize={"sm"} type="number" size={"sm"} />
-                  )}
-                />
-                <FormErrorMessage fontSize={"xs"} fontWeight={500}>
-                  {errors.transactionAmount?.message}
-                </FormErrorMessage>
-              </FormControl>
-
-
-
-              <FormControl isInvalid={errors.comments}>
-                <FormLabel fontSize={"sm"}>Comment</FormLabel>
-                <Controller
-                  name="comments"
-                  control={control} 
-                  render={({ field }) => (
-                    <Textarea {...field} textAlign={'left'}  
-                    maxLength={200} 
-                    focusBorderColor="forestGreen.300" fontSize={"sm"} type="text" size={"sm"} />
-                  )}
-                />
-                <FormErrorMessage fontSize={"xs"} fontWeight={500}>
-                  {errors.comments?.message}
-                </FormErrorMessage>
-                <FormHelperText fontSize="xs" color="gray.500">
-                    <Box as="span" me={1}>Maximum length should be 200 characters. You have entered </Box>
-                    {watch("comments")?.length || 0} characters.
-                  </FormHelperText>
-              </FormControl>
-
-            </Stack>
-          </DrawerBody>
-
-          <DrawerFooter>
-            <Button
-              variant="outline"
-              colorScheme={"forestGreen"}
-              rounded={"sm"}
-              size={"sm"}
-              mr={3}
-              onClick={handleClose}
-            >
-              Cancel
-            </Button>
-
-            <Button
-              colorScheme={"forestGreen"}
-              rounded={"sm"}
-              size={"sm"}
-
-              onClick={() => setAlert(true)}
-            >
-              Save
-            </Button>
-          </DrawerFooter>
-        </DrawerContent>
-      </Drawer>
-
-
-      <CustomAlertDialog
-        isOpen={alert}
-        onClose={() => setAlert(false)}
-        alertHandler={handleSave}
-        message={"Are you sure you want to add cash details?"}
-        isLoading={isLoading}
-      />
-    </>
-  );
-};
-
-export default AddCaseDetails;

src/Pages/IO_Management/CreateIO/IOCashDetails/AddPending.jsx

@@ -1,251 +0,0 @@
-import {
-  Box,
-  Button,
-  Drawer,
-  DrawerBody,
-  DrawerCloseButton,
-  DrawerContent,
-  DrawerFooter,
-  DrawerHeader,
-  DrawerOverlay,
-  FormControl,
-  FormErrorMessage,
-  FormLabel,
-  Input,
-  Select,
-  Stack,
-  Textarea,
-  useToast,
-} from "@chakra-ui/react";
-import * as yup from "yup";
-import React, { useState, useEffect, useContext } from "react";
-import { useForm, Controller } from "react-hook-form";
-import { yupResolver } from "@hookform/resolvers/yup";
-import { v4 as uuidv4 } from "uuid";
-import { useParams } from "react-router-dom";
-import CustomAlertDialog from "../../../../Components/CustomAlertDialog";
-import { useCreateIoCashMutation, useCreateVideoArtifactsMutation, useUpdateVideoArtifactsMutation } from "../../../../Services/io.service";
-import ToastBox from "../../../../Components/ToastBox";
-import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-import CurrencyInput from "../../../../Components/CurrencyInput";
-
-const cashDetails = yup.object().shape({
-  transactionDate: yup.string().required("Date is required"),
-  ioTransType_xid: yup.number().required("Cash transaction is required"),
-  transactionAmount: yup.number().required("Transaction Amount is required"),
-  comments: yup.string().notRequired(),
-});
-
-const AddPending = ({ isOpen, onClose, firstField, actionId, setActionId, data }) => {
-  const params = useParams() 
-  const id = params?.id
-  const [file, setFile] = useState("");
-  const [fileName, setFileName] = useState("");
-  const [isLoading, setIsLoading] = useState(false)
-  const [alert, setAlert] = useState(false);
-  const toast = useToast();
-
-
-
-  // ======================[ Cotext Api ]
-  const { IODetails } = useContext(GlobalStateContext);
-  const found = data?.find((item) => item?.id === actionId);
-
-
-  const [createArtifactsVideo] = useCreateVideoArtifactsMutation()
-  const [updateVideoArtifacts] = useUpdateVideoArtifactsMutation()
-  // const {
-  //   data
-  // } = useGetArtifactsQuery(id) 
-
-  const {
-    control,
-    handleSubmit,
-    watch,
-    reset,
-    formState: { errors },
-  } = useForm({
-    resolver: yupResolver(cashDetails),
-  });
-
-
-  const [createIoCash] = useCreateIoCashMutation()
-
-
-  const onSubmit = async (data) => {
-
-    setIsLoading(true)
-
-    try {
-
-      const res = await createIoCash({ data, id })
-      if (res?.data?.statusCode === 200) {
-        setIsLoading(false);
-        toast({
-          render: () => <ToastBox message={res?.data?.message} />,
-        });
-        handleClose()
-      }else if(res?.error?.status === 400){
-        setIsLoading(false);
-        toast({
-          render: () => <ToastBox message={res?.error?.data?.message } status={"error"} />,
-        });
-      }
-
-    } catch (error) {
-      console.log(error);
-    }
-
-  };
-
-
-
-  const handleConfirm = () => {
-    handleSubmit(onSubmit)();
-  };
-
-  const handleSave = () => {
-    handleSubmit(onSubmit)();
-  };
-
-  const handleClose = () => {
-    setAlert(false)
-    onClose()
-    reset({
-      transactionAmount:""
-    })
-  }
-
-  return (
-    <>
-      <Drawer
-        size={"md"}
-        isOpen={isOpen}
-        placement="right"
-        initialFocusRef={firstField}
-        onClose={handleClose}
-      >
-        <DrawerOverlay />
-        <DrawerContent>
-          <DrawerCloseButton />
-          <DrawerHeader fontSize={"sm"}>IO Cash Details</DrawerHeader>
-
-          <DrawerBody>
-            <Stack spacing={4}>
-              <FormControl isInvalid={errors.transactionDate} isRequired> 
-                <FormLabel fontSize={"sm"}>Date Selection</FormLabel>
-                <Controller
-                  name="transactionDate"
-                  control={control}
-                  render={({ field }) => (
-                    <Input 
-                    focusBorderColor="forestGreen.300" {...field} fontSize={"sm"} type="date" size={"sm"} />
-                  )}
-                />
-                <FormErrorMessage fontSize={"xs"} fontWeight={500}>
-                  {errors.transactionDate?.message}
-                </FormErrorMessage>
-              </FormControl>
-
-
-              <FormControl isInvalid={errors.ioTransType_xid} isRequired>
-                <FormLabel fontSize={"sm"}>Cash transaction</FormLabel>
-                <Controller
-                  name="ioTransType_xid"
-                  control={control}
-                  render={({ field }) => (
-                    <Select
-                      {...field}
-                      placeholder="Select an option"
-                      fontSize={"sm"}
-                      size={"sm"}
-                      focusBorderColor="forestGreen.300"
-                    >
-                      {IODetails?.ioCashTransaction?.map(({ id, transactionName }) => (
-                        <option key={id} value={id}>
-                          {transactionName}
-                        </option>
-                      ))}
-                    </Select>
-                  )}
-                />
-                <FormErrorMessage fontSize={"xs"} fontWeight={500}>
-                  {errors.ioTransType_xid?.message}
-                </FormErrorMessage>
-              </FormControl>
-
-
-
-
-              <FormControl isInvalid={errors.transactionAmount} isRequired>
-                <FormLabel fontSize={"sm"}>Transaction Amount</FormLabel>
-                <Controller
-                  name="transactionAmount"
-                  control={control}
-                  render={({ field }) => (
-                    <CurrencyInput {...field} textAlign={'right'} fontSize={"sm"} type="number" size={"sm"} />
-                  )}
-                />
-                <FormErrorMessage fontSize={"xs"} fontWeight={500}>
-                  {errors.transactionAmount?.message}
-                </FormErrorMessage>
-              </FormControl>
-
-
-
-              <FormControl isInvalid={errors.comments}>
-                <FormLabel fontSize={"sm"}>Comments</FormLabel>
-                <Controller
-                  name="comments"
-                  control={control}
-                  render={({ field }) => (
-                    <Textarea {...field} textAlign={'left'} 
-                    focusBorderColor="forestGreen.300" fontSize={"sm"} type="text" size={"sm"} />
-                  )}
-                />
-                <FormErrorMessage fontSize={"xs"} fontWeight={500}>
-                  {errors.comments?.message}
-                </FormErrorMessage>
-              </FormControl>
-
-            </Stack>
-          </DrawerBody>
-
-          <DrawerFooter>
-            <Button
-              variant="outline"
-              colorScheme={"forestGreen"}
-              rounded={"sm"}
-              size={"sm"}
-              mr={3}
-              onClick={handleClose}
-            >
-              Cancel
-            </Button>
-
-            <Button
-              colorScheme={"forestGreen"}
-              rounded={"sm"}
-              size={"sm"}
-
-              onClick={() => setAlert(true)}
-            >
-              Save
-            </Button>
-          </DrawerFooter>
-        </DrawerContent>
-      </Drawer>
-
-
-      <CustomAlertDialog
-        isOpen={alert}
-        onClose={() => setAlert(false)}
-        alertHandler={handleSave}
-        message={"Are you sure you want to add cash details?"}
-        isLoading={isLoading}
-      />
-    </>
-  );
-};
-
-export default AddPending;

src/Pages/IO_Management/CreateIO/IOCashDetails/AddRejected.jsx

@@ -1,251 +0,0 @@
-import {
-  Box,
-  Button,
-  Drawer,
-  DrawerBody,
-  DrawerCloseButton,
-  DrawerContent,
-  DrawerFooter,
-  DrawerHeader,
-  DrawerOverlay,
-  FormControl,
-  FormErrorMessage,
-  FormLabel,
-  Input,
-  Select,
-  Stack,
-  Textarea,
-  useToast,
-} from "@chakra-ui/react";
-import * as yup from "yup";
-import React, { useState, useEffect, useContext } from "react";
-import { useForm, Controller } from "react-hook-form";
-import { yupResolver } from "@hookform/resolvers/yup";
-import { v4 as uuidv4 } from "uuid";
-import { useParams } from "react-router-dom";
-import CustomAlertDialog from "../../../../Components/CustomAlertDialog";
-import { useCreateIoCashMutation, useCreateVideoArtifactsMutation, useUpdateVideoArtifactsMutation } from "../../../../Services/io.service";
-import ToastBox from "../../../../Components/ToastBox";
-import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-import CurrencyInput from "../../../../Components/CurrencyInput";
-
-const cashDetails = yup.object().shape({
-  transactionDate: yup.string().required("Date is required"),
-  ioTransType_xid: yup.number().required("Cash transaction is required"),
-  transactionAmount: yup.number().required("Transaction Amount is required"),
-  comments: yup.string().notRequired(),
-});
-
-const AddRejected = ({ isOpen, onClose, firstField, actionId, setActionId, data }) => {
-  const params = useParams() 
-  const id = params?.id
-  const [file, setFile] = useState("");
-  const [fileName, setFileName] = useState("");
-  const [isLoading, setIsLoading] = useState(false)
-  const [alert, setAlert] = useState(false);
-  const toast = useToast();
-
-
-
-  // ======================[ Cotext Api ]
-  const { IODetails } = useContext(GlobalStateContext);
-  const found = data?.find((item) => item?.id === actionId);
-
-
-  const [createArtifactsVideo] = useCreateVideoArtifactsMutation()
-  const [updateVideoArtifacts] = useUpdateVideoArtifactsMutation()
-  // const {
-  //   data
-  // } = useGetArtifactsQuery(id) 
-
-  const {
-    control,
-    handleSubmit,
-    watch,
-    reset,
-    formState: { errors },
-  } = useForm({
-    resolver: yupResolver(cashDetails),
-  });
-
-
-  const [createIoCash] = useCreateIoCashMutation()
-
-
-  const onSubmit = async (data) => {
-
-    setIsLoading(true)
-
-    try {
-
-      const res = await createIoCash({ data, id })
-      if (res?.data?.statusCode === 200) {
-        setIsLoading(false);
-        toast({
-          render: () => <ToastBox message={res?.data?.message} />,
-        });
-        handleClose()
-      }else if(res?.error?.status === 400){
-        setIsLoading(false);
-        toast({
-          render: () => <ToastBox message={res?.error?.data?.message } status={"error"} />,
-        });
-      }
-
-    } catch (error) {
-      console.log(error);
-    }
-
-  };
-
-
-
-  const handleConfirm = () => {
-    handleSubmit(onSubmit)();
-  };
-
-  const handleSave = () => {
-    handleSubmit(onSubmit)();
-  };
-
-  const handleClose = () => {
-    setAlert(false)
-    onClose()
-    reset({
-      transactionAmount:""
-    })
-  }
-
-  return (
-    <>
-      <Drawer
-        size={"md"}
-        isOpen={isOpen}
-        placement="right"
-        initialFocusRef={firstField}
-        onClose={handleClose}
-      >
-        <DrawerOverlay />
-        <DrawerContent>
-          <DrawerCloseButton />
-          <DrawerHeader fontSize={"sm"}>IO Cash Details</DrawerHeader>
-
-          <DrawerBody>
-            <Stack spacing={4}>
-              <FormControl isInvalid={errors.transactionDate} isRequired> 
-                <FormLabel fontSize={"sm"}>Date Selection</FormLabel>
-                <Controller
-                  name="transactionDate"
-                  control={control}
-                  render={({ field }) => (
-                    <Input 
-                    focusBorderColor="forestGreen.300" {...field} fontSize={"sm"} type="date" size={"sm"} />
-                  )}
-                />
-                <FormErrorMessage fontSize={"xs"} fontWeight={500}>
-                  {errors.transactionDate?.message}
-                </FormErrorMessage>
-              </FormControl>
-
-
-              <FormControl isInvalid={errors.ioTransType_xid} isRequired>
-                <FormLabel fontSize={"sm"}>Cash transaction</FormLabel>
-                <Controller
-                  name="ioTransType_xid"
-                  control={control}
-                  render={({ field }) => (
-                    <Select
-                      {...field}
-                      placeholder="Select an option"
-                      fontSize={"sm"}
-                      size={"sm"}
-                      focusBorderColor="forestGreen.300"
-                    >
-                      {IODetails?.ioCashTransaction?.map(({ id, transactionName }) => (
-                        <option key={id} value={id}>
-                          {transactionName}
-                        </option>
-                      ))}
-                    </Select>
-                  )}
-                />
-                <FormErrorMessage fontSize={"xs"} fontWeight={500}>
-                  {errors.ioTransType_xid?.message}
-                </FormErrorMessage>
-              </FormControl>
-
-
-
-
-              <FormControl isInvalid={errors.transactionAmount} isRequired>
-                <FormLabel fontSize={"sm"}>Transaction Amount</FormLabel>
-                <Controller
-                  name="transactionAmount"
-                  control={control}
-                  render={({ field }) => (
-                    <CurrencyInput {...field} textAlign={'right'} fontSize={"sm"} type="number" size={"sm"} />
-                  )}
-                />
-                <FormErrorMessage fontSize={"xs"} fontWeight={500}>
-                  {errors.transactionAmount?.message}
-                </FormErrorMessage>
-              </FormControl>
-
-
-
-              <FormControl isInvalid={errors.comments}>
-                <FormLabel fontSize={"sm"}>Comments</FormLabel>
-                <Controller
-                  name="comments"
-                  control={control}
-                  render={({ field }) => (
-                    <Textarea {...field} textAlign={'left'} 
-                    focusBorderColor="forestGreen.300" fontSize={"sm"} type="text" size={"sm"} />
-                  )}
-                />
-                <FormErrorMessage fontSize={"xs"} fontWeight={500}>
-                  {errors.comments?.message}
-                </FormErrorMessage>
-              </FormControl>
-
-            </Stack>
-          </DrawerBody>
-
-          <DrawerFooter>
-            <Button
-              variant="outline"
-              colorScheme={"forestGreen"}
-              rounded={"sm"}
-              size={"sm"}
-              mr={3}
-              onClick={handleClose}
-            >
-              Cancel
-            </Button>
-
-            <Button
-              colorScheme={"forestGreen"}
-              rounded={"sm"}
-              size={"sm"}
-
-              onClick={() => setAlert(true)}
-            >
-              Save
-            </Button>
-          </DrawerFooter>
-        </DrawerContent>
-      </Drawer>
-
-
-      <CustomAlertDialog
-        isOpen={alert}
-        onClose={() => setAlert(false)}
-        alertHandler={handleSave}
-        message={"Are you sure you want to add cash details?"}
-        isLoading={isLoading}
-      />
-    </>
-  );
-};
-
-export default AddRejected;

src/Pages/IO_Management/CreateIO/IOCashDetails/Approved.jsx

@@ -1,397 +0,0 @@
-import {
-  Avatar,
-  Badge,
-  Box,
-  Button,
-  HStack,
-  Input,
-  Table,
-  Tag,
-  Tbody,
-  Text,
-  Th,
-  Tooltip,
-  Tr,
-  useDisclosure,
-  useToast,
-} from "@chakra-ui/react";
-import React, { useContext, useEffect, useRef, useState } from "react";
-import { AddIcon, DeleteIcon, EditIcon, ViewIcon } from "@chakra-ui/icons";
-import { LuFileSpreadsheet } from "react-icons/lu";
-import * as XLSX from "xlsx";
-import { OPACITY_ON_LOAD } from "../../../../Layout/animations";
-import NormalTable from "../../../../Components/DataTable/NormalTable";
-import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-import CustomAlertDialog from "../../../../Components/CustomAlertDialog";
-import ToastBox from "../../../../Components/ToastBox";
-import AddCashDetails from "../AddCashDetails";
-import { debounce } from "../../../Admin/Contact";
-import AddApproved from "./AddCaseDetails";
-import { useUpdateIOCaseMutation } from "../../../../Services/io.service";
-import { useParams } from "react-router-dom";
-import AddCaseDetails from "./AddCaseDetails";
-
-const formatDate = (date) => new Date(date).toLocaleDateString();
-
-const Approved = () => {
-  const firstField = useRef();
-  const params = useParams();
-  const toast = useToast();
-  const id = params?.id;
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const { IODetails, approved, setApproved } = useContext(GlobalStateContext);
-  const [searchTerm, setSearchTerm] = useState("");
-  const [isLoading, setIsLoading] = useState(true);
-  const [deleteAlert, setDeleteAlert] = useState(false);
-  const [actionId, setActionId] = useState(false);
-  const [mouseEntered, setMouseEntered] = useState(false);
-  const [mouseEnteredId, setMouseEnteredId] = useState("");
-
-  useEffect(() => {
-    // Simulate loading
-    const timer = setTimeout(() => {
-      setIsLoading(false);
-    }, 1500);
-
-    // Cleanup the timer on component unmount
-    return () => clearTimeout(timer);
-  }, []);
-
-  const formatDate = (date) => {
-    return new Date(date).toLocaleDateString("en-GB", {
-      day: "2-digit",
-      month: "2-digit",
-      year: "numeric",
-    });
-  };
-
-  console.log("==============", IODetails?.ioCashStatusHistory?.Approved);
-
-  // Table filter
-  const filteredData = IODetails?.ioCashStatusHistory?.Approved?.filter(
-    (item) => {
-      // Filter by name (case insensitive)
-      const name = item.transactionDate;
-      const searchLower = searchTerm.toLowerCase();
-      const nameMatches = name.toLowerCase().includes(searchLower);
-      return nameMatches;
-    }
-  );
-
-  const [updateIOCase] = useUpdateIOCaseMutation();
-
-  const tableHeadRow = [
-    "Sr No.",
-    "Transaction Date",
-    "Transaction Type",
-    "Amount",
-    "Comments",
-    "Update By",
-    "Update On",
-  ];
-
-  const extractedArray = filteredData?.map((item, index) => ({
-    id: item?.id,
-    "Sr No.": (
-      <Text as={"span"} color={"gray.800"} fontWeight={"500"}>
-        {index + 1}.
-      </Text>
-    ),
-    "Transaction Date": (
-      <Text as={"span"} color={"gray.600"} fontWeight={"500"}>
-        {formatDate(item?.transactionDate)}
-      </Text>
-    ),
-    "Transaction Type": (
-      <Text as={"span"} color={"gray.600"} fontWeight={"500"}>
-        {item?.transactionType}
-      </Text>
-    ),
-    Amount: (
-      <Text as={"span"} color={"gray.800"} fontWeight={"500"}>
-        <Badge ms={1} colorScheme="green" me={1}>
-          $
-        </Badge>
-        {parseFloat(item?.transactionAmount || 0).toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
-      </Text>
-    ),
-    Comments: (
-      <Text w={"100px"} as={"span"} color={"gray.800"} fontWeight={"500"}>
-        {item?.comments ? item?.comments : "---"}
-      </Text>
-    ),
-    "Update By": (
-      <Text
-        w={"100px"}
-        as={"span"}
-        color={"gray.800"}
-        fontWeight={"500"}
-        display={"flex"}
-        alignItems={"center"}
-      >
-        {/* <Avatar
-          mr={2}
-          size="sm"
-          name={item.creator?.firstName}
-          src={item.creator?.profilePhoto}
-        /> */}
-        {item?.modifier?.firstName}
-      </Text>
-    ),
-    "Update On": (
-      <Text w={"100px"} as={"span"} color={"gray.800"} fontWeight={"500"}>
-        {formatDate(item.updatedAt)}
-      </Text>
-    ),
-  }));
-
-  const handleDelete = () => {
-    const updatedSponsors = sponser.filter(
-      (sponsor) => sponsor.id !== actionId
-    );
-
-    setTimeout(() => {
-      setCaseDetails(updatedSponsors);
-      setDeleteAlert(false);
-      setIsLoading(false);
-    }, 100);
-    setIsLoading(true);
-  };
-
-  const ioCashExporteDetails = IODetails?.ioCashStatusHistory?.Approved?.map(
-    (item, index) => ({
-      "Transaction date": item?.transactionDate,
-      "Transaction type": item?.transactionType,
-      Amount: parseFloat(item?.transactionAmount) || 0,
-      Comments: item?.comments,
-    })
-  );
-
-  const exportToExcelNew = (data, fileName) => {
-    const worksheet = XLSX.utils.json_to_sheet(data);
-    const workbook = XLSX.utils.book_new();
-    XLSX.utils.book_append_sheet(workbook, worksheet, "Sheet1");
-
-    // Export file
-    XLSX.writeFile(workbook, `${fileName}.xlsx`);
-  };
-
-  const Total = () => {
-    return (
-      <Table size="sm">
-        <Tbody backgroundColor="gray.50">
-          <Tr>
-            <Th
-              textAlign={"center"}
-              p={3}
-              width="200px"
-              color={"#004118"}
-              whiteSpace="normal"
-              wordBreak="normal"
-              overflowWrap="normal"
-            >
-              Balance in IO Cash
-            </Th>
-            <Th
-              textAlign={"center"}
-              p={3}
-              width="120px"
-              color={"#004118"}
-              whiteSpace="normal"
-              wordBreak="normal"
-              overflowWrap="normal"
-            >
-              {" "}
-            </Th>
-            <Th
-              textAlign={"center"}
-              p={3}
-              width="120px"
-              color={"#004118"}
-              whiteSpace="normal"
-              wordBreak="normal"
-              overflowWrap="normal"
-            >
-              {" "}
-            </Th>
-            <Th
-              textAlign={"center"}
-              p={3}
-              width="140px"
-              color={"#004118"}
-              whiteSpace="normal"
-              wordBreak="normal"
-              overflowWrap="normal"
-            >
-              <Badge ms={1} colorScheme="green" me={1}>
-                $
-              </Badge>
-              {/* {IODetails?.ioCash} */}
-              {parseFloat(IODetails?.ioCash || 0).toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
-            </Th>
-            <Th
-              textAlign={"center"}
-              p={3}
-              width="120px"
-              color={"#004118"}
-              whiteSpace="normal"
-              wordBreak="normal"
-              overflowWrap="normal"
-            >
-              {}
-            </Th>
-            <Th
-              textAlign={"center"}
-              p={3}
-              width="100px"
-              color={"#004118"}
-              whiteSpace="normal"
-              wordBreak="normal"
-              overflowWrap="normal"
-            >
-              {" "}
-            </Th>
-            <Th
-              textAlign={"center"}
-              p={3}
-              width="100px"
-              color={"#004118"}
-              whiteSpace="normal"
-              wordBreak="normal"
-              overflowWrap="normal"
-            ></Th>
-            <Th
-              textAlign={"center"}
-              p={3}
-              width="100px"
-              color={"#004118"}
-              whiteSpace="normal"
-              wordBreak="normal"
-              overflowWrap="normal"
-            ></Th>
-          </Tr>
-        </Tbody>
-      </Table>
-    );
-  };
-
-  const handleAdd = async () => {
-    try {
-      const res = await updateIOCase(id);
-      if (res?.data) {
-        // toast({
-        //   render: () => (
-        //     <ToastBox status={"success"} message={res?.data?.message} />
-        //   ),
-        // });
-        setIsLoading(false);
-        onOpen();
-      } else if (res?.error) {
-        toast({
-          render: () => (
-            <ToastBox status={"error"} message={res?.error?.data?.message} />
-          ),
-        });
-        setIsLoading(false);
-      }
-    } catch (error) {}
-  };
-
-  return (
-    <Box {...OPACITY_ON_LOAD} pb={0}>
-      <Box bg="white.500">
-        <HStack
-          display={"flex"}
-          justifyContent={"space-between"}
-          pb={3}
-          spacing="24px"
-        >
-          <Input
-            type="search"
-            width={300}
-            placeholder="Search..."
-            size="sm"
-            rounded="sm"
-            focusBorderColor="green.500"
-            value={searchTerm}
-            onChange={(e) => setSearchTerm(e.target.value)}
-          />
-          
-          <HStack display={"flex"} alignItems={"center"}>
-            <Button
-              onClick={() =>
-                exportToExcelNew(ioCashExporteDetails, "IO Cash History")
-              }
-              leftIcon={<LuFileSpreadsheet />}
-              colorScheme="forestGreen"
-              size={"sm"}
-              variant={"outline"}
-              rounded={"sm"}
-              fontSize={"xs"}
-              isDisabled={ioCashExporteDetails?.length === 0}
-            >
-              Export xls
-            </Button>
-            {/* <Button
-              onClick={onOpen}
-              leftIcon={<AddIcon />}
-              colorScheme={"forestGreen"}
-              rounded={"sm"}
-              fontSize={"xs"}
-              size={"sm"}
-              fontWeight={500}
-            >
-              Add
-            </Button> */}
-            {/* {IODetails?.isInvestedAmount ? (
-              localStorage?.getItem('role') ==="Maker" && <Button
-                onClick={handleAdd}
-                leftIcon={<AddIcon />}
-                colorScheme="forestGreen"
-                size={"sm"}
-                rounded={"sm"}
-                fontSize={"xs"}
-              >
-                Add
-              </Button>
-            ) : null} */}
-          </HStack>
-        </HStack>
-      </Box>
-
-      <NormalTable
-        emptyMessage={`We don't have any Sponers`}
-        tableHeadRow={tableHeadRow}
-        data={extractedArray}
-        isLoading={isLoading}
-        viewActionId={actionId}
-        setViewActionId={setActionId}
-        total={<Total />}
-        setMouseEnteredId={setMouseEnteredId}
-        setMouseEntered={setMouseEntered}
-      />
-
-      {/* <CustomAlertDialog
-        onClose={() => setDeleteAlert(false)}
-        isOpen={deleteAlert}
-        message={"Are you sure you want to delete sponers?"}
-        alertHandler={handleDelete}
-        isLoading={isLoading}
-      /> */}
-
-      <AddCaseDetails
-        isOpen={isOpen}
-        onClose={onClose}
-        firstField={firstField}
-      />
-    </Box>
-  );
-};
-
-export default Approved;

src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx

@@ -1,145 +0,0 @@
-import {
-  Badge,
-  Box,
-  Button,
-  Tab,
-  TabList,
-  TabPanel,
-  TabPanels,
-  Tabs,
-  useDisclosure,
-  useToast,
-} from "@chakra-ui/react";
-import React, { useContext, useRef, useState } from "react";
-import Approved from "./Approved";
-import Pending from "./Pending";
-import Rejected from "./Rejected";
-import { AddIcon } from "@chakra-ui/icons";
-import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-import AddCaseDetails from "./AddCaseDetails";
-import { useUpdateIOCaseMutation } from "../../../../Services/io.service";
-import ToastBox from "../../../../Components/ToastBox";
-import { useParams } from "react-router-dom";
-import { encryptString } from "../../../../Constants/Constants";
-
-const IOCashDetails = () => {
-  const params = useParams();
-  const toast = useToast();
-  const id = params?.id;
-  const { IODetails } = useContext(GlobalStateContext);
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const firstField = useRef();
-
-  const [updateIOCase] = useUpdateIOCaseMutation();
-  const [activeTab, setActiveTab] = useState(0);
-
-  const handleAdd = async () => {
-    try {
-      const res = await updateIOCase(id);
-      if (res?.data) {
-        // toast({
-        //   render: () => (
-        //     <ToastBox status={"success"} message={"res?.data?.message"} />
-        //   ),
-        // });
-        // setIsLoading(false);
-        onOpen();
-      } else if (res?.error) {
-        toast({
-          render: () => (
-            <ToastBox status={"error"} message={res?.error?.data?.message} />
-          ),
-        });
-        setIsLoading(false);
-      }
-    } catch (error) {}
-  };
-
-  return (
-    <Box>
-      <Tabs
-        index={activeTab}
-        onChange={(index) => setActiveTab(index)}
-        variant="unstyled"
-      >
-        <Box
-          display={"flex"}
-          justifyContent={"space-between"}
-          alignItems={"center"}
-          borderBottom={"1px solid #ccc"}
-        >
-          <TabList>
-            <Tab
-              fontSize={"sm"}
-              _selected={{
-                color: "#004118",
-                borderBottom: "2px solid #38a169",
-              }}
-            >
-              Approved
-            </Tab>
-            <Tab
-              fontSize={"sm"}
-              _selected={{
-                color: "#004118",
-                borderBottom: "2px solid #38a169",
-              }}
-            >
-              Pending
-              {IODetails?.ioCashStatusHistory?.Pending.length > 0 && (
-                <Badge rounded={"sm"} colorScheme="forestGreen" ms={2}>
-                  {IODetails?.ioCashStatusHistory?.Pending.length !== 0 && IODetails?.ioCashStatusHistory?.Pending.length}
-                </Badge>
-              )}
-              {/* <Badge rounded={"sm"} colorScheme="forestGreen" ms={2}>
-                {IODetails?.ioCashStatusHistory?.Pending.length || 0}
-              </Badge> */}
-            </Tab>
-            <Tab
-              fontSize={"sm"}
-              _selected={{
-                color: "#004118",
-                borderBottom: "2px solid #38a169",
-              }}
-            >
-              Rejected
-            </Tab>
-          </TabList>
-          {IODetails?.isInvestedAmount
-            ? localStorage?.getItem("role") === encryptString(import.meta.env.VITE_VITE_MAKER) && (
-                <Button
-                  onClick={handleAdd}
-                  leftIcon={<AddIcon />}
-                  colorScheme="forestGreen"
-                  size={"sm"}
-                  rounded={"sm"}
-                  fontSize={"xs"}
-                >
-                  Add
-                </Button>
-              )
-            : null}
-        </Box>
-        <TabPanels>
-          <TabPanel>
-            <Approved />
-          </TabPanel>
-          <TabPanel>
-            <Pending />
-          </TabPanel>
-          <TabPanel>
-            <Rejected />
-          </TabPanel>
-        </TabPanels>
-      </Tabs>
-      <AddCaseDetails
-        setActiveTab={setActiveTab}
-        isOpen={isOpen}
-        onClose={onClose}
-        firstField={firstField}
-      />
-    </Box>
-  );
-};
-
-export default IOCashDetails;

src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx

@@ -1,466 +0,0 @@
-import {
-  Avatar,
-  Badge,
-  Box,
-  Button,
-  HStack,
-  Input,
-  Table,
-  Tag,
-  Tbody,
-  Text,
-  Th,
-  Tooltip,
-  Tr,
-  useDisclosure,
-  useToast,
-} from "@chakra-ui/react";
-import React, { useContext, useEffect, useRef, useState } from "react";
-import {
-  AddIcon,
-  CheckIcon,
-  CloseIcon,
-  DeleteIcon,
-  EditIcon,
-  ViewIcon,
-} from "@chakra-ui/icons";
-import { LuFileSpreadsheet } from "react-icons/lu";
-import { OPACITY_ON_LOAD } from "../../../../Layout/animations";
-import NormalTable from "../../../../Components/DataTable/NormalTable";
-import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-import CustomAlertDialog from "../../../../Components/CustomAlertDialog";
-import ToastBox from "../../../../Components/ToastBox";
-import AddCashDetails from "../AddCashDetails";
-import { debounce } from "../../../Admin/Contact";
-import AddPending from "./AddPending";
-import { useParams } from "react-router-dom";
-import { useUpdateIOCaseMutation } from "../../../../Services/io.service";
-import RequestApproveModal from "./RequestApproveModal";
-import RequestRejectModal from "./RequestRejectModal";
-import AddCaseDetails from "./AddCaseDetails";
-import { encryptString } from "../../../../Constants/Constants";
-
-const formatDate = (date) => new Date(date).toLocaleDateString();
-
-const Pending = () => {
-  const toast = useToast();
-  const params = useParams();
-  const id = params?.id;
-  const firstField = useRef();
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const { IODetails, approved, setApproved } = useContext(GlobalStateContext);
-  const [searchTerm, setSearchTerm] = useState("");
-  const [isLoading, setIsLoading] = useState(true);
-  const [deleteAlert, setDeleteAlert] = useState(false);
-  const [actionId, setActionId] = useState(false);
-  const [mouseEntered, setMouseEntered] = useState(false);
-  const [mouseEnteredId, setMouseEnteredId] = useState("");
-
-  const [updateIOCase] = useUpdateIOCaseMutation();
-  const {
-    isOpen: isConfirmOpen,
-    onOpen: onConfirmOpen,
-    onClose: onConfirmClose,
-  } = useDisclosure();
-  const {
-    isOpen: isRejectOpen,
-    onOpen: onRejectOpen,
-    onClose: onRejectClose,
-  } = useDisclosure();
-
-  useEffect(() => {
-    // Simulate loading
-    const timer = setTimeout(() => {
-      setIsLoading(false);
-    }, 1500);
-
-    // Cleanup the timer on component unmount
-    return () => clearTimeout(timer);
-  }, []);
-
-  const formatDate = (date) => {
-    return new Date(date).toLocaleDateString("en-GB", {
-      day: "2-digit",
-      month: "2-digit",
-      year: "numeric",
-    });
-  };
-
-  // Table filter
-  const filteredData = IODetails?.ioCashStatusHistory?.Pending?.filter(
-    (item) => {
-      // Filter by name (case insensitive)
-      const name = item?.transactionDate;
-      const searchLower = searchTerm?.toLowerCase();
-      const nameMatches = name?.toLowerCase().includes(searchLower);
-      return nameMatches;
-    }
-  );
-
-  const tableHeadRow = [
-    "Sr No.",
-    "Transaction Date",
-    "Transaction Type",
-    "Amount",
-    "Comments",
-    "Update By",
-    "Update On",
-    ...(localStorage?.getItem('role')!==encryptString(import.meta.env.VITE_VITE_MAKER) ? ["Actions"] : []),
-    
-  ];
-
-  const extractedArray = filteredData?.map((item, index) => ({
-    id: item?.id,
-    "Sr No.": (
-      <Text as={"span"} color={"gray.800"} fontWeight={"500"}>
-        {index + 1}.
-      </Text>
-    ),
-    "Transaction Date": (
-      <Text as={"span"} color={"gray.600"} fontWeight={"500"}>
-        {formatDate(item?.transactionDate)}
-      </Text>
-    ),
-    "Transaction Type": (
-      <Text as={"span"} color={"gray.600"} fontWeight={"500"}>
-        {item?.transactionType}
-      </Text>
-    ),
-    Amount: (
-      <Text as={"span"} color={"gray.800"} fontWeight={"500"}>
-        <Badge ms={1} colorScheme="green" me={1}>
-          $
-        </Badge>
-        {parseFloat(item?.transactionAmount || 0).toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
-      </Text>
-    ),
-    Comments: (
-      <Text w={"100px"} as={"span"} color={"gray.800"} fontWeight={"500"}>
-        {item?.comments}
-      </Text>
-    ),
-    "Update By": (
-      <Text
-        w={"100px"}
-        as={"span"}
-        color={"gray.800"}
-        fontWeight={"500"}
-        display={"flex"}
-        alignItems={"center"}
-      >
-        {/* <Avatar
-          mr={2}
-          size="sm"
-          name={item?.creator?.firstName}
-          src={item?.creator?.profilePhoto}
-        /> */}
-        {item?.modifier?.firstName}
-      </Text>
-    ),
-    "Update On": (
-      <Text w={"100px"} as={"span"} color={"gray.800"} fontWeight={"500"}>
-        {formatDate(item.updatedAt)}
-      </Text>
-    ),
-    Actions: (
-      <Box display={"flex"} justifyContent={"center"}>
-        {localStorage?.getItem("role") !== encryptString(import.meta.env.VITE_VITE_MAKER)  ? <Box>
-          {index===0&&<Box display={"flex"} justifyContent={"center"} gap={2}>
-        <Tooltip
-          rounded={"sm"}
-          fontSize={"xs"}
-          label="Approve"
-          bg="#fff"
-          color={"green.500"}
-          placement="left-start"
-        >
-          <Button
-            // colorScheme="forestGreen"
-            // color="green.500"
-            rounded={"sm"}
-            size={"xs"}
-            textTransform={"inherit"}
-            fontWeight={500}
-            px={2}
-            py={1}
-            onClick={() => {
-              setActionId(item.id);
-              onConfirmOpen();
-            }}
-            colorScheme="green"
-            variant={"solid"}
-            cursor={"pointer"}
-          >
-            <CheckIcon fontSize={"12px"} />
-          </Button>
-        </Tooltip>
-        <Tooltip
-          rounded={"sm"}
-          fontSize={"xs"}
-          label="Reject"
-          bg="#fff"
-          color={"red.500"}
-          placement="left-start"
-        >
-          <Button
-            colorScheme="red"
-            // color="red.500"
-            rounded={"sm"}
-            size={"xs"}
-            textTransform={"inherit"}
-            fontWeight={500}
-            px={2}
-            onClick={() => {
-              setActionId(item.id);
-              onRejectOpen();
-            }}
-            py={1}
-            // variant={"solid"}
-          >
-            <CloseIcon fontSize={"10px"} />
-          </Button>
-        </Tooltip></Box>}
-        
-        </Box> : <Button
-            colorScheme="green"
-            rounded={"sm"}
-            size={"xs"}
-            px={2}
-            py={1}
-            fontWeight={500}
-            onClick={() => {
-              setActionId(item.id);
-            }}
-          >
-            <ViewIcon me={"4px"} /> View
-          </Button>}
-      </Box>
-    ),
-  }));
-
-  const handleDelete = () => {
-    const updatedSponsors = sponser.filter(
-      (sponsor) => sponsor.id !== actionId
-    );
-
-    setTimeout(() => {
-      setCaseDetails(updatedSponsors);
-      setDeleteAlert(false);
-      setIsLoading(false);
-    }, 100);
-    setIsLoading(true);
-  };
-
-  const ioCashExporteDetails = IODetails?.ioCashStatusHistory?.Approved?.map(
-    (item, index) => ({
-      "Transaction date": item?.transactionDate,
-      "Transaction type": item?.transactionType,
-      Amount: parseFloat(item?.transactionAmount) || 0,
-      Comments: item?.comments,
-    })
-  );
-
-  const Total = () => {
-    return (
-      <Table size="sm">
-        <Tbody backgroundColor="gray.50">
-          <Tr>
-            <Th
-              textAlign={"center"}
-              p={3}
-              width="130px"
-              color={"#004118"}
-              whiteSpace="normal"
-              wordBreak="normal"
-              overflowWrap="normal"
-            >
-              Balance in IO Cash
-            </Th>
-            <Th
-              textAlign={"center"}
-              p={3}
-              width="150px"
-              color={"#004118"}
-              whiteSpace="normal"
-              wordBreak="normal"
-              overflowWrap="normal"
-            >
-              {" "}
-            </Th>
-            <Th
-              textAlign={"center"}
-              p={3}
-              width="150px"
-              color={"#004118"}
-              whiteSpace="normal"
-              wordBreak="normal"
-              overflowWrap="normal"
-            >
-              {}
-            </Th>
-            <Th
-              textAlign={"center"}
-              p={3}
-              width="100px"
-              color={"#004118"}
-              whiteSpace="normal"
-              wordBreak="normal"
-              overflowWrap="normal"
-            >
-              <Badge ms={1} colorScheme="green" me={1}>
-                $
-              </Badge>
-              {parseFloat(IODetails?.ioCash || 0).toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
-            </Th>
-            <Th
-              textAlign={"center"}
-              p={3}
-              width="100px"
-              color={"#004118"}
-              whiteSpace="normal"
-              wordBreak="normal"
-              overflowWrap="normal"
-            >
-              {" "}
-            </Th>
-            <Th
-              textAlign={"center"}
-              p={3}
-              width="100px"
-              color={"#004118"}
-              whiteSpace="normal"
-              wordBreak="normal"
-              overflowWrap="normal"
-            ></Th>
-            <Th
-              textAlign={"center"}
-              p={3}
-              width="80px"
-              color={"#004118"}
-              whiteSpace="normal"
-              wordBreak="normal"
-              overflowWrap="normal"
-            ></Th>
-            <Th
-              textAlign={"center"}
-              p={3}
-              width="50px"
-              color={"#004118"}
-              whiteSpace="normal"
-              wordBreak="normal"
-              overflowWrap="normal"
-            ></Th>
-          </Tr>
-        </Tbody>
-      </Table>
-    );
-  };
-
-  const handleAdd = async () => {
-    try {
-      const res = await updateIOCase(id);
-      if (res?.data) {
-        // toast({
-        //   render: () => (
-        //     <ToastBox status={"success"} message={res?.data?.message} />
-        //   ),
-        // });
-        setIsLoading(false);
-        onOpen();
-      } else if (res?.error) {
-        toast({
-          render: () => (
-            <ToastBox status={"error"} message={res?.error?.data?.message} />
-          ),
-        });
-        setIsLoading(false);
-      }
-    } catch (error) {}
-  };
-
-  return (
-    <Box {...OPACITY_ON_LOAD} pb={0}>
-      <Box bg="white.500">
-        <HStack
-          display={"flex"}
-          justifyContent={"space-between"}
-          pb={3}
-          spacing="24px"
-        >
-          <Input
-            type="search"
-            width={300}
-            placeholder="Search..."
-            size="sm"
-            rounded="sm"
-            focusBorderColor="green.500"
-            value={searchTerm}
-            onChange={(e) => setSearchTerm(e.target.value)}
-          />
-
-          {/* <HStack display={"flex"} alignItems={"center"}>
-            {IODetails?.isInvestedAmount ? (
-              localStorage?.getItem('role') ==="Maker"&& <Button
-                onClick={handleAdd}
-                leftIcon={<AddIcon />}
-                colorScheme="forestGreen"
-                size={"sm"}
-                rounded={"sm"}
-                fontSize={"xs"}
-              >
-                Add
-              </Button>
-            ) : null}
-          </HStack> */}
-        </HStack>
-      </Box>
-
-      <NormalTable
-        emptyMessage={`We don't have any Sponers`}
-        tableHeadRow={tableHeadRow}
-        data={extractedArray}
-        isLoading={isLoading}
-        viewActionId={actionId}
-        setViewActionId={setActionId}
-        // total={<Total />}
-        setMouseEnteredId={setMouseEnteredId}
-        setMouseEntered={setMouseEntered}
-      />
-
-      <CustomAlertDialog
-        onClose={() => setDeleteAlert(false)}
-        isOpen={deleteAlert}
-        message={"Are you sure you want to delete sponers?"}
-        alertHandler={handleDelete}
-        isLoading={isLoading}
-      />
-
-      <AddCaseDetails
-        isOpen={isOpen}
-        onClose={onClose}
-        firstField={firstField}
-      />
-
-      <RequestApproveModal
-        // data={data?.data?.rows}
-        isOpen={isConfirmOpen}
-        onClose={onConfirmClose}
-        id={actionId}
-        // firstField={firstField}
-      />
-      <RequestRejectModal
-        isOpen={isRejectOpen}
-        onClose={onRejectClose}
-        id={actionId}
-      />
-    </Box>
-  );
-};
-
-export default Pending;

src/Pages/IO_Management/CreateIO/IOCashDetails/Rejected.jsx

@@ -1,357 +0,0 @@
-import {
-    Avatar,
-    Badge,
-    Box,
-    Button,
-    HStack,
-    Input,
-    Table,
-    Tag,
-    Tbody,
-    Text,
-    Th,
-    Tooltip,
-    Tr,
-    useDisclosure,
-    useToast,
-  } from "@chakra-ui/react";
-  import React, { useContext, useEffect, useRef, useState } from "react";
-  import { AddIcon} from "@chakra-ui/icons";
-  import { OPACITY_ON_LOAD } from "../../../../Layout/animations";
-  import NormalTable from "../../../../Components/DataTable/NormalTable";
-  import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-  import CustomAlertDialog from "../../../../Components/CustomAlertDialog";
-  import AddCashDetails from "../AddCashDetails";
-import AddRejected from "./AddRejected";
-import { useUpdateIOCaseMutation } from "../../../../Services/io.service";
-import { useParams } from "react-router-dom";
-import ToastBox from "../../../../Components/ToastBox";
-import AddCaseDetails from "./AddCaseDetails";
-  
-  const formatDate = (date) => new Date(date).toLocaleDateString();
-  
-  const Rejected = () => {
-    const params = useParams()
-    const id = params?.id
-    const toast = useToast();
-    const firstField = useRef();
-    const { isOpen, onOpen, onClose } = useDisclosure();
-    const { IODetails, approved, setApproved } =
-      useContext(GlobalStateContext);
-    const [searchTerm, setSearchTerm] = useState("");
-    const [isLoading, setIsLoading] = useState(true);
-    const [deleteAlert, setDeleteAlert] = useState(false);
-    const [actionId, setActionId] = useState(false);
-    const [mouseEntered, setMouseEntered] = useState(false);
-    const [mouseEnteredId, setMouseEnteredId] = useState("");
-
-    const [updateIOCase] = useUpdateIOCaseMutation()
-  
-    useEffect(() => {
-      // Simulate loading
-      const timer = setTimeout(() => {
-        setIsLoading(false);
-      }, 1500);
-  
-      // Cleanup the timer on component unmount
-      return () => clearTimeout(timer);
-    }, []);
-  
-    const formatDate = (date) => {
-      return new Date(date).toLocaleDateString("en-GB", {
-        day: "2-digit",
-        month: "2-digit",
-        year: "numeric",
-      });
-    };
-  
-  
-    // Table filter
-    const filteredData = IODetails?.ioCashStatusHistory?.Reject?.filter((item) => {
-      // Filter by name (case insensitive)
-      const name = item.transactionDate;
-      const searchLower = searchTerm.toLowerCase();
-      const nameMatches = name.toLowerCase().includes(searchLower);
-      return nameMatches;
-    });
-  
-    const tableHeadRow = [
-      "Sr No.",
-      "Transaction Date",
-      "Transaction Type",
-      "Amount",
-      "Comments",
-      "Update By",
-      "Update On",
-    ];
-  
-    const extractedArray = filteredData?.map((item, index) => ({
-      id: item?.id,
-      "Sr No.": (
-        <Text
-          as={"span"}
-          color={"gray.800"}
-          fontWeight={"500"}
-        >
-          {index + 1}.
-        </Text>
-      ),
-      "Transaction Date": (
-        <Text
-          as={"span"}
-          color={"gray.600"}
-          fontWeight={"500"}
-        >
-          {formatDate(item?.transactionDate)}
-        </Text>
-      ),
-      "Transaction Type": (
-        <Text as={"span"} color={"gray.600"} fontWeight={"500"}>
-          {item?.transactionType}
-        </Text>
-      ),
-      "Amount": (
-        <Text
-          as={"span"}
-          color={"gray.800"}
-          fontWeight={"500"}
-        >
-          <Badge ms={1} colorScheme="green" me={1}>
-                $
-              </Badge>
-              {parseFloat(IODetails?.ioCash || 0).toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
-        </Text>
-      ),
-      "Comments": (
-        <Text
-          w={"100px"}
-          as={"span"}
-          color={"gray.800"}
-          fontWeight={"500"}
-        >
-          {item?.comments}
-        </Text>
-      ),
-      "Update By": (
-        <Text
-          w={"100px"}
-          as={"span"}
-          color={"gray.800"}
-          fontWeight={"500"}
-          display={"flex"}
-          alignItems={"center"}
-        >
-          {/* <Avatar
-           mr={2}
-            size="sm"
-            name={item.creator?.firstName}
-            src={item.creator?.profilePhoto}
-          /> */}
-          {item?.modifier?.firstName}
-        </Text>
-      ),
-      "Update On": (
-        <Text
-          w={"100px"}
-          as={"span"}
-          color={"gray.800"}
-          fontWeight={"500"}
-        >
-          {formatDate(item.updatedAt)}
-        </Text>
-      ),
-    }));
-  
-    const handleDelete = () => {
-      const updatedSponsors = sponser.filter(
-        (sponsor) => sponsor.id !== actionId
-      );
-  
-      setTimeout(() => {
-        setCaseDetails(updatedSponsors);
-        setDeleteAlert(false);
-        setIsLoading(false);
-      }, 100);
-      setIsLoading(true);
-    };
-  
-    const Total = () => {
-      return (
-        <Table size="sm">
-          <Tbody backgroundColor="gray.50">
-            <Tr>
-              <Th
-                textAlign={"center"}
-                p={3}
-                width="130px"
-                color={"#004118"}
-                whiteSpace="normal"
-                wordBreak="normal"
-                overflowWrap="normal"
-              >
-                Balance in IO Cash
-              </Th>
-              <Th
-                textAlign={"center"}
-                p={3}
-                width="150px"
-                color={"#004118"}
-                whiteSpace="normal"
-                wordBreak="normal"
-                overflowWrap="normal"
-              >
-                {" "}
-              </Th>
-              <Th
-                textAlign={"center"}
-                p={3}
-                width="150px"
-                color={"#004118"}
-                whiteSpace="normal"
-                wordBreak="normal"
-                overflowWrap="normal"
-              >
-                {}
-              </Th>
-              <Th
-                textAlign={"center"}
-                p={3}
-                width="100px"
-                color={"#004118"}
-                whiteSpace="normal"
-                wordBreak="normal"
-                overflowWrap="normal"
-              >
-                {"48,000.00"}
-              </Th>
-              <Th
-                textAlign={"center"}
-                p={3}
-                width="100px"
-                color={"#004118"}
-                whiteSpace="normal"
-                wordBreak="normal"
-                overflowWrap="normal"
-              >
-                {" "}
-              </Th>
-              <Th
-                textAlign={"center"}
-                p={3}
-                width="100px"
-                color={"#004118"}
-                whiteSpace="normal"
-                wordBreak="normal"
-                overflowWrap="normal"
-              ></Th>
-              <Th
-                textAlign={"center"}
-                p={3}
-                width="100px"
-                color={"#004118"}
-                whiteSpace="normal"
-                wordBreak="normal"
-                overflowWrap="normal"
-              ></Th>
-            </Tr>
-          </Tbody>
-        </Table>
-      );
-    };
-
-    
-  const handleAdd = async () =>{
-    try {
-       const res = await updateIOCase(id)
-       if (res?.data) {
-        //  toast({
-        //    render: () => (
-        //      <ToastBox status={"success"} message={res?.data?.message} />
-        //    ),
-        //  });
-         setIsLoading(false);
-         onOpen()
- 
-       } else if (res?.error) {
-         toast({
-           render: () => (
-             <ToastBox status={"error"} message={res?.error?.data?.message} />
-           ),
-         });
-         setIsLoading(false);
-       }
-    } catch (error) {    
-    }
-  }
-  
-    return (
-      <Box {...OPACITY_ON_LOAD} pb={0}>
-        <Box bg="white.500">
-          <HStack
-            display={"flex"}
-            justifyContent={"space-between"}
-            pb={3}
-            spacing="24px"
-          >
-            <Input
-              type="search"
-              width={300}
-              placeholder="Search..."
-              size="sm"
-              rounded="sm"
-              focusBorderColor="green.500"
-              value={searchTerm}
-              onChange={(e) => setSearchTerm(e.target.value)}
-            />
-  
-            {/* <HStack display={"flex"} alignItems={"center"}>
-            {IODetails?.isInvestedAmount ? (
-              localStorage?.getItem('role') ==="Maker"&& <Button
-                onClick={handleAdd}
-                leftIcon={<AddIcon />}
-                colorScheme="forestGreen"
-                size={"sm"}
-                rounded={"sm"}
-                fontSize={"xs"}
-              >
-                Add
-              </Button>
-            ) : null}
-            </HStack> */}
-          </HStack>
-        </Box>
-  
-        <NormalTable
-          emptyMessage={`We don't have any Sponers`}
-          tableHeadRow={tableHeadRow}
-          data={extractedArray}
-          isLoading={isLoading}
-          viewActionId={actionId}
-          setViewActionId={setActionId}
-          // total={<Total/>}
-          setMouseEnteredId={setMouseEnteredId}
-          setMouseEntered={setMouseEntered}
-        />
-  
-        <CustomAlertDialog
-          onClose={() => setDeleteAlert(false)}
-          isOpen={deleteAlert}
-          message={"Are you sure you want to delete sponers?"}
-          alertHandler={handleDelete}
-          isLoading={isLoading}
-        />
-  
-        <AddCaseDetails
-          isOpen={isOpen}
-          onClose={onClose}
-          firstField={firstField}
-        />
-      </Box>
-    );
-  };
-  
-  export default Rejected;
-  

src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx

@@ -1,176 +0,0 @@
-import {
-  Box,
-  Button,
-  FormControl,
-  FormHelperText,
-  FormLabel,
-  Input,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  Text,
-  Textarea,
-  useDisclosure,
-  useToast,
-} from "@chakra-ui/react";
-import React, { useEffect, useState } from "react";
-import * as yup from "yup";
-import { yupResolver } from "@hookform/resolvers/yup";
-import { useForm } from "react-hook-form";
-import ToastBox from "../../../../Components/ToastBox";
-import { useApproveIOCaseMutation } from "../../../../Services/io.service";
-
-export const conformModalSchema = yup.object().shape({
-  // comments: yup.string().required("Comment is required")
-  // .max(50, "Investment name cannot be more than 50 characters"),
-  comments: yup
-  .string()
-  .required("Comment is required")
-  .max(200, "Approve Comment cannot be more than 200 characters"),
-});
-
-const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
-  const [isBtnLoading , setIsBtnLoading] = useState(false)
-
-  const toast = useToast()
-
-  const {
-    register,
-    reset,
-    watch,
-    handleSubmit,
-    formState: { errors },
-  } = useForm({
-    resolver: yupResolver(conformModalSchema),
-  });
-
-  const [ approveIOCase ] = useApproveIOCaseMutation()
-  
-
-  const onSubmit = async(data) => {
-    console.log(data, "tewxttttt");
-    setIsBtnLoading(true)
-    try {
-      const res = await approveIOCase({data,id})
-      if (res?.error) {
-        toast({
-          render: () => (
-            <ToastBox status={"error"} message={res?.error?.data?.message} />
-          ),
-        });
-        setIsBtnLoading(false)
-      }else if(res?.data){
-        toast({
-          render: () => (
-            <ToastBox message={res?.data?.message} />
-          ),
-        });
-        onClose()
-        setIsBtnLoading(false)
-      }else{
-        toast({
-          render: () => (
-            <ToastBox status={'error'} message={"Something went wrong"} />
-          ),
-        });
-        setIsBtnLoading(false)
-      }
-    } catch (error) {
-      
-    }
-  };
-
-  const handleFileChange = (event) => {
-    const selectedFile = event.target.files[0];
-    setFile(selectedFile);
-  };
-
-
-  const { data, isLoading } = 
-  (id, {
-    skip: !id,
-  });
-
-  useEffect(() => {
-    if (data) {
-      reset({
-        investorAmount: data?.data?.investorAmount,
-      });
-    }
-  }, [data, reset]);
-
-  const heandleOnClose = () =>{
-    reset()
-    onClose() 
-  }
-
-  return (
-    <Modal isCentered isOpen={isOpen} onClose={heandleOnClose} initialFocusRef={firstField}>
-      <ModalOverlay />
-      <ModalContent pb={4}>
-        <ModalHeader fontSize={"md"}>Approve Comment</ModalHeader>
-        <ModalCloseButton />
-        {isLoading ? (
-          <FullscreenLoaders height={"50vh"} />
-        ) : (
-        <Box as="form" onSubmit={handleSubmit(onSubmit)}>
-          <ModalBody>
-            <FormControl mb={4} isRequired>
-              <FormLabel fontSize="sm">Comment</FormLabel>
-              <Textarea
-                rows={6}
-                focusBorderColor="green.400"
-                name="comments"
-                {...register("comments")}
-                fontSize="sm"
-                type="textarea"
-                size="md"
-                placeholder={"Enter your checker comment...."}
-                rounded={"md"}
-                resize={"none"}
-                maxLength={200}
-              />
-              {errors.comments && (
-                <Text fontSize="xs" color="red">
-                  {errors.comments.message}
-                </Text>
-              )}
-              <FormHelperText fontSize="xs" color="gray.500">
-                <Box as="span" me={1}>Maximum length should be 200 characters. You have entered </Box>
-                 {watch("comments")?.length || 0} characters.
-              </FormHelperText>
-            </FormControl>
-          </ModalBody>
-          <ModalFooter>
-            <Button
-              colorScheme="gray"
-              mr={3}
-              onClick={onClose}
-              size={"sm"}
-              rounded={"sm"}
-            >
-              Cancel
-            </Button>
-            <Button
-              colorScheme="forestGreen"
-              variant="solid"
-              size={"sm"}
-              rounded={"sm"}
-              isLoading={isBtnLoading}
-              type="submit"
-            >
-              Send
-            </Button>
-          </ModalFooter>
-        </Box>
-        )}
-      </ModalContent>
-    </Modal>
-  );
-};
-
-export default RequestApproveModal;

src/Pages/IO_Management/CreateIO/IOCashDetails/RequestRejectModal.jsx

@@ -1,172 +0,0 @@
-import {
-  Box,
-  Button,
-  FormControl,
-  FormHelperText,
-  FormLabel,
-  Input,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  Text,
-  Textarea,
-  useDisclosure,
-  useToast,
-} from "@chakra-ui/react";
-import React, { useEffect, useState } from "react";
-import * as yup from "yup";
-import { yupResolver } from "@hookform/resolvers/yup";
-import { useForm } from "react-hook-form";
-import ToastBox from "../../../../Components/ToastBox";
-import { useRejectIOCaseMutation } from "../../../../Services/io.service";
-
-export const conformModalSchema = yup.object().shape({
-  comments: yup.string().required("Comment is required")
-  .max(200, "Approve Comment cannot be more than 200 characters"),
-});
-
-const RequestRejectModal = ({ isOpen, onClose, firstField ,id}) => {
-  const [isBtnLoading , setIsBtnLoading] = useState(false)
-
-  const toast = useToast()
-
-  const {
-    register,
-    reset,
-    watch,
-    handleSubmit,
-    formState: { errors },
-  } = useForm({
-    resolver: yupResolver(conformModalSchema),
-  });
-
-  const [ rejectIOCase ] = useRejectIOCaseMutation()
-  
-
-  const onSubmit = async(data) => {
-    console.log(data, "tewxttttt");
-    setIsBtnLoading(true)
-    try {
-      const res = await rejectIOCase({data,id})
-      if (res?.error) {
-        toast({
-          render: () => (
-            <ToastBox status={"error"} message={res?.error?.data?.message} />
-          ),
-        });
-        setIsBtnLoading(false)
-      }else if(res?.data){
-        toast({
-          render: () => (
-            <ToastBox message={res?.data?.message} />
-          ),
-        });
-        onClose()
-        setIsBtnLoading(false)
-      }else{
-        toast({
-          render: () => (
-            <ToastBox status={'error'} message={"Something went wrong"} />
-          ),
-        });
-        setIsBtnLoading(false)
-      }
-    } catch (error) {
-      
-    }
-  };
-
-  const handleFileChange = (event) => {
-    const selectedFile = event.target.files[0];
-    setFile(selectedFile);
-  };
-
-
-  const { data, isLoading } = 
-  (id, {
-    skip: !id,
-  });
-
-  useEffect(() => {
-    if (data) {
-      reset({
-        investorAmount: data?.data?.investorAmount,
-      });
-    }
-  }, [data, reset]);
-
-  const heandleOnClose = () =>{
-    reset()
-    onClose()
-  }
-
-  return (
-    <Modal isCentered isOpen={isOpen} onClose={heandleOnClose} initialFocusRef={firstField}>
-      <ModalOverlay />
-      <ModalContent pb={4}>
-        <ModalHeader fontSize={"md"}>Reject Comment</ModalHeader>
-        <ModalCloseButton />
-        {isLoading ? (
-          <FullscreenLoaders height={"50vh"} />
-        ) : (
-        <Box as="form" onSubmit={handleSubmit(onSubmit)}>
-          <ModalBody>
-            <FormControl mb={4} isRequired>
-              <FormLabel fontSize="sm">Comment</FormLabel>
-              <Textarea
-                rows={6}
-                focusBorderColor="green.400"
-                name="comments"
-                {...register("comments")}
-                fontSize="sm"
-                type="textarea"
-                size="md"
-                placeholder={"Enter your comments...."}
-                rounded={"md"}
-                resize={"none"}
-                maxLength={200}
-              />
-              {errors.comments && (
-                <Text fontSize="xs" color="red">
-                  {errors.comments.message}
-                </Text>
-              )}
-              <FormHelperText fontSize="xs" color="gray.500">
-                <Box as="span" me={1}>Maximum length should be 200 characters. You have entered </Box>
-                 {watch("comments")?.length || 0} characters.
-              </FormHelperText>
-            </FormControl>
-          </ModalBody>
-          <ModalFooter>
-            <Button
-              colorScheme="gray"
-              mr={3}
-              onClick={onClose}
-              size={"sm"}
-              rounded={"sm"}
-            >
-              Cancel
-            </Button>
-            <Button
-              colorScheme="forestGreen"
-              variant="solid"
-              size={"sm"}
-              rounded={"sm"}
-              isLoading={isBtnLoading}
-              type="submit"
-            >
-              Send
-            </Button>
-          </ModalFooter>
-        </Box>
-        )}
-      </ModalContent>
-    </Modal>
-  );
-};
-
-export default RequestRejectModal;

src/Pages/IO_Management/CreateIO/IONAVDetails/AddNavDetails.jsx

@@ -1,266 +0,0 @@
-import {
-  Box,
-  Button,
-  Drawer,
-  DrawerBody,
-  DrawerCloseButton,
-  DrawerContent,
-  DrawerFooter,
-  DrawerHeader,
-  DrawerOverlay,
-  FormControl,
-  FormErrorMessage,
-  FormHelperText,
-  FormLabel,
-  HStack,
-  Input,
-  Select,
-  Stack,
-  Text,
-  Textarea,
-  VStack,
-  useToast,
-} from "@chakra-ui/react";
-import * as yup from "yup";
-import React, { useState, useEffect, useContext } from "react";
-import { useForm, Controller } from "react-hook-form";
-import { yupResolver } from "@hookform/resolvers/yup";
-import { v4 as uuidv4 } from "uuid";
-import { useParams } from "react-router-dom";
-import CustomAlertDialog from "../../../../Components/CustomAlertDialog";
-import ToastBox from "../../../../Components/ToastBox";
-import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-import CurrencyInput from "../../../../Components/CurrencyInput";
-import { useAddNavDetailsMutation } from "../../../../Services/io.service";
-import { formatDatee } from "../../../../Components/FormField";
-
-const ioNav = yup.object().shape({
-  transactionDate: yup.string().required("Date is required"),
-  transactionAmount: yup.number().required("New NAV is required"),
-  comments: yup.string().notRequired()
-  .max(200, "Approve Comment cannot be more than 200 characters"),
-});
-
-const AddNavDetails = ({ isOpen, onClose, firstField, actionId, setActionId, data }) => {
-  const params = useParams()
-  const id = params?.id
-  const [file, setFile] = useState("");
-  const [fileName, setFileName] = useState("");
-  const [isLoading, setIsLoading] = useState(false)
-  const [alert, setAlert] = useState(false);
-  const toast = useToast();
-
-
-
-  // ======================[ Cotext Api ]
-  const { IODetails } = useContext(GlobalStateContext);
-  const found = data?.find((item) => item?.id === actionId);
-
-
-  const [addNavDetails] = useAddNavDetailsMutation()
-  // const {
-  //   data
-  // } = useGetArtifactsQuery(id)
-
-  const {
-    control,
-    handleSubmit,
-    watch,
-    reset,
-    formState: { errors },
-  } = useForm({
-    resolver: yupResolver(ioNav),
-  });
-
-
-  const onSubmit = async (data) => {
-
-    setIsLoading(true)
-
-    try {
-
-      const res = await addNavDetails({ data, id })
-      if (res?.data?.statusCode === 201) {
-        setIsLoading(false);
-        toast({
-          render: () => <ToastBox message={res?.data?.message} />,
-        });
-        handleClose()
-      }else if(res?.error?.status === 400){
-        toast({
-          render: () => <ToastBox message={res?.error?.data?.message } status={"error"} />,
-        });
-        handleClose()
-      }
-
-
-    } catch (error) {
-      console.log(error);
-
-    }
-
-  };
-
-
-
-  const handleConfirm = () => {
-    handleSubmit(onSubmit)();
-  };
-
-  const handleSave = () => {
-    handleSubmit(onSubmit)();
-  };
-
-  const handleClose = () => {
-    setIsLoading(false);
-    setAlert(false)
-    onClose()
-    reset({
-      transactionDate:"",
-      transactionAmount:"",
-      comments:""
-    })
-  }
-
-
-
-
-const today = formatDatee(new Date(), 'yyyy-MM-dd');
-
-function calculatePercentage(newNav, currNav) {
-const per = (newNav - currNav) / currNav * 100
-return per.toFixed(2)
-}
-
-
-console.log(calculatePercentage(1092500, 976070));
-
-
-
-  return (
-    <>
-      <Drawer
-        size={"md"}
-        isOpen={isOpen}
-        placement="right"
-        initialFocusRef={firstField}
-        onClose={handleClose}
-      >
-        <DrawerOverlay />
-        <DrawerContent>
-          <DrawerCloseButton />
-          <DrawerHeader fontSize={"sm"}>IO Nav Details</DrawerHeader>
-
-          <DrawerBody>
-            <Stack spacing={4}>
-              <FormControl isInvalid={errors.transactionDate} isRequired>
-                <FormLabel fontSize={"sm"}>Date Selection</FormLabel>
-                <Controller
-                  name="transactionDate"
-                  control={control}
-                  render={({ field }) => (
-                    <Input {...field} 
-                    max={today} // Set max attribute to today’s date
-                     fontSize={"sm"} type="date" size={"sm"} />
-                  )}
-                />
-                <FormErrorMessage fontSize={"xs"} fontWeight={500}>
-                  {errors.transactionDate?.message}
-                </FormErrorMessage>
-              </FormControl>
-
-
-
-              <FormControl isInvalid={errors.transactionAmount} isRequired>
-                <FormLabel fontSize={"sm"}>New NAV</FormLabel>
-                <Controller
-                  name="transactionAmount"
-                  control={control}
-                  render={({ field }) => (
-                    <CurrencyInput {...field} textAlign={'right'} fontSize={"sm"} type="number" size={"sm"} />
-                  )}
-                />
-                <FormErrorMessage fontSize={"xs"} fontWeight={500}>
-                  {errors.transactionAmount?.message}
-                </FormErrorMessage>
-              </FormControl>
-              
-
-              <HStack justify={'start'} gap={10} bg={'green.100'} p={3} rounded={'md'} shadow={'md'}>
-                <VStack align={'start'}>
-                  <Text as={'span'} fontSize={'sm'} fontWeight={500}>Current nav</Text>
-                  <Text as={'span'} fontSize={'sm'}>
-                    {parseFloat(IODetails?.ioNAV || 0).toLocaleString(undefined, {
-                      minimumFractionDigits: 2,
-                      maximumFractionDigits: 2,
-                    })}
-                  </Text>
-                </VStack>
-
-                <VStack align={'start'}>
-                  <Text as={'span'} fontSize={'sm'} fontWeight={500}>Live return %</Text>
-                  <Text as={'span'} fontSize={'sm'}>{calculatePercentage(watch()?.transactionAmount||IODetails?.ioNAV,IODetails?.ioNAV)}</Text>
-                </VStack>
-              </HStack>
-              
-
-
-              <FormControl isInvalid={errors.comments}>
-                <FormLabel fontSize={"sm"}>Comment</FormLabel>
-                <Controller
-                  name="comments"
-                  control={control}
-                  render={({ field }) => (
-                    <Textarea {...field} maxLength={200}   fontSize={"sm"} type="text" size={"sm"} />
-                  )}
-                />
-                <FormErrorMessage fontSize={"xs"} fontWeight={500}>
-                  {errors.comments?.message}
-                </FormErrorMessage>
-                <FormHelperText fontSize="xs" color="gray.500">
-                    <Box as="span" me={1}>Maximum length should be 200 characters. You have entered </Box>
-                    {watch("comments")?.length || 0} characters.
-                  </FormHelperText>
-              </FormControl>
-
-            </Stack>
-          </DrawerBody>
-
-          <DrawerFooter>
-            <Button
-              variant="outline"
-              colorScheme={"forestGreen"}
-              rounded={"sm"}
-              size={"sm"}
-              mr={3}
-              onClick={handleClose}
-            >
-              Cancel
-            </Button>
-
-            <Button
-              colorScheme={"forestGreen"}
-              rounded={"sm"}
-              size={"sm"}
-
-              onClick={() => setAlert(true)}
-            >
-              Save
-            </Button>
-          </DrawerFooter>
-        </DrawerContent>
-      </Drawer>
-
-
-      <CustomAlertDialog
-        isOpen={alert}
-        onClose={() => setAlert(false)}
-        alertHandler={handleSave}
-        message={"Are you sure you want to add NAV details?"}
-        isLoading={isLoading}
-      />
-    </>
-  );
-};
-
-export default AddNavDetails;

src/Pages/IO_Management/CreateIO/IONAVDetails/Approved.jsx

@@ -1,295 +0,0 @@
-import {
-  Avatar,
-  Badge,
-  Box,
-  Button,
-  HStack,
-  Input,   
-  Text,
-  Th,
-  Tooltip,
-  Tr,
-  useDisclosure,
-  useToast,
-} from "@chakra-ui/react";
-import React, { useContext, useEffect, useRef, useState } from "react";
-import { AddIcon, DeleteIcon, EditIcon, ViewIcon } from "@chakra-ui/icons";
-import { LuFileSpreadsheet } from "react-icons/lu";
-import { OPACITY_ON_LOAD } from "../../../../Layout/animations";
-import NormalTable from "../../../../Components/DataTable/NormalTable";
-import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-import CustomAlertDialog from "../../../../Components/CustomAlertDialog";
-import * as XLSX from "xlsx";                                                                  
-import ToastBox from "../../../../Components/ToastBox";
-import AddCashDetails from "../AddCashDetails";
-import { debounce } from "../../../Admin/Contact";
-import { useParams } from "react-router-dom";
-import { useUpdateIOCaseMutation } from "../../../../Services/io.service";
-import AddApproved from "./AddNavDetails";
-import AddNavDetails from "./AddNavDetails";
-
-const formatDate = (date) => new Date(date).toLocaleDateString();
-
-const Approved = () => {
-  const params = useParams();
-  const toast = useToast();
-  const id = params?.id;
-  const firstField = useRef();
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const { IODetails, iONAVDetail, setIONAVDetail } =
-    useContext(GlobalStateContext);
-  const [searchTerm, setSearchTerm] = useState("");
-  const [isLoading, setIsLoading] = useState(true);
-  const [deleteAlert, setDeleteAlert] = useState(false);
-  const [actionId, setActionId] = useState(false);
-  const [mouseEntered, setMouseEntered] = useState(false);
-  const [mouseEnteredId, setMouseEnteredId] = useState("");
-  const [updateIOCase] = useUpdateIOCaseMutation();
-
-  useEffect(() => {
-    // Simulate loading
-    const timer = setTimeout(() => {
-      setIsLoading(false);
-    }, 1500);
-
-    // Cleanup the timer on component unmount
-    return () => clearTimeout(timer);
-  }, []);
-
-  const formatDate = (date) => {
-    return new Date(date).toLocaleDateString("en-GB", {
-      day: "2-digit",
-      month: "2-digit",
-      year: "numeric",
-    });
-  };
-
-  // Table filter
-  const filteredData = IODetails?.ioNAVStatusHistory?.Approved?.filter(
-    (item) => {
-      // Filter by name (case insensitive)
-      const name = item.transactionAmount;
-      const searchLower = searchTerm?.toLowerCase();
-      const nameMatches = name?.toLowerCase().includes(searchLower);
-      return nameMatches;
-    }
-  );
-
-  const tableHeadRow = [
-    "Sr No.",
-    "Valuation date",
-    "NAV",
-    "Last Nav Update",
-    "Investment Closed",
-    "Comments",
-    "Updated By",
-  ];
-
-  const extractedArray = filteredData?.map((item, index) => ({
-    id: item?.id,
-    "Sr No.": (
-      <Text as={"span"} color={"gray.800"} fontWeight={"500"}>
-        {index + 1}.
-      </Text>
-    ),
-    "Valuation date": (
-      <Text as={"span"} color={"gray.600"} fontWeight={"500"}>
-        {formatDate(item?.transactionDate)}
-      </Text>
-    ),
-    NAV: (
-      <Text as={"span"} color={"gray.600"} fontWeight={"500"}>
-        <Badge ms={1} colorScheme="green" me={1}>
-          $
-        </Badge>
-        {parseFloat(item?.transactionAmount || 0).toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
-      </Text>
-    ),
-    "Last Nav Update": (
-      <Text
-        justifyContent={"center"}
-        as={"span"}
-        color={"teal.900"}
-        fontWeight={"500"}
-        className="d-flex align-items-center web-text-small"
-      >
-        {item.previousNAVvalue && `${item.previousNAVvalue}`}
-      </Text>
-    ),
-    "Investment Closed": (
-      <Text
-        justifyContent={"center"}
-        as={"span"}
-        color={"teal.900"}
-        fontWeight={"500"}
-        className="d-flex align-items-center web-text-small"
-      >
-        {item?.initialNAVvalue && `${item?.initialNAVvalue}`}
-      </Text>
-    ),
-    Comments: (
-      <Text w={"100px"} as={"span"} color={"gray.800"} fontWeight={"500"}>
-        {item?.comments ? item?.comments : "---"}
-      </Text>
-    ),
-    "Updated By": (
-      <Text
-        w={"100px"}
-        as={"span"}
-        color={"gray.800"}
-        fontWeight={"500"}
-        display={"flex"}
-        alignItems={"center"}
-      >
-        {/* <Avatar
-          mr={2}
-          size="sm"
-          name={item.creator?.firstName}
-          src={item.creator?.profilePhoto}
-        /> */}
-        {item?.modifier?.firstName}
-      </Text>
-    ),
-  }));
-
-  const handleAdd = async () => {
-    try {
-      const res = await updateIOCase(id);
-      if (res?.data) {
-        // toast({
-        //   render: () => (
-        //     <ToastBox status={"success"} message={res?.data?.message} />
-        //   ),
-        // });
-        setIsLoading(false);
-        onOpen();
-      } else if (res?.error) {
-        toast({
-          render: () => (
-            <ToastBox status={"error"} message={res?.error?.data?.message} />
-          ),
-        });
-        setIsLoading(false);
-      }
-    } catch (error) {}
-  };
-
-  const handleDelete = () => {
-    const updatedSponsors = sponser.filter(
-      (sponsor) => sponsor.id !== actionId
-    );
-
-    setTimeout(() => {
-      setCaseDetails(updatedSponsors);
-      setDeleteAlert(false);
-      setIsLoading(false);
-    }, 100);
-    setIsLoading(true);
-  };
-
-  const exportToExcelNew = (data, fileName) => {
-    const worksheet = XLSX.utils.json_to_sheet(data);
-    const workbook = XLSX.utils.book_new();
-    XLSX.utils.book_append_sheet(workbook, worksheet, "Sheet1");
-
-    // Export file
-    XLSX.writeFile(workbook, `${fileName}.xlsx`);
-  };
-
-  const ioNavExport = IODetails?.ioNAVStatusHistory?.Approved?.map(
-    (item, index) => ({
-      ID: item?.id, // Keep as integer if it's already a number
-      "Valuation date": formatDate(item?.transactionDate), // Assuming this is a date, no conversion needed
-      NAV: parseFloat(item?.transactionAmount) || 0, // Convert to float
-      "Last Nav Update": parseFloat(item?.previousNAVvalue) || 0, // Convert to float
-      "Investment Closed": parseFloat(item?.initialNAVvalue) || 0, // Convert to float
-      Comments: item?.comments, // Keep as string
-      // "Transaction Type": item?.transactionType,
-      "Updated By": item?.creator?.firstName, // Keep as string
-      // "Update On": formatDate(item?.updatedAt) // Assuming this is a date, no conversion needed
-    })
-  );
-
-  return (
-    <Box {...OPACITY_ON_LOAD} pb={0}>
-      <Box bg="white.500">
-        <HStack
-          display={"flex"}
-          justifyContent={"space-between"}
-          pb={3}
-          spacing="24px"
-        >
-          <Input
-            type="search"
-            width={300}
-            placeholder="Search..."
-            size="sm"
-            rounded="sm"
-            focusBorderColor="green.500"
-            value={searchTerm}
-            onChange={(e) => setSearchTerm(e.target.value)}
-          />
-
-          <HStack display={"flex"} alignItems={"center"}>
-            <Button
-              onClick={() => exportToExcelNew(ioNavExport, "Io Nav details")}
-              leftIcon={<LuFileSpreadsheet />}
-              colorScheme="forestGreen"
-              size={"sm"}
-              variant={"outline"}
-              rounded={"sm"}
-              fontSize={"xs"}
-              isDisabled={ioNavExport?.length === 0}
-            >
-              Export xls
-            </Button>
-            {/* {IODetails?.isInvestedAmount
-              ? localStorage?.getItem("role") === "Maker" && (
-                  <Button
-                    onClick={handleAdd}
-                    leftIcon={<AddIcon />}
-                    colorScheme="forestGreen"
-                    size={"sm"}
-                    rounded={"sm"}
-                    fontSize={"xs"}
-                  >
-                    Add
-                  </Button>
-                )
-              : null} */}
-          </HStack>
-        </HStack>
-      </Box>
- 
-      <NormalTable
-        emptyMessage={`We don't have any Sponers`}
-        tableHeadRow={tableHeadRow}
-        data={extractedArray}
-        isLoading={isLoading}
-        viewActionId={actionId}
-        setViewActionId={setActionId}
-        setMouseEnteredId={setMouseEnteredId}
-        setMouseEntered={setMouseEntered}
-      />
-                                                                           
-      <CustomAlertDialog
-        onClose={() => setDeleteAlert(false)}
-        isOpen={deleteAlert}
-        message={"Are you sure you want to delete sponers?"}
-        alertHandler={handleDelete}
-        isLoading={isLoading}
-      />
-
-      <AddNavDetails
-        isOpen={isOpen}
-        onClose={onClose}
-        firstField={firstField}
-      />
-    </Box>
-  );
-};
-
-export default Approved;

src/Pages/IO_Management/CreateIO/IONAVDetails/IONAVDetails.jsx

@@ -1,191 +0,0 @@
-// import { Tab, TabList, TabPanel, TabPanels, Tabs } from "@chakra-ui/react";
-// import React from "react";
-// import Approved from "./Approved";
-// import Pending from "./Pending";
-// import Rejected from "./Rejected";
-
-// const IONAVDetails = () => {
-//   return (
-//     <Tabs>
-//       <TabList>
-//         <Tab
-//           fontSize={"sm"}
-//           _selected={{
-//             color: "#004118",
-//             borderBottom: "2px solid #38a169",
-//           }}
-//         >
-//           Approved
-//         </Tab>
-//         <Tab
-//           fontSize={"sm"}
-//           _selected={{
-//             color: "#004118",
-//             borderBottom: "2px solid #38a169",
-//           }}
-//         >
-//           Pending
-//         </Tab>
-//         <Tab
-//           fontSize={"sm"}
-//           _selected={{
-//             color: "#004118",
-//             borderBottom: "2px solid #38a169",
-//           }}
-//         >
-//           Rejected
-//         </Tab>
-//       </TabList>
-//       <TabPanels>
-//         <TabPanel>
-//           <Approved />
-//         </TabPanel>
-//         <TabPanel>
-//           <Pending />
-//         </TabPanel>
-//         <TabPanel>
-//           <Rejected />
-//         </TabPanel>
-//       </TabPanels>
-//     </Tabs>
-//   );
-// };
-
-// export default IONAVDetails;
-
-import {
-  Badge,
-  Box,
-  Button,
-  Tab,
-  TabList,
-  TabPanel,
-  TabPanels,
-  Tabs,
-  useDisclosure,
-  useToast,
-} from "@chakra-ui/react";
-import React, { useContext, useRef } from "react";
-import Approved from "./Approved";
-import Pending from "./Pending";
-import Rejected from "./Rejected";
-import { AddIcon } from "@chakra-ui/icons";
-import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-import ToastBox from "../../../../Components/ToastBox";
-import { useParams } from "react-router-dom";
-import AddNavDetails from "./AddNavDetails";
-import { useUpdateIOCaseMutation } from "../../../../Services/io.service";
-import { encryptString } from "../../../../Constants/Constants";
-
-const IONAVDetails = () => {
-  const params = useParams();
-  const toast = useToast();
-  const id = params?.id;
-  const { IODetails } = useContext(GlobalStateContext);
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const firstField = useRef();
-
-  const [updateIOCase] = useUpdateIOCaseMutation();
-
-  const handleAdd = async () => {
-    try {
-      const res = await updateIOCase(id);
-      if (res?.data) {
-        // toast({
-        //   render: () => (
-        //     <ToastBox status={"success"} message={res?.data?.message} />
-        //   ),
-        // });
-        // setIsLoading(false);
-        onOpen();
-      } else if (res?.error) {
-        toast({
-          render: () => (
-            <ToastBox status={"error"} message={res?.error?.data?.message} />
-          ),
-        });
-        setIsLoading(false);
-      }
-    } catch (error) {}
-  };
-
-  return (
-    <Box>
-      <Tabs variant="unstyled">
-        <Box
-          display={"flex"}
-          justifyContent={"space-between"}
-          alignItems={"center"}
-          borderBottom={"1px solid #ccc"}
-        >
-          <TabList>
-            <Tab
-              fontSize={"sm"}
-              _selected={{
-                color: "#004118",
-                borderBottom: "2px solid #38a169",
-              }}
-            >
-              Approved
-            </Tab>
-            <Tab
-              fontSize={"sm"}
-              _selected={{
-                color: "#004118",
-                borderBottom: "2px solid #38a169",
-              }}
-            >
-              Pending
-              {IODetails?.ioNAVStatusHistory?.Pending.length > 0 && (
-                <Badge rounded={"sm"} colorScheme="forestGreen" ms={2}>
-                  {IODetails?.ioNAVStatusHistory?.Pending.length || 0}
-                </Badge>
-              )}
-            </Tab>
-            <Tab
-              fontSize={"sm"}
-              _selected={{
-                color: "#004118",
-                borderBottom: "2px solid #38a169",
-              }}
-            >
-              Rejected
-            </Tab>
-          </TabList>
-          {IODetails?.isInvestedAmount
-            ? localStorage?.getItem("role") === encryptString(import.meta.env.VITE_VITE_MAKER) && (
-                <Button
-                  onClick={handleAdd}
-                  leftIcon={<AddIcon />}
-                  colorScheme="forestGreen"
-                  size={"sm"}
-                  rounded={"sm"}
-                  fontSize={"xs"}
-                >
-                  Add
-                </Button>
-              )
-            : null}
-        </Box>
-        <TabPanels>
-          <TabPanel>
-            <Approved />
-          </TabPanel>
-          <TabPanel>
-            <Pending />
-          </TabPanel>
-          <TabPanel>
-            <Rejected />
-          </TabPanel>
-        </TabPanels>
-      </Tabs>
-      <AddNavDetails
-        isOpen={isOpen}
-        onClose={onClose}
-        firstField={firstField}
-      />
-    </Box>
-  );
-};
-
-export default IONAVDetails;

src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx

@@ -1,339 +0,0 @@
-import {
-  Avatar,
-  Badge,
-  Box,
-  Button,
-  HStack,
-  Input,
-  Text,
-  Tooltip,
-  useDisclosure,
-  useToast,
-} from "@chakra-ui/react";
-import React, { useContext, useEffect, useRef, useState } from "react";
-import { OPACITY_ON_LOAD } from "../../../../Layout/animations";
-import NormalTable from "../../../../Components/DataTable/NormalTable";
-import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-import CustomAlertDialog from "../../../../Components/CustomAlertDialog";
-import { AddIcon, CheckIcon, CloseIcon, ViewIcon } from "@chakra-ui/icons";
-import { useParams } from "react-router-dom";
-import { useUpdateIOCaseMutation } from "../../../../Services/io.service";
-import ToastBox from "../../../../Components/ToastBox";
-import AddNavDetails from "./AddNavDetails";
-import RequestApproveModal from "./RequestApproveModal";
-import RequestRejectModal from "./RequestRejectModal";
-import { encryptString } from "../../../../Constants/Constants";
-
-const formatDate = (date) => new Date(date).toLocaleDateString();
-
-const Pending = () => {
-  const params = useParams();
-  const toast = useToast();
-  const id = params?.id;
-  const firstField = useRef();
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const { IODetails, iONAVDetail, setIONAVDetail } =
-    useContext(GlobalStateContext);
-  const [searchTerm, setSearchTerm] = useState("");
-  const [isLoading, setIsLoading] = useState(true);
-  const [deleteAlert, setDeleteAlert] = useState(false);
-  const [actionId, setActionId] = useState(false);
-  const [mouseEntered, setMouseEntered] = useState(false);
-  const [mouseEnteredId, setMouseEnteredId] = useState("");
-
-  const [updateIOCase] = useUpdateIOCaseMutation();
-
-  const {
-    isOpen: isConfirmOpen,
-    onOpen: onConfirmOpen,
-    onClose: onConfirmClose,
-  } = useDisclosure();
-  const {
-    isOpen: isRejectOpen,
-    onOpen: onRejectOpen,
-    onClose: onRejectClose,
-  } = useDisclosure();
-
-  useEffect(() => {
-    // Simulate loading
-    const timer = setTimeout(() => {
-      setIsLoading(false);
-    }, 1500);
-
-    // Cleanup the timer on component unmount
-    return () => clearTimeout(timer);
-  }, []);
-
-  const formatDate = (date) => {
-    return new Date(date).toLocaleDateString("en-GB", {
-      day: "2-digit",
-      month: "2-digit",
-      year: "numeric",
-    });
-  };
-
-  // Table filter
-  const filteredData = IODetails?.ioNAVStatusHistory?.Pending?.filter(
-    (item) => {
-      // Filter by name (case insensitive)
-      const name = item?.transactionDate;
-      const searchLower = searchTerm?.toLowerCase();
-      const nameMatches = name?.toLowerCase().includes(searchLower);
-      return nameMatches;
-    }
-  );
-
-  const tableHeadRow = [
-    "Sr No.",
-    "Valuation date",
-    "NAV",
-    "Last Nav Update",
-    "Investment Closed",
-    "Comments",
-    "Updated By",
-    ...(localStorage?.getItem("role") !== encryptString(import.meta.env.VITE_VITE_MAKER) ? ["Status"] : []),
-  ];
-
-  const extractedArray = filteredData?.map((item, index) => ({
-    id: item?.id,
-    "Sr No.": (
-      <Text as={"span"} color={"gray.800"} fontWeight={"500"}>
-        {index + 1}.
-      </Text>
-    ),
-    "Valuation date": (
-      <Text as={"span"} color={"gray.600"} fontWeight={"500"}>
-        {formatDate(item?.transactionDate)}
-      </Text>
-    ),
-    NAV: (
-      <Text as={"span"} color={"gray.600"} fontWeight={"500"}>
-        <Badge ms={1} colorScheme="green" me={1}>
-          $
-        </Badge>
-        {parseFloat(item?.transactionAmount || 0).toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
-      </Text>
-    ),
-    "Last Nav Update": (
-      <Text
-        justifyContent={"center"}
-        as={"span"}
-        color={"teal.900"}
-        fontWeight={"500"}
-        className="d-flex align-items-center web-text-small"
-      >
-        {item.previousNAVvalue && `${item.previousNAVvalue}`}
-      </Text>
-    ),
-    "Investment Closed": (
-      <Text
-        justifyContent={"center"}
-        as={"span"}
-        color={"teal.900"}
-        fontWeight={"500"}
-        className="d-flex align-items-center web-text-small"
-      >
-        {item?.initialNAVvalue && `${item?.initialNAVvalue}`}
-      </Text>
-    ),
-    Comments: (
-      <Text w={"100px"} as={"span"} color={"gray.800"} fontWeight={"500"}>
-        {item?.comments ? item?.comments : "---"}
-      </Text>
-    ),
-    "Updated By": (
-      <Text
-        w={"100px"}
-        as={"span"}
-        color={"gray.800"}
-        fontWeight={"500"}
-        display={"flex"}
-        alignItems={"center"}
-      >
-        {/* <Avatar
-          mr={2}
-          size="sm"
-          name={item.creator?.firstName}
-          src={item.creator?.profilePhoto}
-        /> */}
-        {item?.modifier?.firstName}
-      </Text>
-    ),
-    Status: (
-      <Box display={"flex"} justifyContent={"center"}>
-       <Box>
-          <Box display={"flex"} justifyContent={"center"} gap={2}>
-        <Tooltip
-          rounded={"sm"}
-          fontSize={"xs"}
-          label="Approve"
-          bg="#fff"
-          color={"green.500"}
-          placement="left-start"
-        >
-          <Button
-            // colorScheme="forestGreen"
-            // color="green.500"
-            rounded={"sm"}
-            size={"xs"}
-            textTransform={"inherit"}
-            fontWeight={500}
-            px={2}
-            py={1}
-            onClick={() => {
-              setActionId(item.id);
-              onConfirmOpen();
-            }}
-            colorScheme="green"
-            variant={"solid"}
-            cursor={"pointer"}
-          >
-            <CheckIcon fontSize={"12px"} />
-          </Button>
-        </Tooltip>
-        <Tooltip
-          rounded={"sm"}
-          fontSize={"xs"}
-          label="Reject"
-          bg="#fff"
-          color={"red.500"}
-          placement="left-start"
-        >
-          <Button
-            colorScheme="red"
-            // color="red.500"
-            rounded={"sm"}
-            size={"xs"}
-            textTransform={"inherit"}
-            fontWeight={500}
-            px={2}
-            onClick={() => {
-              setActionId(item.id);
-              onRejectOpen();
-            }}
-            py={1}
-            // variant={"solid"}
-          >
-            <CloseIcon fontSize={"10px"} />
-          </Button>
-        </Tooltip>
-        </Box>
-        </Box> 
-      </Box>
-    ),
-  }));
-
-  const handleDelete = () => {
-    const updatedSponsors = sponser.filter(
-      (sponsor) => sponsor.id !== actionId
-    );
-
-    setTimeout(() => {
-      setCaseDetails(updatedSponsors);
-      setDeleteAlert(false);
-      setIsLoading(false);
-    }, 100);
-    setIsLoading(true);
-  };
-
-  const handleAdd = async () => {
-    try {
-      const res = await updateIOCase(id);
-      if (res?.data) {
-        // toast({
-        //   render: () => (
-        //     <ToastBox status={"success"} message={res?.data?.message} />
-        //   ),
-        // });
-        setIsLoading(false);
-        onOpen();
-      } else if (res?.error) {
-        toast({
-          render: () => (
-            <ToastBox status={"error"} message={res?.error?.data?.message} />
-          ),
-        });
-        setIsLoading(false);
-      }
-    } catch (error) {}
-  };
-
-  return (
-    <Box {...OPACITY_ON_LOAD} pb={0}>
-      <Box bg="white.500">
-        <HStack
-          display={"flex"}
-          justifyContent={"space-between"}
-          pb={3}
-          spacing="24px"
-        >
-          <Input
-            type="search"
-            width={300}
-            placeholder="Search..."
-            size="sm"
-            rounded="sm"
-            focusBorderColor="green.500"
-            value={searchTerm}
-            onChange={(e) => setSearchTerm(e.target.value)}
-          />
-          {/* {IODetails?.isInvestedAmount
-            ? localStorage?.getItem("role") === "Maker" && (
-                <Button
-                  onClick={handleAdd}
-                  leftIcon={<AddIcon />}
-                  colorScheme="forestGreen"
-                  size={"sm"}
-                  rounded={"sm"}
-                  fontSize={"xs"}
-                >
-                  Add
-                </Button>
-              )
-            : null} */}
-        </HStack>
-      </Box>
-
-      <NormalTable
-        emptyMessage={`We don't have any Sponers`}
-        tableHeadRow={tableHeadRow}
-        data={extractedArray}
-        isLoading={isLoading}
-        viewActionId={actionId}
-        setViewActionId={setActionId}
-        setMouseEnteredId={setMouseEnteredId}
-        setMouseEntered={setMouseEntered}
-      />
-
-      <CustomAlertDialog
-        onClose={() => setDeleteAlert(false)}
-        isOpen={deleteAlert}
-        message={"Are you sure you want to delete sponers?"}
-        alertHandler={handleDelete}
-        isLoading={isLoading}
-      />
-      <AddNavDetails
-        isOpen={isOpen}
-        onClose={onClose}
-        firstField={firstField}
-      />
-      <RequestApproveModal
-        // data={data?.data?.rows}
-        isOpen={isConfirmOpen}
-        onClose={onConfirmClose}
-        id={actionId}
-        // firstField={firstField}
-      />
-      <RequestRejectModal
-        isOpen={isRejectOpen}
-        onClose={onRejectClose}
-        id={actionId}
-      />
-    </Box>
-  );
-};
-
-export default Pending;

src/Pages/IO_Management/CreateIO/IONAVDetails/Rejected.jsx

@@ -1,257 +0,0 @@
-import {
-  Avatar,
-  Badge,
-  Box,
-  Button,
-  HStack,
-  Input,
-  Table,
-  Tag,
-  Tbody,
-  Text,
-  Th,
-  Tooltip,
-  Tr,
-  useDisclosure,
-  useToast,
-} from "@chakra-ui/react";
-import React, { useContext, useEffect, useRef, useState } from "react";
-import { AddIcon, DeleteIcon, EditIcon, ViewIcon } from "@chakra-ui/icons";
-import { LuFileSpreadsheet } from "react-icons/lu";
-import { OPACITY_ON_LOAD } from "../../../../Layout/animations";
-import NormalTable from "../../../../Components/DataTable/NormalTable";
-import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-import CustomAlertDialog from "../../../../Components/CustomAlertDialog";
-import ToastBox from "../../../../Components/ToastBox";
-import AddCashDetails from "../AddCashDetails";
-import { debounce } from "../../../Admin/Contact";
-import { useUpdateIOCaseMutation } from "../../../../Services/io.service";
-import { useParams } from "react-router-dom";
-import AddNavDetails from "./AddNavDetails";
-
-const formatDate = (date) => new Date(date).toLocaleDateString();
-
-const Rejected = () => {
-  const params = useParams();
-  const toast = useToast();
-  const id = params?.id;
-  const firstField = useRef();
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const { IODetails, iONAVDetail, setIONAVDetail } =
-    useContext(GlobalStateContext);
-  const [searchTerm, setSearchTerm] = useState("");
-  const [isLoading, setIsLoading] = useState(true);
-  const [deleteAlert, setDeleteAlert] = useState(false);
-  const [actionId, setActionId] = useState(false);
-  const [mouseEntered, setMouseEntered] = useState(false);
-  const [mouseEnteredId, setMouseEnteredId] = useState("");
-  const [updateIOCase] = useUpdateIOCaseMutation();
-
-  useEffect(() => {
-    // Simulate loading
-    const timer = setTimeout(() => {
-      setIsLoading(false);
-    }, 1500);
-
-    // Cleanup the timer on component unmount
-    return () => clearTimeout(timer);
-  }, []);
-
-  const formatDate = (date) => {
-    return new Date(date).toLocaleDateString("en-GB", {
-      day: "2-digit",
-      month: "2-digit",
-      year: "numeric",
-    });
-  };
-
-  // Table filter
-  const filteredData = IODetails?.ioNAVStatusHistory?.Reject?.filter((item) => {
-    // Filter by name (case insensitive)
-    const name = item.transactionAmount;
-    const searchLower = searchTerm.toLowerCase();
-    const nameMatches = name.toLowerCase().includes(searchLower);
-    return nameMatches;
-  });
-
-  const tableHeadRow = [
-    "Sr No.",
-    "Valuation date",
-    "NAV",
-    "Last Nav Update",
-    "Investment Closed",
-    "Comments",
-    "Updated By",
-  ];
-
-  const extractedArray = filteredData?.map((item, index) => ({
-    id: item?.id,
-    "Sr No.": (
-      <Text as={"span"} color={"gray.800"} fontWeight={"500"}>
-        {index + 1}.
-      </Text>
-    ),
-    "Valuation date": (
-      <Text as={"span"} color={"gray.600"} fontWeight={"500"}>
-        {formatDate(item?.transactionDate)}
-      </Text>
-    ),
-    NAV: (
-      <Text as={"span"} color={"gray.600"} fontWeight={"500"}>
-        <Badge ms={1} colorScheme="green" me={1}>
-          $
-        </Badge>
-        {parseFloat(item?.transactionAmount || 0).toLocaleString(undefined, {
-          minimumFractionDigits: 2,
-          maximumFractionDigits: 2,
-        })}
-      </Text>
-    ),
-    "Last Nav Update": (
-      <Text
-        justifyContent={"center"}
-        as={"span"}
-        color={"teal.900"}
-        fontWeight={"500"}
-        className="d-flex align-items-center web-text-small"
-      >
-        {item.previousNAVvalue && `${item.previousNAVvalue}`}
-      </Text>
-    ),
-    "Investment Closed": (
-      <Text
-        justifyContent={"center"}
-        as={"span"}
-        color={"teal.900"}
-        fontWeight={"500"}
-        className="d-flex align-items-center web-text-small"
-      >
-        {item?.initialNAVvalue && `${item?.initialNAVvalue}`}
-      </Text>
-    ),
-    Comments: (
-      <Text w={"100px"} as={"span"} color={"gray.800"} fontWeight={"500"}>
-        {item?.comments ? item?.comments : "---"}
-      </Text>
-    ),
-    "Updated By": (
-      <Text
-        w={"100px"}
-        as={"span"}
-        color={"gray.800"}
-        fontWeight={"500"}
-        display={"flex"}
-        alignItems={"center"}
-      >
-        {/* <Avatar
-            mr={2}
-          size="sm"
-          name={item.creator?.firstName}
-          src={item.creator?.profilePhoto}
-        /> */}
-        {item?.modifier?.firstName}
-      </Text>
-    ),
-  }));
-
-  const handleDelete = () => {
-    const updatedSponsors = sponser.filter(
-      (sponsor) => sponsor.id !== actionId
-    );
-
-    setTimeout(() => {
-      setCaseDetails(updatedSponsors);
-      setDeleteAlert(false);
-      setIsLoading(false);
-    }, 100);
-    setIsLoading(true);
-  };
-
-  const handleAdd = async () => {
-    try {
-      const res = await updateIOCase(id);
-      if (res?.data) {
-        //  toast({
-        //    render: () => (
-        //      <ToastBox status={"success"} message={res?.data?.message} />
-        //    ),
-        //  });
-        setIsLoading(false);
-        onOpen();
-      } else if (res?.error) {
-        toast({
-          render: () => (
-            <ToastBox status={"error"} message={res?.error?.data?.message} />
-          ),
-        });
-        setIsLoading(false);
-      }
-    } catch (error) {}
-  };
-
-  return (
-    <Box {...OPACITY_ON_LOAD} pb={0}>
-      <Box bg="white.500">
-        <HStack
-          display={"flex"}
-          justifyContent={"space-between"}
-          pb={3}
-          spacing="24px"
-        >
-          <Input
-            type="search"
-            width={300}
-            placeholder="Search..."
-            size="sm"
-            rounded="sm"
-            focusBorderColor="green.500"
-            value={searchTerm}
-            onChange={(e) => setSearchTerm(e.target.value)}
-          />
-
-          {/* {IODetails?.isInvestedAmount
-            ? localStorage?.getItem("role") === "Maker" && (
-                <Button
-                  onClick={handleAdd}
-                  leftIcon={<AddIcon />}
-                  colorScheme="forestGreen"
-                  size={"sm"}
-                  rounded={"sm"}
-                  fontSize={"xs"}
-                >
-                  Add
-                </Button>
-              )
-            : null} */}
-        </HStack>
-      </Box>
-
-      <NormalTable
-        emptyMessage={`We don't have any Sponers`}
-        tableHeadRow={tableHeadRow}
-        data={extractedArray}
-        isLoading={isLoading}
-        viewActionId={actionId}
-        setViewActionId={setActionId}
-        setMouseEnteredId={setMouseEnteredId}
-        setMouseEntered={setMouseEntered}
-      />
-
-      <CustomAlertDialog
-        onClose={() => setDeleteAlert(false)}
-        isOpen={deleteAlert}
-        message={"Are you sure you want to delete sponers?"}
-        alertHandler={handleDelete}
-        isLoading={isLoading}
-      />
-
-      <AddNavDetails
-        isOpen={isOpen}
-        onClose={onClose}
-        firstField={firstField}
-      />
-    </Box>
-  );
-};
-
-export default Rejected;

src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx

@@ -1,176 +0,0 @@
-import {
-  Box,
-  Button,
-  FormControl,
-  FormHelperText,
-  FormLabel,
-  Input,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  Text,
-  Textarea,
-  useDisclosure,
-  useToast,
-} from "@chakra-ui/react";
-import React, { useEffect, useState } from "react";
-import * as yup from "yup";
-import { yupResolver } from "@hookform/resolvers/yup";
-import { useForm } from "react-hook-form";
-import ToastBox from "../../../../Components/ToastBox";
-import { useApproveIOCaseMutation, useApproveIONavMutation } from "../../../../Services/io.service";
-
-export const conformModalSchema = yup.object().shape({
-  // comments: yup.string().required("Comment is required")
-  // .max(50, "Investment name cannot be more than 50 characters"),
-  comments: yup
-  .string()
-  .required("Comment is required")
-  .max(200, "Approve Comment cannot be more than 200 characters"),
-});
-
-const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
-  const [isBtnLoading , setIsBtnLoading] = useState(false)
-
-  const toast = useToast()
-
-  const {
-    register,
-    reset,
-    watch,
-    handleSubmit,
-    formState: { errors },
-  } = useForm({
-    resolver: yupResolver(conformModalSchema),
-  });
-
-  const [ approveIONav ] = useApproveIONavMutation()
-  
-
-  const onSubmit = async(data) => {
-    console.log(data, "tewxttttt");
-    setIsBtnLoading(true)
-    try {
-      const res = await approveIONav({data,id})
-      if (res?.error) {
-        toast({
-          render: () => (
-            <ToastBox status={"error"} message={res?.error?.data?.message} />
-          ),
-        });
-        setIsBtnLoading(false)
-      }else if(res?.data){
-        toast({
-          render: () => (
-            <ToastBox message={res?.data?.message} />
-          ),
-        });
-        onClose()
-        setIsBtnLoading(false)
-      }else{
-        toast({
-          render: () => (
-            <ToastBox status={'error'} message={"Something went wrong"} />
-          ),
-        });
-        setIsBtnLoading(false)
-      }
-    } catch (error) {
-      
-    }
-  };
-
-  const handleFileChange = (event) => {
-    const selectedFile = event.target.files[0];
-    setFile(selectedFile);
-  };
-
-
-  const { data, isLoading } = 
-  (id, {
-    skip: !id,
-  });
-
-  useEffect(() => {
-    if (data) {
-      reset({
-        investorAmount: data?.data?.investorAmount,
-      });
-    }
-  }, [data, reset]);
-
-  const heandleOnClose = () =>{
-    reset()
-    onClose() 
-  }
-
-  return (
-    <Modal isCentered isOpen={isOpen} onClose={heandleOnClose} initialFocusRef={firstField}>
-      <ModalOverlay />
-      <ModalContent pb={4}>
-        <ModalHeader fontSize={"md"}>Approve Comment</ModalHeader>
-        <ModalCloseButton />
-        {isLoading ? (
-          <FullscreenLoaders height={"50vh"} />
-        ) : (
-        <Box as="form" onSubmit={handleSubmit(onSubmit)}>
-          <ModalBody>
-            <FormControl mb={4} isRequired>
-              <FormLabel fontSize="sm">Comment</FormLabel>
-              <Textarea
-                rows={6}
-                focusBorderColor="green.400"
-                name="comments"
-                {...register("comments")}
-                fontSize="sm"
-                type="textarea"
-                size="md"
-                placeholder={"Enter your checker comment...."}
-                rounded={"md"}
-                resize={"none"}
-                maxLength={200}
-              />
-              {errors.comments && (
-                <Text fontSize="xs" color="red">
-                  {errors.comments.message}
-                </Text>
-              )}
-              <FormHelperText fontSize="xs" color="gray.500">
-              <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
-                {watch("comments")?.length || 0} characters.
-              </FormHelperText>
-            </FormControl>
-          </ModalBody>
-          <ModalFooter>
-            <Button
-              colorScheme="gray"
-              mr={3}
-              onClick={onClose}
-              size={"sm"}
-              rounded={"sm"}
-            >
-              Cancel
-            </Button>
-            <Button
-              colorScheme="forestGreen"
-              variant="solid"
-              size={"sm"}
-              rounded={"sm"}
-              isLoading={isBtnLoading}
-              type="submit"
-            >
-              Send
-            </Button>
-          </ModalFooter>
-        </Box>
-        )}
-      </ModalContent>
-    </Modal>
-  );
-};
-
-export default RequestApproveModal;

src/Pages/IO_Management/CreateIO/IONAVDetails/RequestRejectModal.jsx

@@ -1,172 +0,0 @@
-import {
-  Box,
-  Button,
-  FormControl,
-  FormHelperText,
-  FormLabel,
-  Input,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  Text,
-  Textarea,
-  useDisclosure,
-  useToast,
-} from "@chakra-ui/react";
-import React, { useEffect, useState } from "react";
-import * as yup from "yup";
-import { yupResolver } from "@hookform/resolvers/yup";
-import { useForm } from "react-hook-form";
-import ToastBox from "../../../../Components/ToastBox";
-import { useRejectIOCaseMutation } from "../../../../Services/io.service";
-
-export const conformModalSchema = yup.object().shape({
-  comments: yup.string().required("Comment is required")
-  .max(200, "Approve Comment cannot be more than 200 characters"),
-});
-
-const RequestRejectModal = ({ isOpen, onClose, firstField ,id}) => {
-  const [isBtnLoading , setIsBtnLoading] = useState(false)
-
-  const toast = useToast()
-
-  const {
-    register,
-    reset,
-    watch,
-    handleSubmit,
-    formState: { errors },
-  } = useForm({
-    resolver: yupResolver(conformModalSchema),
-  });
-
-  const [ rejectIOCase ] = useRejectIOCaseMutation()
-  
-
-  const onSubmit = async(data) => {
-    console.log(data, "tewxttttt");
-    setIsBtnLoading(true)
-    try {
-      const res = await rejectIOCase({data,id})
-      if (res?.error) {
-        toast({
-          render: () => (
-            <ToastBox status={"error"} message={res?.error?.data?.message} />
-          ),
-        });
-        setIsBtnLoading(false)
-      }else if(res?.data){
-        toast({
-          render: () => (
-            <ToastBox message={res?.data?.message} />
-          ),
-        });
-        onClose()
-        setIsBtnLoading(false)
-      }else{
-        toast({
-          render: () => (
-            <ToastBox status={'error'} message={"Something went wrong"} />
-          ),
-        });
-        setIsBtnLoading(false)
-      }
-    } catch (error) {
-      
-    }
-  };
-
-  const handleFileChange = (event) => {
-    const selectedFile = event.target.files[0];
-    setFile(selectedFile);
-  };
-
-
-  const { data, isLoading } = 
-  (id, {
-    skip: !id,
-  });
-
-  useEffect(() => {
-    if (data) {
-      reset({
-        investorAmount: data?.data?.investorAmount,
-      });
-    }
-  }, [data, reset]);
-
-  const heandleOnClose = () =>{
-    reset()
-    onClose()
-  }
-
-  return (
-    <Modal isCentered isOpen={isOpen} onClose={heandleOnClose} initialFocusRef={firstField}>
-      <ModalOverlay />
-      <ModalContent pb={4}>
-        <ModalHeader fontSize={"md"}>Reject Comment</ModalHeader>
-        <ModalCloseButton />
-        {isLoading ? (
-          <FullscreenLoaders height={"50vh"} />
-        ) : (
-        <Box as="form" onSubmit={handleSubmit(onSubmit)}>
-          <ModalBody>
-            <FormControl mb={4} isRequired>
-              <FormLabel fontSize="sm">Comment</FormLabel>
-              <Textarea
-                rows={6}
-                focusBorderColor="green.400"
-                name="comments"
-                {...register("comments")}
-                fontSize="sm"
-                type="textarea"
-                size="md"
-                placeholder={"Enter your comments...."}
-                rounded={"md"}
-                resize={"none"}
-                maxLength={200}
-              />
-              {errors.comments && (
-                <Text fontSize="xs" color="red">
-                  {errors.comments.message}
-                </Text>
-              )}
-              <FormHelperText fontSize="xs" color="gray.500">
-                <Box as="span" me={1}>Maximum length should be 200 characters. You have entered </Box>
-                 {watch("comments")?.length || 0} characters.
-              </FormHelperText>
-            </FormControl>
-          </ModalBody>
-          <ModalFooter>
-            <Button
-              colorScheme="gray"
-              mr={3}
-              onClick={onClose}
-              size={"sm"}
-              rounded={"sm"}
-            >
-              Cancel
-            </Button>
-            <Button
-              colorScheme="forestGreen"
-              variant="solid"
-              size={"sm"}
-              rounded={"sm"}
-              isLoading={isBtnLoading}
-              type="submit"
-            >
-              Send
-            </Button>
-          </ModalFooter>
-        </Box>
-        )}
-      </ModalContent>
-    </Modal>
-  );
-};
-
-export default RequestRejectModal;

src/Pages/IO_Management/CreateIO/IOTransaction/ApproveDistrubationModal.jsx

@@ -1,179 +0,0 @@
-import {
-    Box,
-    Button,
-    FormControl,
-    FormHelperText,
-    FormLabel,
-    Input,
-    Modal,
-    ModalBody,
-    ModalCloseButton,
-    ModalContent,
-    ModalFooter,
-    ModalHeader,
-    ModalOverlay,
-    Text,
-    Textarea,
-    useDisclosure,
-    useToast,
-  } from "@chakra-ui/react";
-  import React, { useEffect, useState } from "react";
-  import * as yup from "yup";
-  import { yupResolver } from "@hookform/resolvers/yup";
-  import { useForm } from "react-hook-form";
-  import ToastBox from "../../../../Components/ToastBox";
-  import { useApproveDistributedMutation } from "../../../../Services/io.service";
-  
-  export const conformModalSchema = yup.object().shape({
-    // comments: yup.string().required("Comment is required")
-    // .max(50, "Investment name cannot be more than 50 characters"),
-    comments: yup
-    .string()
-    .required("Comment is required")
-    .max(200, "Approve Comment cannot be more than 200 characters"),
-  });
-  
-  const ApproveDistrubationModal = ({ isOpen, onClose, firstField ,id, onBigModalClose}) => {
-    const [isBtnLoading , setIsBtnLoading] = useState(false)
-  
-    const toast = useToast()
-
-    
-  
-    const {
-      register,
-      reset,
-      watch,
-      handleSubmit,
-      formState: { errors },
-    } = useForm({
-      resolver: yupResolver(conformModalSchema),
-    });
-  
-    const [ approveDistributed ] = useApproveDistributedMutation()
-    
-  
-    const onSubmit = async(data) => {
-      setIsBtnLoading(true)
-      try {
-        const res = await approveDistributed({data,id})
-        if (res?.error) {
-          toast({
-            render: () => (
-              <ToastBox status={"error"} message={res?.error?.data?.message} />
-            ),
-          });
-          setIsBtnLoading(false)
-        }else if(res?.data){
-          toast({
-            render: () => (
-              <ToastBox message={res?.data?.message} />
-            ),
-          });
-          onClose()
-          onBigModalClose()
-          setIsBtnLoading(false)
-        }else{
-          toast({
-            render: () => (
-              <ToastBox status={'error'} message={"Something went wrong"} />
-            ),
-          });
-          setIsBtnLoading(false)
-        }
-      } catch (error) {
-        
-      }
-    };
-  
-    const handleFileChange = (event) => {
-      const selectedFile = event.target.files[0];
-      setFile(selectedFile);
-    };
-  
-  
-    const { data, isLoading } = 
-    (id, {
-      skip: !id,
-    });
-  
-    useEffect(() => {
-      if (data) {
-        reset({
-          investorAmount: data?.data?.investorAmount,
-        });
-      }
-    }, [data, reset]);
-  
-    const heandleOnClose = () =>{
-      reset()
-      onClose() 
-    }
-  
-    return (
-      <Modal isCentered isOpen={isOpen} onClose={heandleOnClose} initialFocusRef={firstField}>
-        <ModalOverlay />
-        <ModalContent pb={4}>
-          <ModalHeader fontSize={"md"}>Approve Comment</ModalHeader>
-          <ModalCloseButton />
-          {isLoading ? (
-            <FullscreenLoaders height={"50vh"} />
-          ) : (
-          <Box as="form" onSubmit={handleSubmit(onSubmit)}>
-            <ModalBody>
-              <FormControl mb={4} isRequired>
-                <FormLabel fontSize="sm">Comment</FormLabel>
-                <Textarea
-                  rows={6}
-                  focusBorderColor="green.400"
-                  name="comments"
-                  {...register("comments")}
-                  fontSize="sm"
-                  type="textarea"
-                  size="md"
-                  placeholder={"Enter your checker comment...."}
-                  rounded={"md"}
-                  resize={"none"}
-                  maxLength={200}
-                />
-                {errors.comments && (
-                  <Text fontSize="xs" color="red">
-                    {errors.comments.message}
-                  </Text>
-                )}
-                <FormHelperText fontSize="xs" color="gray.500">
-                <Box as="span" me={1}> Maximum length should be 200 characters. You have entered</Box>
-                  {watch("comments")?.length || 0} characters.
-                </FormHelperText>
-              </FormControl>
-            </ModalBody>
-            <ModalFooter>
-              <Button
-                colorScheme="gray"
-                mr={3}
-                onClick={onClose}
-                size={"xs"}
-                rounded={"sm"}
-              >
-                Cancel
-              </Button>
-              <Button
-                colorScheme="forestGreen"
-                variant="solid"
-                size={"xs"}
-                rounded={"sm"}
-                isLoading={isBtnLoading}
-                type="submit"
-              >
-                Send
-              </Button>
-            </ModalFooter>
-          </Box>
-          )}
-        </ModalContent>
-      </Modal>
-    );
-  };
-  
-  export default ApproveDistrubationModal;
-  

src/Pages/IO_Management/CreateIO/IOTransaction/ApproveInvestedModal.jsx

@@ -1,177 +0,0 @@
-import {
-    Box,
-    Button,
-    FormControl,
-    FormHelperText,
-    FormLabel,
-    Input,
-    Modal,
-    ModalBody,
-    ModalCloseButton,
-    ModalContent,
-    ModalFooter,
-    ModalHeader,
-    ModalOverlay,
-    Text,
-    Textarea,
-    useDisclosure,
-    useToast,
-  } from "@chakra-ui/react";
-  import React, { useEffect, useState } from "react";
-  import * as yup from "yup";
-  import { yupResolver } from "@hookform/resolvers/yup";
-  import { useForm } from "react-hook-form";
-  import ToastBox from "../../../../Components/ToastBox";
-  import { useApproveInvestedMutation } from "../../../../Services/io.service";
-  
-  export const conformModalSchema = yup.object().shape({
-    // comments: yup.string().required("Comment is required")
-    // .max(50, "Investment name cannot be more than 50 characters"),
-    comments: yup
-    .string()
-    .required("Comment is required")
-    .max(200, "Approve Comment cannot be more than 200 characters"),
-  });
-  
-  const ApproveInvestedModal = ({ isOpen, onClose, firstField ,id,onBigModalClose}) => {
-    const [isBtnLoading , setIsBtnLoading] = useState(false)
-  
-    const toast = useToast()
-  
-    const {
-      register,
-      reset,
-      watch,
-      handleSubmit,
-      formState: { errors },
-    } = useForm({
-      resolver: yupResolver(conformModalSchema),
-    });
-  
-    const [ approveInvested ] = useApproveInvestedMutation()
-    
-  
-    const onSubmit = async(data) => {
-      setIsBtnLoading(true)
-      try {
-        const res = await approveInvested({data,id})
-        if (res?.error) {
-          toast({
-            render: () => (
-              <ToastBox status={"error"} message={res?.error?.data?.message} />
-            ),
-          });
-          setIsBtnLoading(false)
-        }else if(res?.data){
-          toast({
-            render: () => (
-              <ToastBox message={res?.data?.message} />
-            ),
-          });
-          onClose()
-          onBigModalClose()
-          setIsBtnLoading(false)
-        }else{
-          toast({
-            render: () => (
-              <ToastBox status={'error'} message={"Something went wrong"} />
-            ),
-          });
-          setIsBtnLoading(false)
-        }
-      } catch (error) {
-        
-      }
-    };
-  
-    const handleFileChange = (event) => {
-      const selectedFile = event.target.files[0];
-      setFile(selectedFile);
-    };
-  
-  
-    const { data, isLoading } = 
-    (id, {
-      skip: !id,
-    });
-  
-    useEffect(() => {
-      if (data) {
-        reset({
-          investorAmount: data?.data?.investorAmount,
-        });
-      }
-    }, [data, reset]);
-  
-    const heandleOnClose = () =>{
-      reset()
-      onClose() 
-    }
-  
-    return (
-      <Modal isCentered isOpen={isOpen} onClose={heandleOnClose} initialFocusRef={firstField}>
-        <ModalOverlay />
-        <ModalContent pb={4}>
-          <ModalHeader fontSize={"md"}>Approve Comment</ModalHeader>
-          <ModalCloseButton />
-          {isLoading ? (
-            <FullscreenLoaders height={"50vh"} />
-          ) : (
-          <Box as="form" onSubmit={handleSubmit(onSubmit)}>
-            <ModalBody>
-              <FormControl mb={4} isRequired>
-                <FormLabel fontSize="sm">Comment</FormLabel>
-                <Textarea
-                  rows={6}
-                  focusBorderColor="green.400"
-                  name="comments"
-                  {...register("comments")}
-                  fontSize="sm"
-                  type="textarea"
-                  size="md"
-                  placeholder={"Enter your checker comment...."}
-                  rounded={"md"}
-                  resize={"none"}
-                  maxLength={200}
-                />
-                {errors.comments && (
-                  <Text fontSize="xs" color="red">
-                    {errors.comments.message}
-                  </Text>
-                )}
-                <FormHelperText fontSize="xs" color="gray.500">
-                <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
-                  {watch("comments")?.length || 0} characters.
-                </FormHelperText>
-              </FormControl>
-            </ModalBody>
-            <ModalFooter>
-              <Button
-                colorScheme="gray"
-                mr={3}
-                onClick={onClose}
-                size={"xs"}
-                rounded={"sm"}
-              >
-                Cancel
-              </Button>
-              <Button
-                colorScheme="forestGreen"
-                variant="solid"
-                size={"xs"}
-                rounded={"sm"}
-                isLoading={isBtnLoading}
-                type="submit"
-              >
-                Send
-              </Button>
-            </ModalFooter>
-          </Box>
-          )}
-        </ModalContent>
-      </Modal>
-    );
-  };
-  
-  export default ApproveInvestedModal;
-  

src/Pages/IO_Management/CreateIO/IOTransaction/Approved.jsx

@@ -1,249 +0,0 @@
-import {
-    Avatar,
-    Badge,
-    Box,
-    Button,
-    HStack,
-    Input,
-    Table,
-    Tag,
-    Tbody,
-    Text,
-    Th,
-    Tooltip,
-    Tr,
-    useDisclosure,
-    useToast,
-  } from "@chakra-ui/react";
-  import React, { useContext, useEffect, useRef, useState } from "react";
-  import { AddIcon, DeleteIcon, EditIcon, ViewIcon } from "@chakra-ui/icons";
-  import { LuFileSpreadsheet } from "react-icons/lu";
-  import { OPACITY_ON_LOAD } from "../../../../Layout/animations";
-  import NormalTable from "../../../../Components/DataTable/NormalTable";
-  import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-  import CustomAlertDialog from "../../../../Components/CustomAlertDialog";
-  import ToastBox from "../../../../Components/ToastBox";
-  import AddCashDetails from "../AddCashDetails";
-  import { debounce } from "../../../Admin/Contact";
-  
-  const formatDate = (date) => new Date(date).toLocaleDateString();
-  
-  const Approved = () => {
-    const toast = useToast();
-    const firstField = useRef();
-    const { isOpen, onOpen, onClose } = useDisclosure();
-    const { IODetails, iOTransaction, setIOTransaction } =
-      useContext(GlobalStateContext);
-    const [searchTerm, setSearchTerm] = useState("");
-    const [isLoading, setIsLoading] = useState(true);
-    const [deleteAlert, setDeleteAlert] = useState(false);
-    const [actionId, setActionId] = useState(false);
-    const [mouseEntered, setMouseEntered] = useState(false);
-    const [mouseEnteredId, setMouseEnteredId] = useState("");
-  
-    useEffect(() => {
-      // Simulate loading
-      const timer = setTimeout(() => {
-        setIsLoading(false);
-      }, 1500);
-  
-      // Cleanup the timer on component unmount
-      return () => clearTimeout(timer);
-    }, []);
-  
-    const formatDate = (date) => {
-      return new Date(date).toLocaleDateString("en-GB", {
-        day: "2-digit",
-        month: "2-digit",
-        year: "numeric",
-      });
-    };
-  
-  
-    // Table filter
-    const filteredData =  IODetails?.ioTransactionRecords?.Approved?.filter((item) => {
-      // Filter by name (case insensitive)
-      const name = item?.transactionAmount;
-      const searchLower = searchTerm?.toLowerCase();
-      const nameMatches = name?.toLowerCase().includes(searchLower);
-      return nameMatches;
-    });
-  
-    const tableHeadRow = [
-      "Sr No.",
-      "Transaction Date",
-      "Transaction Name",
-      "Amount",
-      "Created By",
-      "Created On",
-      "Approved By",
-      "Approved On",
-    ];
-  
-    const extractedArray = filteredData?.map((item, index) => ({
-      id: item?.id,
-      "Sr No.": (
-        <Text
-          as={"span"}
-          color={"gray.800"}
-          fontWeight={"500"}
-        >
-          {index + 1}.
-        </Text>
-      ),
-      "Transaction Date": (
-        <Text
-          as={"span"}
-          color={"gray.600"}
-          fontWeight={"500"}
-        >
-          {formatDate(item?.transactionDate)}
-        </Text>
-      ),
-      "Transaction Name": (
-        <Text
-          as={"span"}
-          color={"gray.600"}
-          fontWeight={"500"}
-        >
-          {item?.transactionType}
-        </Text>
-      ),
-      "Amount": (
-        <Text
-          as={"span"}
-          color={"gray.600"}
-          fontWeight={"500"}
-        >
-          <Badge ms={1} colorScheme="green" me={1}>
-            $
-          </Badge>
-          {/* {item?.transactionAmount} */}
-          {parseFloat(item?.transactionAmount || 0).toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
-        </Text>
-      ),
-      "Created By": (
-        <Text
-          w={"100px"}
-          as={"span"}
-          color={"gray.800"}
-          fontWeight={"500"}
-          textTransform={'capitalize'}
-        >
-          {item?.creator?.firstName}
-        </Text>
-      ),
-      "Created On": (
-        <Text
-          w={"100px"}
-          as={"span"}
-          color={"gray.800"}
-          fontWeight={"500"}
-        >
-          {formatDate(item?.createdAt)}
-        </Text>
-      ),
-      "Approved By": (
-        <>
-        <Text
-          w={"100px"}
-          as={"span"}
-          color={"gray.800"}
-          fontWeight={"500"}
-          textTransform={'capitalize'}
-        >
-           {item?.modifier?.firstName}
-        </Text>
-        {/* <Text
-          w={"100px"}
-          as={"span"}
-          color={"gray.800"}
-          fontWeight={"500"}
-          display={"flex"}
-        alignItems={"center"}
-        >
-           <Avatar
-            mr={2}
-          size="sm"
-          name={item.creator?.firstName}
-          src={item.creator?.profilePhoto}
-        />
-          {item?.creator?.firstName}
-        </Text> */}
-        </>
-      ),
-      "Approved On": (
-          <Text
-          w={"100px"}
-          as={"span"}
-          color={"gray.800"}
-          fontWeight={"500"}
-          >
-            {item?.modifier ? formatDate(item?.updatedAt) : "---" }
-          {}
-        </Text>
-      ),
-    }));
-  
-    const handleDelete = () => {
-      const updatedSponsors = sponser.filter(
-        (sponsor) => sponsor.id !== actionId
-      );
-  
-      setTimeout(() => {
-        setCaseDetails(updatedSponsors);
-        setDeleteAlert(false);
-        setIsLoading(false);
-      }, 100);
-      setIsLoading(true);
-    };
-  
-    return (
-      <Box {...OPACITY_ON_LOAD} pb={0}>
-        <Box bg="white.500">
-          <HStack
-            display={"flex"}
-            justifyContent={"space-between"}
-            pb={3}
-            spacing="24px"
-          >
-            <Input
-              type="search"
-              width={300}
-              placeholder="Search..."
-              size="sm"
-              rounded="sm"
-              focusBorderColor="green.500"
-              value={searchTerm}
-              onChange={(e) => setSearchTerm(e.target.value)}
-            />
-          </HStack>
-        </Box>
-  
-        <NormalTable
-          emptyMessage={`We don't have any Sponers`}
-          tableHeadRow={tableHeadRow}
-          data={extractedArray}
-          isLoading={isLoading}
-          viewActionId={actionId}
-          setViewActionId={setActionId}
-          setMouseEnteredId={setMouseEnteredId}
-          setMouseEntered={setMouseEntered}
-        />
-  
-        <CustomAlertDialog
-          onClose={() => setDeleteAlert(false)}
-          isOpen={deleteAlert}
-          message={"Are you sure you want to delete sponers?"}
-          alertHandler={handleDelete}
-          isLoading={isLoading}
-        />
-      </Box>
-    );
-  };
-  
-  export default Approved;
-  

src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedCancelTransaction.jsx

@@ -1,161 +0,0 @@
-import {
-    Box,
-    Button,
-    FormControl,
-    FormHelperText,
-    FormLabel,
-    Modal,
-    ModalBody,
-    ModalCloseButton,
-    ModalContent,
-    ModalFooter,
-    ModalHeader,
-    ModalOverlay,
-    Text,
-    Textarea,
-    useToast,
-  } from "@chakra-ui/react";
-  import React, { useEffect, useState } from "react";
-  import { yupResolver } from "@hookform/resolvers/yup";
-  import { useForm } from "react-hook-form";
-  import ToastBox from "../../../../Components/ToastBox";
-  import {useApproveCancleTransactionMutation, useApproveExitTransactionMutation} from "../../../../Services/io.service";
-
-  
-  const ApprovedCancelTransaction = ({ isOpen, onClose, firstField ,id,onBigModalClose}) => {
-    const [isBtnLoading , setIsBtnLoading] = useState(false)
-  
-    const toast = useToast()
-  
-    const {
-      register,
-      reset,
-      watch,
-      handleSubmit,
-      formState: { errors },
-    } = useForm({
-      resolver: yupResolver(),
-    });
-  
-    const [ approveCancleTransaction ] = useApproveCancleTransactionMutation()
-    
-  
-    const onSubmit = async(data) => {
-      setIsBtnLoading(true)
-      try {
-        const res = await approveCancleTransaction({data,id})
-        if (res?.error) {
-          toast({
-            render: () => (
-              <ToastBox status={"error"} message={res?.error?.data?.message} />
-            ),
-          });
-          setIsBtnLoading(false)
-        }else if(res?.data){
-          toast({
-            render: () => (
-              <ToastBox message={res?.data?.message} />
-            ),
-          });
-          onClose()
-          onBigModalClose()
-          setIsBtnLoading(false)
-        }else{
-          toast({
-            render: () => (
-              <ToastBox status={'error'} message={"Something went wrong"} />
-            ),
-          });
-          setIsBtnLoading(false)
-        }
-      } catch (error) {
-        
-      }
-    };
-  
-  
-    const { data, isLoading } = 
-    (id, {
-      skip: !id,
-    });
-  
-    useEffect(() => {
-      if (data) {
-        reset({
-          investorAmount: data?.data?.investorAmount,
-        });
-      }
-    }, [data, reset]);
-  
-    const heandleOnClose = () =>{
-      reset()
-      onClose() 
-    }
-  
-    return (
-      <Modal isCentered isOpen={isOpen} onClose={heandleOnClose} initialFocusRef={firstField}>
-        <ModalOverlay />
-        <ModalContent pb={4}>
-          <ModalHeader fontSize={"md"}>Approve Comment</ModalHeader>
-          <ModalCloseButton />
-          {isLoading ? (
-            <FullscreenLoaders height={"50vh"} />
-          ) : (
-          <Box as="form" onSubmit={handleSubmit(onSubmit)}>
-            <ModalBody>
-              <FormControl mb={4} isRequired>
-                <FormLabel fontSize="sm">Comment</FormLabel>
-                <Textarea
-                  rows={6}
-                  focusBorderColor="green.400"
-                  name="comments"
-                  {...register("comments")}
-                  fontSize="sm"
-                  type="textarea"
-                  size="md"
-                  placeholder={"Enter your checker comment...."}
-                  rounded={"md"}
-                  resize={"none"}
-                  maxLength={200}
-                />
-                {errors.comments && (
-                  <Text fontSize="xs" color="red">
-                    {errors.comments.message}
-                  </Text>
-                )}
-                <FormHelperText fontSize="xs" color="gray.500">
-                  <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
-                  {watch("comments")?.length || 0} characters.
-                </FormHelperText>
-              </FormControl>
-            </ModalBody>
-            <ModalFooter>
-              <Button
-                colorScheme="gray"
-                mr={3}
-                onClick={onClose}
-                size={"xs"}
-                rounded={"sm"}
-              >
-                Cancel
-              </Button>
-              <Button
-                colorScheme="forestGreen"
-                variant="solid"
-                size={"xs"}
-                rounded={"sm"}
-                isLoading={isBtnLoading}
-                type="submit"
-              >
-                Send
-              </Button>
-            </ModalFooter>
-          </Box>
-          )}
-        </ModalContent>
-      </Modal>
-    );
-  };
-  
-  export default ApprovedCancelTransaction;
-  

src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedExit.jsx

@@ -1,175 +0,0 @@
-import {
-    Box,
-    Button,
-    FormControl,
-    FormHelperText,
-    FormLabel,
-    Input,
-    Modal,
-    ModalBody,
-    ModalCloseButton,
-    ModalContent,
-    ModalFooter,
-    ModalHeader,
-    ModalOverlay,
-    Text,
-    Textarea,
-    useToast,
-  } from "@chakra-ui/react";
-  import React, { useEffect, useState } from "react";
-  import * as yup from "yup";
-  import { yupResolver } from "@hookform/resolvers/yup";
-  import { useForm } from "react-hook-form";
-  import ToastBox from "../../../../Components/ToastBox";
-  import {  useApproveExitTransactionMutation } from "../../../../Services/io.service";
-  
-  export const conformModalSchema = yup.object().shape({
-    comments: yup
-    .string()
-    .required("Comment is required")
-    .max(200, "Approve Comment cannot be more than 200 characters"),
-  });
-  
-  const ApprovedExit = ({ isOpen, onClose, firstField ,id,onBigModalClose}) => {
-    const [isBtnLoading , setIsBtnLoading] = useState(false)
-  
-    const toast = useToast()
-  
-    const {
-      register,
-      reset,
-      watch,
-      handleSubmit,
-      formState: { errors },
-    } = useForm({
-      resolver: yupResolver(conformModalSchema),
-    });
-  
-    const [ approveExitTransaction ] = useApproveExitTransactionMutation()
-    
-  
-    const onSubmit = async(data) => {
-      setIsBtnLoading(true)
-      try {
-        const res = await approveExitTransaction({data,id})
-        if (res?.error) {
-          toast({
-            render: () => (
-              <ToastBox status={"error"} message={res?.error?.data?.message} />
-            ),
-          });
-          setIsBtnLoading(false)
-        }else if(res?.data){
-          toast({
-            render: () => (
-              <ToastBox message={res?.data?.message} />
-            ),
-          });
-          onClose()
-          onBigModalClose()
-          setIsBtnLoading(false)
-        }else{
-          toast({
-            render: () => (
-              <ToastBox status={'error'} message={"Something went wrong"} />
-            ),
-          });
-          setIsBtnLoading(false)
-        }
-      } catch (error) {
-        
-      }
-    };
-  
-    const handleFileChange = (event) => {
-      const selectedFile = event.target.files[0];
-      setFile(selectedFile);
-    };
-  
-  
-    const { data, isLoading } = 
-    (id, {
-      skip: !id,
-    });
-  
-    useEffect(() => {
-      if (data) {
-        reset({
-          investorAmount: data?.data?.investorAmount,
-        });
-      }
-    }, [data, reset]);
-  
-    const heandleOnClose = () =>{
-      reset()
-      onClose() 
-    }
-    
-  
-    return (
-      <Modal isCentered isOpen={isOpen} onClose={heandleOnClose} initialFocusRef={firstField}>
-        <ModalOverlay />
-        <ModalContent pb={4}>
-          <ModalHeader fontSize={"md"}>Approve Comment</ModalHeader>
-          <ModalCloseButton />
-          {isLoading ? (
-            <FullscreenLoaders height={"50vh"} />
-          ) : (
-          <Box as="form" onSubmit={handleSubmit(onSubmit)}>
-            <ModalBody>
-              <FormControl mb={4} isRequired>
-                <FormLabel fontSize="sm">Comment</FormLabel>
-                <Textarea
-                  rows={6}
-                  focusBorderColor="green.400"
-                  name="comments"
-                  {...register("comments")}
-                  fontSize="sm"
-                  type="textarea"
-                  size="md"
-                  placeholder={"Enter your checker comment...."}
-                  rounded={"md"}
-                  resize={"none"}
-                  maxLength={200}
-                />
-                {errors.comments && (
-                  <Text fontSize="xs" color="red">
-                    {errors.comments.message}
-                  </Text>
-                )}
-                <FormHelperText fontSize="xs" color="gray.500">
-                 <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
-                  {watch("comments")?.length || 0} characters.
-                </FormHelperText>
-              </FormControl>
-            </ModalBody>
-            <ModalFooter>
-              <Button
-                colorScheme="gray"
-                mr={3}
-                onClick={onClose}
-                size={"xs"}
-                rounded={"sm"}
-              >
-                Cancel
-              </Button>
-              <Button
-                colorScheme="forestGreen"
-                variant="solid"
-                size={"xs"}
-                rounded={"sm"}
-                isLoading={isBtnLoading}
-                type="submit"
-              >
-                Send
-              </Button>
-            </ModalFooter>
-          </Box>
-          )}
-        </ModalContent>
-      </Modal>
-    );
-  };
-  
-  export default ApprovedExit;
-  

src/Pages/IO_Management/CreateIO/IOTransaction/IOTransaction.jsx

@@ -1,68 +0,0 @@
-import {
-  Badge,
-  Tab,
-  TabList,
-  TabPanel,
-  TabPanels,
-  Tabs,
-} from "@chakra-ui/react";
-import React, { useContext } from "react";
-import Approved from "./Approved";
-import Pending from "./Pending";
-import Rejected from "./Rejected";
-import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-
-const IOTransaction = () => {
-  const { IODetails } = useContext(GlobalStateContext);
-  return (
-    <Tabs>
-      <TabList>
-        <Tab
-          fontSize={"sm"}
-          _selected={{
-            color: "#004118",
-            borderBottom: "2px solid #38a169",
-          }}
-        >
-          Approved
-        </Tab>
-        <Tab
-          fontSize={"sm"}
-          _selected={{
-            color: "#004118",
-            borderBottom: "2px solid #38a169",
-          }}
-        >
-          Pending
-          {IODetails?.ioTransactionRecords?.Pending.length > 0 && (
-            <Badge rounded={"sm"} colorScheme="forestGreen" ms={2}>
-              {IODetails?.ioTransactionRecords?.Pending.length || 0}
-            </Badge>
-          )}
-        </Tab>
-        <Tab
-          fontSize={"sm"}
-          _selected={{
-            color: "#004118",
-            borderBottom: "2px solid #38a169",
-          }}
-        >
-          Rejected
-        </Tab>
-      </TabList>
-      <TabPanels>
-        <TabPanel>
-          <Approved />
-        </TabPanel>
-        <TabPanel>
-          <Pending />
-        </TabPanel>
-        <TabPanel>
-          <Rejected />
-        </TabPanel>
-      </TabPanels>
-    </Tabs>
-  );
-};
-
-export default IOTransaction;

src/Pages/IO_Management/CreateIO/IOTransaction/Pending.jsx

@@ -1,296 +0,0 @@
-import {
-  Avatar,
-  Badge,
-  Box,
-  Button,
-  HStack,
-  Input,
-  Table,
-  Tag,
-  Tbody,
-  Text,
-  Th,
-  Tooltip,
-  Tr,
-  useDisclosure,
-  useToast,
-} from "@chakra-ui/react";
-import React, { useContext, useEffect, useRef, useState } from "react";
-import { OPACITY_ON_LOAD } from "../../../../Layout/animations";
-import NormalTable from "../../../../Components/DataTable/NormalTable";
-import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-import CustomAlertDialog from "../../../../Components/CustomAlertDialog";
-import { CheckIcon, CloseIcon, ViewIcon } from "@chakra-ui/icons";
-import RequestApproveModal from "./RequestApproveModal";
-import RequestRejectModal from "./RequestRejectModal";
-import ViewAmountInvested from "./ViewAmountInvested";
-import ViewDistributionInvestor from "./ViewDistributionInvestor";
-import ViewExit from "./ViewExit";
-import ViewCancel from "./ViewCancel";
-import { encryptString } from "../../../../Constants/Constants";
-
-const formatDate = (date) => new Date(date).toLocaleDateString();
-
-const Pending = () => {
-  const toast = useToast();
-  const firstField = useRef();
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const { IODetails, iOTransaction, setIOTransaction } =
-    useContext(GlobalStateContext);
-  const [searchTerm, setSearchTerm] = useState("");
-  const [isLoading, setIsLoading] = useState(true);
-  const [deleteAlert, setDeleteAlert] = useState(false);
-  const [actionId, setActionId] = useState(false);
-  const [mouseEntered, setMouseEntered] = useState(false);
-  const [mouseEnteredId, setMouseEnteredId] = useState("");
-
-  const {
-    isOpen: isConfirmOpen,
-    onOpen: onConfirmOpen,
-    onClose: onConfirmClose,
-  } = useDisclosure();
-  const {
-    isOpen: isRejectOpen,
-    onOpen: onRejectOpen,
-    onClose: onRejectClose,
-  } = useDisclosure();
-  const {
-    isOpen: isInvestmentOpen,
-    onOpen: onInvestmentOpen,
-    onClose: onInvestmentClose,
-  } = useDisclosure();
-  const {
-    isOpen: isDistInvestorOpen,
-    onOpen: onDistInvestorOpen,
-    onClose: onDistInvestorClose,
-  } = useDisclosure();
-  const {
-    isOpen: isExitOpen,
-    onOpen: onExitOpen,
-    onClose: onExitClose,
-  } = useDisclosure();
-  const {
-    isOpen: isCancelOpen,
-    onOpen: onCancelOpen,
-    onClose: onCancelClose,
-  } = useDisclosure();
-
-  useEffect(() => {
-    // Simulate loading
-    const timer = setTimeout(() => {
-      setIsLoading(false);
-    }, 1500);
-
-    // Cleanup the timer on component unmount
-    return () => clearTimeout(timer);
-  }, []);
-
-  const formatDate = (date) => {
-    return new Date(date).toLocaleDateString("en-GB", {
-      day: "2-digit",
-      month: "2-digit",
-      year: "numeric",
-    });
-  };
-
-  console.log(
-    "==============panding",
-    IODetails?.ioTransactionRecords?.Pending
-  );
-
-  // Table filter
-  // const filteredData = IODetails?.ioTransactionRecords?.Pending?.filter((item) => {
-  //   // Filter by name (case insensitive)
-  //   const name = item.transactionName;
-  //   const searchLower = searchTerm?.toLowerCase();
-  //   const nameMatches = name?.toLowerCase().includes(searchLower);
-  //   return nameMatches;
-  // });
-
-  const tableHeadRow = [
-    "Sr No.",
-    "Transaction Date",
-    "Transaction Name",
-    "Amount",
-    "Created By",
-    "Created On",
-    "Approved By",
-    "Approved On",
-    "Actions",
-  ];
-
-  const extractedArray = IODetails?.ioTransactionRecords?.Pending?.map(
-    (item, index) => ({
-      id: item?.id,
-      "Sr No.": (
-        <Text as={"span"} color={"gray.800"} fontWeight={"500"}>
-          {index + 1}.
-        </Text>
-      ),
-      "Transaction Date": (
-        <Text
-          as={"span"}
-          color={"gray.600"}
-          fontWeight={"500"}
-        >
-          {formatDate(item?.transactionDate)}
-        </Text>
-      ),
-      "Transaction Name": (
-        <Text as={"span"} color={"gray.600"} fontWeight={"500"}>
-          {item?.transactionType}
-        </Text>
-      ),
-      Amount: (
-        <Text as={"span"} color={"gray.600"} fontWeight={"500"}>
-          <Badge ms={1} colorScheme="green" me={1}>
-            $
-          </Badge>
-          {parseFloat(item?.transactionAmount || 0).toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
-        </Text>
-      ),
-      "Created By": (
-        <Text 
-        textTransform={'capitalize'} w={"100px"} as={"span"} color={"gray.800"} fontWeight={"500"}>
-          {item?.creator?.firstName}
-        </Text>
-      ),
-      "Created On": (
-        <Text w={"100px"} as={"span"} color={"gray.800"} fontWeight={"500"}>
-          {formatDate(item?.createdAt)}
-        </Text>
-      ),
-      "Approved By": (
-        <Text 
-        textTransform={'capitalize'} w={"100px"} as={"span"} color={"gray.800"} fontWeight={"500"}>
-          {item?.modifier?.firstName}
-        </Text>
-      ),
-      "Approved On": (
-        <Text w={"100px"} as={"span"} color={"gray.800"} fontWeight={"500"}>
-          {item?.modifier ? formatDate(item?.updatedAt) : "---"}
-        </Text>
-      ),
-      Actions: (
-        <Box display={"flex"} justifyContent={"center"} gap={2}>
-          <Button
-            colorScheme="forestGreen"
-            rounded={"sm"}
-            size={"xs"}
-            px={2}
-            py={1}
-            fontWeight={500}
-            onClick={() => {
-              setActionId(item.id); // Set the action ID for all cases
-              if (item?.transactionType === "Amount Invested") {
-                onInvestmentOpen();
-              } else if (item?.transactionType === "Distribution To Investor") {
-                onDistInvestorOpen();
-              } else if (item?.transactionType === "Exit") {
-                onExitOpen();
-              } else if (item?.transactionType === "Cancel") {
-                onCancelOpen();
-              }
-            }}
-          >
-            {localStorage?.getItem("role") === encryptString(import.meta.env.VITE_VITE_MAKER) ?  <ViewIcon me={"4px"} /> : null} {localStorage?.getItem("role") === encryptString(import.meta.env.VITE_VITE_MAKER) ?  "View" : "Approve / Reject"}
-          </Button>
-        </Box>
-      ),
-    })
-  );
-
-  const handleDelete = () => {
-    const updatedSponsors = sponser.filter(
-      (sponsor) => sponsor.id !== actionId
-    );
-
-    setTimeout(() => {
-      setCaseDetails(updatedSponsors);
-      setDeleteAlert(false);
-      setIsLoading(false);
-    }, 100);
-    setIsLoading(true);
-  };
-
-  return (
-    <Box {...OPACITY_ON_LOAD} pb={0}>
-      <Box bg="white.500">
-        <HStack
-          display={"flex"}
-          justifyContent={"space-between"}
-          pb={3}
-          spacing="24px"
-        >
-          <Input
-            type="search"
-            width={300}
-            placeholder="Search..."
-            size="sm"
-            rounded="sm"
-            focusBorderColor="green.500"
-            value={searchTerm}
-            onChange={(e) => setSearchTerm(e.target.value)}
-          />
-        </HStack>
-      </Box>
-
-      <NormalTable
-        emptyMessage={`We don't have any Sponers`}
-        tableHeadRow={tableHeadRow}
-        data={extractedArray}
-        isLoading={isLoading}
-        viewActionId={actionId}
-        setViewActionId={setActionId}
-        setMouseEnteredId={setMouseEnteredId}
-        setMouseEntered={setMouseEntered}
-      />
-
-      <CustomAlertDialog
-        onClose={() => setDeleteAlert(false)}
-        isOpen={deleteAlert}
-        message={"Are you sure you want to delete sponers?"}
-        alertHandler={handleDelete}
-        isLoading={isLoading}
-      />
-
-      <ViewAmountInvested
-        isOpen={isInvestmentOpen}
-        onClose={onInvestmentClose}
-        id={actionId}
-      />
-      <ViewDistributionInvestor
-          isOpen={isDistInvestorOpen}
-          onClose={onDistInvestorClose}
-          id={actionId}
-        />
-      <ViewExit 
-        isOpen={isExitOpen} 
-        onClose={onExitClose} 
-        id={actionId}
-      />
-      <ViewCancel 
-        isOpen={isCancelOpen} 
-        onClose={onCancelClose}
-        id={actionId} 
-      />
-      <RequestApproveModal
-        // data={data?.data?.rows}
-        isOpen={isConfirmOpen}
-        onClose={onConfirmClose}
-        id={actionId}
-        // firstField={firstField}
-      />
-      <RequestRejectModal
-        isOpen={isRejectOpen}
-        onClose={onRejectClose}
-        id={actionId}
-      />
-    </Box>
-  );
-};
-
-export default Pending;

src/Pages/IO_Management/CreateIO/IOTransaction/Rejected.jsx

@@ -1,219 +0,0 @@
-import {
-    Avatar,
-    Badge,
-    Box,
-    Button,
-    HStack,
-    Input,
-    Table,
-    Tag,
-    Tbody,
-    Text,
-    Th,
-    Tooltip,
-    Tr,
-    useDisclosure,
-    useToast,
-  } from "@chakra-ui/react";
-  import React, { useContext, useEffect, useRef, useState } from "react";
-  import { AddIcon, DeleteIcon, EditIcon, ViewIcon } from "@chakra-ui/icons";
-  import { LuFileSpreadsheet } from "react-icons/lu";
-  import { OPACITY_ON_LOAD } from "../../../../Layout/animations";
-  import NormalTable from "../../../../Components/DataTable/NormalTable";
-  import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-  import CustomAlertDialog from "../../../../Components/CustomAlertDialog";
-  import ToastBox from "../../../../Components/ToastBox";
-  import AddCashDetails from "../AddCashDetails";
-  import { debounce } from "../../../Admin/Contact";
-  
-  const formatDate = (date) => new Date(date).toLocaleDateString();
-  
-  const Rejected = () => {
-    const toast = useToast();
-    const firstField = useRef();
-    const { isOpen, onOpen, onClose } = useDisclosure();
-    const { IODetails, iOTransaction, setIOTransaction } =
-      useContext(GlobalStateContext);
-    const [searchTerm, setSearchTerm] = useState("");
-    const [isLoading, setIsLoading] = useState(true);
-    const [deleteAlert, setDeleteAlert] = useState(false);
-    const [actionId, setActionId] = useState(false);
-    const [mouseEntered, setMouseEntered] = useState(false);
-    const [mouseEnteredId, setMouseEnteredId] = useState("");
-  
-    useEffect(() => {
-      // Simulate loading
-      const timer = setTimeout(() => {
-        setIsLoading(false);
-      }, 1500);
-  
-      // Cleanup the timer on component unmount
-      return () => clearTimeout(timer);
-    }, []);
-  
-    const formatDate = (date) => {
-      return new Date(date).toLocaleDateString("en-GB", {
-        day: "2-digit",
-        month: "2-digit",
-        year: "numeric",
-      });
-    };
-  
-  
-    // Table filter
-    // const filteredData = IODetails?.ioTransactionRecords?.Reject?.filter((item) => {
-    //   // Filter by name (case insensitive)
-    //   const name = item.transactionName;
-    //   const searchLower = searchTerm.toLowerCase();
-    //   const nameMatches = name.toLowerCase().includes(searchLower);
-    //   return nameMatches;
-    // });
-  
-    const tableHeadRow = [
-      "Sr No.",
-      "Transaction Name",
-      "Amount",
-      "Created By",
-      "Created On",
-      "Approved By",
-      "Approved On",
-    ];
-  
-    const extractedArray = IODetails?.ioTransactionRecords?.Reject?.map((item, index) => ({
-      id: item?.id,
-      "Sr No.": (
-        <Text
-          as={"span"}
-          color={"gray.800"}
-          fontWeight={"500"}
-        >
-          {index + 1}.
-        </Text>
-      ),
-      "Transaction Name": (
-        <Text
-          as={"span"}
-          color={"gray.600"}
-          fontWeight={"500"}
-        >
-          {item?.transactionType}
-        </Text>
-      ),
-      "Amount": (
-        <Text
-          as={"span"}
-          color={"gray.600"}
-          fontWeight={"500"}
-        >
-          <Badge ms={1} colorScheme="green" me={1}>
-            $
-          </Badge>
-          {parseFloat(item?.transactionAmount || 0).toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
-        </Text>
-      ),
-      "Created By": (
-        <Text
-          w={"100px"}
-          as={"span"}
-          color={"gray.800"}
-          fontWeight={"500"}
-          textTransform={'capitalize'}
-        >
-          {item?.creator?.firstName}
-        </Text>
-      ),
-      "Created On": (
-        <Text
-          w={"100px"}
-          as={"span"}
-          color={"gray.800"}
-          fontWeight={"500"}
-        >
-          {formatDate(item?.createdAt)}
-        </Text>
-      ),
-      "Approved By": (
-        <Text
-          w={"100px"}
-          as={"span"}
-          color={"gray.800"}
-          fontWeight={"500"}
-          textTransform={'capitalize'}
-        >
-           {item?.modifier?.firstName}
-        </Text>
-      ),
-      "Approved On": (
-        <Text
-          w={"100px"}
-          as={"span"}
-          color={"gray.800"}
-          fontWeight={"500"}
-        >
-          {formatDate(item?.updatedAt)}
-        </Text>
-      ),
-    }));
-  
-    const handleDelete = () => {
-      const updatedSponsors = sponser.filter(
-        (sponsor) => sponsor.id !== actionId
-      );
-  
-      setTimeout(() => {
-        setCaseDetails(updatedSponsors);
-        setDeleteAlert(false);
-        setIsLoading(false);
-      }, 100);
-      setIsLoading(true);
-    };
-  
-    return (
-      <Box {...OPACITY_ON_LOAD} pb={0}>
-        <Box bg="white.500">
-          <HStack
-            display={"flex"}
-            justifyContent={"space-between"}
-            pb={3}
-            spacing="24px"
-          >
-            <Input
-              type="search"
-              width={300}
-              placeholder="Search..."
-              size="sm"
-              rounded="sm"
-              focusBorderColor="green.500"
-              value={searchTerm}
-              onChange={(e) => setSearchTerm(e.target.value)}
-            />
-          </HStack>
-        </Box>
-  
-        <NormalTable
-          emptyMessage={`We don't have any Sponers`}
-          tableHeadRow={tableHeadRow}
-          data={extractedArray}
-          isLoading={isLoading}
-          viewActionId={actionId}
-          setViewActionId={setActionId}
-          setMouseEnteredId={setMouseEnteredId}
-          setMouseEntered={setMouseEntered}
-        />
-  
-        <CustomAlertDialog
-          onClose={() => setDeleteAlert(false)}
-          isOpen={deleteAlert}
-          message={"Are you sure you want to delete sponers?"}
-          alertHandler={handleDelete}
-          isLoading={isLoading}
-        />
-      </Box>
-    );
-  };
-  
-  export default Rejected;
-  

src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx

@@ -1,175 +0,0 @@
-import {
-  Box,
-  Button,
-  FormControl,
-  FormHelperText,
-  FormLabel,
-  Input,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  Text,
-  Textarea,
-  useDisclosure,
-  useToast,
-} from "@chakra-ui/react";
-import React, { useEffect, useState } from "react";
-import * as yup from "yup";
-import { yupResolver } from "@hookform/resolvers/yup";
-import { useForm } from "react-hook-form";
-import ToastBox from "../../../../Components/ToastBox";
-import { useApproveDistributionMutation, useApproveIOCaseMutation, useApproveIONavMutation } from "../../../../Services/io.service";
-
-export const conformModalSchema = yup.object().shape({
-  // comments: yup.string().required("Comment is required")
-  // .max(50, "Investment name cannot be more than 50 characters"),
-  comments: yup
-  .string()
-  .required("Comment is required")
-  .max(200, "Approve Comment cannot be more than 200 characters"),
-});
-
-const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
-  const [isBtnLoading , setIsBtnLoading] = useState(false)
-
-  const toast = useToast()
-
-  const {
-    register,
-    reset,
-    watch,
-    handleSubmit,
-    formState: { errors },
-  } = useForm({
-    resolver: yupResolver(conformModalSchema),
-  });
-
-  const [ approveDistribution ] = useApproveDistributionMutation()
-  
-
-  const onSubmit = async(data) => {
-    setIsBtnLoading(true)
-    try {
-      const res = await approveDistribution({data,id})
-      if (res?.error) {
-        toast({
-          render: () => (
-            <ToastBox status={"error"} message={res?.error?.data?.message} />
-          ),
-        });
-        setIsBtnLoading(false)
-      }else if(res?.data){
-        toast({
-          render: () => (
-            <ToastBox message={res?.data?.message} />
-          ),
-        });
-        onClose()
-        setIsBtnLoading(false)
-      }else{
-        toast({
-          render: () => (
-            <ToastBox status={'error'} message={"Something went wrong"} />
-          ),
-        });
-        setIsBtnLoading(false)
-      }
-    } catch (error) {
-      
-    }
-  };
-
-  const handleFileChange = (event) => {
-    const selectedFile = event.target.files[0];
-    setFile(selectedFile);
-  };
-
-
-  const { data, isLoading } = 
-  (id, {
-    skip: !id,
-  });
-
-  useEffect(() => {
-    if (data) {
-      reset({
-        investorAmount: data?.data?.investorAmount,
-      });
-    }
-  }, [data, reset]);
-
-  const heandleOnClose = () =>{
-    reset()
-    onClose() 
-  }
-
-  return (
-    <Modal isCentered isOpen={isOpen} onClose={heandleOnClose} initialFocusRef={firstField}>
-      <ModalOverlay />
-      <ModalContent pb={4}>
-        <ModalHeader fontSize={"md"}>Approve Comment</ModalHeader>
-        <ModalCloseButton />
-        {isLoading ? (
-          <FullscreenLoaders height={"50vh"} />
-        ) : (
-        <Box as="form" onSubmit={handleSubmit(onSubmit)}>
-          <ModalBody>
-            <FormControl mb={4} isRequired>
-              <FormLabel fontSize="sm">Comment</FormLabel>
-              <Textarea
-                rows={6}
-                focusBorderColor="green.400"
-                name="comments"
-                {...register("comments")}
-                fontSize="sm"
-                type="textarea"
-                size="md"
-                placeholder={"Enter your checker comment...."}
-                rounded={"md"}
-                resize={"none"}
-                maxLength={200}
-              />
-              {errors.comments && (
-                <Text fontSize="xs" color="red">
-                  {errors.comments.message}
-                </Text>
-              )}
-              <FormHelperText fontSize="xs" color="gray.500">
-              <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
-                {watch("comments")?.length || 0} characters.
-              </FormHelperText>
-            </FormControl>
-          </ModalBody>
-          <ModalFooter>
-            <Button
-              colorScheme="gray"
-              mr={3}
-              onClick={onClose}
-              size={"sm"}
-              rounded={"sm"}
-            >
-              Cancel
-            </Button>
-            <Button
-              colorScheme="forestGreen"
-              variant="solid"
-              size={"sm"}
-              rounded={"sm"}
-              isLoading={isBtnLoading}
-              type="submit"
-            >
-              Send
-            </Button>
-          </ModalFooter>
-        </Box>
-        )}
-      </ModalContent>
-    </Modal>
-  );
-};
-
-export default RequestApproveModal;

src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx

@@ -1,176 +0,0 @@
-import {
-    Box,
-    Button,
-    FormControl,
-    FormHelperText,
-    FormLabel,
-    Input,
-    Modal,
-    ModalBody,
-    ModalCloseButton,
-    ModalContent,
-    ModalFooter,
-    ModalHeader,
-    ModalOverlay,
-    Text,
-    Textarea,
-    useDisclosure,
-    useToast,
-  } from "@chakra-ui/react";
-  import React, { useEffect, useState } from "react";
-  import * as yup from "yup";
-  import { yupResolver } from "@hookform/resolvers/yup";
-  import { useForm } from "react-hook-form";
-  import ToastBox from "../../../../Components/ToastBox";
-  import { useApproveDistributionMutation, useApproveExitMutation, useApproveIOCaseMutation, useApproveIONavMutation } from "../../../../Services/io.service";
-  
-  export const conformModalSchema = yup.object().shape({
-    // comments: yup.string().required("Comment is required")
-    // .max(50, "Investment name cannot be more than 50 characters"),
-    comments: yup
-    .string()
-    .required("Comment is required")
-    .max(200, "Approve Comment cannot be more than 200 characters"),
-  });
-  
-  const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
-    const [isBtnLoading , setIsBtnLoading] = useState(false)
-  
-    const toast = useToast()
-  
-    const {
-      register,
-      reset,
-      watch,
-      handleSubmit,
-      formState: { errors },
-    } = useForm({
-      resolver: yupResolver(conformModalSchema),
-    });
-  
-    const [ approveExit ] = useApproveExitMutation()
-    
-  
-    const onSubmit = async(data) => {
-      setIsBtnLoading(true)
-      try {
-        const res = await approveExit({data,id})
-        if (res?.error) {
-          toast({
-            render: () => (
-              <ToastBox status={"error"} message={res?.error?.data?.message} />
-            ),
-          });
-          setIsBtnLoading(false)
-        }else if(res?.data){
-          toast({
-            render: () => (
-              <ToastBox message={res?.data?.message} />
-            ),
-          });
-          onClose()
-          setIsBtnLoading(false)
-        }else{
-          toast({
-            render: () => (
-              <ToastBox status={'error'} message={"Something went wrong"} />
-            ),
-          });
-          setIsBtnLoading(false)
-        }
-      } catch (error) {
-        
-      }
-    };
-  
-    const handleFileChange = (event) => {
-      const selectedFile = event.target.files[0];
-      setFile(selectedFile);
-    };
-  
-  
-    const { data, isLoading } = 
-    (id, {
-      skip: !id,
-    });
-  
-    useEffect(() => {
-      if (data) {
-        reset({
-          investorAmount: data?.data?.investorAmount,
-        });
-      }
-    }, [data, reset]);
-  
-    const heandleOnClose = () =>{
-      reset()
-      onClose() 
-    }
-  
-    return (
-      <Modal isCentered isOpen={isOpen} onClose={heandleOnClose} initialFocusRef={firstField}>
-        <ModalOverlay />
-        <ModalContent pb={4}>
-          <ModalHeader fontSize={"md"}>Approve Comment</ModalHeader>
-          <ModalCloseButton />
-          {isLoading ? (
-            <FullscreenLoaders height={"50vh"} />
-          ) : (
-          <Box as="form" onSubmit={handleSubmit(onSubmit)}>
-            <ModalBody>
-              <FormControl mb={4} isRequired>
-                <FormLabel fontSize="sm">Comment</FormLabel>
-                <Textarea
-                  rows={6}
-                  focusBorderColor="green.400"
-                  name="comments"
-                  {...register("comments")}
-                  fontSize="sm"
-                  type="textarea"
-                  size="md"
-                  placeholder={"Enter your checker comment...."}
-                  rounded={"md"}
-                  resize={"none"}
-                  maxLength={200}
-                />
-                {errors.comments && (
-                  <Text fontSize="xs" color="red">
-                    {errors.comments.message}
-                  </Text>
-                )}
-                <FormHelperText fontSize="xs" color="gray.500">
-                <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
-                  {watch("comments")?.length || 0} characters.
-                </FormHelperText>
-              </FormControl>
-            </ModalBody>
-            <ModalFooter>
-              <Button
-                colorScheme="gray"
-                mr={3}
-                onClick={onClose}
-                size={"sm"}
-                rounded={"sm"}
-              >
-                Cancel
-              </Button>
-              <Button
-                colorScheme="forestGreen"
-                variant="solid"
-                size={"sm"}
-                rounded={"sm"}
-                isLoading={isBtnLoading}
-                type="submit"
-              >
-                Send
-              </Button>
-            </ModalFooter>
-          </Box>
-          )}
-        </ModalContent>
-      </Modal>
-    );
-  };
-  
-  export default RequestApproveModal;
-  

src/Pages/IO_Management/CreateIO/IOTransaction/RequestRejectModal.jsx

@@ -1,176 +0,0 @@
-import {
-  Box,
-  Button,
-  FormControl,
-  FormHelperText,
-  FormLabel,
-  Input,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  Text,
-  Textarea,
-  useDisclosure,
-  useToast,
-} from "@chakra-ui/react";
-import React, { useEffect, useState } from "react";
-import * as yup from "yup";
-import { yupResolver } from "@hookform/resolvers/yup";
-import { useForm } from "react-hook-form";
-import ToastBox from "../../../../Components/ToastBox";
-import { useRejectIOCaseMutation } from "../../../../Services/io.service";
-
-export const conformModalSchema = yup.object().shape({
-  comments: yup.string().required("Comment is required")
-  .max(200, "Approve Comment cannot be more than 200 characters"),
-});
-
-const RequestRejectModal = ({ isOpen, onClose, firstField ,id, onBigModalClose}) => {
-  const [isBtnLoading , setIsBtnLoading] = useState(false)
-
-  const toast = useToast()
-
-  const {
-    register,
-    reset,
-    watch,
-    handleSubmit,
-    formState: { errors },
-  } = useForm({
-    resolver: yupResolver(conformModalSchema),
-  });
-
-  const [ rejectIOCase ] = useRejectIOCaseMutation()
-  
-
-  const handleFileChange = (event) => {
-    const selectedFile = event.target.files[0];
-    setFile(selectedFile);
-  };
-
-
-  const { data, isLoading } = 
-  (id, {
-    skip: !id,
-  });
-
-  console.log("============data",data);
-  
-  
-  const onSubmit = async(data) => {
-    console.log(data, "tewxttttt");
-    setIsBtnLoading(true)
-    try {
-      const res = await rejectIOCase({data, id})
-      if (res?.error) {
-        toast({
-          render: () => (
-            <ToastBox status={"error"} message={res?.error?.data?.message} />
-          ),
-        });
-        setIsBtnLoading(false)
-      }else if(res?.data){
-        toast({
-          render: () => (
-            <ToastBox message={res?.data?.message} />
-          ),
-        });
-        onClose()
-        onBigModalClose()
-        setIsBtnLoading(false)
-      }else{
-        toast({
-          render: () => (
-            <ToastBox status={'error'} message={"Something went wrong"} />
-          ),
-        });
-        setIsBtnLoading(false)
-      }
-    } catch (error) {
-      
-    }
-  };
-
-
-  // useEffect(() => {
-  //   if (data) {
-  //     reset({
-  //       investorAmount: data?.data?.investorAmount,
-  //     });
-  //   }
-  // }, [data, reset]);
-
-  const heandleOnClose = () =>{
-    reset()
-    onClose()
-  }
-
-  return (
-    <Modal isCentered isOpen={isOpen} onClose={heandleOnClose} initialFocusRef={firstField}>
-      <ModalOverlay />
-      <ModalContent pb={4}>
-        <ModalHeader fontSize={"md"}>Reject Comment</ModalHeader>
-        <ModalCloseButton />
-        {isLoading ? (
-          <FullscreenLoaders height={"50vh"} />
-        ) : (
-        <Box as="form" onSubmit={handleSubmit(onSubmit)}>
-          <ModalBody>
-            <FormControl mb={4} isRequired>
-              <FormLabel fontSize="sm">Comment</FormLabel>
-              <Textarea
-                rows={6}
-                focusBorderColor="green.400"
-                name="comments"
-                {...register("comments")}
-                fontSize="sm"
-                type="textarea"
-                size="md"
-                placeholder={"Enter your comments...."}
-                rounded={"md"}
-                resize={"none"}
-              />
-              {errors.comments && (
-                <Text fontSize="xs" color="red">
-                  {errors.comments.message}
-                </Text>
-              )}
-              <FormHelperText fontSize="xs" color="gray.500">
-              <Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
-                {watch("comments")?.length || 0} characters.
-              </FormHelperText>
-            </FormControl>
-          </ModalBody>
-          <ModalFooter>
-            <Button
-              colorScheme="gray"
-              mr={3}
-              onClick={onClose}
-              size={"xs"}
-              rounded={"sm"}
-            >
-              Cancel
-            </Button>
-            <Button
-              colorScheme="forestGreen"
-              variant="solid"
-              size={"xs"}
-              rounded={"sm"}
-              isLoading={isBtnLoading}
-              type="submit"
-            >
-              Send
-            </Button>
-          </ModalFooter>
-        </Box>
-        )}
-      </ModalContent>
-    </Modal>
-  );
-};
-
-export default RequestRejectModal;

src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx

@@ -1,294 +0,0 @@
-import React, { useContext, useEffect, useState } from "react";
-import {
-  Box,
-  Button,
-  FormControl,
-  FormLabel,
-  Input,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  Text,
-  useDisclosure,
-  useToast,
-} from "@chakra-ui/react";
-import { Controller, useForm } from "react-hook-form";
-import * as yup from "yup";
-import { yupResolver } from "@hookform/resolvers/yup";
-import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-import { useParams } from "react-router-dom";
-import { useAmountIvestmentMutation } from "../../../../Services/io.service";
-import ToastBox from "../../../../Components/ToastBox";
-import CurrencyInput from "../../../../Components/CurrencyInput";
-import RequestRejectModal from "./RequestRejectModal";
-import ApproveInvestedModal from "./ApproveInvestedModal";
-import { formatDate } from "../../../Master/Sponser/Sponsers";
-import { encryptString } from "../../../../Constants/Constants";
-
-// Validation schema
-const validationSchema = yup.object().shape({
-  transactionDate: yup.date().required("Date is required"),
-  Total_Amount: yup.number().required("Amount is required"),
-  amountInvested: yup.number().required("Amount to invest is required"),
-  IoCash: yup
-    .number()
-    .positive("IO Cash must be positive")
-    .required("IO Cash is required"),
-});
-
-// Function to format currency
-const formatCurrency = (value) => {
-  if (isNaN(value)) return "";
-  const formatted = parseFloat(value).toFixed(2).toString();
-  const [integer, decimal] = formatted.split(".");
-  const formattedInteger = integer.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
-  return decimal ? `${formattedInteger}.${decimal}` : formattedInteger;
-};
-
-const ViewAmountInvested = ({ isOpen, onClose, id: investorId }) => {
-  const params = useParams();
-  const toast = useToast();
-  const id = params?.id;
-  const {
-    control,
-    register,
-    handleSubmit,
-    reset,
-    watch,
-    formState: { errors },
-  } = useForm({
-    resolver: yupResolver(validationSchema),
-  });
-  const [isLoading, setIsLoading] = useState(false);
-  const { IODetails } = useContext(GlobalStateContext);
-  const [amountInvested] = useAmountIvestmentMutation();
-  const [actionId, setActionId] = useState(false);
-
-  const {
-    isOpen: isConfirmOpen,
-    onOpen: onConfirmOpen,
-    onClose: onConfirmClose,
-  } = useDisclosure();
-  const {
-    isOpen: isRejectOpen,
-    onOpen: onRejectOpen,
-    onClose: onRejectClose,
-  } = useDisclosure();
-
-  useEffect(() => {
-    if (IODetails?.totalAmtInvestmentInUSD) {
-      const totalAmount = parseFloat(IODetails.totalAmtInvestmentInUSD);
-      const ioCashUpdate = parseFloat(IODetails.totalAmtInvestmentInUSD);
-      reset({
-        Total_Amount: totalAmount,
-        IoCash: ioCashUpdate,
-      });
-    }
-  }, [IODetails, reset]);
-
-  const onSubmit = async (data) => {
-    console.log(data);
-    setIsLoading(true);
-
-    try {
-      const res = await amountInvested({ data, id });
-      console.log(res);
-      if (res?.data?.statusCode === 200) {
-        toast({
-          render: () => <ToastBox message={res?.data?.message} />,
-        });
-        setIsLoading(false);
-        onClose();
-      } else if (res?.error?.status === 400) {
-        toast({
-          render: () => (
-            <ToastBox message={res?.error?.data?.message} status={"error"} />
-          ),
-        });
-        setIsLoading(false);
-      }
-    } catch (error) {
-      setIsLoading(false);
-    }
-  };
-
-  // const formatDate = (date) => new Date(date).toLocaleDateString();
-  
-
-  const handleAmountChange = (e) => {
-    // e might be an object or just a value, handle both cases
-    const amount =
-      typeof e === "object" && e.target
-        ? parseFloat(e.target.value) || 0
-        : parseFloat(e) || 0;
-    const totalAmount = parseFloat(IODetails?.totalAmtInvestmentInUSD) || 0;
-    const ioCash = (totalAmount - amount).toFixed(2);
-
-    reset({
-      amountInvested: parseFloat(amount),
-      IoCash: parseFloat(ioCash),
-      Total_Amount: IODetails?.totalAmtInvestmentInUSD,
-    });
-  };
-
-  console.log(
-    "=========hitttt",
-    IODetails?.ioTransactionRecords?.Pending?.[0]?.createdAt
-  );
-
-  return (
-    <Modal isOpen={isOpen} onClose={onClose}>
-      <ModalOverlay />
-      <ModalContent>
-        <ModalHeader fontSize={"md"}>Amount Invested</ModalHeader>
-        <ModalCloseButton />
-        <ModalBody>
-          <form onSubmit={handleSubmit(onSubmit)}>
-            <FormControl
-              mb={"15px"}
-              isInvalid={!!errors.transactionDate}
-              isRequired
-            >
-              <FormLabel as={"label"} fontSize={"sm"} fontWeight={500}>
-                Date
-              </FormLabel>
-              <Input
-                type="text"
-                value={formatDate(
-                  IODetails?.ioTransactionRecords?.Pending?.[0]?.createdAt
-                )}
-                // value={IODetails?.ioTransactionRecords?.Pending?.[0]?.createdAt}
-                size="sm"
-                rounded={"sm"}
-                textAlign={"end"}
-                focusBorderColor="forestGreen.300"
-                fontSize={"sm"}
-                readOnly
-              />
-              {/* <Text>
-                {IODetails?.ioTransactionRecords?.Approved?.[0]?.createdAt} dccd
-              </Text> */}
-            </FormControl>
-
-            <FormControl
-              mb={"15px"}
-              isInvalid={!!errors.Total_Amount}
-              isReadOnly
-            >
-              <FormLabel as={"label"} fontSize={"sm"} fontWeight={500}>
-                Amount
-              </FormLabel>
-              <Input
-                type="text"
-                value={formatCurrency(watch("Total_Amount") || 0)}
-                size="sm"
-                rounded={"sm"}
-                textAlign={"end"}
-                focusBorderColor="forestGreen.300"
-                fontSize={"sm"}
-                readOnly
-              />
-            </FormControl>
-
-            <FormControl
-              mb={"15px"}
-              isInvalid={!!errors.amountInvested}
-              isRequired
-            >
-              <FormLabel as={"label"} fontSize={"sm"} fontWeight={500}>
-                Amount to invest
-              </FormLabel>
-              <Input
-                type="text"
-                value={formatCurrency(
-                  IODetails?.ioTransactionRecords?.Pending?.[0]
-                    ?.transactionAmount || 0
-                )}
-                size="sm"
-                rounded={"sm"}
-                textAlign={"end"}
-                focusBorderColor="forestGreen.300"
-                fontSize={"sm"}
-                readOnly
-              />
-            </FormControl>
-
-            <FormControl mb={"15px"} isInvalid={!!errors.IoCash}>
-              <FormLabel as={"label"} fontSize={"sm"} fontWeight={500}>
-                IO Cash
-              </FormLabel>
-              <Input
-                type="text"
-                value={formatCurrency(
-                  (watch("Total_Amount") || 0) -
-                    (IODetails?.ioTransactionRecords?.Pending?.[0]
-                      ?.transactionAmount || 0)
-                )}
-                size="sm"
-                rounded={"sm"}
-                focusBorderColor="forestGreen.300"
-                fontSize={"sm"}
-                textAlign={"right"}
-                readOnly
-              />
-            </FormControl>
-
-            {localStorage?.getItem("role") !== encryptString(import.meta.env.VITE_VITE_MAKER) && <ModalFooter>
-              <Box display={"flex"} justifyContent={"center"} gap={2}>
-                <Button
-                  rounded={"sm"}
-                  size={"xs"}
-                  textTransform={"inherit"}
-                  fontWeight={500}
-                  px={3}
-                  py={2}
-                  onClick={() => {
-                    setActionId(id); // Use the `id` variable from params
-                    onConfirmOpen();
-                  }}
-                  colorScheme="forestGreen"
-                  variant={"solid"}
-                  cursor={"pointer"}
-                >
-                  Approve
-                </Button>
-                <Button
-                  rounded={"sm"}
-                  size={"xs"}
-                  textTransform={"inherit"}
-                  fontWeight={500}
-                  px={3}
-                  py={2}
-                  onClick={() => {
-                    setActionId(id); // Use the `id` variable from params
-                    onRejectOpen();
-                  }}
-                >
-                  Reject
-                </Button>
-              </Box>
-            </ModalFooter>}
-          </form>
-        </ModalBody>
-      </ModalContent>
-      <ApproveInvestedModal
-        isOpen={isConfirmOpen}
-        onClose={onConfirmClose}
-        onBigModalClose={onClose}
-        id={investorId}
-      />
-      <RequestRejectModal
-        isOpen={isRejectOpen}
-        onClose={onRejectClose}
-        onBigModalClose={onClose}
-        id={investorId}
-      />
-    </Modal>
-  );
-};
-
-export default ViewAmountInvested;

src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx

@@ -1,368 +0,0 @@
-import {
-    Badge,
-    Box,
-    Button,
-    HStack,
-    Modal,
-    ModalBody,
-    ModalCloseButton,
-    ModalContent,
-    ModalFooter,
-    ModalHeader,
-    ModalOverlay,
-    Table,
-    Tbody,
-    Text,
-    Th,
-    Tr,
-    useDisclosure,
-    useToast,
-  } from "@chakra-ui/react";
-  import NormalData from "../../../../Components/DataTable/NormalTable";
-  import { useContext, useState } from "react";
-  import {
-    useExitIOTransactionMutation,
-    useGetDistributedToInvestorMutation,
-    useGetDistributionInvestorMutation,
-    useGetIOByIdQuery,
-  } from "../../../../Services/io.service";
-  import { useParams } from "react-router-dom";
-  import { useEffect } from "react";
-  import { useForm } from "react-hook-form";
-  import * as yup from "yup";
-  import { yupResolver } from "@hookform/resolvers/yup";
-  import ToastBox from "../../../../Components/ToastBox";
-  import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-import ApprovedCancelTransaction from "./ApprovedCancelTransaction";
-import RequestRejectModal from "./RequestRejectModal";
-import { encryptString } from "../../../../Constants/Constants";
-  
-  const ViewCancel = ({ isOpen, onClose,id:cancleId }) => {
-    const params = useParams();
-    const toast = useToast();
-    const id = params?.id;
-    const [isCalculateLoading, setIsCalculateLoading] = useState(false);
-    const [isFinalCalculateLoading, setIsFinalCalculateLoading] = useState(false);
-    const [calcualtedData, setCalculatedDate] = useState(null);
-    const [isCalcualtedData, setIsCalcualtedData] = useState(false);
-    const { investors, setInvestors, slideFromRight, IODetails } =
-    useContext(GlobalStateContext);
-
-    const [actionId, setActionId] = useState(false);
-
-    const {
-      isOpen: isConfirmOpen,
-      onOpen: onConfirmOpen,
-      onClose: onConfirmClose,
-    } = useDisclosure();
-    const {
-      isOpen: isRejectOpen,
-      onOpen: onRejectOpen,
-      onClose: onRejectClose,
-    } = useDisclosure();
-  
-    const investorExit = yup.object().shape({
-      amount: yup
-        .string()
-        .required("Amount is required")
-        .test(
-          "max",
-          `Distribution amount should not be greater than IO cash amount ${IODetails?.ioCash}`,
-          function (value) {
-            const { ioCash } = IODetails || {}; // Safely get ioCash
-            if (value && ioCash) {
-              return parseFloat(value) <= parseFloat(ioCash); // Ensure both are compared as numbers
-            }
-            return true; // If ioCash is not available, skip validation
-          }
-        ),
-    });
-  
-    const {
-      control,
-      handleSubmit,
-      formState: { errors },
-      reset,
-    } = useForm({
-      resolver: yupResolver(investorExit),
-    });
-  
-    useEffect(() => {
-      console.log("hiit     useEffectc");
-      if (id && IODetails) {
-        handleCalculate(id, {
-          amount: IODetails?.ioMVNAV,
-        });
-       }
-      reset({
-        amount: IODetails?.ioMVNAV,
-      });
-    }, [IODetails, id]);
-  
-    const handleCalculate = async (id, data) => {
-      try {
-        const res = await getDistributionInvestment({ id, data });
-        console.log(res?.data?.data);
-  
-        if (res?.error?.status === 401) { 
-          setIsCalculateLoading(false);
-          setIsCalcualtedData(false);
-        } else if (res?.data?.statusCode === 200) {
-          setCalculatedDate(res?.data?.data);
-          setIsCalculateLoading(false);
-          setIsCalcualtedData(true);
-        }
-      } catch (error) {}
-    };
-  
-    const [getDistributionInvestment] = useGetDistributionInvestorMutation();
-  
-    const investor = yup.object().shape({
-      amount: yup.string().required("Amount is required"),
-    });
-  
-    // ====================================================[Table Setup]================================================================
-    const tableHeadRow = [
-    "Client ID",
-    "First name",
-    "Last name",
-    "Investment amount",
-    "Percentage",
-    "Market Value",
-    "Return on Investment",
-    "Distribution",
-    "Distribution Percent",
-    "Total Return",
-    "Total return on Investment",
-    ];
-  
-    const extractedArray = IODetails?.investors?.map((item, index) => ({
-        id: item?.id,
-        "Client ID": (
-          <Text
-            justifyContent={slideFromRight ? "right" : "center"}
-            as={"span"}
-            color={"teal.900"}
-            fontWeight={"500"}
-            className="d-flex align-items-center web-text-small"
-          >
-            {item?.clientReference_id}
-          </Text>
-        ),
-        "First name": (
-          <Text
-            justifyContent={slideFromRight ? "right" : "center"}
-            as={"span"}
-            color={"teal.900"}
-            fontWeight={"500"}
-            className="d-flex align-items-center web-text-small"
-          >
-            {item.firstName}
-          </Text>
-        ),
-        "Last name": (
-          <Text
-            justifyContent={slideFromRight ? "right" : "center"}
-            as={"span"}
-            color={"teal.900"}
-            fontWeight={"500"}
-            className="d-flex align-items-center web-text-small"
-          >
-            {item.lastName}
-          </Text>
-        ),
-        "Investment amount": (
-          <Text
-            justifyContent={slideFromRight ? "right" : "left"}
-            as={"span"}
-            color={"teal.900"}
-            fontWeight={"500"}
-            className="d-flex align-items-center web-text-small"
-          >
-            <Badge ms={1} colorScheme="green" me={1}>
-              $
-            </Badge>
-            {/* {`$${formatCurrency(item.InvestedAmount_USD)}`} */}
-            {`${parseFloat(item.InvestedAmount_USD || 0).toLocaleString(undefined, {
-              minimumFractionDigits: 2,
-              maximumFractionDigits: 2,
-            })}`}
-          </Text>
-        ),
-        Percentage: (
-          <Text
-            justifyContent={slideFromRight ? "right" : "center"}
-            as={"span"}
-            color={"teal.900"}
-            fontWeight={"500"}
-            className="d-flex align-items-center web-text-small"
-          >
-            {item.Investor_Holidings} %
-          </Text>
-        ),
-        "Market Value": (
-          <Text
-            justifyContent={slideFromRight ? "right" : "left"}
-            as={"span"}
-            color={"teal.900"}
-            fontWeight={"500"}
-            className="d-flex align-items-center web-text-small"
-          >
-            <Badge ms={1} colorScheme="green" me={1}>
-              $
-            </Badge>
-            {`${parseFloat(item.Market_Value || 0).toLocaleString(undefined, {
-              minimumFractionDigits: 2,
-              maximumFractionDigits: 2,
-            })}`}
-          </Text>
-        ),
-        "Return on Investment": (
-          <Text
-            justifyContent={slideFromRight ? "right" : "center"}
-            as={"span"}
-            color={"teal.900"}
-            fontWeight={"500"}
-            h={6}
-            className="d-flex align-items-center web-text-small"
-          >
-            {item.Return_On_Investment || 0} %
-          </Text>
-        ),
-        Distribution: (
-          <Text
-            justifyContent={slideFromRight ? "right" : "left"}
-            as={"span"}
-            color={"teal.900"}
-            fontWeight={"500"}
-            className="d-flex align-items-center web-text-small"
-          >
-            <Badge ms={1} colorScheme="green" me={1}>
-              $
-            </Badge>
-            {/* {`$${item.Distribution_Amt}`} */}
-            {`${parseFloat(item.Distribution_Amt || 0).toLocaleString(undefined, {
-              minimumFractionDigits: 2,
-              maximumFractionDigits: 2,
-            })}`}
-          </Text>
-        ),
-        "Distribution Percent": (
-          <Text
-            justifyContent={slideFromRight ? "right" : "center"}
-            as={"span"}
-            color={"teal.900"}
-            fontWeight={"500"}
-            className="d-flex align-items-center web-text-small"
-          >
-            {/* {`$${item.Distribution_Amt}`} */}
-            {`${parseFloat(item.Distribution_Per || 0).toLocaleString(undefined, {
-              minimumFractionDigits: 2,
-              maximumFractionDigits: 2,
-            })} %`}
-          </Text>
-        ),
-        "Total Return": (
-          <Text
-            justifyContent={slideFromRight ? "right" : "left"}
-            as={"span"}
-            color={"teal.900"}
-            fontWeight={"500"}
-            className="d-flex align-items-center web-text-small"
-          >
-            <Badge ms={1} colorScheme="green" me={1}>
-              $
-            </Badge>
-            {/* {`$${formatCurrency(item.Total_Return) || 0}`} */}
-            {`${parseFloat(item.Total_Return || 0).toLocaleString(undefined, {
-              minimumFractionDigits: 2,
-              maximumFractionDigits: 2,
-            })}`}
-          </Text>
-        ),
-        "Total return on Investment": (
-          <Text
-            justifyContent={slideFromRight ? "right" : "center"}
-            as={"span"}
-            color={"teal.900"}
-            fontWeight={"500"}
-            className="d-flex align-items-center web-text-small"
-          >
-            {item.Total_Return_On_Investment || 0} %
-          </Text>
-        ),
-      }));
-  
-    const handleClose = () => {
-      onClose();
-      setIsFinalCalculateLoading(false);
-      setIsCalcualtedData(false);
-    };
-  
-    return (
-      <Modal size={"xl"} isOpen={isOpen} onClose={handleClose} >
-        <ModalOverlay />
-        <ModalContent maxW={1000}>
-          <ModalHeader fontSize={"md"}>Cancel Transaction</ModalHeader>
-          <ModalCloseButton />
-          <ModalBody>
-            <NormalData
-              emptyMessage={`We don't have any Sponers `}
-              tableHeadRow={tableHeadRow}
-              data={extractedArray}
-            />
-          </ModalBody>
-          {localStorage?.getItem("role") !== encryptString(import.meta.env.VITE_VITE_MAKER) && <ModalFooter pt={0}>
-            <Box display={"flex"} justifyContent={"center"} gap={2}>
-                <Button
-                  rounded={"sm"}
-                  size={"xs"}
-                  textTransform={"inherit"}
-                  fontWeight={500}
-                  px={3}
-                  py={2}
-                  onClick={() => {
-                    setActionId(id); // Use the `id` variable from params
-                    onConfirmOpen();
-                  }}
-                  colorScheme="forestGreen"
-                  variant={"solid"}
-                  cursor={"pointer"}
-                >
-                  Approve
-                </Button>
-                <Button
-                  rounded={"sm"}
-                  size={"xs"}
-                  textTransform={"inherit"}
-                  fontWeight={500}
-                  px={3}
-                  py={2}
-                  onClick={() => {
-                    setActionId(id); // Use the `id` variable from params
-                    onRejectOpen();
-                  }}
-                >
-                  Reject
-                </Button>
-            </Box>
-          </ModalFooter>}
-        </ModalContent>
-        <ApprovedCancelTransaction
-        isOpen={isConfirmOpen}
-        onClose={onConfirmClose}
-        onBigModalClose={onClose}
-        id={cancleId}
-      />
-      <RequestRejectModal
-        isOpen={isRejectOpen}
-        onClose={onRejectClose}
-        onBigModalClose={onClose}
-        id={cancleId}
-      />
-      </Modal>
-    );
-  };
-  
-  export default ViewCancel;
-  

src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx

@@ -1,274 +0,0 @@
-import {
-  Box,
-  Button,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  Text,
-  useDisclosure,
-  useToast,
-} from "@chakra-ui/react";
-import NormalData from "../../../../Components/DataTable/NormalTable";
-import { useContext, useState } from "react";
-import { useGetDistributionInvestorMutation } from "../../../../Services/io.service";
-import { useParams } from "react-router-dom";
-import { useEffect } from "react";
-import { useForm } from "react-hook-form";
-import * as yup from "yup";
-import { yupResolver } from "@hookform/resolvers/yup";
-import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-import ApproveDistrubationModal from "./ApproveDistrubationModal";
-import RequestRejectModal from "./RequestRejectModal";
-import { encryptString } from "../../../../Constants/Constants";
-
-const ViewDistributionInvestor = ({ isOpen, onClose,id:exitId }) => {
-  const params = useParams();
-  const toast = useToast();
-  const id = params?.id;
-  const [isCalculateLoading, setIsCalculateLoading] = useState(false);
-  const [isFinalCalculateLoading, setIsFinalCalculateLoading] = useState(false);
-  const [calcualtedData, setCalculatedDate] = useState(null);
-  const [isCalcualtedData, setIsCalcualtedData] = useState(false);
-  const { IODetails } = useContext(GlobalStateContext);
-  const [actionId, setActionId] = useState(false);
-
-  const investorExit = yup.object().shape({
-    amount: yup
-      .string()
-      .required("Amount is required")
-      .test(
-        "max",
-        `Distribution amount should not be greater than IO cash amount ${IODetails?.ioCash}`,
-        function (value) {
-          const { ioCash } = IODetails || {}; // Safely get ioCash
-          if (value && ioCash) {
-            return parseFloat(value) <= parseFloat(ioCash); // Ensure both are compared as numbers
-          }
-          return true; // If ioCash is not available, skip validation
-        }
-      ),
-  });
-
-  const {
-    isOpen: isConfirmOpen,
-    onOpen: onConfirmOpen,
-    onClose: onConfirmClose,
-  } = useDisclosure();
-  const {
-    isOpen: isRejectOpen,
-    onOpen: onRejectOpen,
-    onClose: onRejectClose,
-  } = useDisclosure();
-
-  const {
-    formState: { errors },
-    reset,
-  } = useForm({
-    resolver: yupResolver(investorExit),
-  });
-
-  useEffect(() => {
-    console.log("hiit     useEffectc");
-    // handleCalculate(id, {
-    //   amount: IODetails?.ioMVNAV,
-    // });
-    if (id && IODetails) {
-      handleCalculate(id, {
-        amount: IODetails?.ioMVNAV,
-      });
-     }
-    reset({
-      amount: IODetails?.ioMVNAV,
-    });
-  }, [IODetails, id]);
-
-  const handleCalculate = async (id, data) => {
-    try {
-      const res = await getDistributionInvestment({ id, data });
-      console.log(res?.data?.data);
-
-      if (res?.error?.status === 401) {
-        setIsCalculateLoading(false);
-        setIsCalcualtedData(false);
-      } else if (res?.data?.statusCode === 200) {
-        setCalculatedDate(res?.data?.data);
-        setIsCalculateLoading(false);
-        setIsCalcualtedData(false);
-      }
-    } catch (error) {}
-  };
-
-  const [getDistributionInvestment] = useGetDistributionInvestorMutation();
-
-  // ====================================================[Table Setup]================================================================
-  const tableHeadRow = [
-    "Sr No.",
-    "Client Id",
-    "First name",
-    "Last Name",
-    "Amount",
-    "Holding (%)",
-    "Distriution Amt($)",
-    "Yeild (%)",
-  ];
-
-  const extractedArray = calcualtedData?.data?.map((item, index) => ({
-    id: item?.id,
-    "Sr No.": (
-      <Box
-        w={9}
-        display={"flex"}
-        alignItems={"center"}
-        isTruncated={true}
-        h={25}
-      >
-        <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
-          {index + 1}
-        </Text>
-      </Box>
-    ),
-    "Client Id": (
-      <Box w={90} isTruncated={true}>
-        <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
-          {item?.clientId}
-        </Text>
-      </Box>
-    ),
-    "First name": (
-      <Box w={90} isTruncated={true}>
-        <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
-          {item?.firstName}
-        </Text>
-      </Box>
-    ),
-    "Last Name": (
-      <Box minW={24} isTruncated={true}>
-        <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
-          {item?.lastName}
-        </Text>
-      </Box>
-    ),
-    Amount: (
-      <Box minW={24} isTruncated={true}>
-        <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
-          {item?.amount?.toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
-        </Text>
-      </Box>
-    ),
-    "Holding (%)": (
-      <Box minW={24} isTruncated={true}>
-        <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
-          {item?.investor_holidings?.toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
-          %
-        </Text>
-      </Box>
-    ),
-    "Distriution Amt($)": (
-      <Box minW={24} isTruncated={true}>
-        <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
-          {item?.distribution_amt?.toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
-        </Text>
-      </Box>
-    ),
-    "Yeild (%)": (
-      <Box minW={24} isTruncated={true}>
-        <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
-          {item?.distribution_per?.toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
-          %
-        </Text>
-      </Box>
-    ),
-  }));
-
-  const handleClose = () => {
-    onClose();
-    setIsFinalCalculateLoading(false);
-    setIsCalcualtedData(false);
-  };
-  
-
-  return (
-    <Modal size={"xl"} isOpen={isOpen} onClose={handleClose}>
-      <ModalOverlay />
-      <ModalContent maxW={1000}>
-        <ModalHeader fontSize={"md"}>
-          Distribution To Investor Transaction
-        </ModalHeader>
-        <ModalCloseButton />
-        <ModalBody>
-          <NormalData
-            emptyMessage={`We don't have any Sponers `}
-            tableHeadRow={tableHeadRow}
-            data={extractedArray}
-          />
-        </ModalBody>
-        {/* ...(localStorage?.getItem("role") !== "Maker" ? ["Status"] : []), */}
-        {localStorage?.getItem("role") !== encryptString(import.meta.env.VITE_VITE_MAKER) &&<ModalFooter pt={0}>
-          <Box display={"flex"} justifyContent={"center"} gap={2}>
-            <Button
-              rounded={"sm"}
-              size={"xs"}
-              textTransform={"inherit"}
-              fontWeight={500}
-              px={3}
-              py={2}
-              onClick={() => {
-                setActionId(id); // Use the `id` variable from params
-                onConfirmOpen();
-              }}
-              colorScheme="forestGreen"
-              variant={"solid"}
-              cursor={"pointer"}
-            >
-              Approve
-            </Button>
-            <Button
-              rounded={"sm"}
-              size={"xs"}
-              textTransform={"inherit"}
-              fontWeight={500}
-              px={3}
-              py={2}
-              onClick={() => {
-                setActionId(id); // Use the `id` variable from params
-                onRejectOpen();
-              }}
-            >
-              Reject
-            </Button>
-          </Box>
-        </ModalFooter>}
-      </ModalContent>
-      <ApproveDistrubationModal
-        isOpen={isConfirmOpen}
-        onClose={onConfirmClose}
-        onBigModalClose={handleClose}
-        id={exitId}
-      />
-      <RequestRejectModal
-        isOpen={isRejectOpen}
-        onClose={onRejectClose}
-        onBigModalClose={handleClose}
-        id={exitId}
-      />
-    </Modal>
-  );
-};
-
-export default ViewDistributionInvestor;

src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx

@@ -1,330 +0,0 @@
-import {
-    Alert,
-    AlertIcon,
-    Box,
-    Button,
-    FormControl,
-    FormErrorMessage,
-    FormLabel,
-    HStack,
-    Input,
-    Modal,
-    ModalBody,
-    ModalCloseButton,
-    ModalContent,
-    ModalFooter,
-    ModalHeader,
-    ModalOverlay,
-    Switch,
-    Table,
-    Tbody,
-    Text,
-    Textarea,
-    Th,
-    Tr,
-    useDisclosure,
-    useToast,
-  } from "@chakra-ui/react";
-  import NormalData from "../../../../Components/DataTable/NormalTable";
-  import { useContext, useState } from "react";
-  import { AddIcon } from "@chakra-ui/icons";
-  import {
-    useExitIOTransactionMutation,
-    useGetDistributedToInvestorMutation,
-    useGetDistributionInvestorMutation,
-    useUpdateExitToInvestorMutation,
-  } from "../../../../Services/io.service";
-  import { useParams } from "react-router-dom";
-  import { useEffect } from "react";
-  import { Controller, useForm } from "react-hook-form";
-  import * as yup from "yup";
-  import { yupResolver } from "@hookform/resolvers/yup";
-  import ToastBox from "../../../../Components/ToastBox";
-  import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-import ApprovedExit from "./ApprovedExit";
-import RequestRejectModal from "./RequestRejectModal";
-import { encryptString } from "../../../../Constants/Constants";
-  
-  const ViewExit = ({ isOpen, onClose ,id:investerId}) => {
-    const params = useParams();
-    const toast = useToast();
-    const id = params?.id;
-    const [isCalculateLoading, setIsCalculateLoading] = useState(false);
-    const [isFinalCalculateLoading, setIsFinalCalculateLoading] = useState(false);
-    const [calcualtedData, setCalculatedDate] = useState(null);
-    const [isCalcualtedData, setIsCalcualtedData] = useState(false);
-    const { IODetails } = useContext(GlobalStateContext);
-    const [actionId, setActionId] = useState(false);
-
-    const {
-      isOpen: isConfirmOpen,
-      onOpen: onConfirmOpen,
-      onClose: onConfirmClose,
-    } = useDisclosure();
-    const {
-      isOpen: isRejectOpen,
-      onOpen: onRejectOpen,
-      onClose: onRejectClose,
-    } = useDisclosure();
-  
-  
-    const {
-      control,
-      handleSubmit,
-      formState: { errors },
-      reset,
-    } = useForm({
-      resolver: yupResolver(),
-    });
-  
-    useEffect(() => {
-      console.log("hiit     useEffectc");
-     if (id && IODetails) {
-      handleCalculate(id, {
-        amount: IODetails?.ioMVNAV,
-      });
-     }
-      reset({
-        amount: IODetails?.ioMVNAV,
-      });
-    }, [IODetails, id]);
-  
-    const handleCalculate = async (id, data) => {
-      try {
-        
-        const res = await getDistributionInvestment({ id, data });
-        console.log(res?.data?.data);
-  
-        if (res?.error?.status === 401) { 
-          setIsCalculateLoading(false);
-          setIsCalcualtedData(false);
-        } else if (res?.data?.statusCode === 200) {
-          setCalculatedDate(res?.data?.data);
-          setIsCalculateLoading(false);
-          setIsCalcualtedData(true);
-        }
-      } catch (error) {}
-    };
-  
-    const [getDistributionInvestment] = useGetDistributionInvestorMutation();
-  
-    const investor = yup.object().shape({
-      amount: yup.string().required("Amount is required"),
-    });
-  
-    // ====================================================[Table Setup]================================================================
-    const tableHeadRow = [
-      "Sr No.",
-      "Client Id",
-      "First name",
-      "Last Name",
-      "Amount",
-      "Holding (%)",
-      "Exit Amt($)",
-    ];
-
-    
-  
-    const extractedArray = calcualtedData?.data?.map((item, index) => ({
-      id: item?.id,
-      "Sr No.": (
-        <Box
-          w={9}
-          display={"flex"}
-          alignItems={"center"}
-          isTruncated={true}
-          h={25}
-        >
-          <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
-            {index + 1}
-          </Text>
-        </Box>
-      ),
-      "Client Id": (
-        <Box w={100} isTruncated={true}>
-          <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
-            {item?.clientId}
-          </Text>
-        </Box>
-      ),
-      "First name": (
-        <Box minW={24} isTruncated={true}>
-          <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
-            {item?.firstName}
-          </Text>
-        </Box>
-      ),
-      "Last Name": (
-        <Box minW={24} isTruncated={true}>
-          <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
-            {item?.lastName}
-          </Text>
-        </Box>
-      ),
-      Amount: (
-        <Box minW={24} isTruncated={true}>
-          <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
-            {item?.amount?.toLocaleString(undefined, {
-              minimumFractionDigits: 2,
-              maximumFractionDigits: 2,
-            })}
-          </Text>
-        </Box>
-      ),
-      "Holding (%)": (
-  <Box minW={24} isTruncated={true}>
-  <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
-    {item?.investor_holidings?.toLocaleString(undefined, {
-      minimumFractionDigits: 2,
-      maximumFractionDigits: 2,
-    })}%
-  </Text>
-  </Box>
-      ),
-      "Exit Amt($)": (
-        <Box minW={24} isTruncated={true}>
-          <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
-            {item?.distribution_amt?.toLocaleString(undefined, {
-              minimumFractionDigits: 2,
-              maximumFractionDigits: 2,
-            })}
-          </Text>
-        </Box>
-      ),
-    }));
-  
-    const onSubmit = async (data) => {
-      setIsCalculateLoading(true);
-  
-      try {
-        const res = await getDistributionInvestment({ id, data });
-        console.log(res?.data?.data);
-  
-        if (res?.error?.status === 401) {
-          toast({
-            render: () => (
-              <ToastBox message={res?.error?.data?.message} status={"error"} />
-            ),
-          });
-          setIsCalculateLoading(false);
-          setIsCalcualtedData(false);
-        } else if (res?.data?.statusCode === 200) {
-          setCalculatedDate(res?.data?.data);
-          toast({
-            render: () => <ToastBox message={res?.data?.message} />,
-          });
-          setIsCalculateLoading(false);
-          setIsCalcualtedData(true);
-        }
-      } catch (error) {}
-    };
-  
-    const handleClose = () => {
-      onClose();
-      setIsFinalCalculateLoading(false);
-      setIsCalcualtedData(false);
-    };
-    
-    console.log(id);
-    
-
-    return (
-      <Modal size={"xl"} isOpen={isOpen} onClose={handleClose} >
-        <ModalOverlay />
-        <ModalContent maxW={1000}>
-          <ModalHeader fontSize={"md"}>Exit Transaction</ModalHeader>
-          <ModalCloseButton />
-          <ModalBody>
-            {/* <Text as="label" mb="5px" fontSize="sm" fontWeight={500}>
-              Amount to Distribute
-            </Text> */}
-            <HStack onSubmit={handleSubmit(onSubmit)} as={"form"} mb={4} alignItems={'center'}>
-              {/* <Input placeholder="$00.00" size={"sm"} className="col" /> */}
-              {/* <FormControl isInvalid={errors.amount} isRequired>*/}
-                <Text textAlign={"right"} fontSize={"sm"}>
-                  Exit Amount :
-                </Text> 
-              <Text
-                textAlign={"start"}
-                bg={"green.100"}
-                p={2}
-                rounded={"md"}
-                fontSize={"sm"}
-                pt={1}
-                pb={1}
-                fontWeight={600}
-              >
-                ${" "}
-                {parseFloat(IODetails?.ioMVNAV || 0).toLocaleString(undefined, {
-                  minimumFractionDigits: 2,
-                  maximumFractionDigits: 2,
-                })}
-              </Text>
-  
-              {/* </FormControl> */}
-            </HStack>
-  
-            {/* {calcualtedData && ( */}
-            <NormalData
-              emptyMessage={`We don't have any Sponers `}
-              tableHeadRow={tableHeadRow}
-              data={extractedArray}
-              // total={<Total />}
-              // isLoading={isLoading}
-            />
-            {/* ) } */}
-          </ModalBody>
-          {localStorage?.getItem("role") !== encryptString(import.meta.env.VITE_VITE_MAKER) && <ModalFooter pt={0}>
-            <Box display={"flex"} justifyContent={"center"} gap={2}>
-                <Button
-                  rounded={"sm"}
-                  size={"xs"}
-                  textTransform={"inherit"}
-                  fontWeight={500}
-                  px={3}
-                  py={2}
-                  onClick={() => {
-                    setActionId(id); // Use the `id` variable from params
-                    onConfirmOpen();
-                  }}
-                  colorScheme="forestGreen"
-                  variant={"solid"}
-                  cursor={"pointer"}
-                >
-                  Approve
-                </Button>
-                <Button
-                  rounded={"sm"}
-                  size={"xs"}
-                  textTransform={"inherit"}
-                  fontWeight={500}
-                  px={3}
-                  py={2}
-                  onClick={() => {
-                    setActionId(id); // Use the `id` variable from params
-                    onRejectOpen();
-                  }}
-                >
-                  Reject
-                </Button>
-            </Box>
-          </ModalFooter>}
-        </ModalContent>
-        <ApprovedExit
-            isOpen={isConfirmOpen}
-            onClose={onConfirmClose}
-            onBigModalClose={onClose}
-            id={investerId}
-        />
-        <RequestRejectModal
-            isOpen={isRejectOpen}
-            onClose={onRejectClose}
-            onBigModalClose={onClose}
-            id={investerId}
-        />
-      </Modal>
-    ); 
-  };
-  
-  export default ViewExit;
-  

src/Pages/IO_Management/CreateIO/InvestmentDocument.jsx

@@ -363,7 +363,7 @@ const InvestmentDocument = ({ control, errors, enableNextTab, index, }) => {
       <CustomAlertDialog
         onClose={() => setDeleteAlert(false)}
         isOpen={deleteAlert}
-        message="Are you sure you want to delete the Investment?"
+        message="Are you sure you want to delete the sponsor?"
         alertHandler={handleDelete}
         isLoading={isLoading}
       />

src/Pages/IO_Management/CreateIO/Investors.jsx

@@ -100,19 +100,19 @@ const Investors = ({ data }) => {
     0
   );
 
-  // Table setup 
+  // Table setup
   const tableHeadRow = [
     "Client ID",
-    "First Name",
-    "Last Name",
-    "Investment Amount",
+    "First name",
+    "Last name",
+    "Investment amount",
     "Percentage",
     "Market Value",
     "Return on Investment",
     "Distribution",
     "Distribution Percent",
     "Total Return",
-    "Total Return on Investment",
+    "Total return on Investment",
   ];
 
   const handleUpdateStatus = debounce((id) => {
@@ -164,7 +164,7 @@ const Investors = ({ data }) => {
     "Distribution": parseFloat(item?.Distribution_Amt) || 0, // Convert to float
     "Distribution Percent": parseFloat(item?.Distribution_Per) || 0, // Convert to float
     "Total Return": parseFloat(item?.Total_Return) || 0, // Convert to float
-    "Total Return on Investment": parseFloat(item?.Total_Return_On_Investment) || 0, // Convert to float
+    "Total return on Investment": parseFloat(item?.Total_Return_On_Investment) || 0, // Convert to float
   }));
 
   console.log(exportInvestorDetails);
@@ -182,7 +182,7 @@ const Investors = ({ data }) => {
         {item?.clientReference_id}
       </Text>
     ),
-    "First Name": (
+    "First name": (
       <Text
         justifyContent={slideFromRight ? "right" : "center"}
         as={"span"}
@@ -193,7 +193,7 @@ const Investors = ({ data }) => {
         {item.firstName}
       </Text>
     ),
-    "Last Name": (
+    "Last name": (
       <Text
         justifyContent={slideFromRight ? "right" : "center"}
         as={"span"}
@@ -204,7 +204,7 @@ const Investors = ({ data }) => {
         {item.lastName}
       </Text>
     ),
-    "Investment Amount": (
+    "Investment amount": (
       <Text
         justifyContent={slideFromRight ? "right" : "left"}
         as={"span"}
@@ -313,7 +313,7 @@ const Investors = ({ data }) => {
         })}`}
       </Text>
     ),
-    "Total Return on Investment": (
+    "Total return on Investment": (
       <Text
         justifyContent={slideFromRight ? "right" : "center"}
         as={"span"}
@@ -508,7 +508,7 @@ console.log(IODetails?.investors);
             > 
               Export xls
             </Button>
-            {/* <Box as="span">
+            <Box as="span">
               <Icon
                 ms={0}
                 animation={
@@ -524,7 +524,7 @@ console.log(IODetails?.investors);
                 _hover={{ bg: "gray.100" }}
                 cursor={"pointer"}
               />
-            </Box> */}
+            </Box>
           </Box>
 
           <HStack

src/Pages/IO_Management/CreateIO/KeyMerits.jsx

@@ -89,7 +89,7 @@ const KeyMerits = ({ enableNextTab, index, data: prepopData }) => {
       const res = await deleteKeyMerits(actionId);
       if (res?.data?.statusCode === 200) {
         toast({
-          render: () => <ToastBox message={res?.data?.message} status={"success"}  />,
+          render: () => <ToastBox message={res?.data?.message} />,
         });
         setIsBtnLoading(false);
         setDeleteAlert(false);

src/Pages/IO_Management/EditIO/InvestmentEdit.jsx

@@ -297,7 +297,7 @@ const InvestmentEdit = ({ isOpen, onClose, thirdField, id, data }) => {
         onClose={() => setAlert(false)}
         alertHandler={handleConfirm}
         isLoading={isLoading}
-        message="Are you sure you want to add this Investment?"
+        message="Are you sure you want to add this document?"
       />
     </Drawer>
   );

src/Pages/IO_Management/IOArtifactsAdd.jsx

@@ -10,7 +10,6 @@ import {
   DrawerOverlay,
   FormControl,
   FormErrorMessage,
-  FormHelperText,
   FormLabel,
   Icon,
   Image,
@@ -36,7 +35,7 @@ import { IoMdRemoveCircleOutline } from "react-icons/io";
 
 const investmentImageSchema = yup.object().shape({
   artifactName: yup.string().required("Artifact image name is required")
-  .max(50, "Approve Comment cannot be more than 50 characters"),
+  .max(25, "File name must be at most 25 characters"),
   artifactPathName: yup.mixed().required("Artifact image is required"),
 });
 
@@ -227,24 +226,19 @@ const IOArtifactsAdd = ({
                   <Controller
                     name="artifactName"
                     control={control}
-                    //  maxLength={50} 
                     render={({ field }) => (
                       <Input
                         {...field}
                         fontSize={"sm"}
                         type="text"
                         size={"sm"}
-                        maxLength={50} 
+                        maxLength={25} 
                       />
                     )}
-                  /> 
+                  />
                   <FormErrorMessage fontSize={"xs"} fontWeight={500}>
                     {errors.artifactName?.message}
                   </FormErrorMessage>
-                  <FormHelperText fontSize="xs" color="gray.500">
-                    <Box as="span" me={1}>Maximum length should be 50 characters. You have entered </Box>
-                    {watch("artifactName")?.length || 0} characters.
-                  </FormHelperText>
                 </FormControl>
 
                 <FormControl
@@ -360,7 +354,7 @@ const IOArtifactsAdd = ({
         isOpen={alert}
         onClose={handleAlertClose}
         alertHandler={handleSave}
-        message={"Are you sure you want to update this artifact?"}
+        message={"Are you sure you want to add this artifact?"}
         isLoading={loading}
       />
     </>

src/Pages/IO_Management/InvestmentDocuments.jsx

@@ -60,7 +60,7 @@ export const investmentDocSchema = yup.object().shape({
   //   return value && value.size <= 2 * 1024 * 1024; // 2MB in bytes
   // })
   fileName: yup.string().required("File name is required")
-  .max(30, "File name must be at most 30 characters"), // Maximum length validation,
+  .max(25, "File name must be at most 25 characters"), // Maximum length validation,
   documentNameArabic: yup.string().required("File name Arabic is required")
   .max(25, "File name must be at most 30 characters"), 
 });
@@ -91,7 +91,6 @@ const InvestmentDocuments = ({
   const {
     register,
     handleSubmit,
-    watch,
     reset,
     formState: { errors },
   } = useForm({
@@ -211,17 +210,13 @@ const InvestmentDocuments = ({
                   fontSize="sm"
                   type="text"
                   size="sm"
-                  maxLength={30} // Maximum length constraint in the input field
+                  maxLength={25} // Maximum length constraint in the input field
                 />
                 {errors.fileName && (
                   <Text mt={1} fontSize="xs" fontWeight={500} color="red">
                     {errors.fileName.message}
                   </Text>
                 )}
-                <FormHelperText fontSize="xs" color="gray.500">
-                    <Box as="span" me={1}>Maximum length should be 30 characters. You have entered </Box>
-                    {watch("fileName")?.length || 0} characters.
-                </FormHelperText>
               </FormControl>
 
 
@@ -234,17 +229,13 @@ const InvestmentDocuments = ({
                   type="text"
                   size="sm"
                   textAlign={'right'}
-                  maxLength={35} // Maximum length constraint in the input field
+                  maxLength={30} // Maximum length constraint in the input field
                 />
                 {errors.documentNameArabic && (
                   <Text mt={1} fontSize="xs" fontWeight={500} color="red">
                     {errors.documentNameArabic.message}
                   </Text>
                 )}
-                <FormHelperText fontSize="xs" color="gray.500">
-                    <Box as="span" me={1}>Maximum length should be 35 characters. You have entered </Box>
-                    {watch("documentNameArabic")?.length || 0} characters.
-                </FormHelperText>
               </FormControl>
 
 

src/Pages/IO_Management/KeyMeritsAdd.jsx

@@ -360,7 +360,7 @@ const KeyMeritsAdd = ({ isOpen, onClose, firstField, id, icons }) => {
         onClose={handleClose}
         // alertHandler={handleSave}
         alertHandler={handleConfirm}
-        message={"Are you sure you want to add this key merits?"}
+        message={"Are you sure you want to add this key merit?"}
         isLoading={isLoading}
       />
     </>

src/Pages/IO_Management/KeyMeritsEdit.jsx

@@ -367,7 +367,7 @@ const KeyMeritsEdit = ({
         isOpen={alert}
         onClose={() => setAlert(false)}
         alertHandler={handleSave}
-        message={"Are you sure you want to update this key merits?"}
+        message={"Are you sure you want to add this key merit?"}
         isLoading={isLoading}
       />
     </>

src/Pages/IO_Management/ViewIO/HeaderModal/AmountInvested.jsx

@@ -46,7 +46,7 @@ const AmountInvested = ({ isOpen, onClose }) => {
   const toast = useToast();
   const id = params?.id;
   const {
-    control, 
+    control,
     register,
     handleSubmit,
     reset,
@@ -114,7 +114,7 @@ const AmountInvested = ({ isOpen, onClose }) => {
 
   return (
     <Modal isOpen={isOpen} onClose={onClose}>
-      <ModalOverlay /> 
+      <ModalOverlay />
       <ModalContent>
         <ModalHeader fontSize={"md"}>Amount Invested</ModalHeader>
         <ModalCloseButton />

src/Pages/IO_Management/ViewIO/HeaderModal/DistributionInvestor.jsx

@@ -28,10 +28,8 @@ import NormalData from "../../../../Components/DataTable/NormalTable";
 import { useContext, useState } from "react";
 import { AddIcon } from "@chakra-ui/icons";
 import {
-  useAddIOTransactionMutation,
   useGetDistributedToInvestorMutation,
   useGetDistributionInvestorMutation,
-  useSaveIOTransactionMutation,
   useUpdateExitToInvestorMutation,
 } from "../../../../Services/io.service";
 import { useParams } from "react-router-dom";
@@ -44,7 +42,6 @@ import CurrencyInput from "../../../../Components/CurrencyInput";
 import { IoCalculator } from "react-icons/io5";
 import { debounce } from "../../../Master/Sponser/AddSponser";
 import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
-import { validate } from "uuid";
 
 
 
@@ -77,6 +74,11 @@ const DistributionInvestor = ({ isOpen, onClose }) => {
     amount: yup
       .string()
       .required("Amount is required")
+      .test(
+        "is-positive",
+        "Amount should be greater than zero",
+        (value) => parseFloat(value) > 0 // Check if the amount is greater than zero
+      )
       .test(
         "max", 
         `Distribution amount should not be greater than IO cash amount ${IODetails?.ioCash}`, 
@@ -89,6 +91,7 @@ const DistributionInvestor = ({ isOpen, onClose }) => {
         }
       ),
   });
+  
 
  const investor = yup.object().shape({
     amount: yup.string().required("Amount is required"),
@@ -104,8 +107,6 @@ const DistributionInvestor = ({ isOpen, onClose }) => {
     resolver: yupResolver(investorExit),
   });
 
-
-  const [saveIOTransaction] = useSaveIOTransactionMutation();
   
 
   // ====================================================[Table Setup]================================================================
@@ -319,81 +320,45 @@ const DistributionInvestor = ({ isOpen, onClose }) => {
     } catch (error) {}
   };
 
-  // const onFinalSubmit = async (data) => {
-  //   setIsFinalCalculateLoading(true);
-  //   if (!isCalcualtedData) {
-  //     setIsFinalCalculateLoading(false);
-  //     return toast({
-  //       render: () => (
-  //         <ToastBox
-  //           message={"Please calculate investment first."}
-  //           status="warn"
-  //         />
-  //       ),
-  //     });
-  //   }
-    
-
-  //   const finalData = {
-  //     transactionAmount: data?.amount,
-  //   };
-
-  //   try {
-  //     const res = await  getFinalDistributionInvestment({ id, data: finalData });
-  //     console.log(finalData);
-
-  //     if (res?.error?.status === 401) {
-  //       toast({
-  //         render: () => (
-  //           <ToastBox message={res?.error?.data?.message} status="error" />
-  //         ),
-  //       });
-  //     } else if (res?.data?.statusCode === 200) {
-  //       toast({
-  //         render: () => <ToastBox message={res?.data?.message} />,
-  //       });
-  //       handleClose();
-  //     }
-  //   } catch (error) {
-  //     console.error("An error occurred:", error);
-  //   } finally {
-  //     handleClose();
-  //   }
-  // };
-
   const onFinalSubmit = async (data) => {
     setIsFinalCalculateLoading(true);
-    const currentDate = new Date();
-    const dataToSend = {
-      transactionDate:  currentDate,
-      transactionAmount: data?.amount,
+    if (!isCalcualtedData) {
+      setIsFinalCalculateLoading(false);
+      return toast({
+        render: () => (
+          <ToastBox
+            message={"Please calculate investment first."}
+            status="warn"
+          />
+        ),
+      });
     }
-    
-    console.log("dataaaaaaa",dataToSend); 
+
+    const finalData = {
+      transactionAmount: data?.amount,
+    };
 
     try {
-      const res = await saveIOTransaction({ id,data: dataToSend });
-      console.log(res?.data?.data);
-      onClose();
-       if (!isCalcualtedData) {
-            setIsFinalCalculateLoading(false);
-            return toast({
-              render: () => (
-                <ToastBox
-                  message={"Please calculate investment first."}
-                  status="warn"
-                />
-              ),
-            });
-          } else if (res?.error) {
+      const res = await  getFinalDistributionInvestment({ id, data: finalData });
+      console.log(finalData);
+
+      if (res?.error?.status === 401) {
         toast({
           render: () => (
-            <ToastBox status={"error"} message={res?.error?.data?.message} />
+            <ToastBox message={res?.error?.data?.message} status="error" />
           ),
         });
-        // setIsLoading(false);
+      } else if (res?.data?.statusCode === 200) {
+        toast({
+          render: () => <ToastBox message={res?.data?.message} />,
+        });
+        handleClose();
       }
-    } catch (error) {}
+    } catch (error) {
+      console.error("An error occurred:", error);
+    } finally {
+      handleClose();
+    }
   };
 
   const handleClose = () => {

src/Pages/IO_Management/ViewIO/HeaderModal/Exit.jsx

@@ -28,7 +28,6 @@ import NormalData from "../../../../Components/DataTable/NormalTable";
 import { useContext, useState } from "react";
 import { AddIcon } from "@chakra-ui/icons";
 import {
-  useExitIOTransactionMutation,
   useGetDistributedToInvestorMutation,
   useGetDistributionInvestorMutation,
   useUpdateExitToInvestorMutation,
@@ -95,7 +94,7 @@ const Exit = ({ isOpen, onClose }) => {
       const res = await getDistributionInvestment({ id, data });
       console.log(res?.data?.data);
 
-      if (res?.error?.status === 401) { 
+      if (res?.error?.status === 401) {
         // toast({
         //   render: () => (
         //     <ToastBox message={res?.error?.data?.message} status={"error"} />
@@ -123,7 +122,7 @@ const Exit = ({ isOpen, onClose }) => {
   const [getDistributionInvestment] = useGetDistributionInvestorMutation();
   const [getFinalDistributionInvestment] =
     useGetDistributedToInvestorMutation();
-  const [exitIOTransaction] = useExitIOTransactionMutation();
+  const [updateExitToInvestor] = useUpdateExitToInvestorMutation();
 
   const investor = yup.object().shape({
     amount: yup.string().required("Amount is required"),
@@ -341,69 +340,46 @@ const Exit = ({ isOpen, onClose }) => {
     } catch (error) {}
   };
 
-  // const onFinalSubmit = async (data) => {
-  //   console.log("hit");
-  //   setIsFinalCalculateLoading(true);
-  //   const finalData = {
-  //     transactionAmount: IODetails?.ioMVNAV,
-  //   };
+  const onFinalSubmit = async (data) => {
+    console.log("hit");
+    setIsFinalCalculateLoading(true);
+    // if (!isCalcualtedData) {
+    //   setIsFinalCalculateLoading(false);
+    //   return toast({
+    //     render: () => (
+    //       <ToastBox
+    //         message={"Please calculate investment first."}
+    //         status="warn"
+    //       />
+    //     ),
+    //   });
+    // }
 
-  //   try {
-  //     const res = await exitIOTransaction({ id, data: finalData });
-  //     console.log(finalData);
-
-  //     if (res?.error?.status === 401) {
-  //       toast({
-  //         render: () => (
-  //           <ToastBox message={res?.error?.data?.message} status="error" />
-  //         ),
-  //       });
-  //     } else if (res?.data?.statusCode === 200) {
-  //       toast({
-  //         render: () => <ToastBox message={res?.data?.message} />,
-  //       });
-  //       handleClose();
-  //     }
-  //   } catch (error) {
-  //     console.error("An error occurred:", error);
-  //   } finally {
-  //     handleClose();
-  //   }
-  // };
-
-  const onFinalSubmit = async () => {
-    setIsCalculateLoading(true);
-    const currentDate = new Date();
-    const dataToSend = {
-      transactionDate:  currentDate,
+    const finalData = {
       transactionAmount: IODetails?.ioMVNAV,
-    }
-     
+    };
 
     try {
-      const res = await exitIOTransaction({ id,data: dataToSend });
-      console.log(res?.data?.data);
+      const res = await updateExitToInvestor({ id, data: finalData });
+      console.log(finalData);
 
-      onClose();
-      if (!isCalcualtedData) {
-        setIsFinalCalculateLoading(false);
-        return toast({
-          render: () => (
-            <ToastBox
-            message={"Please calculate investment first."}
-            status="warn"
-            />
-          ),
-        });
-          } else if (res?.error) {
+      if (res?.error?.status === 401) {
         toast({
           render: () => (
-            <ToastBox status={"error"} message={res?.error?.data?.message} />
+            <ToastBox message={res?.error?.data?.message} status="error" />
           ),
         });
-        setIsLoading(false);
+      } else if (res?.data?.statusCode === 200) {
+        toast({
+          render: () => <ToastBox message={res?.data?.message} />,
+        });
+        handleClose();
       }
-    } catch (error) {}
+    } catch (error) {
+      console.error("An error occurred:", error);
+    } finally {
+      handleClose();
+    }
   };
 
   const handleClose = () => {
@@ -413,7 +389,7 @@ const Exit = ({ isOpen, onClose }) => {
   };
 
   return (
-    <Modal size={"xl"} isOpen={isOpen} onClose={handleClose} >
+    <Modal size={"xl"} isOpen={isOpen} onClose={handleClose}>
       <ModalOverlay />
       <ModalContent maxW={1000}>
         <ModalHeader fontSize={"md"}>Exit Transaction</ModalHeader>
@@ -459,7 +435,7 @@ const Exit = ({ isOpen, onClose }) => {
           {/* ) } */}
         </ModalBody>
         <ModalFooter pt={0}>
-          {/* {isCalcualtedData ? ( */}
+          {isCalcualtedData ? (
             <>
               <Button
                 bg={"hsla(139, 100%, 14%, 1)"}
@@ -479,9 +455,9 @@ const Exit = ({ isOpen, onClose }) => {
                 Close
               </Button>
             </>
-          {/* ) : (
+          ) : (
             ""
-          )} */}
+          )}
         </ModalFooter>
       </ModalContent>
     </Modal>

src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIONav.jsx

@@ -55,7 +55,7 @@ const UpdateIONav = ({ isOpen, onClose }) => {
 
   const [createIoNav] = useCreateIoNavMutation()
 
- 
+
   const onSubmit = async (data) => {
     setIsLoading(true);
     try {

src/Pages/IO_Management/ViewIO/ViewIOdata.jsx

@@ -1,10 +1,7 @@
 import {
   Box,
   Button,
-  Icon,
   Input,
-  keyframes,
-  Stack,
   Tab,
   TabList,
   TabPanel,
@@ -19,7 +16,7 @@ import { useContext, useEffect, useState } from "react";
 import FormInputView from "../../../Components/FormInputView";
 import { useForm } from "react-hook-form"; // assuming react-hook-form is used
 import { OPACITY_ON_LOAD } from "../../../Layout/animations";
-import { ArrowBackIcon, RepeatIcon } from "@chakra-ui/icons";
+import { ArrowBackIcon } from "@chakra-ui/icons";
 import CustomAlertDialog from "../../../Components/CustomAlertDialog";
 import ViewIOdataHeader from "./ViewIOdataHeader";
 import ViewIOdetails from "./ViewIOdetails";
@@ -35,41 +32,21 @@ import KeyMerits from "../CreateIO/KeyMerits";
 import Investors from "../CreateIO/Investors";
 import EditIO from "../EditIO/EditIO";
 import IOArtifacts from "../CreateIO/IOArtifacts";
-// import IOCashDetails from "../CreateIO/IOCashDetailsold";
-// import IONAVDetails from "../CreateIO/IONAVDetailsOld";
-import { useGetIOByIdQuery, useGetIOprepopulateDataQuery } from "../../../Services/io.service";
+import IOCashDetails from "../CreateIO/IOCashDetails";
+import IONAVDetails from "../CreateIO/IONAVDetails";
+import { useGetIOprepopulateDataQuery } from "../../../Services/io.service";
 import UnderConstruction from "../../UnderConstruction";
 import Destribution from "../CreateIO/Destribution";
-import IOCashDetails from "../CreateIO/IOCashDetails/IOCashDetails";
-import IONAVDetails from "../CreateIO/IONAVDetails/IONAVDetails";
-import IOTransaction from "../CreateIO/IOTransaction/IOTransaction";
-import { GoDotFill } from "react-icons/go";
-
-const rotate = keyframes`
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-`;
 
 const ViewIOdata = () => {
   const params = useParams();
   const id = params?.id;
-  const { data, error, isLoading, refetch } = useGetIOprepopulateDataQuery();
-  const {
-    data: IObyID,
-    isLoading: IObyIDisLoading,
-    error: IObyIDerror,
-    refetch: IObyIDrefetch,
-  } = useGetIOByIdQuery(id, { skip: !id });
+  const { data, error, isLoading } = useGetIOprepopulateDataQuery();
   const { isOpen, onOpen, onClose } = useDisclosure();
   const navigate = useNavigate();
   const [isEditing, setIsEditing] = useState(false);
-  const [isRefetchLoading, setIsRefetchLoading] = useState(false);
   const { IODetails, setIODetails } = useContext(GlobalStateContext);
-  console.log(IODetails?.isInvestedAmount);
+  console.log(IODetails?.isInvestedAmount); 
 
   const tabs = [
     { label: "IO Details", content: <ViewIOdetails data={data?.data} /> },
@@ -87,22 +64,9 @@ const ViewIOdata = () => {
       label: "Distribution to Investors",
       content: <Destribution data={data?.data} />,
     },
-    {
-      label: "IO Transaction",
-      content: <IOTransaction data={data?.data} />,
-    },
     // { label: "Distribution to Investors", content: <UnderConstruction h={'75vh'}  />  },
   ];
 
-  const handleRefresh = async () => {
-    setIsRefetchLoading(true);
-
-    await IObyIDrefetch();
-    setIsRefetchLoading(false);
-  };
-
-  console.log(IODetails?.ioNAVHistory);
-
   return (
     <Box
       {...OPACITY_ON_LOAD}
@@ -123,7 +87,7 @@ const ViewIOdata = () => {
 
       <Tabs mt={4}>
         <TabList justifyContent={"space-between"} pe={4} alignItems={"center"}>
-          <Box display={"flex"} position={"relative"} w={"100%"}>
+          <Box display={"flex"}>
             {tabs.map(({ label }, index) => (
               <Tab
                 px={3}
@@ -132,80 +96,20 @@ const ViewIOdata = () => {
                   index === 1 ||
                   index === 2 ||
                   index === 3 ||
-                  index === 4 ||
-                  index === 8
+                  index === 4
                     ? false
                     : !IODetails?.isInvestedAmount
                 }
-                // isDisabled={
-                //   index === 0 ||
-                //   index === 1 ||
-                //   index === 2 ||
-                //   index === 3 ||
-                //   index === 4
-                //     ? false
-                //     : !IODetails?.isInvestedAmount
-                // }
                 key={index}
-                fontSize={"xs"}
+                fontSize={"sm"}
                 _selected={{
                   color: "#004118",
                   borderBottom: "2px solid #38a169",
                 }}
-                fontWeight={500}
-                position={"relative"}
               >
-                {label}{" "}
-                {(index === 5 &&
-                  IODetails?.ioCashStatusHistory?.Pending?.length !== 0) ||
-                (index === 6 &&
-                  IODetails?.ioNAVStatusHistory?.Pending?.length !== 0) ||
-                (index === 8 &&
-                  IODetails?.ioTransactionRecords?.Pending?.length !== 0) ? (
-                  <Box
-                    as="span"
-                    right={0}
-                    color={"forestGreen"}
-                    top={1}
-                    position={"absolute"}
-                  >
-                    <GoDotFill />
-                  </Box>
-                ) : (
-                  ""
-                )}
+                {label}
               </Tab>
             ))}
-            {/* <Box as="span" position={"absolute"} right={2} bottom={1}>
-              <Icon
-                ms={0}
-                animation={
-                  isRefetchLoading ? `${rotate} 1s linear infinite` : "none"
-                }
-                bg={"gray.50"}
-                onClick={handleRefresh}
-                fontWeight={600}
-                as={RepeatIcon}
-                boxSize={8}
-                p={2}
-                rounded={"full"}
-                _hover={{ bg: "gray.100" }}
-                cursor={"pointer"}
-              />
-            </Box> */}
-            <Stack position={"absolute"} right={1} bottom={1} direction="row" spacing={4}>
-              <Button
-                isLoading={isRefetchLoading}
-                loadingText="Refresh"
-                colorScheme="forestGreen"
-                variant="solid"
-                size={'xs'}
-                onClick={handleRefresh}
-                fontWeight={400}
-              >
-                Refresh
-              </Button>
-            </Stack>
           </Box>
         </TabList>
         <TabPanels>

src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx

@@ -24,7 +24,6 @@ import {
   Box,
   Icon,
   HStack,
-  useToast,
 } from "@chakra-ui/react";
 import header from "../../../assets/IOheader.png";
 import { HiDotsVertical } from "react-icons/hi";
@@ -42,16 +41,12 @@ import Cancle from "./HeaderModal/Cancle";
 import { AddIcon } from "@chakra-ui/icons";
 import { GrGallery } from "react-icons/gr";
 import Loader01 from "../../../Components/Loaders/Loader01";
-import { useUpdateTransactionMutation } from "../../../Services/io.service";
-import ToastBox from "../../../Components/ToastBox";
-import { encryptString } from "../../../Constants/Constants";
 // import { formatCurrency } from "../../../Components/CurrencyInput";
 // import { removeTrailingZeros } from "../../../Constants/Constants";
 
 const ViewIOdataHeader = ({ data, isLoading }) => {
-  const params = useParams() 
-    const toast = useToast();
-    const id = params?.id
+  const params = useParams();
+  const id = params?.id;
   const { isOpen, onOpen, onClose } = useDisclosure();
   const btnRef = useRef();
   const { IODetails, isIOloading } = useContext(GlobalStateContext);
@@ -113,95 +108,11 @@ const ViewIOdataHeader = ({ data, isLoading }) => {
       IODetails?.artifactsImage?.[0]?.artifactPathName
   );
 
-  const [updateTransaction] = useUpdateTransactionMutation()
-
-  const handleDistributionInvestors = async () =>{
-    
-    try {
-       const res = await updateTransaction(id)
-       
-       if (res?.data) {
-        //  toast({
-        //    render: () => (
-        //     <ToastBox status={"success"} message={res?.data?.message} />
-        //    ),
-        //  });
-        //  setIsLoading(false);
-        onDistInvestorOpen()
- 
-       } else if (res?.error) {
-         toast({
-           render: () => (
-             <ToastBox status={"error"} message={res?.error?.data?.message} />
-           ),
-         });
-        //  setIsLoading(false);
-       }
-    } catch (error) { 
-     
-    }
-   }
-
-   const handleExit = async () =>{
-    
-    try {
-       const res = await updateTransaction(id)
-       
-       if (res?.data) {
-        //  toast({
-        //    render: () => (
-        //     <ToastBox status={"success"} message={res?.data?.message} />
-        //    ),
-        //  });
-        //  setIsLoading(false);
-        onExitOpen()
- 
-       } else if (res?.error) {
-         toast({
-           render: () => (
-             <ToastBox status={"error"} message={res?.error?.data?.message} />
-           ),
-         });
-        //  setIsLoading(false);
-       }
-    } catch (error) { 
-     
-    }
-   }
-
-   const handleInvestment = async () =>{
-    
-    try {
-       const res = await updateTransaction(id)
-       
-       if (res?.data) {
-        //  toast({
-        //    render: () => (
-        //     <ToastBox status={"success"} message={res?.data?.message} />
-        //    ),
-        //  });
-        //  setIsLoading(false);
-        onInvestmentOpen()
- 
-       } else if (res?.error) {
-         toast({
-           render: () => (
-             <ToastBox status={"error"} message={res?.error?.data?.message} />
-           ),
-         });
-        //  setIsLoading(false);
-       }
-    } catch (error) { 
-     
-    }
-   }
-   
-
   const menu = [
     {
       id: 1,
       title: "Amount Invested",
-      onClickFunction: handleInvestment,
+      onClickFunction: onInvestmentOpen,
     },
     // {
     //   id:2,
@@ -216,8 +127,8 @@ const ViewIOdataHeader = ({ data, isLoading }) => {
     {
       id: 6,
       title: "Distribution To Investors",
-      onClickFunction: handleDistributionInvestors,
-    }, 
+      onClickFunction: onDistInvestorOpen,
+    },
     {
       id: 5,
       title: "Update IO NAV",
@@ -226,7 +137,7 @@ const ViewIOdataHeader = ({ data, isLoading }) => {
     {
       id: 8,
       title: "Exit",
-      onClickFunction: handleExit,
+      onClickFunction: onExitOpen,
     },
     {
       id: 9,
@@ -533,8 +444,8 @@ const ViewIOdataHeader = ({ data, isLoading }) => {
         alignItems={"start"}
         height={"95px"}
       >
-        {localStorage?.getItem("role") === encryptString(import.meta.env.VITE_VITE_MAKER) && <Menu>
-          <MenuButton 
+        <Menu>
+          <MenuButton
             className="link p-1 rounded-1 "
             bg={"#fff"}
             _hover={{ backgroundColor: "#fff !important" }}
@@ -565,7 +476,7 @@ const ViewIOdataHeader = ({ data, isLoading }) => {
               </MenuItem>
             ))}
           </MenuList>
-        </Menu>}
+        </Menu>
 
         {/* Modals */}
         <AmountInvested isOpen={isInvestmentOpen} onClose={onInvestmentClose} />

src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx

@@ -1,4 +1,4 @@
-import { Box, Button, Text } from "@chakra-ui/react";
+import { Box, Button } from "@chakra-ui/react";
 import React, { useContext, useEffect } from "react";
 
 import { useNavigate, useParams } from "react-router-dom";
@@ -240,6 +240,11 @@ const ViewIOdetails = () => {
       width: "32.3%",
       value: IObyID?.data?.isShariah,
     },
+
+
+
+
+
     {
       label: "Investment Type",
       placeHolder: "Select option",
@@ -346,22 +351,19 @@ const ViewIOdetails = () => {
 
   return (
     <Box position={"relative"}>
-      <Box display={"flex"} justifyContent={"space-between"}>
-        <Text></Text>
-        <Button
-          // position={"absolute"}
-          // top={"-62px"}
-          right={0}
-          onClick={() => navigate(`/create-io/${params?.id}`)}
-          ps={4}
-          pe={4}
-          colorScheme="forestGreen"
-          rounded={"sm"}
-          size={"xs"}
-        >  
-          Edit IO
-        </Button>
-      </Box>
+      <Button
+        position={"absolute"}
+        top={"-62px"}
+        right={0}
+        onClick={() => navigate(`/create-io/${params?.id}`)}
+        ps={4}
+        pe={4}
+        colorScheme="forestGreen"
+        rounded={"sm"}
+        size={"xs"}
+      >  
+        Edit IO
+      </Button>
       <FormInputView  groupedFields={groupedFields} />
     </Box>
   );

src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx

@@ -6,6 +6,8 @@ import {
   HStack,
   Input,
   Select,
+  Switch,
+  Tag,
   Text,
   Tooltip,
   useDisclosure,
@@ -101,6 +103,7 @@ const InvestorDetails = () => {
   // ====================================================[Table Setup]================================================================
   const tableHeadRow = [
     "Sr No",
+    
     "Client ID",
     "First Name",
     "Last Name",
@@ -220,7 +223,7 @@ const InvestorDetails = () => {
 
         >
           {/* {item.KYCStatus ? "Completed" : "Not complete"} */}
-          {item?.KYCStatus === true ? "Completed" : "NotCompleted"}
+          {item?.KYCStatus === true ? "Completed" : "Not Completed"}
         </Text>
       </Box>
     ),

src/Pages/Investor_Management/InvestorDetails/Kyc.jsx

@@ -49,7 +49,7 @@ const Kyc = () => {
           <HStack spacing={4} mb={4}>
             <FormControl>
               <FormLabel mb={1} fontSize={"sm"}>
-                Address line 1
+                House/Unit
               </FormLabel>
               <Input
                 bg={"#ccc3"}
@@ -62,7 +62,7 @@ const Kyc = () => {
             </FormControl>
             <FormControl>
               <FormLabel mb={1} fontSize={"sm"}>
-                Address line 2
+                Road/Street
               </FormLabel>
               <Input
                 bg={"#ccc3"}

src/Pages/Login.jsx

@@ -3,7 +3,7 @@ import Input01 from "../Components/Inputs/Input01";
 import logo from "../assets/logo2.png";
 import { useDispatch, useSelector } from "react-redux";
 import { loginUser } from "../Redux/Slice/auth";
-import { useContext, useEffect, useRef, useState } from "react";
+import { useContext, useEffect, useState } from "react";
 import Button01 from "../Components/Buttons/Button01";
 import { yupResolver } from "@hookform/resolvers/yup";
 import { useForm } from "react-hook-form";
@@ -12,15 +12,12 @@ import Loader01 from "../Components/Loaders/Loader01";
 import Asset1 from "../assets/asset1.png";
 import Asset2 from "../assets/asset2.png";
 import {
-  Box,
   Button,
   FormControl,
   FormLabel,
   Input,
   InputGroup,
   InputRightElement,
-  Text,
-  useDisclosure,
   useToast,
 } from "@chakra-ui/react";
 import GlobalStateContext from "../Contexts/GlobalStateContext";
@@ -31,7 +28,6 @@ import { useLoginMutation } from "../Services/token.serivce";
 
 // import { yupResolver } from "@hookform/resolvers/yup";
 import * as Yup from "yup";
-import ForgetPassword from "./ForgetPassword";
 
 
 const validationSchema = Yup.object().shape({
@@ -54,8 +50,6 @@ const Login = () => {
   const dispatch = useDispatch();
 
   const [login] = useLoginMutation()
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const firstField = useRef();
 
   useEffect(() => {
     
@@ -211,7 +205,7 @@ const Login = () => {
           )}
         </FormControl>
 
-        <FormControl className="mb-2">
+        <FormControl className="mb-4">
           <FormLabel className="rubix-text-dark ps-1 web-text-medium fw-bold">
             Password <span className="text-danger">*</span>
           </FormLabel>
@@ -244,9 +238,6 @@ const Login = () => {
             </span>
           )}
         </FormControl>
-        <Box fontSize={"sm"} display={"flex"} justifyContent={"end"} mt={0}>
-          <Text fontWeight={500} cursor={"pointer"} onClick={onOpen}>Forget Password?</Text>
-        </Box>
 
         <Button
           isLoading={isLoading}
@@ -256,8 +247,6 @@ const Login = () => {
           color={"whitesmoke"}
           colorScheme="green.500"
           size="lg"
-          fontWeight={500}
-          fontSize={"md"}
         >
           Log In
         </Button>
@@ -328,11 +317,6 @@ const Login = () => {
         src={Asset2}
         alt="bg-img"
       />
-      <ForgetPassword
-          isOpen={isOpen}
-          onClose={onClose}
-          firstField={firstField}
-        />
     </div>
   );
 };

src/Pages/Master/InvestmentType/AddInvestmentType.jsx

@@ -24,7 +24,7 @@ export const addInvestmentType = yup.object().shape({
     .string()
     .required("Investment type is required")
     .max(50, "Investment name cannot be more than 50 characters"),
-  // note: yup.string().optional().max(255, "Note cannot exceed 255 characters"),
+  note: yup.string().optional().max(255, "Note cannot exceed 255 characters"),
   investmentTypeNameArabic: yup
     .string()
     .required("Investment type in required"),
@@ -107,23 +107,27 @@ const AddInvestmentType = () => {
           isActive: isSwitchOn,
         };
         await updateInvestmentType({ data: formData, id }).then((response) => {
-          if (response?.data?.statusCode === 200) {
+          if (response?.data) {
             toast({
-              render: () => <ToastBox message={response?.data?.message} />,
+              render: () => (
+                <ToastBox
+                  status={"success"}
+                  message={response?.data?.message}
+                />
+              ),
             });
-
             setIsLoadingBtn(false);
             setAlert(false);
             navigate("/investment-type");
-          } else {
+          } else if (response?.error) {
             toast({
               render: () => (
-                <ToastBox message={"Something Went Wrong"} status={"error"} />
+                <ToastBox
+                  status={"error"}
+                  message={response?.error?.data?.message}
+                />
               ),
             });
-
-            setIsLoadingBtn(false);
-            navigate("/investment-type");
           }
         });
       } catch (error) {
@@ -139,22 +143,50 @@ const AddInvestmentType = () => {
         };
 
         await createInvestmentType(formData).then((response) => {
-          if (response?.data?.statusCode === 201) {
-            toast({
-              render: () => <ToastBox message={response?.data?.message} />,
-            });
+          // if (response?.data?.statusCode === 201) {
+          //   toast({
+          //     render: () => <ToastBox message={response?.data?.message} />,
+          //   });
 
-            setIsLoadingBtn(false);
-            navigate("/investment-type");
-          } else {
+          //   setIsLoadingBtn(false);
+          //   navigate("/investment-type");
+          // } else {
+          //   toast({
+          //     render: () => (
+          //       <ToastBox message={"Something Went Wrong"} status={"error"} />
+          //     ),
+          //   });
+
+          //   setIsLoadingBtn(false);
+          //   navigate("/investment-type");
+          // }
+
+          if (response?.data) {
             toast({
               render: () => (
-                <ToastBox message={"Something Went Wrong"} status={"error"} />
+                <ToastBox
+                  status={"success"}
+                  message={response?.data?.message}
+                />
               ),
             });
-
+            setAlert(false);
             setIsLoadingBtn(false);
             navigate("/investment-type");
+          } else if (response?.error) {
+
+            toast({
+              render: () => (
+                <ToastBox
+                  status={"error"}
+                  message={response?.error.data.message}
+                />
+              ),
+            });
+            setAlert(false);
+            setIsLoadingBtn(false);
+            
+            // navigate("/investment-type");
           }
         });
       } catch (error) {
@@ -199,7 +231,7 @@ const AddInvestmentType = () => {
       placeHolder: " ",
       name: "note",
       type: "textarea",
-      isRequired: false,
+      // isRequired: true,
       section: "",
       maxLength: 255,
       helperText: `Maximum length should be 255 characters. You have entered ${
@@ -211,7 +243,7 @@ const AddInvestmentType = () => {
       placeHolder: " ",
       name: "noteArabic",
       type: "textarea",
-      isRequired: false,
+      // isRequired: true,
       arabic: true,
       section: "",
       maxLength: 255,
@@ -254,7 +286,7 @@ const AddInvestmentType = () => {
       placeHolder: " ",
       name: "note",
       type: "textarea",
-      isRequired: false,
+      // isRequired: true,
       section: "",
       maxLength: 255,
       helperText: `Maximum length should be 255 characters. You have entered ${
@@ -266,7 +298,7 @@ const AddInvestmentType = () => {
       placeHolder: " ",
       name: "noteArabic",
       type: "textarea",
-      isRequired: false,
+      // isRequired: true,
       arabic: true,
       section: "",
       maxLength: 255,
@@ -314,9 +346,22 @@ const AddInvestmentType = () => {
     <Box {...OPACITY_ON_LOAD} overflowY={"scroll"} height={"100vh"} pb={14}>
       {/* =====================  [Switch Button] ======================== */}
 
-      <Box display={"flex"} justifyContent={"space-between"} alignItems={"center"} mt={5} px={4} mb={5}>
-        <Text fontSize={"sm"} mb={0}  onClick={() => navigate(-1)} cursor={"pointer"}>
-          <ArrowBackIcon fontSize={"xl"} me={2} />Add Details
+      <Box
+        display={"flex"}
+        justifyContent={"space-between"}
+        alignItems={"center"}
+        mt={5}
+        px={4}
+        mb={5}
+      >
+        <Text
+          fontSize={"sm"}
+          mb={0}
+          onClick={() => navigate(-1)}
+          cursor={"pointer"}
+        >
+          <ArrowBackIcon fontSize={"xl"} me={2} />
+          Add Details
         </Text>
         <SwitchButton isSwitchOn={isSwitchOn} setIsSwitchOn={setIsSwitchOn} />
       </Box>
@@ -338,7 +383,11 @@ const AddInvestmentType = () => {
         isOpen={alert}
         onClose={() => setAlert(false)}
         alertHandler={handleConfirm}
-        message={id ? "Are you sure you want to update this Investment Type?" : " Are you sure you want to add this Investment Type?"}
+        message={
+          id
+            ? "Are you sure you want to update this document?"
+            : " Are you sure you want to add this document?"
+        }
         isLoading={isLoadingBtn}
       />
     </Box>

src/Pages/Master/InvestmentType/InvestmentType.jsx

@@ -232,49 +232,16 @@ const InvestmentType = () => {
 
   // ==================== [Delete Function] =======================
 
-  // const handleDelete = async () => {
-  //   console.log(actionId);
-  //   setIsLoading(true);
-  //   try {
-  //     const response = await deleteInvestmentType(actionId);
-  //     console.log(response);
-  //     setIsLoading(false);
-  //     setDeleteAlert(false);
-  //   } catch (error) {}
-  // };
-
   const handleDelete = async () => {
     console.log(actionId);
     setIsLoading(true);
     try {
       const response = await deleteInvestmentType(actionId);
-      console.log(response?.data);
-  
-      if (response?.error?.data?.code === 400) {
-        toast({
-          render: () => (
-            <ToastBox message={response?.error?.data?.message} status="error" />
-          ),
-        });
-      } else if (
-        response?.data?.statusCode === 201 ||
-        response?.data?.statusCode === 200
-      ) {
-        toast({
-          render: () => (
-            <ToastBox message={response?.data?.message} status="success" />
-          ),
-        });
-      }
+      console.log(response);
       setIsLoading(false);
       setDeleteAlert(false);
-    } catch (error) {
-      console.error(error);
-      setIsLoading(false);
-    }
+    } catch (error) {}
   };
-  
-
 
   return (
     <Box {...OPACITY_ON_LOAD} overflowY={"scroll"} height={"100vh"} pb={38}>
@@ -348,7 +315,7 @@ const InvestmentType = () => {
       <CustomAlertDialog
         onClose={() => setDeleteAlert(false)}
         isOpen={deleteAlert}
-        message={"Are you sure you want to delete Investment Type?"}
+        message={"Are you sure you want to delete sponers?"}
         alertHandler={handleDelete}
         isLoading={isLoading}
       />

src/Pages/Master/Sponser/Sponsers.jsx

@@ -187,13 +187,13 @@ const Sponser = () => {
       console.log(response?.data);
       if(response?.error?.data?.code === 400){
         toast({
-          render: () => <ToastBox message={response?.error?.data?.message} status={'error'} />,
+          render: () => <ToastBox message={response?.error?.data?.message} status={'warn'} />,
         });
         setIsLoading(false);
         setDeleteAlert(false);
       } else if(response?.data?.statusCode === 201 || response?.data?.statusCode === 200){
         toast({
-          render: () => <ToastBox message={response?.data?.message} status={'success'} />,
+          render: () => <ToastBox message={response?.data?.message} status={'error'} />,
         });
         setIsLoading(false);
         setDeleteAlert(false);
@@ -201,7 +201,7 @@ const Sponser = () => {
       }
     } catch (error) {}
   };
- 
+
   console.log(isSponserLoading);
 
   

src/Pages/SplashScreen.jsx

@@ -1,31 +1,31 @@
-import { Box, Image, Spinner, Text } from "@chakra-ui/react";
-import React from "react";
-import logo from "../assets/logo2.png";
+import { Box, Image, Spinner, Text } from '@chakra-ui/react'
+import React from 'react'
+import logo from '../assets/logo2.png'
 
 const SplashScreen = () => {
   return (
     <Box
-      h={"100vh"}
-      display={"flex"}
-      justifyContent={"center"}
-      alignItems={"center"}
-      flexDirection={"column"}
-      gap={10}
+    h={'100vh'}
+    display={'flex'}
+    justifyContent={'center'}
+    alignItems={'center'}
+    flexDirection={'column'}
+    gap={10}
     >
-      <Image src={logo} />
-      <Spinner color='green.900' size='md' />
-      {/* <div className="dot-spinner">
-        <div className="dot-spinner__dot"></div>
-        <div className="dot-spinner__dot"></div>
-        <div className="dot-spinner__dot"></div>
-        <div className="dot-spinner__dot"></div>
-        <div className="dot-spinner__dot"></div>
-        <div className="dot-spinner__dot"></div>
-        <div className="dot-spinner__dot"></div>
-        <div className="dot-spinner__dot"></div>
-      </div> */}
+        <Image src={logo} />
+        {/* <Spinner color='green.900' size='md' /> */}
+        <div className="dot-spinner">
+    <div className="dot-spinner__dot"></div>
+    <div className="dot-spinner__dot"></div>
+    <div className="dot-spinner__dot"></div>
+    <div className="dot-spinner__dot"></div>
+    <div className="dot-spinner__dot"></div>
+    <div className="dot-spinner__dot"></div>
+    <div className="dot-spinner__dot"></div>
+    <div className="dot-spinner__dot"></div>
+</div>
     </Box>
-  );
-};
+  )
+}
 
-export default SplashScreen;
+export default SplashScreen

src/Pages/SubAdmin/SubAdmin.jsx

@@ -1,377 +0,0 @@
-import {
-  Badge,
-  Box,
-  Button,
-  HStack,
-  Input,
-  Switch,
-  Text,
-  Tooltip,
-  useToast,
-} from "@chakra-ui/react";
-import React, { useContext, useEffect, useState } from "react";
-import { Link, Link as RouterLink } from "react-router-dom";
-import { AddIcon, DeleteIcon, EditIcon } from "@chakra-ui/icons";
-import { useNavigate } from "react-router-dom";
-import { OPACITY_ON_LOAD } from "../../Layout/animations";
-import NormalTable from "../../Components/DataTable/NormalTable";
-import Pagination from "../../Components/Pagination";
-import GlobalStateContext from "../../Contexts/GlobalStateContext";
-import CustomAlertDialog from "../../Components/CustomAlertDialog";
-import ToastBox from "../../Components/ToastBox";
-import { TABLE_PAGINATION } from "../../Constants/Paginations";
-import { generateSerialNumber } from "../../Constants/Constants";
-import { useGetSponserMasterQuery } from "../../Services/io.service";
-import {
-  useGetSubAdminMasterQuery,
-  useToggleStatusMutation,
-} from "../../Services/subadmin.service";
-import RoleSwitchButton from "../../Components/RoleSwitchButton";
-
-export const formatDate = (date) => {
-  const d = new Date(date);
-  const year = d.getFullYear();
-  const month = String(d.getMonth() + 1).padStart(2, "0"); // Months are 0-indexed
-  const day = String(d.getDate()).padStart(2, "0");
-
-  return `${day}/${month}/${year}`;
-};
-
-const SubAdmin = () => {
-  const navigate = useNavigate();
-  const toast = useToast();
-  const [isLoading, setIsLoading] = useState(false);
-  const [deleteAlert, setDeleteAlert] = useState(false);
-  const [actionId, setActionId] = useState(false);
-  const [mouseEntered, setMouseEntered] = useState(false);
-  const [mouseEnteredId, setMouseEnteredId] = useState("");
-  //   const [deleteSponser] = useDeleteSponserMutation();
-  const { sponser, setSponser, slideFromRight } =
-    useContext(GlobalStateContext);
-
-  // =========================== [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 [isSwitchOn, setIsSwitchOn] = useState(true);
-
-  // Debounce the search term to avoid making a request on every keystroke
-  useEffect(() => {
-    const handler = setTimeout(() => {
-      setDebouncedSearchTerm(searchTerm);
-    }, 500); // Adjust delay as needed
-    return () => {
-      clearTimeout(handler);
-    };
-  }, [searchTerm]);
-
-  const {
-    data: subAdmin,
-    error,
-    isLoading: isSponserLoading,
-  } = useGetSubAdminMasterQuery();
-
-  const [toggleStatus] = useToggleStatusMutation();
-
-  // useEffect(() => {
-  //   if (subAdmin?.data) {
-  //     setIsSwitchOn(subAdmin?.role?.role);
-  //     console.log(subAdmin);
-  //   }
-  // }, [subAdmin]);
-
-  // ==============================[Table Filter]========================
-
-  const filteredData = subAdmin?.data?.filter((item) => {
-    const name = item.firstName;
-    const searchLower = searchTerm?.toLowerCase();
-    const nameMatches = name?.toLowerCase().includes(searchLower);
-    return nameMatches;
-  });
-
-  const handleToggleStatus = async (isMaker, id) => {
-    console.log("hit");
-    const data = {
-      role_xid: isMaker ? "2" : "1",
-    };
-    console.log("=======================",data)
-    try {
-      const res = await toggleStatus({id, data});
-      if (res?.error) {
-        toast({
-          render: () => (
-            <ToastBox status={"error"} message={res?.error?.data?.message} />
-          ),
-        });
-      } else if (res) {
-        toast({
-          render: () => (
-            <ToastBox
-              status={"success"}
-              message={res?.message || "Status updated successfully!"}
-            />
-          ),
-        });
-      }
-    } catch (error) {
-      toast({
-        render: () => (
-          <ToastBox
-            status={"error"}
-            message={error?.data?.message || "Something went wrong"}
-          />
-        ),
-      });
-    }
-  };
-
-  // ====================================================[Table Setup]================================================================
-
-  const tableHeadRow = [
-    "Sr No",
-    "First Name",
-    "Last Name",
-    "Email Address",
-    "Role",
-    "Action",
-  ];
-
-  const extractedArray = subAdmin?.data?.map((item, index) => ({
-    "Sr No": (
-      <Text
-        w={"24px"}
-        justifyContent={slideFromRight ? "right" : "left"}
-        as={"span"}
-        color={"gray.600"}
-        className="d-flex align-items-center fw-bold web-text-small"
-      >
-        {/* {item.id} */}
-        {generateSerialNumber(index, currentPage, pageSize)}
-      </Text>
-    ),
-    "First Name": (
-      <Text
-        justifyContent={slideFromRight ? "right" : "left"}
-        as={"span"}
-        color={"teal.900"}
-        fontWeight={"500"}
-        className="d-flex align-items-center web-text-small"
-      >
-        {item?.firstName}
-      </Text>
-    ),
-    "Last Name": (
-      <Text
-        justifyContent={slideFromRight ? "right" : "left"}
-        as={"span"}
-        color={"teal.900"}
-        fontWeight={"500"}
-        className="d-flex align-items-center web-text-small"
-      >
-        {item?.lastName}
-      </Text>
-    ),
-    "Email Address": (
-      <Box isTruncated={true}>
-        <Text as={"span"} color={"teal.900"} fontWeight={"500"}>
-          {item?.emailAddress}
-        </Text>
-      </Box>
-    ),
-    Role: (
-      <Box  isTruncated={true} >
-        <Badge
-          py={"2px"}
-          me={2}
-          fontWeight={600}
-          bg={item?.role[0]?.role === "Maker" ? "#00ffcc" : "#b3ff99"}
-          px={item?.role[0]?.role === "Maker" ? "12px"  : "5px"}
-        >
-          {item?.role[0]?.role}
-        </Badge>
-        <Switch
-          onChange={() =>
-            handleToggleStatus(item?.role[0]?.role === "Maker", item?.id)
-          }
-          isChecked={item?.role[0]?.role === "Maker"}
-          // colorScheme={item?.role[0]?.role === "Maker" ? "green" : "teal"}
-          sx={{
-            ".chakra-switch__track": {
-              bg: item?.role[0]?.role === "Maker" ? "#00ffcc" : "#b3ff99", // "Off" state color
-            },
-          }}
-        />
-        {/* <RoleSwitchButton
-        setIsSwitchOn={setIsSwitchOn}
-          isSwitchOn={item?.role[0]?.role === "Maker"}
-          onClick={() => handleToggleStatus(item?.role[0]?.role=== "Maker")}
-        /> */}
-      </Box>
-    ),
-    Action: (
-      <Box display={"flex"} justifyContent={"center"} gap={2}>
-        <Tooltip
-          rounded={"sm"}
-          fontSize={"xs"}
-          label="Edit"
-          bg="#fff"
-          color={"blue.500"}
-          placement="top"
-        >
-          <Button
-            onClick={() => navigate(`/subadmin/subadmin-update/${item.id}`)}
-            // _hover={{ color: "blue.500" }}
-            // color="blue.400"
-            rounded={"sm"}
-            size={"xs"}
-            colorScheme="blue"
-          >
-            <EditIcon />
-          </Button>
-        </Tooltip>
-
-        {/* <Tooltip
-          rounded={"sm"}
-          fontSize={"xs"}
-          label="Delete"
-          bg="#fff"
-          color={"red.500"}
-          placement="top"
-        >
-          <Button
-            onClick={() => {
-              setActionId(item?.id);
-              setDeleteAlert(true);
-            }}
-            // _hover={{ color: "red.500" }}
-            // color="red"
-            rounded={"sm"}
-            size={"xs"}
-            colorScheme="red"
-            variant={"solid"}
-          >
-            <DeleteIcon />
-          </Button>
-        </Tooltip> */}
-      </Box>
-    ),
-  }));
-
-  // ===========================  [ Delete Function ] =================================
-
-  // const handleDelete = async () => {
-  //   console.log(actionId);
-  //   setIsLoading(true);
-  //   try {
-  //     const response = await deleteSponser(actionId);
-  //     console.log(response?.data);
-  //     if (response?.error?.data?.code === 400) {
-  //       toast({
-  //         render: () => (
-  //           <ToastBox
-  //             message={response?.error?.data?.message}
-  //             status={"error"}
-  //           />
-  //         ),
-  //       });
-  //       setIsLoading(false);
-  //       setDeleteAlert(false);
-  //     } else if (
-  //       response?.data?.statusCode === 201 ||
-  //       response?.data?.statusCode === 200
-  //     ) {
-  //       toast({
-  //         render: () => (
-  //           <ToastBox message={response?.data?.message} status={"success"} />
-  //         ),
-  //       });
-  //       setIsLoading(false);
-  //       setDeleteAlert(false);
-  //     }
-  //   } catch (error) {}
-  // };
-
-  console.log(isSponserLoading);
-
-  return (
-    <Box {...OPACITY_ON_LOAD} overflowY={"scroll"} height={"100vh"} pb={38}>
-      <Box bg="white.500">
-        <HStack
-          display={"flex"}
-          justifyContent={"space-between"}
-          ps={1}
-          pe={1}
-          pb={4}
-          pt={4}
-          spacing="24px"
-        >
-          {/* =======================[Search Input]======================== */}
-
-          <Input
-            type="search"
-            width={300}
-            placeholder="Search..."
-            size="sm"
-            rounded="sm"
-            focusBorderColor="green.500"
-            value={searchTerm}
-            onChange={(e) => setSearchTerm(e.target.value)}
-          />
-
-          <HStack display={"flex"} alignItems={"center"}>
-            {/* ====================[Pagination]===================== */}
-
-            <Pagination
-              isLoading={isSponserLoading}
-              pageSize={pageSize}
-              setPageSize={setPageSize}
-              currentPage={currentPage}
-              setCurrentPage={setCurrentPage}
-              totalItems={subAdmin?.data?.totalItems}
-            />
-
-            {/* =====================[Add Button]===================== */}
-
-            <Link to={"/subadmin/subadmin-update"}>
-              <Button
-                leftIcon={<AddIcon />}
-                colorScheme={"forestGreen"}
-                rounded={"sm"}
-                fontSize={"xs"}
-                size={"sm"}
-              >
-                Add
-              </Button>
-            </Link>
-          </HStack>
-        </HStack>
-      </Box>
-
-      {/* =================== [Data Table] ===================== */}
-
-      <NormalTable
-        emptyMessage={`We don't have any Sponers `}
-        tableHeadRow={tableHeadRow}
-        data={extractedArray}
-        isLoading={isSponserLoading}
-        viewActionId={actionId}
-        setViewActionId={setActionId}
-        setMouseEnteredId={setMouseEnteredId}
-        setMouseEntered={setMouseEntered}
-      />
-
-      {/* ========================  [Modal]  ======================== */}
-
-      <CustomAlertDialog
-        onClose={() => setDeleteAlert(false)}
-        isOpen={deleteAlert}
-        message={"Are you sure you want to delete sponers?"}
-        // alertHandler={handleDelete}
-        isLoading={isLoading}
-      />
-    </Box>
-  );
-};
-
-export default SubAdmin;

src/Pages/SubAdmin/SubAdminUpdateCreate.jsx

@@ -1,355 +0,0 @@
-import React, { useContext, useEffect, useState } from "react";
-import { Box, Button, Text, useToast } from "@chakra-ui/react";
-import { useForm, Controller } from "react-hook-form";
-import { yupResolver } from "@hookform/resolvers/yup";
-import * as yup from "yup";
-import { useNavigate, useParams } from "react-router-dom";
-import { v4 as uuidv4 } from "uuid";
-import { ArrowBackIcon } from "@chakra-ui/icons";
-import { OPACITY_ON_LOAD } from "../../Layout/animations";
-import FormInputMain from "../../Components/FormInputMain";
-import ToastBox from "../../Components/ToastBox";
-import FullscreenLoaders from "../../Components/Loaders/FullscreenLoaders";
-import CustomAlertDialog from "../../Components/CustomAlertDialog";
-import RoleSwitchButton from "../../Components/RoleSwitchButton";
-import {
-  useCreateSubAdminMutation,
-  useGetSubAdminByIdQuery,
-  useUpdateSubAdminMutation,
-} from "../../Services/subadmin.service";
-import { useGetSponserByIdQuery } from "../../Services/io.service";
-import { encryptString } from "../../Constants/Constants";
-// ======================= [validation] =========================
-
-export const addSubAdmin = yup.object().shape({
-  firstName: yup
-    .string()
-    .required("First Name is required")
-    .min(3, "First Name must be at least 3 characters long")
-    .max(50, "First Name cannot exceed 50 characters")
-    .matches(/^[^\d]+$/, "First Name cannot contain numbers"),
-
-  lastName: yup.string().required("Last Name name in arabic is required"),
-  emailAddress: yup.string().email("Invalid email address").notRequired(),
-  //   .test("emailValidity", "Email address is invalid", async function (value) {
-  //     if (!value) {
-  //         return true; // Allow if the field is empty
-  //     }
-  //     return await checkEmailValidity(value);
-  // }),
-});
-
-// ==================== [debounce] ========================
-
-export function debounce(func, delay) {
-  let debounceTimer;
-  return function (...args) {
-    clearTimeout(debounceTimer);
-    debounceTimer = setTimeout(() => func.apply(this, args), delay);
-  };
-}
-
-const SubAdminUpdateCreate = () => {
-  const toast = useToast();
-  const params = useParams();
-  const navigate = useNavigate();
-  const id = params?.id;
-
-  // =====================[useState]=======================
-
-  const [isLoadingBtn, setIsLoadingBtn] = useState(false);
-  const [alert, setAlert] = useState(false);
-  const [form, setForm] = useState();
-  const [isSwitchOn, setIsSwitchOn] = useState(true);
-
-  const [createSubAdmin] = useCreateSubAdminMutation();
-  const [updateSubAdmin] = useUpdateSubAdminMutation();
-
-  // Fetch sponsor data only if id exists
-  const {
-    data: subAdminByIdData,
-    error,
-    isLoading,
-  } = useGetSubAdminByIdQuery(id, { skip: !id });
-
-  // ======================== [validators] ===========================
-
-  const {
-    control,
-    watch,
-    handleSubmit,
-    formState: { errors },
-    reset,
-  } = useForm({
-    resolver: yupResolver(addSubAdmin),
-  });
-
-  // ========================== [useEffect] ================================
-
-  useEffect(() => {
-    if (subAdminByIdData?.data) {
-      reset({
-        firstName: subAdminByIdData?.data?.firstName,
-        lastName: subAdminByIdData?.data?.lastName,
-        emailAddress: subAdminByIdData?.data?.emailAddress,
-      });
-      setIsSwitchOn(
-        subAdminByIdData?.data?.role[0]?.role ===
-          encryptString(import.meta.env.VITE_VITE_MAKER)
-      );
-      console.log(subAdminByIdData?.data?.role);
-    }
-  }, [subAdminByIdData, reset]);
-
-  if (false) {
-    return <FullscreenLoaders />;
-  }
-
-  // ============================ [API]===============================
-
-  const handleConfirm = async () => {
-    setIsLoadingBtn(true);
-    const id = params?.id;
-    console.log(isSwitchOn);
-
-    if (id) {
-      try {
-        const formData = {
-          ...form,
-          // role_xid: !isSwitchOn ? 1 : 2,
-        };
-        await updateSubAdmin({ data: formData, id }).then((response) => {
-          if (response?.data?.statusCode) {
-            toast({
-              render: () => <ToastBox message={response?.data?.message} />,
-            });
-
-            setIsLoadingBtn(false);
-            setAlert(false);
-            navigate("/subadmin");
-          } else if (response?.error?.status === 400) {
-            toast({
-              render: () => (
-                <ToastBox
-                  message={response?.error?.data?.message}
-                  status={"error"}
-                />
-              ),
-            });
-
-            setIsLoadingBtn(false);
-            setAlert(false);
-          }
-        });
-      } catch (error) {
-        console.log(error);
-        setIsLoadingBtn(false);
-        navigate("/subadmin");
-      }
-    } else {
-      try {
-        const formData = {
-          ...form,
-          role_xid: isSwitchOn ? 1 : 2,
-        };
-        await createSubAdmin(formData).then((response) => {
-          console.log(response);
-          if (response?.data?.statusCode === 201) {
-            toast({
-              render: () => <ToastBox message={response?.data?.message} />,
-            });
-
-            setIsLoadingBtn(false);
-            navigate("/subadmin");
-          } else if (response?.error?.status === 400) {
-            toast({
-              render: () => (
-                <ToastBox
-                  message={response?.error?.data?.message}
-                  status={"error"}
-                />
-              ),
-            });
-
-            setIsLoadingBtn(false);
-            setAlert(false);
-          }
-        });
-      } catch (error) {
-        console.log(error);
-
-        setIsLoadingBtn(false);
-        navigate("/subadmin");
-      }
-    }
-  };
-
-  // ====================== [Update  Form Object] =========================
-
-  const formFields = [
-    {
-      label: "First Name",
-      placeHolder: " ",
-      name: "firstName",
-      type: "text",
-      isRequired: true,
-      section: "",
-      maxLength: 50,
-      helperText: `Maximum length should be 50 characters. You have entered ${
-        watch()?.firstName?.length || 0
-      } characters.`,
-    },
-    {
-      label: "Last Name",
-      name: "lastName",
-      placeHolder: " ",
-      type: "text",
-      isRequired: true,
-      section: "",
-      maxLength: 55,
-      helperText: `Maximum length should be 55 characters. You have entered ${
-        watch()?.lastName?.length || 0
-      } characters.`,
-    },
-    {
-      label: "Email address",
-      name: "emailAddress",
-      placeHolder: " ",
-      type: "email",
-      // isRequired: true,
-      section: "",
-    },
-  ];
-
-  // ==================== [Create Form Object] =======================
-
-  const formEditFields = [
-    {
-      label: "First Name",
-      placeHolder: " ",
-      name: "firstName",
-      type: "text",
-      isRequired: true,
-      section: "",
-      maxLength: 55,
-      helperText: `Maximum length should be 55 characters. You have entered ${
-        watch()?.firstName?.length || 0
-      } characters.`,
-    },
-    {
-      label: "Last Name",
-      name: "lastName",
-      placeHolder: " ",
-      type: "text",
-      isRequired: true,
-      section: "",
-      maxLength: 55,
-      helperText: `Maximum length should be 55 characters. You have entered ${
-        watch()?.lastName?.length || 0
-      } characters.`,
-    },
-    {
-      label: "Email Address",
-      name: "emailAddress",
-      placeHolder: " ",
-      type: "email",
-      // isRequired: true,
-      section: "",
-    },
-  ];
-
-  // ====================== [Group Create Fields] =========================
-
-  const groupedEditFields = formEditFields.reduce((groups, field) => {
-    const { section } = field;
-    if (!groups[section]) {
-      groups[section] = [];
-    }
-    groups[section].push(field);
-    return groups;
-  }, {});
-
-  // ====================== [Group Update Fields] =======================
-
-  const groupedFields = formFields.reduce((groups, field) => {
-    const { section } = field;
-    if (!groups[section]) {
-      groups[section] = [];
-    }
-    groups[section].push(field);
-    return groups;
-  }, {});
-
-  // ==================== [On Submit] ========================
-  console.log(errors);
-
-  const onSubmit = async (data) => {
-    console.log("Hit");
-
-    if (Object.keys(errors).length === 0) {
-      setForm(data);
-      setAlert(true);
-    }
-  };
-
-  return isLoading ? (
-    <FullscreenLoaders />
-  ) : (
-    <Box {...OPACITY_ON_LOAD} overflowY={"scroll"} height={"100vh"} pb={14}>
-      {/* =====================  [Switch Button] ======================== */}
-      <Box
-        display={"flex"}
-        justifyContent={"space-between"}
-        alignItems={"center"}
-        mt={5}
-        px={4}
-      >
-        <Text
-          fontSize={"sm"}
-          mb={0}
-          onClick={() => navigate(-1)}
-          cursor={"pointer"}
-        >
-          <ArrowBackIcon fontSize={"xl"} me={2} />
-          Add Details
-        </Text>
-        {params?.id ? (
-          ""
-        ) : (
-          <RoleSwitchButton
-            isSwitchOn={isSwitchOn}
-            setIsSwitchOn={setIsSwitchOn}
-          />
-        )}
-      </Box>
-
-      {/* ====================== [Form Input] ====================== */}
-
-      <FormInputMain
-        groupedFields={params?.id ? groupedEditFields : groupedFields}
-        control={control}
-        errors={errors}
-        onSubmit={handleSubmit(onSubmit)}
-        submitTitle={params?.id ? "Update" : "Submit"}
-      ></FormInputMain>
-
-      {/* ======================= [Modal] =========================== */}
-
-      <CustomAlertDialog
-        isOpen={alert}
-        onClose={() => setAlert(false)}
-        alertHandler={handleConfirm}
-        message={
-          id
-            ? "Are you sure you want to update this?"
-            : "Are you sure you want to add this?"
-        }
-        isLoading={isLoadingBtn}
-      />
-
-      {/* <DummyComponent /> */}
-    </Box>
-  );
-};
-
-export default SubAdminUpdateCreate;

src/Pages/WithDrawal/DrawalRequest/DrawalRequestApprove.jsx

@@ -3,7 +3,6 @@ import {
   Box,
   Button,
   FormControl,
-  FormHelperText,
   FormLabel,
   Heading,
   HStack,
@@ -37,8 +36,7 @@ const FILE_TYPES = ["image/jpeg", "image/png", "image/gif"];
 
 export const conformModalSchema = yup.object().shape({
   investorAmount: yup.string().required("Investor amount is required"),
-  comment: yup.string().notRequired()
-  .max(200, "Approve Comment cannot be more than 200 characters"),
+  comment: yup.string().notRequired(),
 });
 
 const DrawalRequestApprove = ({
@@ -61,7 +59,6 @@ const DrawalRequestApprove = ({
   const {
     control,
     register,
-    watch,
     reset,
     handleSubmit,
     formState: { errors },
@@ -262,17 +259,12 @@ const DrawalRequestApprove = ({
                   size="sm"
                   placeholder={"Enter your comments...."}
                   resize={"none"}
-                  maxLength={200}
                 />
                 {errors.comment && (
                   <Text fontSize="xs" color="red">
                     {errors.comment.message}
                   </Text>
                 )}
-                <FormHelperText fontSize="xs" color="gray.500">
-                  <Text as={"span"} me={1}>Maximum length should be 200 characters. You have entered</Text>
-                  {watch("checkerComment")?.length || 0} characters.
-                </FormHelperText>
               </FormControl>
             </ModalBody>
             <ModalFooter>

src/Pages/WithDrawal/DrawalRequest/DrawalRequestReject.jsx

@@ -2,7 +2,6 @@ import {
     Box,
     Button,
     FormControl,
-    FormHelperText,
     FormLabel,
     Input,
     Modal,
@@ -25,8 +24,7 @@ import {
 import { useDepositRejectMutation } from "../../../Services/drawal.request.service";
   
   export const conformModalSchema = yup.object().shape({
-    comments: yup.string().required("Comment is required")
-    .max(200, "Approve Comment cannot be more than 200 characters"),
+    comments: yup.string().required("Comment is required"),
   });
   
   const DrawalRequestReject = ({ isOpen, onClose, firstField ,id}) => {
@@ -36,7 +34,6 @@ import { useDepositRejectMutation } from "../../../Services/drawal.request.servi
   
     const {
       register,
-      watch,
       reset,
       handleSubmit,
       formState: { errors },
@@ -104,21 +101,16 @@ import { useDepositRejectMutation } from "../../../Services/drawal.request.servi
                   placeholder={"Enter your comments...."}
                   rounded={"md"}
                   resize={"none"}
-                  maxLength={200}
                 />
                 {errors.comments && (
                   <Text fontSize="xs" color="red">
                     {errors.comments.message}
                   </Text>
                 )}
-                <FormHelperText fontSize="xs" color="gray.500">
-                <Text as={"span"} me={1}>Maximum length should be 200 characters. You have entered</Text>
-                  {watch("comments")?.length || 0} characters.
-                </FormHelperText>
               </FormControl>
             </ModalBody>
             <ModalFooter>
-              <Button 
+              <Button
                 colorScheme="gray"
                 mr={3}
                 onClick={onClose}

src/Routes/Nav.js

@@ -104,23 +104,25 @@ export const nav = [
     title: "INVESTORS REQUEST",
     type: "title",
   },
-  {
-    title: "Fawateer Deposit",
-    submenu: [
-      {
-        title: "Aprover Request",
-        path: "/fawateer",
-        icon: RiMoneyDollarBoxLine,
-      },
-      {
-        title: "View History",
-        path: "/fawateer-history",
-        icon: RiExchangeBoxLine,
-      },
-    ],
-    type: "accordion",
-    Icon: HiOutlineBanknotes,
-  },
+{
+        title: "Fawateer Deposit",
+        submenu: [
+          {
+            title: "Aprover Request",
+            path: "/fawateer",
+            icon: RiMoneyDollarBoxLine,
+          },
+          {
+            title: "View History",
+            path: "/fawateer-history",
+            icon: RiExchangeBoxLine,
+          },
+        ],
+        type: "accordion",
+        Icon: HiOutlineBanknotes,
+}
+,
+
   {
     title: "Bank Deposit",
     submenu: [
@@ -231,11 +233,6 @@ export const nav = [
         path: "/bank-details",
         icon: RiBankLine,
       },
-      {
-        title: "Sub Admin",
-        path: "/subadmin",
-        icon: RiFileUserLine,
-      },
     ],
     type: "accordion",
     Icon: MdOutlineAdminPanelSettings,

src/Routes/Routes.js

@@ -46,8 +46,6 @@ import EmailNotification from "../Pages/EmailNotification/EmailNotification";
 import User from "../Pages/User/User";
 import AddUser from "../Pages/User/AddUser";
 import Profile from "../Pages/Profile/Profile";
-import SubAdmin from "../Pages/SubAdmin/SubAdmin";
-import SubAdminUpdateCreate from "../Pages/SubAdmin/SubAdminUpdateCreate";
 
 export const RouteLink = [
   // =============[ Tanami ]================
@@ -125,9 +123,6 @@ export const RouteLink = [
   // { path: "/bank-details", Component: UnderConstruction },
   { path: "/bank-details/edit-bank-details/:id", Component: EditBankDetails },
   { path: "/profile", Component: Profile },
-  { path: "/subadmin", Component: SubAdmin },
-  { path: "/subadmin/subadmin-update/:id", Component: SubAdminUpdateCreate },
-  { path: "/subadmin/subadmin-update", Component: SubAdminUpdateCreate },
 
 
 
@@ -139,5 +134,8 @@ export const RouteLink = [
   // { path: "/fawateer-approver", Component: ApproveRequest },
   // { path: "/approver-history", Component: ApproveHistory },
 
+
+
+
   
 ];

src/Services/change.password.service.js

@@ -1,30 +0,0 @@
-
-// Need to use the React-specific entry point to import createApi
-import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
-import { baseQuery } from "./token.serivce";
-
-
-
-// Define a service using a base URL and expected endpoints
-export const changePasswordMake = createApi({
-  reducerPath: "changePassword",
-  baseQuery: baseQuery,
-  tagTypes: ["getPassword"],
-  endpoints: (builder) => ({
-    // // ========[ update ]========
-    updatePassword: builder.mutation({
-      query: (data) => ({
-        url: `/auth/admin/update-password`,
-        method: "POST",
-        body: data,
-      }),
-      invalidatesTags: ["getPassword"],
-    }),
-
-  }),
-});
-
-// Export hooks for usage in functional components
-export const {
-    useUpdatePasswordMutation
-} = changePasswordMake;

src/Services/forget.password.service.js

@@ -1,30 +0,0 @@
-
-// Need to use the React-specific entry point to import createApi
-import { createApi} from "@reduxjs/toolkit/query/react";
-import { baseQuery } from "./token.serivce";
-
-
-
-// Define a service using a base URL and expected endpoints
-export const forgetPasswordMake = createApi({
-  reducerPath: "forgetPassword",
-  baseQuery: baseQuery,
-  tagTypes: ["getPassword"],
-  endpoints: (builder) => ({
-    // // ========[ update ]========
-    forgetPassword: builder.mutation({
-      query: (data) => ({
-        url: `/auth/admin/forget-password`,
-        method: "POST",
-        body: data,
-      }),
-      invalidatesTags: ["getPassword"],
-    }),
-
-  }),
-});
-
-// Export hooks for usage in functional components
-export const {
-    useForgetPasswordMutation
-} = forgetPasswordMake;

src/Services/io.service.js

@@ -15,9 +15,9 @@ export const ioService = createApi({
     "getArtifactsVideo",
     "getInvestmentDocuments",
     "getIOById",
-    "getSponser",
-    "getInvestmentType",
-    "getInvestmentTypeID",
+    "getSponser", 
+    "getInvestmentType", 
+    "getInvestmentTypeID"
   ],
   endpoints: (builder) => ({
     // =====[get prepopulate data]
@@ -28,8 +28,7 @@ export const ioService = createApi({
 
     // =====[get]
     getIOs: builder.query({
-      query: ({ page, size, ioStatus_xid, search }) =>
-        `/io/admin?page=${page}&size=${size}&ioStatus_xid=${ioStatus_xid}&search=${search}`,
+      query: ({ page, size, ioStatus_xid, search }) => `/io/admin?page=${page}&size=${size}&ioStatus_xid=${ioStatus_xid}&search=${search}`,
       providesTags: ["getIO"],
     }),
 
@@ -225,7 +224,7 @@ export const ioService = createApi({
       invalidatesTags: ["getIOById"],
     }),
 
-    // ======== [ Distribution Transaction ] ======== 
+    // ======== [ Distribution Transaction ] ========
 
     getDistributionInvestor: builder.mutation({
       query: ({ id, data }) => ({
@@ -262,7 +261,9 @@ export const ioService = createApi({
       invalidatesTags: ["getIOById"],
     }),
 
-    // ==============[ Displaye Orders ]===============
+
+
+// ==============[ Displaye Orders ]===============
 
     setDisplayOrder: builder.mutation({
       query: ({ data }) => ({
@@ -308,7 +309,7 @@ export const ioService = createApi({
         method: "POST",
         body: data,
       }),
-      invalidatesTags: ["getSponser", "prePopulate"],
+      invalidatesTags: ["getSponser","prePopulate"],
     }),
 
     // ========[Update Sponser]========
@@ -319,11 +320,12 @@ export const ioService = createApi({
         method: "PATCH",
         body: data,
       }),
-      invalidatesTags: ["getSponser", "prePopulate"],
+      invalidatesTags: ["getSponser","prePopulate"],
     }),
 
     // ======[Get All]=====
 
+    
     getSponserMaster: builder.query({
       query: ({ page, size, searchTerm }) => {
         let baseURL = `/sponsor/admin/?search=${searchTerm || ""}`;
@@ -334,10 +336,10 @@ export const ioService = createApi({
       },
       providesTags: ["getSponser"],
     }),
-
+    
     // ========[Delete Sponser]========
 
-    deleteSponser: builder.mutation({
+     deleteSponser: builder.mutation({
       query: (id) => ({
         url: `/sponsor/admin/delete/${id}`,
         method: "DELETE",
@@ -354,7 +356,7 @@ export const ioService = createApi({
     getSponserMasterActive: builder.query({
       query: () => "/sponsor/admin/active",
     }),
-
+    
     // ======[Get ID]=====
 
     getSponserById: builder.query({
@@ -367,8 +369,12 @@ export const ioService = createApi({
       query: () => `/sponsor/admin/active`,
     }),
 
-    // ===============================[ Investment Type ]===================================
 
+
+
+// ===============================[ Investment Type ]===================================
+
+    
     // ========[Get All]=========
 
     getInvestmentTypes: builder.query({
@@ -399,15 +405,11 @@ export const ioService = createApi({
 
     updateInvestmentType: builder.mutation({
       query: ({ data, id }) => ({
-        url: `/investmentType/admin/${id}`,
+        url: `/investmentType/admin/${id}`, 
         method: "PATCH",
         body: data,
       }),
-      invalidatesTags: [
-        "getInvestmentTypeID",
-        "getInvestmentType",
-        "prePopulate",
-      ],
+      invalidatesTags: ["getInvestmentTypeID", "getInvestmentType", "prePopulate"],
     }),
 
     // ========[Delete Investment]=======
@@ -417,181 +419,25 @@ export const ioService = createApi({
         url: `/investmentType/admin/delete/${id}`,
         method: "DELETE",
       }),
-      invalidatesTags: ["getInvestmentType", "prePopulate"],
+      invalidatesTags: ["getInvestmentType", 'prePopulate'],
     }),
 
+
+
+
+
     profile: builder.query({
       query: (id) => `/auth/admin/profile`,
     }),
 
-    // ========Add Io Details========
-
-    updateIOCase: builder.mutation({
-      query: (id) => ({
-        url: `/io/admin/maker-transaction/${id}/verify-pending-transaction-for-cash-and-nav`,
-        method: "POST",
-      }),
-
-      invalidatesTags: ["getIOById"],
-    }),
-
- 
-    updateTransaction: builder.mutation({
-      query: (id) => ({
-        // url: `/io/admin/maker-transaction/${id}/verify-pending-transaction-for-cash-and-nav`,
-        url: `/io/admin/maker-transaction/${id}/verify-pending-transaction`,
-        method: "POST",
-      }),
-
-      invalidatesTags: ["getIOById"],
-    }),
 
 
-    addNavDetails: builder.mutation({
-      query: ({id,data}) => ({
-        url: `/io/admin/maker-transaction/${id}/io-nav`,
-        method: "POST",
-        body:data,
-      }),
-
-      invalidatesTags: ["getIOById"],
-    }),
-
-    addIOTransaction: builder.mutation({
-      query: ({id,data}) => ({
-        url: `/io/admin/maker-transaction/${id}/io-nav`,
-        method: "POST",
-        body:data,
-      }),
-
-      invalidatesTags: ["getIOById"],
-    }),
-
-    saveIOTransaction: builder.mutation({
-      query: ({id,data}) => ({
-        url: `/io/admin/maker-transaction/${id}/io-yeild`,
-        method: "POST",
-        body:data,
-      }),
-
-      invalidatesTags: ["getIOById"],
-    }),
-
-    exitIOTransaction: builder.mutation({
-      query: ({id,data}) => ({
-        url: `/io/admin/maker-transaction/${id}/io-exit`,
-        method: "POST",
-        body:data,
-      }),
-
-      invalidatesTags: ["getIOById"],
-    }),
-    
-
-    addIoCase: builder.mutation({
-      query: (id) => ({
-        url: `/io/admin/maker-transaction/${id}/verify-pending-transaction`,
-        method: "POST",
-      }),
-
-      invalidatesTags: ["getIOById"],
-    }),
 
 
-    approveIOCase: builder.mutation({
-      query: ({id,data}) => ({
-        url: `/io/admin/checker-transaction/approved/io-cash/${id}`,
-        method: "PATCH",
-        body:data,
-      }),
-
-      invalidatesTags: ["getIOById"],
-    }),
 
 
-    approveIONav: builder.mutation({
-      query: ({id,data}) => ({
-        url: `/io/admin/checker-transaction/approved/io-nav/${id}`,
-        method: "PATCH",
-        body:data,
-      }),
-
-      invalidatesTags: ["getIOById"],
-    }),
-
-    approveDistribution: builder.mutation({
-      query: ({id,data}) => ({
-        url: `/io/admin/checker-transaction/approved/distributed-to-investor/${id}`,
-        method: "PATCH",
-        body:data,
-      }),
-
-      invalidatesTags: ["getIOById"],
-    }),
-
-    
-    approveExit: builder.mutation({
-      query: ({id,data}) => ({
-        url: `/io/admin/checker-transaction/approved/exit/${id}`,
-        method: "PATCH",
-        body:data,
-      }),
-
-      invalidatesTags: ["getIOById"],
-    }),
-
-    approveInvested: builder.mutation({
-      query: ({id,data}) => ({
-        url: `/io/admin/checker-transaction/approved/amount-invested/${id}`,
-        method: "PATCH",
-        body:data,
-      }),
-
-      invalidatesTags: ["getIOById"],
-    }),
-    
-    approveDistributed: builder.mutation({
-      query: ({id,data}) => ({
-        url: `/io/admin/checker-transaction/approved/distributed-to-investor/${id}`,
-        method: "PATCH",
-        body:data,
-      }),
-
-      invalidatesTags: ["getIOById"],
-    }),
-
-    approveExitTransaction: builder.mutation({
-      query: ({id,data}) => ({
-        url: `/io/admin/checker-transaction/approved/exit/${id}`,
-        method: "PATCH",
-        body:data,
-      }),
-
-      invalidatesTags: ["getIOById"],
-    }),
-
-    approveCancleTransaction: builder.mutation({
-      query: ({id,data}) => ({
-        url: `/io/admin/checker-transaction/approved/cancel/${id}`,
-        method: "PATCH",
-        body:data,
-      }),
-
-      invalidatesTags: ["getIOById"],
-    }),
 
 
-    rejectIOCase: builder.mutation({
-      query: ({id,data}) => ({
-        url: `/io/admin/checker-transaction/reject/${id}`,
-        method: "PATCH",
-        body:data,
-      }),
-
-      invalidatesTags: ["getIOById"],
-    }),
-
- 
   }),
 });
 
@@ -624,6 +470,7 @@ export const {
   useDeleteVideoArtifactsMutation,
   useDeleteImageArtifactsMutation,
 
+
   useSetDisplayOrderMutation,
   useSetDisplayOrderIODocumentsMutation,
   useSetDisplayOrderIOArtifactsImageMutation,
@@ -641,9 +488,11 @@ export const {
   useGetDistributedToInvestorMutation,
   useUpdateExitToInvestorMutation,
 
+
   useUpdateCancleStatusMutation,
 
-  // ==============[ Sponser ]===============
+
+// ==============[ Sponser ]===============
   useGetSponserMasterQuery,
   useGetSponserMasterActiveQuery,
   useCreateSponserMutation,
@@ -652,6 +501,7 @@ export const {
   useDeleteSponserMutation,
   useGetActiveSponserMasterQuery,
 
+
   // ============[ Investment Type ]========
 
   useGetInvestmentTypesQuery,
@@ -659,24 +509,6 @@ export const {
   useCreateInvestmentTypeMutation,
   useUpdateInvestmentTypeMutation,
   useDeleteInvestmentTypeMutation,
-  useProfileQuery,
-
-  // ========[ Add Io Details ]========
-
-  useUpdateIOCaseMutation,
-  useUpdateTransactionMutation,
-  useApproveIOCaseMutation,
-  useRejectIOCaseMutation,
-  useAddNavDetailsMutation,
-  useApproveIONavMutation,
-  useAddIOTransactionMutation,
-  useSaveIOTransactionMutation,
-  useApproveDistributionMutation,
-  useExitIOTransactionMutation,
-  useApproveExitMutation,
-  useApproveInvestedMutation,
-  useApproveDistributedMutation,
-  useApproveExitTransactionMutation,
-  useApproveCancleTransactionMutation
+  useProfileQuery
 
 } = ioService;

src/Services/subadmin.service.js

@@ -1,98 +0,0 @@
-
-// Need to use the React-specific entry point to import createApi
-import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
-import { baseQuery } from "./token.serivce";
-
-
-
-// Define a service using a base URL and expected endpoints
-export const sabAdminMaster = createApi({
-  reducerPath: "sabAdminMaster",
-  baseQuery: baseQuery,
-  tagTypes: ["getSubAdmin", "prePopulate"],
-  endpoints: (builder) => ({
-
-
-
-    // ======[Get All]=====
-
-    getSubAdminMaster: builder.query({
-      query: () => `/subadmin/admin/getAll`,
-      providesTags: ["getSubAdmin"],
-    }),
-
-    // // ========[ Create ]========
-
-    createSubAdmin: builder.mutation({
-      query: (data) => ({
-        url: `/subadmin/admin/create`,
-        method: "POST",
-        body: data,
-      }),
-      invalidatesTags: ["getSubAdmin","prePopulate"],
-    }),
-
-    // // ========[Update Sponser]========
-
-    updateSubAdmin: builder.mutation({
-      query: ({ data, id }) => ({
-        url: `/subadmin/admin/${id}`,
-        method: "PATCH",
-        body: data,
-      }),
-      invalidatesTags: ["getSubAdmin"],
-    }),
-
-    getSubAdminById: builder.query({
-      query: (id) => `/subadmin/admin/${id}`,
-    }),
-
-    // // ========[Toggle Status]========
-
-    toggleStatus: builder.mutation({
-      query: ({id, data}) => ({
-        url: `/subadmin/admin/toggle-role/${id}`,
-        method: "PATCH",
-        body: data,
-      }),
-      invalidatesTags: ["getSubAdmin"],
-    }),
-
-    // // ========[Get Active]========
-
-    // getActiveSponserMaster: builder.query({
-    //   query: () => `/sponsor/admin/active`,
-    // }),
-
-    // getSponserMasterActive: builder.query({
-    //   query: () => "/sponsor/admin/active",
-    // }),
-
-    // // ======[Get ID]=====
-
-    // getSponserById: builder.query({
-    //   query: (id) => `/sponsor/admin/${id}`,
-    // }),
-
-    // // ========[Update Sponser]========
-
-    // updateSponser: builder.mutation({
-    //   query: ({ data, id }) => ({
-    //     url: `/sponsor/admin/${id}`,
-    //     method: "PATCH",
-    //     body: data,
-    //   }),
-    //   invalidatesTags: ["getSponser"],
-    // }),
-
-  }),
-});
-
-// Export hooks for usage in functional components
-export const {
-   useGetSubAdminMasterQuery,
-   useCreateSubAdminMutation,
-   useUpdateSubAdminMutation,
-   useGetSubAdminByIdQuery,
-   useToggleStatusMutation
-} = sabAdminMaster;

src/Services/token.serivce.js

@@ -1,5 +1,4 @@
 import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
-import { encryptString } from '../Constants/Constants'
 
 // Define a base query function with RTK Query
 // export const baseQuery = fetchBaseQuery({
@@ -47,7 +46,7 @@ export const baseQuery = async (args, api, extraOptions) => {
         if (refreshResult.data) {
           // Save new tokens
           localStorage.setItem("accessToken", refreshResult?.data?.data?.access?.token);
-          // localStorage.setItem("role", refreshResult?.data?.data?.role);
+          localStorage.setItem("role", refreshResult?.data?.data?.role);
           // console.log(refreshResult?.data?.data?.role);
         
 
@@ -101,7 +100,7 @@ export const apiSlice = createApi({
           localStorage.setItem("refreshToken", data?.data?.refresh?.token);
           // localStorage.setItem('refreshTokenExp', data?.data?.refresh?.expires);
           localStorage.setItem("accessTokenExp", data?.data?.access?.expires);
-          localStorage.setItem("role", encryptString(data?.data?.role));
+          localStorage.setItem("role", data?.data?.role);
         } catch (error) {
           console.error("Login failed:", error);
         }
@@ -127,6 +126,6 @@ export const apiSlice = createApi({
 
 
   }),
-}); 
+});
 
 export const { useLoginMutation, useRefreshTokenMutation, useLogoutMutation } = apiSlice;

src/Store/Store.js

@@ -17,9 +17,6 @@ import { deleteRequest } from "../Services/delete.request.service";
 import { banInvestorDetails } from "../Services/ban.investor.service";
 import { fawateerRequest } from "../Services/fawateer.request.service";
 import { fawateerMaker } from "../Services/fawateer.maker.service";
-import { sabAdminMaster } from "../Services/subadmin.service";
-import { changePasswordMake } from "../Services/change.password.service";
-import { forgetPasswordMake } from "../Services/forget.password.service";
 
 export const store = configureStore({
   reducer: {
@@ -38,9 +35,6 @@ export const store = configureStore({
     [banInvestorDetails.reducerPath]: banInvestorDetails.reducer,
     [fawateerRequest.reducerPath]: fawateerRequest.reducer,
     [fawateerMaker.reducerPath]: fawateerMaker.reducer,
-    [sabAdminMaster.reducerPath]: sabAdminMaster.reducer,
-    [changePasswordMake.reducerPath]: changePasswordMake.reducer,
-    [forgetPasswordMake.reducerPath]: forgetPasswordMake.reducer,
 
     // Add other reducers as needed
   },
@@ -65,9 +59,7 @@ export const store = configureStore({
       banInvestorDetails.middleware,
       fawateerRequest.middleware,
       fawateerMaker.middleware,
-      sabAdminMaster.middleware,
-      changePasswordMake.middleware,
-      forgetPasswordMake.middleware,
+
     ),
 });