From 650452eff0446ca11f625e6f01795a3f6ca4bac3 Mon Sep 17 00:00:00 2001
From: Jestavo1 <gonjestavo1@gmail.com>
Date: Thu, 8 Oct 2026 15:17:19 +0100
Subject: [PATCH] Fix format clock edge cases

---
 format-clock-edge-cases/timeConverter.js      | 14 ++++++++++--
 format-clock-edge-cases/timeConverter.test.js | 22 +++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/format-clock-edge-cases/timeConverter.js b/format-clock-edge-cases/timeConverter.js
index 310c07bd9..052041357 100644
--- a/format-clock-edge-cases/timeConverter.js
+++ b/format-clock-edge-cases/timeConverter.js
@@ -1,11 +1,21 @@
 function formatAs12HourClock(time) {
 
   const hours = Number(time.slice(0, 2));
+  const minutes = time.slice(3);
+
+  if (hours === 0) {
+    return `12:${minutes} am`;
+  }
+
+  if (hours === 12) {
+    return `${time} pm`;
+  }
 
   if (hours > 12) {
-    return `${hours - 12}:00 pm`;
+    return `${hours - 12}:${minutes} pm`;
   }
+
   return `${time} am`;
 }
 
-export {formatAs12HourClock};
+export {formatAs12HourClock};
\ No newline at end of file
diff --git a/format-clock-edge-cases/timeConverter.test.js b/format-clock-edge-cases/timeConverter.test.js
index 88f2af094..8ef5cc3e3 100644
--- a/format-clock-edge-cases/timeConverter.test.js
+++ b/format-clock-edge-cases/timeConverter.test.js
@@ -9,3 +9,25 @@ test("correctly convert time after 12:00", function(){
 test("can correctly convert morning time", function() {
     assert.equal(formatAs12HourClock("08:00"), "08:00 am");
 });
+
+test("correctly convert midnight", function() {
+    assert.equal(formatAs12HourClock("00:00"), "12:00 am");
+});
+test("correctly convert noon", function() {
+    assert.equal(formatAs12HourClock("12:00"), "12:00 pm");
+});
+test("correctly convert 13:00", function() {
+    assert.equal(formatAs12HourClock("13:00"), "1:00 pm");
+});
+test("correctly keep the minutes", function() {
+    assert.equal(formatAs12HourClock("13:45"), "1:45 pm");
+});
+test("correctly convert 12:30", function() {
+    assert.equal(formatAs12HourClock("12:30"), "12:30 pm");
+});
+test("correctly convert the last minute of the day", function() {
+    assert.equal(formatAs12HourClock("23:59"), "11:59 pm");
+});
+test("correctly convert 00:30", function() {
+    assert.equal(formatAs12HourClock("00:30"), "12:30 am");
+});
\ No newline at end of file