diff --git a/src/components/Acceptance/Acceptance.tsx b/src/components/Acceptance/Acceptance.tsx
index d159b75c92a28b274becb76f82bdd7191546ffbb..5ac18e299441125d976b7fe8a9d3fe303b122529 100644
--- a/src/components/Acceptance/Acceptance.tsx
+++ b/src/components/Acceptance/Acceptance.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/exhaustive-deps */
 import { useEffect, useState } from "react"
 import {
   Button,
@@ -24,37 +25,52 @@ import {
   ModalHeader,
   ModalCloseButton,
   ModalBody,
-  ModalFooter,
-} from "@chakra-ui/react";
-import { Search2Icon, CheckIcon, CloseIcon } from "@chakra-ui/icons";
-import { useParams } from "react-router-dom";
-import useAxiosPrivate from "../../hooks/axiosPrivate";
+  ModalFooter
+} from "@chakra-ui/react"
+import { Search2Icon, CheckIcon, CloseIcon } from "@chakra-ui/icons"
+import { useParams } from "react-router-dom"
+import useAxiosPrivate from "../../hooks/axiosPrivate"
 
 const Acceptance = () => {
-    const axiosInstance = useAxiosPrivate()
-    const { scholarshipid } = useParams()
-    const [sid, setSID] = useState(Number(scholarshipid))
-    const [students, setStudents] = useState<JSX.Element[]>([])
-    const [selectedID, setSelectedID] = useState(0)
-    const [search, setSearch] = useState("")
-
-    /* Get all applicant */
-    const fetchApplicant = async () => {
-        const urlApplicant = new URL(process.env.REACT_APP_API_URL + "/api/scholarship/user/" + sid)    
-        const applicantsResponse = await axiosInstance.get(urlApplicant.toString())
-        const applicants = await applicantsResponse.data.data.scholarships
-
-        /* Fetch the names of the students */
-        const studentPromises = applicants.map(async (applicant: any) => {
-            const studentURL = new URL(process.env.REACT_APP_API_URL + "/api/user/" + applicant.user_id_student)
-            const studentResponse = await axiosInstance.get(studentURL.toString())
-            return {
-                user_id: applicant.user_id_student,
-                name: studentResponse.data.data.user.name,
-                email: studentResponse.data.data.user.email,
-                status: applicant.status
-            }
-        })
+  const axiosInstance = useAxiosPrivate()
+  const { scholarshipid } = useParams()
+  const [sid] = useState(Number(scholarshipid))
+  const [students, setStudents] = useState<JSX.Element[]>([])
+  const [selectedID, setSelectedID] = useState(0)
+  const [search, setSearch] = useState("")
+
+  /* Get all applicant */
+  const fetchApplicant = async () => {
+    const urlApplicant = new URL(
+      process.env.REACT_APP_API_URL + "/api/scholarship/user/" + sid
+    )
+    const applicantsResponse = await axiosInstance.get(urlApplicant.toString())
+    const applicants = await applicantsResponse.data.data.scholarships
+
+    if (!applicants) {
+      setStudents([
+        <Tr key={0}>
+          <Td>No applicants yet</Td>
+          <Td></Td>
+          <Td></Td>
+        </Tr>
+      ])
+      return
+    }
+
+    /* Fetch the names of the students */
+    const studentPromises = applicants.map(async (applicant: any) => {
+      const studentURL = new URL(
+        process.env.REACT_APP_API_URL + "/api/user/" + applicant.user_id_student
+      )
+      const studentResponse = await axiosInstance.get(studentURL.toString())
+      return {
+        user_id: applicant.user_id_student,
+        name: studentResponse.data.data.user.name,
+        email: studentResponse.data.data.user.email,
+        status: applicant.status
+      }
+    })
 
     const studentNames = await Promise.all(studentPromises)
 
@@ -64,40 +80,40 @@ const Acceptance = () => {
         String(student.status).toLowerCase().includes(search.toLowerCase())
     )
 
-        const studentProp = filteredStudentNames.map((student) => (
-            <Tr key={student.user_id}>
-                <Td>{student.name}</Td>
-                <Td>{student.email}</Td>
-                <Td>
-                    {String(student.status) === "waiting" ? (
-                        <>
-                            <Button
-                                variant="ghost"
-                                colorScheme="green"
-                                leftIcon={<Icon as={CheckIcon} />}
-                                onClick={() => acceptAction(student.user_id)}
-                            >
-                                Accept
-                            </Button>
-                            <Button
-                                variant="ghost"
-                                colorScheme="red"
-                                leftIcon={<Icon as={CloseIcon} />}
-                                onClick={() => rejectAction(student.user_id)}
-                            >
-                                Reject
-                            </Button>
-                        </>
-                    ) : (
-                        <Text color = {String(student.status) === "accepted" ? "green": "red"}>
-                            {String(student.status) === "accepted" ? "Accepted" : "Rejected"}
-                        </Text>
-                        
-                    )}
-                </Td>
-            </Tr>
-        ));
-
+    const studentProp = filteredStudentNames.map((student) => (
+      <Tr key={student.user_id}>
+        <Td>{student.name}</Td>
+        <Td>{student.email}</Td>
+        <Td>
+          {String(student.status) === "waiting" ? (
+            <>
+              <Button
+                variant="ghost"
+                colorScheme="green"
+                leftIcon={<Icon as={CheckIcon} />}
+                onClick={() => acceptAction(student.user_id)}
+              >
+                Accept
+              </Button>
+              <Button
+                variant="ghost"
+                colorScheme="red"
+                leftIcon={<Icon as={CloseIcon} />}
+                onClick={() => rejectAction(student.user_id)}
+              >
+                Reject
+              </Button>
+            </>
+          ) : (
+            <Text
+              color={String(student.status) === "accepted" ? "green" : "red"}
+            >
+              {String(student.status) === "accepted" ? "Accepted" : "Rejected"}
+            </Text>
+          )}
+        </Td>
+      </Tr>
+    ))
     setStudents(studentProp)
   }
 
@@ -123,127 +139,138 @@ const Acceptance = () => {
     onRejectModalOpen()
   }
 
-    const handleAcceptConfirm = () => {
-        const url = new URL(process.env.REACT_APP_API_URL + `/api/scholarship/acceptance/${sid}`)
-        console.log(url.toString())
-        axiosInstance.post(url.toString(), {
-            "status": "accepted",
-            "user_id": Number(selectedID)
-        })
-        .then(function (response) {
-            console.log(response);
-        })
-        .catch(function (error) {
-            console.log(error);
-        });
-        
-        toast({
-            title: "Acceptance set",
-            description: "This applicant has been accepted",
-            status: "success",
-            duration: 9000,
-            isClosable: true,
-        });
-        onAcceptModalClose();
-    };
-    
-    const handleRejectConfirm = () => {
-        const url = new URL(process.env.REACT_APP_API_URL + `/api/scholarship/acceptance/${sid}`)
-        axiosInstance.post(url.toString(), {
-            "status": "rejected",
-            "user_id": Number(selectedID)
-        })
-        .then(function (response) {
-            console.log(response);
-        })
-        .catch(function (error) {
-            console.log(error);
-        });
-
-        toast({
-            title: "Rejection set",
-            description: "This applicant has been rejected",
-            status: "success",
-            duration: 9000,
-            isClosable: true,
-        });
-        onRejectModalClose();
-    };
-    
-    useEffect(() => {
-        fetchApplicant()
-    }, [sid, search]);
-
-    return (
-        <Box>
-        <Heading>Scholarship Acceptance</Heading>
-        <Stack>
-            {/* Search Bar */}
-            <InputGroup borderRadius={10} size="sm">
-            <InputLeftElement pointerEvents="none" children={<Search2Icon color="gray.600" />} />
-            <Input type="text" borderRadius={10} placeholder="Search Name or Status..." border="1px solid #949494" 
-                onChange={(e) => {setSearch(e.target.value)}}
-            />
-            </InputGroup>
-        </Stack>
-        <Box>
-            <TableContainer>
-                <Table variant="simple">
-                    <Thead>
-                    <Tr>
-                        <Th>Student Name</Th>
-                        <Th>Email</Th>
-                        <Th>Status</Th>
-                    </Tr>
-                    </Thead>
-                    <Tbody>
-                        {students}
-                    </Tbody>
-                </Table>
-            </TableContainer>
-        </Box>
-
-        {/* Accept Confirmation Modal */}
-        <Modal isOpen={acceptModalIsOpen} onClose={onAcceptModalClose}>
-            <ModalOverlay />
-            <ModalContent>
-            <ModalHeader>Confirm Acceptance</ModalHeader>
-            <ModalCloseButton />
-            <ModalBody>
-                Are you sure you want to accept this applicant?
-            </ModalBody>
-            <ModalFooter>
-                <Button colorScheme="green" mr={3} onClick={handleAcceptConfirm}>
-                Confirm
-                </Button>
-                <Button variant="ghost" onClick={onAcceptModalClose}>
-                Cancel
-                </Button>
-            </ModalFooter>
-            </ModalContent>
-        </Modal>
-
-        {/* Reject Confirmation Modal */}
-        <Modal isOpen={rejectModalIsOpen} onClose={onRejectModalClose}>
-            <ModalOverlay />
-            <ModalContent>
-            <ModalHeader>Confirm Rejection</ModalHeader>
-            <ModalCloseButton />
-            <ModalBody>
-                Are you sure you want to reject this applicant?
-            </ModalBody>
-            <ModalFooter>
-                <Button colorScheme="red" mr={3} onClick={handleRejectConfirm}>
-                Confirm
-                </Button>
-                <Button variant="ghost" onClick={onRejectModalClose}>
-                Cancel
-                </Button>
-            </ModalFooter>
-            </ModalContent>
-        </Modal>
-        </Box>
-    );
-    };
-
-    export default Acceptance;
+  const handleAcceptConfirm = () => {
+    const url = new URL(
+      process.env.REACT_APP_API_URL + `/api/scholarship/acceptance/${sid}`
+    )
+    console.log(url.toString())
+    axiosInstance
+      .post(url.toString(), {
+        status: "accepted",
+        user_id: Number(selectedID)
+      })
+      .then(function (response) {
+        console.log(response)
+      })
+      .catch(function (error) {
+        console.log(error)
+      })
+
+    toast({
+      title: "Acceptance set",
+      description: "This applicant has been accepted",
+      status: "success",
+      duration: 9000,
+      isClosable: true
+    })
+    fetchApplicant()
+    onAcceptModalClose()
+  }
+
+  const handleRejectConfirm = () => {
+    const url = new URL(
+      process.env.REACT_APP_API_URL + `/api/scholarship/acceptance/${sid}`
+    )
+    axiosInstance
+      .post(url.toString(), {
+        status: "rejected",
+        user_id: Number(selectedID)
+      })
+      .then(function (response) {
+        console.log(response)
+      })
+      .catch(function (error) {
+        console.log(error)
+      })
+
+    toast({
+      title: "Rejection set",
+      description: "This applicant has been rejected",
+      status: "success",
+      duration: 9000,
+      isClosable: true
+    })
+    fetchApplicant()
+    onRejectModalClose()
+  }
+
+  useEffect(() => {
+    fetchApplicant()
+  }, [sid, search])
+
+  return (
+    <Box>
+      <Heading>Scholarship Acceptance</Heading>
+      <Stack>
+        {/* Search Bar */}
+        <InputGroup borderRadius={10} size="sm">
+          <InputLeftElement
+            pointerEvents="none"
+            children={<Search2Icon color="gray.600" />}
+          />
+          <Input
+            type="text"
+            borderRadius={10}
+            placeholder="Search Name or Status..."
+            border="1px solid #949494"
+            onChange={(e) => {
+              setSearch(e.target.value)
+            }}
+          />
+        </InputGroup>
+      </Stack>
+      <Box>
+        <TableContainer>
+          <Table variant="simple">
+            <Thead>
+              <Tr>
+                <Th>Student Name</Th>
+                <Th>Email</Th>
+                <Th>Status</Th>
+              </Tr>
+            </Thead>
+            <Tbody>{students}</Tbody>
+          </Table>
+        </TableContainer>
+      </Box>
+
+      {/* Accept Confirmation Modal */}
+      <Modal isOpen={acceptModalIsOpen} onClose={onAcceptModalClose} isCentered>
+        <ModalOverlay backdropFilter="blur(10px)" />
+        <ModalContent>
+          <ModalHeader>Confirm Acceptance</ModalHeader>
+          <ModalCloseButton />
+          <ModalBody>Are you sure you want to accept this applicant?</ModalBody>
+          <ModalFooter>
+            <Button colorScheme="green" mr={3} onClick={handleAcceptConfirm}>
+              Confirm
+            </Button>
+            <Button variant="ghost" onClick={onAcceptModalClose}>
+              Cancel
+            </Button>
+          </ModalFooter>
+        </ModalContent>
+      </Modal>
+
+      {/* Reject Confirmation Modal */}
+      <Modal isOpen={rejectModalIsOpen} onClose={onRejectModalClose} isCentered>
+        <ModalOverlay backdropFilter="blur(10px)" />
+        <ModalContent>
+          <ModalHeader>Confirm Rejection</ModalHeader>
+          <ModalCloseButton />
+          <ModalBody>Are you sure you want to reject this applicant?</ModalBody>
+          <ModalFooter>
+            <Button colorScheme="red" mr={3} onClick={handleRejectConfirm}>
+              Confirm
+            </Button>
+            <Button variant="ghost" onClick={onRejectModalClose}>
+              Cancel
+            </Button>
+          </ModalFooter>
+        </ModalContent>
+      </Modal>
+    </Box>
+  )
+}
+
+export default Acceptance