Merge remote-tracking branch 'origin/main' into Sprint-10

Reviewed-on: #31

src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryChecker.jsx

@@ -61,6 +61,16 @@ const ApproveHistory = () => {
     onClose: onRejectClose,
   } = useDisclosure();
 
+  // Debounce the search term to avoid making a request on every keystroke
+  useEffect(() => {
+    const handler = setTimeout(() => {
+      setDebouncedSearchTerm(searchTerm);
+    }, 500); // Adjust delay as needed
+    return () => {
+      clearTimeout(handler);
+    };
+  }, [searchTerm]);
+
   const {
     data,
     isLoading: drawalRequestLoading,
@@ -191,11 +201,7 @@ const ApproveHistory = () => {
       </Box>
     ),
     "Deposit Date": (
-      <Box
+      <Box w={"100px"} isTruncated={true} display={"flex"}>
-        w={"100px"}
-        isTruncated={true}
-        display={"flex"}
-      >
         <Text as={"span"} color={"teal.900"}>
           {formatDate(item?.transaction_date)}
         </Text>
@@ -221,28 +227,27 @@ const ApproveHistory = () => {
         fontWeight={"500"}
         className="d-flex align-items-center web-text-small"
       >
-        {item?.spportFile_path&&<Badge
+        {item?.spportFile_path && (
-          px={2}
+          <Badge
-          py={0.5}
+            px={2}
-          textTransform={"inherit"}
+            py={0.5}
-          fontWeight={500}
+            textTransform={"inherit"}
-          colorScheme={"forestGreen"}
+            fontWeight={500}
-        >
+            colorScheme={"forestGreen"}
-          <Link
-            href={import.meta.env.VITE_IMAGE_URL + item?.spportFile_path}
-            isExternal
-            display={"flex"}
-            alignItems={"center"}
           >
-            <Box me={"1px"}
+            <Link
-              as="span"
+              href={import.meta.env.VITE_IMAGE_URL + item?.spportFile_path}
-              cursor={"pointer"}
+              isExternal
+              display={"flex"}
+              alignItems={"center"}
             >
-              View
+              <Box me={"1px"} as="span" cursor={"pointer"}>
-            </Box>
+                View
-            <ExternalLinkIcon />
+              </Box>
-          </Link>
+              <ExternalLinkIcon />
-        </Badge>}
+            </Link>
+          </Badge>
+        )}
       </Text>
     ),
     Status: (
@@ -255,12 +260,12 @@ const ApproveHistory = () => {
           rounded={4}
           colorScheme={
             item?.transactionStatus === "Approved"
-            ? "green"
+              ? "green"
-            : item?.transactionStatus === "Pending"
+              : item?.transactionStatus === "Pending"
-            ? "yellow"
+              ? "yellow"
-            : item?.transactionStatus === "Reject"
+              : item?.transactionStatus === "Reject"
-            ? "red"
+              ? "red"
-            : "gray" // default border color if status doesn't match any condition
+              : "gray" // default border color if status doesn't match any condition
           }
         >
           {item.transactionStatus}

src/Services/fawateer.request.service.js

@@ -9,7 +9,7 @@ import { baseQuery } from "./token.serivce";
 export const fawateerRequest = createApi({
   reducerPath: "fawateerRequest",
   baseQuery: baseQuery,
-  tagTypes: ["getFawateerRequest" ,"getApproveHistory","getApproveComment","getRejectComment","getFawateerMakerRequest"],
+  tagTypes: ["getFawateerRequest", "getApproveHistory", "getApproveComment", "getRejectComment", "getFawateerMakerRequest"],
   endpoints: (builder) => ({
 
 
@@ -89,10 +89,10 @@ export const fawateerRequest = createApi({
 
 // Export hooks for usage in functional components
 export const {
-    useGetFawateerRequestQuery,
+  useGetFawateerRequestQuery,
-    useGetApproveHistoryQuery,
+  useGetApproveHistoryQuery,
-    useApproveCommentMutation,
+  useApproveCommentMutation,
-    useRejectCommentMutation,
+  useRejectCommentMutation,
-    useGetFawateerForMakerRequestQuery,
+  useGetFawateerForMakerRequestQuery,
-    useGetFawateerInvestorsQuery
+  useGetFawateerInvestorsQuery
 } = fawateerRequest;