From ddb9a45f2254a7540ec4c296fd9ed7cca9c3ae16 Mon Sep 17 00:00:00 2001 From: talksik Date: Tue, 21 Dec 2021 19:30:30 -0800 Subject: [PATCH] one bug which breaks because of force unwrapping while someone logs out the auth session store sets the user to nil while the circlegridview tries to still display stuff --- nirvana-ios/Views/InnerCircle/CircleGridView.swift | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nirvana-ios/Views/InnerCircle/CircleGridView.swift b/nirvana-ios/Views/InnerCircle/CircleGridView.swift index 43d3182..bea516d 100644 --- a/nirvana-ios/Views/InnerCircle/CircleGridView.swift +++ b/nirvana-ios/Views/InnerCircle/CircleGridView.swift @@ -177,10 +177,12 @@ struct CircleGridView: View { } private func haveNewMessageFromFriend(friendDbId: String) -> Bool { - let userId = self.authSessionStore.user!.id // O(1) // currUser who is signed in - - if let messagesRelatedToFriend = self.authSessionStore.friendMessagesDict[friendDbId] { // O(1) - return messagesRelatedToFriend.last?.receiverId == userId && messagesRelatedToFriend.last?.listenCount == 0 + if self.authSessionStore.user != nil { + let userId = self.authSessionStore.user!.id // O(1) // currUser who is signed in + + if let messagesRelatedToFriend = self.authSessionStore.friendMessagesDict[friendDbId] { // O(1) + return messagesRelatedToFriend.last?.receiverId == userId && messagesRelatedToFriend.last?.listenCount == 0 + } } return false