From 8dae36daaf423d93cef9d3257b59d48c93d19268 Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Tue, 13 Aug 2024 19:02:47 +0530 Subject: [PATCH] updated 13-Aug --- src/Components/DataTable/NormalTable.jsx | 2 ++ src/Pages/IO_Management/KeyMeritsAdd.jsx | 11 ++++------- src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/Components/DataTable/NormalTable.jsx b/src/Components/DataTable/NormalTable.jsx index 54da2e8..0ae24b8 100644 --- a/src/Components/DataTable/NormalTable.jsx +++ b/src/Components/DataTable/NormalTable.jsx @@ -51,6 +51,8 @@ const DataTable = ({ whiteSpace="normal" // Allow text to wrap wordBreak="normal" // Ensure long words break properly overflowWrap="normal" // Break long words if necessary + textTransform={'none'} + > {isLoading ? : heading} {/* {heading} */} diff --git a/src/Pages/IO_Management/KeyMeritsAdd.jsx b/src/Pages/IO_Management/KeyMeritsAdd.jsx index e3102e0..54d9677 100644 --- a/src/Pages/IO_Management/KeyMeritsAdd.jsx +++ b/src/Pages/IO_Management/KeyMeritsAdd.jsx @@ -80,6 +80,8 @@ const KeyMeritsAdd = ({ isOpen, onClose, firstField, id, icons }) => { setIsLoading(true); try { const res = await createKeyMerits({ data: formData, id }); + console.log(res?.error?.status); + if (res?.data?.statusCode === 201) { toast({ render: () => , @@ -91,21 +93,16 @@ const KeyMeritsAdd = ({ isOpen, onClose, firstField, id, icons }) => { return; } - if (res?.error?.data?.code === 400) { + if (res?.error?.status === 400 || res?.error?.status === 500 ) { toast({ render: () => ( ), }); setIsLoading(false); - onClose(); setAlert(false); - reset(); - setFile(null); - setSelectedImageIcon(null); - setSelectedIcon("Select Icon"); return; - } + } } catch (error) { if (error) { toast({ diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx index 7cbced4..a1616ac 100644 --- a/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx +++ b/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx @@ -290,7 +290,7 @@ console.log(isLoading); IO NAV - {IODetails?.currentValuation ? IODetails?.currentValuation : "00.00"} + {IODetails?.ioNAV ? IODetails?.ioNAV : "00.00"} @@ -308,7 +308,7 @@ console.log(isLoading); IO MV NAV - {IODetails?.marketValue ? IODetails?.marketValue : "00.00"} + {IODetails?.ioMVNAV ? IODetails?.ioMVNAV : "00.00"}