From 149f4e17eb559db2a9a839c6bcd33a19194a1415 Mon Sep 17 00:00:00 2001
From: jajjibhai008 <ejazofficial122@gmail.com>
Date: Tue, 12 Nov 2024 19:04:53 +0500
Subject: [PATCH] fix: resolve some issue on analytics v2

---
 src/components/AdvanceAnalyticsV2/AnalyticsV2Page.jsx     | 7 ++++++-
 src/components/AdvanceAnalyticsV2/tabs/AnalyticsTable.jsx | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/AdvanceAnalyticsV2/AnalyticsV2Page.jsx b/src/components/AdvanceAnalyticsV2/AnalyticsV2Page.jsx
index a4d6af084e..9f6c649c30 100644
--- a/src/components/AdvanceAnalyticsV2/AnalyticsV2Page.jsx
+++ b/src/components/AdvanceAnalyticsV2/AnalyticsV2Page.jsx
@@ -31,6 +31,10 @@ const AnalyticsV2Page = ({ enterpriseId }) => {
     endDate,
   });
   const currentDate = new Date().toISOString().split('T')[0];
+  const formatDate = (dateString) => {
+    const options = { year: 'numeric', month: 'long', day: 'numeric' };
+    return new Date(dateString).toLocaleDateString(undefined, options);
+  };
   return (
     <>
       <Helmet title={PAGE_TITLE} />
@@ -43,7 +47,7 @@ const AnalyticsV2Page = ({ enterpriseId }) => {
                 id="advance.analytics.data.refresh.msg"
                 defaultMessage="Data updated on {date}"
                 description="Data refresh message"
-                values={{ date: data?.lastUpdatedAt || currentDate }}
+                values={{ date: formatDate(data?.lastUpdatedAt || currentDate) }}
               />
             </span>
           </div>
@@ -191,6 +195,7 @@ const AnalyticsV2Page = ({ enterpriseId }) => {
         <div className="tabs-container">
           <Tabs
             variant="tabs"
+            className="d-flex justify-content-between px-2"
             activeKey={activeTab}
             onSelect={(tab) => {
               setActiveTab(tab);
diff --git a/src/components/AdvanceAnalyticsV2/tabs/AnalyticsTable.jsx b/src/components/AdvanceAnalyticsV2/tabs/AnalyticsTable.jsx
index e91088060d..68adf1b46d 100644
--- a/src/components/AdvanceAnalyticsV2/tabs/AnalyticsTable.jsx
+++ b/src/components/AdvanceAnalyticsV2/tabs/AnalyticsTable.jsx
@@ -62,7 +62,7 @@ const AnalyticsTable = ({
           title={tableTitle}
           subtitle={tableSubtitle}
           DownloadCSVComponent={(
-            <Link to={CSVDownloadURL} target="_blank" className="btn btn-sm btn-outline-primary ml-0 ml-md-3 mr-3">
+            <Link to={CSVDownloadURL} target="_blank" className="btn btn-sm btn-primary float-right">
               <Icon src={Download} className="mr-2" />
               <FormattedMessage
                 id="adminPortal.AnalyticsV2.downloadCSV.button"