Merge remote-tracking branch 'origin/staging' into origin/production

2024-02-18 09:54:29 +07:00
parent f8021fbd0b 8f904a8ce8
commit 785f20e235
1 changed files with 2 additions and 2 deletions
--- a/frontend/client-portal/src/pages/AlarmCenter/List.tsx
+++ b/frontend/client-portal/src/pages/AlarmCenter/List.tsx
@@ -298,8 +298,8 @@ export default function List() {
      setData(
        response.data.data.map((obj: any) => ({
          ...obj,
-          start_date: <Label>{fDateSuffix(obj.start_date)}</Label>,
-          end_date: <Label> {fDateSuffix(obj.end_date)}</Label>,
+          start_date: <Label>{obj.start_date ? fDateSuffix(obj.start_date) : '-'}</Label>,
+          end_date: <Label> {obj.end_date ? fDateSuffix(obj.end_date) : '-'}</Label>,
          action: (
            <TableMoreMenu
            actions={