diff --git a/src/lib/hooks/useNotificationHandler.ts b/src/lib/hooks/useNotificationHandler.ts index 625ec9e6a9..69ae536d02 100644 --- a/src/lib/hooks/useNotificationHandler.ts +++ b/src/lib/hooks/useNotificationHandler.ts @@ -177,7 +177,14 @@ export function useNotificationsHandler() { Notifications.setNotificationHandler({ handleNotification: async e => { - if (e.request.trigger.type !== 'push') return DEFAULT_HANDLER_OPTIONS + if ( + e.request.trigger == null || + typeof e.request.trigger !== 'object' || + !('type' in e.request.trigger) || + e.request.trigger.type !== 'push' + ) { + return DEFAULT_HANDLER_OPTIONS + } logger.debug( 'Notifications: received', @@ -220,6 +227,9 @@ export function useNotificationsHandler() { if ( e.actionIdentifier === Notifications.DEFAULT_ACTION_IDENTIFIER && + e.notification.request.trigger != null && + typeof e.notification.request.trigger === 'object' && + 'type' in e.notification.request.trigger && e.notification.request.trigger.type === 'push' ) { logger.debug( diff --git a/src/view/com/util/forms/NativeDropdown.web.tsx b/src/view/com/util/forms/NativeDropdown.web.tsx index 364e10d104..c1a0b80966 100644 --- a/src/view/com/util/forms/NativeDropdown.web.tsx +++ b/src/view/com/util/forms/NativeDropdown.web.tsx @@ -229,6 +229,7 @@ const getKey = (label: string, index: number, id?: string) => { return `${label}_${index}` } +// @ts-expect-error - web only styles. the only style that should be broken here is `outline` const styles = StyleSheet.create({ separator: { height: 1,