KrikoriosandClaude
f50ff27e11
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>
102 lines
2.2 KiB
TypeScript
102 lines
2.2 KiB
TypeScript
import { Tabs } from "expo-router";
|
|
import { Image, type ImageSourcePropType, View } from "react-native";
|
|
|
|
import { icons } from "@/constants";
|
|
|
|
const TabIcon = ({
|
|
source,
|
|
focused,
|
|
alt,
|
|
}: {
|
|
source: ImageSourcePropType;
|
|
alt: string;
|
|
focused: boolean;
|
|
}) => (
|
|
<View
|
|
className={`flex flex-row justify-center items-center rounded-full ${focused && "bg-general-300"}`}
|
|
>
|
|
<View
|
|
className={`rounded-full w-12 h-12 items-center justify-center ${focused && "bg-general-400"}`}
|
|
>
|
|
<Image
|
|
source={source}
|
|
alt={alt}
|
|
tintColor="white"
|
|
resizeMode="contain"
|
|
className="w-7 h-7"
|
|
/>
|
|
</View>
|
|
</View>
|
|
);
|
|
|
|
const TabsLayout = () => (
|
|
<Tabs
|
|
initialRouteName="home"
|
|
screenOptions={{
|
|
tabBarActiveTintColor: "white",
|
|
tabBarInactiveTintColor: "white",
|
|
tabBarShowLabel: false,
|
|
tabBarStyle: {
|
|
backgroundColor: "#333",
|
|
borderRadius: 50,
|
|
paddingBottom: 0,
|
|
overflow: "hidden",
|
|
marginHorizontal: 20,
|
|
marginBottom: 20,
|
|
height: 78,
|
|
display: "flex",
|
|
justifyContent: "space-between",
|
|
alignItems: "center",
|
|
flexDirection: "row",
|
|
position: "absolute",
|
|
},
|
|
}}
|
|
>
|
|
<Tabs.Screen
|
|
name="home"
|
|
options={{
|
|
title: "Home",
|
|
headerShown: false,
|
|
tabBarIcon: ({ focused }) => (
|
|
<TabIcon focused={focused} source={icons.home} alt="Home" />
|
|
),
|
|
}}
|
|
/>
|
|
|
|
<Tabs.Screen
|
|
name="rides"
|
|
options={{
|
|
title: "Rides",
|
|
headerShown: false,
|
|
tabBarIcon: ({ focused }) => (
|
|
<TabIcon focused={focused} source={icons.list} alt="Rides" />
|
|
),
|
|
}}
|
|
/>
|
|
|
|
<Tabs.Screen
|
|
name="chat"
|
|
options={{
|
|
title: "Chat",
|
|
headerShown: false,
|
|
tabBarIcon: ({ focused }) => (
|
|
<TabIcon focused={focused} source={icons.chat} alt="Chat" />
|
|
),
|
|
}}
|
|
/>
|
|
|
|
<Tabs.Screen
|
|
name="profile"
|
|
options={{
|
|
title: "Profile",
|
|
headerShown: false,
|
|
tabBarIcon: ({ focused }) => (
|
|
<TabIcon focused={focused} source={icons.profile} alt="Profile" />
|
|
),
|
|
}}
|
|
/>
|
|
</Tabs>
|
|
);
|
|
|
|
export default TabsLayout;
|