scan food

apps/admin/src/app/api/food/barcode/[code]/route.ts

@@ -0,0 +1,156 @@
+import { NextResponse } from "next/server";
+import { auth } from "@clerk/nextjs/server";
+import { getUserMembershipContext } from "@/lib/membership/access";
+import log from "@/lib/logger";
+
+interface OpenFoodFactsProduct {
+  product_name?: string;
+  product_name_en?: string;
+  brands?: string;
+  image_url?: string;
+  image_front_url?: string;
+  serving_size?: string;
+  nutriments?: {
+    [key: string]: number | string | undefined;
+    "energy-kcal_serving"?: number;
+    "energy-kcal_100g"?: number;
+    proteins_serving?: number;
+    proteins_100g?: number;
+    carbohydrates_serving?: number;
+    carbohydrates_100g?: number;
+    fat_serving?: number;
+    fat_100g?: number;
+  };
+}
+
+interface OpenFoodFactsResponse {
+  status: number;
+  code: string;
+  product?: OpenFoodFactsProduct;
+}
+
+function normalizeBarcode(rawCode: string): string {
+  return rawCode.replace(/\D/g, "").trim();
+}
+
+function isSupportedBarcode(code: string): boolean {
+  return [8, 12, 13].includes(code.length);
+}
+
+function getNumber(value: unknown): number | undefined {
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  if (typeof value === "string") {
+    const parsed = Number(value);
+    if (Number.isFinite(parsed)) return parsed;
+  }
+  return undefined;
+}
+
+function buildProductPayload(code: string, product: OpenFoodFactsProduct) {
+  const caloriesPerServing =
+    getNumber(product.nutriments?.["energy-kcal_serving"]) ??
+    getNumber(product.nutriments?.["energy-kcal_100g"]) ??
+    0;
+
+  const protein =
+    getNumber(product.nutriments?.proteins_serving) ??
+    getNumber(product.nutriments?.proteins_100g);
+  const carbs =
+    getNumber(product.nutriments?.carbohydrates_serving) ??
+    getNumber(product.nutriments?.carbohydrates_100g);
+  const fat =
+    getNumber(product.nutriments?.fat_serving) ??
+    getNumber(product.nutriments?.fat_100g);
+
+  return {
+    barcode: code,
+    name: product.product_name || product.product_name_en || "Unknown Product",
+    brand: product.brands || null,
+    imageUrl: product.image_url || product.image_front_url || null,
+    servingSize: product.serving_size || "1 serving",
+    caloriesPerServing: Math.max(0, Math.round(caloriesPerServing)),
+    macros: {
+      protein: protein ?? null,
+      carbs: carbs ?? null,
+      fat: fat ?? null,
+    },
+    source: "openfoodfacts" as const,
+  };
+}
+
+export async function GET(
+  _request: Request,
+  { params }: { params: Promise<{ code: string }> },
+) {
+  try {
+    const { userId } = await auth();
+    if (!userId) {
+      return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+    }
+
+    const { features, membershipType } = await getUserMembershipContext(userId);
+    if (!features.nutritionTracking) {
+      return NextResponse.json(
+        {
+          error:
+            "Barcode food scan is available on Premium and VIP memberships",
+          membershipType,
+        },
+        { status: 403 },
+      );
+    }
+
+    const { code: rawCode } = await params;
+    const code = normalizeBarcode(rawCode);
+
+    if (!isSupportedBarcode(code)) {
+      return NextResponse.json(
+        { error: "Invalid barcode. Use EAN-8, UPC-A, or EAN-13 formats." },
+        { status: 400 },
+      );
+    }
+
+    const response = await fetch(
+      `https://world.openfoodfacts.org/api/v2/product/${code}.json`,
+      {
+        headers: {
+          "User-Agent": "FitAI/1.0 (fitai.app)",
+        },
+        cache: "no-store",
+      },
+    );
+
+    if (!response.ok) {
+      log.warn("OpenFoodFacts lookup failed", {
+        status: response.status,
+        barcode: code,
+      });
+      return NextResponse.json(
+        { error: "Food lookup service unavailable. Please try again." },
+        { status: 503 },
+      );
+    }
+
+    const payload = (await response.json()) as OpenFoodFactsResponse;
+    if (payload.status !== 1 || !payload.product) {
+      return NextResponse.json(
+        { error: "Product not found in OpenFoodFacts" },
+        { status: 404 },
+      );
+    }
+
+    return NextResponse.json({
+      success: true,
+      data: buildProductPayload(code, payload.product),
+      meta: {
+        timestamp: new Date().toISOString(),
+      },
+    });
+  } catch (error) {
+    log.error("Failed barcode food lookup", error);
+    return NextResponse.json(
+      { error: "Failed to lookup food barcode" },
+      { status: 500 },
+    );
+  }
+}

apps/admin/src/app/api/membership/features/route.ts

@@ -0,0 +1,32 @@
+import { NextResponse } from "next/server";
+import { auth } from "@clerk/nextjs/server";
+import { MEMBERSHIP_FEATURES } from "@/lib/membership/features";
+import { getUserMembershipContext } from "@/lib/membership/access";
+
+export async function GET() {
+  try {
+    const { userId } = await auth();
+    if (!userId) {
+      return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+    }
+
+    const { membershipType, features } = await getUserMembershipContext(userId);
+
+    return NextResponse.json({
+      success: true,
+      data: {
+        membershipType,
+        currentFeatures: features,
+        plans: MEMBERSHIP_FEATURES,
+      },
+      meta: {
+        timestamp: new Date().toISOString(),
+      },
+    });
+  } catch {
+    return NextResponse.json(
+      { error: "Failed to load membership features" },
+      { status: 500 },
+    );
+  }
+}

apps/admin/src/middleware.ts

