diff --git a/src/Pages/Admin/BankDetails/EditBankDetails.jsx b/src/Pages/Admin/BankDetails/EditBankDetails.jsx index 58bc47c..f17865c 100644 --- a/src/Pages/Admin/BankDetails/EditBankDetails.jsx +++ b/src/Pages/Admin/BankDetails/EditBankDetails.jsx @@ -36,7 +36,7 @@ const EditBankDetails = () => { const [isSwitchOn, setIsSwitchOn] = useState(false); const [updateBankDetails] = useUpdateBankDetailsMutation(); - const { data: bankDetails, error, isLoading } = useGetBankDetailsQuery({ id }, { skip: !id }); + const { data: bankDetails, error, isLoading, refetch } = useGetBankDetailsQuery({ id }, { skip: !id }); console.log(bankDetails); @@ -54,6 +54,7 @@ const EditBankDetails = () => { setInvestorDetails({ ...bankDetails?.data, }); + // refetch() if (bankDetails?.data) { reset({ accountName: bankDetails?.data?.accountName, @@ -87,6 +88,7 @@ const EditBankDetails = () => { setIsLoadingBtn(false); setAlert(false); + refetch() navigate("/bank-details"); } else { throw new Error("Something went wrong"); @@ -121,7 +123,7 @@ const EditBankDetails = () => { name: "accountName", placeHolder: "", type: "text", - // isRequired: true, + isRequired: true, section: "Add Details", // maxLength: 255, width: "32%", @@ -133,6 +135,7 @@ const EditBankDetails = () => { type: "text", section: "Add Details", width: "32%", + isRequired: true, }, { label: "IBAN Number", @@ -141,6 +144,7 @@ const EditBankDetails = () => { type: "text", section: "Add Details", width: "32%", + isRequired: true, }, { label: "SWIFT Code", @@ -150,6 +154,7 @@ const EditBankDetails = () => { type: "text", section: "Add Details", width: "32%", + isRequired: true, }, { label: "Bank Name", @@ -158,6 +163,7 @@ const EditBankDetails = () => { type: "text", section: "Add Details", width: "32%", + isRequired: true, }, { label: "Bank Address", @@ -166,6 +172,7 @@ const EditBankDetails = () => { type: "text", section: "Add Details", width: "32%", + isRequired: true, }, ]; diff --git a/src/Pages/Fawateer/CreateRequest.jsx b/src/Pages/Fawateer/CreateRequest.jsx index 375b9ae..3bd9e39 100644 --- a/src/Pages/Fawateer/CreateRequest.jsx +++ b/src/Pages/Fawateer/CreateRequest.jsx @@ -223,7 +223,7 @@ const CreateRequest = () => { name="transaction_amount" control={control} render={({ field }) => ( - + )} /> diff --git a/src/Pages/FawateerChecker/ApproveRequest/RequestApproveModal.jsx b/src/Pages/FawateerChecker/ApproveRequest/RequestApproveModal.jsx index fab8abe..de219ae 100644 --- a/src/Pages/FawateerChecker/ApproveRequest/RequestApproveModal.jsx +++ b/src/Pages/FawateerChecker/ApproveRequest/RequestApproveModal.jsx @@ -2,6 +2,7 @@ import { Box, Button, FormControl, + FormHelperText, FormLabel, Input, Modal, @@ -25,7 +26,12 @@ import ToastBox from "../../../Components/ToastBox"; import { useApproveCommentMutation } from "../../../Services/fawateer.request.service"; export const conformModalSchema = yup.object().shape({ - checkerComment: yup.string().required("Comment is required"), + // checkerComment: yup.string().required("Comment is required") + // .max(50, "Investment name cannot be more than 50 characters"), + checkerComment: yup + .string() + .required("Comment is required") + .max(200, "Approve Comment cannot be more than 200 characters"), }); const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => { @@ -36,6 +42,7 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => { const { register, reset, + watch, handleSubmit, formState: { errors }, } = useForm({ @@ -99,7 +106,7 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => { const heandleOnClose = () =>{ reset() - onClose() + onClose() } return ( @@ -126,12 +133,17 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => { placeholder={"Enter your checkerComment...."} rounded={"md"} resize={"none"} + maxLength={200} /> {errors.checkerComment && ( {errors.checkerComment.message} )} + + Maximum length should be 200 characters. You have entered + {watch("checkerComment")?.length || 0} characters. + diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx index cedd8c8..f9d8171 100644 --- a/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx +++ b/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx @@ -124,12 +124,24 @@ const IONAVDetails = () => { ), Comments: ( + // + // {item.comments} + // {item.comments} diff --git a/src/Pages/IO_Management/KeyMeritsAdd.jsx b/src/Pages/IO_Management/KeyMeritsAdd.jsx index 095868c..f7582c0 100644 --- a/src/Pages/IO_Management/KeyMeritsAdd.jsx +++ b/src/Pages/IO_Management/KeyMeritsAdd.jsx @@ -156,7 +156,7 @@ const KeyMeritsAdd = ({ isOpen, onClose, firstField, id, icons }) => { - Key Merits + Key Merits @@ -339,7 +339,7 @@ const KeyMeritsAdd = ({ isOpen, onClose, firstField, id, icons }) => { rounded={"sm"} size={"sm"} mr={3} - onClick={onClose} + onClick={onClose} > Cancel