Skip to content

Commit

Permalink
ensure messages exist before filtering unseen messages
Browse files Browse the repository at this point in the history
  • Loading branch information
guytepper committed Oct 18, 2024
1 parent 3577cf2 commit 969826a
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions app/components/announcements/urgent-announcements.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { spacing } from "../../theme"
import { Screen, Text } from ".."
import { useIsDarkMode } from "../../hooks"
import { useStores } from "../../models"
import { AnnouncementCard } from "./announcement-card"

export const UrgentAnnouncements = () => {
const { settings } = useStores()
Expand All @@ -17,14 +18,17 @@ export const UrgentAnnouncements = () => {
const [unseenUrgentMessages, setUnseenUrgentMessages] = useState<PopUpMessage[]>([])

useEffect(() => {
const unseenUrgentMessages = settings.filterUnseenUrgentMessages(messages)
setUnseenUrgentMessages(unseenUrgentMessages)
if (messages) {
const unseenUrgentMessages = settings.filterUnseenUrgentMessages(messages)
setUnseenUrgentMessages(unseenUrgentMessages)

if (unseenUrgentMessages) {
// Delay to avoid hiding the urgent announcement bar while the modal is opening
setTimeout(() => {
settings.setSeenUrgentMessagesIds(unseenUrgentMessages.map((message) => message.id))
}, 1000)
if (unseenUrgentMessages.length > 0) {
// Delay to avoid hiding the urgent announcement bar while the modal is opening.
// For some reason, the timeout also prevents the rerender of planner screen header.
setTimeout(() => {
settings.setSeenUrgentMessagesIds(unseenUrgentMessages.map((message) => message.id))
}, 1000)
}
}
}, [messages])

Expand Down

0 comments on commit 969826a

Please sign in to comment.