Waseel: driver capture, chat/calls, dispatch, and session fixes
Driver onboarding now photographs the licence, ID card and vehicle
registration and reads the credential fields off them, plus a camera-only
profile selfie riders check the arriving driver against. Adds in-app chat
and WebRTC calls, push-backed ride offers, ratings, cancellation and
payment sheets, settlement, and the owner dashboard endpoints behind them.
Camera permission on Android:
- Declare CAMERA and READ_MEDIA_IMAGES in the manifest. expo-image-picker's
own plugin never declares CAMERA, and Android denies a request for an
undeclared permission instantly and silently — no dialog is ever shown,
which is indistinguishable from the app not asking at all.
- Handle canAskAgain: once Android stops showing the dialog, repeating why
we need it is a dead end, so offer Open Settings instead (lib/capture-
permission.ts), matching what the location flow already did.
Session: a 401 on a request that carried a token now ends the session
instead of being reinterpreted per-screen — driver-home had been reading it
as "this user has no driver profile" and showing an onboarding form to an
already-onboarded driver. Requests without a token are exempt so a failed
sign-in doesn't sign you out, and the notification is latched per token so
concurrent polls tear the session down once. (root) gains the auth guard
that turns that into the sign-in screen; app/index.tsx only guarded the way
in, leaving a session that ended mid-screen with nowhere to go.
Also ignore .uploads/ — it holds driver licence, ID and vehicle scans plus
profile photos, which are personal data and must not be committed.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5
parent
1d84003e0a
commit
8807ff41c5
@@ -0,0 +1,140 @@
|
||||
import { MaterialCommunityIcons } from "@expo/vector-icons";
|
||||
import { useState } from "react";
|
||||
import { Image, Text, TextInput, TouchableOpacity, View } from "react-native";
|
||||
import ReactNativeModal from "react-native-modal";
|
||||
|
||||
import { CustomButton } from "@/components/custom-button";
|
||||
import { driverPhotoUri } from "@/lib/driver-photo";
|
||||
import { fetchAPI } from "@/lib/fetch";
|
||||
import { useT } from "@/lib/i18n";
|
||||
import { useTheme } from "@/lib/theme";
|
||||
|
||||
// The post-trip rating prompt, shared by both apps: a rider rates their driver
|
||||
// and a driver rates their rider through the same endpoint, which infers who
|
||||
// is rating from the caller's role on the ride. Both sides get the same sheet
|
||||
// so the two directions can't drift apart.
|
||||
|
||||
type Props = {
|
||||
visible: boolean;
|
||||
rideId: number;
|
||||
/** Who is being rated — only used for the copy. */
|
||||
subjectName?: string | null;
|
||||
subjectAvatar?: string | null;
|
||||
/** Rider-facing copy differs from driver-facing copy. */
|
||||
audience: "rider" | "driver";
|
||||
onDone: () => void;
|
||||
/** Called on "not now"; omit to make the rating unskippable. */
|
||||
onSkip?: () => void;
|
||||
};
|
||||
|
||||
export const RatingSheet = ({
|
||||
visible,
|
||||
rideId,
|
||||
subjectName,
|
||||
subjectAvatar,
|
||||
audience,
|
||||
onDone,
|
||||
onSkip,
|
||||
}: Props) => {
|
||||
const t = useT();
|
||||
const { isDark } = useTheme();
|
||||
const [stars, setStars] = useState(0);
|
||||
const [comment, setComment] = useState("");
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
const submit = async () => {
|
||||
if (stars < 1) return;
|
||||
setSubmitting(true);
|
||||
setError(null);
|
||||
try {
|
||||
await fetchAPI(`/(api)/ride/${rideId}/rate`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({
|
||||
rating: stars,
|
||||
comment: comment.trim() || null,
|
||||
}),
|
||||
});
|
||||
onDone();
|
||||
} catch (err) {
|
||||
console.log("[RATE_RIDE]: ", err);
|
||||
setError(t("rating.error"));
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<ReactNativeModal isVisible={visible} onBackdropPress={onSkip}>
|
||||
<View className="bg-white dark:bg-neutral-900 p-6 rounded-2xl">
|
||||
{subjectAvatar ? (
|
||||
<Image
|
||||
source={{ uri: driverPhotoUri(subjectAvatar) }}
|
||||
className="w-16 h-16 rounded-full self-center mb-3"
|
||||
/>
|
||||
) : null}
|
||||
|
||||
<Text className="text-xl font-JakartaBold text-center text-black dark:text-white">
|
||||
{audience === "rider"
|
||||
? t("rating.rateDriverTitle", { name: subjectName ?? "" })
|
||||
: t("rating.rateRiderTitle", { name: subjectName ?? "" })}
|
||||
</Text>
|
||||
<Text className="text-sm text-general-200 dark:text-neutral-400 text-center mt-1">
|
||||
{t("rating.subtitle")}
|
||||
</Text>
|
||||
|
||||
<View className="flex-row justify-center gap-x-2 my-5">
|
||||
{[1, 2, 3, 4, 5].map((value) => (
|
||||
<TouchableOpacity
|
||||
key={value}
|
||||
onPress={() => setStars(value)}
|
||||
hitSlop={{ top: 8, bottom: 8, left: 4, right: 4 }}
|
||||
accessibilityLabel={t("rating.starLabel", { n: value })}
|
||||
>
|
||||
<MaterialCommunityIcons
|
||||
name={value <= stars ? "star" : "star-outline"}
|
||||
size={38}
|
||||
color={
|
||||
value <= stars ? "#f5b301" : isDark ? "#525252" : "#d4d4d4"
|
||||
}
|
||||
/>
|
||||
</TouchableOpacity>
|
||||
))}
|
||||
</View>
|
||||
|
||||
<TextInput
|
||||
value={comment}
|
||||
onChangeText={setComment}
|
||||
placeholder={t("rating.commentPlaceholder")}
|
||||
placeholderTextColor={isDark ? "#737373" : "#858585"}
|
||||
multiline
|
||||
maxLength={500}
|
||||
className="bg-neutral-100 dark:bg-neutral-800 text-black dark:text-white rounded-2xl px-4 py-3 font-Jakarta text-[15px] min-h-[72px]"
|
||||
textAlignVertical="top"
|
||||
/>
|
||||
|
||||
{error ? (
|
||||
<Text className="text-rose-500 text-sm text-center mt-3">
|
||||
{error}
|
||||
</Text>
|
||||
) : null}
|
||||
|
||||
<CustomButton
|
||||
title={submitting ? t("common.saving") : t("rating.submit")}
|
||||
onPress={submit}
|
||||
disabled={submitting || stars < 1}
|
||||
className={`mt-5 ${stars < 1 ? "opacity-50" : ""}`}
|
||||
/>
|
||||
|
||||
{onSkip ? (
|
||||
<TouchableOpacity onPress={onSkip} className="py-3 mt-1">
|
||||
<Text className="text-center font-JakartaMedium text-general-200 dark:text-neutral-400">
|
||||
{t("rating.notNow")}
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
) : null}
|
||||
</View>
|
||||
</ReactNativeModal>
|
||||
);
|
||||
};
|
||||
Reference in New Issue
Block a user