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,108 @@
|
||||
import { MaterialCommunityIcons } from "@expo/vector-icons";
|
||||
import { Text, TouchableOpacity, View } from "react-native";
|
||||
import ReactNativeModal from "react-native-modal";
|
||||
|
||||
import { useT } from "@/lib/i18n";
|
||||
|
||||
// How the rider pays, asked at the moment it becomes a real question: after
|
||||
// they have chosen a driver, not before they know one exists.
|
||||
//
|
||||
// The card path opens the gateway's hosted page and can take the better part
|
||||
// of a minute, during which the driver they picked could be taken by someone
|
||||
// else — so the sheet says what happens either way rather than dropping the
|
||||
// rider into a browser with no warning.
|
||||
|
||||
type Props = {
|
||||
visible: boolean;
|
||||
driverName: string | null;
|
||||
fareCents: number;
|
||||
submitting: boolean;
|
||||
onPay: (method: "cash" | "card") => void;
|
||||
onCancel: () => void;
|
||||
};
|
||||
|
||||
export const PaymentChoiceSheet = ({
|
||||
visible,
|
||||
driverName,
|
||||
fareCents,
|
||||
submitting,
|
||||
onPay,
|
||||
onCancel,
|
||||
}: Props) => {
|
||||
const t = useT();
|
||||
const fare = (fareCents / 100).toFixed(2);
|
||||
|
||||
return (
|
||||
<ReactNativeModal
|
||||
isVisible={visible}
|
||||
onBackdropPress={submitting ? undefined : onCancel}
|
||||
>
|
||||
<View className="bg-white dark:bg-neutral-900 rounded-2xl p-5">
|
||||
<Text className="text-lg font-JakartaBold text-black dark:text-white">
|
||||
{driverName
|
||||
? t("bookRide.payment.titleNamed", { name: driverName })
|
||||
: t("bookRide.payment.title")}
|
||||
</Text>
|
||||
<Text className="text-sm text-general-200 dark:text-neutral-400 mt-1">
|
||||
{t("bookRide.payment.subtitle", { fare })}
|
||||
</Text>
|
||||
|
||||
<TouchableOpacity
|
||||
onPress={() => onPay("cash")}
|
||||
disabled={submitting}
|
||||
className="flex-row items-center gap-x-3 rounded-2xl border border-neutral-200 dark:border-neutral-700 px-4 py-4 mt-4"
|
||||
>
|
||||
<MaterialCommunityIcons name="cash" size={22} color="#10b981" />
|
||||
<View className="flex-1">
|
||||
<Text className="font-JakartaBold text-black dark:text-white">
|
||||
{t("bookRide.payment.cash")}
|
||||
</Text>
|
||||
<Text className="text-xs text-general-200 dark:text-neutral-400">
|
||||
{t("bookRide.payment.cashHint")}
|
||||
</Text>
|
||||
</View>
|
||||
<MaterialCommunityIcons
|
||||
name="chevron-right"
|
||||
size={20}
|
||||
color="#9ca3af"
|
||||
/>
|
||||
</TouchableOpacity>
|
||||
|
||||
<TouchableOpacity
|
||||
onPress={() => onPay("card")}
|
||||
disabled={submitting}
|
||||
className="flex-row items-center gap-x-3 rounded-2xl border border-neutral-200 dark:border-neutral-700 px-4 py-4 mt-2"
|
||||
>
|
||||
<MaterialCommunityIcons
|
||||
name="credit-card-outline"
|
||||
size={22}
|
||||
color="#0286ff"
|
||||
/>
|
||||
<View className="flex-1">
|
||||
<Text className="font-JakartaBold text-black dark:text-white">
|
||||
{t("bookRide.payment.card")}
|
||||
</Text>
|
||||
<Text className="text-xs text-general-200 dark:text-neutral-400">
|
||||
{t("bookRide.payment.cardHint")}
|
||||
</Text>
|
||||
</View>
|
||||
<MaterialCommunityIcons
|
||||
name="chevron-right"
|
||||
size={20}
|
||||
color="#9ca3af"
|
||||
/>
|
||||
</TouchableOpacity>
|
||||
|
||||
<TouchableOpacity
|
||||
onPress={onCancel}
|
||||
disabled={submitting}
|
||||
className="items-center py-3 mt-2"
|
||||
>
|
||||
<Text className="font-JakartaBold text-general-200 dark:text-neutral-400">
|
||||
{submitting ? t("bookRide.payment.working") : t("common.cancel")}
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
</ReactNativeModal>
|
||||
);
|
||||
};
|
||||
Reference in New Issue
Block a user