Driver side (was a stub): - In-app driver onboarding: a driver-role user creates their own linked drivers profile (driver/profile+api GET/POST/PATCH). - Driver dashboard: online/offline toggle, today's earnings, incoming request cards (accept/decline), active ride panel (start/complete trip). Polls /driver/rides every 4s while online. - Location heartbeat (use-driver-location): watchPositionAsync pings /driver/location every ~5s; restarts the watch on app foreground so a backgrounded driver doesn't go permanently stale and miss requests. Dispatch (auto-match nearest, Uber-style): - Ride state machine: requested -> accepted -> en_route -> completed/cancelled with a nullable driver_id until matched (lib/dispatch.matchNextDriver). - matchNextDriver locks the ride (SELECT FOR UPDATE), expires 15s-stale offers, picks the nearest eligible driver of the matching service by haversine, offers one at a time. Called from ride/create, ride/[id] GET (lazy match on the rider's poll), and ride/[id]/respond (on decline). - ride/create is now a request endpoint (driver_id NULL, status=requested, service); drops the pre-match driver_id payment reconciliation. - ride/[id] GET returns status/service/nullable driver; PATCH handles rider cancel + driver en_route/completed. ride/list backs the history tabs. Rider flow (best experience): - confirm-ride is now a request screen: single trip fare + nearest-driver ETA + cash/card + Request Ride -> live status. Periodically polls online drivers of the selected service and disables Request when none are online (prevents the "stuck searching forever" state). - book-ride is the live ride-status screen (searching -> accepted -> en_route -> completed/cancelled + Cancel), polling every 3s. - lib/request-ride unifies the Areeba card flow + cash path. - Map reads /driver/nearby (real positions, service-filtered); lib/map adds calculateTripFare + service-aware fares. POI suggestions: - lib/places (Google Nearby Search) + nearby-suggestions chips for mall/hospital/pharmacy/restaurant on the home screen. Service categories now drive both matching and a per-service fare multiplier (car 1.0 / moto 0.7 / courier 0.85 / chauffeur 1.5). Map tiles: react-native-maps rendered blank on Android because no Google Maps key was set. Switched app.json -> app.config.js so android.config.googleMaps.apiKey is injected from EXPO_PUBLIC_GOOGLE_API_KEY at build time (keeps the key out of git). Requires a native rebuild (expo run:android) to take effect. Also includes the prior payment/auth hardening (server-authoritative payment_orders ledger with double-spend guards, peppered OTP, register TOCTOU fix, stats cents fix) that was left uncommitted. Co-Authored-By: Claude <noreply@anthropic.com>
157 lines
5.3 KiB
TypeScript
157 lines
5.3 KiB
TypeScript
import { router } from "expo-router";
|
|
import {
|
|
ActivityIndicator,
|
|
FlatList,
|
|
Image,
|
|
Text,
|
|
TouchableOpacity,
|
|
View,
|
|
} from "react-native";
|
|
import { SafeAreaView } from "react-native-safe-area-context";
|
|
|
|
import { GoogleTextInput } from "@/components/google-text-input";
|
|
import { LocationNotice } from "@/components/location-notice";
|
|
import { Map } from "@/components/map";
|
|
import { NearbySuggestions } from "@/components/nearby-suggestions";
|
|
import { RideCard } from "@/components/ride-card";
|
|
import { ServiceSelector } from "@/components/service-selector";
|
|
import { icons, images } from "@/constants";
|
|
import { useSession } from "@/lib/session";
|
|
import { useUserLocation } from "@/lib/use-user-location";
|
|
import { useLocationStore } from "@/store";
|
|
import { useFetch } from "@/lib/fetch";
|
|
import type { Ride } from "@/types/type";
|
|
|
|
const Home = () => {
|
|
const setDestinationLocation = useLocationStore(
|
|
(state) => state.setDestinationLocation,
|
|
);
|
|
const { signOut, user } = useSession();
|
|
const { data: recentRides, loading } = useFetch<Ride[]>("/(api)/ride/list");
|
|
|
|
const { status: locationStatus, retry: retryLocation } = useUserLocation();
|
|
|
|
const handleSignOut = () => {
|
|
signOut();
|
|
|
|
router.replace("/(auth)/sign-in");
|
|
};
|
|
const handleDestinationPress = (location: {
|
|
latitude: number;
|
|
longitude: number;
|
|
address: string;
|
|
}) => {
|
|
setDestinationLocation(location);
|
|
|
|
router.push("/(root)/find-ride");
|
|
};
|
|
|
|
return (
|
|
<SafeAreaView className="bg-general-500">
|
|
<FlatList
|
|
data={recentRides?.slice(0, 5)}
|
|
renderItem={({ item }) => <RideCard ride={item} />}
|
|
className="px-5"
|
|
keyboardShouldPersistTaps="handled"
|
|
contentContainerStyle={{
|
|
paddingBottom: 100,
|
|
}}
|
|
ListEmptyComponent={
|
|
<View className="flex flex-col items-center justify-center">
|
|
{!loading ? (
|
|
<>
|
|
<Image
|
|
source={images.noResult}
|
|
alt="No recent rides found"
|
|
className="w-40 h-40"
|
|
resizeMode="contain"
|
|
/>
|
|
<Text className="text-sm">No recent rides found.</Text>
|
|
</>
|
|
) : (
|
|
<ActivityIndicator size="small" color="#000" />
|
|
)}
|
|
</View>
|
|
}
|
|
// Passed as an *element*, not as `() => (...)`. VirtualizedList
|
|
// renders a function prop as `<HeaderComponent />`, so a fresh arrow
|
|
// function each render is a fresh element type: React unmounts the
|
|
// whole header — MapView included — and mounts a new one. Recreating
|
|
// the Android map surface on every re-render leaves it grey with the
|
|
// Google logo and tiles that never finish loading.
|
|
ListHeaderComponent={
|
|
<>
|
|
<View className="flex flex-row items-center justify-between my-5">
|
|
<Text
|
|
className="text-base font-JakartaExtraBold"
|
|
numberOfLines={1}
|
|
>
|
|
Welcome {user?.name || user?.email} 👋
|
|
</Text>
|
|
|
|
<View className="flex flex-row items-center gap-x-1">
|
|
<TouchableOpacity
|
|
onPress={handleSignOut}
|
|
className="justify-center items-center w-10 h-10 rounded-full bg-white"
|
|
>
|
|
<Image source={icons.out} className="w-4 h-4" alt="Logout" />
|
|
</TouchableOpacity>
|
|
</View>
|
|
</View>
|
|
|
|
<GoogleTextInput
|
|
icon={icons.search}
|
|
containerStyles="bg-white shadow-md shadow-neutral-300"
|
|
handlePress={handleDestinationPress}
|
|
/>
|
|
|
|
<Text className="text-xl font-JakartaBold mt-5 mb-3">
|
|
Your Current Location
|
|
</Text>
|
|
|
|
<View className="w-full h-[300px] rounded-2xl overflow-hidden bg-white">
|
|
{locationStatus === "pending" || locationStatus === "granted" ? (
|
|
<>
|
|
{/* The map draws straight away on the Beirut fallback so the
|
|
slot never sits empty while the fix is still coming. */}
|
|
<Map />
|
|
|
|
{locationStatus === "pending" ? (
|
|
<View className="absolute bottom-3 self-center flex-row items-center rounded-full bg-white/95 px-4 py-2 shadow-md shadow-neutral-400/40">
|
|
<ActivityIndicator size="small" color="#0286ff" />
|
|
<Text className="ml-2 text-xs font-JakartaMedium text-general-200">
|
|
Finding your location…
|
|
</Text>
|
|
</View>
|
|
) : null}
|
|
</>
|
|
) : (
|
|
<LocationNotice
|
|
status={locationStatus}
|
|
onRetry={retryLocation}
|
|
/>
|
|
)}
|
|
</View>
|
|
|
|
<Text className="text-xl font-JakartaBold mt-5 mb-3">
|
|
What do you need?
|
|
</Text>
|
|
|
|
<ServiceSelector />
|
|
|
|
<View className="mt-5">
|
|
<NearbySuggestions />
|
|
</View>
|
|
|
|
<Text className="text-xl font-JakartaBold mt-5 mb-3">
|
|
Recent Rides
|
|
</Text>
|
|
</>
|
|
}
|
|
/>
|
|
</SafeAreaView>
|
|
);
|
|
};
|
|
|
|
export default Home;
|