Avoid attempting to index into null NotificationRequest.trigger

tloncorp · Feb 6, 2025 · 7398b56 · 7398b56
1 parent 0cd60ae
commit 7398b56
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/apps/tlon-mobile/src/hooks/useNotificationListener.ts b/apps/tlon-mobile/src/hooks/useNotificationListener.ts
@@ -57,7 +57,9 @@ function payloadFromNotification(
   // `trigger`.
   // Detect and use whatever payload is available.
   const payload =
-    notification.request.trigger.type === 'push'
+    // `NotificationRequest.trigger` is marked as non-null in
+    // expo-notifications' types, but is null on Android - so we need the `?`
+    notification.request.trigger?.type === 'push'
       ? notification.request.trigger.payload
       : notification.request.content.data;
 

diff --git a/packages/app/lib/notifications.ts b/packages/app/lib/notifications.ts
@@ -76,12 +76,18 @@ export const connectNotifications = async () => {
 };
 
 const channelIdFromNotification = (notif: Notifications.Notification) => {
-  if (notif.request.trigger.type !== 'push') {
-    return null;
+  let out: string | null = null;
+  if (
+    notif.request.trigger?.type === 'push' &&
+    typeof notif.request.trigger.payload?.channelId === 'string'
+  ) {
+    out = notif.request.trigger.payload.channelId;
   }
-  const out = notif.request.trigger.payload?.channelId;
-  if (typeof out !== 'string') {
-    return null;
+  if (
+    out == null &&
+    typeof notif.request.content.data?.channelId === 'string'
+  ) {
+    out = notif.request.content.data.channelId;
   }
   return out;
 };