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) => (
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 ( <>
@@ -160,10 +160,10 @@ export default function AdminDashboard({user}: Props) { Back
-

Inactive Country Managers ({users.filter(filter).length})

+

Inactive Country Managers ({users.filter(inactiveCountryManagerFilter).length})

- + ); } @@ -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" />