chore: clean up conditionals

HackAtUCI · Jan 17, 2024 · 122b1a8 · 122b1a8
1 parent c2b679f
commit 122b1a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/apps/site/src/app/(main)/portal/@applicant/ApplicantPortal.tsx b/apps/site/src/app/(main)/portal/@applicant/ApplicantPortal.tsx
@@ -28,14 +28,14 @@ async function Portal() {
 	const submittedWaiver =
 		status === PortalStatus.waived || status === PortalStatus.confirmed;
 
-	const isAccepted = status === PortalStatus.accepted || submittedWaiver;
+	const isAccepted = status === PortalStatus.accepted;
 
 	return (
 		<div className="bg-white text-black max-w-4xl rounded-2xl p-6 flex flex-col mb-24 w-full">
 			<h2 className="text-4xl font-semibold">Status</h2>
 			<VerticalTimeline status={status as PortalStatus} />
 			<Message status={status as PortalStatus} />
-			{isAccepted && <SignWaiver status={status as PortalStatus} />}
+			{isAccepted && !submittedWaiver && <SignWaiver />}
 			{submittedWaiver && <ConfirmAttendance status={status} />}
 		</div>
 	);

diff --git a/apps/site/src/app/(main)/portal/@applicant/SignWaiver.tsx b/apps/site/src/app/(main)/portal/@applicant/SignWaiver.tsx
@@ -1,14 +1,7 @@
 import Button from "@/lib/components/Button/Button";
 
-import { PortalStatus } from "./ApplicantPortal";
-
-interface SignWaiverProps {
-	status: PortalStatus;
-}
-
-function SignWaiver({ status }: SignWaiverProps) {
-	return status === PortalStatus.waived ||
-		status === PortalStatus.confirmed ? null : (
+function SignWaiver() {
+	return (
 		<div>
 			<hr />
 			<h3 className="text-3xl my-4">Waiver</h3>