fix types

Author: blopa

components/modals/AddExerciseModal.tsx

@@ -14,7 +14,11 @@ import { Button } from '../theme/Button';
 import { StepperInlineInput } from '../theme/StepperInlineInput';
 import { TextInput } from '../theme/TextInput';
 import { FullScreenModal } from './FullScreenModal';
-import { type MuscleGroup } from '../../database/models';
+import {
+  type EquipmentType,
+  type MechanicType,
+  type MuscleGroup,
+} from '../../database/models';
 
 // UI-specific muscle group filter type (subset of MuscleGroup + 'all')
 type MuscleGroupFilter = 'all' | 'chest' | 'back' | 'legs' | 'arms';
@@ -23,7 +27,7 @@ type ExerciseId = string;
 
 type ExerciseOption = SelectorOption<ExerciseId> & {
   category: string;
-  type: 'compound' | 'isolation' | 'bodyweight' | 'machine';
+  type: MechanicType | EquipmentType;
 };
 
 type AddExerciseModalProps = {
@@ -66,20 +70,20 @@ const normalizeMuscleGroup = (muscleGroup: MuscleGroup | string): MuscleGroupFil
 const getExerciseType = (
   mechanicType: string,
   equipmentType: string
-): 'compound' | 'isolation' | 'bodyweight' | 'machine' => {
+): MechanicType | EquipmentType => {
   const mechanic = mechanicType?.toLowerCase() || '';
   const equipment = equipmentType?.toLowerCase() || '';
 
   if (equipment.includes('bodyweight') || equipment.includes('body weight')) {
-    return 'bodyweight';
+    return 'bodyweight' as EquipmentType;
   }
   if (mechanic.includes('compound')) {
-    return 'compound';
+    return 'compound' as MechanicType;
   }
   if (equipment.includes('machine')) {
-    return 'machine';
+    return 'machine' as EquipmentType;
   }
-  return 'isolation';
+  return 'isolation' as MechanicType;
 };
 
 // Helper function to get icon for exercise type

components/modals/CreateExerciseModal.tsx

@@ -3,6 +3,7 @@ import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Pressable, ScrollView, Text, View } from 'react-native';
 
+import { type MuscleGroup } from '../../database/models';
 import { useTheme } from '../../hooks/useTheme';
 import { BottomPopUpMenu } from '../BottomPopUpMenu';
 import { Button } from '../theme/Button';
@@ -11,8 +12,23 @@ import { ToggleInput } from '../theme/ToggleInput';
 import { FullScreenModal } from './FullScreenModal';
 
 // Muscle groups will be translated using useTranslation hook
