diff --git a/src/Pages/Deposit/DepositRequest/DepositRequestApprove.jsx b/src/Pages/Deposit/DepositRequest/DepositRequestApprove.jsx index 8940627..ee64021 100644 --- a/src/Pages/Deposit/DepositRequest/DepositRequestApprove.jsx +++ b/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]); diff --git a/src/Pages/Investor_Management/InvestorDetails/ProfileView.jsx b/src/Pages/Investor_Management/InvestorDetails/ProfileView.jsx index b59ef9c..e118dc0 100644 --- a/src/Pages/Investor_Management/InvestorDetails/ProfileView.jsx +++ b/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", diff --git a/src/Pages/Investor_Management/InvestorDetails/ViewInvestorDetails.jsx b/src/Pages/Investor_Management/InvestorDetails/ViewInvestorDetails.jsx index 52d4b81..ff89183 100644 --- a/src/Pages/Investor_Management/InvestorDetails/ViewInvestorDetails.jsx +++ b/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": ( - {item.IOId} + {index + 1}. ), "Deal Name": ( diff --git a/src/Pages/WithDrawal/DrawalRequest/DrawalRequestApprove.jsx b/src/Pages/WithDrawal/DrawalRequest/DrawalRequestApprove.jsx index b462462..006adca 100644 --- a/src/Pages/WithDrawal/DrawalRequest/DrawalRequestApprove.jsx +++ b/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 ". Investor Account Details Account Name: - John David + {data?.data?.bankDetails?.accountName} Account No: - 100000345779 + {data?.data?.bankDetails?.accountNumber} IBAN: - BH 23 BBKU 00200 00048 0779 + {data?.data?.bankDetails?.IBANnumber} SWIFT Code: - BBKUBHBM + {data?.data?.bankDetails?.swiftCode} Bank Name: - Bank of Bahrain and Kuwait B.S.C + {data?.data?.bankDetails?.bankName} - Bank Address: - 43 Government Avenue, Manama, Kingdom of Bahrain + Bank Address: + {data?.data?.bankDetails?.bankAddress} Comments