diff --git a/public/pages/MonitorDetails/containers/MonitorDetails.js b/public/pages/MonitorDetails/containers/MonitorDetails.js index 2a9752b53..3bda926bb 100644 --- a/public/pages/MonitorDetails/containers/MonitorDetails.js +++ b/public/pages/MonitorDetails/containers/MonitorDetails.js @@ -493,7 +493,9 @@ export default class MonitorDetails extends Component { ) : null} {this.state.tabContent} - ) : null} + ) : ( + this.renderAlertsTable() + )} {isJsonModalOpen && ( diff --git a/public/utils/contextMenu/monitors.ts b/public/utils/contextMenu/monitors.ts index 02b5b5ecc..4717f3e35 100644 --- a/public/utils/contextMenu/monitors.ts +++ b/public/utils/contextMenu/monitors.ts @@ -22,7 +22,7 @@ const getMonitors = async (params) => { const parseMonitor = (monitor) => { const state = monitor.monitor.enabled ? 'enabled' : 'disabled'; - const latestAlert = monitor.latestAlert === "--" ? undefined : monitor.latestAlert; + const latestAlert = monitor.lastNotificationTime === "--" ? undefined : monitor.lastNotificationTime; return { name: monitor.name, state: state,