diff --git a/lib/notifier/queries.js b/lib/notifier/queries.js index d89e74fb..60b8e0d8 100644 --- a/lib/notifier/queries.js +++ b/lib/notifier/queries.js @@ -54,7 +54,7 @@ const getValidNotifications = (type, detail) => { } const getNotifications = () => { - const sql = `SELECT * FROM notifications ORDER BY created DESC` + const sql = `SELECT * FROM notifications WHERE valid ORDER BY created DESC` return db.any(sql).catch(logger.error) } const setRead = (id, read) => { diff --git a/new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.js b/new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.js index 67095851..d4aa8be8 100644 --- a/new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.js +++ b/new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.js @@ -25,7 +25,6 @@ const GET_NOTIFICATIONS = gql` message created read - valid } hasUnreadNotifications machines { @@ -106,7 +105,6 @@ const NotificationCenter = ({ deviceName={machines[n.detail.deviceId]} created={n.created} read={n.read} - valid={n.valid} toggleClear={() => toggleClearNotification({ variables: { id: n.id, read: !n.read } diff --git a/new-lamassu-admin/src/components/NotificationCenter/NotificationRow.js b/new-lamassu-admin/src/components/NotificationCenter/NotificationRow.js index f5cdea17..87682409 100644 --- a/new-lamassu-admin/src/components/NotificationCenter/NotificationRow.js +++ b/new-lamassu-admin/src/components/NotificationCenter/NotificationRow.js @@ -44,7 +44,6 @@ const NotificationRow = ({ deviceName, created, read, - valid, toggleClear }) => { const classes = useStyles() @@ -72,7 +71,7 @@ const NotificationRow = ({
{icon}