Merge pull request #490 from HSLdevcom/DT-6627

DT-6627 When alerts are removed the stopmonitor may crash
HSLdevcom · Dec 17, 2024 · c1588c9 · c1588c9
2 parents be8d881 + c34441f
commit c1588c9
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/ui/MonitorAlertRowStatic.tsx b/src/ui/MonitorAlertRowStatic.tsx
@@ -34,15 +34,13 @@ const MonitorAlertRowStatic: FC<IProps> = ({
     return () => clearTimeout(id);
   }, [current]);
 
+  const alertObject = alerts[alertIndex] || alerts[0];
   const alert =
     getServiceAlertDescription(
-      alerts[alertIndex],
+      alertObject,
       languages[current % languages.length],
     ) ||
-    getServiceAlertHeader(
-      alerts[alertIndex],
-      languages[current % languages.length],
-    );
+    getServiceAlertHeader(alertObject, languages[current % languages.length]);
 
   return (
     <div className={cx('grid-row', 'alert static')}>