Merge pull request #180 from homenoc/develop

Fix expired group's email list in Dashboard
homenoc · Jun 22, 2024 · 14c94c8 · 14c94c8
2 parents f48313d + 28890e7
commit 14c94c8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/pages/Dashboard/Dashboard.tsx b/src/pages/Dashboard/Dashboard.tsx
@@ -218,7 +218,8 @@ export default function Dashboard() {
                   if (!expired_status2IsChecked && item.expired_status === 2) { return false }
                   if (!expired_status3IsChecked && item.expired_status === 3) { return false }
 
-                  if(new Date() < new Date(item.member_expired.split('T')[0]) ) { return false }
+                  if (item.member_expired === '' || item.member_expired === null) { return true }
+                  if (new Date() < new Date(item.member_expired.split('T')[0])) { return false }
                   return true
                 }).map(((group) => 
                   group.users?.filter((user) =>