From 47d75371bc7cc89a79c515bb58d1795ea08dd368 Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Fri, 11 Oct 2024 16:03:26 +0530
Subject: [PATCH] create update date

---
 src/Pages/Fawateer/CreateRequest.jsx          |  2 +-
 .../ApproveHistory/ApproveHistoryChecker.jsx  | 13 +++++++----
 .../ApproveHistory/ApproveHistoryMaker.jsx    | 13 +++++++----
 .../ApproveRequest/ApproveRequest.jsx         | 23 +++++++++++++++----
 4 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/src/Pages/Fawateer/CreateRequest.jsx b/src/Pages/Fawateer/CreateRequest.jsx
index 43a4c29..bc3f811 100644
--- a/src/Pages/Fawateer/CreateRequest.jsx
+++ b/src/Pages/Fawateer/CreateRequest.jsx
@@ -205,7 +205,7 @@ const CreateRequest = () => {
             size={"sm"}
             fontSize={"sm"}
             rounded={"sm"}
-            type={"transaction_date"}
+            type={"date"}
             max={new Date().toISOString().split("T")[0]} // Disable future dates
             {...register("transaction_date")}
           />
diff --git a/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryChecker.jsx b/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryChecker.jsx
index 8aa4fb5..4046f42 100644
--- a/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryChecker.jsx
+++ b/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryChecker.jsx
@@ -174,10 +174,9 @@ const ApproveHistory = () => {
         w={"100px"}
         isTruncated={true}
         display={"flex"}
-        justifyContent={"end"}
       >
         <Text as={"span"} color={"teal.900"}>
-          {item.transaction_date}
+          {formatDate(item?.transaction_date)}
         </Text>
       </Box>
     ),
@@ -202,9 +201,13 @@ const ApproveHistory = () => {
           py={"2px"}
           rounded={4}
           colorScheme={
-            item?.transactionStatus === "APPROVED"
-              ? "green"
-              : "red" // default color scheme if status doesn't match any condition
+            item?.transactionStatus === "Approved"
+            ? "green"
+            : item?.transactionStatus === "Pending"
+            ? "yellow"
+            : item?.transactionStatus === "Reject"
+            ? "red"
+            : "gray" // default border color if status doesn't match any condition
           }
         >
           {item.transactionStatus}
diff --git a/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryMaker.jsx b/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryMaker.jsx
index 07a25f7..783422b 100644
--- a/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryMaker.jsx
+++ b/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryMaker.jsx
@@ -194,10 +194,9 @@ import {
           w={"100px"}
           isTruncated={true}
           display={"flex"}
-          justifyContent={"end"}
         >
           <Text as={"span"} color={"teal.900"}>
-            {item.transaction_date}
+            {formatDate(item?.transaction_date)}
           </Text>
         </Box>
       ),
@@ -222,9 +221,13 @@ import {
             py={"2px"}
             rounded={4}
             colorScheme={
-              item?.transactionStatus === "APPROVED"
-                ? "green"
-                : "red" // default color scheme if status doesn't match any condition
+              item?.transactionStatus === "Approved"
+              ? "green"
+              : item?.transactionStatus === "Pending"
+              ? "yellow"
+              : item?.transactionStatus === "Reject"
+              ? "red"
+              : "gray" // default border color if status doesn't match any condition
             }
           >
             {item.transactionStatus}
diff --git a/src/Pages/FawateerChecker/ApproveRequest/ApproveRequest.jsx b/src/Pages/FawateerChecker/ApproveRequest/ApproveRequest.jsx
index 5f3e37a..8c6caa9 100644
--- a/src/Pages/FawateerChecker/ApproveRequest/ApproveRequest.jsx
+++ b/src/Pages/FawateerChecker/ApproveRequest/ApproveRequest.jsx
@@ -198,7 +198,7 @@ import RequestRejectModal from "./RequestRejectModal";
         "Transaction Date": (
           <Box isTruncated={true}  display={'flex'} >
             <Text as={"span"} color={"teal.900"}>
-              {item.transaction_date} 
+              {formatDate(item?.transaction_date)}
             </Text>
           </Box>
         ),
@@ -216,9 +216,24 @@ import RequestRejectModal from "./RequestRejectModal";
         ),
         "Status": (
           <Box isTruncated={true}  display={'flex'} >
-            <Badge colorScheme='green' fontWeight={500} px={2} py={"2px"} rounded={4}>
-              {item.transactionStatus} 
-            </Badge>
+            <Badge
+            my={1}
+            fontWeight={500}
+            px={2}
+            py={"2px"}
+            rounded={4}
+            colorScheme={
+              item?.transactionStatus === "Approved"
+              ? "green"
+              : item?.transactionStatus === "Pending"
+              ? "yellow"
+              : item?.transactionStatus === "Reject"
+              ? "red"
+              : "gray" // default border color if status doesn't match any condition
+            }
+          >
+            {item.transactionStatus}
+          </Badge>
           </Box>
         ),
         Action: (