Merge remote-tracking branch 'origin/develop' into feature/training-content

2024-08-30 09:25:38 +01:00
parent 4ea3a844ed 39710aaea1
commit 3892fe1a67
34 changed files with 2667 additions and 3306 deletions
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
    "react-diff-viewer": "^3.1.1",
    "react-dom": "18.2.0",
    "react-firebase-hooks": "^5.1.1",
-    "react-icons": "^4.8.0",
+    "react-icons": "^5.3.0",
    "react-lineto": "^3.3.0",
    "react-media-recorder": "1.6.5",
    "react-phone-number-input": "^3.3.6",
--- a/src/components/DemographicInformationInput.tsx
+++ b/src/components/DemographicInformationInput.tsx
@@ -106,7 +106,7 @@ export default function DemographicInformationInput({user, mutateUser}: Props) {

 				<GenderInput value={gender} onChange={setGender} />
 				{user.type === "corporate" && (
-					<Input name="position" onChange={setPosition} type="text" label="Position" placeholder="CEO, Head of Marketing..." required />
+					<Input name="position" onChange={setPosition} type="text" label="Department" placeholder="CEO, Head of Marketing..." required />
 				)}
 				{user.type !== "corporate" && <EmploymentStatusInput value={employment} onChange={setEmployment} />}
 			</form>
--- a/src/components/Medium/Timer.tsx
+++ b/src/components/Medium/Timer.tsx
@@ -58,7 +58,7 @@ const Timer: React.FC<Props> = ({minTimer, disableTimer, standalone = false}) =>
 				animate={{scale: warningMode && !disableTimer ? 1.1 : 1}}
 				transition={{repeat: Infinity, repeatType: "reverse", duration: 0.5, ease: "easeInOut"}}>
 				<BsStopwatch className="w-6 h-6" />
-                <span className="text-base font-semibold w-12">
+				<span className="text-lg font-bold w-12">
 					{timer > 0 && (
 						<>
 							{Math.floor(timer / 60)
@@ -75,6 +75,6 @@ const Timer: React.FC<Props> = ({minTimer, disableTimer, standalone = false}) =>
 			</motion.div>
 		</>
 	);
-}
+};

 export default Timer;
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -19,17 +19,7 @@ import TicketSubmission from "./High/TicketSubmission";
 import {Module} from "@/interfaces";
 import Badge from "./Low/Badge";

-import {
-  BsArrowRepeat,
-  BsBook,
-  BsCheck,
-  BsCheckCircle,
-  BsClipboard,
-  BsHeadphones,
-  BsMegaphone,
-  BsPen,
-  BsXCircle,
-} from "react-icons/bs";
+import {BsArrowRepeat, BsBook, BsCheck, BsCheckCircle, BsClipboard, BsHeadphones, BsMegaphone, BsPen, BsXCircle} from "react-icons/bs";
 interface Props {
 	user: User;
 	navDisabled?: boolean;
@@ -39,13 +29,7 @@ interface Props {
 }

 /* eslint-disable @next/next/no-img-element */
-export default function Navbar({
-  user,
-  path,
-  navDisabled = false,
-  focusMode = false,
-  onFocusLayerMouseEnter,
-}: Props) {
+export default function Navbar({user, path, navDisabled = false, focusMode = false, onFocusLayerMouseEnter}: Props) {
 	const [isMenuOpen, setIsMenuOpen] = useState(false);
 	const [disablePaymentPage, setDisablePaymentPage] = useState(true);
 	const [isTicketOpen, setIsTicketOpen] = useState(false);
@@ -58,12 +42,9 @@ export default function Navbar({
 		const momentDate = moment(date);
 		const today = moment(new Date());

-    if (today.add(1, "days").isAfter(momentDate))
-      return "!bg-mti-red-ultralight border-mti-red-light";
-    if (today.add(3, "days").isAfter(momentDate))
-      return "!bg-mti-rose-ultralight border-mti-rose-light";
-    if (today.add(7, "days").isAfter(momentDate))
-      return "!bg-mti-orange-ultralight border-mti-orange-light";
+		if (today.add(1, "days").isAfter(momentDate)) return "!bg-mti-red-ultralight border-mti-red-light";
+		if (today.add(3, "days").isAfter(momentDate)) return "!bg-mti-rose-ultralight border-mti-rose-light";
+		if (today.add(7, "days").isAfter(momentDate)) return "!bg-mti-orange-ultralight border-mti-orange-light";
 	};

 	const showExpirationDate = () => {
@@ -76,11 +57,8 @@ export default function Navbar({
 	};

 	useEffect(() => {
-    if (user.type !== "student" && user.type !== "teacher")
-      return setDisablePaymentPage(false);
-    isUserFromCorporate(user.id).then((result) =>
-      setDisablePaymentPage(result)
-    );
+		if (user.type !== "student" && user.type !== "teacher") return setDisablePaymentPage(false);
+		isUserFromCorporate(user.id).then((result) => setDisablePaymentPage(result));
 	}, [user]);

 	const badges = [
@@ -114,32 +92,15 @@ export default function Navbar({

 	return (
 		<>
-      <Modal
-        isOpen={isTicketOpen}
-        onClose={() => setIsTicketOpen(false)}
-        title="Submit a ticket"
-      >
-        <TicketSubmission
-          user={user}
-          page={router.asPath}
-          onClose={() => setIsTicketOpen(false)}
-        />
+			<Modal isOpen={isTicketOpen} onClose={() => setIsTicketOpen(false)} title="Submit a ticket">
+				<TicketSubmission user={user} page={router.asPath} onClose={() => setIsTicketOpen(false)} />
 			</Modal>

 			{user && (
-        <MobileMenu
-          disableNavigation={disableNavigation}
-          path={path}
-          isOpen={isMenuOpen}
-          onClose={() => setIsMenuOpen(false)}
-          user={user}
-        />
+				<MobileMenu disableNavigation={disableNavigation} path={path} isOpen={isMenuOpen} onClose={() => setIsMenuOpen(false)} user={user} />
 			)}
 			<header className="-md:justify-between -md:px-4 relative flex w-full items-center bg-transparent py-2 md:gap-12 md:py-4">
-        <Link
-          href={disableNavigation ? "" : "/"}
-          className=" flex items-center gap-8 md:px-8"
-        >
+				<Link href={disableNavigation ? "" : "/"} className=" flex items-center gap-8 md:px-8">
 					<img src="/logo.png" alt="EnCoach's Logo" className="w-8 md:w-12" />
 					<h1 className="-md:hidden w-1/6 text-2xl font-bold">EnCoach</h1>
 				</Link>
@@ -148,8 +109,9 @@ export default function Navbar({
 						badges.map((badge) => (
 							<div
 								key={badge.module}
-                className={`${badge.achieved ? `bg-ielts-${badge.module}`: 'bg-mti-gray-anti-flash'} flex h-8 w-8 items-center justify-center rounded-full`}
-              >
+								className={`${
+									badge.achieved ? `bg-ielts-${badge.module}` : "bg-mti-gray-anti-flash"
+								} flex h-8 w-8 items-center justify-center rounded-full`}>
 								{badge.icon()}
 							</div>
 						))}
@@ -157,21 +119,16 @@ export default function Navbar({
 					<button
 						className={clsx(
 							"border-mti-purple-light tooltip tooltip-bottom flex h-8 w-8 flex-col items-center justify-center rounded-full border p-1",
-              "hover:bg-mti-purple-light transition duration-300 ease-in-out hover:text-white z-20"
+							"hover:bg-mti-purple-light transition duration-300 ease-in-out hover:text-white z-20",
 						)}
 						data-tip="Submit a help/feedback ticket"
-            onClick={() => setIsTicketOpen(true)}
-          >
+						onClick={() => setIsTicketOpen(true)}>
 						<BsQuestionCircleFill />
 					</button>

 					{showExpirationDate() && (
 						<Link
-              href={
-                !!user.subscriptionExpirationDate && !disablePaymentPage
-                  ? "/payment"
-                  : ""
-              }
+							href={!!user.subscriptionExpirationDate && !disablePaymentPage ? "/payment" : ""}
 							data-tip="Expiry date"
 							className={clsx(
 								"flex w-fit cursor-pointer justify-center rounded-full border px-6 py-2 text-sm font-normal focus:outline-none",
@@ -179,40 +136,27 @@ export default function Navbar({
 								!user.subscriptionExpirationDate
 									? "bg-mti-green-ultralight border-mti-green-light"
 									: expirationDateColor(user.subscriptionExpirationDate),
-                "border-mti-gray-platinum bg-white"
-              )}
-            >
+								"border-mti-gray-platinum bg-white",
+							)}>
 							{!user.subscriptionExpirationDate && "Unlimited"}
-              {user.subscriptionExpirationDate &&
-                moment(user.subscriptionExpirationDate).format("DD/MM/YYYY")}
+							{user.subscriptionExpirationDate && moment(user.subscriptionExpirationDate).format("DD/MM/YYYY")}
 						</Link>
 					)}
-          <Link
-            href={disableNavigation ? "" : "/profile"}
-            className="-md:hidden flex items-center justify-end gap-6"
-          >
-            <img
-              src={user.profilePicture}
-              alt={user.name}
-              className="h-10 w-10 rounded-full object-cover"
-            />
+					<Link href={disableNavigation ? "" : "/profile"} className="-md:hidden flex items-center justify-end gap-6">
+						<img src={user.profilePicture} alt={user.name} className="h-10 w-10 rounded-full object-cover" />
 						<span className="-md:hidden text-right">
-              {user.type === "corporate"
-                ? `${user.corporateInformation?.companyInformation.name} |`
-                : ""}{" "}
-              {user.name} | {USER_TYPE_LABELS[user.type]}
+							{user.type === "corporate" ? `${user.corporateInformation?.companyInformation.name} |` : ""} {user.name} |{" "}
+							{USER_TYPE_LABELS[user.type]}
+							{user.type === "corporate" &&
+								!!user.demographicInformation?.position &&
+								` | ${user.demographicInformation?.position || "N/A"}`}
 						</span>
 					</Link>
-          <div
-            className="cursor-pointer md:hidden"
-            onClick={() => setIsMenuOpen(true)}
-          >
+					<div className="cursor-pointer md:hidden" onClick={() => setIsMenuOpen(true)}>
 						<BsList className="text-mti-purple-light h-8 w-8" />
 					</div>
 				</div>
-        {focusMode && (
-          <FocusLayer onFocusLayerMouseEnter={onFocusLayerMouseEnter} />
-        )}
+				{focusMode && <FocusLayer onFocusLayerMouseEnter={onFocusLayerMouseEnter} />}
 			</header>
 		</>
 	);
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -212,7 +212,7 @@ export default function Sidebar({path, navDisabled = false, focusMode = false, u
 				)}
 			</div>

-			<div className="fixed bottom-12 flex flex-col gap-0">
+			<div className="2xl:fixed bottom-12 flex flex-col gap-0 -2xl:mt-8">
 				<div
 					role="button"
 					tabIndex={1}
--- a/src/components/UserCard.tsx
+++ b/src/components/UserCard.tsx
@@ -140,8 +140,9 @@ const UserCard = ({
 	}, [users, referralAgent]);

 	const updateUser = () => {
-		if (user.type === "corporate" || (user.type === "mastercorporate" && (!paymentValue || paymentValue < 0)))
+		if ((user.type === "corporate" || user.type === "mastercorporate") && (!paymentValue || paymentValue < 0))
 			return toast.error("Please set a price for the user's package before updating!");
+
 		if (!confirm(`Are you sure you want to update ${user.name}'s account?`)) return;

 		axios
@@ -213,7 +214,7 @@ const UserCard = ({
 					},
 					{
 						icon: <BsPersonAdd className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />,
-						value: user.corporateInformation.companyInformation.userAmount,
+						value: user.corporateInformation?.companyInformation?.userAmount,
 						label: "Number of Users",
 					},
 			  ]
@@ -277,7 +278,15 @@ const UserCard = ({
 							onChange={setCompanyName}
 							placeholder="Enter corporate name"
 							defaultValue={companyName}
-							disabled={disabled || checkAccess(loggedInUser, getTypesOfUser(["developer", "admin"]))}
+							disabled={
+								disabled ||
+								checkAccess(
+									loggedInUser,
+									getTypesOfUser(
+										user.type === "mastercorporate" ? ["developer", "admin"] : ["developer", "admin", "mastercorporate"],
+									),
+								)
+							}
 						/>
 						<Input
 							label="Number of Users"
@@ -508,7 +517,7 @@ const UserCard = ({
 							name="position"
 							onChange={setPosition}
 							type="text"
-							label="Position"
+							label="Department"
 							defaultValue={position}
 							placeholder="CEO, Head of Marketing..."
 							disabled
--- a/src/dashboards/AssignmentCreator.tsx
+++ b/src/dashboards/AssignmentCreator.tsx
@@ -24,14 +24,13 @@ import useExams from "@/hooks/useExams";

 interface Props {
 	isCreating: boolean;
-	assigner: string;
 	users: User[];
 	groups: Group[];
 	assignment?: Assignment;
 	cancelCreation: () => void;
 }

-export default function AssignmentCreator({isCreating, assignment, assigner, groups, users, cancelCreation}: Props) {
+export default function AssignmentCreator({isCreating, assignment, groups, users, cancelCreation}: Props) {
 	const [selectedModules, setSelectedModules] = useState<Module[]>(assignment?.exams.map((e) => e.module) || []);
 	const [assignees, setAssignees] = useState<string[]>(assignment?.assignees || []);
 	const [name, setName] = useState(
--- a/src/dashboards/Corporate.tsx
+++ b/src/dashboards/Corporate.tsx
@@ -2,11 +2,11 @@
 import Modal from "@/components/Modal";
 import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
 import useUsers from "@/hooks/useUsers";
-import { CorporateUser, Group, Stat, User } from "@/interfaces/user";
+import {CorporateUser, Group, MasterCorporateUser, Stat, User} from "@/interfaces/user";
 import UserList from "@/pages/(admin)/Lists/UserList";
 import {dateSorter} from "@/utils";
 import moment from "moment";
-import { useEffect, useState } from "react";
+import {useEffect, useMemo, useState} from "react";
 import {
 	BsArrowLeft,
 	BsClipboard2Data,
@@ -29,11 +29,7 @@ import {
 } from "react-icons/bs";
 import UserCard from "@/components/UserCard";
 import useGroups from "@/hooks/useGroups";
-import {
-  averageLevelCalculator,
-  calculateAverageLevel,
-  calculateBandScore,
-} from "@/utils/score";
+import {averageLevelCalculator, calculateAverageLevel, calculateBandScore} from "@/utils/score";
 import {MODULE_ARRAY} from "@/utils/moduleUtils";
 import {Module} from "@/interfaces";
 import {groupByExam} from "@/utils/stats";
@@ -53,28 +49,16 @@ import { createColumnHelper } from "@tanstack/react-table";
 import Checkbox from "@/components/Low/Checkbox";
 import List from "@/components/List";
 import {getUserCompanyName} from "@/resources/user";
-import {
-  futureAssignmentFilter,
-  pastAssignmentFilter,
-  archivedAssignmentFilter,
-  activeAssignmentFilter,
-} from "@/utils/assignments";
+import {futureAssignmentFilter, pastAssignmentFilter, archivedAssignmentFilter, activeAssignmentFilter} from "@/utils/assignments";
 import useUserBalance from "@/hooks/useUserBalance";

 interface Props {
 	user: CorporateUser;
+	linkedCorporate?: CorporateUser | MasterCorporateUser;
 }

 type StudentPerformanceItem = User & {corporateName: string; group: string};
-const StudentPerformanceList = ({
-  items,
-  stats,
-  users,
-}: {
-  items: StudentPerformanceItem[];
-  stats: Stat[];
-  users: User[];
-}) => {
+const StudentPerformanceList = ({items, stats, users}: {items: StudentPerformanceItem[]; stats: Stat[]; users: User[]}) => {
 	const [isShowingAmount, setIsShowingAmount] = useState(false);

 	const columnHelper = createColumnHelper<StudentPerformanceItem>();
@@ -105,81 +89,35 @@ const StudentPerformanceList = ({
 			cell: (info) =>
 				!isShowingAmount
 					? info.getValue() || 0
-          : `${
-              Object.keys(
-                groupByExam(
-                  stats.filter(
-                    (x) =>
-                      x.module === "reading" && x.user === info.row.original.id
-                  )
-                )
-              ).length
-            } exams`,
+					: `${Object.keys(groupByExam(stats.filter((x) => x.module === "reading" && x.user === info.row.original.id))).length} exams`,
 		}),
 		columnHelper.accessor("levels.listening", {
 			header: "Listening",
 			cell: (info) =>
 				!isShowingAmount
 					? info.getValue() || 0
-          : `${
-              Object.keys(
-                groupByExam(
-                  stats.filter(
-                    (x) =>
-                      x.module === "listening" &&
-                      x.user === info.row.original.id
-                  )
-                )
-              ).length
-            } exams`,
+					: `${Object.keys(groupByExam(stats.filter((x) => x.module === "listening" && x.user === info.row.original.id))).length} exams`,
 		}),
 		columnHelper.accessor("levels.writing", {
 			header: "Writing",
 			cell: (info) =>
 				!isShowingAmount
 					? info.getValue() || 0
-          : `${
-              Object.keys(
-                groupByExam(
-                  stats.filter(
-                    (x) =>
-                      x.module === "writing" && x.user === info.row.original.id
-                  )
-                )
-              ).length
-            } exams`,
+					: `${Object.keys(groupByExam(stats.filter((x) => x.module === "writing" && x.user === info.row.original.id))).length} exams`,
 		}),
 		columnHelper.accessor("levels.speaking", {
 			header: "Speaking",
 			cell: (info) =>
 				!isShowingAmount
 					? info.getValue() || 0
-          : `${
-              Object.keys(
-                groupByExam(
-                  stats.filter(
-                    (x) =>
-                      x.module === "speaking" && x.user === info.row.original.id
-                  )
-                )
-              ).length
-            } exams`,
+					: `${Object.keys(groupByExam(stats.filter((x) => x.module === "speaking" && x.user === info.row.original.id))).length} exams`,
 		}),
 		columnHelper.accessor("levels.level", {
 			header: "Level",
 			cell: (info) =>
 				!isShowingAmount
 					? info.getValue() || 0
-          : `${
-              Object.keys(
-                groupByExam(
-                  stats.filter(
-                    (x) =>
-                      x.module === "level" && x.user === info.row.original.id
-                  )
-                )
-              ).length
-            } exams`,
+					: `${Object.keys(groupByExam(stats.filter((x) => x.module === "level" && x.user === info.row.original.id))).length} exams`,
 		}),
 		columnHelper.accessor("levels", {
 			id: "overall_level",
@@ -188,15 +126,9 @@ const StudentPerformanceList = ({
 				!isShowingAmount
 					? averageLevelCalculator(
 							users,
-              stats.filter((x) => x.user === info.row.original.id)
+							stats.filter((x) => x.user === info.row.original.id),
 					  ).toFixed(1)
-          : `${
-              Object.keys(
-                groupByExam(
-                  stats.filter((x) => x.user === info.row.original.id)
-                )
-              ).length
-            } exams`,
+					: `${Object.keys(groupByExam(stats.filter((x) => x.user === info.row.original.id))).length} exams`,
 		}),
 	];

@@ -210,12 +142,12 @@ const StudentPerformanceList = ({
 					(a, b) =>
 						averageLevelCalculator(
 							users,
-              stats.filter((x) => x.user === b.id)
+							stats.filter((x) => x.user === b.id),
 						) -
 						averageLevelCalculator(
 							users,
-              stats.filter((x) => x.user === a.id)
-            )
+							stats.filter((x) => x.user === a.id),
+						),
 				)}
 				columns={columns}
 			/>
@@ -223,12 +155,10 @@ const StudentPerformanceList = ({
 	);
 };

-export default function CorporateDashboard({ user }: Props) {
+export default function CorporateDashboard({user, linkedCorporate}: Props) {
 	const [page, setPage] = useState("");
 	const [selectedUser, setSelectedUser] = useState<User>();
 	const [showModal, setShowModal] = useState(false);
-  const [corporateUserToShow, setCorporateUserToShow] =
-    useState<CorporateUser>();
 	const [selectedAssignment, setSelectedAssignment] = useState<Assignment>();
 	const [isCreatingAssignment, setIsCreatingAssignment] = useState(false);

@@ -236,45 +166,43 @@ export default function CorporateDashboard({ user }: Props) {
 	const {users, reload, isLoading} = useUsers();
 	const {codes} = useCodes(user.id);
 	const {groups} = useGroups({admin: user.id});
-  const {
-    assignments,
-    isLoading: isAssignmentsLoading,
-    reload: reloadAssignments,
-  } = useAssignments({ corporate: user.id });
+	const {assignments, isLoading: isAssignmentsLoading, reload: reloadAssignments} = useAssignments({corporate: user.id});
 	const {balance} = useUserBalance();

 	const appendUserFilters = useFilterStore((state) => state.appendUserFilter);
 	const router = useRouter();

+	const assignmentsGroups = useMemo(() => groups.filter((x) => x.admin === user.id || x.participants.includes(user.id)), [groups, user.id]);
+
+	const assignmentsUsers = useMemo(
+		() =>
+			users.filter(
+				(x) =>
+					x.type === "student" &&
+					(!!selectedUser
+						? groups
+								.filter((g) => g.admin === selectedUser.id)
+								.flatMap((g) => g.participants)
+								.includes(x.id) || false
+						: groups.flatMap((g) => g.participants).includes(x.id)),
+			),
+		[groups, users, selectedUser],
+	);
+
 	useEffect(() => {
 		setShowModal(!!selectedUser && page === "");
 	}, [selectedUser, page]);

-  useEffect(() => {
-    // in this case it fetches the master corporate account
-    getUserCorporate(user.id).then(setCorporateUserToShow);
-  }, [user]);
+	const studentFilter = (user: User) => user.type === "student" && groups.flatMap((g) => g.participants).includes(user.id);
+	const teacherFilter = (user: User) => user.type === "teacher" && groups.flatMap((g) => g.participants).includes(user.id);

-  const studentFilter = (user: User) =>
-    user.type === "student" &&
-    groups.flatMap((g) => g.participants).includes(user.id);
-  const teacherFilter = (user: User) =>
-    user.type === "teacher" &&
-    groups.flatMap((g) => g.participants).includes(user.id);
-
-  const getStatsByStudent = (user: User) =>
-    stats.filter((s) => s.user === user.id);
+	const getStatsByStudent = (user: User) => stats.filter((s) => s.user === user.id);

 	const UserDisplay = (displayUser: User) => (
 		<div
 			onClick={() => setSelectedUser(displayUser)}
-      className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300"
-    >
-      <img
-        src={displayUser.profilePicture}
-        alt={displayUser.name}
-        className="rounded-full w-10 h-10"
-      />
+			className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300">
+			<img src={displayUser.profilePicture} alt={displayUser.name} className="rounded-full w-10 h-10" />
 			<div className="flex flex-col gap-1 items-start">
 				<span>{displayUser.name}</span>
 				<span className="text-sm opacity-75">{displayUser.email}</span>
@@ -300,8 +228,7 @@ export default function CorporateDashboard({ user }: Props) {
 					<div className="flex flex-col gap-4">
 						<div
 							onClick={() => setPage("")}
-              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-            >
+							className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 							<BsArrowLeft className="text-xl" />
 							<span>Back</span>
 						</div>
@@ -330,8 +257,7 @@ export default function CorporateDashboard({ user }: Props) {
 					<div className="flex flex-col gap-4">
 						<div
 							onClick={() => setPage("")}
-              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-            >
+							className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 							<BsArrowLeft className="text-xl" />
 							<span>Back</span>
 						</div>
@@ -343,22 +269,18 @@ export default function CorporateDashboard({ user }: Props) {
 	};

 	const GroupsList = () => {
-    const filter = (x: Group) =>
-      x.admin === user.id || x.participants.includes(user.id);
+		const filter = (x: Group) => x.admin === user.id || x.participants.includes(user.id);

 		return (
 			<>
 				<div className="flex flex-col gap-4">
 					<div
 						onClick={() => setPage("")}
-            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-          >
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 						<BsArrowLeft className="text-xl" />
 						<span>Back</span>
 					</div>
-          <h2 className="text-2xl font-semibold">
-            Groups ({groups.filter(filter).length})
-          </h2>
+					<h2 className="text-2xl font-semibold">Groups ({groups.filter(filter).length})</h2>
 				</div>

 				<GroupList user={user} />
@@ -380,20 +302,8 @@ export default function CorporateDashboard({ user }: Props) {
 				/>
 				<AssignmentCreator
 					assignment={selectedAssignment}
-          groups={groups.filter(
-            (x) => x.admin === user.id || x.participants.includes(user.id)
-          )}
-          users={users.filter(
-            (x) =>
-              x.type === "student" &&
-              (!!selectedUser
-                ? groups
-                    .filter((g) => g.admin === selectedUser.id)
-                    .flatMap((g) => g.participants)
-                    .includes(x.id) || false
-                : groups.flatMap((g) => g.participants).includes(x.id))
-          )}
-          assigner={user.id}
+					groups={assignmentsGroups}
+					users={assignmentsUsers}
 					isCreating={isCreatingAssignment}
 					cancelCreation={() => {
 						setIsCreatingAssignment(false);
@@ -404,50 +314,31 @@ export default function CorporateDashboard({ user }: Props) {
 				<div className="w-full flex justify-between items-center">
 					<div
 						onClick={() => setPage("")}
-            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-          >
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 						<BsArrowLeft className="text-xl" />
 						<span>Back</span>
 					</div>
 					<div
 						onClick={reloadAssignments}
-            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-          >
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 						<span>Reload</span>
-            <BsArrowRepeat
-              className={clsx(
-                "text-xl",
-                isAssignmentsLoading && "animate-spin"
-              )}
-            />
+						<BsArrowRepeat className={clsx("text-xl", isAssignmentsLoading && "animate-spin")} />
 					</div>
 				</div>
 				<section className="flex flex-col gap-4">
-          <h2 className="text-2xl font-semibold">
-            Active Assignments (
-            {assignments.filter(activeAssignmentFilter).length})
-          </h2>
+					<h2 className="text-2xl font-semibold">Active Assignments ({assignments.filter(activeAssignmentFilter).length})</h2>
 					<div className="flex flex-wrap gap-2">
 						{assignments.filter(activeAssignmentFilter).map((a) => (
-              <AssignmentCard
-                {...a}
-                users={users}
-                onClick={() => setSelectedAssignment(a)}
-                key={a.id}
-              />
+							<AssignmentCard {...a} users={users} onClick={() => setSelectedAssignment(a)} key={a.id} />
 						))}
 					</div>
 				</section>
 				<section className="flex flex-col gap-4">
-          <h2 className="text-2xl font-semibold">
-            Planned Assignments (
-            {assignments.filter(futureAssignmentFilter).length})
-          </h2>
+					<h2 className="text-2xl font-semibold">Planned Assignments ({assignments.filter(futureAssignmentFilter).length})</h2>
 					<div className="flex flex-wrap gap-2">
 						<div
 							onClick={() => setIsCreatingAssignment(true)}
-              className="w-[250px] h-[200px] flex flex-col gap-2 items-center justify-center bg-white hover:bg-mti-purple-ultralight text-mti-purple-light hover:text-mti-purple-dark border border-mti-gray-platinum hover:drop-shadow p-4 cursor-pointer rounded-xl transition ease-in-out duration-300"
-            >
+							className="w-[250px] h-[200px] flex flex-col gap-2 items-center justify-center bg-white hover:bg-mti-purple-ultralight text-mti-purple-light hover:text-mti-purple-dark border border-mti-gray-platinum hover:drop-shadow p-4 cursor-pointer rounded-xl transition ease-in-out duration-300">
 							<BsPlus className="text-6xl" />
 							<span className="text-lg">New Assignment</span>
 						</div>
@@ -465,9 +356,7 @@ export default function CorporateDashboard({ user }: Props) {
 					</div>
 				</section>
 				<section className="flex flex-col gap-4">
-          <h2 className="text-2xl font-semibold">
-            Past Assignments ({assignments.filter(pastAssignmentFilter).length})
-          </h2>
+					<h2 className="text-2xl font-semibold">Past Assignments ({assignments.filter(pastAssignmentFilter).length})</h2>
 					<div className="flex flex-wrap gap-2">
 						{assignments.filter(pastAssignmentFilter).map((a) => (
 							<AssignmentCard
@@ -484,10 +373,7 @@ export default function CorporateDashboard({ user }: Props) {
 					</div>
 				</section>
 				<section className="flex flex-col gap-4">
-          <h2 className="text-2xl font-semibold">
-            Archived Assignments (
-            {assignments.filter(archivedAssignmentFilter).length})
-          </h2>
+					<h2 className="text-2xl font-semibold">Archived Assignments ({assignments.filter(archivedAssignmentFilter).length})</h2>
 					<div className="flex flex-wrap gap-2">
 						{assignments.filter(archivedAssignmentFilter).map((a) => (
 							<AssignmentCard
@@ -509,11 +395,7 @@ export default function CorporateDashboard({ user }: Props) {

 	const StudentPerformancePage = () => {
 		const students = users
-      .filter(
-        (x) =>
-          x.type === "student" &&
-          groups.flatMap((g) => g.participants).includes(x.id)
-      )
+			.filter((x) => x.type === "student" && groups.flatMap((g) => g.participants).includes(x.id))
 			.map((u) => ({
 				...u,
 				group: groups.find((x) => x.participants.includes(u.id))?.name || "N/A",
@@ -525,19 +407,15 @@ export default function CorporateDashboard({ user }: Props) {
 				<div className="w-full flex justify-between items-center">
 					<div
 						onClick={() => setPage("")}
-            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-          >
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 						<BsArrowLeft className="text-xl" />
 						<span>Back</span>
 					</div>
 					<div
 						onClick={reload}
-            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-          >
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 						<span>Reload</span>
-            <BsArrowRepeat
-              className={clsx("text-xl", isLoading && "animate-spin")}
-            />
+						<BsArrowRepeat className={clsx("text-xl", isLoading && "animate-spin")} />
 					</div>
 				</div>
 				<StudentPerformanceList items={students} stats={stats} users={users} />
@@ -555,12 +433,7 @@ export default function CorporateDashboard({ user }: Props) {
 			.filter((f) => !!f.focus);
 		const bandScores = formattedStats.map((s) => ({
 			module: s.module,
-      level: calculateBandScore(
-        s.score.correct,
-        s.score.total,
-        s.module,
-        s.focus!
-      ),
+			level: calculateBandScore(s.score.correct, s.score.total, s.module, s.focus!),
 		}));

 		const levels: {[key in Module]: number} = {
@@ -577,13 +450,9 @@ export default function CorporateDashboard({ user }: Props) {

 	const DefaultDashboard = () => (
 		<>
-      {corporateUserToShow && (
+			{!!linkedCorporate && (
 				<div className="absolute top-4 right-4 bg-neutral-200 px-2 rounded-lg py-1">
-          Linked to:{" "}
-          <b>
-            {corporateUserToShow?.corporateInformation?.companyInformation
-              .name || corporateUserToShow.name}
-          </b>
+					Linked to: <b>{linkedCorporate?.corporateInformation?.companyInformation.name || linkedCorporate.name}</b>
 				</div>
 			)}
 			<section className="grid grid-cols-5 -md:grid-cols-2 gap-4 text-center">
@@ -604,46 +473,26 @@ export default function CorporateDashboard({ user }: Props) {
 				<IconCard
 					Icon={BsClipboard2Data}
 					label="Exams Performed"
-          value={
-            stats.filter((s) =>
-              groups.flatMap((g) => g.participants).includes(s.user)
-            ).length
-          }
+					value={stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user)).length}
 					color="purple"
 				/>
 				<IconCard
 					Icon={BsPaperclip}
 					label="Average Level"
-          value={averageLevelCalculator(
-            stats.filter((s) =>
-              groups.flatMap((g) => g.participants).includes(s.user)
-            )
-          ).toFixed(1)}
-          color="purple"
-        />
-        <IconCard
-          onClick={() => setPage("groups")}
-          Icon={BsPeople}
-          label="Groups"
-          value={groups.length}
+					value={averageLevelCalculator(stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user))).toFixed(1)}
 					color="purple"
 				/>
+				<IconCard onClick={() => setPage("groups")} Icon={BsPeople} label="Groups" value={groups.length} color="purple" />
 				<IconCard
 					Icon={BsPersonCheck}
 					label="User Balance"
-          value={`${balance}/${
-            user.corporateInformation?.companyInformation?.userAmount || 0
-          }`}
+					value={`${balance}/${user.corporateInformation?.companyInformation?.userAmount || 0}`}
 					color="purple"
 				/>
 				<IconCard
 					Icon={BsClock}
 					label="Expiration Date"
-          value={
-            user.subscriptionExpirationDate
-              ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy")
-              : "Unlimited"
-          }
+					value={user.subscriptionExpirationDate ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy") : "Unlimited"}
 					color="rose"
 				/>
 				<IconCard
@@ -656,15 +505,12 @@ export default function CorporateDashboard({ user }: Props) {
 				<button
 					disabled={isAssignmentsLoading}
 					onClick={() => setPage("assignments")}
-          className="bg-white col-span-2 rounded-xl shadow p-4 flex flex-col gap-4 items-center w-96 h-52 justify-center cursor-pointer hover:shadow-xl transition ease-in-out duration-300"
-        >
+					className="bg-white col-span-2 rounded-xl shadow p-4 flex flex-col gap-4 items-center w-96 h-52 justify-center cursor-pointer hover:shadow-xl transition ease-in-out duration-300">
 					<BsEnvelopePaper className="text-6xl text-mti-purple-light" />
 					<span className="flex flex-col gap-1 items-center text-xl">
 						<span className="text-lg">Assignments</span>
 						<span className="font-semibold text-mti-purple-light">
-              {isAssignmentsLoading
-                ? "Loading..."
-                : assignments.filter((a) => !a.archived).length}
+							{isAssignmentsLoading ? "Loading..." : assignments.filter((a) => !a.archived).length}
 						</span>
 					</span>
 				</button>
@@ -698,11 +544,7 @@ export default function CorporateDashboard({ user }: Props) {
 					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
 						{users
 							.filter(studentFilter)
-              .sort(
-                (a, b) =>
-                  calculateAverageLevel(b.levels) -
-                  calculateAverageLevel(a.levels)
-              )
+							.sort((a, b) => calculateAverageLevel(b.levels) - calculateAverageLevel(a.levels))
 							.map((x) => (
 								<UserDisplay key={x.id} {...x} />
 							))}
@@ -715,8 +557,7 @@ export default function CorporateDashboard({ user }: Props) {
 							.filter(studentFilter)
 							.sort(
 								(a, b) =>
-                  Object.keys(groupByExam(getStatsByStudent(b))).length -
-                  Object.keys(groupByExam(getStatsByStudent(a))).length
+									Object.keys(groupByExam(getStatsByStudent(b))).length - Object.keys(groupByExam(getStatsByStudent(a))).length,
 							)
 							.map((x) => (
 								<UserDisplay key={x.id} {...x} />
@@ -740,8 +581,7 @@ export default function CorporateDashboard({ user }: Props) {
 									if (shouldReload) reload();
 								}}
 								onViewStudents={
-                  selectedUser.type === "corporate" ||
-                  selectedUser.type === "teacher"
+									selectedUser.type === "corporate" || selectedUser.type === "teacher"
 										? () => {
 												appendUserFilters({
 													id: "view-students",
@@ -751,11 +591,7 @@ export default function CorporateDashboard({ user }: Props) {
 													id: "belongs-to-admin",
 													filter: (x: User) =>
 														groups
-                              .filter(
-                                (g) =>
-                                  g.admin === selectedUser.id ||
-                                  g.participants.includes(selectedUser.id)
-                              )
+															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
 															.flatMap((g) => g.participants)
 															.includes(x.id),
 												});
@@ -765,8 +601,7 @@ export default function CorporateDashboard({ user }: Props) {
 										: undefined
 								}
 								onViewTeachers={
-                  selectedUser.type === "corporate" ||
-                  selectedUser.type === "student"
+									selectedUser.type === "corporate" || selectedUser.type === "student"
 										? () => {
 												appendUserFilters({
 													id: "view-teachers",
@@ -776,11 +611,7 @@ export default function CorporateDashboard({ user }: Props) {
 													id: "belongs-to-admin",
 													filter: (x: User) =>
 														groups
-                              .filter(
-                                (g) =>
-                                  g.admin === selectedUser.id ||
-                                  g.participants.includes(selectedUser.id)
-                              )
+															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
 															.flatMap((g) => g.participants)
 															.includes(x.id),
 												});
--- a/src/dashboards/MasterCorporate.tsx
+++ b/src/dashboards/MasterCorporate.tsx
@@ -2,13 +2,7 @@
 import Modal from "@/components/Modal";
 import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
 import useUsers from "@/hooks/useUsers";
-import {
-  CorporateUser,
-  Group,
-  MasterCorporateUser,
-  Stat,
-  User,
-} from "@/interfaces/user";
+import {CorporateUser, Group, MasterCorporateUser, Stat, User} from "@/interfaces/user";
 import UserList from "@/pages/(admin)/Lists/UserList";
 import {dateSorter} from "@/utils";
 import moment from "moment";
@@ -33,11 +27,7 @@ import {
 import UserCard from "@/components/UserCard";
 import useGroups from "@/hooks/useGroups";

-import {
-  averageLevelCalculator,
-  calculateAverageLevel,
-  calculateBandScore,
-} from "@/utils/score";
+import {averageLevelCalculator, calculateAverageLevel, calculateBandScore} from "@/utils/score";
 import {MODULE_ARRAY} from "@/utils/moduleUtils";
 import {Module} from "@/interfaces";
 import {groupByExam} from "@/utils/stats";
@@ -60,18 +50,9 @@ import Checkbox from "@/components/Low/Checkbox";
 import {groupBy, uniq, uniqBy} from "lodash";
 import Select from "@/components/Low/Select";
 import {Menu, MenuButton, MenuItem, MenuItems} from "@headlessui/react";
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@/components/ui/popover";
+import {Popover, PopoverContent, PopoverTrigger} from "@/components/ui/popover";
 import MasterStatistical from "./MasterStatistical";
-import {
-  futureAssignmentFilter,
-  pastAssignmentFilter,
-  archivedAssignmentFilter,
-  activeAssignmentFilter,
-} from "@/utils/assignments";
+import {futureAssignmentFilter, pastAssignmentFilter, archivedAssignmentFilter, activeAssignmentFilter} from "@/utils/assignments";
 import useUserBalance from "@/hooks/useUserBalance";

 interface Props {
@@ -82,37 +63,23 @@ type StudentPerformanceItem = User & {
 	corporate?: CorporateUser;
 	group?: Group;
 };
-const StudentPerformanceList = ({
-  items,
-  stats,
-  users,
-  groups,
-}: {
-  items: StudentPerformanceItem[];
-  stats: Stat[];
-  users: User[];
-  groups: Group[];
-}) => {
+const StudentPerformanceList = ({items, stats, users, groups}: {items: StudentPerformanceItem[]; stats: Stat[]; users: User[]; groups: Group[]}) => {
 	const [isShowingAmount, setIsShowingAmount] = useState(false);
 	const [availableCorporates] = useState(
 		uniqBy(
 			items.map((x) => x.corporate),
-      "id"
-    )
+			"id",
+		),
 	);
 	const [availableGroups] = useState(
 		uniqBy(
 			items.map((x) => x.group),
-      "id"
-    )
+			"id",
+		),
 	);

-  const [selectedCorporate, setSelectedCorporate] = useState<
-    CorporateUser | null | undefined
-  >(null);
-  const [selectedGroup, setSelectedGroup] = useState<Group | null | undefined>(
-    null
-  );
+	const [selectedCorporate, setSelectedCorporate] = useState<CorporateUser | null | undefined>(null);
+	const [selectedGroup, setSelectedGroup] = useState<Group | null | undefined>(null);

 	const columnHelper = createColumnHelper<StudentPerformanceItem>();

@@ -135,10 +102,7 @@ const StudentPerformanceList = ({
 		}),
 		columnHelper.accessor("corporate", {
 			header: "Corporate",
-      cell: (info) =>
-        !!info.getValue()
-          ? getUserCompanyName(info.getValue() as User, users, groups)
-          : "N/A",
+			cell: (info) => (!!info.getValue() ? getUserCompanyName(info.getValue() as User, users, groups) : "N/A"),
 		}),
 		columnHelper.accessor("levels.reading", {
 			header: "Reading",
@@ -146,30 +110,15 @@ const StudentPerformanceList = ({
 				!isShowingAmount
 					? calculateBandScore(
 							stats
-                .filter(
-                  (x) =>
-                    x.module === "reading" && x.user === info.row.original.id
-                )
+								.filter((x) => x.module === "reading" && x.user === info.row.original.id)
 								.reduce((acc, curr) => acc + curr.score.correct, 0),
 							stats
-                .filter(
-                  (x) =>
-                    x.module === "reading" && x.user === info.row.original.id
-                )
+								.filter((x) => x.module === "reading" && x.user === info.row.original.id)
 								.reduce((acc, curr) => acc + curr.score.total, 0),
 							"level",
-              info.row.original.focus || "academic"
+							info.row.original.focus || "academic",
 					  ) || 0
-          : `${
-              Object.keys(
-                groupByExam(
-                  stats.filter(
-                    (x) =>
-                      x.module === "reading" && x.user === info.row.original.id
-                  )
-                )
-              ).length
-            } exams`,
+					: `${Object.keys(groupByExam(stats.filter((x) => x.module === "reading" && x.user === info.row.original.id))).length} exams`,
 		}),
 		columnHelper.accessor("levels.listening", {
 			header: "Listening",
@@ -177,31 +126,15 @@ const StudentPerformanceList = ({
 				!isShowingAmount
 					? calculateBandScore(
 							stats
-                .filter(
-                  (x) =>
-                    x.module === "listening" && x.user === info.row.original.id
-                )
+								.filter((x) => x.module === "listening" && x.user === info.row.original.id)
 								.reduce((acc, curr) => acc + curr.score.correct, 0),
 							stats
-                .filter(
-                  (x) =>
-                    x.module === "listening" && x.user === info.row.original.id
-                )
+								.filter((x) => x.module === "listening" && x.user === info.row.original.id)
 								.reduce((acc, curr) => acc + curr.score.total, 0),
 							"level",
-              info.row.original.focus || "academic"
+							info.row.original.focus || "academic",
 					  ) || 0
-          : `${
-              Object.keys(
-                groupByExam(
-                  stats.filter(
-                    (x) =>
-                      x.module === "listening" &&
-                      x.user === info.row.original.id
-                  )
-                )
-              ).length
-            } exams`,
+					: `${Object.keys(groupByExam(stats.filter((x) => x.module === "listening" && x.user === info.row.original.id))).length} exams`,
 		}),
 		columnHelper.accessor("levels.writing", {
 			header: "Writing",
@@ -209,30 +142,15 @@ const StudentPerformanceList = ({
 				!isShowingAmount
 					? calculateBandScore(
 							stats
-                .filter(
-                  (x) =>
-                    x.module === "writing" && x.user === info.row.original.id
-                )
+								.filter((x) => x.module === "writing" && x.user === info.row.original.id)
 								.reduce((acc, curr) => acc + curr.score.correct, 0),
 							stats
-                .filter(
-                  (x) =>
-                    x.module === "writing" && x.user === info.row.original.id
-                )
+								.filter((x) => x.module === "writing" && x.user === info.row.original.id)
 								.reduce((acc, curr) => acc + curr.score.total, 0),
 							"level",
-              info.row.original.focus || "academic"
+							info.row.original.focus || "academic",
 					  ) || 0
-          : `${
-              Object.keys(
-                groupByExam(
-                  stats.filter(
-                    (x) =>
-                      x.module === "writing" && x.user === info.row.original.id
-                  )
-                )
-              ).length
-            } exams`,
+					: `${Object.keys(groupByExam(stats.filter((x) => x.module === "writing" && x.user === info.row.original.id))).length} exams`,
 		}),
 		columnHelper.accessor("levels.speaking", {
 			header: "Speaking",
@@ -240,30 +158,15 @@ const StudentPerformanceList = ({
 				!isShowingAmount
 					? calculateBandScore(
 							stats
-                .filter(
-                  (x) =>
-                    x.module === "speaking" && x.user === info.row.original.id
-                )
+								.filter((x) => x.module === "speaking" && x.user === info.row.original.id)
 								.reduce((acc, curr) => acc + curr.score.correct, 0),
 							stats
-                .filter(
-                  (x) =>
-                    x.module === "speaking" && x.user === info.row.original.id
-                )
+								.filter((x) => x.module === "speaking" && x.user === info.row.original.id)
 								.reduce((acc, curr) => acc + curr.score.total, 0),
 							"level",
-              info.row.original.focus || "academic"
+							info.row.original.focus || "academic",
 					  ) || 0
-          : `${
-              Object.keys(
-                groupByExam(
-                  stats.filter(
-                    (x) =>
-                      x.module === "speaking" && x.user === info.row.original.id
-                  )
-                )
-              ).length
-            } exams`,
+					: `${Object.keys(groupByExam(stats.filter((x) => x.module === "speaking" && x.user === info.row.original.id))).length} exams`,
 		}),
 		columnHelper.accessor("levels.level", {
 			header: "Level",
@@ -271,28 +174,15 @@ const StudentPerformanceList = ({
 				!isShowingAmount
 					? calculateBandScore(
 							stats
-                .filter(
-                  (x) => x.module === "level" && x.user === info.row.original.id
-                )
+								.filter((x) => x.module === "level" && x.user === info.row.original.id)
 								.reduce((acc, curr) => acc + curr.score.correct, 0),
 							stats
-                .filter(
-                  (x) => x.module === "level" && x.user === info.row.original.id
-                )
+								.filter((x) => x.module === "level" && x.user === info.row.original.id)
 								.reduce((acc, curr) => acc + curr.score.total, 0),
 							"level",
-              info.row.original.focus || "academic"
+							info.row.original.focus || "academic",
 					  ) || 0
-          : `${
-              Object.keys(
-                groupByExam(
-                  stats.filter(
-                    (x) =>
-                      x.module === "level" && x.user === info.row.original.id
-                  )
-                )
-              ).length
-            } exams`,
+					: `${Object.keys(groupByExam(stats.filter((x) => x.module === "level" && x.user === info.row.original.id))).length} exams`,
 		}),
 		columnHelper.accessor("levels", {
 			id: "overall_level",
@@ -301,24 +191,16 @@ const StudentPerformanceList = ({
 				!isShowingAmount
 					? averageLevelCalculator(
 							users,
-              stats.filter((x) => x.user === info.row.original.id)
+							stats.filter((x) => x.user === info.row.original.id),
 					  ).toFixed(1)
-          : `${
-              Object.keys(
-                groupByExam(
-                  stats.filter((x) => x.user === info.row.original.id)
-                )
-              ).length
-            } exams`,
+					: `${Object.keys(groupByExam(stats.filter((x) => x.user === info.row.original.id))).length} exams`,
 		}),
 	];

 	const filterUsers = (data: StudentPerformanceItem[]) => {
 		console.log(data, selectedCorporate);
-    const filterByCorporate = (item: StudentPerformanceItem) =>
-      item.corporate?.id === selectedCorporate?.id;
-    const filterByGroup = (item: StudentPerformanceItem) =>
-      item.group?.id === selectedGroup?.id;
+		const filterByCorporate = (item: StudentPerformanceItem) => item.corporate?.id === selectedCorporate?.id;
+		const filterByGroup = (item: StudentPerformanceItem) => item.group?.id === selectedGroup?.id;

 		const filters: ((item: StudentPerformanceItem) => boolean)[] = [];
 		if (selectedCorporate !== null) filters.push(filterByCorporate);
@@ -345,10 +227,7 @@ const StudentPerformanceList = ({
 							<Select
 								options={availableCorporates.map((x) => ({
 									value: x?.id || "N/A",
-                  label:
-                    x?.corporateInformation?.companyInformation?.name ||
-                    x?.name ||
-                    "N/A",
+									label: x?.corporateInformation?.companyInformation?.name || x?.name || "N/A",
 								}))}
 								isClearable
 								value={
@@ -357,8 +236,7 @@ const StudentPerformanceList = ({
 										: {
 												value: selectedCorporate?.id || "N/A",
 												label:
-                          selectedCorporate?.corporateInformation
-                            ?.companyInformation?.name ||
+													selectedCorporate?.corporateInformation?.companyInformation?.name ||
 													selectedCorporate?.name ||
 													"N/A",
 										  }
@@ -368,11 +246,7 @@ const StudentPerformanceList = ({
 									!value
 										? setSelectedCorporate(null)
 										: setSelectedCorporate(
-                        value.value === "N/A"
-                          ? undefined
-                          : availableCorporates.find(
-                              (x) => x?.id === value.value
-                            )
+												value.value === "N/A" ? undefined : availableCorporates.find((x) => x?.id === value.value),
 										  )
 								}
 							/>
@@ -394,11 +268,7 @@ const StudentPerformanceList = ({
 								onChange={(value) =>
 									!value
 										? setSelectedGroup(null)
-                    : setSelectedGroup(
-                        value.value === "N/A"
-                          ? undefined
-                          : availableGroups.find((x) => x?.id === value.value)
-                      )
+										: setSelectedGroup(value.value === "N/A" ? undefined : availableGroups.find((x) => x?.id === value.value))
 								}
 							/>
 						</div>
@@ -411,13 +281,13 @@ const StudentPerformanceList = ({
 						(a, b) =>
 							averageLevelCalculator(
 								users,
-                stats.filter((x) => x.user === b.id)
+								stats.filter((x) => x.user === b.id),
 							) -
 							averageLevelCalculator(
 								users,
-                stats.filter((x) => x.user === a.id)
-              )
-          )
+								stats.filter((x) => x.user === a.id),
+							),
+					),
 				)}
 				columns={columns}
 			/>
@@ -431,31 +301,37 @@ export default function MasterCorporateDashboard({ user }: Props) {
 	const [showModal, setShowModal] = useState(false);
 	const [selectedAssignment, setSelectedAssignment] = useState<Assignment>();
 	const [isCreatingAssignment, setIsCreatingAssignment] = useState(false);
-  const [corporateAssignments, setCorporateAssignments] = useState<
-    (Assignment & { corporate?: CorporateUser })[]
-  >([]);
+	const [corporateAssignments, setCorporateAssignments] = useState<(Assignment & {corporate?: CorporateUser})[]>([]);

 	const {data: stats} = useFilterRecordsByUser<Stat[]>();
 	const {users, reload} = useUsers();
-  const { codes } = useCodes(user.id);
 	const {groups} = useGroups({admin: user.id, userType: user.type});
 	const {balance} = useUserBalance();

-  const masterCorporateUserGroups = useMemo(() => [
-    ...new Set(
-      groups.filter((u) => u.admin === user.id).flatMap((g) => g.participants)
+	const masterCorporateUserGroups = useMemo(
+		() => [...new Set(groups.filter((u) => u.admin === user.id).flatMap((g) => g.participants))],
+		[groups, user.id],
+	);
+
+	const corporateUserGroups = useMemo(() => [...new Set(groups.flatMap((g) => g.participants))], [groups]);
+
+	const {assignments, isLoading: isAssignmentsLoading, reload: reloadAssignments} = useAssignments({corporate: user.id});
+
+	const assignmentsGroups = useMemo(() => groups.filter((x) => x.admin === user.id || x.participants.includes(user.id)), [groups, user.id]);
+	const assignmentsUsers = useMemo(
+		() =>
+			users.filter(
+				(x) =>
+					x.type === "student" &&
+					(!!selectedUser
+						? groups
+								.filter((g) => g.admin === selectedUser.id)
+								.flatMap((g) => g.participants)
+								.includes(x.id) || false
+						: groups.flatMap((g) => g.participants).includes(x.id)),
 			),
-  ], [groups, user.id]);
-
-  const corporateUserGroups = [
-    ...new Set(groups.flatMap((g) => g.participants)),
-  ];
-
-  const {
-    assignments,
-    isLoading: isAssignmentsLoading,
-    reload: reloadAssignments,
-  } = useAssignments({ corporate: user.id });
+		[groups, users, selectedUser],
+	);

 	const appendUserFilters = useFilterStore((state) => state.appendUserFilter);
 	const router = useRouter();
@@ -469,33 +345,21 @@ export default function MasterCorporateDashboard({ user }: Props) {
 			assignments.filter(activeAssignmentFilter).map((a) => ({
 				...a,
 				corporate: !!users.find((x) => x.id === a.assigner)
-          ? getCorporateUser(
-              users.find((x) => x.id === a.assigner)!,
-              users,
-              groups
-            )
+					? getCorporateUser(users.find((x) => x.id === a.assigner)!, users, groups)
 					: undefined,
-      }))
+			})),
 		);
 	}, [assignments, groups, users]);

-  const studentFilter = (user: User) =>
-    user.type === "student" && corporateUserGroups.includes(user.id);
-  const teacherFilter = (user: User) =>
-    user.type === "teacher" && corporateUserGroups.includes(user.id);
-  const getStatsByStudent = (user: User) =>
-    stats.filter((s) => s.user === user.id);
+	const studentFilter = (user: User) => user.type === "student" && corporateUserGroups.includes(user.id);
+	const teacherFilter = (user: User) => user.type === "teacher" && corporateUserGroups.includes(user.id);
+	const getStatsByStudent = (user: User) => stats.filter((s) => s.user === user.id);

 	const UserDisplay = (displayUser: User) => (
 		<div
 			onClick={() => setSelectedUser(displayUser)}
-      className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300"
-    >
-      <img
-        src={displayUser.profilePicture}
-        alt={displayUser.name}
-        className="rounded-full w-10 h-10"
-      />
+			className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300">
+			<img src={displayUser.profilePicture} alt={displayUser.name} className="rounded-full w-10 h-10" />
 			<div className="flex flex-col gap-1 items-start">
 				<span>{displayUser.name}</span>
 				<span className="text-sm opacity-75">{displayUser.email}</span>
@@ -505,10 +369,7 @@ export default function MasterCorporateDashboard({ user }: Props) {

 	const StudentsList = () => {
 		const filter = (x: User) =>
-      x.type === "student" &&
-      (!!selectedUser
-        ? corporateUserGroups.includes(x.id) || false
-        : corporateUserGroups.includes(x.id));
+			x.type === "student" && (!!selectedUser ? corporateUserGroups.includes(x.id) || false : corporateUserGroups.includes(x.id));

 		return (
 			<UserList
@@ -518,8 +379,7 @@ export default function MasterCorporateDashboard({ user }: Props) {
 					<div className="flex flex-col gap-4">
 						<div
 							onClick={() => setPage("")}
-              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-            >
+							className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 							<BsArrowLeft className="text-xl" />
 							<span>Back</span>
 						</div>
@@ -532,10 +392,7 @@ export default function MasterCorporateDashboard({ user }: Props) {

 	const TeachersList = () => {
 		const filter = (x: User) =>
-      x.type === "teacher" &&
-      (!!selectedUser
-        ? corporateUserGroups.includes(x.id) || false
-        : corporateUserGroups.includes(x.id));
+			x.type === "teacher" && (!!selectedUser ? corporateUserGroups.includes(x.id) || false : corporateUserGroups.includes(x.id));

 		return (
 			<UserList
@@ -545,8 +402,7 @@ export default function MasterCorporateDashboard({ user }: Props) {
 					<div className="flex flex-col gap-4">
 						<div
 							onClick={() => setPage("")}
-              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-            >
+							className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 							<BsArrowLeft className="text-xl" />
 							<span>Back</span>
 						</div>
@@ -558,10 +414,7 @@ export default function MasterCorporateDashboard({ user }: Props) {
 	};

 	const corporateUserFilter = (x: User) =>
-    x.type === "corporate" &&
-    (!!selectedUser
-      ? masterCorporateUserGroups.includes(x.id) || false
-      : masterCorporateUserGroups.includes(x.id));
+		x.type === "corporate" && (!!selectedUser ? masterCorporateUserGroups.includes(x.id) || false : masterCorporateUserGroups.includes(x.id));

 	const CorporateList = () => {
 		return (
@@ -572,8 +425,7 @@ export default function MasterCorporateDashboard({ user }: Props) {
 					<div className="flex flex-col gap-4">
 						<div
 							onClick={() => setPage("")}
-              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-            >
+							className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 							<BsArrowLeft className="text-xl" />
 							<span>Back</span>
 						</div>
@@ -590,8 +442,7 @@ export default function MasterCorporateDashboard({ user }: Props) {
 				<div className="flex flex-col gap-4">
 					<div
 						onClick={() => setPage("")}
-            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-          >
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 						<BsArrowLeft className="text-xl" />
 						<span>Back</span>
 					</div>
@@ -605,11 +456,7 @@ export default function MasterCorporateDashboard({ user }: Props) {

 	const StudentPerformancePage = () => {
 		const students = users
-      .filter(
-        (x) =>
-          x.type === "student" &&
-          groups.flatMap((g) => g.participants).includes(x.id)
-      )
+			.filter((x) => x.type === "student" && groups.flatMap((g) => g.participants).includes(x.id))
 			.map((u) => ({
 				...u,
 				group: groups.find((x) => x.participants.includes(u.id)),
@@ -621,30 +468,18 @@ export default function MasterCorporateDashboard({ user }: Props) {
 				<div className="w-full flex justify-between items-center">
 					<div
 						onClick={() => setPage("")}
-            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-          >
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 						<BsArrowLeft className="text-xl" />
 						<span>Back</span>
 					</div>
 					<div
 						onClick={reloadAssignments}
-            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-          >
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 						<span>Reload</span>
-            <BsArrowRepeat
-              className={clsx(
-                "text-xl",
-                isAssignmentsLoading && "animate-spin"
-              )}
-            />
+						<BsArrowRepeat className={clsx("text-xl", isAssignmentsLoading && "animate-spin")} />
 					</div>
 				</div>
-        <StudentPerformanceList
-          items={students}
-          stats={stats}
-          users={users}
-          groups={groups}
-        />
+				<StudentPerformanceList items={students} stats={stats} users={users} groups={groups} />
 			</>
 		);
 	};
@@ -663,20 +498,8 @@ export default function MasterCorporateDashboard({ user }: Props) {
 				/>
 				<AssignmentCreator
 					assignment={selectedAssignment}
-          groups={groups.filter(
-            (x) => x.admin === user.id || x.participants.includes(user.id)
-          )}
-          users={users.filter(
-            (x) =>
-              x.type === "student" &&
-              (!!selectedUser
-                ? groups
-                    .filter((g) => g.admin === selectedUser.id)
-                    .flatMap((g) => g.participants)
-                    .includes(x.id) || false
-                : groups.flatMap((g) => g.participants).includes(x.id))
-          )}
-          assigner={user.id}
+					groups={assignmentsGroups}
+					users={assignmentsUsers}
 					isCreating={isCreatingAssignment}
 					cancelCreation={() => {
 						setIsCreatingAssignment(false);
@@ -687,88 +510,49 @@ export default function MasterCorporateDashboard({ user }: Props) {
 				<div className="w-full flex justify-between items-center">
 					<div
 						onClick={() => setPage("")}
-            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-          >
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 						<BsArrowLeft className="text-xl" />
 						<span>Back</span>
 					</div>
 					<div
 						onClick={reloadAssignments}
-            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-          >
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 						<span>Reload</span>
-            <BsArrowRepeat
-              className={clsx(
-                "text-xl",
-                isAssignmentsLoading && "animate-spin"
-              )}
-            />
+						<BsArrowRepeat className={clsx("text-xl", isAssignmentsLoading && "animate-spin")} />
 					</div>
 				</div>
 				<div className="flex flex-col gap-2">
 					<span className="text-lg font-bold">Active Assignments Status</span>
 					<div className="flex items-center gap-4">
 						<span>
-              <b>Total:</b>{" "}
-              {assignments
-                .filter(activeAssignmentFilter)
-                .reduce((acc, curr) => acc + curr.results.length, 0)}
-              /
-              {assignments
-                .filter(activeAssignmentFilter)
-                .reduce((acc, curr) => curr.exams.length + acc, 0)}
+							<b>Total:</b> {assignments.filter(activeAssignmentFilter).reduce((acc, curr) => acc + curr.results.length, 0)}/
+							{assignments.filter(activeAssignmentFilter).reduce((acc, curr) => curr.exams.length + acc, 0)}
 						</span>
-            {Object.keys(
-              groupBy(corporateAssignments, (x) => x.corporate?.id)
-            ).map((x) => (
+						{Object.keys(groupBy(corporateAssignments, (x) => x.corporate?.id)).map((x) => (
 							<div key={x}>
-                <span className="font-semibold">
-                  {getUserCompanyName(
-                    users.find((u) => u.id === x)!,
-                    users,
-                    groups
-                  )}
-                  :{" "}
-                </span>
+								<span className="font-semibold">{getUserCompanyName(users.find((u) => u.id === x)!, users, groups)}: </span>
 								<span>
-                  {groupBy(corporateAssignments, (x) => x.corporate?.id)[
-                    x
-                  ].reduce((acc, curr) => curr.results.length + acc, 0)}
-                  /
-                  {groupBy(corporateAssignments, (x) => x.corporate?.id)[
-                    x
-                  ].reduce((acc, curr) => curr.exams.length + acc, 0)}
+									{groupBy(corporateAssignments, (x) => x.corporate?.id)[x].reduce((acc, curr) => curr.results.length + acc, 0)}/
+									{groupBy(corporateAssignments, (x) => x.corporate?.id)[x].reduce((acc, curr) => curr.exams.length + acc, 0)}
 								</span>
 							</div>
 						))}
 					</div>
 				</div>
 				<section className="flex flex-col gap-4">
-          <h2 className="text-2xl font-semibold">
-            Active Assignments (
-            {assignments.filter(activeAssignmentFilter).length})
-          </h2>
+					<h2 className="text-2xl font-semibold">Active Assignments ({assignments.filter(activeAssignmentFilter).length})</h2>
 					<div className="flex flex-wrap gap-2">
 						{assignments.filter(activeAssignmentFilter).map((a) => (
-              <AssignmentCard
-                {...a}
-                users={users}
-                onClick={() => setSelectedAssignment(a)}
-                key={a.id}
-              />
+							<AssignmentCard {...a} users={users} onClick={() => setSelectedAssignment(a)} key={a.id} />
 						))}
 					</div>
 				</section>
 				<section className="flex flex-col gap-4">
-          <h2 className="text-2xl font-semibold">
-            Planned Assignments (
-            {assignments.filter(futureAssignmentFilter).length})
-          </h2>
+					<h2 className="text-2xl font-semibold">Planned Assignments ({assignments.filter(futureAssignmentFilter).length})</h2>
 					<div className="flex flex-wrap gap-2">
 						<div
 							onClick={() => setIsCreatingAssignment(true)}
-              className="w-[250px] h-[200px] flex flex-col gap-2 items-center justify-center bg-white hover:bg-mti-purple-ultralight text-mti-purple-light hover:text-mti-purple-dark border border-mti-gray-platinum hover:drop-shadow p-4 cursor-pointer rounded-xl transition ease-in-out duration-300"
-            >
+							className="w-[250px] h-[200px] flex flex-col gap-2 items-center justify-center bg-white hover:bg-mti-purple-ultralight text-mti-purple-light hover:text-mti-purple-dark border border-mti-gray-platinum hover:drop-shadow p-4 cursor-pointer rounded-xl transition ease-in-out duration-300">
 							<BsPlus className="text-6xl" />
 							<span className="text-lg">New Assignment</span>
 						</div>
@@ -786,9 +570,7 @@ export default function MasterCorporateDashboard({ user }: Props) {
 					</div>
 				</section>
 				<section className="flex flex-col gap-4">
-          <h2 className="text-2xl font-semibold">
-            Past Assignments ({assignments.filter(pastAssignmentFilter).length})
-          </h2>
+					<h2 className="text-2xl font-semibold">Past Assignments ({assignments.filter(pastAssignmentFilter).length})</h2>
 					<div className="flex flex-wrap gap-2">
 						{assignments.filter(pastAssignmentFilter).map((a) => (
 							<AssignmentCard
@@ -805,10 +587,7 @@ export default function MasterCorporateDashboard({ user }: Props) {
 					</div>
 				</section>
 				<section className="flex flex-col gap-4">
-          <h2 className="text-2xl font-semibold">
-            Archived Assignments (
-            {assignments.filter(archivedAssignmentFilter).length})
-          </h2>
+					<h2 className="text-2xl font-semibold">Archived Assignments ({assignments.filter(archivedAssignmentFilter).length})</h2>
 					<div className="flex flex-wrap gap-2">
 						{assignments.filter(archivedAssignmentFilter).map((a) => (
 							<AssignmentCard
@@ -835,7 +614,7 @@ export default function MasterCorporateDashboard({ user }: Props) {
 				if (user) return [...accm, user];
 				return accm;
 			}, []),
-    [masterCorporateUserGroups, users]
+		[masterCorporateUserGroups, users],
 	);

 	const MasterStatisticalPage = () => {
@@ -844,17 +623,13 @@ export default function MasterCorporateDashboard({ user }: Props) {
 				<div className="flex flex-col gap-4">
 					<div
 						onClick={() => setPage("")}
-            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-          >
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 						<BsArrowLeft className="text-xl" />
 						<span>Back</span>
 					</div>
 					<h2 className="text-2xl font-semibold">Master Statistical</h2>
 				</div>
-        <MasterStatistical
-          users={users}
-          corporateUsers={masterCorporateUsers}
-        />
+				<MasterStatistical users={users} corporateUsers={masterCorporateUsers} />
 			</>
 		);
 	};
@@ -879,11 +654,7 @@ export default function MasterCorporateDashboard({ user }: Props) {
 				<IconCard
 					Icon={BsClipboard2Data}
 					label="Exams Performed"
-          value={
-            stats.filter((s) =>
-              groups.flatMap((g) => g.participants).includes(s.user)
-            ).length
-          }
+					value={stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user)).length}
 					color="purple"
 				/>
 				<IconCard
@@ -891,35 +662,21 @@ export default function MasterCorporateDashboard({ user }: Props) {
 					label="Average Level"
 					value={averageLevelCalculator(
 						users,
-            stats.filter((s) =>
-              groups.flatMap((g) => g.participants).includes(s.user)
-            )
+						stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user)),
 					).toFixed(1)}
 					color="purple"
 				/>
-        <IconCard
-          onClick={() => setPage("groups")}
-          Icon={BsPeople}
-          label="Groups"
-          value={groups.length}
-          color="purple"
-        />
+				<IconCard onClick={() => setPage("groups")} Icon={BsPeople} label="Groups" value={groups.length} color="purple" />
 				<IconCard
 					Icon={BsPersonCheck}
 					label="User Balance"
-          value={`${balance}/${
-            user.corporateInformation?.companyInformation?.userAmount || 0
-          }`}
+					value={`${balance}/${user.corporateInformation?.companyInformation?.userAmount || 0}`}
 					color="purple"
 				/>
 				<IconCard
 					Icon={BsClock}
 					label="Expiration Date"
-          value={
-            user.subscriptionExpirationDate
-              ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy")
-              : "Unlimited"
-          }
+					value={user.subscriptionExpirationDate ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy") : "Unlimited"}
 					color="rose"
 				/>
 				<IconCard
@@ -946,15 +703,12 @@ export default function MasterCorporateDashboard({ user }: Props) {
 				<button
 					disabled={isAssignmentsLoading}
 					onClick={() => setPage("assignments")}
-          className="bg-white col-span-2 rounded-xl shadow p-4 flex flex-col gap-4 items-center w-96 h-52 justify-center cursor-pointer hover:shadow-xl transition ease-in-out duration-300"
-        >
+					className="bg-white col-span-2 rounded-xl shadow p-4 flex flex-col gap-4 items-center w-96 h-52 justify-center cursor-pointer hover:shadow-xl transition ease-in-out duration-300">
 					<BsEnvelopePaper className="text-6xl text-mti-purple-light" />
 					<span className="flex flex-col gap-1 items-center text-xl">
 						<span className="text-lg">Assignments</span>
 						<span className="font-semibold text-mti-purple-light">
-              {isAssignmentsLoading
-                ? "Loading..."
-                : assignments.filter((a) => !a.archived).length}
+							{isAssignmentsLoading ? "Loading..." : assignments.filter((a) => !a.archived).length}
 						</span>
 					</span>
 				</button>
@@ -988,11 +742,7 @@ export default function MasterCorporateDashboard({ user }: Props) {
 					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
 						{users
 							.filter(studentFilter)
-              .sort(
-                (a, b) =>
-                  calculateAverageLevel(b.levels) -
-                  calculateAverageLevel(a.levels)
-              )
+							.sort((a, b) => calculateAverageLevel(b.levels) - calculateAverageLevel(a.levels))
 							.map((x) => (
 								<UserDisplay key={x.id} {...x} />
 							))}
@@ -1005,8 +755,7 @@ export default function MasterCorporateDashboard({ user }: Props) {
 							.filter(studentFilter)
 							.sort(
 								(a, b) =>
-                  Object.keys(groupByExam(getStatsByStudent(b))).length -
-                  Object.keys(groupByExam(getStatsByStudent(a))).length
+									Object.keys(groupByExam(getStatsByStudent(b))).length - Object.keys(groupByExam(getStatsByStudent(a))).length,
 							)
 							.map((x) => (
 								<UserDisplay key={x.id} {...x} />
@@ -1026,8 +775,7 @@ export default function MasterCorporateDashboard({ user }: Props) {
 							<UserCard
 								maxUserAmount={
 									user.type === "mastercorporate"
-                    ? (user.corporateInformation?.companyInformation
-                        ?.userAmount || 0) - balance
+										? (user.corporateInformation?.companyInformation?.userAmount || 0) - balance
 										: undefined
 								}
 								loggedInUser={user}
@@ -1036,8 +784,7 @@ export default function MasterCorporateDashboard({ user }: Props) {
 									if (shouldReload) reload();
 								}}
 								onViewStudents={
-                  selectedUser.type === "corporate" ||
-                  selectedUser.type === "teacher"
+									selectedUser.type === "corporate" || selectedUser.type === "teacher"
 										? () => {
 												appendUserFilters({
 													id: "view-students",
@@ -1047,11 +794,7 @@ export default function MasterCorporateDashboard({ user }: Props) {
 													id: "belongs-to-admin",
 													filter: (x: User) =>
 														groups
-                              .filter(
-                                (g) =>
-                                  g.admin === selectedUser.id ||
-                                  g.participants.includes(selectedUser.id)
-                              )
+															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
 															.flatMap((g) => g.participants)
 															.includes(x.id),
 												});
@@ -1061,8 +804,7 @@ export default function MasterCorporateDashboard({ user }: Props) {
 										: undefined
 								}
 								onViewTeachers={
-                  selectedUser.type === "corporate" ||
-                  selectedUser.type === "student"
+									selectedUser.type === "corporate" || selectedUser.type === "student"
 										? () => {
 												appendUserFilters({
 													id: "view-teachers",
@@ -1072,11 +814,7 @@ export default function MasterCorporateDashboard({ user }: Props) {
 													id: "belongs-to-admin",
 													filter: (x: User) =>
 														groups
-                              .filter(
-                                (g) =>
-                                  g.admin === selectedUser.id ||
-                                  g.participants.includes(selectedUser.id)
-                              )
+															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
 															.flatMap((g) => g.participants)
 															.includes(x.id),
 												});
--- a/src/dashboards/Student.tsx
+++ b/src/dashboards/Student.tsx
@@ -9,7 +9,7 @@ import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
 import useUsers from "@/hooks/useUsers";
 import {Invite} from "@/interfaces/invite";
 import {Assignment} from "@/interfaces/results";
-import {CorporateUser, Stat, User} from "@/interfaces/user";
+import {CorporateUser, MasterCorporateUser, Stat, User} from "@/interfaces/user";
 import useExamStore from "@/stores/examStore";
 import {getExamById} from "@/utils/exams";
 import {getUserCorporate} from "@/utils/groups";
@@ -30,11 +30,10 @@ import {toast} from "react-toastify";

 interface Props {
 	user: User;
+	linkedCorporate?: CorporateUser | MasterCorporateUser;
 }

-export default function StudentDashboard({user}: Props) {
-	const [corporateUserToShow, setCorporateUserToShow] = useState<CorporateUser>();
-
+export default function StudentDashboard({user, linkedCorporate}: Props) {
 	const {users} = useUsers();
 	const {gradingSystem} = useGradingSystem();
 	const {data: stats} = useFilterRecordsByUser<Stat[]>(user.id, !user?.id);
@@ -49,10 +48,6 @@ export default function StudentDashboard({user}: Props) {
 	const setSelectedModules = useExamStore((state) => state.setSelectedModules);
 	const setAssignment = useExamStore((state) => state.setAssignment);

-	useEffect(() => {
-		getUserCorporate(user.id).then(setCorporateUserToShow);
-	}, [user]);
-
 	const startAssignment = (assignment: Assignment) => {
 		const examPromises = assignment.exams.filter((e) => e.assignee === user.id).map((e) => getExamById(e.module, e.id));

@@ -76,9 +71,9 @@ export default function StudentDashboard({user}: Props) {

 	return (
 		<>
-			{corporateUserToShow && (
+			{linkedCorporate && (
 				<div className="absolute right-4 top-4 rounded-lg bg-neutral-200 px-2 py-1">
-					Linked to: <b>{corporateUserToShow?.corporateInformation?.companyInformation.name || corporateUserToShow.name}</b>
+					Linked to: <b>{linkedCorporate?.corporateInformation?.companyInformation.name || linkedCorporate.name}</b>
 				</div>
 			)}
 			<ProfileSummary
--- a/src/dashboards/Teacher.tsx
+++ b/src/dashboards/Teacher.tsx
@@ -2,11 +2,11 @@
 import Modal from "@/components/Modal";
 import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
 import useUsers from "@/hooks/useUsers";
-import { CorporateUser, Group, Stat, User } from "@/interfaces/user";
+import {CorporateUser, Group, MasterCorporateUser, Stat, User} from "@/interfaces/user";
 import UserList from "@/pages/(admin)/Lists/UserList";
 import {dateSorter} from "@/utils";
 import moment from "moment";
-import { useEffect, useState } from "react";
+import {useEffect, useMemo, useState} from "react";
 import {
 	BsArrowLeft,
 	BsArrowRepeat,
@@ -48,61 +48,56 @@ import AssignmentView from "./AssignmentView";
 import {getUserCorporate} from "@/utils/groups";
 import {checkAccess} from "@/utils/permissions";
 import usePermissions from "@/hooks/usePermissions";
-import {
-	futureAssignmentFilter,
-	pastAssignmentFilter,
-	archivedAssignmentFilter,
-	activeAssignmentFilter
-} from '@/utils/assignments';
+import {futureAssignmentFilter, pastAssignmentFilter, archivedAssignmentFilter, activeAssignmentFilter} from "@/utils/assignments";

 interface Props {
 	user: User;
+	linkedCorporate?: CorporateUser | MasterCorporateUser;
 }

-export default function TeacherDashboard({ user }: Props) {
+export default function TeacherDashboard({user, linkedCorporate}: Props) {
 	const [page, setPage] = useState("");
 	const [selectedUser, setSelectedUser] = useState<User>();
 	const [showModal, setShowModal] = useState(false);
 	const [selectedAssignment, setSelectedAssignment] = useState<Assignment>();
 	const [isCreatingAssignment, setIsCreatingAssignment] = useState(false);
-  const [corporateUserToShow, setCorporateUserToShow] =
-    useState<CorporateUser>();

 	const {data: stats} = useFilterRecordsByUser<Stat[]>();
 	const {users, reload} = useUsers();
 	const {groups} = useGroups({adminAdmins: user.id});
 	const {permissions} = usePermissions(user.id);
-  const {
-    assignments,
-    isLoading: isAssignmentsLoading,
-    reload: reloadAssignments,
-  } = useAssignments({ assigner: user.id });
+	const {assignments, isLoading: isAssignmentsLoading, reload: reloadAssignments} = useAssignments({assigner: user.id});
+
+	const assignmentsGroups = useMemo(() => groups.filter((x) => x.admin === user.id || x.participants.includes(user.id)), [groups, user.id]);
+
+	const assignmentsUsers = useMemo(
+		() =>
+			users.filter(
+				(x) =>
+					x.type === "student" &&
+					(!!selectedUser
+						? groups
+								.filter((g) => g.admin === selectedUser.id)
+								.flatMap((g) => g.participants)
+								.includes(x.id)
+						: groups.flatMap((g) => g.participants).includes(x.id)),
+			),
+		[groups, users, selectedUser],
+	);

 	useEffect(() => {
 		setShowModal(!!selectedUser && page === "");
 	}, [selectedUser, page]);

-  useEffect(() => {
-    getUserCorporate(user.id).then(setCorporateUserToShow);
-  }, [user]);
+	const studentFilter = (user: User) => user.type === "student" && groups.flatMap((g) => g.participants).includes(user.id);

-  const studentFilter = (user: User) =>
-    user.type === "student" &&
-    groups.flatMap((g) => g.participants).includes(user.id);
-
-  const getStatsByStudent = (user: User) =>
-    stats.filter((s) => s.user === user.id);
+	const getStatsByStudent = (user: User) => stats.filter((s) => s.user === user.id);

 	const UserDisplay = (displayUser: User) => (
 		<div
 			onClick={() => setSelectedUser(displayUser)}
-      className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300"
-    >
-      <img
-        src={displayUser.profilePicture}
-        alt={displayUser.name}
-        className="rounded-full w-10 h-10"
-      />
+			className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300">
+			<img src={displayUser.profilePicture} alt={displayUser.name} className="rounded-full w-10 h-10" />
 			<div className="flex flex-col gap-1 items-start">
 				<span>{displayUser.name}</span>
 				<span className="text-sm opacity-75">{displayUser.email}</span>
@@ -128,8 +123,7 @@ export default function TeacherDashboard({ user }: Props) {
 					<div className="flex flex-col gap-4">
 						<div
 							onClick={() => setPage("")}
-              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-            >
+							className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 							<BsArrowLeft className="text-xl" />
 							<span>Back</span>
 						</div>
@@ -148,14 +142,11 @@ export default function TeacherDashboard({ user }: Props) {
 				<div className="flex flex-col gap-4">
 					<div
 						onClick={() => setPage("")}
-            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-          >
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 						<BsArrowLeft className="text-xl" />
 						<span>Back</span>
 					</div>
-          <h2 className="text-2xl font-semibold">
-            Groups ({groups.filter(filter).length})
-          </h2>
+					<h2 className="text-2xl font-semibold">Groups ({groups.filter(filter).length})</h2>
 				</div>

 				<GroupList user={user} />
@@ -173,12 +164,7 @@ export default function TeacherDashboard({ user }: Props) {
 			.filter((f) => !!f.focus);
 		const bandScores = formattedStats.map((s) => ({
 			module: s.module,
-      level: calculateBandScore(
-        s.score.correct,
-        s.score.total,
-        s.module,
-        s.focus!
-      ),
+			level: calculateBandScore(s.score.correct, s.score.total, s.module, s.focus!),
 		}));

 		const levels: {[key in Module]: number} = {
@@ -207,20 +193,8 @@ export default function TeacherDashboard({ user }: Props) {
 				/>
 				<AssignmentCreator
 					assignment={selectedAssignment}
-          groups={groups.filter(
-            (x) => x.admin === user.id || x.participants.includes(user.id)
-          )}
-          users={users.filter(
-            (x) =>
-              x.type === "student" &&
-              (!!selectedUser
-                ? groups
-                    .filter((g) => g.admin === selectedUser.id)
-                    .flatMap((g) => g.participants)
-                    .includes(x.id)
-                : groups.flatMap((g) => g.participants).includes(x.id))
-          )}
-          assigner={user.id}
+					groups={assignmentsGroups}
+					users={assignmentsUsers}
 					isCreating={isCreatingAssignment}
 					cancelCreation={() => {
 						setIsCreatingAssignment(false);
@@ -231,48 +205,31 @@ export default function TeacherDashboard({ user }: Props) {
 				<div className="w-full flex justify-between items-center">
 					<div
 						onClick={() => setPage("")}
-            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-          >
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 						<BsArrowLeft className="text-xl" />
 						<span>Back</span>
 					</div>
 					<div
 						onClick={reloadAssignments}
-            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-          >
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
 						<span>Reload</span>
-            <BsArrowRepeat
-              className={clsx(
-                "text-xl",
-                isAssignmentsLoading && "animate-spin"
-              )}
-            />
+						<BsArrowRepeat className={clsx("text-xl", isAssignmentsLoading && "animate-spin")} />
 					</div>
 				</div>
 				<section className="flex flex-col gap-4">
-          <h2 className="text-2xl font-semibold">
-            Active Assignments ({assignments.filter(activeAssignmentFilter).length})
-          </h2>
+					<h2 className="text-2xl font-semibold">Active Assignments ({assignments.filter(activeAssignmentFilter).length})</h2>
 					<div className="flex flex-wrap gap-2">
 						{assignments.filter(activeAssignmentFilter).map((a) => (
-              <AssignmentCard
-                {...a}
-                users={users}
-                onClick={() => setSelectedAssignment(a)}
-                key={a.id}
-              />
+							<AssignmentCard {...a} users={users} onClick={() => setSelectedAssignment(a)} key={a.id} />
 						))}
 					</div>
 				</section>
 				<section className="flex flex-col gap-4">
-          <h2 className="text-2xl font-semibold">
-            Planned Assignments ({assignments.filter(futureAssignmentFilter).length})
-          </h2>
+					<h2 className="text-2xl font-semibold">Planned Assignments ({assignments.filter(futureAssignmentFilter).length})</h2>
 					<div className="flex flex-wrap gap-2">
 						<div
 							onClick={() => setIsCreatingAssignment(true)}
-              className="w-[250px] h-[200px] flex flex-col gap-2 items-center justify-center bg-white hover:bg-mti-purple-ultralight text-mti-purple-light hover:text-mti-purple-dark border border-mti-gray-platinum hover:drop-shadow p-4 cursor-pointer rounded-xl transition ease-in-out duration-300"
-            >
+							className="w-[250px] h-[200px] flex flex-col gap-2 items-center justify-center bg-white hover:bg-mti-purple-ultralight text-mti-purple-light hover:text-mti-purple-dark border border-mti-gray-platinum hover:drop-shadow p-4 cursor-pointer rounded-xl transition ease-in-out duration-300">
 							<BsPlus className="text-6xl" />
 							<span className="text-lg">New Assignment</span>
 						</div>
@@ -290,9 +247,7 @@ export default function TeacherDashboard({ user }: Props) {
 					</div>
 				</section>
 				<section className="flex flex-col gap-4">
-          <h2 className="text-2xl font-semibold">
-            Past Assignments ({assignments.filter(pastAssignmentFilter).length})
-          </h2>
+					<h2 className="text-2xl font-semibold">Past Assignments ({assignments.filter(pastAssignmentFilter).length})</h2>
 					<div className="flex flex-wrap gap-2">
 						{assignments.filter(pastAssignmentFilter).map((a) => (
 							<AssignmentCard
@@ -309,9 +264,7 @@ export default function TeacherDashboard({ user }: Props) {
 					</div>
 				</section>
 				<section className="flex flex-col gap-4">
-          <h2 className="text-2xl font-semibold">
-            Archived Assignments ({assignments.filter(archivedAssignmentFilter).length})
-          </h2>
+					<h2 className="text-2xl font-semibold">Archived Assignments ({assignments.filter(archivedAssignmentFilter).length})</h2>
 					<div className="flex flex-wrap gap-2">
 						{assignments.filter(archivedAssignmentFilter).map((a) => (
 							<AssignmentCard
@@ -333,21 +286,16 @@ export default function TeacherDashboard({ user }: Props) {

 	const DefaultDashboard = () => (
 		<>
-      {corporateUserToShow && (
+			{linkedCorporate && (
 				<div className="absolute top-4 right-4 bg-neutral-200 px-2 rounded-lg py-1">
-          Linked to:{" "}
-          <b>
-            {corporateUserToShow?.corporateInformation?.companyInformation
-              .name || corporateUserToShow.name}
-          </b>
+					Linked to: <b>{linkedCorporate?.corporateInformation?.companyInformation.name || linkedCorporate.name}</b>
 				</div>
 			)}
 			<section
 				className={clsx(
 					"flex -lg:flex-wrap gap-4 items-center -lg:justify-center lg:justify-start text-center",
-          !!corporateUserToShow && "mt-12 xl:mt-6"
-        )}
-      >
+					!!linkedCorporate && "mt-12 xl:mt-6",
+				)}>
 				<IconCard
 					onClick={() => setPage("students")}
 					Icon={BsPersonFill}
@@ -358,29 +306,16 @@ export default function TeacherDashboard({ user }: Props) {
 				<IconCard
 					Icon={BsClipboard2Data}
 					label="Exams Performed"
-          value={
-            stats.filter((s) =>
-              groups.flatMap((g) => g.participants).includes(s.user)
-            ).length
-          }
+					value={stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user)).length}
 					color="purple"
 				/>
 				<IconCard
 					Icon={BsPaperclip}
 					label="Average Level"
-          value={averageLevelCalculator(
-            stats.filter((s) =>
-              groups.flatMap((g) => g.participants).includes(s.user)
-            )
-          ).toFixed(1)}
+					value={averageLevelCalculator(stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user))).toFixed(1)}
 					color="purple"
 				/>
-        {checkAccess(
-          user,
-          ["teacher", "developer"],
-          permissions,
-          "viewGroup"
-        ) && (
+				{checkAccess(user, ["teacher", "developer"], permissions, "viewGroup") && (
 					<IconCard
 						Icon={BsPeople}
 						label="Groups"
@@ -391,14 +326,11 @@ export default function TeacherDashboard({ user }: Props) {
 				)}
 				<div
 					onClick={() => setPage("assignments")}
-          className="bg-white rounded-xl shadow p-4 flex flex-col gap-4 items-center w-96 h-52 justify-center cursor-pointer hover:shadow-xl transition ease-in-out duration-300"
-        >
+					className="bg-white rounded-xl shadow p-4 flex flex-col gap-4 items-center w-96 h-52 justify-center cursor-pointer hover:shadow-xl transition ease-in-out duration-300">
 					<BsEnvelopePaper className="text-6xl text-mti-purple-light" />
 					<span className="flex flex-col gap-1 items-center text-xl">
 						<span className="text-lg">Assignments</span>
-            <span className="font-semibold text-mti-purple-light">
-              {assignments.filter((a) => !a.archived).length}
-            </span>
+						<span className="font-semibold text-mti-purple-light">{assignments.filter((a) => !a.archived).length}</span>
 					</span>
 				</div>
 			</section>
@@ -420,11 +352,7 @@ export default function TeacherDashboard({ user }: Props) {
 					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
 						{users
 							.filter(studentFilter)
-              .sort(
-                (a, b) =>
-                  calculateAverageLevel(b.levels) -
-                  calculateAverageLevel(a.levels)
-              )
+							.sort((a, b) => calculateAverageLevel(b.levels) - calculateAverageLevel(a.levels))
 							.map((x) => (
 								<UserDisplay key={x.id} {...x} />
 							))}
@@ -437,8 +365,7 @@ export default function TeacherDashboard({ user }: Props) {
 							.filter(studentFilter)
 							.sort(
 								(a, b) =>
-                  Object.keys(groupByExam(getStatsByStudent(b))).length -
-                  Object.keys(groupByExam(getStatsByStudent(a))).length
+									Object.keys(groupByExam(getStatsByStudent(b))).length - Object.keys(groupByExam(getStatsByStudent(a))).length,
 							)
 							.map((x) => (
 								<UserDisplay key={x.id} {...x} />
@@ -462,16 +389,9 @@ export default function TeacherDashboard({ user }: Props) {
 									if (shouldReload) reload();
 								}}
 								onViewStudents={
-                  selectedUser.type === "corporate" ||
-                  selectedUser.type === "teacher"
-                    ? () => setPage("students")
-                    : undefined
-                }
-                onViewTeachers={
-                  selectedUser.type === "corporate"
-                    ? () => setPage("teachers")
-                    : undefined
+									selectedUser.type === "corporate" || selectedUser.type === "teacher" ? () => setPage("students") : undefined
 								}
+								onViewTeachers={selectedUser.type === "corporate" ? () => setPage("teachers") : undefined}
 								user={selectedUser}
 							/>
 						</div>
--- a/src/pages/(admin)/BatchCodeGenerator.tsx
+++ b/src/pages/(admin)/BatchCodeGenerator.tsx
@@ -55,7 +55,14 @@ const USER_TYPE_PERMISSIONS: {
 	},
 };

-export default function BatchCodeGenerator({user, onFinish}: {user: User; onFinish: () => void}) {
+interface Props {
+	user: User;
+	users: User[];
+	permissions: PermissionType[];
+	onFinish: () => void;
+}
+
+export default function BatchCodeGenerator({user, users, permissions, onFinish}: Props) {
 	const [infos, setInfos] = useState<{email: string; name: string; passport_id: string}[]>([]);
 	const [isLoading, setIsLoading] = useState(false);
 	const [expiryDate, setExpiryDate] = useState<Date | null>(
@@ -65,9 +72,6 @@ export default function BatchCodeGenerator({user, onFinish}: {user: User; onFini
 	const [type, setType] = useState<Type>("student");
 	const [showHelp, setShowHelp] = useState(false);

-	const {users} = useUsers();
-	const {permissions} = usePermissions(user?.id || "");
-
 	const {openFilePicker, filesContent, clear} = useFilePicker({
 		accept: ".xlsx",
 		multiple: false,
--- a/src/pages/(admin)/BatchCreateUser.tsx
+++ b/src/pages/(admin)/BatchCreateUser.tsx
@@ -61,7 +61,14 @@ const USER_TYPE_PERMISSIONS: {
 	},
 };

-export default function BatchCreateUser({user, onFinish}: {user: User; onFinish: () => void}) {
+interface Props {
+	user: User;
+	users: User[];
+	permissions: PermissionType[];
+	onFinish: () => void;
+}
+
+export default function BatchCreateUser({user, users, permissions, onFinish}: Props) {
 	const [infos, setInfos] = useState<
 		{
 			email: string;
@@ -83,9 +90,6 @@ export default function BatchCreateUser({user, onFinish}: {user: User; onFinish:
 	const [type, setType] = useState<Type>("student");
 	const [showHelp, setShowHelp] = useState(false);

-	const {users} = useUsers();
-	const {permissions} = usePermissions(user?.id || "");
-
 	const {openFilePicker, filesContent, clear} = useFilePicker({
 		accept: ".xlsx",
 		multiple: false,
--- a/src/pages/(admin)/CodeGenerator.tsx
+++ b/src/pages/(admin)/CodeGenerator.tsx
@@ -48,14 +48,19 @@ const USER_TYPE_PERMISSIONS: {
 	},
 };

-export default function CodeGenerator({user, onFinish}: {user: User; onFinish: () => void}) {
+interface Props {
+	user: User;
+	permissions: PermissionType[];
+	onFinish: () => void;
+}
+
+export default function CodeGenerator({user, permissions, onFinish}: Props) {
 	const [generatedCode, setGeneratedCode] = useState<string>();
 	const [expiryDate, setExpiryDate] = useState<Date | null>(
 		user?.subscriptionExpirationDate ? moment(user.subscriptionExpirationDate).toDate() : null,
 	);
 	const [isExpiryDateEnabled, setIsExpiryDateEnabled] = useState(true);
 	const [type, setType] = useState<Type>("student");
-	const {permissions} = usePermissions(user?.id || "");

 	useEffect(() => {
 		if (!isExpiryDateEnabled) setExpiryDate(null);
--- a/src/pages/(admin)/Lists/GroupList.tsx
+++ b/src/pages/(admin)/Lists/GroupList.tsx
@@ -7,7 +7,7 @@ import {CorporateUser, Group, User} from "@/interfaces/user";
 import {createColumnHelper, flexRender, getCoreRowModel, useReactTable} from "@tanstack/react-table";
 import axios from "axios";
 import {capitalize, uniq} from "lodash";
-import {useEffect, useState} from "react";
+import {useEffect, useMemo, useState} from "react";
 import {BsPencil, BsQuestionCircleFill, BsTrash} from "react-icons/bs";
 import Select from "react-select";
 import {toast} from "react-toastify";
@@ -65,6 +65,14 @@ const CreatePanel = ({user, users, group, onClose}: CreateDialogProps) => {
 		readAs: "ArrayBuffer",
 	});

+	const availableUsers = useMemo(() => {
+		if (user.type === "teacher") return users.filter((x) => ["student"].includes(x.type));
+		if (user.type === "corporate") return users.filter((x) => ["teacher", "student"].includes(x.type));
+		if (user.type === "mastercorporate") return users.filter((x) => ["corporate", "teacher", "student"].includes(x.type));
+
+		return users;
+	}, [user, users]);
+
 	useEffect(() => {
 		if (filesContent.length > 0) {
 			setIsLoading(true);
@@ -155,15 +163,7 @@ const CreatePanel = ({user, users, group, onClose}: CreateDialogProps) => {
 								value: x,
 								label: `${users.find((y) => y.id === x)?.email} - ${users.find((y) => y.id === x)?.name}`,
 							}))}
-							options={users
-								.filter((x) =>
-									user.type === "teacher"
-										? x.type === "student"
-										: user.type === "corporate"
-										? x.type === "student" || x.type === "teacher"
-										: x.type === "student" || x.type === "teacher" || x.type === "corporate",
-								)
-								.map((x) => ({value: x.id, label: `${x.email} - ${x.name}`}))}
+							options={availableUsers.map((x) => ({value: x.id, label: `${x.email} - ${x.name}`}))}
 							onChange={(value) => setParticipants(value.map((x) => x.value))}
 							isMulti
 							isSearchable
--- a/src/pages/(admin)/Lists/index.tsx
+++ b/src/pages/(admin)/Lists/index.tsx
@@ -9,10 +9,15 @@ import PackageList from "./PackageList";
 import UserList from "./UserList";
 import {checkAccess} from "@/utils/permissions";
 import usePermissions from "@/hooks/usePermissions";
+import {PermissionType} from "@/interfaces/permissions";

-export default function Lists({user}: {user: User}) {
-	const {permissions} = usePermissions(user?.id || "");
+interface Props {
+	user: User;
+	users: User[];
+	permissions: PermissionType[];
+}

+export default function Lists({user, users, permissions}: Props) {
 	return (
 		<TabGroup>
 			<TabList className="flex space-x-1 rounded-xl bg-mti-purple-ultralight/40 p-1">
--- a/src/pages/(admin)/UserCreator.tsx
+++ b/src/pages/(admin)/UserCreator.tsx
@@ -54,7 +54,14 @@ const USER_TYPE_PERMISSIONS: {
 	},
 };

-export default function UserCreator({user, onFinish}: {user: User; onFinish: () => void}) {
+interface Props {
+	user: User;
+	users: User[];
+	permissions: PermissionType[];
+	onFinish: () => void;
+}
+
+export default function UserCreator({user, users, permissions, onFinish}: Props) {
 	const [name, setName] = useState<string>();
 	const [email, setEmail] = useState<string>();
 	const [phone, setPhone] = useState<string>();
@@ -72,10 +79,9 @@ export default function UserCreator({user, onFinish}: {user: User; onFinish: ()
 	const [isExpiryDateEnabled, setIsExpiryDateEnabled] = useState(true);
 	const [isLoading, setIsLoading] = useState(false);
 	const [type, setType] = useState<Type>("student");
+	const [position, setPosition] = useState<string>();

-	const {permissions} = usePermissions(user?.id || "");
 	const {groups} = useGroups({admin: ["developer", "admin"].includes(user?.type) ? undefined : user?.id, userType: user?.type});
-	const {users} = useUsers();

 	useEffect(() => {
 		if (!isExpiryDateEnabled) setExpiryDate(null);
@@ -104,6 +110,7 @@ export default function UserCreator({user, onFinish}: {user: User; onFinish: ()
 			email,
 			password,
 			groupID: group,
+			corporate: selectedCorporate || user.id,
 			type,
 			studentID: type === "student" ? studentID : undefined,
 			expiryDate,
@@ -111,6 +118,7 @@ export default function UserCreator({user, onFinish}: {user: User; onFinish: ()
 				passport_id: type === "student" ? passportID : undefined,
 				phone,
 				country,
+				position,
 			},
 		};

@@ -131,6 +139,7 @@ export default function UserCreator({user, onFinish}: {user: User; onFinish: ()
 				setExpiryDate(user?.subscriptionExpirationDate ? moment(user?.subscriptionExpirationDate).toDate() : null);
 				setIsExpiryDateEnabled(true);
 				setType("student");
+				setPosition(undefined);
 			})
 			.catch(() => toast.error("Something went wrong! Please try again later!"))
 			.finally(() => setIsLoading(false));
@@ -186,10 +195,16 @@ export default function UserCreator({user, onFinish}: {user: User; onFinish: ()
 					</div>
 				)}

+				{["corporate", "mastercorporate"].includes(type) && (
+					<Input type="text" name="department" label="Department" onChange={setPosition} value={position} placeholder="Department" />
+				)}
+
 				<div
 					className={clsx(
 						"flex flex-col gap-4",
-						(!["student", "teacher"].includes(type) || ["corporate", "teacher"].includes(user?.type)) && "col-span-2",
+						(!["student", "teacher"].includes(type) || ["corporate", "teacher"].includes(user?.type)) &&
+							!["corporate", "mastercorporate"].includes(type) &&
+							"col-span-2",
 					)}>
 					<label className="font-normal text-base text-mti-gray-dim">Group</label>
 					<Select
--- a/src/pages/(exam)/ExamPage.tsx
+++ b/src/pages/(exam)/ExamPage.tsx
@@ -13,7 +13,7 @@ import Speaking from "@/exams/Speaking";
 import Writing from "@/exams/Writing";
 import useUser from "@/hooks/useUser";
 import {Exam, LevelExam, UserSolution, Variant} from "@/interfaces/exam";
-import {Stat} from "@/interfaces/user";
+import {Stat, User} from "@/interfaces/user";
 import useExamStore from "@/stores/examStore";
 import {evaluateSpeakingAnswer, evaluateWritingAnswer} from "@/utils/evaluation";
 import {defaultExamUserSolutions, getExam} from "@/utils/exams";
@@ -28,9 +28,10 @@ import useGradingSystem from "@/hooks/useGrading";

 interface Props {
 	page: "exams" | "exercises";
+	user: User;
 }

-export default function ExamPage({page}: Props) {
+export default function ExamPage({page, user}: Props) {
 	const [variant, setVariant] = useState<Variant>("full");
 	const [avoidRepeated, setAvoidRepeated] = useState(false);
 	const [hasBeenUploaded, setHasBeenUploaded] = useState(false);
@@ -59,7 +60,6 @@ export default function ExamPage({page}: Props) {
 	const {bgColor, setBgColor} = useExamStore((state) => state);
 	const setShuffleMaps = useExamStore((state) => state.setShuffles);

-	const {user} = useUser({redirectTo: "/login"});
 	const router = useRouter();

 	// eslint-disable-next-line react-hooks/exhaustive-deps
--- a/src/pages/api/make_user.ts
+++ b/src/pages/api/make_user.ts
@@ -67,6 +67,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 				focus: "academic",
 				status: "active",
 				desiredLevels: DEFAULT_DESIRED_LEVELS,
+				profilePicture: "/defaultAvatar.png",
 				levels: DEFAULT_LEVELS,
 				isFirstLogin: false,
 				isVerified: true,
--- a/src/pages/api/register.ts
+++ b/src/pages/api/register.ts
@@ -75,6 +75,7 @@ async function registerIndividual(req: NextApiRequest, res: NextApiResponse) {
 				levels: DEFAULT_LEVELS,
 				bio: "",
 				isFirstLogin: codeData ? codeData.type === "student" : true,
+				profilePicture: "/defaultAvatar.png",
 				focus: "academic",
 				type: email.endsWith("@ecrop.dev") ? "developer" : codeData ? codeData.type : "student",
 				subscriptionExpirationDate: codeData ? codeData.expiryDate : moment().subtract(1, "days").toISOString(),
--- a/src/pages/exam.tsx
+++ b/src/pages/exam.tsx
@@ -5,6 +5,7 @@ import {sessionOptions} from "@/lib/session";
 import {shouldRedirectHome} from "@/utils/navigation.disabled";
 import ExamPage from "./(exam)/ExamPage";
 import Head from "next/head";
+import {User} from "@/interfaces/user";

 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
@@ -14,7 +15,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 			redirect: {
 				destination: "/login",
 				permanent: false,
-			}
+			},
 		};
 	}

@@ -23,7 +24,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 			redirect: {
 				destination: "/",
 				permanent: false,
-			}
+			},
 		};
 	}

@@ -32,7 +33,11 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	};
 }, sessionOptions);

-export default function Page() {
+interface Props {
+	user: User;
+}
+
+export default function Page({user}: Props) {
 	return (
 		<>
 			<Head>
@@ -44,7 +49,7 @@ export default function Page() {
 				<meta name="viewport" content="width=device-width, initial-scale=1" />
 				<link rel="icon" href="/favicon.ico" />
 			</Head>
-			<ExamPage page="exams" />
+			<ExamPage page="exams" user={user} />
 		</>
 	);
 }
--- a/src/pages/exercises.tsx
+++ b/src/pages/exercises.tsx
@@ -5,6 +5,7 @@ import {sessionOptions} from "@/lib/session";
 import {shouldRedirectHome} from "@/utils/navigation.disabled";
 import ExamPage from "./(exam)/ExamPage";
 import Head from "next/head";
+import {User} from "@/interfaces/user";

 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
@@ -14,7 +15,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 			redirect: {
 				destination: "/login",
 				permanent: false,
-			}
+			},
 		};
 	}

@@ -23,7 +24,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 			redirect: {
 				destination: "/",
 				permanent: false,
-			}
+			},
 		};
 	}

@@ -32,7 +33,11 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	};
 }, sessionOptions);

-export default function Page() {
+interface Props {
+	user: User;
+}
+
+export default function Page({user}: Props) {
 	return (
 		<>
 			<Head>
@@ -44,7 +49,7 @@ export default function Page() {
 				<meta name="viewport" content="width=device-width, initial-scale=1" />
 				<link rel="icon" href="/favicon.ico" />
 			</Head>
-			<ExamPage page="exercises" />
+			<ExamPage page="exercises" user={user} />
 		</>
 	);
 }
--- a/src/pages/generation.tsx
+++ b/src/pages/generation.tsx
@@ -22,6 +22,7 @@ import WritingGeneration from "./(generation)/WritingGeneration";
 import LevelGeneration from "./(generation)/LevelGeneration";
 import SpeakingGeneration from "./(generation)/SpeakingGeneration";
 import {checkAccess} from "@/utils/permissions";
+import {User} from "@/interfaces/user";

 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
@@ -49,10 +50,12 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	};
 }, sessionOptions);

-export default function Generation() {
-	const [module, setModule] = useState<Module>("reading");
+interface Props {
+	user: User;
+}

-	const {user} = useUser({redirectTo: "/login"});
+export default function Generation({user}: Props) {
+	const [module, setModule] = useState<Module>("reading");

 	const [title, setTitle] = useState<string>("");
 	return (
--- a/src/pages/groups.tsx
+++ b/src/pages/groups.tsx
@@ -29,7 +29,7 @@ import MasterCorporateDashboard from "@/dashboards/MasterCorporate";
 import PaymentDue from "./(status)/PaymentDue";
 import {useRouter} from "next/router";
 import {PayPalScriptProvider} from "@paypal/react-paypal-js";
-import {CorporateUser, MasterCorporateUser, Type, User, userTypes} from "@/interfaces/user";
+import {CorporateUser, Group, MasterCorporateUser, Type, User, userTypes} from "@/interfaces/user";
 import Select from "react-select";
 import {USER_TYPE_LABELS} from "@/resources/user";
 import {checkAccess, getTypesOfUser} from "@/utils/permissions";
@@ -37,8 +37,10 @@ import {shouldRedirectHome} from "@/utils/navigation.disabled";
 import useGroups from "@/hooks/useGroups";
 import useUsers from "@/hooks/useUsers";
 import {getUserName} from "@/utils/users";
+import {getParticipantGroups, getUserGroups} from "@/utils/groups.be";
+import {getUsers} from "@/utils/users.be";

-export const getServerSideProps = withIronSessionSsr(({req, res}) => {
+export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 	const user = req.session.user;

 	if (!user || !user.isVerified) {
@@ -59,26 +61,20 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 		};
 	}

+	const groups = await getParticipantGroups(user.id);
+	const users = await getUsers();
+
 	return {
-		props: {user: req.session.user},
+		props: {user, groups, users},
 	};
 }, sessionOptions);

 interface Props {
 	user: User;
-	envVariables: {[key: string]: string};
+	groups: Group[];
+	users: User[];
 }
-export default function Home(props: Props) {
-	const {user, mutateUser} = useUser({redirectTo: "/login"});
-	const {groups} = useGroups({});
-	const {users} = useUsers();
-
-	const router = useRouter();
-
-	useEffect(() => {
-		console.log(groups);
-	}, [groups]);
-
+export default function Home({user, groups, users}: Props) {
 	return (
 		<>
 			<Head>
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -1,15 +1,7 @@
 /* eslint-disable @next/next/no-img-element */
 import Head from "next/head";
 import Navbar from "@/components/Navbar";
-import {
-  BsFileEarmarkText,
-  BsPencil,
-  BsStar,
-  BsBook,
-  BsHeadphones,
-  BsPen,
-  BsMegaphone,
-} from "react-icons/bs";
+import {BsFileEarmarkText, BsPencil, BsStar, BsBook, BsHeadphones, BsPen, BsMegaphone} from "react-icons/bs";
 import {withIronSessionSsr} from "iron-session/next";
 import {sessionOptions} from "@/lib/session";
 import {useEffect, useState} from "react";
@@ -37,17 +29,13 @@ import MasterCorporateDashboard from "@/dashboards/MasterCorporate";
 import PaymentDue from "./(status)/PaymentDue";
 import {useRouter} from "next/router";
 import {PayPalScriptProvider} from "@paypal/react-paypal-js";
-import {
-  CorporateUser,
-  MasterCorporateUser,
-  Type,
-  userTypes,
-} from "@/interfaces/user";
+import {CorporateUser, MasterCorporateUser, Type, userTypes} from "@/interfaces/user";
 import Select from "react-select";
 import {USER_TYPE_LABELS} from "@/resources/user";
 import {checkAccess, getTypesOfUser} from "@/utils/permissions";
+import {getUserCorporate} from "@/utils/groups.be";

-export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
+export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 	const user = req.session.user;

 	const envVariables: {[key: string]: string} = {};
@@ -66,17 +54,20 @@ export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
 		};
 	}

+	const linkedCorporate = (await getUserCorporate(user.id)) || null;
+
 	return {
-    props: { user: req.session.user, envVariables },
+		props: {user, envVariables, linkedCorporate},
 	};
 }, sessionOptions);

 interface Props {
 	user: any;
 	envVariables: {[key: string]: string};
+	linkedCorporate?: CorporateUser | MasterCorporateUser;
 }
-export default function Home(props: Props) {
-  const { envVariables } = props;
+
+export default function Home({linkedCorporate}: Props) {
 	const [showDiagnostics, setShowDiagnostics] = useState(false);
 	const [showDemographicInput, setShowDemographicInput] = useState(false);
 	const [selectedScreen, setSelectedScreen] = useState<Type>("admin");
@@ -90,7 +81,7 @@ export default function Home(props: Props) {
 				!user.demographicInformation ||
 					!user.demographicInformation.country ||
 					!user.demographicInformation.gender ||
-          !user.demographicInformation.phone
+					!user.demographicInformation.phone,
 			);
 			setShowDiagnostics(user.isFirstLogin && user.type === "student");
 		}
@@ -105,12 +96,7 @@ export default function Home(props: Props) {
 		return true;
 	};

-  if (
-    user &&
-    (user.status === "paymentDue" ||
-      user.status === "disabled" ||
-      checkIfUserExpired())
-  ) {
+	if (user && (user.status === "paymentDue" || user.status === "disabled" || checkIfUserExpired())) {
 		return (
 			<>
 				<Head>
@@ -125,19 +111,12 @@ export default function Home(props: Props) {
 				{user.status === "disabled" && (
 					<Layout user={user} navDisabled>
 						<div className="flex flex-col items-center justify-center text-center w-full gap-4">
-              <span className="font-bold text-lg">
-                Your account has been disabled!
-              </span>
-              <span>
-                Please contact an administrator if you believe this to be a
-                mistake.
-              </span>
+							<span className="font-bold text-lg">Your account has been disabled!</span>
+							<span>Please contact an administrator if you believe this to be a mistake.</span>
 						</div>
 					</Layout>
 				)}
-        {(user.status === "paymentDue" || checkIfUserExpired()) && (
-          <PaymentDue hasExpired user={user} reload={router.reload} />
-        )}
+				{(user.status === "paymentDue" || checkIfUserExpired()) && <PaymentDue hasExpired user={user} reload={router.reload} />}
 			</>
 		);
 	}
@@ -194,14 +173,10 @@ export default function Home(props: Props) {
 			<ToastContainer />
 			{user && (
 				<Layout user={user}>
-          {checkAccess(user, ["student"]) && <StudentDashboard user={user} />}
-          {checkAccess(user, ["teacher"]) && <TeacherDashboard user={user} />}
-          {checkAccess(user, ["corporate"]) && (
-            <CorporateDashboard user={user as CorporateUser} />
-          )}
-          {checkAccess(user, ["mastercorporate"]) && (
-            <MasterCorporateDashboard user={user as MasterCorporateUser} />
-          )}
+					{checkAccess(user, ["student"]) && <StudentDashboard linkedCorporate={linkedCorporate} user={user} />}
+					{checkAccess(user, ["teacher"]) && <TeacherDashboard linkedCorporate={linkedCorporate} user={user} />}
+					{checkAccess(user, ["corporate"]) && <CorporateDashboard linkedCorporate={linkedCorporate} user={user as CorporateUser} />}
+					{checkAccess(user, ["mastercorporate"]) && <MasterCorporateDashboard user={user as MasterCorporateUser} />}
 					{checkAccess(user, ["agent"]) && <AgentDashboard user={user} />}
 					{checkAccess(user, ["admin"]) && <AdminDashboard user={user} />}
 					{checkAccess(user, ["developer"]) && (
@@ -215,23 +190,15 @@ export default function Home(props: Props) {
 									value: selectedScreen,
 									label: USER_TYPE_LABELS[selectedScreen],
 								}}
-                onChange={(value) =>
-                  value
-                    ? setSelectedScreen(value.value)
-                    : setSelectedScreen("admin")
-                }
+								onChange={(value) => (value ? setSelectedScreen(value.value) : setSelectedScreen("admin"))}
 							/>

-              {selectedScreen === "student" && <StudentDashboard user={user} />}
-              {selectedScreen === "teacher" && <TeacherDashboard user={user} />}
+							{selectedScreen === "student" && <StudentDashboard linkedCorporate={linkedCorporate} user={user} />}
+							{selectedScreen === "teacher" && <TeacherDashboard linkedCorporate={linkedCorporate} user={user} />}
 							{selectedScreen === "corporate" && (
-                <CorporateDashboard user={user as unknown as CorporateUser} />
-              )}
-              {selectedScreen === "mastercorporate" && (
-                <MasterCorporateDashboard
-                  user={user as unknown as MasterCorporateUser}
-                />
+								<CorporateDashboard linkedCorporate={linkedCorporate} user={user as unknown as CorporateUser} />
 							)}
+							{selectedScreen === "mastercorporate" && <MasterCorporateDashboard user={user as unknown as MasterCorporateUser} />}
 							{selectedScreen === "agent" && <AgentDashboard user={user} />}
 							{selectedScreen === "admin" && <AdminDashboard user={user} />}
 						</>
--- a/src/pages/profile.tsx
+++ b/src/pages/profile.tsx
@@ -12,7 +12,16 @@ import Link from "next/link";
 import axios from "axios";
 import {ErrorMessage} from "@/constants/errors";
 import clsx from "clsx";
-import {CorporateUser, EmploymentStatus, EMPLOYMENT_STATUS, Gender, User, DemographicInformation} from "@/interfaces/user";
+import {
+	CorporateUser,
+	EmploymentStatus,
+	EMPLOYMENT_STATUS,
+	Gender,
+	User,
+	DemographicInformation,
+	MasterCorporateUser,
+	Group,
+} from "@/interfaces/user";
 import CountrySelect from "@/components/Low/CountrySelect";
 import {shouldRedirectHome} from "@/utils/navigation.disabled";
 import moment from "moment";
@@ -34,8 +43,11 @@ import {capitalize} from "lodash";
 import TopicModal from "@/components/Medium/TopicModal";
 import {v4} from "uuid";
 import {checkAccess, getTypesOfUser} from "@/utils/permissions";
+import {getParticipantGroups, getUserCorporate} from "@/utils/groups.be";
+import {InferGetServerSidePropsType} from "next";
+import {getUsers} from "@/utils/users.be";

-export const getServerSideProps = withIronSessionSsr(({req, res}) => {
+export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 	const user = req.session.user;

 	if (!user || !user.isVerified) {
@@ -57,18 +69,26 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	}

 	return {
-		props: {user: req.session.user},
+		props: {
+			user,
+			linkedCorporate: (await getUserCorporate(user.id)) || null,
+			groups: await getParticipantGroups(user.id),
+			users: await getUsers(),
+		},
 	};
 }, sessionOptions);

 interface Props {
 	user: User;
+	groups: Group[];
+	users: User[];
 	mutateUser: Function;
+	linkedCorporate?: CorporateUser | MasterCorporateUser;
 }

 const DoubleColumnRow = ({children}: {children: ReactNode}) => <div className="flex flex-col lg:flex-row gap-8 w-full">{children}</div>;

-function UserProfile({user, mutateUser}: Props) {
+function UserProfile({user, mutateUser, linkedCorporate, groups, users}: Props) {
 	const [bio, setBio] = useState(user.bio || "");
 	const [name, setName] = useState(user.name || "");
 	const [email, setEmail] = useState(user.email || "");
@@ -111,9 +131,6 @@ function UserProfile({user, mutateUser}: Props) {

 	const [isPreferredTopicsOpen, setIsPreferredTopicsOpen] = useState(false);

-	const {groups} = useGroups({});
-	const {users} = useUsers();
-
 	const profilePictureInput = useRef(null);
 	const expirationDateColor = (date: Date) => {
 		const momentDate = moment(date);
@@ -245,7 +262,7 @@ function UserProfile({user, mutateUser}: Props) {
 						<h1 className="text-4xl font-bold mb-6 -md:hidden">Edit Profile</h1>
 						<form className="flex flex-col items-center gap-6 w-full" onSubmit={(e) => e.preventDefault()}>
 							<DoubleColumnRow>
-								{user.type !== "corporate" ? (
+								{user.type !== "corporate" && user.type !== "mastercorporate" ? (
 									<Input
 										label={user.type === "agent" ? "English name" : "Name"}
 										type="text"
@@ -260,6 +277,7 @@ function UserProfile({user, mutateUser}: Props) {
 										label="Company name"
 										type="text"
 										name="name"
+										disabled={!!linkedCorporate}
 										onChange={(e) =>
 											setCorporateInformation((prev) => ({
 												...prev!,
@@ -499,9 +517,10 @@ function UserProfile({user, mutateUser}: Props) {
 											onChange={setPosition}
 											defaultValue={position}
 											type="text"
-											label="Position"
+											label="Department"
 											placeholder="CEO, Head of Marketing..."
 											required
+											disabled={!!linkedCorporate}
 										/>
 									</DoubleColumnRow>
 								</>
@@ -638,7 +657,7 @@ function UserProfile({user, mutateUser}: Props) {
 	);
 }

-export default function Home() {
+export default function Home(props: {linkedCorporate?: CorporateUser | MasterCorporateUser; groups: Group[]; users: User[]}) {
 	const {user, mutateUser} = useUser({redirectTo: "/login"});

 	return (
@@ -653,7 +672,7 @@ export default function Home() {
 				<link rel="icon" href="/favicon.ico" />
 			</Head>
 			<ToastContainer />
-			{user && <UserProfile user={user} mutateUser={mutateUser} />}
+			{user && <UserProfile user={user} mutateUser={mutateUser} {...props} />}
 		</>
 	);
 }
--- a/src/pages/record.tsx
+++ b/src/pages/record.tsx
@@ -21,8 +21,11 @@ import StatsGridItem from "@/components/Medium/StatGridItem";
 import RecordFilter from "@/components/Medium/RecordFilter";
 import {useRouter} from "next/router";
 import useTrainingContentStore from "@/stores/trainingContentStore";
+import {Assignment} from "@/interfaces/results";
+import {getUsers} from "@/utils/users.be";
+import {getAssignments, getAssignmentsByAssigner} from "@/utils/assignments.be";

-export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
+export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 	const user = req.session.user;

 	if (!user || !user.isVerified) {
@@ -43,14 +46,23 @@ export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
 		};
 	}

+	const users = await getUsers();
+	const assignments = await getAssignments();
+
 	return {
-		props: { user: req.session.user },
+		props: {user, users, assignments},
 	};
 }, sessionOptions);

 type Filter = "months" | "weeks" | "days" | "assignments" | undefined;

-export default function History({ user }: { user: User }) {
+interface Props {
+	user: User;
+	users: User[];
+	assignments: Assignment[];
+}
+
+export default function History({user, users, assignments}: Props) {
 	const router = useRouter();
 	const [statsUserId, setStatsUserId, training, setTraining] = useRecordStore((state) => [
 		state.selectedUser,
@@ -62,9 +74,7 @@ export default function History({ user }: { user: User }) {
 	// const [statsUserId, setStatsUserId] = useState<string | undefined>(user.id);
 	const [groupedStats, setGroupedStats] = useState<{[key: string]: Stat[]}>();
 	const [filter, setFilter] = useState<Filter>();
-	const { assignments } = useAssignments({});

-	const { users } = useUsers();
 	const {data: stats, isLoading: isStatsLoading} = useFilterRecordsByUser<Stat[]>(statsUserId || user?.id);

 	const setExams = useExamStore((state) => state.setExams);
@@ -127,7 +137,6 @@ export default function History({ user }: { user: User }) {
 		return stats;
 	};

-
 	const MAX_TRAINING_EXAMS = 10;
 	const [selectedTrainingExams, setSelectedTrainingExams] = useState<string[]>([]);
 	const setTrainingStats = useTrainingContentStore((state) => state.setStats);
--- a/src/pages/settings.tsx
+++ b/src/pages/settings.tsx
@@ -24,8 +24,12 @@ import UserCreator from "./(admin)/UserCreator";
 import CorporateGradingSystem from "./(admin)/CorporateGradingSystem";
 import useGradingSystem from "@/hooks/useGrading";
 import {CEFR_STEPS} from "@/resources/grading";
+import {User} from "@/interfaces/user";
+import {getUserPermissions} from "@/utils/permissions.be";
+import {Permission, PermissionType} from "@/interfaces/permissions";
+import {getUsers} from "@/utils/users.be";

-export const getServerSideProps = withIronSessionSsr(({req, res}) => {
+export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 	const user = req.session.user;
 	if (!user || !user.isVerified) {
 		return {
@@ -45,14 +49,21 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 		};
 	}

+	const permissions = await getUserPermissions(user.id);
+	const users = await getUsers();
+
 	return {
-		props: {user: req.session.user},
+		props: {user, permissions, users},
 	};
 }, sessionOptions);

-export default function Admin() {
-	const {user} = useUser({redirectTo: "/login"});
-	const {permissions} = usePermissions(user?.id || "");
+interface Props {
+	user: User;
+	users: User[];
+	permissions: PermissionType[];
+}
+
+export default function Admin({user, users, permissions}: Props) {
 	const {gradingSystem, mutate} = useGradingSystem();

 	const [modalOpen, setModalOpen] = useState<string>();
@@ -69,19 +80,18 @@ export default function Admin() {
 				<link rel="icon" href="/favicon.ico" />
 			</Head>
 			<ToastContainer />
-			{user && (
 			<Layout user={user} className="gap-6">
 				<Modal isOpen={modalOpen === "batchCreateUser"} onClose={() => setModalOpen(undefined)}>
-						<BatchCreateUser user={user} onFinish={() => setModalOpen(undefined)} />
+					<BatchCreateUser user={user} users={users} permissions={permissions} onFinish={() => setModalOpen(undefined)} />
 				</Modal>
 				<Modal isOpen={modalOpen === "batchCreateCode"} onClose={() => setModalOpen(undefined)}>
-						<BatchCodeGenerator user={user} onFinish={() => setModalOpen(undefined)} />
+					<BatchCodeGenerator user={user} users={users} permissions={permissions} onFinish={() => setModalOpen(undefined)} />
 				</Modal>
 				<Modal isOpen={modalOpen === "createCode"} onClose={() => setModalOpen(undefined)}>
-						<CodeGenerator user={user} onFinish={() => setModalOpen(undefined)} />
+					<CodeGenerator user={user} permissions={permissions} onFinish={() => setModalOpen(undefined)} />
 				</Modal>
 				<Modal isOpen={modalOpen === "createUser"} onClose={() => setModalOpen(undefined)}>
-						<UserCreator user={user} onFinish={() => setModalOpen(undefined)} />
+					<UserCreator user={user} users={users} permissions={permissions} onFinish={() => setModalOpen(undefined)} />
 				</Modal>
 				<Modal isOpen={modalOpen === "gradingSystem"} onClose={() => setModalOpen(undefined)}>
 					<CorporateGradingSystem
@@ -139,10 +149,9 @@ export default function Admin() {
 					)}
 				</section>
 				<section className="w-full">
-						<Lists user={user} />
+					<Lists user={user} users={users} permissions={permissions} />
 				</section>
 			</Layout>
-			)}
 		</>
 	);
 }
--- a/src/utils/assignments.be.ts
+++ b/src/utils/assignments.be.ts
@@ -1,20 +1,10 @@
 import {app} from "@/firebase";
 import {Assignment} from "@/interfaces/results";
-import {
-  collection,
-  getDocs,
-  getFirestore,
-  query,
-  where,
-} from "firebase/firestore";
+import {collection, getDocs, getFirestore, query, where} from "firebase/firestore";

 const db = getFirestore(app);

-export const getAssignmentsByAssigner = async (
-  id: string,
-  startDate?: Date,
-  endDate?: Date
-) => {
+export const getAssignmentsByAssigner = async (id: string, startDate?: Date, endDate?: Date) => {
 	const {docs} = await getDocs(
 		query(
 			collection(db, "assignments"),
@@ -23,36 +13,24 @@ export const getAssignmentsByAssigner = async (
 				...(startDate ? [where("startDate", ">=", startDate.toISOString())] : []),
 				// firebase doesnt accept compound queries so we have to filter on the server
 				// ...endDate ? [where("endDate", "<=", endDate)] : [],
-      ]
-    )
+			],
+		),
 	);
 	if (endDate) {
-    return docs
-      .map((x) => ({ ...(x.data() as Assignment), id: x.id }))
-      .filter((x) => new Date(x.endDate) <= endDate) as Assignment[];
+		return docs.map((x) => ({...(x.data() as Assignment), id: x.id})).filter((x) => new Date(x.endDate) <= endDate) as Assignment[];
 	}
 	return docs.map((x) => ({...x.data(), id: x.id})) as Assignment[];
 };
-
-export const getAssignmentsByAssignerBetweenDates = async (
-  id: string,
-  startDate: Date,
-  endDate: Date
-) => {
-  const { docs } = await getDocs(
-    query(collection(db, "assignments"), where("assigner", "==", id))
-  );
+export const getAssignments = async () => {
+	const {docs} = await getDocs(collection(db, "assignments"));
 	return docs.map((x) => ({...x.data(), id: x.id})) as Assignment[];
 };

-export const getAssignmentsByAssigners = async (
-  ids: string[],
-  startDate?: Date,
-  endDate?: Date
-) => {
-  return (
-    await Promise.all(
-      ids.map((id) => getAssignmentsByAssigner(id, startDate, endDate))
-    )
-  ).flat();
+export const getAssignmentsByAssignerBetweenDates = async (id: string, startDate: Date, endDate: Date) => {
+	const {docs} = await getDocs(query(collection(db, "assignments"), where("assigner", "==", id)));
+	return docs.map((x) => ({...x.data(), id: x.id})) as Assignment[];
+};
+
+export const getAssignmentsByAssigners = async (ids: string[], startDate?: Date, endDate?: Date) => {
+	return (await Promise.all(ids.map((id) => getAssignmentsByAssigner(id, startDate, endDate)))).flat();
 };
--- a/src/utils/groups.be.ts
+++ b/src/utils/groups.be.ts
@@ -1,5 +1,5 @@
 import {app} from "@/firebase";
-import {CorporateUser, Group, StudentUser, TeacherUser} from "@/interfaces/user";
+import {CorporateUser, Group, MasterCorporateUser, StudentUser, TeacherUser} from "@/interfaces/user";
 import {collection, doc, getDoc, getDocs, getFirestore, query, setDoc, where} from "firebase/firestore";
 import moment from "moment";
 import {getUser} from "./users.be";
@@ -35,14 +35,14 @@ export const updateExpiryDateOnGroup = async (participantID: string, corporateID

 export const getUserCorporate = async (id: string) => {
 	const user = await getUser(id);
-	if (user.type === "corporate" || user.type === "mastercorporate") return user;
+	if (user.type === "mastercorporate") return user;

 	const groups = await getParticipantGroups(id);
 	const admins = await Promise.all(groups.map((x) => x.admin).map(getUser));
-	const corporates = admins.filter((x) => x.type === "corporate");
+	const corporates = admins.filter((x) => x.type === "corporate" || x.type === "mastercorporate");

 	if (corporates.length === 0) return undefined;
-	return corporates.shift() as CorporateUser;
+	return corporates.shift() as CorporateUser | MasterCorporateUser;
 };

 export const getGroups = async () => {
--- a/src/utils/permissions.be.ts
+++ b/src/utils/permissions.be.ts
@@ -1,23 +1,8 @@
 import {app, adminApp} from "@/firebase";
 import {getAuth} from "firebase-admin/auth";

-import {
-  collection,
-  deleteDoc,
-  doc,
-  getDoc,
-  getDocs,
-  getFirestore,
-  query,
-  setDoc,
-  where,
-} from "firebase/firestore";
-import {
-  Permission,
-  PermissionType,
-  permissions,
-  PermissionTopic,
-} from "@/interfaces/permissions";
+import {collection, deleteDoc, doc, getDoc, getDocs, getFirestore, query, setDoc, where} from "firebase/firestore";
+import {Permission, PermissionType, permissions, PermissionTopic} from "@/interfaces/permissions";
 import {v4} from "uuid";

 const db = getFirestore(app);
@@ -57,6 +42,11 @@ export function getPermissions(userId: string | undefined, docs: Permission[]) {
 	return permissions;
 }

+export async function getUserPermissions(id: string) {
+	const permissions = await getPermissionDocs();
+	return getPermissions(id, permissions);
+}
+
 export async function bootstrap() {
 	await permissions
 		.reduce((accm: PermissionsHelperList[], permissionData) => {
--- a/src/utils/users.be.ts
+++ b/src/utils/users.be.ts
@@ -5,21 +5,23 @@ import {CorporateUser, Group, User} from "@/interfaces/user";
 import {getGroupsForUser} from "./groups.be";
 import {uniq, uniqBy} from "lodash";
 import {getUserCodes} from "./codes.be";
+import moment from "moment";
 const db = getFirestore(app);

 export async function getUsers() {
 	const snapshot = await getDocs(collection(db, "users"));

 	return snapshot.docs.map((doc) => ({
-		id: doc.id,
 		...doc.data(),
-	})) as User[];
+		id: doc.id,
+		registrationDate: moment(doc.data().registrationDate).toISOString(),
+	})) as unknown as User[];
 }

 export async function getUser(id: string) {
 	const userDoc = await getDoc(doc(db, "users", id));

-	return {...userDoc.data(), id} as User;
+	return {...userDoc.data(), id, registrationDate: moment(userDoc.data()?.registrationDate).toISOString()} as unknown as User;
 }

 export async function getSpecificUsers(ids: string[]) {
@@ -28,9 +30,10 @@ export async function getSpecificUsers(ids: string[]) {
 	const snapshot = await getDocs(query(collection(db, "users"), where("id", "in", ids)));

 	const groups = snapshot.docs.map((doc) => ({
-		id: doc.id,
 		...doc.data(),
-	})) as User[];
+		id: doc.id,
+		registrationDate: moment(doc.data().registrationDate).toISOString(),
+	})) as unknown as User[];

 	return groups;
 }
--- a/src/utils/users.ts
+++ b/src/utils/users.ts
@@ -32,7 +32,7 @@ export const exportListToExcel = (rowUsers: User[], users: User[], groups: Group
 		gender: user.demographicInformation?.gender ? capitalize(user.demographicInformation.gender) : "N/A",
 		verified: user.isVerified?.toString() || "FALSE",
 	}));
-	const header = "Name,Email,Type,Company Name,Expiry Date,Country,Phone,Employment/Position,Gender,Verification";
+	const header = "Name,Email,Type,Company Name,Expiry Date,Country,Phone,Employment/Department,Gender,Verification";
 	const rowsString = rows.map((x) => Object.values(x).join(",")).join("\n");

 	return `${header}\n${rowsString}`;
--- a/yarn.lock
+++ b/yarn.lock
@@ -191,7 +191,7 @@
    "@emotion/utils" "0.11.3"
    "@emotion/weak-memoize" "0.2.5"

-"@emotion/cache@^11.13.0":
+"@emotion/cache@^11.13.0", "@emotion/cache@^11.4.0":
  version "11.13.1"
  resolved "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.1.tgz"
  integrity sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==
@@ -202,27 +202,16 @@
    "@emotion/weak-memoize" "^0.4.0"
    stylis "4.2.0"

-"@emotion/cache@^11.4.0":
-  version "11.13.1"
-  resolved "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.1.tgz"
-  integrity sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==
-  dependencies:
-    "@emotion/memoize" "^0.9.0"
-    "@emotion/sheet" "^1.4.0"
-    "@emotion/utils" "^1.4.0"
-    "@emotion/weak-memoize" "^0.4.0"
-    stylis "4.2.0"
-
-"@emotion/hash@^0.9.2":
-  version "0.9.2"
-  resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz"
-  integrity sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==
-
 "@emotion/hash@0.8.0":
  version "0.8.0"
  resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz"
  integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==

+"@emotion/hash@^0.9.2":
+  version "0.9.2"
+  resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz"
+  integrity sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==
+
 "@emotion/is-prop-valid@^0.8.2":
  version "0.8.8"
  resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz"
@@ -230,16 +219,16 @@
  dependencies:
    "@emotion/memoize" "0.7.4"

-"@emotion/memoize@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz"
-  integrity sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==
-
 "@emotion/memoize@0.7.4":
  version "0.7.4"
  resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz"
  integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==

+"@emotion/memoize@^0.9.0":
+  version "0.9.0"
+  resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz"
+  integrity sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==
+
 "@emotion/react@^11.8.1":
  version "11.13.0"
  resolved "https://registry.npmjs.org/@emotion/react/-/react-11.13.0.tgz"
@@ -265,7 +254,7 @@
    "@emotion/utils" "0.11.3"
    csstype "^2.5.7"

-"@emotion/serialize@^1.2.0":
+"@emotion/serialize@^1.2.0", "@emotion/serialize@^1.3.0":
  version "1.3.0"
  resolved "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.0.tgz"
  integrity sha512-jACuBa9SlYajnpIVXB+XOXnfJHyckDfe6fOpORIM6yhBDlqGuExvDdZYHDQGoDf3bZXGv7tNr+LpLjJqiEQ6EA==
@@ -276,67 +265,56 @@
    "@emotion/utils" "^1.4.0"
    csstype "^3.0.2"

-"@emotion/serialize@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.0.tgz"
-  integrity sha512-jACuBa9SlYajnpIVXB+XOXnfJHyckDfe6fOpORIM6yhBDlqGuExvDdZYHDQGoDf3bZXGv7tNr+LpLjJqiEQ6EA==
-  dependencies:
-    "@emotion/hash" "^0.9.2"
-    "@emotion/memoize" "^0.9.0"
-    "@emotion/unitless" "^0.9.0"
-    "@emotion/utils" "^1.4.0"
-    csstype "^3.0.2"
-
-"@emotion/sheet@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.4.0.tgz"
-  integrity sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==
-
 "@emotion/sheet@0.9.4":
  version "0.9.4"
  resolved "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.4.tgz"
  integrity sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==

+"@emotion/sheet@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.4.0.tgz"
+  integrity sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==
+
 "@emotion/stylis@0.8.5":
  version "0.8.5"
  resolved "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz"
  integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==

-"@emotion/unitless@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.9.0.tgz"
-  integrity sha512-TP6GgNZtmtFaFcsOgExdnfxLLpRDla4Q66tnenA9CktvVSdNKDvMVuUah4QvWPIpNjrWsGg3qeGo9a43QooGZQ==
-
 "@emotion/unitless@0.7.5":
  version "0.7.5"
  resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz"
  integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==

+"@emotion/unitless@^0.9.0":
+  version "0.9.0"
+  resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.9.0.tgz"
+  integrity sha512-TP6GgNZtmtFaFcsOgExdnfxLLpRDla4Q66tnenA9CktvVSdNKDvMVuUah4QvWPIpNjrWsGg3qeGo9a43QooGZQ==
+
 "@emotion/use-insertion-effect-with-fallbacks@^1.1.0":
  version "1.1.0"
  resolved "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.1.0.tgz"
  integrity sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw==

-"@emotion/utils@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.0.tgz"
-  integrity sha512-spEnrA1b6hDR/C68lC2M7m6ALPUHZC0lIY7jAS/B/9DuuO1ZP04eov8SMv/6fwRd8pzmsn2AuJEznRREWlQrlQ==
-
 "@emotion/utils@0.11.3":
  version "0.11.3"
  resolved "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz"
  integrity sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==

-"@emotion/weak-memoize@^0.4.0":
-  version "0.4.0"
-  resolved "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz"
-  integrity sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==
+"@emotion/utils@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.0.tgz"
+  integrity sha512-spEnrA1b6hDR/C68lC2M7m6ALPUHZC0lIY7jAS/B/9DuuO1ZP04eov8SMv/6fwRd8pzmsn2AuJEznRREWlQrlQ==

 "@emotion/weak-memoize@0.2.5":
  version "0.2.5"
  resolved "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz"
  integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==

+"@emotion/weak-memoize@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz"
+  integrity sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==
+
 "@eslint/eslintrc@^1.4.1":
  version "1.4.1"
  resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz"
@@ -511,7 +489,7 @@
    "@firebase/util" "1.9.3"
    tslib "^2.1.0"

-"@firebase/database-compat@^0.3.4", "@firebase/database-compat@0.3.4":
+"@firebase/database-compat@0.3.4", "@firebase/database-compat@^0.3.4":
  version "0.3.4"
  resolved "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.3.4.tgz"
  integrity sha512-kuAW+l+sLMUKBThnvxvUZ+Q1ZrF/vFJ58iUY9kAcbX48U03nVzIF6Tmkf0p3WVQwMqiXguSgtOPIB6ZCeF+5Gg==
@@ -523,7 +501,7 @@
    "@firebase/util" "1.9.3"
    tslib "^2.1.0"

-"@firebase/database-types@^0.10.4", "@firebase/database-types@0.10.4":
+"@firebase/database-types@0.10.4", "@firebase/database-types@^0.10.4":
  version "0.10.4"
  resolved "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.10.4.tgz"
  integrity sha512-dPySn0vJ/89ZeBac70T+2tWWPiJXWbmRygYv0smT5TfE3hDrQ09eKMF3Y+vMlTdrMWq7mUdYW5REWPSGH4kAZQ==
@@ -744,13 +722,6 @@
    node-fetch "2.6.7"
    tslib "^2.1.0"

-"@firebase/util@^1.9.7":
-  version "1.9.7"
-  resolved "https://registry.npmjs.org/@firebase/util/-/util-1.9.7.tgz"
-  integrity sha512-fBVNH/8bRbYjqlbIhZ+lBtdAAS4WqZumx03K06/u7fJSpz1TGjEMm1ImvKD47w+xaFKIP2ori6z8BrbakRfjJA==
-  dependencies:
-    tslib "^2.1.0"
-
 "@firebase/util@1.9.3":
  version "1.9.3"
  resolved "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz"
@@ -758,6 +729,13 @@
  dependencies:
    tslib "^2.1.0"

+"@firebase/util@^1.9.7":
+  version "1.9.7"
+  resolved "https://registry.npmjs.org/@firebase/util/-/util-1.9.7.tgz"
+  integrity sha512-fBVNH/8bRbYjqlbIhZ+lBtdAAS4WqZumx03K06/u7fJSpz1TGjEMm1ImvKD47w+xaFKIP2ori6z8BrbakRfjJA==
+  dependencies:
+    tslib "^2.1.0"
+
 "@firebase/webchannel-wrapper@0.9.0":
  version "0.9.0"
  resolved "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.9.0.tgz"
@@ -1013,6 +991,46 @@
  dependencies:
    glob "7.1.7"

+"@next/swc-darwin-arm64@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.5.tgz#d0a160cf78c18731c51cc0bff131c706b3e9bb05"
+  integrity sha512-/9zVxJ+K9lrzSGli1///ujyRfon/ZneeZ+v4ptpiPoOU+GKZnm8Wj8ELWU1Pm7GHltYRBklmXMTUqM/DqQ99FQ==
+
+"@next/swc-darwin-x64@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.5.tgz#eb832a992407f6e6352eed05a073379f1ce0589c"
+  integrity sha512-vXHOPCwfDe9qLDuq7U1OYM2wUY+KQ4Ex6ozwsKxp26BlJ6XXbHleOUldenM67JRyBfVjv371oneEvYd3H2gNSA==
+
+"@next/swc-linux-arm64-gnu@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.5.tgz#098fdab57a4664969bc905f5801ef5a89582c689"
+  integrity sha512-vlhB8wI+lj8q1ExFW8lbWutA4M2ZazQNvMWuEDqZcuJJc78iUnLdPPunBPX8rC4IgT6lIx/adB+Cwrl99MzNaA==
+
+"@next/swc-linux-arm64-musl@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.5.tgz#243a1cc1087fb75481726dd289c7b219fa01f2b5"
+  integrity sha512-NpDB9NUR2t0hXzJJwQSGu1IAOYybsfeB+LxpGsXrRIb7QOrYmidJz3shzY8cM6+rO4Aojuef0N/PEaX18pi9OA==
+
+"@next/swc-linux-x64-gnu@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.5.tgz#b8a2e436387ee4a52aa9719b718992e0330c4953"
+  integrity sha512-8XFikMSxWleYNryWIjiCX+gU201YS+erTUidKdyOVYi5qUQo/gRxv/3N1oZFCgqpesN6FPeqGM72Zve+nReVXQ==
+
+"@next/swc-linux-x64-musl@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.5.tgz#cb8a9adad5fb8df86112cfbd363aab5c6d32757b"
+  integrity sha512-6QLwi7RaYiQDcRDSU/os40r5o06b5ue7Jsk5JgdRBGGp8l37RZEh9JsLSM8QF0YDsgcosSeHjglgqi25+m04IQ==
+
+"@next/swc-win32-arm64-msvc@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.5.tgz#81f996c1c38ea0900d4e7719cc8814be8a835da0"
+  integrity sha512-1GpG2VhbspO+aYoMOQPQiqc/tG3LzmsdBH0LhnDS3JrtDx2QmzXe0B6mSZZiN3Bq7IOMXxv1nlsjzoS1+9mzZw==
+
+"@next/swc-win32-ia32-msvc@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.5.tgz#f61c74ce823e10b2bc150e648fc192a7056422e0"
+  integrity sha512-Igh9ZlxwvCDsu6438FXlQTHlRno4gFpJzqPjSIBZooD22tKeI4fE/YMRoHVJHmrQ2P5YL1DoZ0qaOKkbeFWeMg==
+
 "@next/swc-win32-x64-msvc@14.2.5":
  version "14.2.5"
  resolved "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.5.tgz"
@@ -1026,7 +1044,7 @@
    "@nodelib/fs.stat" "2.0.5"
    run-parallel "^1.1.9"

-"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5":
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
  version "2.0.5"
  resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
@@ -1579,6 +1597,14 @@
  resolved "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz"
  integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==

+"@swc/helpers@0.5.5":
+  version "0.5.5"
+  resolved "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.5.tgz"
+  integrity sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==
+  dependencies:
+    "@swc/counter" "^0.1.3"
+    tslib "^2.4.0"
+
 "@swc/helpers@^0.4.2":
  version "0.4.14"
  resolved "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz"
@@ -1593,14 +1619,6 @@
  dependencies:
    tslib "^2.4.0"

-"@swc/helpers@0.5.5":
-  version "0.5.5"
-  resolved "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.5.tgz"
-  integrity sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==
-  dependencies:
-    "@swc/counter" "^0.1.3"
-    tslib "^2.4.0"
-
 "@tanstack/react-table@^8.10.1":
  version "8.19.3"
  resolved "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.19.3.tgz"
@@ -1814,7 +1832,7 @@
  resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz"
  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==

-"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@>=8.1.0", "@types/node@18.13.0":
+"@types/node@*", "@types/node@18.13.0", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@>=8.1.0":
  version "18.13.0"
  resolved "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz"
  integrity sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==
@@ -2624,20 +2642,16 @@ cliui@^7.0.2:
    strip-ansi "^6.0.0"
    wrap-ansi "^7.0.0"

-cliui@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz"
-  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.1"
-    wrap-ansi "^7.0.0"
-
 clone@^2.1.2:
  version "2.1.2"
  resolved "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"
  integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==

+clsx@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz"
+  integrity sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==
+
 clsx@^1.1.1:
  version "1.2.1"
  resolved "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz"
@@ -2648,11 +2662,6 @@ clsx@^2.0.0, clsx@^2.1.1:
  resolved "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz"
  integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==

-clsx@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz"
-  integrity sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==
-
 color-convert@^1.9.0:
  version "1.9.3"
  resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
@@ -2667,16 +2676,16 @@ color-convert@^2.0.1:
  dependencies:
    color-name "~1.1.4"

-color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
 color-name@1.1.3:
  version "1.1.3"
  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==

+color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
 color-string@^1.9.1:
  version "1.9.1"
  resolved "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz"
@@ -2897,6 +2906,13 @@ dayjs@^1.8.34:
  resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz"
  integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==

+debug@4, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 debug@^3.2.7:
  version "3.2.7"
  resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
@@ -2904,13 +2920,6 @@ debug@^3.2.7:
  dependencies:
    ms "^2.1.1"

-debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@4:
-  version "4.3.4"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
 decamelize@^1.2.0:
  version "1.2.0"
  resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
@@ -3085,7 +3094,7 @@ eastasianwidth@^0.2.0:
  resolved "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz"
  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==

-ecdsa-sig-formatter@^1.0.11, ecdsa-sig-formatter@1.0.11:
+ecdsa-sig-formatter@1.0.11, ecdsa-sig-formatter@^1.0.11:
  version "1.0.11"
  resolved "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"
  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
@@ -3826,6 +3835,11 @@ fs.realpath@^1.0.0:
  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==

+fsevents@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
 fstream@^1.0.12:
  version "1.0.12"
  resolved "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz"
@@ -3928,7 +3942,7 @@ get-tsconfig@^4.2.0:
  resolved "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.4.0.tgz"
  integrity sha512-0Gdjo/9+FzsYhXCEFueo2aY1z1tpXrxWZzP7k8ul9qt1U5o8rYJwTJYmaeHdrVosYIVYkOy2iwCJ9FdpocJhPQ==

-glob-parent@^5.1.2:
+glob-parent@^5.1.2, glob-parent@~5.1.2:
  version "5.1.2"
  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -3942,12 +3956,29 @@ glob-parent@^6.0.2:
  dependencies:
    is-glob "^4.0.3"

-glob-parent@~5.1.2:
-  version "5.1.2"
-  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+glob@7.1.6:
+  version "7.1.6"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
  dependencies:
-    is-glob "^4.0.1"
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@7.1.7, glob@^7.1.3, glob@^7.1.4:
+  version "7.1.7"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"

 glob@^10.4.2:
  version "10.4.5"
@@ -3961,18 +3992,6 @@ glob@^10.4.2:
    package-json-from-dist "^1.0.0"
    path-scurry "^1.11.1"

-glob@^7.1.3, glob@^7.1.4, glob@7.1.7:
-  version "7.1.7"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"
-  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^7.2.3:
  version "7.2.3"
  resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
@@ -3996,18 +4015,6 @@ glob@^8.0.0:
    minimatch "^5.0.1"
    once "^1.3.0"

-glob@7.1.6:
-  version "7.1.6"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 globals@^11.1.0:
  version "11.12.0"
  resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
@@ -4306,7 +4313,7 @@ inflight@^1.0.4:
    once "^1.3.0"
    wrappy "1"

-inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.3, inherits@2:
+inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.3:
  version "2.0.4"
  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4994,18 +5001,18 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
  dependencies:
    js-tokens "^3.0.0 || ^4.0.0"

-lru-cache@^10.2.0:
-  version "10.4.3"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz"
-  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
-
-lru-cache@^6.0.0, lru-cache@6.0.0:
+lru-cache@6.0.0, lru-cache@^6.0.0:
  version "6.0.0"
  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
  dependencies:
    yallist "^4.0.0"

+lru-cache@^10.2.0:
+  version "10.4.3"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz"
+  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
+
 lru-memoizer@^2.2.0:
  version "2.3.0"
  resolved "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.3.0.tgz"
@@ -5076,7 +5083,7 @@ micromatch@^4.0.4, micromatch@^4.0.5:
    braces "^3.0.2"
    picomatch "^2.3.1"

-"mime-db@>= 1.43.0 < 2", mime-db@1.52.0:
+mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
  version "1.52.0"
  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
@@ -5100,14 +5107,7 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
  dependencies:
    brace-expansion "^1.1.7"

-minimatch@^5.0.1:
-  version "5.1.6"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"
-  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimatch@^5.1.0:
+minimatch@^5.0.1, minimatch@^5.1.0:
  version "5.1.6"
  resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"
  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
@@ -5151,11 +5151,6 @@ minizlib@^2.1.1:
    minipass "^3.0.0"
    yallist "^4.0.0"

-mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
 "mkdirp@>=0.5 0":
  version "0.5.6"
  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"
@@ -5163,6 +5158,11 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
  dependencies:
    minimist "^1.2.6"

+mkdirp@^1.0.3, mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 moment-timezone@^0.5.44:
  version "0.5.45"
  resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz"
@@ -5175,7 +5175,7 @@ moment@^2.29.4:
  resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz"
  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==

-ms@^2.1.1, ms@2.1.2:
+ms@2.1.2, ms@^2.1.1:
  version "2.1.2"
  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
@@ -5237,21 +5237,14 @@ node-addon-api@^5.0.0:
  resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz"
  integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==

-node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@2.6.7:
+node-fetch@2.6.7, node-fetch@^2.6.1, node-fetch@^2.6.7:
  version "2.6.7"
  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"
  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
  dependencies:
    whatwg-url "^5.0.0"

-node-fetch@^2.6.12:
-  version "2.7.0"
-  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz"
-  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-node-fetch@^2.6.9:
+node-fetch@^2.6.12, node-fetch@^2.6.9:
  version "2.7.0"
  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz"
  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
@@ -5607,7 +5600,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^
  resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==

-postcss@^8, postcss@^8.0.9, postcss@^8.4.21, postcss@8.4.31:
+postcss@8.4.31, postcss@^8, postcss@^8.0.9, postcss@^8.4.21:
  version "8.4.31"
  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz"
  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
@@ -5649,15 +5642,6 @@ promise-polyfill@^8.3.0:
  resolved "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.3.0.tgz"
  integrity sha512-H5oELycFml5yto/atYqmjyigJoAo3+OXwolYiH7OfQuYlAqhxNvTfiNMbV9hsC6Yp83yE5r2KTVmtrG6R9i6Pg==

-prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
-  version "15.8.1"
-  resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"
-  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.13.1"
-
 prop-types@15.7.2:
  version "15.7.2"
  resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz"
@@ -5667,6 +5651,15 @@ prop-types@15.7.2:
    object-assign "^4.1.1"
    react-is "^16.8.1"

+prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
+  version "15.8.1"
+  resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"
+  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
+  dependencies:
+    loose-envify "^1.4.0"
+    object-assign "^4.1.1"
+    react-is "^16.13.1"
+
 proto3-json-serializer@^1.0.0:
  version "1.1.1"
  resolved "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-1.1.1.tgz"
@@ -5690,6 +5683,24 @@ protobufjs-cli@1.1.1:
    tmp "^0.2.1"
    uglify-js "^3.7.7"

+protobufjs@7.2.4:
+  version "7.2.4"
+  resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz"
+  integrity sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.2"
+    "@protobufjs/base64" "^1.1.2"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/node" ">=13.7.0"
+    long "^5.0.0"
+
 protobufjs@^6.11.3:
  version "6.11.3"
  resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz"
@@ -5745,24 +5756,6 @@ protobufjs@^7.2.5:
    "@types/node" ">=13.7.0"
    long "^5.0.0"

-protobufjs@7.2.4:
-  version "7.2.4"
-  resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz"
-  integrity sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==
-  dependencies:
-    "@protobufjs/aspromise" "^1.1.2"
-    "@protobufjs/base64" "^1.1.2"
-    "@protobufjs/codegen" "^2.0.4"
-    "@protobufjs/eventemitter" "^1.1.0"
-    "@protobufjs/fetch" "^1.1.0"
-    "@protobufjs/float" "^1.0.2"
-    "@protobufjs/inquire" "^1.1.0"
-    "@protobufjs/path" "^1.1.2"
-    "@protobufjs/pool" "^1.1.0"
-    "@protobufjs/utf8" "^1.1.0"
-    "@types/node" ">=13.7.0"
-    long "^5.0.0"
-
 proxy-from-env@^1.1.0:
  version "1.1.0"
  resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz"
@@ -5893,10 +5886,10 @@ react-firebase-hooks@^5.1.1:
  resolved "https://registry.npmjs.org/react-firebase-hooks/-/react-firebase-hooks-5.1.1.tgz"
  integrity sha512-y2UpWs82xs+39q5Rc/wq316ca52QsC0n8m801V+yM4IC4hbfOL4yQPVSh7w+ydstdvjN9F+lvs1WrO2VYxpmdA==

-react-icons@^4.8.0:
-  version "4.10.1"
-  resolved "https://registry.npmjs.org/react-icons/-/react-icons-4.10.1.tgz"
-  integrity sha512-/ngzDP/77tlCfqthiiGNZeYFACw85fUjZtLbedmJ5DTlNDIwETxhwBzdOJ21zj4iJdvc0J3y7yOsX3PpxAJzrw==
+react-icons@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-5.3.0.tgz#ccad07a30aebd40a89f8cfa7d82e466019203f1c"
+  integrity sha512-DnUk8aFbTyQPSkCfF8dbX6kQjXA9DktMeJqfjrg6cK9vwQVMxmcA3BfP4QoiztVmEHtwlTgLFsPuH2NskKT6eg==

 react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1:
  version "16.13.1"
@@ -6064,33 +6057,7 @@ read-excel-file@^5.7.1:
    fflate "^0.7.3"
    unzipper "^0.12.2"

-readable-stream@^2.0.0:
-  version "2.3.8"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"
-  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@^2.0.2:
-  version "2.3.8"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"
-  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@^2.0.5:
+readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@~2.3.6:
  version "2.3.8"
  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"
  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
@@ -6112,19 +6079,6 @@ readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
    string_decoder "^1.1.1"
    util-deprecate "^1.0.1"

-readable-stream@~2.3.6:
-  version "2.3.8"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"
-  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
 readdir-glob@^1.1.2:
  version "1.1.3"
  resolved "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz"
@@ -6226,13 +6180,6 @@ reusify@^1.0.4:
  resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==

-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@2:
  version "2.7.1"
  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"
@@ -6240,6 +6187,13 @@ rimraf@2:
  dependencies:
    glob "^7.1.3"

+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 run-parallel@^1.1.9:
  version "1.2.0"
  resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
@@ -6247,7 +6201,7 @@ run-parallel@^1.1.9:
  dependencies:
    queue-microtask "^1.2.2"

-safe-buffer@^5.0.1, safe-buffer@>=5.1.0, safe-buffer@~5.2.0:
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@~5.2.0:
  version "5.2.1"
  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -6447,30 +6401,7 @@ streamsearch@^1.1.0:
  resolved "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz"
  integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==

-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
  version "4.2.3"
  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -6520,14 +6451,21 @@ string.prototype.trimstart@^1.0.6:
    define-properties "^1.1.4"
    es-abstract "^1.20.4"

-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
  dependencies:
-    ansi-regex "^5.0.1"
+    safe-buffer "~5.2.0"

-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
  version "6.0.1"
  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -6966,7 +6904,7 @@ use-sidecar@^1.1.2:
    detect-node-es "^1.1.0"
    tslib "^2.0.0"

-use-sync-external-store@^1.2.0, use-sync-external-store@1.2.0:
+use-sync-external-store@1.2.0, use-sync-external-store@^1.2.0:
  version "1.2.0"
  resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz"
  integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
@@ -6976,12 +6914,7 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
  resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==

-uuid@^8.0.0:
-  version "8.3.2"
-  resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-
-uuid@^8.3.0:
+uuid@^8.0.0, uuid@^8.3.0:
  version "8.3.2"
  resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"
  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
@@ -7119,7 +7052,7 @@ wordwrap@^1.0.0:
  resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"
  integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==

-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
  version "7.0.0"
  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -7137,15 +7070,6 @@ wrap-ansi@^6.2.0:
    string-width "^4.1.0"
    strip-ansi "^6.0.0"

-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
  version "8.1.0"
  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz"
@@ -7203,11 +7127,6 @@ yargs-parser@^20.2.2:
  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==

-yargs-parser@^21.1.1:
-  version "21.1.1"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"
-  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
-
 yargs@^15.3.1:
  version "15.4.1"
  resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"
@@ -7238,19 +7157,6 @@ yargs@^16.2.0:
    y18n "^5.0.5"
    yargs-parser "^20.2.2"

-yargs@^17.7.2:
-  version "17.7.2"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz"
-  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
 yocto-queue@^0.1.0:
  version "0.1.0"
  resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"