From e79d3bc3b7070404e090036d1bd4e28d4bed54ca Mon Sep 17 00:00:00 2001
From: Alexander Skvortsov <sasha.skvortsov109@gmail.com>
Date: Sun, 12 Dec 2021 15:41:59 -0500
Subject: [PATCH] Don't assume `app.session.user` is present

---
 framework/core/js/src/forum/states/NotificationListState.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/core/js/src/forum/states/NotificationListState.ts b/framework/core/js/src/forum/states/NotificationListState.ts
index cfe214c02..75bb07158 100644
--- a/framework/core/js/src/forum/states/NotificationListState.ts
+++ b/framework/core/js/src/forum/states/NotificationListState.ts
@@ -15,7 +15,7 @@ export default class NotificationListState extends PaginatedListState<Notificati
    * Load the next page of notification results.
    */
   load(): Promise<void> {
-    if (app.session.user.newNotificationCount()) {
+    if (app.session.user?.newNotificationCount()) {
       this.pages = [];
       this.location = { page: 1 };
     }
@@ -24,7 +24,7 @@ export default class NotificationListState extends PaginatedListState<Notificati
       return Promise.resolve();
     }
 
-    app.session.user.pushAttributes({ newNotificationCount: 0 });
+    app.session.user?.pushAttributes({ newNotificationCount: 0 });
 
     return super.loadNext();
   }
@@ -35,7 +35,7 @@ export default class NotificationListState extends PaginatedListState<Notificati
   markAllAsRead() {
     if (this.pages.length === 0) return;
 
-    app.session.user.pushAttributes({ unreadNotificationCount: 0 });
+    app.session.user?.pushAttributes({ unreadNotificationCount: 0 });
 
     this.pages.forEach((page) => {
       page.items.forEach((notification) => notification.pushAttributes({ isRead: true }));