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

src/Pages/AccountDeletion/DeletionRequest.jsx

@@ -33,6 +33,14 @@ const DeletionRequest = () => {
   const [mouseEntered, setMouseEntered] = useState(false);
   const [mouseEnteredId, setMouseEnteredId] = useState("");
 
+  const formatDate = (date) => {
+    return new Date(date).toLocaleDateString("en-GB", {
+      day: "2-digit",
+      month: "2-digit",
+      year: "numeric",
+    });
+  };
+
   const {
     data,
     isLoading: DeletionLoading
@@ -114,7 +122,7 @@ const DeletionRequest = () => {
         className="d-flex align-items-center web-text-small"
         fontWeight={'500'}
       >
-        {formatDate(item?.RequestOn)}
+        {formatDate(item?.Requested_on)}
       </Text>
     ),
     "Client ID": (

src/Pages/Admin/Notification.jsx

@@ -78,6 +78,13 @@ const Notification = () => {
   const [pageSize, setPageSize] = useState(TABLE_PAGINATION?.size);
   const [currentPage, setCurrentPage] = useState(TABLE_PAGINATION?.page);
 
+  const formatDate = (date) => {
+    return new Date(date).toLocaleDateString("en-GB", {
+      day: "2-digit",
+      month: "2-digit",
+      year: "numeric",
+    });
+  };
 
   // const {
   //   data: investorDetails,

src/Pages/Master/ExchangeRate/ExchangeRate.jsx

@@ -64,6 +64,13 @@ const ExchangeRate = () => {
 
   console.log(data?.data);
 
+  const formatDate = (date) => {
+    return new Date(date).toLocaleDateString("en-GB", {
+      day: "2-digit",
+      month: "2-digit",
+      year: "numeric",
+    });
+  };
 
   const filteredData = data?.data?.filter((item) => {
     const name = item?.fromCurrency?.currencyCode;