From 44454d1e056b638a96e38275f1ffb16da3d80d10 Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Thu, 14 Dec 2023 17:57:39 +0000
Subject: [PATCH] Changed corporate from user.name to user.companyName Company
 name is now updateable

---
 src/components/UserCard.tsx          |  2 +-
 src/dashboards/Admin.tsx             |  2 +-
 src/dashboards/Agent.tsx             |  2 +-
 src/interfaces/user.ts               |  2 +-
 src/pages/(admin)/Lists/UserList.tsx |  2 +-
 src/pages/payment-record.tsx         | 22 ++++++++++++----------
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/components/UserCard.tsx b/src/components/UserCard.tsx
index c703d99c..c6b5db64 100644
--- a/src/components/UserCard.tsx
+++ b/src/components/UserCard.tsx
@@ -48,7 +48,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
 	const [referralAgent, setReferralAgent] = useState(user.type === "corporate" ? user.corporateInformation?.referralAgent : undefined);
 	const [companyName, setCompanyName] = useState(
 		user.type === "corporate"
-			? user.corporateInformation?.companyInformation.name
+			? user.corporateInformation?.companyInformation.companyName
 			: user.type === "agent"
 			? user.agentInformation.companyName
 			: undefined,
diff --git a/src/dashboards/Admin.tsx b/src/dashboards/Admin.tsx
index 37514f3d..7db04b84 100644
--- a/src/dashboards/Admin.tsx
+++ b/src/dashboards/Admin.tsx
@@ -48,7 +48,7 @@ export default function AdminDashboard({user}: Props) {
 			<div className="flex flex-col gap-1 items-start">
 				<span>
 					{displayUser.type === "corporate"
-						? displayUser.corporateInformation?.companyInformation?.name || displayUser.name
+						? displayUser.corporateInformation?.companyInformation?.companyName || displayUser.name
 						: displayUser.name}
 				</span>
 				<span className="text-sm opacity-75">{displayUser.email}</span>
diff --git a/src/dashboards/Agent.tsx b/src/dashboards/Agent.tsx
index f37054b4..c99e0d4d 100644
--- a/src/dashboards/Agent.tsx
+++ b/src/dashboards/Agent.tsx
@@ -51,7 +51,7 @@ export default function AgentDashboard({user}: Props) {
 			<div className="flex flex-col gap-1 items-start">
 				<span>
 					{displayUser.type === "corporate"
-						? displayUser.corporateInformation?.companyInformation?.name || displayUser.name
+						? displayUser.corporateInformation?.companyInformation?.companyName || displayUser.name
 						: displayUser.name}
 				</span>
 				<span className="text-sm opacity-75">{displayUser.email}</span>
diff --git a/src/interfaces/user.ts b/src/interfaces/user.ts
index cd337ac5..b13089fa 100644
--- a/src/interfaces/user.ts
+++ b/src/interfaces/user.ts
@@ -68,7 +68,7 @@ export interface AgentInformation {
 }
 
 export interface CompanyInformation {
-	name: string;
+	companyName: string;
 	userAmount: number;
 }
 
diff --git a/src/pages/(admin)/Lists/UserList.tsx b/src/pages/(admin)/Lists/UserList.tsx
index 5d83a17c..16efd641 100644
--- a/src/pages/(admin)/Lists/UserList.tsx
+++ b/src/pages/(admin)/Lists/UserList.tsx
@@ -294,7 +294,7 @@ export default function UserList({user, filters = []}: {user: User; filters?: ((
 							"underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer",
 					)}
 					onClick={() => (PERMISSIONS.updateExpiryDate[row.original.type].includes(user.type) ? setSelectedUser(row.original) : null)}>
-					{row.original.type === "corporate" ? row.original.corporateInformation?.companyInformation?.name || getValue() : getValue()}
+					{row.original.type === "corporate" ? row.original.corporateInformation?.companyInformation?.companyName || getValue() : getValue()}
 				</div>
 			),
 		}),
diff --git a/src/pages/payment-record.tsx b/src/pages/payment-record.tsx
index d7827f0c..bc78813d 100644
--- a/src/pages/payment-record.tsx
+++ b/src/pages/payment-record.tsx
@@ -115,7 +115,7 @@ const PaymentCreator = ({onClose, reload, showComission = false}: {onClose: () =
 						options={(users.filter((u) => u.type === "corporate") as CorporateUser[]).map((user) => ({
 							value: user.id,
 							meta: user,
-							label: `${user.corporateInformation.companyInformation.name || user.name} - ${user.email}`,
+							label: `${user.corporateInformation.companyInformation.companyName || user.name} - ${user.email}`,
 						}))}
 						defaultValue={{value: "undefined", label: "Select an account"}}
 						onChange={(value) => setCorporate((value as any)?.meta ?? undefined)}
@@ -313,14 +313,16 @@ export default function PaymentRecord() {
 		}),
 		columnHelper.accessor("corporate", {
 			header: "Corporate",
-			cell: (info) => (
-				<div
-					className={clsx("underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer")}
-					onClick={() => setSelectedUser(users.find((x) => x.id === info.row.original.corporate))}>
-					{(users.find((x) => x.id === info.row.original.corporate) as CorporateUser)?.corporateInformation.companyInformation.name ||
-						(users.find((x) => x.id === info.row.original.corporate) as CorporateUser)?.name}
-				</div>
-			),
+			cell: (info) => {
+				const user = users.find((x) => x.id === info.row.original.corporate) as CorporateUser;
+				return (
+					<div
+						className={clsx("underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer")}
+						onClick={() => setSelectedUser(user)}>
+						{user?.corporateInformation.companyInformation.companyName || user?.name}
+					</div>
+				);
+			},
 		}),
 		columnHelper.accessor("date", {
 			header: "Date",
@@ -445,7 +447,7 @@ export default function PaymentRecord() {
 								options={(users.filter((u) => u.type === "corporate") as CorporateUser[]).map((user) => ({
 									value: user.id,
 									meta: user,
-									label: `${user.corporateInformation.companyInformation.name || user.name} - ${user.email}`,
+									label: `${user.corporateInformation.companyInformation.companyName || user.name} - ${user.email}`,
 								}))}
 								onChange={(value) => setCorporate((value as any)?.meta ?? undefined)}
 								styles={{