Merge pull request #761 from Real-Dev-Squad/develop

Dev to Main Sync

Author: iamitprakash

__tests__/extension-requests/extension-requests.test.js

@@ -663,18 +663,21 @@ describe('Tests the Extension Requests Screen', () => {
     expect(extensionCardsAfter.length).toBe(4);
   });
 
-  it('Checks whether the timestamp are sorted', async () => {
+  it('Checks whether the timestamps are sorted', async () => {
     const extensionCards = await page.$$('.extension-card');
 
     const requestDaysArray = [];
     for (const card of extensionCards) {
       const requestedDays = await card.$eval(
         '.requested-day > .tooltip',
-        (requestDays) => requestDays.textContent,
+        (requestDays) => new Date(requestDays.textContent.slice(5)),
       );
-      requestDaysArray.push(requestedDays.slice(5));
+      requestDaysArray.push(requestedDays);
     }
-    const sortedRequestDaysArray = [...requestDaysArray].sort();
+
+    const sortedRequestDaysArray = requestDaysArray
+      .slice()
+      .sort((a, b) => a - b);
     expect(requestDaysArray).toEqual(sortedRequestDaysArray);
   });
 

__tests__/task-requests/task-requestDetails.test.js

@@ -60,7 +60,7 @@ describe('Task request details page', () => {
       '[data-modal-start-date-value="proposed-start-date-value"]',
       (element) => element.textContent,
     );
-    expect(proposedStartDateValue).toBe('30-10-2023');
+    expect(proposedStartDateValue).toBe('Monday, 30 Oct 2023');
 
     const proposedEndDateHeading = await page.$eval(
       '[data-modal-end-date-text="proposed-end-date-text"]',
@@ -72,7 +72,7 @@ describe('Task request details page', () => {
       '[data-modal-end-date-value="proposed-end-date-value"]',
       (element) => element.textContent,
     );
-    expect(proposedEndDateValue).toBe('5-11-2023');
+    expect(proposedEndDateValue).toBe('Sunday, 5 Nov 2023');
 
     const descriptionTextHeading = await page.$eval(
       '[data-modal-description-text="proposed-description-text"]',
@@ -153,7 +153,7 @@ describe('Task request details page with markdown support in description', () =>
       '[data-modal-start-date-value="proposed-start-date-value"]',
       (element) => element.textContent,
     );
-    expect(proposedStartDateValue).toBe('30-10-2023');
+    expect(proposedStartDateValue).toBe('Monday, 30 Oct 2023');
 
     const proposedEndDateHeading = await page.$eval(
       '[data-modal-end-date-text="proposed-end-date-text"]',
@@ -165,7 +165,7 @@ describe('Task request details page with markdown support in description', () =>
       '[data-modal-end-date-value="proposed-end-date-value"]',
       (element) => element.textContent,
     );
-    expect(proposedEndDateValue).toBe('5-11-2023');
+    expect(proposedEndDateValue).toBe('Sunday, 5 Nov 2023');
 
     const descriptionTextHeading = await page.$eval(
       '[data-modal-description-text="proposed-description-text"]',

extension-requests/local-utils.js

@@ -289,12 +289,13 @@ function dateString(milliseconds) {
 
 const fullDateString = (timestamp) => {
   const options = {
-    weekday: 'short',
+    weekday: 'long',
     year: 'numeric',
-    month: 'long',
+    month: 'short',
     day: 'numeric',
     hour: 'numeric',
     minute: 'numeric',
+    timeZoneName: 'short',
     hour12: true,
   };
   return new Intl.DateTimeFormat('en-US', options).format(new Date(timestamp));

utils/time/index.js

@@ -4,10 +4,18 @@ function getHumanReadableDate(timeStamp) {
   }
   const date = new Date(timeStamp);
 
-  const year = date.getFullYear();
-  const month = date.getMonth() + 1;
-  const day = date.getDate();
+  const options = {
+    weekday: 'long',
+    month: 'short',
+    day: 'numeric',
+    year: 'numeric',
+  };
+  const parts = date.toLocaleDateString('en-US', options).split(', ');
+
+  const [weekday, monthDay, year] = parts;
+  const [month, day] = monthDay.split(' ');
+
+  const formattedDate = `${weekday}, ${day} ${month} ${year}`;
 
-  const formattedDate = `${day}-${month}-${year}`;
   return formattedDate;
 }