Skip to content

Fix camera back behavior for selected friends #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AugusDogus merged 3 commits into from
Mar 25, 2026
Merged

Fix camera back behavior for selected friends #11

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f89d4d
fix: handle back press for selected recipient
cursoragent Mar 25, 2026
2113313
fix: scope camera back handler to focus
AugusDogus Mar 25, 2026
ede4504
fix: keep camera open when clearing recipient
AugusDogus Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions apps/expo/src/app/camera.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type { NativeStackNavigationProp } from "@react-navigation/native-stack";
import type * as React from "react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import {
BackHandler,
InteractionManager,
Pressable,
StyleSheet,
Expand Down Expand Up @@ -213,6 +214,14 @@ export default function CameraPage(): React.ReactElement {
onFlipCameraPressed();
}, [onFlipCameraPressed]);

const clearSelectedRecipient = useCallback(() => {
navigation.setParams({ defaultRecipientId: undefined });
navigation.navigate("Main", { screen: "Friends" });
}, [navigation]);
const clearSelectedRecipientInPlace = useCallback(() => {
navigation.setParams({ defaultRecipientId: undefined });
}, [navigation]);

// On focus, revalidate the session in case cookie exists but session expired
useFocusEffect(
useCallback(() => {
Expand Down Expand Up @@ -261,6 +270,22 @@ export default function CameraPage(): React.ReactElement {
void requestPermissions();
}, [isCameraInitialized, isActive, requestPermissions]);

useFocusEffect(
useCallback(() => {
if (!defaultRecipientId) return;

const backHandler = BackHandler.addEventListener(
"hardwareBackPress",
() => {
clearSelectedRecipient();
return true;
},
);

return () => backHandler.remove();
}, [clearSelectedRecipient, defaultRecipientId]),
);

const videoHdr = format?.supportsVideoHdr && enableHdr;
const photoHdr = format?.supportsPhotoHdr && enableHdr && !videoHdr;

Expand Down Expand Up @@ -364,10 +389,7 @@ export default function CameraPage(): React.ReactElement {
Sending to {selectedFriend.name}
</Text>
<Pressable
onPress={() => {
// Clear the pre-selection by resetting navigation params
navigation.setParams({ defaultRecipientId: undefined });
}}
onPress={clearSelectedRecipientInPlace}
style={styles.clearButton}
>
<Ionicons name="close-outline" size={24} color="white" />
Expand Down