From 26c4368f31d99fd46b640464a656eb7bfaeabc5e Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Thu, 7 Dec 2023 23:34:31 +0000
Subject: [PATCH] Minor improvement on reusability of filter function

---
 src/dashboards/Admin.tsx | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/dashboards/Admin.tsx b/src/dashboards/Admin.tsx
index 33410fd6..49b9c654 100644
--- a/src/dashboards/Admin.tsx
+++ b/src/dashboards/Admin.tsx
@@ -42,6 +42,8 @@ export default function AdminDashboard({user}: Props) {
 		setShowModal(!!selectedUser && page === "");
 	}, [selectedUser, page]);
 
+	const inactiveCountryManagerFilter = (x: User) => x.type === "agent" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
+
 	const UserDisplay = (displayUser: User) => (
 		<div
 			onClick={() => setSelectedUser(displayUser)}
@@ -149,8 +151,6 @@ export default function AdminDashboard({user}: Props) {
 	);
 
 	const InactiveCountryManagerList = () => {
-		const filter = (x: User) => x.type === "agent" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
-
 		return (
 			<>
 				<div className="flex flex-col gap-4">
@@ -160,10 +160,10 @@ export default function AdminDashboard({user}: Props) {
 						<BsArrowLeft className="text-xl" />
 						<span>Back</span>
 					</div>
-					<h2 className="text-2xl font-semibold">Inactive Country Managers ({users.filter(filter).length})</h2>
+					<h2 className="text-2xl font-semibold">Inactive Country Managers ({users.filter(inactiveCountryManagerFilter).length})</h2>
 				</div>
 
-				<UserList user={user} filters={[filter]} />
+				<UserList user={user} filters={[inactiveCountryManagerFilter]} />
 			</>
 		);
 	}
@@ -259,10 +259,7 @@ export default function AdminDashboard({user}: Props) {
 					onClick={() => setPage("inactiveCountryManagers")}
 					Icon={BsPerson}
 					label="Inactive Country Managers"
-					value={
-						users.filter((x) => x.type === "agent" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate)))
-							.length
-					}
+					value={users.filter(inactiveCountryManagerFilter).length}
 					color="rose"
 				/>
 				<IconCard