Merge pull request 'bug-fix/9.0.3' (#30) from bug-fix/9.0.3 into main

Reviewed-on: #30

README.md

@@ -1,10 +1,113 @@
-# React + Vite
+# **Tanami Capital**
 
-This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
+**Tanami** is a cutting-edge fintech platform designed to streamline investment opportunities for users in the Gulf region. It features two main components:
 
-Currently, two official plugins are available:
+- **Admin Panel:** A web-based dashboard for managing users, monitoring transactions, and overseeing investments efficiently.  
+- **Mobile Application:** A user-friendly app that empowers individuals to invest in diverse asset classes, including real estate, private equity, and other financial instruments located in Gulf countries.  
+
+---
+
+## **Key Features**
+- **Regional Focus:** Exclusively operational in Gulf countries, offering investment opportunities tailored to the region.  
+- **Diverse Investment Options:** Enables users to invest in financial instruments like real estate and private equity with ease and transparency.  
+- **Comprehensive Admin Tools:** The admin panel offers robust tools for tracking and managing platform activity.
+
+---
+
+## **Current Status**
+The project is **live and operational**, catering specifically to the investment needs of users in the Gulf region.
+
+---
+
+## **Table of Contents**
+- [Installation](#installation)
+- [Usage](#usage)
+- [Environment Variables](#environment-variables)
+- [Scripts](#scripts)
+- [License](#license)
+
+---
+
+## **Installation**
+
+### **Prerequisites**
+- [Node.js](https://nodejs.org/) (version 14 or higher recommended)  
+- [npm](https://www.npmjs.com/) (bundled with Node.js)  
+
+### **Steps**
+1. Clone the repository:  
+	```bash
+	git clone http://git.wdipl.com/Siddhesh.More/tanami-admin-panel.git
+	```
+2. Navigate to the project directory:  
+	```bash
+	cd tanami-admin-panel
+	```
+3. Install dependencies:  
+	```bash
+	npm install
+	```
+
+---
+
+## **Usage**
+
+### **Development Mode**
+1. Start the development server:  
+	```bash
+	npm run dev
+	```
+2. Open your browser and navigate to:  
+	```
+	http://localhost:5173/
+	```
+
+### **Production Mode**
+1. Install [PM2](https://pm2.keymetrics.io/) globally for process management:  
+	```bash
+	npm install pm2 -g
+	```
+
+2. Build the application (if applicable):  
+	```bash
+	npm run build
+	```
+
+3. Serve the application using PM2:
+	```bash
+	pm2 serve ./dist <port_number> --spa --name=<application_name>
+	```
+	Replace:
+	- `./dist` with your build directory.
+	- `<port_number>` with the desired port (e.g., `3000`).
+	- `<application_name>` with the name of your application.
+
+4. Save the PM2 process list and enable startup on system reboot:
+	```bash
+	pm2 save
+	pm2 startup
+	```
+
+---
+
+## **Environment Variables**
+
+Create a `.env` file in the root directory based on the structure of [`.env.example`](.env.example). 
+
+---
+
+## **Scripts**
+
+| Script             | Description                                                 |
+|---------------------|-------------------------------------------------------------|
+| `npm run dev`       | Starts the app in development mode with `Vite` server.      |
+| `npm run build`     | Builds the app for production.                              |
+| `npm run lint`      | Runs ESLint to check for code quality issues.               |
+| `npm run preview`   | Previews the production build locally.                      |
+
+---
+
+## **License**
+
+This project is licensed under the [MIT License](LICENSE).
 
-- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
-- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
-# rubix-admin-panel
-# tanami-admin-panel

src/Pages/ChangePassword.jsx

@@ -16,14 +16,13 @@ import {
   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 React, { useState } from "react";
+import { useForm } from "react-hook-form";
+import * as yup from "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({
@@ -53,12 +52,18 @@ const ChangePassword = ({
   actionId,
   setActionId,
 }) => {
+  const initialValue = {
+    oldPassword: "",
+    newPassword: "",
+    confirmNewPassword: "",
+  };
   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 [input, setInput] = useState(initialValue);
 
   const [updatePassword] = useUpdatePasswordMutation();
 
@@ -74,10 +79,10 @@ const ChangePassword = ({
   });
 
   // Form submit handler
-  const onSubmit = async (data) => {
+  const onSubmit = async () => {
     setIsLoading(true);
     try {
-      const res = await updatePassword(data); // Assuming API request works as expected
+      const res = await updatePassword(input); // Assuming API request works as expected
       if (res?.data?.statusCode === 200) {
         toast({
           render: () => <ToastBox message={res?.data?.message} />,
@@ -98,6 +103,11 @@ const ChangePassword = ({
     }
   };
 
+  const handleSubmitFrom = (data) => {
+    setAlert(true);
+    setInput(data);
+  };
+
   // Handle modal close
   const handleClose = () => {
     setAlert(false);
@@ -107,7 +117,7 @@ const ChangePassword = ({
 
   return (
     <>
-      <Modal isOpen={isOpen} onClose={onClose} initialFocusRef={firstField}>
+      <Modal isOpen={isOpen} onClose={handleClose} initialFocusRef={firstField}>
         <ModalOverlay />
         <ModalContent>
           <ModalHeader fontSize="md">Change Password</ModalHeader>
@@ -211,7 +221,8 @@ const ChangePassword = ({
               rounded={"sm"}
               colorScheme="forestGreen"
               size="sm"
-              onClick={() => setAlert(true)}
+              // onClick={() => setAlert(true)}
+              onClick={handleSubmit(handleSubmitFrom)}
               isLoading={isLoading}
             >
               Save
@@ -223,7 +234,7 @@ const ChangePassword = ({
       <CustomAlertDialog
         isOpen={alert}
         onClose={() => setAlert(false)}
-        alertHandler={handleSubmit(onSubmit)}
+        alertHandler={onSubmit}
         message={"Are you sure you want to change the password?"}
         isLoading={isLoading}
       />

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

@@ -38,7 +38,7 @@ import { useUpdateIOCaseMutation } from "../../../../Services/io.service";
 import RequestApproveModal from "./RequestApproveModal";
 import RequestRejectModal from "./RequestRejectModal";
 import AddCaseDetails from "./AddCaseDetails";
-import { encryptString } from "../../../../Constants/Constants";
+import { encryptString, isMaker } from "../../../../Constants/Constants";
 
 const formatDate = (date) => new Date(date).toLocaleDateString();
 
@@ -105,8 +105,7 @@ const Pending = () => {
     "Comments",
     "Update By",
     "Update On",
-    ...(localStorage?.getItem('role')!==encryptString(import.meta.env.VITE_VITE_MAKER) ? ["Actions"] : []),
-    
+    ...(!isMaker() ? ["Actions"] : []),
   ];
 
   const extractedArray = filteredData?.map((item, index) => ({
@@ -132,9 +131,9 @@ const Pending = () => {
           $
         </Badge>
         {parseFloat(item?.transactionAmount || 0).toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
+          minimumFractionDigits: 2,
+          maximumFractionDigits: 2,
+        })}
       </Text>
     ),
     Comments: (
@@ -167,64 +166,69 @@ const Pending = () => {
     ),
     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"
-        >
+        {!isMaker() ? (
+          <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="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"}
@@ -236,7 +240,8 @@ const Pending = () => {
             }}
           >
             <ViewIcon me={"4px"} /> View
-          </Button>}
+          </Button>
+        )}
       </Box>
     ),
   }));
@@ -314,9 +319,9 @@ const Pending = () => {
                 $
               </Badge>
               {parseFloat(IODetails?.ioCash || 0).toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
+                minimumFractionDigits: 2,
+                maximumFractionDigits: 2,
+              })}
             </Th>
             <Th
               textAlign={"center"}

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

@@ -22,7 +22,7 @@ import ToastBox from "../../../../Components/ToastBox";
 import AddNavDetails from "./AddNavDetails";
 import RequestApproveModal from "./RequestApproveModal";
 import RequestRejectModal from "./RequestRejectModal";
-import { encryptString } from "../../../../Constants/Constants";
+import { encryptString, isMaker } from "../../../../Constants/Constants";
 
 const formatDate = (date) => new Date(date).toLocaleDateString();
 
@@ -91,7 +91,7 @@ const Pending = () => {
     "Investment Closed",
     "Comments",
     "Updated By",
-    ...(localStorage?.getItem("role") !== encryptString(import.meta.env.VITE_VITE_MAKER) ? ["Status"] : []),
+    ...(!isMaker() ? ["Status"] : []),
   ];
 
   const extractedArray = filteredData?.map((item, index) => ({
@@ -112,9 +112,9 @@ const Pending = () => {
           $
         </Badge>
         {parseFloat(item?.transactionAmount || 0).toLocaleString(undefined, {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-          })}
+          minimumFractionDigits: 2,
+          maximumFractionDigits: 2,
+        })}
       </Text>
     ),
     "Last Nav Update": (
@@ -162,66 +162,80 @@ const Pending = () => {
         {item?.modifier?.firstName}
       </Text>
     ),
-    Status: (
+    Status: isMaker() ? (
+      <Button
+        colorScheme="green"
+        rounded={"sm"}
+        size={"xs"}
+        px={2}
+        py={1}
+        fontWeight={500}
+        onClick={() => {
+          setActionId(item.id);
+        }}
+      >
+        <ViewIcon me={"4px"} /> View
+      </Button>
+    ) : (
       <Box display={"flex"} justifyContent={"center"}>
-       <Box>
+        <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>
+            <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> 
       </Box>
     ),
   }));

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

@@ -1,33 +1,26 @@
+import { ViewIcon } from "@chakra-ui/icons";
 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 NormalTable from "../../../../Components/DataTable/NormalTable";
+import { isMaker } from "../../../../Constants/Constants";
+import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
+import { OPACITY_ON_LOAD } from "../../../../Layout/animations";
 import RequestApproveModal from "./RequestApproveModal";
 import RequestRejectModal from "./RequestRejectModal";
 import ViewAmountInvested from "./ViewAmountInvested";
+import ViewCancel from "./ViewCancel";
 import ViewDistributionInvestor from "./ViewDistributionInvestor";
 import ViewExit from "./ViewExit";
-import ViewCancel from "./ViewCancel";
-import { encryptString, isMaker } from "../../../../Constants/Constants";
 
 const formatDate = (date) => new Date(date).toLocaleDateString();
 
@@ -43,6 +36,7 @@ const Pending = () => {
   const [actionId, setActionId] = useState(false);
   const [mouseEntered, setMouseEntered] = useState(false);
   const [mouseEnteredId, setMouseEnteredId] = useState("");
+  const [distributedAmt, setDistributedAmt] = useState();
 
   const {
     isOpen: isConfirmOpen,
@@ -93,11 +87,6 @@ const Pending = () => {
     });
   };
 
-  console.log(
-    "==============panding",
-    IODetails?.ioTransactionRecords?.Pending
-  );
-
   // Table filter
   // const filteredData = IODetails?.ioTransactionRecords?.Pending?.filter((item) => {
   //   // Filter by name (case insensitive)
@@ -195,6 +184,7 @@ const Pending = () => {
                 onInvestmentOpen();
               } else if (item?.transactionType === "Distribution To Investor") {
                 onDistInvestorOpen();
+                setDistributedAmt(item?.transactionAmount);
               } else if (item?.transactionType === "Exit") {
                 onExitOpen();
               } else if (item?.transactionType === "Cancel") {
@@ -203,10 +193,7 @@ const Pending = () => {
             }}
           >
             {isMaker() ? <ViewIcon me={"4px"} /> : null}{" "}
-            {localStorage?.getItem("role") ===
-            encryptString(import.meta.env.VITE_VITE_MAKER)
-              ? "View"
-              : "Approve / Reject"}
+            {isMaker() ? "View" : "Approve / Reject"}
           </Button>
         </Box>
       ),
@@ -276,6 +263,7 @@ const Pending = () => {
         isOpen={isDistInvestorOpen}
         onClose={onDistInvestorClose}
         id={actionId}
+        amount={distributedAmt}
       />
       <ViewExit isOpen={isExitOpen} onClose={onExitClose} id={actionId} />
       <ViewCancel isOpen={isCancelOpen} onClose={onCancelClose} id={actionId} />

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

@@ -27,7 +27,7 @@ import CurrencyInput from "../../../../Components/CurrencyInput";
 import RequestRejectModal from "./RequestRejectModal";
 import ApproveInvestedModal from "./ApproveInvestedModal";
 import { formatDate } from "../../../Master/Sponser/Sponsers";
-import { encryptString } from "../../../../Constants/Constants";
+import { encryptString, isMaker } from "../../../../Constants/Constants";
 
 // Validation schema
 const validationSchema = yup.object().shape({
@@ -117,7 +117,6 @@ const ViewAmountInvested = ({ isOpen, onClose, id: investorId }) => {
   };
 
   // const formatDate = (date) => new Date(date).toLocaleDateString();
-  
 
   const handleAmountChange = (e) => {
     // e might be an object or just a value, handle both cases
@@ -237,41 +236,43 @@ const ViewAmountInvested = ({ isOpen, onClose, id: investorId }) => {
               />
             </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>}
+            {!isMaker() && (
+              <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>

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

@@ -1,128 +1,128 @@
 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";
+  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 } =
+import { encryptString, isMaker } 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 [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 {
+    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
           }
-        ),
-    });
-  
-    const {
-      control,
-      handleSubmit,
-      formState: { errors },
-      reset,
-    } = useForm({
-      resolver: yupResolver(investorExit),
-    });
-  
-    useEffect(() => {
-      console.log("hiit     useEffectc");
-      if (id && IODetails) {
-        handleCalculate(id, {
-          amount: IODetails?.ioMVNAV,
-        });
-       }
-      reset({
+          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,
       });
-    }, [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"),
+    }
+    reset({
+      amount: IODetails?.ioMVNAV,
     });
-  
-    // ====================================================[Table Setup]================================================================
-    const tableHeadRow = [
+  }, [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",
@@ -134,221 +134,223 @@ import { encryptString } from "../../../../Constants/Constants";
     "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}>
+  ];
+
+  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>
+        {!isMaker() && (
+          <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>
+              <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
+          </ModalFooter>
+        )}
+      </ModalContent>
+      <ApprovedCancelTransaction
         isOpen={isConfirmOpen}
         onClose={onConfirmClose}
         onBigModalClose={onClose}
@@ -360,9 +362,8 @@ import { encryptString } from "../../../../Constants/Constants";
         onBigModalClose={onClose}
         id={cancleId}
       />
-      </Modal>
-    );
-  };
-  
-  export default ViewCancel;
-  
+    </Modal>
+  );
+};
+
+export default ViewCancel;

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

@@ -23,9 +23,9 @@ import { yupResolver } from "@hookform/resolvers/yup";
 import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
 import ApproveDistrubationModal from "./ApproveDistrubationModal";
 import RequestRejectModal from "./RequestRejectModal";
-import { encryptString } from "../../../../Constants/Constants";
+import { encryptString, isMaker } from "../../../../Constants/Constants";
 
-const ViewDistributionInvestor = ({ isOpen, onClose,id:exitId }) => {
+const ViewDistributionInvestor = ({ isOpen, onClose, id: exitId, amount }) => {
   const params = useParams();
   const toast = useToast();
   const id = params?.id;
@@ -72,19 +72,15 @@ const ViewDistributionInvestor = ({ isOpen, onClose,id:exitId }) => {
   });
 
   useEffect(() => {
-    console.log("hiit     useEffectc");
-    // handleCalculate(id, {
-    //   amount: IODetails?.ioMVNAV,
-    // });
     if (id && IODetails) {
       handleCalculate(id, {
-        amount: IODetails?.ioMVNAV,
+        amount: Math.abs(amount),
       });
-     }
+    }
     reset({
-      amount: IODetails?.ioMVNAV,
+      amount: amount,
     });
-  }, [IODetails, id]);
+  }, [IODetails, id, amount]);
 
   const handleCalculate = async (id, data) => {
     try {
@@ -201,7 +197,6 @@ const ViewDistributionInvestor = ({ isOpen, onClose,id:exitId }) => {
     setIsFinalCalculateLoading(false);
     setIsCalcualtedData(false);
   };
-  
 
   return (
     <Modal size={"xl"} isOpen={isOpen} onClose={handleClose}>
@@ -219,41 +214,43 @@ const ViewDistributionInvestor = ({ isOpen, onClose,id:exitId }) => {
           />
         </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>}
+        {!isMaker() && (
+          <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}

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

@@ -1,330 +1,332 @@
 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";
+  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);
+import { encryptString, isMaker } from "../../../../Constants/Constants";
 
-    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) {
+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"),
+    }
+    reset({
+      amount: IODetails?.ioMVNAV,
     });
-  
-    // ====================================================[Table Setup]================================================================
-    const tableHeadRow = [
-      "Sr No.",
-      "Client Id",
-      "First name",
-      "Last Name",
-      "Amount",
-      "Holding (%)",
-      "Exit Amt($)",
-    ];
+  }, [IODetails, id]);
 
-    
-  
-    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);
-    
+  const handleCalculate = async (id, data) => {
+    try {
+      const res = await getDistributionInvestment({ id, data });
+      console.log(res?.data?.data);
 
-    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}>
+      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}>
+          <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>
+        {!isMaker() && (
+          <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>
+              <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;
-  
+          </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/Services/token.serivce.js

@@ -7,7 +7,7 @@ export const baseQuery = async (args, api, extraOptions) => {
 		baseUrl: import.meta.env.VITE_BAS_URL,
 		credentials: 'include',
 		prepareHeaders: (headers) => {
-			headers.set('Content-Type', 'application/json');
+			// headers.set('Content-Type', 'application/json');
 			return headers;
 		},
 	});