merge main

This commit is contained in:
Hailey
2024-06-10 13:20:05 -07:00
11 changed files with 101 additions and 33 deletions
+8 -2
View File
@@ -72,14 +72,17 @@ export function useNotificationsRegistration() {
export function useRequestNotificationsPermission() {
const gate = useGate()
const {currentAccount} = useSession()
return async (context: 'StartOnboarding' | 'AfterOnboarding' | 'Login') => {
return async (
context: 'StartOnboarding' | 'AfterOnboarding' | 'Login' | 'Home',
) => {
const permissions = await Notifications.getPermissionsAsync()
if (
!isNative ||
permissions?.status === 'granted' ||
permissions?.status === 'denied'
(permissions?.status === 'denied' && !permissions.canAskAgain)
) {
return
}
@@ -95,6 +98,9 @@ export function useRequestNotificationsPermission() {
) {
return
}
if (context === 'Home' && !currentAccount) {
return
}
const res = await Notifications.requestPermissionsAsync()
logEvent('notifications:request', {
+1 -1
View File
@@ -17,7 +17,7 @@ export type LogEvents = {
}
'notifications:openApp': {}
'notifications:request': {
context: 'StartOnboarding' | 'AfterOnboarding' | 'Login'
context: 'StartOnboarding' | 'AfterOnboarding' | 'Login' | 'Home'
status: 'granted' | 'denied' | 'undetermined'
}
'state:background:sampled': {