diff options
| author | Hailey <me@haileyok.com> | 2024-12-06 09:52:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-06 17:52:08 +0000 |
| commit | 1f6acc11abec91972e6e04abd55e09b2a9dc1433 (patch) | |
| tree | 3d6a9b1e8a3aa6f06a4700e9b40519439fcb37da /src/lib/hooks | |
| parent | 3ab6c435df5dc3d17fe3e2531231ccf012a4860c (diff) | |
| download | voidsky-1f6acc11abec91972e6e04abd55e09b2a9dc1433.tar.zst | |
clean rn 0.76 upgrade (#6887)
* package upgrades * upgrade system ui * update patches * rename patch * rm * use .set/.set * resolve yarnlock * fix accidentally removed package * fix use permissions hook * fix some type errors * type fixes * more tweaking * clean * Discard changes to src/screens/Onboarding/StepProfile/index.tsx * oops * fix splash * use ios/android in config * Fix tests * add back patch * add to rn patch * fullscreen? * Revert "add to rn patch" This reverts commit 4716d2c643a29fc77b871ca8555d8d78cb4ac427. * try this * test with revert * test * maybe this * fix config * Bump @react-native-picker/picker * Bump some packages * Rm unused * Update lockfile * Rename expo-notifications+0.29.8.patch.md to expo-notifications+0.29.10.patch.md * Update react-native+0.76.3.patch.md * Update react-native+0.76.3.patch.md * Inline splash configs Jumping around the file is annoying and makes it harder to understand how this is structured. * Start fixing Android splash * Downgrade compressor This version isn't building for me due to https://github.com/numandev1/react-native-compressor/issues/322. * Make Android splash empty for now * Work around a bug * Bump the compressor * Bump again * Include splash fixes * Try updating * No custom Android splash * Revert to using icons * welp * Fix sizes * Make sizing work * Bump size --------- Co-authored-by: Dan Abramov <dan.abramov@gmail.com>
Diffstat (limited to 'src/lib/hooks')
| -rw-r--r-- | src/lib/hooks/useNotificationHandler.ts | 12 | ||||
| -rw-r--r-- | src/lib/hooks/usePermissions.ts | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/lib/hooks/useNotificationHandler.ts b/src/lib/hooks/useNotificationHandler.ts index 625ec9e6a..69ae536d0 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/lib/hooks/usePermissions.ts b/src/lib/hooks/usePermissions.ts index 6da14232f..af4358c78 100644 --- a/src/lib/hooks/usePermissions.ts +++ b/src/lib/hooks/usePermissions.ts @@ -1,5 +1,5 @@ import {Linking} from 'react-native' -import {Camera} from 'expo-camera/legacy' // TODO: Migrate to the new one. +import {useCameraPermissions as useExpoCameraPermissions} from 'expo-camera' import * as MediaLibrary from 'expo-media-library' import {isWeb} from '#/platform/detection' @@ -78,7 +78,7 @@ export function useVideoLibraryPermission() { } export function useCameraPermission() { - const [res, requestPermission] = Camera.useCameraPermissions() + const [res, requestPermission] = useExpoCameraPermissions() const requestCameraAccessIfNeeded = async () => { if (res?.granted) { |