diff --git a/src/dashboards/Owner.tsx b/src/dashboards/Owner.tsx
index a41632cc..10d83356 100644
--- a/src/dashboards/Owner.tsx
+++ b/src/dashboards/Owner.tsx
@@ -244,7 +244,8 @@ export default function OwnerDashboard({user}: Props) {
(x) =>
x.type === "student" &&
x.subscriptionExpirationDate &&
- moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")),
+ moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
+ moment().isBefore(moment(x.subscriptionExpirationDate)),
)
.map((x) => (
@@ -259,7 +260,8 @@ export default function OwnerDashboard({user}: Props) {
(x) =>
x.type === "teacher" &&
x.subscriptionExpirationDate &&
- moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")),
+ moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
+ moment().isBefore(moment(x.subscriptionExpirationDate)),
)
.map((x) => (
@@ -274,7 +276,45 @@ export default function OwnerDashboard({user}: Props) {
(x) =>
x.type === "corporate" &&
x.subscriptionExpirationDate &&
- moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")),
+ moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
+ moment().isBefore(moment(x.subscriptionExpirationDate)),
+ )
+ .map((x) => (
+
+ ))}
+
+
+
+
Expired Students
+
+ {users
+ .filter(
+ (x) => x.type === "student" && x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)),
+ )
+ .map((x) => (
+
+ ))}
+
+
+
+
Expired Teachers
+
+ {users
+ .filter(
+ (x) => x.type === "teacher" && x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)),
+ )
+ .map((x) => (
+
+ ))}
+
+
+
+
Expired Corporate
+
+ {users
+ .filter(
+ (x) =>
+ x.type === "corporate" && x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)),
)
.map((x) => (
diff --git a/src/pages/(admin)/BatchCodeGenerator.tsx b/src/pages/(admin)/BatchCodeGenerator.tsx
index c6f99a1a..a308772e 100644
--- a/src/pages/(admin)/BatchCodeGenerator.tsx
+++ b/src/pages/(admin)/BatchCodeGenerator.tsx
@@ -128,7 +128,7 @@ export default function BatchCodeGenerator({user}: {user: User}) {
variant="outline"
onClick={() => generateCode("corporate")}
disabled={emails.length === 0 || isLoading || !PERMISSIONS.generateCode.corporate.includes(user.type)}>
- Admin
+ Corporate