Merge branch 'dev' of http://git.wdipl.com/Siddhesh.More/tanami-admin-panel into dev

src/Pages/Deposit/DepositRequest/DepositRequestApprove.jsx

@@ -51,6 +51,8 @@ const DepositRequestApprove = ({ isOpen, onClose, firstField, id, data:requestDa
     skip: !id,
   });
 
+  
+
 
   const {
     register,
@@ -116,6 +118,7 @@ const DepositRequestApprove = ({ isOpen, onClose, firstField, id, data:requestDa
     if (data) {
       reset({
         investorAmount: data?.data?.investorAmount,
+        accountName:data?.data?.accountName
       });
     }
   }, [data, reset]);

src/Pages/Investor_Management/InvestorDetails/ProfileView.jsx

@@ -40,7 +40,7 @@ const ProfileView = () => {
     skip: !id,
   });
 
-  const foundObject = data?.data;
+  const foundObject = data?.data; 
 
   useEffect(() => {
     setViewInvestor(data?.data?.portfolio);
@@ -147,8 +147,48 @@ const ProfileView = () => {
       width: "32%",
     },
     {
-      label: "App Notification",
-      value: foundObject?.IsAppNotificationEnabled === 1 ? "Yes" : "No",
+      label: "Account Name",
+      value: foundObject?.accountName,
+      type: "text",
+      isRequired: true,
+      section: "Bank Details",
+      width: "32%",
+    },
+    {
+      label: "Account No",
+      value: foundObject?.accountNumber,
+      type: "text",
+      isRequired: true,
+      section: "Bank Details",
+      width: "32%",
+    },
+    {
+      label: "IBAN",
+      value: foundObject?.IBANnumber,
+      type: "text",
+      isRequired: true,
+      section: "Bank Details",
+      width: "32%",
+    },
+    {
+      label: "SWIFT Code",
+      value: foundObject?.swiftCode,
+      type: "text",
+      isRequired: true,
+      section: "Bank Details",
+      width: "32%",
+    },
+    {
+      label: "Bank Name",
+      value: foundObject?.bankName,
+      type: "text",
+      isRequired: true,
+      section: "Bank Details",
+      width: "32%",
+    },
+    {
+      label: "Bank Address",
+      value: foundObject?.bankAddress,
       type: "text",
       isRequired: true,
       section: "Bank Details",

src/Pages/Investor_Management/InvestorDetails/ViewInvestorDetails.jsx

@@ -67,7 +67,7 @@ const ViewInvestorDetails = () => {
     "Holding Period",
     "Estimated return",
     "Status",
-    "Action",
+    // "Action",
   ];
 
 console.log(viewInvestor);
@@ -94,7 +94,7 @@ console.log(viewInvestor);
 
   console.log(filteredData);
 
-  const extractedArray = filteredData?.map((item) => ({
+  const extractedArray = filteredData?.map((item,index) => ({
     id: item?.id,
     "Sr N/O": (
       <Text w={'50px'}
@@ -103,7 +103,7 @@ console.log(viewInvestor);
         color={"gray.600"}
         className="d-flex align-items-center fw-bold web-text-small"
       >
-        {item.IOId}
+        {index + 1}.
       </Text>
     ),
     "Deal Name": (

src/Pages/WithDrawal/DrawalRequest/DrawalRequestApprove.jsx

@@ -48,6 +48,7 @@ import {  useGetDrawalRequestByIdQuery, useUpdateDrawalRequestMutation } from ".
     const { data, isLoading } = useGetDrawalRequestByIdQuery(id, {
       skip: !id,
     });
+    
 
     const filteredData =data?.dat;
     const {
@@ -107,7 +108,7 @@ import {  useGetDrawalRequestByIdQuery, useUpdateDrawalRequestMutation } from ".
     useEffect(() => {
       if (data) {
         reset({
-          investorAmount: data?.data?.investorAmount,
+          investorAmount: data?.data?.dataValues?.investorAmount,
         });
       }
     }, [data, reset]);
@@ -154,27 +155,27 @@ import {  useGetDrawalRequestByIdQuery, useUpdateDrawalRequestMutation } from ".
                   <Heading fontSize="sm" fontWeight={600} mb={4}>Investor Account Details</Heading>
                   <Box display={"flex"} mb={3}>
                     <Text fontSize="xs" mb={0} fontWeight={500} me={2} w={"110px"}>Account Name:</Text>
-                    <Text fontSize="xs" mb={0}>John David</Text>
+                    <Text fontSize="xs" mb={0}>{data?.data?.bankDetails?.accountName}</Text>
                   </Box>
                   <Box display={"flex"} mb={3}>
                     <Text fontSize="xs" mb={0} fontWeight={500} me={2}  w={"110px"}>Account No:</Text>
-                    <Text fontSize="xs" mb={0}>100000345779</Text>
+                    <Text fontSize="xs" mb={0}>{data?.data?.bankDetails?.accountNumber}</Text>
                   </Box>
                   <Box display={"flex"} mb={3}>
                     <Text fontSize="xs" mb={0} fontWeight={500} me={2}  w={"110px"}>IBAN:</Text>
-                    <Text fontSize="xs" mb={0}>BH 23 BBKU 00200 00048 0779</Text>
+                    <Text fontSize="xs" mb={0}>{data?.data?.bankDetails?.IBANnumber}</Text>
                   </Box>
                   <Box display={"flex"} mb={3}>
                     <Text fontSize="xs" mb={0} fontWeight={500} me={2}  w={"110px"}>SWIFT Code:</Text>
-                    <Text fontSize="xs" mb={0}>BBKUBHBM</Text>
+                    <Text fontSize="xs" mb={0}>{data?.data?.bankDetails?.swiftCode}</Text>
                   </Box>
                   <Box display={"flex"} mb={3}>
                     <Text fontSize="xs" mb={0} fontWeight={500} me={2}  w={"110px"}>Bank Name:</Text>
-                    <Text fontSize="xs" mb={0}>Bank of Bahrain and Kuwait B.S.C</Text>
+                    <Text fontSize="xs" mb={0}>{data?.data?.bankDetails?.bankName}</Text>
                   </Box>
                   <Box display={"flex"} mb={5}>
-                    <Text fontSize="xs" mb={0} fontWeight={500} me={2}  w={"120px"}>Bank Address:</Text>
-                    <Text fontSize="xs" mb={0}>43 Government Avenue, Manama, Kingdom of Bahrain</Text>
+                    <Text fontSize="xs" mb={0} fontWeight={500} me={2}  w={"110px"}>Bank Address:</Text>
+                    <Text fontSize="xs" mb={0}>{data?.data?.bankDetails?.bankAddress}</Text>
                   </Box>
                 <FormControl mb={4}>
                   <FormLabel fontSize="sm">Comments</FormLabel>