-const PRIMARY_MUSCLES_KEYS = ['chest', 'shoulders', 'back', 'legs', 'arms', 'core'];
-const SECONDARY_MUSCLES_KEYS = ['triceps', 'biceps', 'abs', 'forearms', 'traps', 'glutes'];
+// Using string arrays for translation keys, but values should match MuscleGroup where possible
+const PRIMARY_MUSCLES_KEYS: (MuscleGroup | 'legs' | 'arms' | 'core')[] = [
+  'chest',
+  'shoulders',
+  'back',
+  'legs',
+  'arms',
+  'core',
+];
+const SECONDARY_MUSCLES_KEYS: (MuscleGroup | 'abs' | 'forearms' | 'traps' | 'glutes')[] = [
+  'triceps',
+  'biceps',
+  'abs',
+  'forearms',
+  'traps',
+  'glutes',
+];
 
 type CreateExerciseModalProps = {
   visible: boolean;

components/modals/FilterWorkoutsModal.tsx

@@ -11,6 +11,7 @@ import { FullScreenModal } from './FullScreenModal';
 
 type WorkoutType = 'strength' | 'cardio' | 'flexibility';
 
+// UI-specific muscle group type for filtering (aggregated categories)
 type TargetMuscle = 'full-body' | 'chest' | 'back' | 'legs' | 'shoulders' | 'arms' | 'core';
 
 type FilterWorkoutsModalProps = {

components/modals/PastWorkoutsHistoryFilterMenu.tsx

@@ -12,7 +12,8 @@ import { Slider } from '../theme/Slider';
 
 type WorkoutType = 'all' | 'strength' | 'cardio' | 'hiit' | 'yoga';
 type DateRange = '30' | '90' | 'custom';
-type MuscleGroup = 'chest' | 'back' | 'legs' | 'shoulders' | 'arms' | 'core' | 'full-body';
+// UI-specific muscle group type for filtering (aggregated categories)
+type MuscleGroup = 'full-body' | 'chest' | 'back' | 'legs' | 'shoulders' | 'arms' | 'core';
 
 type PastWorkoutsHistoryFilterMenuProps = {
   visible: boolean;

components/modals/PastWorkoutsHistoryModal.tsx

@@ -417,15 +417,9 @@ export default function PastWorkoutsHistoryModal({ visible, onClose }: WorkoutHi
         initialFilters={{
           workoutType: filters.workoutType,
           dateRange: filters.dateRange,
-          muscleGroups: filters.muscleGroups as (
-            | 'chest'
-            | 'back'
-            | 'legs'
-            | 'shoulders'
-            | 'arms'
-            | 'core'
-            | 'full-body'
-          )[],
+          muscleGroups: filters.muscleGroups as Array<
+            'chest' | 'back' | 'legs' | 'shoulders' | 'arms' | 'core' | 'full-body'
+          >,
           minDuration: filters.minDuration,
         }}
         onApplyFilters={handleApplyFilters}

types/EatingPhaseUI.ts

@@ -1,3 +1,5 @@
+import { type EatingPhase } from '../database/models';
+
 /**
  * UI-specific eating phase types for display purposes.
  * These map to the database EatingPhase types ('cut' | 'maintain' | 'bulk')
@@ -8,7 +10,7 @@ export type EatingPhaseUI = 'cutting' | 'maintenance' | 'bulking' | 'lean-bulk';
 /**
  * Converts database EatingPhase to UI EatingPhaseUI
  */
-export function convertEatingPhaseToUI(dbPhase: string): EatingPhaseUI {
+export function convertEatingPhaseToUI(dbPhase: EatingPhase | string): EatingPhaseUI {
   switch (dbPhase) {
     case 'cut':
       return 'cutting';
@@ -24,7 +26,7 @@ export function convertEatingPhaseToUI(dbPhase: string): EatingPhaseUI {
 /**
  * Converts UI EatingPhaseUI to database EatingPhase
  */
-export function convertEatingPhaseToDB(uiPhase: EatingPhaseUI): 'cut' | 'maintain' | 'bulk' {
+export function convertEatingPhaseToDB(uiPhase: EatingPhaseUI): EatingPhase {
   switch (uiPhase) {
     case 'cutting':
       return 'cut';

utils/workout.ts

@@ -16,7 +16,7 @@ export const WEEKDAY_LABELS = ['M', 'T', 'W', 'T', 'F', 'S', 'S'];
 
 // Day names mapping for database: WeekdayPicker index -> Day name
 // WeekdayPicker uses: 0 = Monday, 1 = Tuesday, ..., 6 = Sunday
-export const WEEKDAY_NAMES = [
+export const WEEKDAY_NAMES: DayOfWeek[] = [
   'Monday',
   'Tuesday',
   'Wednesday',
@@ -29,8 +29,8 @@ export const WEEKDAY_NAMES = [
 /**
  * Convert day name from database to WeekdayPicker index
  */
-export function dayNameToIndex(dayName: string): number {
-  return WEEKDAY_NAMES.indexOf(dayName);
+export function dayNameToIndex(dayName: DayOfWeek | string): number {
+  return WEEKDAY_NAMES.indexOf(dayName as DayOfWeek);
 }
 
 /**