Merge pull request #177 from homenoc/fix-some-bugs

Fix expired group's email list in Dashboard
homenoc · Jun 22, 2024 · 4a608b9 · 4a608b9
2 parents 0a8309f + 9211624
commit 4a608b9
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/pages/Dashboard/Dashboard.tsx b/src/pages/Dashboard/Dashboard.tsx
@@ -217,6 +217,8 @@ export default function Dashboard() {
                   if (!expired_status1IsChecked && item.expired_status === 1) { return false }
                   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 }
                   return true
                 }).map(((group) => 
                   group.users?.filter((user) =>