@@ -34,7 +34,6 @@ export default clerkMiddleware(async (auth, req) => {
   // For API routes, let the route handler check auth
   // This allows API routes to handle both web sessions and mobile Bearer tokens
   if (isApiRoute(req)) {
-    log.debug("API route, auth will be checked in handler");
     return;
   }
 

apps/mobile/src/api/food.ts

@@ -0,0 +1,35 @@
+import { apiClient, withAuth } from "./client";
+import { API_ENDPOINTS } from "../config/api";
+
+export interface ScannedFoodProduct {
+  barcode: string;
+  name: string;
+  brand: string | null;
+  imageUrl: string | null;
+  servingSize: string;
+  caloriesPerServing: number;
+  macros: {
+    protein: number | null;
+    carbs: number | null;
+    fat: number | null;
+  };
+  source: "openfoodfacts";
+}
+
+interface FoodLookupResponse {
+  success: boolean;
+  data: ScannedFoodProduct;
+}
+
+export async function lookupFoodByBarcode(
+  barcode: string,
+  token: string | null,
+): Promise<ScannedFoodProduct> {
+  const normalized = barcode.replace(/\D/g, "");
+  const response = await apiClient.get<FoodLookupResponse>(
+    API_ENDPOINTS.FOOD.LOOKUP_BARCODE(normalized),
+    withAuth(token),
+  );
+
+  return response.data.data;
+}

apps/mobile/src/api/index.ts

@@ -15,4 +15,5 @@ export * from "./hydration";
 export * from "./client";
 export * from "./helpers";
 export * from "./membership";
+export * from "./food";
 export * from "./gyms";

apps/mobile/src/api/membership.ts

@@ -51,6 +51,15 @@ interface UsersListResponse {
   }>;
 }
 
+interface MembershipFeaturesResponse {
+  success: boolean;
+  data: {
+    membershipType: MembershipType;
+    currentFeatures: MembershipFeatures;
+    plans: Record<MembershipType, MembershipFeatures>;
+  };
+}
+
 function isMembershipType(value: unknown): value is MembershipType {
   return value === "basic" || value === "premium" || value === "vip";
 }
@@ -85,3 +94,35 @@ export function getMembershipFeatures(
 ): MembershipFeatures {
   return MEMBERSHIP_FEATURES[membershipType];
 }
+
+export async function getCurrentMembershipFeaturesFromServer(
+  token: string | null,
+): Promise<{
+  membershipType: MembershipType;
+  features: MembershipFeatures;
+}> {
+  if (!token) {
+    return {
+      membershipType: "basic",
+      features: MEMBERSHIP_FEATURES.basic,
+    };
+  }
+
+  const response = await apiClient.get<MembershipFeaturesResponse>(
+    API_ENDPOINTS.MEMBERSHIP.FEATURES,
+    withAuth(token),
+  );
+
+  const data = response.data?.data;
+  if (!data) {
+    return {
+      membershipType: "basic",
+      features: MEMBERSHIP_FEATURES.basic,
+    };
+  }
+
+  return {
+    membershipType: data.membershipType,
+    features: data.currentFeatures,
+  };
+}

apps/mobile/src/app/(auth)/onboarding.tsx

@@ -13,12 +13,17 @@ import { useUser, useAuth } from "@clerk/clerk-expo";
 import { useRouter } from "expo-router";
 import { fitnessProfileApi } from "@/api/fitnessProfile";
 import { gymsApi, type Gym } from "@/api/gyms";
+import { useTheme } from "../../contexts/ThemeContext";
+import { Input } from "../../components/Input";
+import { MinimalButton } from "../../components/MinimalButton";
+import { MinimalCard } from "../../components/MinimalCard";
 import log from "../../utils/logger";
 
 export default function OnboardingScreen() {
   const { user } = useUser();
   const { getToken } = useAuth();
   const router = useRouter();
+  const { colors, typography } = useTheme();
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [gyms, setGyms] = useState<Gym[]>([]);
   const [gymsLoading, setGymsLoading] = useState<boolean>(false);
@@ -134,24 +139,53 @@ export default function OnboardingScreen() {
   const progress = calculateProgress();
 
   return (
-    <ScrollView style={styles.container}>
+    <ScrollView
-      <Text style={styles.title}>Set Up Your Fitness Profile</Text>
+      style={[styles.container, { backgroundColor: colors.background }]}
-      <Text style={styles.subtitle}>
+    >
+      <Text
+        style={[typography.h2, { color: colors.textPrimary }, styles.title]}
+      >
+        Set Up Your Fitness Profile
+      </Text>
+      <Text
+        style={[
+          typography.body,
+          { color: colors.textSecondary },
+          styles.subtitle,
+        ]}
+      >
         Help us personalize your fitness journey
       </Text>
 
       {/* Progress indicator */}
       <View style={styles.progressContainer}>
-        <View style={styles.progressBarBackground}>
+        <View
-          <View style={[styles.progressBarFill, { width: `${progress}%` }]} />
+          style={[
+            styles.progressBarBackground,
+            { backgroundColor: colors.borderLight },
+          ]}
+        >
+          <View
+            style={[
+              styles.progressBarFill,
+              { width: `${progress}%`, backgroundColor: colors.primary },
+            ]}
+          />
         </View>
-        <Text style={styles.progressText}>{progress}% Complete</Text>
+        <Text
+          style={[
+            typography.caption,
+            { color: colors.textTertiary },
+            styles.progressText,
+          ]}
+        >
+          {progress}% Complete
+        </Text>
       </View>
 
       <View style={styles.form}>
-        <Text style={styles.label}>Height (cm)</Text>
+        <Input
-        <TextInput
+          label="Height (cm)"
-          style={styles.input}
           value={fitnessProfile.height}
           onChangeText={(value) =>
             setFitnessProfile({ ...fitnessProfile, height: value })
@@ -160,9 +194,8 @@ export default function OnboardingScreen() {
           placeholder="Enter height in cm"
         />
 
-        <Text style={styles.label}>Weight (kg)</Text>
+        <Input
-        <TextInput
+          label="Weight (kg)"
-          style={styles.input}
           value={fitnessProfile.weight}
           onChangeText={(value) =>
             setFitnessProfile({ ...fitnessProfile, weight: value })
@@ -171,9 +204,8 @@ export default function OnboardingScreen() {
           placeholder="Enter weight in kg"
         />
 
-        <Text style={styles.label}>Age</Text>
+        <Input
-        <TextInput
+          label="Age"
-          style={styles.input}
           value={fitnessProfile.age}
           onChangeText={(value) =>
             setFitnessProfile({ ...fitnessProfile, age: value })
@@ -182,9 +214,9 @@ export default function OnboardingScreen() {
           placeholder="Enter your age"
         />
 
-        <Text style={styles.label}>Fitness Goals</Text>
+        <Input
-        <TextInput
+          label="Fitness Goals"
-          style={[styles.input, styles.textArea]}
+          style={styles.textArea}
           value={fitnessProfile.goals}
           onChangeText={(value) =>
             setFitnessProfile({ ...fitnessProfile, goals: value })
@@ -194,33 +226,48 @@ export default function OnboardingScreen() {
           placeholder="What are your fitness goals?"
         />
 
-        <Text style={styles.label}>Fitness Level</Text>
+        <Text
+          style={[typography.h4, { color: colors.textPrimary }, styles.label]}
+        >
+          Fitness Level
+        </Text>
         <View style={styles.buttonGroup}>
           {["beginner", "intermediate", "advanced"].map((level) => (
             <TouchableOpacity
               key={level}
               style={[
-                styles.levelButton,
+                styles.segmentButton,
-                fitnessProfile.fitnessLevel === level && styles.selectedButton,
+                {
+                  backgroundColor:
+                    fitnessProfile.fitnessLevel === level
+                      ? colors.primary
+                      : colors.surface,
+                  borderColor: colors.border,
+                },
               ]}
               onPress={() => handleLevelSelect(level)}
             >
               <Text
                 style={[
-                  styles.levelButtonText,
+                  typography.caption,
-                  fitnessProfile.fitnessLevel === level &&
+                  {
-                    styles.selectedButtonText,
+                    color:
+                      fitnessProfile.fitnessLevel === level
+                        ? colors.white
+                        : colors.textSecondary,
+                    textTransform: "capitalize",
+                  },
                 ]}
               >
-                {level.charAt(0).toUpperCase() + level.slice(1)}
+                {level}
               </Text>
             </TouchableOpacity>
           ))}
         </View>
 
-        <Text style={styles.label}>Medical Conditions</Text>
+        <Input
-        <TextInput
+          label="Medical Conditions"
-          style={[styles.input, styles.textArea]}
+          style={styles.textArea}
           value={fitnessProfile.medicalConditions}
           onChangeText={(value) =>
             setFitnessProfile({ ...fitnessProfile, medicalConditions: value })
@@ -230,9 +277,9 @@ export default function OnboardingScreen() {
           placeholder="Any medical conditions we should know about?"
         />
 
-        <Text style={styles.label}>Dietary Restrictions</Text>
+        <Input
-        <TextInput
+          label="Dietary Restrictions"
-          style={[styles.input, styles.textArea]}
+          style={styles.textArea}
           value={fitnessProfile.dietaryRestrictions}
           onChangeText={(value) =>
             setFitnessProfile({
@@ -245,34 +292,47 @@ export default function OnboardingScreen() {
           placeholder="Any dietary restrictions?"
         />
 
-        <Text style={styles.label}>Preferred Workout Time</Text>
+        <Text
+          style={[typography.h4, { color: colors.textPrimary }, styles.label]}
+        >
+          Preferred Workout Time
+        </Text>
         <View style={styles.buttonGroup}>
           {["morning", "afternoon", "evening"].map((time) => (
             <TouchableOpacity
               key={time}
               style={[
-                styles.timeButton,
+                styles.segmentButton,
-                fitnessProfile.preferredWorkoutTime === time &&
+                {
-                  styles.selectedButton,
+                  backgroundColor:
+                    fitnessProfile.preferredWorkoutTime === time
+                      ? colors.primary
+                      : colors.surface,
+                  borderColor: colors.border,
+                },
               ]}
               onPress={() => handleTimeSelect(time)}
             >
               <Text
                 style={[
-                  styles.timeButtonText,
+                  typography.caption,
-                  fitnessProfile.preferredWorkoutTime === time &&
+                  {
-                    styles.selectedButtonText,
+                    color:
+                      fitnessProfile.preferredWorkoutTime === time
+                        ? colors.white
+                        : colors.textSecondary,
+                    textTransform: "capitalize",
+                  },
                 ]}
               >
-                {time.charAt(0).toUpperCase() + time.slice(1)}
+                {time}
               </Text>
             </TouchableOpacity>
           ))}
         </View>
 
-        <Text style={styles.label}>Workouts per Week</Text>
+        <Input
-        <TextInput
+          label="Workouts per Week"
-          style={styles.input}
           value={fitnessProfile.workoutFrequency}
           onChangeText={(value) =>
             setFitnessProfile({ ...fitnessProfile, workoutFrequency: value })
@@ -281,7 +341,11 @@ export default function OnboardingScreen() {
           placeholder="Number of workouts per week"
         />
 
-        <Text style={styles.label}>Select a Gym</Text>
+        <Text
+          style={[typography.h4, { color: colors.textPrimary }, styles.label]}
+        >
+          Select a Gym
+        </Text>
         {gymsLoading ? (
           <ActivityIndicator />
         ) : (
@@ -293,15 +357,24 @@ export default function OnboardingScreen() {
             <View style={{ flexDirection: "row" }}>
               <TouchableOpacity
                 style={[
-                  styles.levelButton,
+                  styles.segmentButton,
-                  selectedGymId === null && styles.selectedButton,
+                  {
+                    backgroundColor:
+                      selectedGymId === null ? colors.primary : colors.surface,
+                    borderColor: colors.border,
+                  },
                 ]}
                 onPress={() => setSelectedGymId(null)}
               >
                 <Text
                   style={[
-                    styles.levelButtonText,
+                    typography.caption,
-                    selectedGymId === null && styles.selectedButtonText,
+                    {
+                      color:
+                        selectedGymId === null
+                          ? colors.white
+                          : colors.textSecondary,
+                    },
                   ]}
                 >
                   Proceed without gym
@@ -311,15 +384,26 @@ export default function OnboardingScreen() {
                 <TouchableOpacity
                   key={gym.id}
                   style={[
-                    styles.levelButton,
+                    styles.segmentButton,
-                    selectedGymId === gym.id && styles.selectedButton,
+                    {
+                      backgroundColor:
+                        selectedGymId === gym.id
+                          ? colors.primary
+                          : colors.surface,
+                      borderColor: colors.border,
+                    },
                   ]}
                   onPress={() => setSelectedGymId(gym.id)}
                 >
                   <Text
                     style={[
-                      styles.levelButtonText,
+                      typography.caption,
-                      selectedGymId === gym.id && styles.selectedButtonText,
+                      {
+                        color:
+                          selectedGymId === gym.id
+                            ? colors.white
+                            : colors.textSecondary,
+                      },
                     ]}
                   >
                     {gym.name}
@@ -330,17 +414,14 @@ export default function OnboardingScreen() {
           </ScrollView>
         )}
 
-        <TouchableOpacity
+        <MinimalButton
-          style={styles.submitButton}
+          title="Complete Setup"
           onPress={handleSubmit}
+          loading={isSubmitting}
           disabled={isSubmitting}
-        >
+          fullWidth
-          {isSubmitting ? (
+          size="lg"
-            <ActivityIndicator color="white" />
+        />
-          ) : (
-            <Text style={styles.submitButtonText}>Complete Setup</Text>
-          )}
-        </TouchableOpacity>
       </View>
     </ScrollView>
   );
@@ -349,18 +430,13 @@ export default function OnboardingScreen() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: "#f5f5f5",
   },
   title: {
-    fontSize: 24,
-    fontWeight: "bold",
     textAlign: "center",
     marginTop: 40,
     marginBottom: 8,
   },
   subtitle: {
-    fontSize: 16,
-    color: "#666",
     textAlign: "center",
     marginBottom: 32,
   },
@@ -368,91 +444,39 @@ const styles = StyleSheet.create({
     padding: 20,
   },
   label: {
-    fontSize: 14,
+    marginBottom: 8,
-    fontWeight: "600",
-    color: "#374151",
-    marginBottom: 4,
-  },
-  input: {
-    borderWidth: 1,
-    borderColor: "#ddd",
-    borderRadius: 8,
-    padding: 12,
-    marginBottom: 16,
-    backgroundColor: "white",
   },
   textArea: {
-    height: 80,
+    minHeight: 80,
     textAlignVertical: "top",
+    marginBottom: 16,
   },
   buttonGroup: {
     flexDirection: "row",
-    justifyContent: "space-between",
+    flexWrap: "wrap",
+    gap: 8,
     marginBottom: 16,
   },
-  levelButton: {
+  segmentButton: {
-    flex: 1,
+    minWidth: 100,
-    backgroundColor: "#f3f4f6",
     padding: 10,
-    borderRadius: 8,
+    borderRadius: 10,
-    marginHorizontal: 4,
+    borderWidth: 1,
     alignItems: "center",
   },
-  timeButton: {
-    flex: 1,
-    backgroundColor: "#f3f4f6",
-    padding: 10,
-    borderRadius: 8,
-    marginHorizontal: 4,
-    alignItems: "center",
-  },
-  selectedButton: {
-    backgroundColor: "#3b82f6",
-  },
-  levelButtonText: {
-    color: "#374151",
-    fontSize: 14,
-    fontWeight: "500",
-  },
-  timeButtonText: {
-    color: "#374151",
-    fontSize: 14,
-    fontWeight: "500",
-  },
-  selectedButtonText: {
-    color: "white",
-  },
-  submitButton: {
-    backgroundColor: "#3b82f6",
-    padding: 16,
-    borderRadius: 8,
-    alignItems: "center",
-    marginTop: 24,
-  },
-  submitButtonText: {
-    color: "white",
-    fontSize: 16,
-    fontWeight: "600",
-  },
   progressContainer: {
     paddingHorizontal: 20,
     marginBottom: 16,
   },
   progressBarBackground: {
     height: 8,
-    backgroundColor: "#e5e7eb",
     borderRadius: 4,
     overflow: "hidden",
     marginBottom: 8,
   },
   progressBarFill: {
     height: "100%",
-    backgroundColor: "#3b82f6",
     borderRadius: 4,
   },
-  progressText: {
+  progressText: { textAlign: "center" },
-    fontSize: 12,
-    color: "#6b7280",
-    textAlign: "center",
-  },
 });

apps/mobile/src/app/(auth)/sign-in.tsx

@@ -4,7 +4,6 @@ import { useRouter } from "expo-router";
 import {
   View,
   Text,
-  TextInput,
   TouchableOpacity,
   StyleSheet,
   ActivityIndicator,
@@ -13,6 +12,9 @@ import {
   ScrollView,
 } from "react-native";
 import { OAuthButtons } from "../../components/auth/OAuthButtons";
+import { Input } from "../../components/Input";
+import { MinimalButton } from "../../components/MinimalButton";
+import { useTheme } from "../../contexts/ThemeContext";
 import { getErrorMessage, getClerkErrorCode } from "../../utils/error-helpers";
 import log from "../../utils/logger";
 
@@ -25,6 +27,7 @@ export default function SignInScreen() {
   const [password, setPassword] = useState("");
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState("");
+  const { colors, typography } = useTheme();
 
   // Redirect if already signed in
   useEffect(() => {
@@ -77,8 +80,15 @@ export default function SignInScreen() {
   if (isSignedIn) {
     return (
       <View style={[styles.container, styles.centerContent]}>
-        <ActivityIndicator size="large" color="#2563eb" />
+        <ActivityIndicator size="large" color={colors.primary} />
-        <Text style={styles.loadingText}>Redirecting...</Text>
+        <Text
+          style={[
+            typography.body,
+            { color: colors.textSecondary, marginTop: 12 },
+          ]}
+        >
+          Redirecting...
+        </Text>
       </View>
     );
   }
@@ -86,19 +96,33 @@ export default function SignInScreen() {
   return (
     <KeyboardAvoidingView
       behavior={Platform.OS === "ios" ? "padding" : "height"}
-      style={styles.container}
+      style={[styles.container, { backgroundColor: colors.background }]}
     >
       <ScrollView
         contentContainerStyle={styles.scrollContent}
         keyboardShouldPersistTaps="handled"
       >
         <View style={styles.content}>
-          <Text style={styles.title}>Welcome Back</Text>
+          <Text
-          <Text style={styles.subtitle}>Sign in to continue to FitAI</Text>
+            style={[typography.h1, { color: colors.textPrimary }, styles.title]}
+          >
+            Welcome Back
+          </Text>
+          <Text
+            style={[
+              typography.body,
+              { color: colors.textSecondary },
+              styles.subtitle,
+            ]}
+          >
+            Sign in to continue to FitAI
+          </Text>
 
           {error ? (
             <View style={styles.errorContainer}>
-              <Text style={styles.errorText}>{error}</Text>
+              <Text style={[typography.caption, { color: colors.danger }]}>
+                {error}
+              </Text>
             </View>
           ) : null}
 
@@ -112,13 +136,11 @@ export default function SignInScreen() {
 
           <View style={styles.form}>
             <View style={styles.inputContainer}>
-              <Text style={styles.label}>Email</Text>
+              <Input
-              <TextInput
+                label="Email"
-                style={styles.input}
                 autoCapitalize="none"
                 value={emailAddress}
                 placeholder="Enter your email"
-                placeholderTextColor="#999"
                 onChangeText={setEmailAddress}
                 keyboardType="email-address"
                 autoComplete="email"
@@ -127,12 +149,10 @@ export default function SignInScreen() {
             </View>
 
             <View style={styles.inputContainer}>
-              <Text style={styles.label}>Password</Text>
+              <Input
-              <TextInput
+                label="Password"
-                style={styles.input}
                 value={password}
                 placeholder="Enter your password"
-                placeholderTextColor="#999"
                 secureTextEntry={true}
                 onChangeText={setPassword}
                 autoComplete="password"
@@ -140,26 +160,29 @@ export default function SignInScreen() {
               />
             </View>
 
-            <TouchableOpacity
+            <MinimalButton
-              style={[styles.button, loading && styles.buttonDisabled]}
+              title="Sign In"
               onPress={onSignInPress}
+              loading={loading}
               disabled={loading || !emailAddress || !password}
-            >
+              fullWidth
-              {loading ? (
+              size="lg"
-                <ActivityIndicator color="#fff" />
+            />
-              ) : (
-                <Text style={styles.buttonText}>Sign In</Text>
-              )}
-            </TouchableOpacity>
           </View>
 
           <View style={styles.footer}>
-            <Text style={styles.footerText}>Don't have an account? </Text>
+            <Text style={[typography.caption, { color: colors.textSecondary }]}>
+              Don't have an account?{" "}
+            </Text>
             <TouchableOpacity
               onPress={() => router.push("/(auth)/sign-up")}
               disabled={loading}
             >
-              <Text style={styles.linkText}>Sign Up</Text>
+              <Text
+                style={[typography.bodyEmphasis, { color: colors.primary }]}
+              >
+                Sign Up
+              </Text>
             </TouchableOpacity>
           </View>
         </View>
@@ -171,17 +194,11 @@ export default function SignInScreen() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: "#f5f5f5",
   },
   centerContent: {
     justifyContent: "center",
     alignItems: "center",
   },
-  loadingText: {
-    marginTop: 12,
-    fontSize: 16,
-    color: "#666",
-  },
   scrollContent: {
     flexGrow: 1,
     justifyContent: "center",
@@ -193,27 +210,18 @@ const styles = StyleSheet.create({
     paddingVertical: 40,
   },
   title: {
-    fontSize: 32,
-    fontWeight: "bold",
-    color: "#1a1a1a",
     marginBottom: 8,
   },
   subtitle: {
-    fontSize: 16,
-    color: "#666",
     marginBottom: 32,
   },
   errorContainer: {
-    backgroundColor: "#fee",
+    backgroundColor: "rgba(255, 59, 59, 0.08)",
     padding: 12,
-    borderRadius: 8,
+    borderRadius: 12,
     marginBottom: 16,
     borderLeftWidth: 4,
-    borderLeftColor: "#f44",
+    borderLeftColor: "#FF3B3B",
-  },
-  errorText: {
-    color: "#c00",
-    fontSize: 14,
   },
   form: {
     marginBottom: 24,
@@ -221,51 +229,11 @@ const styles = StyleSheet.create({
   inputContainer: {
     marginBottom: 20,
   },
-  label: {
-    fontSize: 14,
-    fontWeight: "600",
-    color: "#333",
-    marginBottom: 8,
-  },
-  input: {
-    backgroundColor: "#fff",
-    borderWidth: 1,
-    borderColor: "#ddd",
-    borderRadius: 8,
-    paddingHorizontal: 16,
-    paddingVertical: 12,
-    fontSize: 16,
-    color: "#1a1a1a",
-  },
-  button: {
-    backgroundColor: "#2563eb",
-    paddingVertical: 16,
-    borderRadius: 8,
-    alignItems: "center",
-    marginTop: 8,
-  },
-  buttonDisabled: {
-    backgroundColor: "#93c5fd",
-  },
-  buttonText: {
-    color: "#fff",
-    fontSize: 16,
-    fontWeight: "600",
-  },
   footer: {
     flexDirection: "row",
     justifyContent: "center",
     alignItems: "center",
   },
-  footerText: {
-    fontSize: 14,
-    color: "#666",
-  },
-  linkText: {
-    fontSize: 14,
-    color: "#2563eb",
-    fontWeight: "600",
-  },
   dividerContainer: {
     flexDirection: "row",
     alignItems: "center",
@@ -274,11 +242,11 @@ const styles = StyleSheet.create({
   dividerLine: {
     flex: 1,
     height: 1,
-    backgroundColor: "#ddd",
+    backgroundColor: "#E5E5EA",
   },
   dividerText: {
     marginHorizontal: 10,
-    color: "#666",
+    color: "#8E8E93",
     fontSize: 14,
   },
 });

apps/mobile/src/app/(auth)/sign-up.tsx

@@ -4,7 +4,6 @@ import { useRouter } from "expo-router";
 import {
   View,
   Text,
-  TextInput,
   TouchableOpacity,
   StyleSheet,
   ActivityIndicator,
@@ -13,6 +12,9 @@ import {
   ScrollView,
 } from "react-native";
 import { OAuthButtons } from "../../components/auth/OAuthButtons";
+import { Input } from "../../components/Input";
+import { MinimalButton } from "../../components/MinimalButton";
+import { useTheme } from "../../contexts/ThemeContext";
 import { getErrorMessage, getClerkErrorCode } from "../../utils/error-helpers";
 import log from "../../utils/logger";
 
@@ -29,6 +31,7 @@ export default function SignUpScreen() {
   const [code, setCode] = useState("");
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState("");
+  const { colors, typography } = useTheme();
 
   // Redirect if already signed in
   useEffect(() => {
@@ -101,8 +104,15 @@ export default function SignUpScreen() {
   if (isSignedIn) {
     return (
       <View style={[styles.container, styles.centerContent]}>
-        <ActivityIndicator size="large" color="#2563eb" />
+        <ActivityIndicator size="large" color={colors.primary} />
-        <Text style={styles.loadingText}>Redirecting...</Text>
+        <Text
+          style={[
+            typography.body,
+            { color: colors.textSecondary, marginTop: 12 },
+          ]}
+        >
+          Redirecting...
+        </Text>
       </View>
     );
   }
@@ -118,42 +128,53 @@ export default function SignUpScreen() {
           keyboardShouldPersistTaps="handled"
         >
           <View style={styles.content}>
-            <Text style={styles.title}>Verify Email</Text>
+            <Text
-            <Text style={styles.subtitle}>
+              style={[
+                typography.h1,
+                { color: colors.textPrimary },
+                styles.title,
+              ]}
+            >
+              Verify Email
+            </Text>
+            <Text
+              style={[
+                typography.body,
+                { color: colors.textSecondary },
+                styles.subtitle,
+              ]}
+            >
               Enter the verification code sent to {emailAddress}
             </Text>
 
             {error ? (
               <View style={styles.errorContainer}>
-                <Text style={styles.errorText}>{error}</Text>
+                <Text style={[typography.caption, { color: colors.danger }]}>
+                  {error}
+                </Text>
               </View>
             ) : null}
 
             <View style={styles.form}>
               <View style={styles.inputContainer}>
-                <Text style={styles.label}>Verification Code</Text>
+                <Input
-                <TextInput
+                  label="Verification Code"
-                  style={styles.input}
                   value={code}
                   placeholder="Enter verification code"
-                  placeholderTextColor="#999"
                   onChangeText={setCode}
                   keyboardType="number-pad"
                   editable={!loading}
                 />
               </View>
 
-              <TouchableOpacity
+              <MinimalButton
-                style={[styles.button, loading && styles.buttonDisabled]}
+                title="Verify Email"
                 onPress={onVerifyPress}
+                loading={loading}
                 disabled={loading || !code}
-              >
+                fullWidth
-                {loading ? (
+                size="lg"
-                  <ActivityIndicator color="#fff" />
+              />
-                ) : (
-                  <Text style={styles.buttonText}>Verify Email</Text>
-                )}
-              </TouchableOpacity>
             </View>
           </View>
         </ScrollView>
@@ -164,19 +185,33 @@ export default function SignUpScreen() {
   return (
     <KeyboardAvoidingView
       behavior={Platform.OS === "ios" ? "padding" : "height"}
-      style={styles.container}
+      style={[styles.container, { backgroundColor: colors.background }]}
     >
       <ScrollView
         contentContainerStyle={styles.scrollContent}
         keyboardShouldPersistTaps="handled"
       >
         <View style={styles.content}>
-          <Text style={styles.title}>Create Account</Text>
+          <Text
-          <Text style={styles.subtitle}>Sign up to get started with FitAI</Text>
+            style={[typography.h1, { color: colors.textPrimary }, styles.title]}
+          >
+            Create Account
+          </Text>
+          <Text
+            style={[
+              typography.body,
+              { color: colors.textSecondary },
+              styles.subtitle,
+            ]}
+          >
+            Sign up to get started with FitAI
+          </Text>
 
           {error ? (
             <View style={styles.errorContainer}>
-              <Text style={styles.errorText}>{error}</Text>
+              <Text style={[typography.caption, { color: colors.danger }]}>
+                {error}
+              </Text>
             </View>
           ) : null}
 
@@ -190,12 +225,10 @@ export default function SignUpScreen() {
 
           <View style={styles.form}>
             <View style={styles.inputContainer}>
-              <Text style={styles.label}>First Name</Text>
+              <Input
-              <TextInput
+                label="First Name"
-                style={styles.input}
                 value={firstName}
                 placeholder="Enter your first name"
-                placeholderTextColor="#999"
                 onChangeText={setFirstName}
                 autoComplete="given-name"
                 editable={!loading}
@@ -203,12 +236,10 @@ export default function SignUpScreen() {
             </View>
 
             <View style={styles.inputContainer}>
-              <Text style={styles.label}>Last Name</Text>
+              <Input
-              <TextInput
+                label="Last Name"
-                style={styles.input}
                 value={lastName}
                 placeholder="Enter your last name"
-                placeholderTextColor="#999"
                 onChangeText={setLastName}
                 autoComplete="family-name"
                 editable={!loading}
@@ -216,13 +247,11 @@ export default function SignUpScreen() {
             </View>
 
             <View style={styles.inputContainer}>
-              <Text style={styles.label}>Email</Text>
+              <Input
-              <TextInput
+                label="Email"
-                style={styles.input}
                 autoCapitalize="none"
                 value={emailAddress}
                 placeholder="Enter your email"
-                placeholderTextColor="#999"
                 onChangeText={setEmailAddress}
                 keyboardType="email-address"
                 autoComplete="email"
@@ -231,42 +260,51 @@ export default function SignUpScreen() {
             </View>
 
             <View style={styles.inputContainer}>
-              <Text style={styles.label}>Password</Text>
+              <Input
-              <TextInput
+                label="Password"
-                style={styles.input}
                 value={password}
                 placeholder="Create a password"
-                placeholderTextColor="#999"
                 secureTextEntry={true}
                 onChangeText={setPassword}
                 autoComplete="password-new"
                 editable={!loading}
               />
-              <Text style={styles.hint}>Must be at least 8 characters</Text>
+              <Text
+                style={[
+                  typography.caption,
+                  { color: colors.textTertiary },
+                  styles.hint,
+                ]}
+              >
+                Must be at least 8 characters
+              </Text>
             </View>
 
-            <TouchableOpacity
+            <MinimalButton
-              style={[styles.button, loading && styles.buttonDisabled]}
+              title="Sign Up"
               onPress={onSignUpPress}
+              loading={loading}
               disabled={
                 loading || !emailAddress || !password || !firstName || !lastName
               }
-            >
+              fullWidth
-              {loading ? (
+              size="lg"
-                <ActivityIndicator color="#fff" />
+            />
-              ) : (
-                <Text style={styles.buttonText}>Sign Up</Text>
-              )}
-            </TouchableOpacity>
           </View>
 
           <View style={styles.footer}>
-            <Text style={styles.footerText}>Already have an account? </Text>
+            <Text style={[typography.caption, { color: colors.textSecondary }]}>
+              Already have an account?{" "}
+            </Text>
             <TouchableOpacity
               onPress={() => router.push("/(auth)/sign-in")}
               disabled={loading}
             >
-              <Text style={styles.linkText}>Sign In</Text>
+              <Text
+                style={[typography.bodyEmphasis, { color: colors.primary }]}
+              >
+                Sign In
+              </Text>
             </TouchableOpacity>
           </View>
         </View>
@@ -278,17 +316,11 @@ export default function SignUpScreen() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: "#f5f5f5",
   },
   centerContent: {
     justifyContent: "center",
     alignItems: "center",
   },
-  loadingText: {
-    marginTop: 12,
-    fontSize: 16,
-    color: "#666",
-  },
   scrollContent: {
     flexGrow: 1,
     justifyContent: "center",
@@ -300,27 +332,18 @@ const styles = StyleSheet.create({
     paddingVertical: 40,
   },
   title: {
-    fontSize: 32,
-    fontWeight: "bold",
-    color: "#1a1a1a",
     marginBottom: 8,
   },
   subtitle: {
-    fontSize: 16,
-    color: "#666",
     marginBottom: 32,
   },
   errorContainer: {
-    backgroundColor: "#fee",
+    backgroundColor: "rgba(255, 59, 59, 0.08)",
     padding: 12,
-    borderRadius: 8,
+    borderRadius: 12,
     marginBottom: 16,
     borderLeftWidth: 4,
-    borderLeftColor: "#f44",
+    borderLeftColor: "#FF3B3B",
-  },
-  errorText: {
-    color: "#c00",
-    fontSize: 14,
   },
   form: {
     marginBottom: 24,
@@ -328,56 +351,14 @@ const styles = StyleSheet.create({
   inputContainer: {
     marginBottom: 20,
   },
-  label: {
-    fontSize: 14,
-    fontWeight: "600",
-    color: "#333",
-    marginBottom: 8,
-  },
-  input: {
-    backgroundColor: "#fff",
-    borderWidth: 1,
-    borderColor: "#ddd",
-    borderRadius: 8,
-    paddingHorizontal: 16,
-    paddingVertical: 12,
-    fontSize: 16,
-    color: "#1a1a1a",
-  },
   hint: {
-    fontSize: 12,
-    color: "#999",
     marginTop: 4,
   },
-  button: {
-    backgroundColor: "#2563eb",
-    paddingVertical: 16,
-    borderRadius: 8,
-    alignItems: "center",
-    marginTop: 8,
-  },
-  buttonDisabled: {
-    backgroundColor: "#93c5fd",
-  },
-  buttonText: {
-    color: "#fff",
-    fontSize: 16,
-    fontWeight: "600",
-  },
   footer: {
     flexDirection: "row",
     justifyContent: "center",
     alignItems: "center",
   },
-  footerText: {
-    fontSize: 14,
-    color: "#666",
-  },
-  linkText: {
-    fontSize: 14,
-    color: "#2563eb",
-    fontWeight: "600",
-  },
   dividerContainer: {
     flexDirection: "row",
     alignItems: "center",
@@ -386,11 +367,11 @@ const styles = StyleSheet.create({
   dividerLine: {
     flex: 1,
     height: 1,
-    backgroundColor: "#ddd",
+    backgroundColor: "#E5E5EA",
   },
   dividerText: {
     marginHorizontal: 10,
-    color: "#666",
+    color: "#8E8E93",
     fontSize: 14,
   },
 });

apps/mobile/src/app/(tabs)/_layout.tsx

@@ -80,7 +80,7 @@ export default function TabLayout() {
       <Tabs.Screen
         name="recommendations"
         options={{
-          title: "AI",
+          title: "Plans",
         }}
       />
       <Tabs.Screen

apps/mobile/src/app/(tabs)/index.tsx

@@ -8,6 +8,7 @@ import {
   Animated,
   TouchableOpacity,
   Alert,
+  AppState,
 } from "react-native";
 import { useUser } from "@clerk/clerk-expo";
 import { useState, useCallback, useEffect, useRef, useMemo } from "react";
@@ -42,6 +43,34 @@ import {
 const CALORIE_GOAL = 2000;
 const WATER_GOAL = 2000;
 const WORKOUT_GOAL = 3;
+const MOTIVATION_KEY_PREFIX = "home-motivation";
+const HOME_METRICS_KEY_PREFIX = "home-metrics";
+
+const getLocalDateKey = () => {
+  const now = new Date();
+  const year = now.getFullYear();
+  const month = String(now.getMonth() + 1).padStart(2, "0");
+  const day = String(now.getDate()).padStart(2, "0");
+  return `${year}-${month}-${day}`;
+};
+
+const getMillisecondsUntilNextMidnight = () => {
+  const now = new Date();
+  const nextMidnight = new Date(now);
+  nextMidnight.setHours(24, 0, 0, 0);
+  return Math.max(1000, nextMidnight.getTime() - now.getTime());
+};
+
+const getRandomMotivation = () => {
+  const messages = [
+    "Let's crush it today! 💪",
+    "Ready to level up? 🔥",
+    "You've got this! ⚡",
+    "Time to shine! ✨",
+    "Let's make it happen! 🚀",
+  ];
+  return messages[Math.floor(Math.random() * messages.length)];
+};
 
 export default function HomeScreen() {
   const { user } = useUser();
@@ -56,15 +85,108 @@ export default function HomeScreen() {
   const [scanFoodModalVisible, setScanFoodModalVisible] = useState(false);
   const [calories, setCalories] = useState(0);
   const [waterIntake, setWaterIntake] = useState(0);
+  const [motivationalMessage, setMotivationalMessage] = useState(
+    "Let's crush it today! 💪",
+  );
 
   const caloriesBounce = useRef(new Animated.Value(1)).current;
   const waterBounce = useRef(new Animated.Value(1)).current;
+  const caloriesRef = useRef(0);
+  const waterRef = useRef(0);
+  const currentDateRef = useRef(getLocalDateKey());
+  const midnightResetTimerRef = useRef<ReturnType<typeof setTimeout> | null>(
+    null,
+  );
+
+  useEffect(() => {
+    caloriesRef.current = calories;
+  }, [calories]);
+
+  useEffect(() => {
+    waterRef.current = waterIntake;
+  }, [waterIntake]);
+
+  const getMetricsStorageKey = useCallback(
+    () => `${HOME_METRICS_KEY_PREFIX}_${user?.id || "guest"}`,
+    [user?.id],
+  );
+
+  const persistDailyMetrics = useCallback(
+    async (nextCalories: number, nextWaterIntake: number, dateKey?: string) => {
+      if (!user?.id) return;
+
+      const targetDate = dateKey || currentDateRef.current;
+      await AsyncStorage.setItem(
+        getMetricsStorageKey(),
+        JSON.stringify({
+          date: targetDate,
+          calories: nextCalories,
+          waterIntake: nextWaterIntake,
+        }),
+      );
+    },
+    [getMetricsStorageKey, user?.id],
+  );
+
+  const reconcileDailyMetrics = useCallback(async () => {
+    const today = getLocalDateKey();
+    currentDateRef.current = today;
+
+    if (!user?.id) {
+      setCalories(0);
+      setWaterIntake(0);
+      return;
+    }
+
+    const stored = await AsyncStorage.getItem(getMetricsStorageKey());
+    if (!stored) {
+      setCalories(0);
+      setWaterIntake(0);
+      await persistDailyMetrics(0, 0, today);
+      return;
+    }
+
+    try {
+      const parsed = JSON.parse(stored) as {
+        date?: string;
+        calories?: number;
+        waterIntake?: number;
+      };
+
+      if (parsed.date === today) {
+        const nextCalories = Number(parsed.calories) || 0;
+        const nextWater = Number(parsed.waterIntake) || 0;
+        setCalories(nextCalories);
+        setWaterIntake(nextWater);
+      } else {
+        setCalories(0);
+        setWaterIntake(0);
+        await persistDailyMetrics(0, 0, today);
+      }
+    } catch {
+      setCalories(0);
+      setWaterIntake(0);
+      await persistDailyMetrics(0, 0, today);
+    }
+  }, [getMetricsStorageKey, persistDailyMetrics, user?.id]);
+
+  const scheduleMidnightReset = useCallback(() => {
+    if (midnightResetTimerRef.current) {
+      clearTimeout(midnightResetTimerRef.current);
+    }
+
+    midnightResetTimerRef.current = setTimeout(() => {
+      void reconcileDailyMetrics();
+      scheduleMidnightReset();
+    }, getMillisecondsUntilNextMidnight() + 50);
+  }, [reconcileDailyMetrics]);
 
   useFocusEffect(
     useCallback(() => {
+      void reconcileDailyMetrics();
       refetchStatistics();
       refetchGoals();
-    }, [refetchStatistics, refetchGoals]),
+    }, [reconcileDailyMetrics, refetchStatistics, refetchGoals]),
   );
 
   const onRefresh = useCallback(async () => {
@@ -80,23 +202,16 @@ export default function HomeScreen() {
     return "Good Evening";
   };
 
-  const getMotivationalMessage = () => {
-    const messages = [
-      "Let's crush it today! 💪",
-      "Ready to level up? 🔥",
-      "You've got this! ⚡",
-      "Time to shine! ✨",
-      "Let's make it happen! 🚀",
-    ];
-    return messages[Math.floor(Math.random() * messages.length)];
-  };
-
   const handleSaveMeal = (meal: {
     type: string;
     name: string;
     calories: number;
   }) => {
-    setCalories((prev) => prev + meal.calories);
+    setCalories((prev) => {
+      const next = prev + meal.calories;
+      void persistDailyMetrics(next, waterRef.current);
+      return next;
+    });
     setTrackMealModalVisible(false);
     Animated.sequence([
       Animated.timing(caloriesBounce, {
@@ -113,7 +228,11 @@ export default function HomeScreen() {
   };
 
   const handleAddWater = (amount: number) => {
-    setWaterIntake((prev) => prev + amount);
+    setWaterIntake((prev) => {
+      const next = prev + amount;
+      void persistDailyMetrics(caloriesRef.current, next);
+      return next;
+    });
     setAddWaterModalVisible(false);
     Animated.sequence([
       Animated.timing(waterBounce, {
@@ -129,59 +248,81 @@ export default function HomeScreen() {
     ]).start();
   };
 
-  const handleResetCalories = () => setCalories(0);
+  const handleResetCalories = () => {
-  const handleResetWater = () => setWaterIntake(0);
+    setCalories(0);
+    void persistDailyMetrics(0, waterRef.current);
+  };
+
+  const handleResetWater = () => {
+    setWaterIntake(0);
+    void persistDailyMetrics(caloriesRef.current, 0);
+  };
+
   const handleAddScannedFood = (scannedCalories: number) => {
-    setCalories((prev) => prev + scannedCalories);
+    setCalories((prev) => {
+      const next = prev + scannedCalories;
+      void persistDailyMetrics(next, waterRef.current);
+      return next;
+    });
     setScanFoodModalVisible(false);
   };
 
-  const resetAllCounters = async () => {
+  useEffect(() => {
-    setCalories(0);
+    const loadDailyMotivation = async () => {
-    setWaterIntake(0);
+      const today = new Date().toISOString().split("T")[0];
-    const today = new Date().toDateString();
+      const storageKey = `${MOTIVATION_KEY_PREFIX}_${user?.id || "guest"}`;
-    await AsyncStorage.setItem("lastResetDate", today);
+      const storedValue = await AsyncStorage.getItem(storageKey);
-    await AsyncStorage.removeItem(`calories_${today}`);
+
-    await AsyncStorage.removeItem(`water_${today}`);
+      if (storedValue) {
+        try {
+          const parsed = JSON.parse(storedValue) as {
+            date: string;
+            message: string;
           };
 
-  useEffect(() => {
+          if (parsed.date === today && parsed.message) {
-    const loadPersistedData = async () => {
+            setMotivationalMessage(parsed.message);
-      const today = new Date().toDateString();
+            return;
-      const storedCalories = await AsyncStorage.getItem(`calories_${today}`);
+          }
-      const storedWater = await AsyncStorage.getItem(`water_${today}`);
+        } catch {
-      if (storedCalories) setCalories(parseInt(storedCalories, 10));
+          // Ignore invalid local value and regenerate
-      if (storedWater) setWaterIntake(parseInt(storedWater, 10));
+        }
+      }
+
+      const nextMessage = getRandomMotivation();
+      setMotivationalMessage(nextMessage);
+      await AsyncStorage.setItem(
+        storageKey,
+        JSON.stringify({ date: today, message: nextMessage }),
+      );
     };
-    loadPersistedData();
+
-  }, []);
+    loadDailyMotivation();
+  }, [user?.id]);
 
   useEffect(() => {
-    const persistCalories = async () => {
+    void reconcileDailyMetrics();
-      const today = new Date().toDateString();
+  }, [reconcileDailyMetrics]);
-      await AsyncStorage.setItem(`calories_${today}`, calories.toString());
-    };
-    persistCalories();
-  }, [calories]);
 
   useEffect(() => {
-    const persistWater = async () => {
+    const appStateSubscription = AppState.addEventListener(
-      const today = new Date().toDateString();
+      "change",
-      await AsyncStorage.setItem(`water_${today}`, waterIntake.toString());
+      (state) => {
-    };
+        if (state === "active") {
-    persistWater();
+          void reconcileDailyMetrics();
-  }, [waterIntake]);
+        }
+      },
+    );
 
-  useEffect(() => {
+    scheduleMidnightReset();
-    const checkAndResetIfNeeded = async () => {
+
-      const lastResetDate = await AsyncStorage.getItem("lastResetDate");
+    return () => {
-      const today = new Date().toDateString();
+      appStateSubscription.remove();
-      if (lastResetDate !== today) {
+      if (midnightResetTimerRef.current) {
-        await resetAllCounters();
+        clearTimeout(midnightResetTimerRef.current);
       }
     };
-    checkAndResetIfNeeded();
+  }, [reconcileDailyMetrics, scheduleMidnightReset]);
-  }, []);
 
   const checkInsThisWeek = statistics?.attendance.checkInsThisWeek || 0;
   const currentStreak = statistics?.attendance.currentStreak || 0;
@@ -238,7 +379,7 @@ export default function HomeScreen() {
               {user?.firstName || "Champion"}
             </Text>
             <Text style={[typography.body, { color: colors.textSecondary }]}>
-              {getMotivationalMessage()}
+              {motivationalMessage}
             </Text>
           </View>
           <TouchableOpacity activeOpacity={0.8}>

apps/mobile/src/app/_layout.tsx

@@ -11,6 +11,7 @@ import { StatisticsProvider } from "../contexts/StatisticsContext";
 import { FitnessGoalsProvider } from "../contexts/FitnessGoalsContext";
 import { RecommendationsProvider } from "../contexts/RecommendationsContext";
 import { NotificationsProvider } from "../contexts/NotificationsContext";
+import { MembershipProvider } from "../contexts/MembershipContext";
 import { queryClient } from "../lib/query-client";
 import log from "../utils/logger";
 
@@ -180,11 +181,13 @@ export default function RootLayout() {
             <ThemeProvider>
               <NotificationsProvider>
                 <StatisticsProvider>
+                  <MembershipProvider>
                     <FitnessGoalsProvider>
                       <RecommendationsProvider>
                         <AppContent />
                       </RecommendationsProvider>
                     </FitnessGoalsProvider>
+                  </MembershipProvider>
                 </StatisticsProvider>
               </NotificationsProvider>
             </ThemeProvider>

apps/mobile/src/app/personal-details.tsx

@@ -1,162 +1,147 @@
-import React, { useState } from 'react';
+import React, { useState } from "react";
 import {
   View,
   Text,
   StyleSheet,
   ScrollView,
   TouchableOpacity,
-    TextInput,
   Alert,
-    Platform,
+  ActivityIndicator,
-} from 'react-native';
+} from "react-native";
-import { useRouter, Stack } from 'expo-router';
+import { Stack, useRouter } from "expo-router";
-import { useUser } from '@clerk/clerk-expo';
+import { Ionicons } from "@expo/vector-icons";
-import { Ionicons } from '@expo/vector-icons';
+import { useUser } from "@clerk/clerk-expo";
-import { LinearGradient } from 'expo-linear-gradient';
+import { useTheme } from "../contexts/ThemeContext";
-import { theme } from '../styles/theme';
+import { MinimalCard } from "../components/MinimalCard";
+import { Input } from "../components/Input";
+import { MinimalButton } from "../components/MinimalButton";
 
 export default function PersonalDetailsScreen() {
   const router = useRouter();
   const { user } = useUser();
+  const { colors, typography } = useTheme();
   const [loading, setLoading] = useState(false);
 
-    // Initialize with current user data
   const [formData, setFormData] = useState({
-        firstName: user?.firstName || '',
+    firstName: user?.firstName || "",
-        lastName: user?.lastName || '',
+    lastName: user?.lastName || "",
-        email: user?.primaryEmailAddress?.emailAddress || '',
+    email: user?.primaryEmailAddress?.emailAddress || "",
-        phone: user?.primaryPhoneNumber?.phoneNumber || '',
+    phone: user?.primaryPhoneNumber?.phoneNumber || "",
   });
 
+  const updateField = (field: "firstName" | "lastName", value: string) => {
+    setFormData((prev) => ({ ...prev, [field]: value }));
+  };
+
   const handleSave = async () => {
     setLoading(true);
     try {
-            // Update user profile via Clerk
       await user?.update({
         firstName: formData.firstName,
         lastName: formData.lastName,
       });
 
-            Alert.alert('Success', 'Personal details updated successfully', [
+      Alert.alert("Success", "Personal details updated successfully", [
-                { text: 'OK', onPress: () => router.back() },
+        { text: "OK", onPress: () => router.back() },
       ]);
-        } catch (error) {
+    } catch {
-            console.error('Error updating personal details:', error);
+      Alert.alert(
-            Alert.alert('Error', 'Failed to update personal details. Please try again.');
+        "Error",
+        "Failed to update personal details. Please try again.",
+      );
     } finally {
       setLoading(false);
     }
   };
 
-    const updateField = (field: string, value: string) => {
-        setFormData(prev => ({ ...prev, [field]: value }));
-    };
-
   return (
     <>
       <Stack.Screen options={{ headerShown: false }} />
-            <View style={styles.container}>
+      <View style={[styles.container, { backgroundColor: colors.background }]}>
-                {/* Header */}
+        <View
-                <LinearGradient
+          style={[styles.header, { borderBottomColor: colors.borderLight }]}
-                    colors={theme.gradients.primary}
-                    style={styles.header}
         >
           <TouchableOpacity
-                        style={styles.backButton}
+            style={[
+              styles.backButton,
+              { backgroundColor: colors.surfaceElevated },
+            ]}
             onPress={() => router.back()}
+            activeOpacity={0.8}
           >
-                        <Ionicons name="arrow-back" size={24} color="#fff" />
+            <Ionicons name="arrow-back" size={20} color={colors.textPrimary} />
           </TouchableOpacity>
-                    <Text style={styles.headerTitle}>Personal Details</Text>
+          <Text style={[typography.h3, { color: colors.textPrimary }]}>
-                    <View style={{ width: 40 }} />
+            Personal Details
-                </LinearGradient>
+          </Text>
+          <View style={styles.backButtonPlaceholder} />
+        </View>
 
         <ScrollView
           style={styles.content}
           contentContainerStyle={styles.scrollContent}
           showsVerticalScrollIndicator={false}
         >
-                    {/* First Name */}
+          <MinimalCard variant="elevated" style={styles.card}>
-                    <View style={styles.field}>
+            <Input
-                        <Text style={styles.label}>First Name *</Text>
+              label="First Name"
-                        <View style={styles.inputContainer}>
-                            <Ionicons name="person-outline" size={20} color={theme.colors.gray400} style={styles.inputIcon} />
-                            <TextInput
-                                style={styles.input}
               value={formData.firstName}
-                                onChangeText={(value) => updateField('firstName', value)}
+              onChangeText={(value) => updateField("firstName", value)}
               placeholder="Enter first name"
-                                placeholderTextColor={theme.colors.gray400}
             />
-                        </View>
-                    </View>
 
-                    {/* Last Name */}
+            <Input
-                    <View style={styles.field}>
+              label="Last Name"
-                        <Text style={styles.label}>Last Name *</Text>
-                        <View style={styles.inputContainer}>
-                            <Ionicons name="person-outline" size={20} color={theme.colors.gray400} style={styles.inputIcon} />
-                            <TextInput
-                                style={styles.input}
               value={formData.lastName}
-                                onChangeText={(value) => updateField('lastName', value)}
+              onChangeText={(value) => updateField("lastName", value)}
               placeholder="Enter last name"
-                                placeholderTextColor={theme.colors.gray400}
             />
-                        </View>
-                    </View>
 
-                    {/* Email (Read-only) */}
+            <View style={styles.readOnlyField}>
-                    <View style={styles.field}>
+              <Text style={[typography.h4, { color: colors.textPrimary }]}>
-                        <Text style={styles.label}>Email</Text>
+                Email
-                        <View style={[styles.inputContainer, styles.disabledInput]}>
+              </Text>
-                            <Ionicons name="mail-outline" size={20} color={theme.colors.gray400} style={styles.inputIcon} />
+              <Text style={[typography.body, { color: colors.textSecondary }]}>
-                            <TextInput
+                {formData.email || "Not set"}
-                                style={[styles.input, styles.disabledText]}
+              </Text>
-                                value={formData.email}
+              <Text
-                                editable={false}
+                style={[typography.caption, { color: colors.textTertiary }]}
-                                placeholderTextColor={theme.colors.gray400}
-                            />
-                            <Ionicons name="lock-closed-outline" size={16} color={theme.colors.gray400} />
-                        </View>
-                        <Text style={styles.helperText}>Email cannot be changed here</Text>
-                    </View>
-
-                    {/* Phone (Read-only for now) */}
-                    <View style={styles.field}>
-                        <Text style={styles.label}>Phone Number</Text>
-                        <View style={[styles.inputContainer, styles.disabledInput]}>
-                            <Ionicons name="call-outline" size={20} color={theme.colors.gray400} style={styles.inputIcon} />
-                            <TextInput
-                                style={[styles.input, styles.disabledText]}
-                                value={formData.phone || 'Not set'}
-                                editable={false}
-                                placeholderTextColor={theme.colors.gray400}
-                            />
-                            <Ionicons name="lock-closed-outline" size={16} color={theme.colors.gray400} />
-                        </View>
-                        <Text style={styles.helperText}>Phone number cannot be changed here</Text>
-                    </View>
-                </ScrollView>
-
-                {/* Save Button */}
-                <View style={styles.footer}>
-                    <TouchableOpacity
-                        style={[styles.saveButton, loading && styles.saveButtonDisabled]}
-                        onPress={handleSave}
-                        disabled={loading}
               >
-                        <LinearGradient
+                Read-only in app settings
-                            colors={theme.gradients.primary}
-                            style={styles.saveButtonGradient}
-                        >
-                            <Ionicons name="checkmark-circle" size={20} color="#fff" />
-                            <Text style={styles.saveButtonText}>
-                                {loading ? 'Saving...' : 'Save Changes'}
               </Text>
-                        </LinearGradient>
-                    </TouchableOpacity>
             </View>
+
+            <View style={styles.readOnlyField}>
+              <Text style={[typography.h4, { color: colors.textPrimary }]}>
+                Phone Number
+              </Text>
+              <Text style={[typography.body, { color: colors.textSecondary }]}>
+                {formData.phone || "Not set"}
+              </Text>
+              <Text
+                style={[typography.caption, { color: colors.textTertiary }]}
+              >
+                Read-only in app settings
+              </Text>
+            </View>
+          </MinimalCard>
+
+          <MinimalButton
+            title="Save Changes"
+            onPress={handleSave}
+            loading={loading}
+            disabled={loading}
+            fullWidth
+            size="lg"
+            style={{ marginTop: 16 }}
+          />
+
+          {loading ? (
+            <View style={styles.loadingRow}>
+              <ActivityIndicator size="small" color={colors.primary} />
+            </View>
+          ) : null}
+        </ScrollView>
       </View>
     </>
   );
@@ -165,105 +150,44 @@ export default function PersonalDetailsScreen() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-        backgroundColor: theme.colors.background,
   },
   header: {
-        flexDirection: 'row',
+    paddingTop: 56,
-        alignItems: 'center',
+    paddingBottom: 12,
-        justifyContent: 'space-between',
-        paddingTop: Platform.OS === 'ios' ? 60 : 40,
-        paddingBottom: 20,
     paddingHorizontal: 20,
+    borderBottomWidth: 1,
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "space-between",
   },
   backButton: {
-        width: 40,
+    width: 36,
-        height: 40,
+    height: 36,
-        borderRadius: 20,
+    borderRadius: 10,
-        backgroundColor: 'rgba(255, 255, 255, 0.2)',
+    alignItems: "center",
-        justifyContent: 'center',
+    justifyContent: "center",
-        alignItems: 'center',
   },
-    headerTitle: {
+  backButtonPlaceholder: {
-        fontSize: theme.typography.fontSize['2xl'],
+    width: 36,
-        fontWeight: theme.typography.fontWeight.bold,
+    height: 36,
-        color: '#fff',
   },
   content: {
     flex: 1,
   },
   scrollContent: {
     padding: 20,
-        paddingBottom: 100,
+    paddingBottom: 80,
   },
-    field: {
+  card: {
-        marginBottom: 24,
+    borderRadius: 16,
   },
-    label: {
+  readOnlyField: {
-        fontSize: theme.typography.fontSize.sm,
+    marginTop: 8,
-        fontWeight: theme.typography.fontWeight.semibold,
+    marginBottom: 12,
-        color: theme.colors.gray700,
+    gap: 4,
-        marginBottom: 8,
   },
-    inputContainer: {
+  loadingRow: {
-        flexDirection: 'row',
+    marginTop: 16,
-        alignItems: 'center',
+    alignItems: "center",
-        backgroundColor: '#fff',
-        borderRadius: theme.borderRadius.lg,
-        borderWidth: 1,
-        borderColor: theme.colors.gray200,
-        paddingHorizontal: 16,
-        ...theme.shadows.subtle,
-    },
-    inputIcon: {
-        marginRight: 12,
-    },
-    input: {
-        flex: 1,
-        paddingVertical: 16,
-        fontSize: theme.typography.fontSize.base,
-        color: theme.colors.gray900,
-    },
-    disabledInput: {
-        backgroundColor: theme.colors.gray50,
-    },
-    disabledText: {
-        color: theme.colors.gray500,
-    },
-    helperText: {
-        fontSize: theme.typography.fontSize.xs,
-        color: theme.colors.gray500,
-        marginTop: 6,
-        marginLeft: 4,
-    },
-    footer: {
-        position: 'absolute',
-        bottom: 0,
-        left: 0,
-        right: 0,
-        padding: 20,
-        paddingBottom: Platform.OS === 'ios' ? 40 : 20,
-        backgroundColor: '#fff',
-        borderTopWidth: 1,
-        borderTopColor: theme.colors.gray100,
-        ...theme.shadows.medium,
-    },
-    saveButton: {
-        borderRadius: theme.borderRadius.lg,
-        overflow: 'hidden',
-    },
-    saveButtonGradient: {
-        flexDirection: 'row',
-        alignItems: 'center',
-        justifyContent: 'center',
-        paddingVertical: 16,
-        gap: 8,
-    },
-    saveButtonDisabled: {
-        opacity: 0.6,
-    },
-    saveButtonText: {
-        fontSize: theme.typography.fontSize.base,
-        fontWeight: theme.typography.fontWeight.bold,
-        color: '#fff',
   },
 });

apps/mobile/src/components/Input.tsx

@@ -1,5 +1,12 @@
 import React from "react";
-import { View, Text, TextInput, StyleSheet, TextInputProps } from "react-native";
+import {
+  View,
+  Text,
+  TextInput,
+  StyleSheet,
+  TextInputProps,
+} from "react-native";
+import { useTheme } from "../contexts/ThemeContext";
 
 interface InputProps extends TextInputProps {
   label: string;
@@ -7,15 +14,39 @@ interface InputProps extends TextInputProps {
 }
 
 export function Input({ label, error, style, ...props }: InputProps) {
+  const { colors, typography } = useTheme();
+
   return (
     <View style={styles.container}>
-      <Text style={styles.label}>{label}</Text>
+      <Text
+        style={[typography.h4, { color: colors.textPrimary }, styles.label]}
+      >
+        {label}
+      </Text>
       <TextInput
-        style={[styles.input, error && styles.inputError, style]}
+        style={[
-        placeholderTextColor="#9ca3af"
+          styles.input,
+          {
+            backgroundColor: colors.surface,
+            borderColor: error ? colors.danger : colors.border,
+            color: colors.textPrimary,
+          },
+          style,
+        ]}
+        placeholderTextColor={colors.textTertiary}
         {...props}
       />
-      {error && <Text style={styles.errorText}>{error}</Text>}
+      {error && (
+        <Text
+          style={[
+            typography.caption,
+            styles.errorText,
+            { color: colors.danger },
+          ]}
+        >
+          {error}
+        </Text>
+      )}
     </View>
   );
 }
@@ -25,27 +56,16 @@ const styles = StyleSheet.create({
     marginBottom: 16,
   },
   label: {
-    fontSize: 14,
-    fontWeight: "600",
-    color: "#374151",
     marginBottom: 8,
   },
   input: {
-    backgroundColor: "white",
     borderWidth: 1,
-    borderColor: "#e5e7eb",
+    borderRadius: 12,
-    borderRadius: 8,
     paddingHorizontal: 16,
-    paddingVertical: 12,
+    paddingVertical: 14,
     fontSize: 16,
-    color: "#1f2937",
-  },
-  inputError: {
-    borderColor: "#ef4444",
   },
   errorText: {
-    fontSize: 12,
-    color: "#ef4444",
     marginTop: 4,
   },
 });

apps/mobile/src/components/Picker.tsx

@@ -1,6 +1,7 @@
 import React from "react";
 import { View, Text, StyleSheet } from "react-native";
 import { Picker as RNPicker } from "@react-native-picker/picker";
+import { useTheme } from "../contexts/ThemeContext";
 
 interface PickerProps {
   label: string;
@@ -10,23 +11,57 @@ interface PickerProps {
   error?: string;
 }
 
-export function Picker({ label, value, onValueChange, items, error }: PickerProps) {
+export function Picker({
+  label,
+  value,
+  onValueChange,
+  items,
+  error,
+}: PickerProps) {
+  const { colors, typography } = useTheme();
+
   return (
     <View style={styles.container}>
-      <Text style={styles.label}>{label}</Text>
+      <Text
-      <View style={[styles.pickerWrapper, error && styles.pickerError]}>
+        style={[typography.h4, { color: colors.textPrimary }, styles.label]}
+      >
+        {label}
+      </Text>
+      <View
+        style={[
+          styles.pickerWrapper,
+          {
+            backgroundColor: colors.surface,
+            borderColor: error ? colors.danger : colors.border,
+          },
+        ]}
+      >
         <RNPicker
           selectedValue={value}
           onValueChange={onValueChange}
-          style={styles.picker}
+          style={[styles.picker, { color: colors.textPrimary }]}
         >
           <RNPicker.Item label="Select..." value="" />
           {items.map((item) => (
-            <RNPicker.Item key={item.value} label={item.label} value={item.value} />
+            <RNPicker.Item
+              key={item.value}
+              label={item.label}
+              value={item.value}
+            />
           ))}
         </RNPicker>
       </View>
-      {error && <Text style={styles.errorText}>{error}</Text>}
+      {error && (
+        <Text
+          style={[
+            typography.caption,
+            styles.errorText,
+            { color: colors.danger },
+          ]}
+        >
+          {error}
+        </Text>
+      )}
     </View>
   );
 }
@@ -36,27 +71,17 @@ const styles = StyleSheet.create({
     marginBottom: 16,
   },
   label: {
-    fontSize: 14,
-    fontWeight: "600",
-    color: "#374151",
     marginBottom: 8,
   },
   pickerWrapper: {
-    backgroundColor: "white",
     borderWidth: 1,
-    borderColor: "#e5e7eb",
+    borderRadius: 12,
-    borderRadius: 8,
     overflow: "hidden",
   },
-  pickerError: {
-    borderColor: "#ef4444",
-  },
   picker: {
     height: 50,
   },
   errorText: {
-    fontSize: 12,
-    color: "#ef4444",
     marginTop: 4,
   },
 });

apps/mobile/src/components/ScanFoodModal.tsx

@@ -1,9 +1,24 @@
-import React, { useState, useEffect } from 'react';
+import React, { useEffect, useRef, useState } from "react";
-import { View, Text, StyleSheet, Modal, TouchableOpacity, TextInput, Alert } from 'react-native';
+import {
-import { CameraView, useCameraPermissions } from 'expo-camera';
+  ActivityIndicator,
-import { Ionicons } from '@expo/vector-icons';
+  Alert,
-import { LinearGradient } from 'expo-linear-gradient';
+  KeyboardAvoidingView,
-import { theme } from '../styles/theme';
+  Modal,
+  Platform,
+  ScrollView,
+  StyleSheet,
+  Text,
+  TextInput,
+  TouchableOpacity,
+  View,
+} from "react-native";
+import { CameraView, useCameraPermissions } from "expo-camera";
+import { useAuth } from "@clerk/clerk-expo";
+import { Ionicons } from "@expo/vector-icons";
+import { LinearGradient } from "expo-linear-gradient";
+import { addMealEntry } from "../api/nutrition";
+import { lookupFoodByBarcode, type ScannedFoodProduct } from "../api/food";
+import { theme } from "../styles/theme";
 
 interface ScanFoodModalProps {
   visible: boolean;
@@ -11,62 +26,133 @@ interface ScanFoodModalProps {
   onAddFood: (calories: number) => void;
 }
 
-// Mock food database
+const MEAL_TYPES = ["breakfast", "lunch", "dinner", "snack"] as const;
-const FOOD_DATABASE: { [key: string]: { name: string; calories: number; servingSize: string } } = {
+type MealType = (typeof MEAL_TYPES)[number];
-    '0123456789': { name: 'Apple', calories: 95, servingSize: '1 medium' },
-    '9876543210': { name: 'Banana', calories: 105, servingSize: '1 medium' },
-    '5555555555': { name: 'Protein Bar', calories: 200, servingSize: '1 bar' },
-    '1111111111': { name: 'Greek Yogurt', calories: 150, servingSize: '1 cup' },
-};
 
-export function ScanFoodModal({ visible, onClose, onAddFood }: ScanFoodModalProps) {
+export function ScanFoodModal({
+  visible,
+  onClose,
+  onAddFood,
+}: ScanFoodModalProps) {
   const [permission, requestPermission] = useCameraPermissions();
+  const { getToken } = useAuth();
   const [scanned, setScanned] = useState(false);
-    const [foodData, setFoodData] = useState<{ name: string; calories: number; servingSize: string } | null>(null);
+  const [isLookingUp, setIsLookingUp] = useState(false);
-    const [servings, setServings] = useState('1');
+  const [foodData, setFoodData] = useState<ScannedFoodProduct | null>(null);
+  const [notFound, setNotFound] = useState(false);
+  const [manualFoodName, setManualFoodName] = useState("Manual food entry");
+  const [manualCalories, setManualCalories] = useState("");
+  const [servings, setServings] = useState("1");
+  const [mealType, setMealType] = useState<MealType>("snack");
+  const lastScannedRef = useRef<{ code: string; ts: number } | null>(null);
 
   useEffect(() => {
-        if (visible) {
+    if (!visible) return;
     setScanned(false);
+    setIsLookingUp(false);
     setFoodData(null);
-            setServings('1');
+    setNotFound(false);
-        }
+    setManualFoodName("Manual food entry");
+    setManualCalories("");
+    setServings("1");
+    setMealType("snack");
   }, [visible]);
 
-    const handleBarCodeScanned = ({ data }: { data: string }) => {
+  const handleReset = () => {
+    setScanned(false);
+    setIsLookingUp(false);
+    setFoodData(null);
+    setNotFound(false);
+    setManualFoodName("Manual food entry");
+    setManualCalories("");
+    setServings("1");
+    setMealType("snack");
+  };
+
+  const handleBarCodeScanned = async ({ data }: { data: string }) => {
     if (scanned) return;
 
+    const normalized = data.replace(/\D/g, "");
+    const now = Date.now();
+    if (
+      lastScannedRef.current &&
+      lastScannedRef.current.code === normalized &&
+      now - lastScannedRef.current.ts < 2500
+    ) {
+      return;
+    }
+    lastScannedRef.current = { code: normalized, ts: now };
+
     setScanned(true);
+    setIsLookingUp(true);
+    setNotFound(false);
+    setFoodData(null);
 
-        // Look up food in database
+    try {
-        const food = FOOD_DATABASE[data];
+      const token = await getToken();
-
+      const product = await lookupFoodByBarcode(normalized, token);
-        if (food) {
+      setFoodData(product);
-            setFoodData(food);
+    } catch (error: any) {
+      const status = error?.response?.status;
+      if (status === 404) {
+        setNotFound(true);
+      } else if (status === 403) {
+        Alert.alert(
+          "Premium Feature",
+          "Barcode food scanning is available on Premium and VIP memberships.",
+        );
+        onClose();
       } else {
-            // Mock data for unknown barcodes
+        Alert.alert("Scan Failed", "Unable to lookup this barcode right now.");
-            setFoodData({
+        setScanned(false);
-                name: 'Unknown Food',
+      }
-                calories: 150,
+    } finally {
-                servingSize: '1 serving'
+      setIsLookingUp(false);
-            });
     }
   };
 
-    const handleConfirm = () => {
+  const getTotalCalories = () => {
     if (foodData) {
-            const totalCalories = foodData.calories * parseFloat(servings || '1');
+      return Math.round(
+        foodData.caloriesPerServing * parseFloat(servings || "1"),
+      );
+    }
+
+    const manual = parseInt(manualCalories || "0", 10);
+    return Number.isFinite(manual) && manual > 0 ? manual : 0;
+  };
+
+  const handleConfirm = async () => {
+    const totalCalories = getTotalCalories();
+    if (totalCalories <= 0) {
+      Alert.alert("Invalid calories", "Please enter a valid calorie amount.");
+      return;
+    }
+
+    try {
+      const token = await getToken();
+      await addMealEntry(
+        {
+          mealType,
+          foodName: foodData?.name || manualFoodName,
+          calories: totalCalories,
+          protein: foodData?.macros.protein ?? undefined,
+          carbs: foodData?.macros.carbs ?? undefined,
+          fats: foodData?.macros.fat ?? undefined,
+        },
+        token,
+      );
+
       onAddFood(totalCalories);
       onClose();
+    } catch {
+      Alert.alert(
+        "Could not save",
+        "Failed to add scanned food to nutrition diary.",
+      );
     }
   };
 
-    const handleRescan = () => {
-        setScanned(false);
-        setFoodData(null);
-        setServings('1');
-    };
-
   if (!permission) {
     return null;
   }
@@ -76,17 +162,28 @@ export function ScanFoodModal({ visible, onClose, onAddFood }: ScanFoodModalProp
       <Modal visible={visible} transparent animationType="slide">
         <View style={styles.permissionContainer}>
           <View style={styles.permissionContent}>
-                        <Ionicons name="camera-outline" size={64} color={theme.colors.primary} />
+            <Ionicons
-                        <Text style={styles.permissionTitle}>Camera Permission Required</Text>
+              name="camera-outline"
+              size={64}
+              color={theme.colors.primary}
+            />
+            <Text style={styles.permissionTitle}>
+              Camera Permission Required
+            </Text>
             <Text style={styles.permissionText}>
               We need access to your camera to scan food barcodes.
             </Text>
-                        <TouchableOpacity onPress={requestPermission} style={styles.permissionButtonContainer}>
+            <TouchableOpacity
+              onPress={requestPermission}
+              style={styles.permissionButtonContainer}
+            >
               <LinearGradient
                 colors={theme.gradients.primary}
                 style={styles.permissionButton}
               >
-                                <Text style={styles.permissionButtonText}>Grant Permission</Text>
+                <Text style={styles.permissionButtonText}>
+                  Grant Permission
+                </Text>
               </LinearGradient>
             </TouchableOpacity>
             <TouchableOpacity onPress={onClose} style={styles.cancelButton}>
@@ -98,10 +195,12 @@ export function ScanFoodModal({ visible, onClose, onAddFood }: ScanFoodModalProp
     );
   }
 
+  const showScanner = !foodData && !notFound;
+
   return (
     <Modal visible={visible} animationType="slide">
       <View style={styles.container}>
-                {!foodData ? (
+        {showScanner ? (
           <>
             <View style={styles.header}>
               <TouchableOpacity onPress={onClose} style={styles.closeButton}>
@@ -116,51 +215,108 @@ export function ScanFoodModal({ visible, onClose, onAddFood }: ScanFoodModalProp
               facing="back"
               onBarcodeScanned={scanned ? undefined : handleBarCodeScanned}
               barcodeScannerSettings={{
-                                barcodeTypes: ['ean13', 'ean8', 'upc_a', 'upc_e', 'code128', 'code39'],
+                barcodeTypes: [
+                  "ean13",
+                  "ean8",
+                  "upc_a",
+                  "upc_e",
+                  "code128",
+                  "code39",
+                ],
               }}
             >
               <View style={styles.scanOverlay}>
                 <View style={styles.scanFrame} />
-                                <Text style={styles.scanText}>Position barcode within frame</Text>
+                {isLookingUp ? (
+                  <View style={styles.lookupContainer}>
+                    <ActivityIndicator color="#fff" />
+                    <Text style={styles.scanText}>Looking up product...</Text>
+                  </View>
+                ) : (
+                  <Text style={styles.scanText}>
+                    Position barcode within frame
+                  </Text>
+                )}
               </View>
             </CameraView>
           </>
         ) : (
-                    <View style={styles.resultContainer}>
+          <KeyboardAvoidingView
+            behavior={Platform.OS === "ios" ? "padding" : "height"}
+            style={styles.resultContainer}
+          >
+            <View style={styles.resultSheet}>
               <View style={styles.resultHeader}>
-                            <TouchableOpacity onPress={onClose} style={styles.closeButton}>
+                <TouchableOpacity
-                                <Ionicons name="close" size={28} color={theme.colors.gray900} />
+                  onPress={handleReset}
+                  style={styles.closeButton}
+                >
+                  <Ionicons
+                    name="scan"
+                    size={24}
+                    color={theme.colors.gray700}
+                  />
                 </TouchableOpacity>
-                            <Text style={styles.resultTitle}>Food Details</Text>
+                <Text style={styles.resultTitle}>
-                            <View style={{ width: 28 }} />
+                  {notFound ? "Barcode Not Found" : "Food Details"}
+                </Text>
+                <View style={{ width: 24 }} />
               </View>
 
+              <ScrollView
+                style={styles.resultScroll}
+                contentContainerStyle={styles.resultScrollContent}
+                showsVerticalScrollIndicator={false}
+              >
                 <View style={styles.foodCard}>
+                  {!notFound && foodData ? (
+                    <>
                       <View style={styles.foodIconContainer}>
                         <LinearGradient
                           colors={theme.gradients.success}
                           style={styles.foodIcon}
                         >
-                                    <Ionicons name="restaurant" size={32} color="#fff" />
+                          <Ionicons name="restaurant" size={28} color="#fff" />
                         </LinearGradient>
                       </View>
 
                       <Text style={styles.foodName}>{foodData.name}</Text>
-                            <Text style={styles.servingSize}>{foodData.servingSize}</Text>
+                      <Text style={styles.servingMeta}>
+                        {[foodData.brand, foodData.servingSize]
+                          .filter(Boolean)
+                          .join(" • ")}
+                      </Text>
 
                       <View style={styles.caloriesBadge}>
-                                <Text style={styles.caloriesValue}>{foodData.calories}</Text>
+                        <Text style={styles.caloriesValue}>
-                                <Text style={styles.caloriesLabel}>kcal per serving</Text>
+                          {foodData.caloriesPerServing}
+                        </Text>
+                        <Text style={styles.caloriesLabel}>
+                          kcal per serving
+                        </Text>
                       </View>
 
                       <View style={styles.servingsContainer}>
-                                <Text style={styles.label}>Number of Servings</Text>
+                        <Text style={styles.label}>Servings</Text>
                         <View style={styles.servingsInput}>
                           <TouchableOpacity
-                                        onPress={() => setServings(String(Math.max(0.5, parseFloat(servings || '1') - 0.5)))}
+                            onPress={() =>
+                              setServings(
+                                String(
+                                  Math.max(
+                                    0.5,
+                                    parseFloat(servings || "1") - 0.5,
+                                  ),
+                                ),
+                              )
+                            }
                             style={styles.servingsButton}
                           >
-                                        <Ionicons name="remove" size={20} color={theme.colors.primary} />
+                            <Ionicons
+                              name="remove"
+                              size={20}
+                              color={theme.colors.primary}
+                            />
                           </TouchableOpacity>
                           <TextInput
                             style={styles.servingsValue}
@@ -169,37 +325,106 @@ export function ScanFoodModal({ visible, onClose, onAddFood }: ScanFoodModalProp
                             keyboardType="decimal-pad"
                           />
                           <TouchableOpacity
-                                        onPress={() => setServings(String(parseFloat(servings || '1') + 0.5))}
+                            onPress={() =>
+                              setServings(
+                                String(parseFloat(servings || "1") + 0.5),
+                              )
+                            }
                             style={styles.servingsButton}
                           >
-                                        <Ionicons name="add" size={20} color={theme.colors.primary} />
+                            <Ionicons
+                              name="add"
+                              size={20}
+                              color={theme.colors.primary}
+                            />
                           </TouchableOpacity>
                         </View>
                       </View>
-
+                    </>
-                            <View style={styles.totalCalories}>
+                  ) : (
-                                <Text style={styles.totalLabel}>Total Calories</Text>
+                    <>
-                                <Text style={styles.totalValue}>
+                      <Text style={styles.servingMeta}>
-                                    {Math.round(foodData.calories * parseFloat(servings || '1'))} kcal
+                        We could not find this product in OpenFoodFacts.
                       </Text>
+
+                      <Text style={styles.label}>Food Name</Text>
+                      <TextInput
+                        style={styles.input}
+                        value={manualFoodName}
+                        onChangeText={setManualFoodName}
+                        placeholder="Enter food name"
+                        placeholderTextColor={theme.colors.gray400}
+                      />
+
+                      <Text style={styles.label}>Calories</Text>
+                      <View style={styles.caloriesInputContainer}>
+                        <TextInput
+                          style={[styles.input, styles.caloriesInput]}
+                          value={manualCalories}
+                          onChangeText={setManualCalories}
+                          keyboardType="number-pad"
+                          placeholder="0"
+                          placeholderTextColor={theme.colors.gray400}
+                        />
+                        <Text style={styles.caloriesUnit}>kcal</Text>
                       </View>
+                    </>
+                  )}
+
+                  <View style={styles.mealTypeContainer}>
+                    <Text style={styles.label}>Meal Type</Text>
+                    <View style={styles.mealTypeRow}>
+                      {MEAL_TYPES.map((type) => {
+                        const active = mealType === type;
+                        return (
+                          <TouchableOpacity
+                            key={type}
+                            onPress={() => setMealType(type)}
+                            style={[
+                              styles.mealTypeChip,
+                              active && styles.mealTypeChipActive,
+                            ]}
+                          >
+                            <Text
+                              style={[
+                                styles.mealTypeText,
+                                active && styles.mealTypeTextActive,
+                              ]}
+                            >
+                              {type.charAt(0).toUpperCase() + type.slice(1)}
+                            </Text>
+                          </TouchableOpacity>
+                        );
+                      })}
+                    </View>
+                  </View>
+                </View>
+              </ScrollView>
+
+              <View style={styles.footerSummary}>
+                <Text style={styles.totalLabel}>Total Calories</Text>
+                <Text style={styles.totalValue}>{getTotalCalories()} kcal</Text>
               </View>
 
               <View style={styles.buttonRow}>
-                            <TouchableOpacity onPress={handleRescan} style={styles.rescanButton}>
+                <TouchableOpacity onPress={onClose} style={styles.rejectButton}>
-                                <Text style={styles.rescanButtonText}>Scan Again</Text>
+                  <Text style={styles.rejectButtonText}>Reject</Text>
                 </TouchableOpacity>
 
-                            <TouchableOpacity onPress={handleConfirm} style={styles.confirmButtonContainer}>
+                <TouchableOpacity
+                  onPress={handleConfirm}
+                  style={styles.confirmButtonContainer}
+                >
                   <LinearGradient
                     colors={theme.gradients.success}
                     style={styles.confirmButton}
                   >
-                                    <Text style={styles.confirmButtonText}>Add to Diary</Text>
+                    <Text style={styles.confirmButtonText}>Add to Count</Text>
                   </LinearGradient>
                 </TouchableOpacity>
               </View>
             </View>
+          </KeyboardAvoidingView>
         )}
       </View>
     </Modal>
@@ -209,106 +434,129 @@ export function ScanFoodModal({ visible, onClose, onAddFood }: ScanFoodModalProp
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-        backgroundColor: '#000',
+    backgroundColor: "#000",
   },
   header: {
-        flexDirection: 'row',
+    flexDirection: "row",
-        justifyContent: 'space-between',
+    justifyContent: "space-between",
-        alignItems: 'center',
+    alignItems: "center",
     padding: 20,
     paddingTop: 60,
-        backgroundColor: 'rgba(0, 0, 0, 0.8)',
+    backgroundColor: "rgba(0, 0, 0, 0.8)",
   },
   closeButton: {
     padding: 4,
   },
   title: {
     fontSize: 18,
-        fontWeight: '700',
+    fontWeight: "700",
-        color: '#fff',
+    color: "#fff",
   },
   camera: {
     flex: 1,
   },
   scanOverlay: {
     flex: 1,
-        justifyContent: 'center',
+    justifyContent: "center",
-        alignItems: 'center',
+    alignItems: "center",
-        backgroundColor: 'rgba(0, 0, 0, 0.3)',
+    backgroundColor: "rgba(0, 0, 0, 0.3)",
   },
   scanFrame: {
     width: 250,
     height: 250,
     borderWidth: 2,
-        borderColor: '#fff',
+    borderColor: "#fff",
     borderRadius: 20,
-        backgroundColor: 'transparent',
+    backgroundColor: "transparent",
   },
   scanText: {
-        color: '#fff',
+    color: "#fff",
     fontSize: 16,
-        fontWeight: '600',
+    fontWeight: "600",
+    marginTop: 16,
+    textAlign: "center",
+  },
+  lookupContainer: {
+    alignItems: "center",
     marginTop: 24,
-        textAlign: 'center',
   },
   resultContainer: {
     flex: 1,
+    backgroundColor: "rgba(0, 0, 0, 0.35)",
+    justifyContent: "flex-end",
+  },
+  resultSheet: {
     backgroundColor: theme.colors.background,
+    borderTopLeftRadius: 24,
+    borderTopRightRadius: 24,
+    maxHeight: "80%",
   },
   resultHeader: {
-        flexDirection: 'row',
+    flexDirection: "row",
-        justifyContent: 'space-between',
+    justifyContent: "space-between",
-        alignItems: 'center',
+    alignItems: "center",
-        padding: 20,
+    paddingHorizontal: 20,
-        paddingTop: 60,
+    paddingVertical: 14,
-        backgroundColor: '#fff',
+    backgroundColor: "#fff",
+    borderTopLeftRadius: 24,
+    borderTopRightRadius: 24,
+    borderBottomWidth: 1,
+    borderBottomColor: theme.colors.gray100,
+  },
+  resultScroll: {
+    flexGrow: 0,
+  },
+  resultScrollContent: {
+    paddingBottom: 12,
   },
   resultTitle: {
     fontSize: 18,
-        fontWeight: '700',
+    fontWeight: "700",
     color: theme.colors.gray900,
   },
   foodCard: {
-        margin: 20,
+    marginHorizontal: 16,
-        padding: 24,
+    marginTop: 12,
-        backgroundColor: '#fff',
+    padding: 16,
-        borderRadius: 24,
+    backgroundColor: "#fff",
-        alignItems: 'center',
+    borderRadius: 16,
+    alignItems: "center",
     ...theme.shadows.medium,
   },
   foodIconContainer: {
-        marginBottom: 16,
+    marginBottom: 10,
   },
   foodIcon: {
-        width: 80,
+    width: 64,
-        height: 80,
+    height: 64,
-        borderRadius: 40,
+    borderRadius: 32,
-        justifyContent: 'center',
+    justifyContent: "center",
-        alignItems: 'center',
+    alignItems: "center",
   },
   foodName: {
-        fontSize: 24,
+    fontSize: 20,
-        fontWeight: '700',
+    fontWeight: "700",
     color: theme.colors.gray900,
-        marginBottom: 8,
+    marginBottom: 4,
-        textAlign: 'center',
+    textAlign: "center",
   },
-    servingSize: {
+  servingMeta: {
-        fontSize: 16,
+    fontSize: 14,
     color: theme.colors.gray600,
-        marginBottom: 24,
+    marginBottom: 12,
+    textAlign: "center",
   },
   caloriesBadge: {
     backgroundColor: theme.colors.gray50,
-        paddingHorizontal: 24,
+    paddingHorizontal: 18,
-        paddingVertical: 16,
+    paddingVertical: 10,
-        borderRadius: 16,
+    borderRadius: 12,
-        alignItems: 'center',
+    alignItems: "center",
-        marginBottom: 32,
+    marginBottom: 14,
   },
   caloriesValue: {
-        fontSize: 32,
+    fontSize: 26,
-        fontWeight: '700',
+    fontWeight: "700",
     color: theme.colors.primary,
   },
   caloriesLabel: {
@@ -317,19 +565,49 @@ const styles = StyleSheet.create({
     marginTop: 4,
   },
   servingsContainer: {
-        width: '100%',
+    width: "100%",
-        marginBottom: 24,
+    marginBottom: 14,
+  },
+  mealTypeContainer: {
+    width: "100%",
+    marginBottom: 6,
+  },
+  mealTypeRow: {
+    flexDirection: "row",
+    flexWrap: "wrap",
+    gap: 8,
+  },
+  mealTypeChip: {
+    paddingHorizontal: 14,
+    paddingVertical: 8,
+    borderRadius: 18,
+    backgroundColor: theme.colors.gray100,
+    borderWidth: 1,
+    borderColor: theme.colors.gray200,
+  },
+  mealTypeChipActive: {
+    backgroundColor: theme.colors.primary,
+    borderColor: theme.colors.primary,
+  },
+  mealTypeText: {
+    fontSize: 13,
+    fontWeight: "600",
+    color: theme.colors.gray700,
+  },
+  mealTypeTextActive: {
+    color: "#fff",
   },
   label: {
     fontSize: 16,
-        fontWeight: '600',
+    fontWeight: "600",
     color: theme.colors.gray700,
     marginBottom: 12,
+    alignSelf: "flex-start",
   },
   servingsInput: {
-        flexDirection: 'row',
+    flexDirection: "row",
-        alignItems: 'center',
+    alignItems: "center",
-        justifyContent: 'center',
+    justifyContent: "center",
     gap: 16,
   },
   servingsButton: {
@@ -337,50 +615,84 @@ const styles = StyleSheet.create({
     height: 40,
     borderRadius: 20,
     backgroundColor: theme.colors.gray100,
-        justifyContent: 'center',
+    justifyContent: "center",
-        alignItems: 'center',
+    alignItems: "center",
   },
   servingsValue: {
     fontSize: 24,
-        fontWeight: '700',
+    fontWeight: "700",
     color: theme.colors.gray900,
-        textAlign: 'center',
+    textAlign: "center",
     minWidth: 60,
   },
+  input: {
+    width: "100%",
+    backgroundColor: theme.colors.gray50,
+    borderWidth: 1,
+    borderColor: theme.colors.gray200,
+    borderRadius: 16,
+    padding: 16,
+    fontSize: 16,
+    color: theme.colors.gray900,
+    marginBottom: 16,
+  },
+  caloriesInputContainer: {
+    width: "100%",
+    flexDirection: "row",
+    alignItems: "center",
+  },
+  caloriesInput: {
+    flex: 1,
+    marginBottom: 0,
+    marginRight: 12,
+  },
+  caloriesUnit: {
+    fontSize: 16,
+    fontWeight: "600",
+    color: theme.colors.gray500,
+  },
   totalCalories: {
-        width: '100%',
+    display: "none",
-        flexDirection: 'row',
+  },
-        justifyContent: 'space-between',
+  footerSummary: {
-        alignItems: 'center',
+    flexDirection: "row",
-        paddingTop: 24,
+    justifyContent: "space-between",
+    alignItems: "center",
+    paddingHorizontal: 20,
+    paddingTop: 10,
+    paddingBottom: 10,
     borderTopWidth: 1,
     borderTopColor: theme.colors.gray200,
+    backgroundColor: "#fff",
   },
   totalLabel: {
     fontSize: 16,
-        fontWeight: '600',
+    fontWeight: "600",
     color: theme.colors.gray700,
   },
   totalValue: {
     fontSize: 20,
-        fontWeight: '700',
+    fontWeight: "700",
     color: theme.colors.gray900,
   },
   buttonRow: {
-        flexDirection: 'row',
+    flexDirection: "row",
-        padding: 20,
+    paddingHorizontal: 20,
+    paddingTop: 8,
+    paddingBottom: 16,
     gap: 12,
+    backgroundColor: "#fff",
   },
-    rescanButton: {
+  rejectButton: {
     flex: 1,
     paddingVertical: 16,
     borderRadius: 20,
     backgroundColor: theme.colors.gray100,
-        alignItems: 'center',
+    alignItems: "center",
   },
-    rescanButtonText: {
+  rejectButtonText: {
     fontSize: 16,
-        fontWeight: '700',
+    fontWeight: "700",
     color: theme.colors.gray700,
   },
   confirmButtonContainer: {
@@ -389,30 +701,30 @@ const styles = StyleSheet.create({
   confirmButton: {
     paddingVertical: 16,
     borderRadius: 20,
-        alignItems: 'center',
+    alignItems: "center",
   },
   confirmButtonText: {
     fontSize: 16,
-        fontWeight: '700',
+    fontWeight: "700",
-        color: '#fff',
+    color: "#fff",
   },
   permissionContainer: {
     flex: 1,
-        justifyContent: 'center',
+    justifyContent: "center",
-        alignItems: 'center',
+    alignItems: "center",
-        backgroundColor: 'rgba(0, 0, 0, 0.5)',
+    backgroundColor: "rgba(0, 0, 0, 0.5)",
   },
   permissionContent: {
-        backgroundColor: '#fff',
+    backgroundColor: "#fff",
     borderRadius: 24,
     padding: 32,
     margin: 20,
-        alignItems: 'center',
+    alignItems: "center",
     ...theme.shadows.strong,
   },
   permissionTitle: {
     fontSize: 20,
-        fontWeight: '700',
+    fontWeight: "700",
     color: theme.colors.gray900,
     marginTop: 16,
     marginBottom: 8,
@@ -420,29 +732,29 @@ const styles = StyleSheet.create({
   permissionText: {
     fontSize: 16,
     color: theme.colors.gray600,
-        textAlign: 'center',
+    textAlign: "center",
     marginBottom: 24,
   },
   permissionButtonContainer: {
-        width: '100%',
+    width: "100%",
     marginBottom: 12,
   },
   permissionButton: {
     paddingVertical: 16,
     borderRadius: 20,
-        alignItems: 'center',
+    alignItems: "center",
   },
   permissionButtonText: {
     fontSize: 16,
-        fontWeight: '700',
+    fontWeight: "700",
-        color: '#fff',
+    color: "#fff",
   },
   cancelButton: {
     paddingVertical: 12,
   },
   cancelButtonText: {
     fontSize: 16,
-        fontWeight: '600',
+    fontWeight: "600",
     color: theme.colors.gray600,
   },
 });

apps/mobile/src/config/api.ts

@@ -44,6 +44,12 @@ export const API_ENDPOINTS = {
     HISTORY: "/api/attendance/history",
   },
   RECOMMENDATIONS: "/api/recommendations",
+  MEMBERSHIP: {
+    FEATURES: "/api/membership/features",
+  },
+  FOOD: {
+    LOOKUP_BARCODE: (code: string) => `/api/food/barcode/${code}`,
+  },
   NUTRITION: {
     BASE: "/api/nutrition",
     MEALS: "/api/nutrition/meals",

apps/mobile/src/contexts/MembershipContext.tsx

@@ -0,0 +1,96 @@
+import React, {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useState,
+  type ReactNode,
+} from "react";
+import { useAuth, useUser } from "@clerk/clerk-expo";
+import {
+  getCurrentMembershipFeaturesFromServer,
+  type MembershipFeatures,
+  type MembershipType,
+} from "../api/membership";
+import log from "../utils/logger";
+
+const BASIC_FEATURES: MembershipFeatures = {
+  recommendationsPerMonth: 1,
+  hydrationTracking: false,
+  nutritionTracking: false,
+  advancedStatistics: false,
+};
+
+interface MembershipContextValue {
+  membershipType: MembershipType;
+  features: MembershipFeatures;
+  loading: boolean;
+  refreshMembership: () => Promise<void>;
+}
+
+const MembershipContext = createContext<MembershipContextValue | undefined>(
+  undefined,
+);
+
+export function MembershipProvider({ children }: { children: ReactNode }) {
+  const { user } = useUser();
+  const { getToken, isSignedIn } = useAuth();
+  const [membershipType, setMembershipType] = useState<MembershipType>("basic");
+  const [features, setFeatures] = useState<MembershipFeatures>(BASIC_FEATURES);
+  const [loading, setLoading] = useState(true);
+
+  const loadMembership = useCallback(async () => {
+    if (!isSignedIn || !user?.id) {
+      setMembershipType("basic");
+      setFeatures(BASIC_FEATURES);
+      setLoading(false);
+      return;
+    }
+
+    try {
+      setLoading(true);
+      const token = await getToken();
+      const result = await getCurrentMembershipFeaturesFromServer(token);
+      setMembershipType(result.membershipType);
+      setFeatures(result.features);
+    } catch (error) {
+      log.error("Failed to load membership", error, { userId: user.id });
+      setMembershipType("basic");
+      setFeatures(BASIC_FEATURES);
+    } finally {
+      setLoading(false);
+    }
+  }, [isSignedIn, user?.id]);
+
+  useEffect(() => {
+    loadMembership();
+  }, [loadMembership]);
+
+  const value = useMemo(
+    () => ({
+      membershipType,
+      features,
+      loading,
+      refreshMembership: loadMembership,
+    }),
+    [membershipType, features, loading, loadMembership],
+  );
+
+  return (
+    <MembershipContext.Provider value={value}>
+      {children}
+    </MembershipContext.Provider>
+  );
+}
+
+export function useMembershipContext(): MembershipContextValue {
+  const context = useContext(MembershipContext);
+  if (!context) {
+    throw new Error(
+      "useMembershipContext must be used within MembershipProvider",
+    );
+  }
+
+  return context;
+}

apps/mobile/src/hooks/useMembership.ts

@@ -1,68 +1,5 @@
-import { useAuth, useUser } from "@clerk/clerk-expo";
+import { useMembershipContext } from "../contexts/MembershipContext";
-import { useEffect, useState } from "react";
-import {
-  getCurrentMembershipType,
-  getMembershipFeatures,
-  type MembershipFeatures,
-  type MembershipType,
-} from "../api/membership";
-import log from "../utils/logger";
 
-const BASIC_FEATURES = getMembershipFeatures("basic");
+export function useMembership() {
-
+  return useMembershipContext();
-interface UseMembershipResult {
-  membershipType: MembershipType;
-  features: MembershipFeatures;
-  loading: boolean;
-}
-
-export function useMembership(): UseMembershipResult {
-  const { user } = useUser();
-  const { getToken, isSignedIn } = useAuth();
-  const [membershipType, setMembershipType] = useState<MembershipType>("basic");
-  const [loading, setLoading] = useState(true);
-
-  useEffect(() => {
-    let isMounted = true;
-
-    const loadMembership = async () => {
-      if (!isSignedIn || !user?.id) {
-        if (isMounted) {
-          setMembershipType("basic");
-          setLoading(false);
-        }
-        return;
-      }
-
-      try {
-        setLoading(true);
-        const token = await getToken();
-        const type = await getCurrentMembershipType(user.id, token);
-        if (isMounted) {
-          setMembershipType(type);
-        }
-      } catch (error) {
-        log.error("Failed to load membership", error, { userId: user.id });
-        if (isMounted) {
-          setMembershipType("basic");
-        }
-      } finally {
-        if (isMounted) {
-          setLoading(false);
-        }
-      }
-    };
-
-    loadMembership();
-
-    return () => {
-      isMounted = false;
-    };
-  }, [isSignedIn, user?.id, getToken]);
-
-  return {
-    membershipType,
-    features: getMembershipFeatures(membershipType) || BASIC_FEATURES,
-    loading,
-  };
 }