From bac3980dec3fa17921ebc1e61357ca67cff404f8 Mon Sep 17 00:00:00 2001 From: symysak Date: Sat, 22 Jun 2024 15:05:35 +0900 Subject: [PATCH] Fix expired group's email list in Dashboard --- src/pages/Dashboard/Dashboard.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/Dashboard/Dashboard.tsx b/src/pages/Dashboard/Dashboard.tsx index 81aea95..16f7832 100644 --- 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) =>