From bdda6b69723ba66a7109927d4bc3ab4309c66d1a Mon Sep 17 00:00:00 2001
From: Belinda Marion Kobusingye <46527380+Codebmk@users.noreply.github.com>
Date: Wed, 4 Dec 2024 16:36:01 +0300
Subject: [PATCH 4/7] format time
---
platform/src/common/components/MaintenanceBanner/index.jsx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/platform/src/common/components/MaintenanceBanner/index.jsx b/platform/src/common/components/MaintenanceBanner/index.jsx
index 923a124c46..484ed12571 100644
--- a/platform/src/common/components/MaintenanceBanner/index.jsx
+++ b/platform/src/common/components/MaintenanceBanner/index.jsx
@@ -1,6 +1,7 @@
import React from 'react';
import { IoWarningOutline } from 'react-icons/io5';
import { format } from 'date-fns';
+import dayjs from 'dayjs';
const MaintenanceBanner = ({ maintenance }) => {
if (!maintenance?.isActive) return null;
@@ -22,7 +23,9 @@ const MaintenanceBanner = ({ maintenance }) => {
{maintenance.message}
- ({startTime} - {endTime})
+ (Estimated downtime:{' '}
+ {dayjs(startTime).format('DDD MM, YYYY HH:mm')} -{' '}
+ {dayjs(endTime).format('DDD MM, YYYY HH:mm')})
From 5202804abbf4a6c5cd9e18928093f9099af70273 Mon Sep 17 00:00:00 2001
From: Belinda Marion Kobusingye <46527380+Codebmk@users.noreply.github.com>
Date: Wed, 4 Dec 2024 16:47:09 +0300
Subject: [PATCH 5/7] fix date time
---
.../src/common/components/MaintenanceBanner/index.jsx | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/platform/src/common/components/MaintenanceBanner/index.jsx b/platform/src/common/components/MaintenanceBanner/index.jsx
index 484ed12571..5e5f97634b 100644
--- a/platform/src/common/components/MaintenanceBanner/index.jsx
+++ b/platform/src/common/components/MaintenanceBanner/index.jsx
@@ -1,14 +1,10 @@
import React from 'react';
import { IoWarningOutline } from 'react-icons/io5';
-import { format } from 'date-fns';
import dayjs from 'dayjs';
const MaintenanceBanner = ({ maintenance }) => {
if (!maintenance?.isActive) return null;
- const startTime = format(new Date(maintenance.startDate), 'HH:mm');
- const endTime = format(new Date(maintenance.endDate), 'HH:mm');
-
return (
@@ -24,8 +20,8 @@ const MaintenanceBanner = ({ maintenance }) => {
{maintenance.message}
(Estimated downtime:{' '}
- {dayjs(startTime).format('DDD MM, YYYY HH:mm')} -{' '}
- {dayjs(endTime).format('DDD MM, YYYY HH:mm')})
+ {dayjs(maintenance.startDate).format('DDD MM, YYYY HH:mm')} -{' '}
+ {dayjs(maintenance.endDate).format('DDD MM, YYYY HH:mm')})
From d27cd8e65275d89914011b406c04e61cde4b338d Mon Sep 17 00:00:00 2001
From: Belinda Marion Kobusingye <46527380+Codebmk@users.noreply.github.com>
Date: Wed, 4 Dec 2024 16:58:51 +0300
Subject: [PATCH 6/7] Update index.jsx
---
platform/src/common/components/MaintenanceBanner/index.jsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/platform/src/common/components/MaintenanceBanner/index.jsx b/platform/src/common/components/MaintenanceBanner/index.jsx
index 5e5f97634b..8caa5686dc 100644
--- a/platform/src/common/components/MaintenanceBanner/index.jsx
+++ b/platform/src/common/components/MaintenanceBanner/index.jsx
@@ -20,8 +20,8 @@ const MaintenanceBanner = ({ maintenance }) => {
{maintenance.message}
(Estimated downtime:{' '}
- {dayjs(maintenance.startDate).format('DDD MM, YYYY HH:mm')} -{' '}
- {dayjs(maintenance.endDate).format('DDD MM, YYYY HH:mm')})
+ {dayjs(maintenance.startDate).format('D MMM, YYYY HH:mm A')} -{' '}
+ {dayjs(maintenance.endDate).format('D MMM, YYYY HH:mm A')})
From 5b332d066a2673ebd09d1cf2055bd3e9bdb9611c Mon Sep 17 00:00:00 2001
From: Belinda Marion Kobusingye <46527380+Codebmk@users.noreply.github.com>
Date: Wed, 4 Dec 2024 17:07:55 +0300
Subject: [PATCH 7/7] Update index.jsx
---
platform/src/common/components/MaintenanceBanner/index.jsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/platform/src/common/components/MaintenanceBanner/index.jsx b/platform/src/common/components/MaintenanceBanner/index.jsx
index 8caa5686dc..82d0ebb84d 100644
--- a/platform/src/common/components/MaintenanceBanner/index.jsx
+++ b/platform/src/common/components/MaintenanceBanner/index.jsx
@@ -20,8 +20,8 @@ const MaintenanceBanner = ({ maintenance }) => {
{maintenance.message}
(Estimated downtime:{' '}
- {dayjs(maintenance.startDate).format('D MMM, YYYY HH:mm A')} -{' '}
- {dayjs(maintenance.endDate).format('D MMM, YYYY HH:mm A')})
+ {dayjs(maintenance.startDate).format('D MMM, YYYY hh:mm A')} -{' '}
+ {dayjs(maintenance.endDate).format('D MMM, YYYY hh:mm A')})