wip

.eslintrc.json

@@ -0,0 +1,23 @@
+{
+  "root": true,
+  "env": {
+    "es2022": true,
+    "node": true
+  },
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaVersion": 2022
+  },
+  "overrides": [
+    {
+      "files": ["**/*.ts", "**/*.tsx"],
+      "parser": "@typescript-eslint/parser",
+      "plugins": ["@typescript-eslint"],
+      "extends": [],
+      "rules": {
+        "@typescript-eslint/no-explicit-any": "error"
+      }
+    }
+  ]
+}
+  

.gitignore

@@ -44,3 +44,6 @@ tmp/
 temp/
 .vercel
 .env*.local
+
+
+userData/

apps/companion/main/di-config.ts

@@ -11,12 +11,14 @@ import type { AutomationEnginePort } from '@gridpilot/automation/application/por
 import type { AuthenticationServicePort } from '@gridpilot/automation/application/ports/AuthenticationServicePort';
 import type { LoggerPort } from '@gridpilot/automation/application/ports/LoggerPort';
 import type { OverlaySyncPort } from '@gridpilot/automation/application/ports/OverlaySyncPort';
+import type { CheckoutServicePort } from '@gridpilot/automation/application/ports/CheckoutServicePort';
 import { StartAutomationSessionUseCase } from '@gridpilot/automation/application/use-cases/StartAutomationSessionUseCase';
 import { CheckAuthenticationUseCase } from '@gridpilot/automation/application/use-cases/CheckAuthenticationUseCase';
 import { InitiateLoginUseCase } from '@gridpilot/automation/application/use-cases/InitiateLoginUseCase';
 import { ClearSessionUseCase } from '@gridpilot/automation/application/use-cases/ClearSessionUseCase';
 import { ConfirmCheckoutUseCase } from '@gridpilot/automation/application/use-cases/ConfirmCheckoutUseCase';
 import { OverlaySyncService } from '@gridpilot/automation/application/services/OverlaySyncService';
+import type { IAutomationLifecycleEmitter } from '@gridpilot/automation/infrastructure/adapters/IAutomationLifecycleEmitter';
 
 // Infrastructure
 import { InMemorySessionRepository } from '@gridpilot/automation/infrastructure/repositories/InMemorySessionRepository';
@@ -187,13 +189,19 @@ export function configureDIContainer(): void {
     browserAutomation
   );
 
+  // Checkout Service (singleton, backed by browser automation)
+  container.registerInstance<CheckoutServicePort>(
+    DI_TOKENS.CheckoutService,
+    browserAutomation as unknown as CheckoutServicePort
+  );
+
   // Automation Engine (singleton)
   const sessionRepository = container.resolve<SessionRepositoryPort>(DI_TOKENS.SessionRepository);
   let automationEngine: AutomationEnginePort;
 
   if (fixtureMode) {
     automationEngine = new AutomationEngineAdapter(
-      browserAutomation as any,
+      browserAutomation,
       sessionRepository
     );
   } else {
@@ -247,16 +255,16 @@ export function configureDIContainer(): void {
   }
 
   // Overlay Sync Service - create singleton instance directly
-  const lifecycleEmitter = browserAutomation as any;
+  const lifecycleEmitter = browserAutomation as unknown as IAutomationLifecycleEmitter;
   const publisher = {
-    publish: async (_event: any) => {
+    publish: async (event: unknown) => {
       try {
-        logger.debug?.('OverlaySyncPublisher.publish', _event);
+        logger.debug?.('OverlaySyncPublisher.publish', { event });
       } catch {
         // swallow
       }
     },
-  } as any;
+  };
   const overlaySyncService = new OverlaySyncService({
     lifecycleEmitter,
     publisher,

apps/companion/main/di-container.ts

@@ -13,6 +13,7 @@ import type { IBrowserAutomation } from '@gridpilot/automation/application/ports
 import type { AutomationEnginePort } from '@gridpilot/automation/application/ports/AutomationEnginePort';
 import type { AuthenticationServicePort } from '@gridpilot/automation/application/ports/AuthenticationServicePort';
 import type { CheckoutConfirmationPort } from '@gridpilot/automation/application/ports/CheckoutConfirmationPort';
+import type { CheckoutServicePort } from '@gridpilot/automation/application/ports/CheckoutServicePort';
 import type { LoggerPort } from '@gridpilot/automation/application/ports/LoggerPort';
 import type { OverlaySyncPort } from '@gridpilot/automation/application/ports/OverlaySyncPort';
 
@@ -145,9 +146,9 @@ export class DIContainer {
 
   public setConfirmCheckoutUseCase(checkoutConfirmationPort: CheckoutConfirmationPort): void {
     this.ensureInitialized();
-    const browserAutomation = getDIContainer().resolve<IBrowserAutomation>(DI_TOKENS.BrowserAutomation);
+    const checkoutService = getDIContainer().resolve<CheckoutServicePort>(DI_TOKENS.CheckoutService);
     this.confirmCheckoutUseCase = new ConfirmCheckoutUseCase(
-      browserAutomation as any,
+      checkoutService,
       checkoutConfirmationPort
     );
   }
@@ -188,7 +189,7 @@ export class DIContainer {
             new Error(result.error || 'Unknown error'),
             { mode: this.automationMode }
           );
-          return { success: false, error: result.error };
+          return { success: false, error: result.error ?? 'Unknown error' };
         }
 
         const isConnected = playwrightAdapter.isConnected();

apps/companion/main/di-tokens.ts

@@ -27,6 +27,7 @@ export const DI_TOKENS = {
   
   // Services
   OverlaySyncPort: Symbol.for('OverlaySyncPort'),
+  CheckoutService: Symbol.for('CheckoutServicePort'),
   
   // Infrastructure
   FixtureServer: Symbol.for('FixtureServer'),

apps/companion/main/ipc-handlers.ts

@@ -1,10 +1,12 @@
 import { ipcMain } from 'electron';
 import type { BrowserWindow, IpcMainInvokeEvent } from 'electron';
 import { DIContainer } from './di-container';
-import type { HostedSessionConfig } from '@/packages/domain/entities/HostedSessionConfig';
-import { StepId } from '@/packages/domain/value-objects/StepId';
-import { AuthenticationState } from '@/packages/domain/value-objects/AuthenticationState';
-import { ElectronCheckoutConfirmationAdapter } from '@/packages/infrastructure/adapters/ipc/ElectronCheckoutConfirmationAdapter';
+import type { HostedSessionConfig } from 'packages/automation/domain/types/HostedSessionConfig';
+import { StepId } from 'packages/automation/domain/value-objects/StepId';
+import { AuthenticationState } from 'packages/automation/domain/value-objects/AuthenticationState';
+import { ElectronCheckoutConfirmationAdapter } from 'packages/automation/infrastructure/adapters/ipc/ElectronCheckoutConfirmationAdapter';
+import type { OverlayAction } from 'packages/automation/application/ports/OverlaySyncPort';
+import type { IAutomationLifecycleEmitter } from 'packages/automation/infrastructure/adapters/IAutomationLifecycleEmitter';
 
 let progressMonitorInterval: NodeJS.Timeout | null = null;
 let lifecycleSubscribed = false;
@@ -95,8 +97,8 @@ export function setupIpcHandlers(mainWindow: BrowserWindow): void {
       }
 
       // Call confirmLoginComplete on the adapter if it exists
-      if ('confirmLoginComplete' in authService) {
-        const result = await (authService as any).confirmLoginComplete();
+      if ('confirmLoginComplete' in authService && typeof authService.confirmLoginComplete === 'function') {
+        const result = await authService.confirmLoginComplete();
         if (result.isErr()) {
           logger.error('Confirm login failed', result.unwrapErr());
           return { success: false, error: result.unwrapErr().message };
@@ -334,7 +336,7 @@ export function setupIpcHandlers(mainWindow: BrowserWindow): void {
         // Ensure runtime automation wiring reflects the new browser mode
         if ('refreshBrowserAutomation' in container) {
           // Call method to refresh adapters/use-cases that depend on browser mode
-          (container as any).refreshBrowserAutomation();
+          container.refreshBrowserAutomation();
         }
         logger.info('Browser mode updated', { mode });
         return { success: true, mode };
@@ -349,9 +351,9 @@ export function setupIpcHandlers(mainWindow: BrowserWindow): void {
   });
 
   // Handle overlay action requests from renderer and forward to the OverlaySyncService
-  ipcMain.handle('overlay-action-request', async (_event: IpcMainInvokeEvent, action: any) => {
+  ipcMain.handle('overlay-action-request', async (_event: IpcMainInvokeEvent, action: OverlayAction) => {
     try {
-      const overlayPort = (container as any).getOverlaySyncPort ? container.getOverlaySyncPort() : null;
+      const overlayPort = 'getOverlaySyncPort' in container ? container.getOverlaySyncPort() : null;
       if (!overlayPort) {
         logger.warn('OverlaySyncPort not available');
         return { id: action?.id ?? 'unknown', status: 'failed', reason: 'OverlaySyncPort not available' };
@@ -361,16 +363,20 @@ export function setupIpcHandlers(mainWindow: BrowserWindow): void {
     } catch (e) {
       const err = e instanceof Error ? e : new Error(String(e));
       logger.error('Overlay action request failed', err);
-      return { id: action?.id ?? 'unknown', status: 'failed', reason: err.message };
+      const id = typeof action === 'object' && action !== null && 'id' in action
+        ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          (action as { id?: string }).id ?? 'unknown'
+        : 'unknown';
+      return { id, status: 'failed', reason: err.message };
     }
   });
 
   // Subscribe to automation adapter lifecycle events and relay to renderer
   try {
     if (!lifecycleSubscribed) {
-      const browserAutomation = container.getBrowserAutomation() as any;
-      if (browserAutomation && typeof browserAutomation.onLifecycle === 'function') {
-        browserAutomation.onLifecycle((ev: any) => {
+      const lifecycleEmitter = container.getBrowserAutomation() as unknown as IAutomationLifecycleEmitter;
+      if (typeof lifecycleEmitter.onLifecycle === 'function') {
+        lifecycleEmitter.onLifecycle((ev) => {
           try {
             if (mainWindow && mainWindow.webContents) {
               mainWindow.webContents.send('automation-event', ev);

apps/companion/main/preload.ts

@@ -1,6 +1,6 @@
 import { contextBridge, ipcRenderer } from 'electron';
 import type { HostedSessionConfig } from '../../../packages/automation/domain/types/HostedSessionConfig';
-import type { AuthenticationState } from '../../../packages/domain/value-objects/AuthenticationState';
+import type { AuthenticationState } from '../../../packages/automation/domain/value-objects/AuthenticationState';
 
 export interface AuthStatusEvent {
   state: AuthenticationState;

apps/companion/renderer/App.tsx

@@ -5,7 +5,7 @@ import { LoginPrompt } from './components/LoginPrompt';
 import { BrowserModeToggle } from './components/BrowserModeToggle';
 import { CheckoutConfirmationDialog } from './components/CheckoutConfirmationDialog';
 import { RaceCreationSuccessScreen } from './components/RaceCreationSuccessScreen';
-import type { HostedSessionConfig } from '../../../packages/domain/entities/HostedSessionConfig';
+import type { HostedSessionConfig } from '../../../packages/automation/domain/types/HostedSessionConfig';
 
 interface SessionProgress {
   sessionId: string;
@@ -138,7 +138,13 @@ export function App() {
 
   const handleStartAutomation = async (config: HostedSessionConfig) => {
     setIsRunning(true);
-    const result = await window.electronAPI.startAutomation(config);
+    const result = await window.electronAPI.startAutomation(config) as {
+      success: boolean;
+      sessionId?: string;
+      error?: string;
+      authRequired?: boolean;
+      authState?: AuthState;
+    };
     
     if (result.success && result.sessionId) {
       setSessionId(result.sessionId);
@@ -147,8 +153,8 @@ export function App() {
 
     setIsRunning(false);
 
-    if ((result as any).authRequired) {
-      const nextAuthState = (result as any).authState as AuthState | undefined;
+    if ('authRequired' in result && result.authRequired) {
+      const nextAuthState = result.authState as AuthState | undefined;
       setAuthState(nextAuthState ?? 'EXPIRED');
       setAuthError(result.error ?? 'Authentication required before starting automation.');
       return;

apps/companion/renderer/components/LoginPrompt.tsx

@@ -4,7 +4,7 @@ type LoginStatus = 'idle' | 'waiting' | 'success' | 'error';
 
 interface LoginPromptProps {
   authState: string;
-  errorMessage?: string;
+  errorMessage: string | undefined;
   onLogin: () => void;
   onRetry: () => void;
   loginStatus?: LoginStatus;

apps/companion/renderer/components/SessionCreationForm.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import type { HostedSessionConfig } from '../../../../packages/domain/entities/HostedSessionConfig';
+import type { HostedSessionConfig } from '../../../../packages/automation/domain/types/HostedSessionConfig';
 
 interface SessionCreationFormProps {
   onSubmit: (config: HostedSessionConfig) => void;
@@ -112,7 +112,14 @@ export function SessionCreationForm({ onSubmit, disabled }: SessionCreationFormP
         <label style={labelStyle}>Weather Type</label>
         <select
           value={config.weatherType}
-          onChange={(e) => setConfig({ ...config, weatherType: e.target.value as any })}
+          onChange={(e) =>
+            setConfig(prev =>
+              ({
+                ...prev,
+                weatherType: e.target.value as HostedSessionConfig['weatherType'],
+              } as HostedSessionConfig)
+            )
+          }
           style={inputStyle}
           disabled={disabled}
         >
@@ -125,7 +132,14 @@ export function SessionCreationForm({ onSubmit, disabled }: SessionCreationFormP
         <label style={labelStyle}>Time of Day</label>
         <select
           value={config.timeOfDay}
-          onChange={(e) => setConfig({ ...config, timeOfDay: e.target.value as any })}
+          onChange={(e) =>
+            setConfig(prev =>
+              ({
+                ...prev,
+                timeOfDay: e.target.value as HostedSessionConfig['timeOfDay'],
+              } as HostedSessionConfig)
+            )
+          }
           style={inputStyle}
           disabled={disabled}
         >

apps/companion/renderer/components/SessionProgressMonitor.tsx

@@ -73,8 +73,8 @@ export function SessionProgressMonitor({ sessionId, progress, isRunning }: Sessi
     (async () => {
       try {
         // Use electronAPI overlayActionRequest to obtain ack
-        if ((window as any).electronAPI?.overlayActionRequest) {
-          const ack = await (window as any).electronAPI.overlayActionRequest(action);
+        if (window.electronAPI?.overlayActionRequest) {
+          const ack = await window.electronAPI.overlayActionRequest(action);
           if (!mounted) return;
           setAckStatusByStep(prev => ({ ...prev, [currentStep]: ack.status }));
         } else {
@@ -91,8 +91,8 @@ export function SessionProgressMonitor({ sessionId, progress, isRunning }: Sessi
 
   // Subscribe to automation events for optional live updates
   useEffect(() => {
-    if ((window as any).electronAPI?.onAutomationEvent) {
-      const off = (window as any).electronAPI.onAutomationEvent((ev: any) => {
+    if (window.electronAPI?.onAutomationEvent) {
+      const off = window.electronAPI.onAutomationEvent((ev) => {
         if (ev && ev.payload && ev.payload.actionId && ev.type) {
           setAutomationEventMsg(`${ev.type} ${ev.payload.actionId}`);
         } else if (ev && ev.type) {

apps/website/.eslintrc.json

@@ -3,6 +3,7 @@
   "rules": {
     "react/no-unescaped-entities": "off",
     "@next/next/no-img-element": "warn",
-    "react-hooks/exhaustive-deps": "warn"
+    "react-hooks/exhaustive-deps": "warn",
+    "@typescript-eslint/no-explicit-any": "error"
   }
 }

apps/website/app/api/signup/route.ts

@@ -27,7 +27,10 @@ export async function POST(request: Request) {
     return jsonError(400, 'Invalid request body');
   }
 
-  const email = (body as any)?.email;
+  const email =
+    typeof body === 'object' && body !== null && 'email' in body
+      ? (body as { email: unknown }).email
+      : undefined;
 
   if (typeof email !== 'string' || !email.trim()) {
     return jsonError(400, 'Invalid email address');

apps/website/app/auth/iracing/callback/route.ts

@@ -9,7 +9,8 @@ export async function GET(request: Request) {
   const url = new URL(request.url);
   const code = url.searchParams.get('code') ?? undefined;
   const state = url.searchParams.get('state') ?? undefined;
-  const returnTo = url.searchParams.get('returnTo') ?? undefined;
+  const rawReturnTo = url.searchParams.get('returnTo');
+  const returnTo = rawReturnTo ?? undefined;
 
   if (!code || !state) {
     return NextResponse.redirect('/auth/iracing');
@@ -23,7 +24,8 @@ export async function GET(request: Request) {
   }
 
   const authService = getAuthService();
-  await authService.loginWithIracingCallback({ code, state, returnTo });
+  const loginInput = returnTo ? { code, state, returnTo } : { code, state };
+  await authService.loginWithIracingCallback(loginInput);
 
   cookieStore.delete(STATE_COOKIE);
 

apps/website/app/drivers/[id]/page.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { useState, useEffect, use } from 'react';
+import { useState, useEffect } from 'react';
 import Image from 'next/image';
 import Link from 'next/link';
 import { useRouter, useParams } from 'next/navigation';
@@ -43,12 +43,16 @@ import {
   getGetAllTeamsUseCase,
   getGetTeamMembersUseCase,
 } from '@/lib/di-container';
+import { AllTeamsPresenter } from '@/lib/presenters/AllTeamsPresenter';
+import { TeamMembersPresenter } from '@/lib/presenters/TeamMembersPresenter';
 import { Driver, EntityMappers, type Team } from '@gridpilot/racing';
 import type { DriverDTO } from '@gridpilot/racing';
+import type { ProfileOverviewViewModel } from '@gridpilot/racing/application/presenters/IProfileOverviewPresenter';
 import Button from '@/components/ui/Button';
 import Card from '@/components/ui/Card';
 import Breadcrumbs from '@/components/layout/Breadcrumbs';
 import type { GetDriverTeamQueryResultDTO } from '@gridpilot/racing/application/dto/TeamCommandAndQueryDTO';
+import type { TeamMemberViewModel } from '@gridpilot/racing/application/presenters/ITeamMembersPresenter';
 
 // ============================================================================
 // TYPES
@@ -134,14 +138,22 @@ function getDemoExtendedProfile(driverId: string): DriverExtendedProfile {
   const timezones = ['EST (UTC-5)', 'CET (UTC+1)', 'PST (UTC-8)', 'GMT (UTC+0)', 'JST (UTC+9)'];
   const hours = ['Evenings (18:00-23:00)', 'Weekends only', 'Late nights (22:00-02:00)', 'Flexible schedule'];
 
+  const socialHandles = socialOptions[hash % socialOptions.length] ?? [];
+  const achievements = achievementSets[hash % achievementSets.length] ?? [];
+  const racingStyle = styles[hash % styles.length] ?? 'Consistent Pacer';
+  const favoriteTrack = tracks[hash % tracks.length] ?? 'Unknown Track';
+  const favoriteCar = cars[hash % cars.length] ?? 'Unknown Car';
+  const timezone = timezones[hash % timezones.length] ?? 'UTC';
+  const availableHours = hours[hash % hours.length] ?? 'Flexible schedule';
+
   return {
-    socialHandles: socialOptions[hash % socialOptions.length],
-    achievements: achievementSets[hash % achievementSets.length],
-    racingStyle: styles[hash % styles.length],
-    favoriteTrack: tracks[hash % tracks.length],
-    favoriteCar: cars[hash % cars.length],
-    timezone: timezones[hash % timezones.length],
-    availableHours: hours[hash % hours.length],
+    socialHandles,
+    achievements,
+    racingStyle,
+    favoriteTrack,
+    favoriteCar,
+    timezone,
+    availableHours,
     lookingForTeam: hash % 3 === 0,
     openToRequests: hash % 2 === 0,
   };
@@ -301,11 +313,46 @@ function HorizontalBarChart({ data, maxValue }: BarChartProps) {
 // MAIN PAGE
 // ============================================================================
 
-export default function DriverDetailPage({
-  searchParams,
-}: {
-  searchParams: any;
-}) {
+interface DriverProfileStatsViewModel {
+  rating: number;
+  wins: number;
+  podiums: number;
+  dnfs: number;
+  totalRaces: number;
+  avgFinish: number;
+  bestFinish: number;
+  worstFinish: number;
+  consistency: number;
+  percentile: number;
+}
+
+interface DriverProfileFriendViewModel {
+  id: string;
+  name: string;
+  country: string;
+}
+
+interface DriverProfileExtendedViewModel extends DriverExtendedProfile {}
+
+interface DriverProfileViewModel {
+  currentDriver?: {
+    id: string;
+    name: string;
+    iracingId?: string | null;
+    country: string;
+    bio?: string | null;
+    joinedAt: string | Date;
+    globalRank?: number;
+    totalDrivers?: number;
+  };
+  stats?: DriverProfileStatsViewModel;
+  extendedProfile?: DriverProfileExtendedViewModel;
+  socialSummary?: {
+    friends: DriverProfileFriendViewModel[];
+  };
+}
+
+export default function DriverDetailPage() {
   const router = useRouter();
   const params = useParams();
   const driverId = params.id as string;
@@ -318,24 +365,16 @@ export default function DriverDetailPage({
   const [allTeamMemberships, setAllTeamMemberships] = useState<TeamMembershipInfo[]>([]);
   const [friends, setFriends] = useState<Driver[]>([]);
   const [friendRequestSent, setFriendRequestSent] = useState(false);
-  const [profileData, setProfileData] = useState<any>(null);
+  const [profileData, setProfileData] = useState<ProfileOverviewViewModel | null>(null);
 
-  const unwrappedSearchParams = use(searchParams) as URLSearchParams | undefined;
-
-  const from =
-    typeof unwrappedSearchParams?.get === 'function'
-      ? unwrappedSearchParams.get('from') ?? undefined
+  const search =
+    typeof window !== 'undefined'
+      ? new URLSearchParams(window.location.search)
       : undefined;
 
-  const leagueId =
-    typeof unwrappedSearchParams?.get === 'function'
-      ? unwrappedSearchParams.get('leagueId') ?? undefined
-      : undefined;
-
-  const raceId =
-    typeof unwrappedSearchParams?.get === 'function'
-      ? unwrappedSearchParams.get('raceId') ?? undefined
-      : undefined;
+  const from = search?.get('from') ?? undefined;
+  const leagueId = search?.get('leagueId') ?? undefined;
+  const raceId = search?.get('raceId') ?? undefined;
 
   let backLink: string | null = null;
 
@@ -362,8 +401,7 @@ export default function DriverDetailPage({
     try {
       // Use GetProfileOverviewUseCase to load all profile data
       const profileUseCase = getGetProfileOverviewUseCase();
-      await profileUseCase.execute({ driverId });
-      const profileViewModel = profileUseCase.presenter.getViewModel();
+      const profileViewModel = await profileUseCase.execute({ driverId });
 
       if (!profileViewModel || !profileViewModel.currentDriver) {
         setError('Driver not found');
@@ -375,7 +413,7 @@ export default function DriverDetailPage({
       const driverData: DriverDTO = {
         id: profileViewModel.currentDriver.id,
         name: profileViewModel.currentDriver.name,
-        iracingId: profileViewModel.currentDriver.iracingId,
+        iracingId: profileViewModel.currentDriver.iracingId ?? '',
         country: profileViewModel.currentDriver.country,
         bio: profileViewModel.currentDriver.bio || '',
         joinedAt: profileViewModel.currentDriver.joinedAt,
@@ -383,30 +421,37 @@ export default function DriverDetailPage({
       setDriver(driverData);
       setProfileData(profileViewModel);
 
-      // Load team data
-      const teamUseCase = getGetDriverTeamUseCase();
-      await teamUseCase.execute({ driverId });
-      const teamViewModel = teamUseCase.presenter.getViewModel();
-      setTeamData(teamViewModel.result);
-
-      // Load ALL team memberships
+      // Load ALL team memberships using caller-owned presenters
       const allTeamsUseCase = getGetAllTeamsUseCase();
-      await allTeamsUseCase.execute();
-      const allTeamsViewModel = allTeamsUseCase.presenter.getViewModel();
-      const allTeams = allTeamsViewModel.teams;
-      const membershipsUseCase = getGetTeamMembersUseCase();
+      const allTeamsPresenter = new AllTeamsPresenter();
+      await allTeamsUseCase.execute(undefined as void, allTeamsPresenter);
+      const allTeamsViewModel = allTeamsPresenter.getViewModel();
+      const allTeams = allTeamsViewModel?.teams ?? [];
 
+      const membershipsUseCase = getGetTeamMembersUseCase();
       const memberships: TeamMembershipInfo[] = [];
+
       for (const team of allTeams) {
-        await membershipsUseCase.execute({ teamId: team.id });
-        const membersViewModel = membershipsUseCase.presenter.getViewModel();
-        const members = membersViewModel.members;
-        const membership = members.find((m) => m.driverId === driverId);
+        const teamMembersPresenter = new TeamMembersPresenter();
+        await membershipsUseCase.execute({ teamId: team.id }, teamMembersPresenter);
+        const membersResult = teamMembersPresenter.getViewModel();
+        const members = membersResult?.members ?? [];
+        const membership = members.find(
+          (member: TeamMemberViewModel) => member.driverId === driverId,
+        );
         if (membership) {
           memberships.push({
-            team,
+            team: {
+              id: team.id,
+              name: team.name,
+              tag: team.tag,
+              description: team.description,
+              ownerId: '',
+              leagues: team.leagues,
+              createdAt: new Date(),
+            } as Team,
             role: membership.role,
-            joinedAt: membership.joinedAt,
+            joinedAt: new Date(membership.joinedAt),
           });
         }
       }
@@ -459,7 +504,30 @@ export default function DriverDetailPage({
     );
   }
 
-  const extendedProfile = profileData?.extendedProfile || getDemoExtendedProfile(driver.id);
+  const demoExtended = getDemoExtendedProfile(driver.id);
+  const extendedProfile: DriverExtendedProfile = {
+    socialHandles: profileData?.extendedProfile?.socialHandles ?? demoExtended.socialHandles,
+    achievements:
+      profileData?.extendedProfile?.achievements
+        ? profileData.extendedProfile.achievements.map((achievement) => ({
+            id: achievement.id,
+            title: achievement.title,
+            description: achievement.description,
+            icon: achievement.icon,
+            rarity: achievement.rarity,
+            earnedAt: new Date(achievement.earnedAt),
+          }))
+        : demoExtended.achievements,
+    racingStyle: profileData?.extendedProfile?.racingStyle ?? demoExtended.racingStyle,
+    favoriteTrack: profileData?.extendedProfile?.favoriteTrack ?? demoExtended.favoriteTrack,
+    favoriteCar: profileData?.extendedProfile?.favoriteCar ?? demoExtended.favoriteCar,
+    timezone: profileData?.extendedProfile?.timezone ?? demoExtended.timezone,
+    availableHours: profileData?.extendedProfile?.availableHours ?? demoExtended.availableHours,
+    lookingForTeam:
+      profileData?.extendedProfile?.lookingForTeam ?? demoExtended.lookingForTeam,
+    openToRequests:
+      profileData?.extendedProfile?.openToRequests ?? demoExtended.openToRequests,
+  };
   const stats = profileData?.stats || null;
   const globalRank = profileData?.currentDriver?.globalRank || 1;
 
@@ -627,7 +695,7 @@ export default function DriverDetailPage({
             <div className="mt-6 pt-6 border-t border-charcoal-outline/50">
               <div className="flex flex-wrap items-center gap-2">
                 <span className="text-sm text-gray-500 mr-2">Connect:</span>
-                {extendedProfile.socialHandles.map((social) => {
+                {extendedProfile.socialHandles.map((social: SocialHandle) => {
                   const Icon = getSocialIcon(social.platform);
                   return (
                     <a
@@ -724,7 +792,7 @@ export default function DriverDetailPage({
               </div>
               <div className="flex gap-6">
                 <CircularProgress
-                  value={stats.consistency}
+                  value={stats.consistency ?? 0}
                   max={100}
                   label="Consistency"
                   color="text-primary-blue"
@@ -766,7 +834,9 @@ export default function DriverDetailPage({
                     <Target className="w-4 h-4 text-primary-blue" />
                     <span className="text-xs text-gray-500 uppercase">Avg Finish</span>
                   </div>
-                  <p className="text-2xl font-bold text-primary-blue">P{stats.avgFinish.toFixed(1)}</p>
+                  <p className="text-2xl font-bold text-primary-blue">
+                    P{(stats.avgFinish ?? 0).toFixed(1)}
+                  </p>
                 </div>
               </div>
             </div>
@@ -888,7 +958,7 @@ export default function DriverDetailPage({
               <span className="ml-auto text-sm text-gray-500">{extendedProfile.achievements.length} earned</span>
             </h2>
             <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-              {extendedProfile.achievements.map((achievement) => {
+              {extendedProfile.achievements.map((achievement: Achievement) => {
                 const Icon = getAchievementIcon(achievement.icon);
                 const rarityClasses = getRarityColor(achievement.rarity);
                 return (
@@ -1033,7 +1103,9 @@ export default function DriverDetailPage({
                 <div className="text-xs text-gray-400 uppercase">Best Finish</div>
               </div>
               <div className="p-4 rounded-xl bg-gradient-to-br from-primary-blue/20 to-primary-blue/5 border border-primary-blue/30 text-center">
-                <div className="text-4xl font-bold text-primary-blue mb-1">P{stats.avgFinish.toFixed(1)}</div>
+                <div className="text-4xl font-bold text-primary-blue mb-1">
+                  P{(stats.avgFinish ?? 0).toFixed(1)}
+                </div>
                 <div className="text-xs text-gray-400 uppercase">Avg Finish</div>
               </div>
               <div className="p-4 rounded-xl bg-gradient-to-br from-warning-amber/20 to-warning-amber/5 border border-warning-amber/30 text-center">

apps/website/app/leaderboards/drivers/page.tsx

@@ -71,11 +71,15 @@ interface TopThreePodiumProps {
 }
 
 function TopThreePodium({ drivers, onDriverClick }: TopThreePodiumProps) {
-  const top3 = drivers.slice(0, 3);
+  if (drivers.length < 3) return null;
 
-  if (top3.length < 3) return null;
+  const top3 = drivers.slice(0, 3) as [DriverListItem, DriverListItem, DriverListItem];
 
-  const podiumOrder = [top3[1], top3[0], top3[2]]; // 2nd, 1st, 3rd
+  const podiumOrder: [DriverListItem, DriverListItem, DriverListItem] = [
+    top3[1],
+    top3[0],
+    top3[2],
+  ]; // 2nd, 1st, 3rd
   const podiumHeights = ['h-32', 'h-40', 'h-24'];
   const podiumColors = [
     'from-gray-400/20 to-gray-500/10 border-gray-400/40',

apps/website/app/leaderboards/page.tsx

@@ -21,6 +21,7 @@ import {
 import Button from '@/components/ui/Button';
 import Heading from '@/components/ui/Heading';
 import { getGetDriversLeaderboardUseCase, getGetTeamsLeaderboardUseCase } from '@/lib/di-container';
+import { TeamsLeaderboardPresenter } from '@/lib/presenters/TeamsLeaderboardPresenter';
 import type { DriverLeaderboardItemViewModel, SkillLevel } from '@gridpilot/racing/application/presenters/IDriversLeaderboardPresenter';
 import type { TeamLeaderboardItemViewModel } from '@gridpilot/racing/application/presenters/ITeamsLeaderboardPresenter';
 import Image from 'next/image';
@@ -286,14 +287,16 @@ export default function LeaderboardsPage() {
       try {
         const driversUseCase = getGetDriversLeaderboardUseCase();
         const teamsUseCase = getGetTeamsLeaderboardUseCase();
+        const teamsPresenter = new TeamsLeaderboardPresenter();
+
         await driversUseCase.execute();
-        await teamsUseCase.execute();
+        await teamsUseCase.execute(undefined as void, teamsPresenter);
 
         const driversViewModel = driversUseCase.presenter.getViewModel();
-        const teamsViewModel = teamsUseCase.presenter.getViewModel();
+        const teamsViewModel = teamsPresenter.getViewModel();
 
         setDrivers(driversViewModel.drivers);
-        setTeams(teamsViewModel.teams);
+        setTeams(teamsViewModel ? teamsViewModel.teams : []);
       } catch (error) {
         console.error('Failed to load leaderboard data:', error);
         setDrivers([]);

apps/website/app/leagues/[id]/layout.tsx

@@ -19,8 +19,8 @@ import type { League } from '@gridpilot/racing/domain/entities/League';
 // Main sponsor info for "by XYZ" display
 interface MainSponsorInfo {
   name: string;
-  logoUrl?: string;
-  websiteUrl?: string;
+  logoUrl: string;
+  websiteUrl: string;
 }
 
 export default function LeagueLayout({
@@ -80,8 +80,8 @@ export default function LeagueLayout({
               if (sponsor) {
                 setMainSponsor({
                   name: sponsor.name,
-                  logoUrl: sponsor.logoUrl,
-                  websiteUrl: sponsor.websiteUrl,
+                  logoUrl: sponsor.logoUrl ?? '',
+                  websiteUrl: sponsor.websiteUrl ?? '',
                 });
               }
             }

apps/website/app/leagues/[id]/page.tsx

@@ -127,7 +127,7 @@ export default function LeagueDetailPage() {
       const getLeagueScoringConfigUseCase = getGetLeagueScoringConfigUseCase();
       await getLeagueScoringConfigUseCase.execute({ leagueId });
       const scoringViewModel = getLeagueScoringConfigUseCase.presenter.getViewModel();
-      setScoringConfig(scoringViewModel);
+      setScoringConfig(scoringViewModel as unknown as LeagueScoringConfigDTO);
 
       // Load all drivers for standings and map to DTOs for UI components
       const allDrivers = await driverRepo.findAll();
@@ -157,23 +157,23 @@ export default function LeagueDetailPage() {
         
         if (activeSeason) {
           const sponsorships = await sponsorshipRepo.findBySeasonId(activeSeason.id);
-          const activeSponsorships = sponsorships.filter(s => s.status === 'active');
+          const activeSponsorships = sponsorships.filter((s) => s.status === 'active');
           
           const sponsorInfos: SponsorInfo[] = [];
           for (const sponsorship of activeSponsorships) {
             const sponsor = await sponsorRepo.findById(sponsorship.sponsorId);
             if (sponsor) {
-              // Get tagline from demo data if available
-              const demoSponsors = (await import('@gridpilot/testing-support')).sponsors;
-              const demoSponsor = demoSponsors.find((s: any) => s.id === sponsor.id);
+              const testingSupportModule = await import('@gridpilot/testing-support');
+              const demoSponsors = testingSupportModule.sponsors as Array<{ id: string; tagline?: string }>;
+              const demoSponsor = demoSponsors.find((demo) => demo.id === sponsor.id);
               
               sponsorInfos.push({
                 id: sponsor.id,
                 name: sponsor.name,
-                logoUrl: sponsor.logoUrl,
-                websiteUrl: sponsor.websiteUrl,
+                logoUrl: sponsor.logoUrl ?? '',
+                websiteUrl: sponsor.websiteUrl ?? '',
                 tier: sponsorship.tier,
-                tagline: demoSponsor?.tagline,
+                tagline: demoSponsor?.tagline ?? '',
               });
             }
           }

apps/website/app/leagues/[id]/rulebook/page.tsx

@@ -37,7 +37,7 @@ export default function LeagueRulebookPage() {
 
         await scoringUseCase.execute({ leagueId });
         const scoringViewModel = scoringUseCase.presenter.getViewModel();
-        setScoringConfig(scoringViewModel);
+        setScoringConfig(scoringViewModel as unknown as LeagueScoringConfigDTO);
       } catch (err) {
         console.error('Failed to load scoring config:', err);
       } finally {

apps/website/app/leagues/[id]/settings/page.tsx

@@ -14,6 +14,8 @@ import {
   getListLeagueScoringPresetsUseCase,
   getTransferLeagueOwnershipUseCase
 } from '@/lib/di-container';
+import { LeagueFullConfigPresenter } from '@/lib/presenters/LeagueFullConfigPresenter';
+import { LeagueScoringPresetsPresenter } from '@/lib/presenters/LeagueScoringPresetsPresenter';
 import { useEffectiveDriverId } from '@/lib/currentDriver';
 import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles';
 import { ScoringPatternSection, ChampionshipsSection } from '@/components/leagues/LeagueScoringSection';
@@ -70,13 +72,17 @@ export default function LeagueSettingsPage() {
 
         setLeague(leagueData);
 
-        await useCase.execute({ leagueId });
-        const configViewModel = useCase.presenter.getViewModel();
-        setConfigForm(configViewModel);
+        const configPresenter = new LeagueFullConfigPresenter();
+        await useCase.execute({ leagueId }, configPresenter);
+        const configViewModel = configPresenter.getViewModel();
+        if (configViewModel) {
+          setConfigForm(configViewModel as LeagueConfigFormModel);
+        }
 
-        await presetsUseCase.execute();
-        const presetsViewModel = presetsUseCase.presenter.getViewModel();
-        setPresets(presetsViewModel);
+        const presetsPresenter = new LeagueScoringPresetsPresenter();
+        await presetsUseCase.execute(undefined as void, presetsPresenter);
+        const presetsViewModel = presetsPresenter.getViewModel();
+        setPresets(presetsViewModel.presets);
 
         const entity = await driverRepo.findById(leagueData.ownerId);
         if (entity) {

apps/website/app/leagues/[id]/standings/page.tsx

@@ -37,8 +37,15 @@ export default function LeagueStandingsPage() {
       const membershipRepo = getLeagueMembershipRepository();
 
       await getLeagueDriverSeasonStatsUseCase.execute({ leagueId });
-      const standingsViewModel = getLeagueDriverSeasonStatsUseCase.presenter.getViewModel();
-      setStandings(standingsViewModel);
+      type GetLeagueDriverSeasonStatsUseCaseType = {
+        presenter: {
+          getViewModel(): { stats: LeagueDriverSeasonStatsDTO[] };
+        };
+      };
+      const typedUseCase =
+        getLeagueDriverSeasonStatsUseCase as GetLeagueDriverSeasonStatsUseCaseType;
+      const standingsViewModel = typedUseCase.presenter.getViewModel();
+      setStandings(standingsViewModel.stats);
 
       const allDrivers = await driverRepo.findAll();
       const driverDtos: DriverDTO[] = allDrivers
@@ -48,8 +55,19 @@ export default function LeagueStandingsPage() {
 
       // Load league memberships from repository (consistent with other data)
       const allMemberships = await membershipRepo.getLeagueMembers(leagueId);
-      // Convert to the format expected by StandingsTable
-      const membershipData: LeagueMembership[] = allMemberships.map(m => ({
+
+      type RawMembership = {
+        id: string | number;
+        leagueId: string;
+        driverId: string;
+        role: MembershipRole;
+        status: LeagueMembership['status'];
+        joinedAt: string | Date;
+      };
+
+      // Convert to the format expected by StandingsTable (website-level LeagueMembership)
+      const membershipData: LeagueMembership[] = (allMemberships as RawMembership[]).map((m) => ({
+        id: String(m.id),
         leagueId: m.leagueId,
         driverId: m.driverId,
         role: m.role,

apps/website/app/leagues/[id]/stewarding/protests/[protestId]/page.tsx

@@ -246,12 +246,15 @@ export default function ProtestReviewPage() {
         });
 
         const selectedPenalty = PENALTY_TYPES.find(p => p.type === penaltyType);
+        const penaltyValueToUse =
+          selectedPenalty && selectedPenalty.requiresValue ? penaltyValue : 0;
+
         await penaltyUseCase.execute({
           raceId: protest.raceId,
           driverId: protest.accusedDriverId,
           stewardId: currentDriverId,
           type: penaltyType,
-          value: selectedPenalty?.requiresValue ? penaltyValue : undefined,
+          value: penaltyValueToUse,
           reason: protest.incident.description,
           protestId: protest.id,
           notes: stewardNotes,

apps/website/app/leagues/create/page.tsx

@@ -35,8 +35,8 @@ export default function CreateLeaguePage() {
 
   const handleStepChange = (stepName: StepName) => {
     const params = new URLSearchParams(
-      searchParams && typeof (searchParams as any).toString === 'function'
-        ? (searchParams as any).toString()
+      searchParams && typeof searchParams.toString === 'function'
+        ? searchParams.toString()
         : '',
     );
     params.set('step', stepName);

apps/website/app/leagues/page.tsx

@@ -391,8 +391,11 @@ export default function LeaguesPage() {
     try {
       const useCase = getGetAllLeaguesWithCapacityAndScoringUseCase();
       await useCase.execute();
-      const viewModel = useCase.presenter.getViewModel();
-      setRealLeagues(viewModel);
+      const presenter = useCase.presenter as unknown as {
+        getViewModel(): { leagues: LeagueSummaryDTO[] };
+      };
+      const viewModel = presenter.getViewModel();
+      setRealLeagues(viewModel.leagues);
     } catch (error) {
       console.error('Failed to load leagues:', error);
     } finally {

apps/website/app/profile/page.tsx

@@ -284,15 +284,14 @@ export default function ProfilePage() {
 
         // Use GetProfileOverviewUseCase to load all profile data
         const profileUseCase = getGetProfileOverviewUseCase();
-        await profileUseCase.execute({ driverId: currentDriverId });
-        const profileViewModel = profileUseCase.presenter.getViewModel();
+        const profileViewModel = await profileUseCase.execute({ driverId: currentDriverId });
         
         if (profileViewModel && profileViewModel.currentDriver) {
           // Set driver from ViewModel instead of direct repository access
           const driverData: DriverDTO = {
             id: profileViewModel.currentDriver.id,
             name: profileViewModel.currentDriver.name,
-            iracingId: profileViewModel.currentDriver.iracingId,
+            iracingId: profileViewModel.currentDriver.iracingId ?? '',
             country: profileViewModel.currentDriver.country,
             bio: profileViewModel.currentDriver.bio || '',
             joinedAt: profileViewModel.currentDriver.joinedAt,
@@ -335,11 +334,14 @@ export default function ProfilePage() {
 
     try {
       const updateProfileUseCase = getUpdateDriverProfileUseCase();
-      const updatedDto = await updateProfileUseCase.execute({
-        driverId: driver.id,
-        bio: updates.bio,
-        country: updates.country,
-      });
+      const input: { driverId: string; bio?: string; country?: string } = { driverId: driver.id };
+      if (typeof updates.bio === 'string') {
+        input.bio = updates.bio;
+      }
+      if (typeof updates.country === 'string') {
+        input.country = updates.country;
+      }
+      const updatedDto = await updateProfileUseCase.execute(input);
 
       if (updatedDto) {
         setDriver(updatedDto);
@@ -468,7 +470,9 @@ export default function ProfilePage() {
                   <>
                     <div className="flex items-center gap-2 px-3 py-1.5 rounded-lg bg-primary-blue/10 border border-primary-blue/30">
                       <Star className="w-4 h-4 text-primary-blue" />
-                      <span className="font-mono font-bold text-primary-blue">{stats.rating}</span>
+                      <span className="font-mono font-bold text-primary-blue">
+                        {stats.rating ?? 0}
+                      </span>
                       <span className="text-xs text-gray-400">Rating</span>
                     </div>
                     <div className="flex items-center gap-2 px-3 py-1.5 rounded-lg bg-yellow-400/10 border border-yellow-400/30">
@@ -644,7 +648,7 @@ export default function ProfilePage() {
               </div>
               <div className="flex gap-6">
                 <CircularProgress
-                  value={stats.consistency}
+                  value={stats.consistency ?? 0}
                   max={100}
                   label="Consistency"
                   color="text-primary-blue"
@@ -684,7 +688,9 @@ export default function ProfilePage() {
                     <Target className="w-4 h-4 text-primary-blue" />
                     <span className="text-xs text-gray-500 uppercase">Avg Finish</span>
                   </div>
-                  <p className="text-2xl font-bold text-primary-blue">P{stats.avgFinish.toFixed(1)}</p>
+                  <p className="text-2xl font-bold text-primary-blue">
+                    P{(stats.avgFinish ?? 0).toFixed(1)}
+                  </p>
                 </div>
               </div>
             </div>
@@ -758,7 +764,9 @@ export default function ProfilePage() {
                     <div className="text-xs text-gray-500 uppercase tracking-wider">Podiums</div>
                   </div>
                   <div className="p-4 rounded-xl bg-deep-graphite border border-charcoal-outline text-center">
-                    <div className="text-3xl font-bold text-primary-blue mb-1">{stats.consistency}%</div>
+                    <div className="text-3xl font-bold text-primary-blue mb-1">
+                      {stats.consistency ?? 0}%
+                    </div>
                     <div className="text-xs text-gray-500 uppercase tracking-wider">Consistency</div>
                   </div>
                 </div>
@@ -863,30 +871,35 @@ export default function ProfilePage() {
               </h2>
               <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
                 {extendedProfile.achievements.map((achievement) => {
-                const Icon = getAchievementIcon(achievement.icon);
-                const rarityClasses = getRarityColor(achievement.rarity);
-                return (
-                  <div
-                    key={achievement.id}
-                    className={`p-4 rounded-xl border ${rarityClasses} transition-all hover:scale-105`}
-                  >
-                    <div className="flex items-start gap-3">
-                      <div className={`flex h-10 w-10 items-center justify-center rounded-lg ${rarityClasses.split(' ')[1]}`}>
-                        <Icon className={`w-5 h-5 ${rarityClasses.split(' ')[0]}`} />
-                      </div>
-                      <div className="flex-1 min-w-0">
-                        <p className="text-white font-semibold text-sm">{achievement.title}</p>
-                        <p className="text-gray-400 text-xs mt-0.5">{achievement.description}</p>
-                        <p className="text-gray-500 text-xs mt-1">
-                          {new Date(achievement.earnedAt).toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' })}
-                        </p>
+                  const Icon = getAchievementIcon(achievement.icon);
+                  const rarityClasses = getRarityColor(achievement.rarity);
+                  return (
+                    <div
+                      key={achievement.id}
+                      className={`p-4 rounded-xl border ${rarityClasses} transition-all hover:scale-105`}
+                    >
+                      <div className="flex items-start gap-3">
+                        <div className={`flex h-10 w-10 items-center justify-center rounded-lg ${rarityClasses.split(' ')[1]}`}>
+                          <Icon className={`w-5 h-5 ${rarityClasses.split(' ')[0]}`} />
+                        </div>
+                        <div className="flex-1 min-w-0">
+                          <p className="text-white font-semibold text-sm">{achievement.title}</p>
+                          <p className="text-gray-400 text-xs mt-0.5">{achievement.description}</p>
+                          <p className="text-gray-500 text-xs mt-1">
+                            {new Date(achievement.earnedAt).toLocaleDateString('en-US', {
+                              month: 'short',
+                              day: 'numeric',
+                              year: 'numeric',
+                            })}
+                          </p>
+                        </div>
                       </div>
                     </div>
-                  </div>
-                );
-              })}
-            </div>
-          </Card>
+                  );
+                })}
+              </div>
+            </Card>
+          )}
 
           {/* Friends Preview */}
           {socialSummary && socialSummary.friends.length > 0 && (
@@ -987,7 +1000,9 @@ export default function ProfilePage() {
                     <Activity className="w-4 h-4 text-primary-blue" />
                     <span className="text-xs text-gray-500 uppercase">Consistency</span>
                   </div>
-                  <p className="text-2xl font-bold text-primary-blue">{stats.consistency}%</p>
+                  <p className="text-2xl font-bold text-primary-blue">
+                    {stats.consistency ?? 0}%
+                  </p>
                 </div>
                 <div className="p-4 rounded-xl bg-deep-graphite border border-charcoal-outline">
                   <div className="flex items-center gap-2 mb-2">
@@ -1015,7 +1030,9 @@ export default function ProfilePage() {
                 <div className="text-xs text-gray-400 uppercase">Best Finish</div>
               </div>
               <div className="p-4 rounded-xl bg-gradient-to-br from-primary-blue/20 to-primary-blue/5 border border-primary-blue/30 text-center">
-                <div className="text-4xl font-bold text-primary-blue mb-1">P{stats.avgFinish.toFixed(1)}</div>
+                <div className="text-4xl font-bold text-primary-blue mb-1">
+                  P{(stats.avgFinish ?? 0).toFixed(1)}
+                </div>
                 <div className="text-xs text-gray-400 uppercase">Avg Finish</div>
               </div>
               <div className="p-4 rounded-xl bg-gradient-to-br from-warning-amber/20 to-warning-amber/5 border border-warning-amber/30 text-center">
@@ -1044,7 +1061,9 @@ export default function ProfilePage() {
               </div>
               <div className="p-6 rounded-xl bg-gradient-to-br from-primary-blue/20 to-primary-blue/5 border border-primary-blue/30 text-center">
                 <Star className="w-8 h-8 text-primary-blue mx-auto mb-3" />
-                <div className="text-3xl font-bold text-primary-blue mb-1">{stats.rating}</div>
+                <div className="text-3xl font-bold text-primary-blue mb-1">
+                  {stats.rating ?? 0}
+                </div>
                 <div className="text-sm text-gray-400">Rating</div>
               </div>
               <div className="p-6 rounded-xl bg-gradient-to-br from-purple-400/20 to-purple-600/5 border border-purple-400/30 text-center">

apps/website/app/profile/sponsorship-requests/page.tsx

@@ -16,6 +16,7 @@ import {
   getLeagueMembershipRepository,
   getTeamMembershipRepository,
 } from '@/lib/di-container';
+import { PendingSponsorshipRequestsPresenter } from '@/lib/presenters/PendingSponsorshipRequestsPresenter';
 import { useEffectiveDriverId } from '@/lib/currentDriver';
 import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles';
 import { Handshake, User, Users, Trophy, ChevronRight, Building, AlertTriangle } from 'lucide-react';
@@ -51,12 +52,17 @@ export default function SponsorshipRequestsPage() {
       const allSections: EntitySection[] = [];
       
       // 1. Driver's own sponsorship requests
-      const driverResult = await query.execute({
-        entityType: 'driver',
-        entityId: currentDriverId,
-      });
+      const driverPresenter = new PendingSponsorshipRequestsPresenter();
+      await useCase.execute(
+        {
+          entityType: 'driver',
+          entityId: currentDriverId,
+        },
+        driverPresenter,
+      );
+      const driverResult = driverPresenter.getViewModel();
       
-      if (driverResult.requests.length > 0) {
+      if (driverResult && driverResult.requests.length > 0) {
         const driver = await driverRepo.findById(currentDriverId);
         allSections.push({
           entityType: 'driver',
@@ -74,12 +80,17 @@ export default function SponsorshipRequestsPage() {
           // Load sponsorship requests for this league's active season
           try {
             // For simplicity, we'll query by season entityType - in production you'd get the active season ID
-            const leagueResult = await query.execute({
-              entityType: 'season',
-              entityId: league.id, // Using league ID as a proxy for now
-            });
+            const leaguePresenter = new PendingSponsorshipRequestsPresenter();
+            await useCase.execute(
+              {
+                entityType: 'season',
+                entityId: league.id, // Using league ID as a proxy for now
+              },
+              leaguePresenter,
+            );
+            const leagueResult = leaguePresenter.getViewModel();
             
-            if (leagueResult.requests.length > 0) {
+            if (leagueResult && leagueResult.requests.length > 0) {
               allSections.push({
                 entityType: 'season',
                 entityId: league.id,
@@ -98,12 +109,17 @@ export default function SponsorshipRequestsPage() {
       for (const team of allTeams) {
         const membership = await teamMembershipRepo.getMembership(team.id, currentDriverId);
         if (membership && (membership.role === 'owner' || membership.role === 'manager')) {
-          const teamResult = await query.execute({
-            entityType: 'team',
-            entityId: team.id,
-          });
+          const teamPresenter = new PendingSponsorshipRequestsPresenter();
+          await useCase.execute(
+            {
+              entityType: 'team',
+              entityId: team.id,
+            },
+            teamPresenter,
+          );
+          const teamResult = teamPresenter.getViewModel();
           
-          if (teamResult.requests.length > 0) {
+          if (teamResult && teamResult.requests.length > 0) {
             allSections.push({
               entityType: 'team',
               entityId: team.id,
@@ -138,11 +154,14 @@ export default function SponsorshipRequestsPage() {
 
   const handleReject = async (requestId: string, reason?: string) => {
     const useCase = getRejectSponsorshipRequestUseCase();
-    await useCase.execute({
+    const input: { requestId: string; respondedBy: string; reason?: string } = {
       requestId,
       respondedBy: currentDriverId,
-      reason,
-    });
+    };
+    if (typeof reason === 'string') {
+      input.reason = reason;
+    }
+    await useCase.execute(input);
     await loadAllRequests();
   };
 

apps/website/app/races/[id]/page.tsx

@@ -928,7 +928,7 @@ export default function RaceDetailPage() {
         isOpen={showProtestModal}
         onClose={() => setShowProtestModal(false)}
         raceId={race.id}
-        leagueId={league?.id}
+        leagueId={league ? league.id : ''}
         protestingDriverId={currentDriverId}
         participants={entryList.map(d => ({ id: d.id, name: d.name }))}
       />

apps/website/app/races/[id]/results/page.tsx

@@ -115,13 +115,17 @@ export default function RaceResultsPage() {
         setPointsSystem(viewModel.pointsSystem);
         setFastestLapTime(viewModel.fastestLapTime);
         setCurrentDriverId(viewModel.currentDriverId);
-        setPenalties(
-          viewModel.penalties.map((p) => ({
+        const mappedPenalties: PenaltyData[] = viewModel.penalties.map((p) => {
+          const base: PenaltyData = {
             driverId: p.driverId,
             type: p.type as PenaltyTypeDTO,
-            value: p.value,
-          })),
-        );
+          };
+          if (typeof p.value === 'number') {
+            return { ...base, value: p.value };
+          }
+          return base;
+        });
+        setPenalties(mappedPenalties);
       }
 
       try {
@@ -287,9 +291,9 @@ export default function RaceResultsPage() {
               results={results}
               drivers={drivers}
               pointsSystem={pointsSystem}
-              fastestLapTime={fastestLapTime}
+              fastestLapTime={fastestLapTime ?? 0}
               penalties={penalties}
-              currentDriverId={currentDriverId}
+              currentDriverId={currentDriverId ?? ''}
             />
           ) : (
             <>

apps/website/app/races/[id]/stewarding/page.tsx

@@ -31,6 +31,8 @@ import {
 } from '@/lib/di-container';
 import { useEffectiveDriverId } from '@/lib/currentDriver';
 import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles';
+import { RaceProtestsPresenter } from '@/lib/presenters/RaceProtestsPresenter';
+import { RacePenaltiesPresenter } from '@/lib/presenters/RacePenaltiesPresenter';
 import type { RaceProtestViewModel } from '@gridpilot/racing/application/presenters/IRaceProtestsPresenter';
 import type { RacePenaltyViewModel } from '@gridpilot/racing/application/presenters/IRacePenaltiesPresenter';
 import type { League } from '@gridpilot/racing/domain/entities/League';
@@ -41,7 +43,9 @@ export default function RaceStewardingPage() {
   const router = useRouter();
   const raceId = params.id as string;
   const currentDriverId = useEffectiveDriverId();
-
+ 
+  const driversById: Record<string, { name?: string }> = {};
+ 
   const [race, setRace] = useState<Race | null>(null);
   const [league, setLeague] = useState<League | null>(null);
   const [protests, setProtests] = useState<RaceProtestViewModel[]>([]);
@@ -78,13 +82,15 @@ export default function RaceStewardingPage() {
           setIsAdmin(membership ? isLeagueAdminOrHigherRole(membership.role) : false);
         }
 
-        await protestsUseCase.execute(raceId);
-        const protestsViewModel = protestsUseCase.presenter.getViewModel();
-        setProtests(protestsViewModel.protests);
+        const protestsPresenter = new RaceProtestsPresenter();
+        await protestsUseCase.execute({ raceId }, protestsPresenter);
+        const protestsViewModel = protestsPresenter.getViewModel();
+        setProtests(protestsViewModel?.protests ?? []);
 
-        await penaltiesUseCase.execute(raceId);
-        const penaltiesViewModel = penaltiesUseCase.presenter.getViewModel();
-        setPenalties(penaltiesViewModel.penalties);
+        const penaltiesPresenter = new RacePenaltiesPresenter();
+        await penaltiesUseCase.execute({ raceId }, penaltiesPresenter);
+        const penaltiesViewModel = penaltiesPresenter.getViewModel();
+        setPenalties(penaltiesViewModel?.penalties ?? []);
       } catch (err) {
         console.error('Failed to load data:', err);
       } finally {

apps/website/app/races/all/page.tsx

@@ -105,8 +105,9 @@ export default function AllRacesPage() {
     setCurrentPage(1);
   }, [statusFilter, leagueFilter, searchQuery]);
 
-  const formatDate = (date: Date) => {
-    return new Date(date).toLocaleDateString('en-US', {
+  const formatDate = (date: Date | string) => {
+    const d = typeof date === 'string' ? new Date(date) : date;
+    return d.toLocaleDateString('en-US', {
       weekday: 'short',
       month: 'short',
       day: 'numeric',
@@ -114,8 +115,9 @@ export default function AllRacesPage() {
     });
   };
 
-  const formatTime = (date: Date) => {
-    return new Date(date).toLocaleTimeString('en-US', {
+  const formatTime = (date: Date | string) => {
+    const d = typeof date === 'string' ? new Date(date) : date;
+    return d.toLocaleTimeString('en-US', {
       hour: '2-digit',
       minute: '2-digit',
     });

apps/website/app/races/page.tsx

@@ -93,8 +93,11 @@ export default function RacesPage() {
   // Group races by date for calendar view
   const racesByDate = useMemo(() => {
     const grouped = new Map<string, RaceListItemViewModel[]>();
-    filteredRaces.forEach(race => {
-      const dateKey = new Date(race.scheduledAt).toISOString().split('T')[0];
+    filteredRaces.forEach((race) => {
+      if (typeof race.scheduledAt !== 'string') {
+        return;
+      }
+      const dateKey = race.scheduledAt.split('T')[0]!;
       if (!grouped.has(dateKey)) {
         grouped.set(dateKey, []);
       }
@@ -108,23 +111,26 @@ export default function RacesPage() {
   const recentResults = pageData?.recentResults ?? [];
   const stats = pageData?.stats ?? { total: 0, scheduled: 0, running: 0, completed: 0 };
 
-  const formatDate = (date: Date) => {
-    return new Date(date).toLocaleDateString('en-US', {
+  const formatDate = (date: Date | string) => {
+    const d = typeof date === 'string' ? new Date(date) : date;
+    return d.toLocaleDateString('en-US', {
       weekday: 'short',
       month: 'short',
       day: 'numeric',
     });
   };
 
-  const formatTime = (date: Date) => {
-    return new Date(date).toLocaleTimeString('en-US', {
+  const formatTime = (date: Date | string) => {
+    const d = typeof date === 'string' ? new Date(date) : date;
+    return d.toLocaleTimeString('en-US', {
       hour: '2-digit',
       minute: '2-digit',
     });
   };
 
-  const formatFullDate = (date: Date) => {
-    return new Date(date).toLocaleDateString('en-US', {
+  const formatFullDate = (date: Date | string) => {
+    const d = typeof date === 'string' ? new Date(date) : date;
+    return d.toLocaleDateString('en-US', {
       weekday: 'long',
       month: 'long',
       day: 'numeric',
@@ -132,9 +138,10 @@ export default function RacesPage() {
     });
   };
 
-  const getRelativeTime = (date: Date) => {
+  const getRelativeTime = (date?: Date | string) => {
+    if (!date) return '';
     const now = new Date();
-    const targetDate = new Date(date);
+    const targetDate = typeof date === 'string' ? new Date(date) : date;
     const diffMs = targetDate.getTime() - now.getTime();
     const diffHours = Math.floor(diffMs / (1000 * 60 * 60));
     const diffDays = Math.floor(diffMs / (1000 * 60 * 60 * 24));
@@ -144,7 +151,7 @@ export default function RacesPage() {
     if (diffHours < 24) return `In ${diffHours}h`;
     if (diffDays === 1) return 'Tomorrow';
     if (diffDays < 7) return `In ${diffDays} days`;
-    return formatDate(date);
+    return formatDate(targetDate);
   };
 
   const statusConfig = {
@@ -368,6 +375,9 @@ export default function RacesPage() {
                    {/* Races for this date */}
                    <div className="space-y-2">
                      {dayRaces.map((race) => {
+                       if (!race.scheduledAt) {
+                         return null;
+                       }
                        const config = statusConfig[race.status];
                        const StatusIcon = config.icon;
 
@@ -385,9 +395,13 @@ export default function RacesPage() {
                            <div className="flex items-start gap-4">
                              {/* Time Column */}
                              <div className="flex-shrink-0 text-center min-w-[60px]">
-                               <p className="text-lg font-bold text-white">{formatTime(new Date(race.scheduledAt))}</p>
+                               <p className="text-lg font-bold text-white">
+                                 {formatTime(race.scheduledAt)}
+                               </p>
                                <p className={`text-xs ${config.color}`}>
-                                 {race.status === 'running' ? 'LIVE' : getRelativeTime(new Date(race.scheduledAt))}
+                                 {race.status === 'running'
+                                   ? 'LIVE'
+                                   : getRelativeTime(race.scheduledAt)}
                                </p>
                              </div>
 
@@ -427,7 +441,7 @@ export default function RacesPage() {
                                {/* League Link */}
                                <div className="mt-3 pt-3 border-t border-charcoal-outline/50">
                                  <Link
-                                   href={`/leagues/${race.leagueId}`}
+                                   href={`/leagues/${race.leagueId ?? ''}`}
                                    onClick={(e) => e.stopPropagation()}
                                    className="inline-flex items-center gap-2 text-sm text-primary-blue hover:underline"
                                  >
@@ -482,24 +496,30 @@ export default function RacesPage() {
                 </p>
               ) : (
                 <div className="space-y-3">
-                  {upcomingRaces.map((race) => (
-                    <div
-                      key={race.id}
-                      onClick={() => router.push(`/races/${race.id}`)}
-                      className="flex items-center gap-3 p-2 rounded-lg hover:bg-deep-graphite cursor-pointer transition-colors"
-                    >
-                      <div className="flex-shrink-0 w-10 h-10 bg-primary-blue/10 rounded-lg flex items-center justify-center">
-                        <span className="text-sm font-bold text-primary-blue">
-                          {new Date(race.scheduledAt).getDate()}
-                        </span>
+                  {upcomingRaces.map((race) => {
+                    if (!race.scheduledAt) {
+                      return null;
+                    }
+                    const scheduledAtDate = new Date(race.scheduledAt);
+                    return (
+                      <div
+                        key={race.id}
+                        onClick={() => router.push(`/races/${race.id}`)}
+                        className="flex items-center gap-3 p-2 rounded-lg hover:bg-deep-graphite cursor-pointer transition-colors"
+                      >
+                        <div className="flex-shrink-0 w-10 h-10 bg-primary-blue/10 rounded-lg flex items-center justify-center">
+                          <span className="text-sm font-bold text-primary-blue">
+                            {scheduledAtDate.getDate()}
+                          </span>
+                        </div>
+                        <div className="min-w-0 flex-1">
+                          <p className="text-sm font-medium text-white truncate">{race.track}</p>
+                          <p className="text-xs text-gray-500">{formatTime(scheduledAtDate)}</p>
+                        </div>
+                        <ChevronRight className="w-4 h-4 text-gray-500" />
                       </div>
-                      <div className="min-w-0 flex-1">
-                        <p className="text-sm font-medium text-white truncate">{race.track}</p>
-                        <p className="text-xs text-gray-500">{formatTime(new Date(race.scheduledAt))}</p>
-                      </div>
-                      <ChevronRight className="w-4 h-4 text-gray-500" />
-                    </div>
-                  ))}
+                    );
+                  })}
                 </div>
               )}
             </Card>

apps/website/app/teams/[id]/page.tsx

@@ -9,6 +9,7 @@ import Button from '@/components/ui/Button';
 import Breadcrumbs from '@/components/layout/Breadcrumbs';
 import SponsorInsightsCard, { useSponsorMode, MetricBuilders, SlotTemplates } from '@/components/sponsors/SponsorInsightsCard';
 import { getImageService } from '@/lib/di-container';
+import { TeamMembersPresenter } from '@/lib/presenters/TeamMembersPresenter';
 import TeamRoster from '@/components/teams/TeamRoster';
 import TeamStandings from '@/components/teams/TeamStandings';
 import TeamAdmin from '@/components/teams/TeamAdmin';
@@ -19,9 +20,17 @@ import {
   getTeamMembershipRepository,
 } from '@/lib/di-container';
 import { useEffectiveDriverId } from '@/lib/currentDriver';
-import type { Team, TeamMembership, TeamRole } from '@gridpilot/racing';
+import type { Team } from '@gridpilot/racing';
 import { Users, Trophy, TrendingUp, Star, Zap } from 'lucide-react';
 
+type TeamRole = 'owner' | 'manager' | 'driver';
+
+interface TeamMembership {
+  driverId: string;
+  role: TeamRole;
+  joinedAt: Date;
+}
+
 type Tab = 'overview' | 'roster' | 'standings' | 'admin';
 
 export default function TeamDetailPage() {
@@ -42,16 +51,32 @@ export default function TeamDetailPage() {
       const detailsUseCase = getGetTeamDetailsUseCase();
       const membersUseCase = getGetTeamMembersUseCase();
 
-      await detailsUseCase.execute({ teamId, driverId: currentDriverId });
-      const detailsViewModel = detailsUseCase.presenter.getViewModel();
-      
-      await membersUseCase.execute({ teamId });
-      const membersViewModel = membersUseCase.presenter.getViewModel();
-      const teamMemberships = membersViewModel.members;
+      await detailsUseCase.execute(teamId, currentDriverId);
+      const detailsPresenter = detailsUseCase.presenter;
+      const detailsViewModel = detailsPresenter
+        ? (detailsPresenter as any).getViewModel?.() as { team: Team } | null
+        : null;
+
+      if (!detailsViewModel) {
+        setTeam(null);
+        setMemberships([]);
+        setIsAdmin(false);
+        return;
+      }
+
+      const teamMembersPresenter = new TeamMembersPresenter();
+      await membersUseCase.execute({ teamId }, teamMembersPresenter);
+      const membersViewModel = teamMembersPresenter.getViewModel();
+
+      const teamMemberships: TeamMembership[] = (membersViewModel?.members ?? []).map((m) => ({
+        driverId: m.driverId,
+        role: m.role as TeamRole,
+        joinedAt: new Date(m.joinedAt),
+      }));
 
       const adminStatus =
         teamMemberships.some(
-          (m) =>
+          (m: TeamMembership) =>
             m.driverId === currentDriverId &&
             (m.role === 'owner' || m.role === 'manager'),
         ) ?? false;

apps/website/app/teams/leaderboard/page.tsx

@@ -23,6 +23,7 @@ import Button from '@/components/ui/Button';
 import Input from '@/components/ui/Input';
 import Heading from '@/components/ui/Heading';
 import { getGetTeamsLeaderboardUseCase } from '@/lib/di-container';
+import { TeamsLeaderboardPresenter } from '@/lib/presenters/TeamsLeaderboardPresenter';
 import type {
   TeamLeaderboardItemViewModel,
   SkillLevel,
@@ -36,6 +37,23 @@ type SortBy = 'rating' | 'wins' | 'winRate' | 'races';
 
 type TeamDisplayData = TeamLeaderboardItemViewModel;
 
+const getSafeRating = (team: TeamDisplayData): number => {
+  const value = typeof team.rating === 'number' ? team.rating : 0;
+  return Number.isFinite(value) ? value : 0;
+};
+
+const getSafeTotalWins = (team: TeamDisplayData): number => {
+  const raw = team.totalWins;
+  const value = typeof raw === 'number' ? raw : 0;
+  return Number.isFinite(value) ? value : 0;
+};
+
+const getSafeTotalRaces = (team: TeamDisplayData): number => {
+  const raw = team.totalRaces;
+  const value = typeof raw === 'number' ? raw : 0;
+  return Number.isFinite(value) ? value : 0;
+};
+
 // ============================================================================
 // SKILL LEVEL CONFIG
 // ============================================================================
@@ -103,11 +121,15 @@ interface TopThreePodiumProps {
 }
 
 function TopThreePodium({ teams, onTeamClick }: TopThreePodiumProps) {
-  const top3 = teams.slice(0, 3);
-  if (top3.length < 3) return null;
+  const top3 = teams.slice(0, 3) as [TeamDisplayData, TeamDisplayData, TeamDisplayData];
+  if (teams.length < 3) return null;
 
   // Display order: 2nd, 1st, 3rd
-  const podiumOrder = [top3[1], top3[0], top3[2]];
+  const podiumOrder: [TeamDisplayData, TeamDisplayData, TeamDisplayData] = [
+    top3[1],
+    top3[0],
+    top3[2],
+  ];
   const podiumHeights = ['h-28', 'h-36', 'h-20'];
   const podiumPositions = [2, 1, 3];
 
@@ -159,7 +181,7 @@ function TopThreePodium({ teams, onTeamClick }: TopThreePodiumProps) {
 
       <div className="flex items-end justify-center gap-4 md:gap-8">
         {podiumOrder.map((team, index) => {
-          const position = podiumPositions[index];
+          const position = podiumPositions[index] ?? 0;
           const levelConfig = SKILL_LEVELS.find((l) => l.id === team.performanceLevel);
           const LevelIcon = levelConfig?.icon || Shield;
 
@@ -172,7 +194,7 @@ function TopThreePodium({ teams, onTeamClick }: TopThreePodiumProps) {
             >
               {/* Team card */}
               <div
-                className={`relative mb-4 p-4 rounded-xl bg-gradient-to-br ${getGradient(position)} border ${getBorderColor(position)} transition-all group-hover:scale-105 group-hover:shadow-lg`}
+                className={`relative mb-4 p-4 rounded-xl bg-gradient-to-br ${getGradient(position ?? 0)} border ${getBorderColor(position ?? 0)} transition-all group-hover:scale-105 group-hover:shadow-lg`}
               >
                 {/* Crown for 1st place */}
                 {position === 1 && (
@@ -198,14 +220,14 @@ function TopThreePodium({ teams, onTeamClick }: TopThreePodiumProps) {
 
                 {/* Rating */}
                 <p className={`text-lg md:text-xl font-mono font-bold ${getPositionColor(position)} text-center`}>
-                  {team.rating?.toLocaleString() ?? '—'}
+                  {getSafeRating(team).toLocaleString()}
                 </p>
 
                 {/* Stats row */}
                 <div className="flex items-center justify-center gap-3 mt-2 text-xs text-gray-400">
                   <span className="flex items-center gap-1">
                     <Trophy className="w-3 h-3 text-performance-green" />
-                    {team.totalWins}
+                    {getSafeTotalWins(team)}
                   </span>
                   <span className="flex items-center gap-1">
                     <Users className="w-3 h-3 text-purple-400" />
@@ -246,9 +268,14 @@ export default function TeamLeaderboardPage() {
     const loadTeams = async () => {
       try {
         const useCase = getGetTeamsLeaderboardUseCase();
-        await useCase.execute();
-        const viewModel = useCase.presenter.getViewModel();
-        setTeams(viewModel.teams);
+        const presenter = new TeamsLeaderboardPresenter();
+
+        await useCase.execute(undefined as void, presenter);
+
+        const viewModel = presenter.getViewModel();
+        if (viewModel) {
+          setTeams(viewModel.teams);
+        }
       } catch (error) {
         console.error('Failed to load teams:', error);
       } finally {
@@ -286,17 +313,30 @@ export default function TeamLeaderboardPage() {
     })
     .sort((a, b) => {
       switch (sortBy) {
-        case 'rating':
-          return (b.rating ?? 0) - (a.rating ?? 0);
-        case 'wins':
-          return b.totalWins - a.totalWins;
+        case 'rating': {
+          const aRating = getSafeRating(a);
+          const bRating = getSafeRating(b);
+          return bRating - aRating;
+        }
+        case 'wins': {
+          const aWinsSort = getSafeTotalWins(a);
+          const bWinsSort = getSafeTotalWins(b);
+          return bWinsSort - aWinsSort;
+        }
         case 'winRate': {
-          const aRate = a.totalRaces > 0 ? a.totalWins / a.totalRaces : 0;
-          const bRate = b.totalRaces > 0 ? b.totalWins / b.totalRaces : 0;
+          const aRaces = getSafeTotalRaces(a);
+          const bRaces = getSafeTotalRaces(b);
+          const aWins = getSafeTotalWins(a);
+          const bWins = getSafeTotalWins(b);
+          const aRate = aRaces > 0 ? aWins / aRaces : 0;
+          const bRate = bRaces > 0 ? bWins / bRaces : 0;
           return bRate - aRate;
         }
-        case 'races':
-          return b.totalRaces - a.totalRaces;
+        case 'races': {
+          const aRacesSort = getSafeTotalRaces(a);
+          const bRacesSort = getSafeTotalRaces(b);
+          return bRacesSort - aRacesSort;
+        }
         default:
           return 0;
       }
@@ -468,7 +508,10 @@ export default function TeamLeaderboardPage() {
             <span className="text-xs text-gray-500">Total Wins</span>
           </div>
           <p className="text-2xl font-bold text-white">
-            {filteredAndSortedTeams.reduce((sum, t) => sum + t.totalWins, 0)}
+            {filteredAndSortedTeams.reduce<number>(
+              (sum, t) => sum + getSafeTotalWins(t),
+              0,
+            )}
           </p>
         </div>
         <div className="p-4 rounded-xl bg-iron-gray/30 border border-charcoal-outline">
@@ -477,7 +520,10 @@ export default function TeamLeaderboardPage() {
             <span className="text-xs text-gray-500">Total Races</span>
           </div>
           <p className="text-2xl font-bold text-white">
-            {filteredAndSortedTeams.reduce((sum, t) => sum + t.totalRaces, 0)}
+            {filteredAndSortedTeams.reduce<number>(
+              (sum, t) => sum + getSafeTotalRaces(t),
+              0,
+            )}
           </p>
         </div>
       </div>
@@ -499,7 +545,10 @@ export default function TeamLeaderboardPage() {
           {filteredAndSortedTeams.map((team, index) => {
             const levelConfig = SKILL_LEVELS.find((l) => l.id === team.performanceLevel);
             const LevelIcon = levelConfig?.icon || Shield;
-            const winRate = team.totalRaces > 0 ? ((team.totalWins / team.totalRaces) * 100).toFixed(1) : '0.0';
+            const totalRaces = getSafeTotalRaces(team);
+            const totalWins = getSafeTotalWins(team);
+            const winRate =
+              totalRaces > 0 ? ((totalWins / totalRaces) * 100).toFixed(1) : '0.0';
 
             return (
               <button
@@ -565,15 +614,19 @@ export default function TeamLeaderboardPage() {
 
                 {/* Rating */}
                 <div className="col-span-2 lg:col-span-1 flex items-center justify-center">
-                  <span className={`font-mono font-semibold ${sortBy === 'rating' ? 'text-purple-400' : 'text-white'}`}>
-                    {team.rating?.toLocaleString() ?? '—'}
+                  <span
+                    className={`font-mono font-semibold ${
+                      sortBy === 'rating' ? 'text-purple-400' : 'text-white'
+                    }`}
+                  >
+                    {getSafeRating(team).toLocaleString()}
                   </span>
                 </div>
 
                 {/* Wins */}
                 <div className="col-span-2 lg:col-span-1 flex items-center justify-center">
                   <span className={`font-mono font-semibold ${sortBy === 'wins' ? 'text-purple-400' : 'text-white'}`}>
-                    {team.totalWins}
+                    {getSafeTotalWins(team)}
                   </span>
                 </div>
 

apps/website/app/teams/page.tsx

@@ -29,6 +29,7 @@ import Input from '@/components/ui/Input';
 import Heading from '@/components/ui/Heading';
 import CreateTeamForm from '@/components/teams/CreateTeamForm';
 import { getGetTeamsLeaderboardUseCase } from '@/lib/di-container';
+import { TeamsLeaderboardPresenter } from '@/lib/presenters/TeamsLeaderboardPresenter';
 import type { TeamLeaderboardItemViewModel, SkillLevel } from '@gridpilot/racing/application/presenters/ITeamsLeaderboardPresenter';
 
 // ============================================================================
@@ -204,7 +205,7 @@ function SkillLevelSection({ level, teams, onTeamClick, defaultExpanded = false
             key={team.id}
             id={team.id}
             name={team.name}
-            description={team.description}
+            description={team.description ?? ''}
             memberCount={team.memberCount}
             rating={team.rating}
             totalWins={team.totalWins}
@@ -212,7 +213,7 @@ function SkillLevelSection({ level, teams, onTeamClick, defaultExpanded = false
             performanceLevel={team.performanceLevel}
             isRecruiting={team.isRecruiting}
             specialization={team.specialization}
-            region={team.region}
+            region={team.region ?? ''}
             languages={team.languages}
             onClick={() => onTeamClick(team.id)}
           />
@@ -449,11 +450,16 @@ export default function TeamsPage() {
   const loadTeams = async () => {
     try {
       const useCase = getGetTeamsLeaderboardUseCase();
-      await useCase.execute();
-      const viewModel = useCase.presenter.getViewModel();
-      setRealTeams(viewModel.teams);
-      setGroupsBySkillLevel(viewModel.groupsBySkillLevel);
-      setTopTeams(viewModel.topTeams);
+      const presenter = new TeamsLeaderboardPresenter();
+
+      await useCase.execute(undefined as void, presenter);
+
+      const viewModel = presenter.getViewModel();
+      if (viewModel) {
+        setRealTeams(viewModel.teams);
+        setGroupsBySkillLevel(viewModel.groupsBySkillLevel);
+        setTopTeams(viewModel.topTeams);
+      }
     } catch (error) {
       console.error('Failed to load teams:', error);
     } finally {

apps/website/components/dev/DevToolbar.tsx

@@ -179,13 +179,18 @@ export default function DevToolbar() {
         leagueRepository.findAll(),
       ]);
 
-      const completedRaces = allRaces.filter((race: any) => race.status === 'completed');
-      const scheduledRaces = allRaces.filter((race: any) => race.status === 'scheduled');
+      const completedRaces = allRaces.filter((race) => race.status === 'completed');
+      const scheduledRaces = allRaces.filter((race) => race.status === 'scheduled');
 
       const primaryRace = completedRaces[0] ?? allRaces[0];
       const secondaryRace = scheduledRaces[0] ?? allRaces[1] ?? primaryRace;
       const primaryLeague = allLeagues[0];
 
+      const notificationDeadline =
+        selectedUrgency === 'modal'
+          ? new Date(Date.now() + 48 * 60 * 60 * 1000)
+          : undefined;
+
       let title: string;
       let body: string;
       let notificationType: 'protest_filed' | 'protest_defense_requested' | 'protest_vote_required';
@@ -227,7 +232,7 @@ export default function DevToolbar() {
               { label: 'View Protest', type: 'primary' as const, href: actionUrl, actionId: 'view' },
               { label: 'Dismiss', type: 'secondary' as const, actionId: 'dismiss' },
             ]
-          : undefined;
+          : [];
 
       await sendNotification.execute({
         recipientId: currentDriverId,
@@ -240,12 +245,9 @@ export default function DevToolbar() {
         actions,
         data: {
           protestId: `demo-protest-${Date.now()}`,
-          raceId: primaryRace?.id,
-          leagueId: primaryLeague?.id,
-          deadline:
-            selectedUrgency === 'modal'
-              ? new Date(Date.now() + 48 * 60 * 60 * 1000)
-              : undefined,
+          raceId: primaryRace?.id ?? '',
+          leagueId: primaryLeague?.id ?? '',
+          ...(notificationDeadline ? { deadline: notificationDeadline } : {}),
         },
       });
 

apps/website/components/drivers/CreateDriverForm.tsx

@@ -70,13 +70,14 @@ export default function CreateDriverForm() {
     
     try {
       const driverRepo = getDriverRepository();
+      const bio = formData.bio.trim();
       
       const driver = Driver.create({
         id: crypto.randomUUID(),
         iracingId: formData.iracingId.trim(),
         name: formData.name.trim(),
         country: formData.country.trim().toUpperCase(),
-        bio: formData.bio.trim() || undefined,
+        ...(bio ? { bio } : {}),
       });
       
       await driverRepo.create(driver);

apps/website/components/drivers/DriverCard.tsx

@@ -40,7 +40,7 @@ export default function DriverCard(props: DriverCardProps) {
   return (
     <Card
       className="hover:border-charcoal-outline/60 transition-colors cursor-pointer"
-      onClick={onClick}
+      {...(onClick ? { onClick } : {})}
     >
       <div className="flex items-center justify-between">
         <div className="flex items-center gap-4 flex-1">

apps/website/components/drivers/DriverProfile.tsx

@@ -9,8 +9,10 @@ import DriverRankings from './DriverRankings';
 import PerformanceMetrics from './PerformanceMetrics';
 import { useEffect, useState } from 'react';
 import { getLeagueRankings, getGetDriverTeamUseCase, getGetProfileOverviewUseCase } from '@/lib/di-container';
+import { DriverTeamPresenter } from '@/lib/presenters/DriverTeamPresenter';
 import { getPrimaryLeagueIdForDriver } from '@/lib/leagueMembership';
-import type { GetDriverTeamQueryResultDTO } from '@gridpilot/racing/application/dto/TeamCommandAndQueryDTO';
+import type { ProfileOverviewViewModel } from '@gridpilot/racing/application/presenters/IProfileOverviewPresenter';
+import type { DriverTeamViewModel } from '@gridpilot/racing/application/presenters/IDriverTeamPresenter';
 
 interface DriverProfileProps {
   driver: DriverDTO;
@@ -18,23 +20,39 @@ interface DriverProfileProps {
   onEditClick?: () => void;
 }
  
+interface DriverProfileStatsViewModel {
+  rating: number;
+  wins: number;
+  podiums: number;
+  dnfs: number;
+  totalRaces: number;
+  avgFinish: number;
+  bestFinish: number;
+  worstFinish: number;
+  consistency: number;
+  percentile: number;
+  overallRank?: number;
+}
+
+type DriverProfileOverviewViewModel = ProfileOverviewViewModel | null;
+
 export default function DriverProfile({ driver, isOwnProfile = false, onEditClick }: DriverProfileProps) {
-  const [profileData, setProfileData] = useState<any>(null);
-  const [teamData, setTeamData] = useState<GetDriverTeamQueryResultDTO | null>(null);
+  const [profileData, setProfileData] = useState<DriverProfileOverviewViewModel>(null);
+  const [teamData, setTeamData] = useState<DriverTeamViewModel | null>(null);
 
   useEffect(() => {
     const load = async () => {
       // Load profile data using GetProfileOverviewUseCase
       const profileUseCase = getGetProfileOverviewUseCase();
-      await profileUseCase.execute({ driverId: driver.id });
-      const profileViewModel = profileUseCase.presenter.getViewModel();
+      const profileViewModel = await profileUseCase.execute({ driverId: driver.id });
       setProfileData(profileViewModel);
 
-      // Load team data
+      // Load team data using caller-owned presenter
       const teamUseCase = getGetDriverTeamUseCase();
-      await teamUseCase.execute({ driverId: driver.id });
-      const teamViewModel = teamUseCase.presenter.getViewModel();
-      setTeamData(teamViewModel.result);
+      const driverTeamPresenter = new DriverTeamPresenter();
+      await teamUseCase.execute({ driverId: driver.id }, driverTeamPresenter);
+      const teamResult = driverTeamPresenter.getViewModel();
+      setTeamData(teamResult ?? null);
     };
     void load();
   }, [driver.id]);
@@ -44,27 +62,27 @@ export default function DriverProfile({ driver, isOwnProfile = false, onEditClic
   const leagueRank = primaryLeagueId
     ? getLeagueRankings(driver.id, primaryLeagueId)
     : { rank: 0, totalDrivers: 0, percentile: 0 };
-  const globalRank = profileData?.currentDriver?.globalRank || null;
-  const totalDrivers = profileData?.currentDriver?.totalDrivers || 0;
+  const globalRank = profileData?.currentDriver?.globalRank ?? null;
+  const totalDrivers = profileData?.currentDriver?.totalDrivers ?? 0;
 
   const performanceStats = driverStats ? {
-    winRate: (driverStats.wins / driverStats.totalRaces) * 100,
-    podiumRate: (driverStats.podiums / driverStats.totalRaces) * 100,
-    dnfRate: (driverStats.dnfs / driverStats.totalRaces) * 100,
-    avgFinish: driverStats.avgFinish,
-    consistency: driverStats.consistency,
-    bestFinish: driverStats.bestFinish,
-    worstFinish: driverStats.worstFinish,
+    winRate: driverStats.totalRaces > 0 ? (driverStats.wins / driverStats.totalRaces) * 100 : 0,
+    podiumRate: driverStats.totalRaces > 0 ? (driverStats.podiums / driverStats.totalRaces) * 100 : 0,
+    dnfRate: driverStats.totalRaces > 0 ? (driverStats.dnfs / driverStats.totalRaces) * 100 : 0,
+    avgFinish: driverStats.avgFinish ?? 0,
+    consistency: driverStats.consistency ?? 0,
+    bestFinish: driverStats.bestFinish ?? 0,
+    worstFinish: driverStats.worstFinish ?? 0,
   } : null;
 
   const rankings = driverStats ? [
     {
       type: 'overall' as const,
       name: 'Overall Ranking',
-      rank: globalRank || driverStats.overallRank || 0,
-      totalDrivers: totalDrivers,
-      percentile: driverStats.percentile,
-      rating: driverStats.rating,
+      rank: globalRank ?? driverStats.overallRank ?? 0,
+      totalDrivers,
+      percentile: driverStats.percentile ?? 0,
+      rating: driverStats.rating ?? 0,
     },
     {
       type: 'league' as const,
@@ -72,7 +90,7 @@ export default function DriverProfile({ driver, isOwnProfile = false, onEditClic
       rank: leagueRank.rank,
       totalDrivers: leagueRank.totalDrivers,
       percentile: leagueRank.percentile,
-      rating: driverStats.rating,
+      rating: driverStats.rating ?? 0,
     },
   ] : [];
 
@@ -84,7 +102,7 @@ export default function DriverProfile({ driver, isOwnProfile = false, onEditClic
           rating={driverStats?.rating ?? null}
           rank={driverStats?.overallRank ?? null}
           isOwnProfile={isOwnProfile}
-          onEditClick={isOwnProfile ? onEditClick : undefined}
+          onEditClick={onEditClick ?? (() => {})}
           teamName={teamData?.team.name ?? null}
           teamTag={teamData?.team.tag ?? null}
         />
@@ -103,7 +121,11 @@ export default function DriverProfile({ driver, isOwnProfile = false, onEditClic
             <Card>
               <h3 className="text-lg font-semibold text-white mb-4">Career Statistics</h3>
               <div className="grid grid-cols-2 gap-4">
-                <StatCard label="Rating" value={driverStats.rating.toString()} color="text-primary-blue" />
+                <StatCard
+                  label="Rating"
+                  value={(driverStats.rating ?? 0).toString()}
+                  color="text-primary-blue"
+                />
                 <StatCard label="Total Races" value={driverStats.totalRaces.toString()} color="text-white" />
                 <StatCard label="Wins" value={driverStats.wins.toString()} color="text-green-400" />
                 <StatCard label="Podiums" value={driverStats.podiums.toString()} color="text-warning-amber" />
@@ -130,14 +152,21 @@ export default function DriverProfile({ driver, isOwnProfile = false, onEditClic
 
       <Card>
         <h3 className="text-lg font-semibold text-white mb-4">Performance by Class</h3>
-        <ProfileStats stats={driverStats ? {
-          totalRaces: driverStats.totalRaces,
-          wins: driverStats.wins,
-          podiums: driverStats.podiums,
-          dnfs: driverStats.dnfs,
-          avgFinish: driverStats.avgFinish,
-          completionRate: ((driverStats.totalRaces - driverStats.dnfs) / driverStats.totalRaces) * 100
-        } : undefined} />
+        {driverStats && (
+          <ProfileStats
+            stats={{
+              totalRaces: driverStats.totalRaces,
+              wins: driverStats.wins,
+              podiums: driverStats.podiums,
+              dnfs: driverStats.dnfs,
+              avgFinish: driverStats.avgFinish ?? 0,
+              completionRate:
+                driverStats.totalRaces > 0
+                  ? ((driverStats.totalRaces - driverStats.dnfs) / driverStats.totalRaces) * 100
+                  : 0,
+            }}
+          />
+        )}
       </Card>
 
       <CareerHighlights />

apps/website/components/drivers/ProfileRaceHistory.tsx

@@ -135,8 +135,8 @@ export default function ProfileRaceHistory({ driverId }: RaceHistoryProps) {
       <Card>
         <div className="space-y-2">
           {paginatedResults.map(({ race, result, league }) => {
-            if (!result) return null;
-            
+            if (!result || !league) return null;
+
             return (
               <RaceResultCard
                 key={race.id}

apps/website/components/drivers/ProfileStats.tsx

@@ -5,6 +5,7 @@ import RankBadge from './RankBadge';
 import { getLeagueRankings, getGetProfileOverviewUseCase } from '@/lib/di-container';
 import { useState, useEffect } from 'react';
 import { getPrimaryLeagueIdForDriver } from '@/lib/leagueMembership';
+import type { ProfileOverviewViewModel } from '@gridpilot/racing/application/presenters/IProfileOverviewPresenter';
 
 interface ProfileStatsProps {
   driverId?: string;
@@ -18,15 +19,16 @@ interface ProfileStatsProps {
   };
 }
 
+type DriverProfileOverviewViewModel = ProfileOverviewViewModel | null;
+
 export default function ProfileStats({ driverId, stats }: ProfileStatsProps) {
-  const [profileData, setProfileData] = useState<any>(null);
+  const [profileData, setProfileData] = useState<DriverProfileOverviewViewModel>(null);
   
   useEffect(() => {
     if (driverId) {
       const load = async () => {
         const profileUseCase = getGetProfileOverviewUseCase();
-        await profileUseCase.execute({ driverId });
-        const vm = profileUseCase.presenter.getViewModel();
+        const vm = await profileUseCase.execute({ driverId });
         setProfileData(vm);
       };
       void load();
@@ -34,23 +36,26 @@ export default function ProfileStats({ driverId, stats }: ProfileStatsProps) {
   }, [driverId]);
 
   const driverStats = profileData?.stats || null;
-  const totalDrivers = profileData?.currentDriver?.totalDrivers || 0;
+  const totalDrivers = profileData?.currentDriver?.totalDrivers ?? 0;
   const primaryLeagueId = driverId ? getPrimaryLeagueIdForDriver(driverId) : null;
   const leagueRank =
     driverId && primaryLeagueId ? getLeagueRankings(driverId, primaryLeagueId) : null;
 
-  const defaultStats = stats || (driverStats
-    ? {
-        totalRaces: driverStats.totalRaces,
-        wins: driverStats.wins,
-        podiums: driverStats.podiums,
-        dnfs: driverStats.dnfs,
-        avgFinish: driverStats.avgFinish,
-        completionRate:
-          ((driverStats.totalRaces - driverStats.dnfs) / driverStats.totalRaces) *
-          100,
-      }
-    : null);
+  const defaultStats =
+    stats ||
+    (driverStats
+      ? {
+          totalRaces: driverStats.totalRaces,
+          wins: driverStats.wins,
+          podiums: driverStats.podiums,
+          dnfs: driverStats.dnfs,
+          avgFinish: driverStats.avgFinish ?? 0,
+          completionRate:
+            driverStats.totalRaces > 0
+              ? ((driverStats.totalRaces - driverStats.dnfs) / driverStats.totalRaces) * 100
+              : 0,
+        }
+      : null);
 
   const winRate =
     defaultStats && defaultStats.totalRaces > 0
@@ -91,17 +96,19 @@ export default function ProfileStats({ driverId, stats }: ProfileStatsProps) {
             <div className="p-4 rounded-lg bg-deep-graphite border border-charcoal-outline">
               <div className="flex items-center justify-between mb-3">
                 <div className="flex items-center gap-3">
-                  <RankBadge rank={driverStats.overallRank} size="lg" />
+                  <RankBadge rank={driverStats.overallRank ?? 0} size="lg" />
                   <div>
                     <div className="text-white font-medium text-lg">Overall Ranking</div>
                     <div className="text-sm text-gray-400">
-                      {driverStats.overallRank} of {totalDrivers} drivers
+                      {driverStats.overallRank ?? 0} of {totalDrivers} drivers
                     </div>
                   </div>
                 </div>
                 <div className="text-right">
-                  <div className={`text-sm font-medium ${getPercentileColor(driverStats.percentile)}`}>
-                    {getPercentileLabel(driverStats.percentile)}
+                  <div
+                    className={`text-sm font-medium ${getPercentileColor(driverStats.percentile ?? 0)}`}
+                  >
+                    {getPercentileLabel(driverStats.percentile ?? 0)}
                   </div>
                   <div className="text-xs text-gray-500">Global Percentile</div>
                 </div>
@@ -109,7 +116,9 @@ export default function ProfileStats({ driverId, stats }: ProfileStatsProps) {
               
               <div className="grid grid-cols-3 gap-4 pt-3 border-t border-charcoal-outline">
                 <div className="text-center">
-                  <div className="text-2xl font-bold text-primary-blue">{driverStats.rating}</div>
+                  <div className="text-2xl font-bold text-primary-blue">
+                    {driverStats.rating ?? 0}
+                  </div>
                   <div className="text-xs text-gray-400">Rating</div>
                 </div>
                 <div className="text-center">

apps/website/components/feed/FeedItemCard.tsx

@@ -1,11 +1,13 @@
+import { useState, useEffect } from 'react';
 import Card from '@/components/ui/Card';
 import Button from '@/components/ui/Button';
 import Image from 'next/image';
 import type { FeedItemDTO } from '@gridpilot/social/application/dto/FeedItemDTO';
 import { getDriverRepository, getImageService } from '@/lib/di-container';
 
-function timeAgo(timestamp: Date): string {
-  const diffMs = Date.now() - timestamp.getTime();
+function timeAgo(timestamp: Date | string): string {
+  const date = typeof timestamp === 'string' ? new Date(timestamp) : timestamp;
+  const diffMs = Date.now() - date.getTime();
   const diffMinutes = Math.floor(diffMs / 60000);
   if (diffMinutes < 1) return 'Just now';
   if (diffMinutes < 60) return `${diffMinutes} min ago`;

apps/website/components/landing/AlternatingSection.tsx

@@ -3,7 +3,7 @@
 import { useRef, ReactNode } from 'react';
 import Container from '@/components/ui/Container';
 import Heading from '@/components/ui/Heading';
-import { useScrollProgress, useParallax } from '@/hooks/useScrollProgress';
+import { useParallax } from '../../hooks/useScrollProgress';
 
 interface AlternatingSectionProps {
   heading: string;

apps/website/components/landing/DiscordCTA.tsx

@@ -2,7 +2,6 @@
 
 import { useRef } from 'react';
 import Button from '@/components/ui/Button';
-import { useScrollProgress } from '@/hooks/useScrollProgress';
 
 export default function DiscordCTA() {
   const discordUrl = process.env.NEXT_PUBLIC_DISCORD_URL || '#';

apps/website/components/landing/FeatureGrid.tsx

@@ -11,7 +11,6 @@ import TeamCompetitionMockup from '@/components/mockups/TeamCompetitionMockup';
 import ProtestWorkflowMockup from '@/components/mockups/ProtestWorkflowMockup';
 import LeagueDiscoveryMockup from '@/components/mockups/LeagueDiscoveryMockup';
 import DriverProfileMockup from '@/components/mockups/DriverProfileMockup';
-import { useScrollProgress } from '@/hooks/useScrollProgress';
 
 const features = [
   {

apps/website/components/landing/Footer.tsx

@@ -1,8 +1,6 @@
 'use client';
 
 import Image from 'next/image';
-import { useRef } from 'react';
-import { useScrollProgress } from '@/hooks/useScrollProgress';
 
 const discordUrl = process.env.NEXT_PUBLIC_DISCORD_URL || 'https://discord.gg/gridpilot';
 const xUrl = process.env.NEXT_PUBLIC_X_URL || '#';

apps/website/components/landing/Hero.tsx

@@ -4,7 +4,7 @@ import { useRef } from 'react';
 import Button from '@/components/ui/Button';
 import Container from '@/components/ui/Container';
 import Heading from '@/components/ui/Heading';
-import { useScrollProgress, useParallax } from '@/hooks/useScrollProgress';
+import { useParallax } from '../../hooks/useScrollProgress';
 
 const discordUrl = process.env.NEXT_PUBLIC_DISCORD_URL || '#';
 

apps/website/components/leagues/CreateLeagueWizard.tsx

@@ -156,7 +156,8 @@ function getDefaultSeasonStartDate(): string {
   const daysUntilSaturday = (6 - now.getDay() + 7) % 7 || 7;
   const nextSaturday = new Date(now);
   nextSaturday.setDate(now.getDate() + daysUntilSaturday);
-  return nextSaturday.toISOString().split('T')[0];
+  const [datePart] = nextSaturday.toISOString().split('T');
+  return datePart ?? '';
 }
 
 function createDefaultForm(): LeagueConfigFormModel {
@@ -172,8 +173,6 @@ function createDefaultForm(): LeagueConfigFormModel {
     structure: {
       mode: 'solo',
       maxDrivers: 24,
-      maxTeams: undefined,
-      driversPerTeam: undefined,
       multiClassEnabled: false,
     },
     championships: {
@@ -193,7 +192,7 @@ function createDefaultForm(): LeagueConfigFormModel {
     timings: {
       practiceMinutes: 20,
       qualifyingMinutes: 30,
-      sprintRaceMinutes: defaultPatternId === 'sprint-main-driver' ? 20 : undefined,
+      sprintRaceMinutes: 20,
       mainRaceMinutes: 40,
       sessionCount: 2,
       roundsPlanned: 8,
@@ -265,12 +264,13 @@ export default function CreateLeagueWizard({ stepName, onStepChange }: CreateLea
         const query = getListLeagueScoringPresetsQuery();
         const result = await query.execute();
         setPresets(result);
-        if (result.length > 0) {
+        const firstPreset = result[0];
+        if (firstPreset) {
           setForm((prev) => ({
             ...prev,
             scoring: {
               ...prev.scoring,
-              patternId: prev.scoring.patternId || result[0].id,
+              patternId: prev.scoring.patternId || firstPreset.id,
               customScoringEnabled: prev.scoring.customScoringEnabled ?? false,
             },
           }));
@@ -338,7 +338,10 @@ export default function CreateLeagueWizard({ stepName, onStepChange }: CreateLea
     }
 
     setLoading(true);
-    setErrors((prev) => ({ ...prev, submit: undefined }));
+    setErrors((prev) => {
+      const { submit, ...rest } = prev;
+      return rest;
+    });
 
     try {
       const result = await createLeagueFromConfig(form);
@@ -577,7 +580,7 @@ export default function CreateLeagueWizard({ stepName, onStepChange }: CreateLea
               <LeagueBasicsSection
                 form={form}
                 onChange={setForm}
-                errors={errors.basics}
+                errors={errors.basics ?? {}}
               />
             </div>
           )}
@@ -587,7 +590,11 @@ export default function CreateLeagueWizard({ stepName, onStepChange }: CreateLea
               <LeagueVisibilitySection
                 form={form}
                 onChange={setForm}
-                errors={errors.basics}
+                errors={
+                  errors.basics?.visibility
+                    ? { visibility: errors.basics.visibility }
+                    : {}
+                }
               />
             </div>
           )}
@@ -607,7 +614,7 @@ export default function CreateLeagueWizard({ stepName, onStepChange }: CreateLea
               <LeagueTimingsSection
                 form={form}
                 onChange={setForm}
-                errors={errors.timings}
+                errors={errors.timings ?? {}}
               />
             </div>
           )}
@@ -619,7 +626,7 @@ export default function CreateLeagueWizard({ stepName, onStepChange }: CreateLea
                 scoring={form.scoring}
                 presets={presets}
                 readOnly={presetsLoading}
-                patternError={errors.scoring?.patternId}
+                patternError={errors.scoring?.patternId ?? ''}
                 onChangePatternId={handleScoringPresetChange}
                 onToggleCustomScoring={() =>
                   setForm((prev) => ({

apps/website/components/leagues/JoinLeagueButton.tsx

@@ -32,24 +32,19 @@ export default function JoinLeagueButton({
       const membershipRepo = getLeagueMembershipRepository();
 
       if (isInviteOnly) {
-        // For alpha, treat "request to join" as creating a pending membership
-        const pending = await membershipRepo.getMembership(leagueId, currentDriverId);
-        if (pending) {
+        const existing = await membershipRepo.getMembership(leagueId, currentDriverId);
+        if (existing) {
           throw new Error('Already a member or have a pending request');
         }
 
-        await membershipRepo.saveMembership({
-          leagueId,
-          driverId: currentDriverId,
-          role: 'member',
-          status: 'pending',
-          joinedAt: new Date(),
-        });
-      } else {
-        const useCase = getJoinLeagueUseCase();
-        await useCase.execute({ leagueId, driverId: currentDriverId });
+        throw new Error(
+          'Requesting to join invite-only leagues is not available in this alpha build.',
+        );
       }
 
+      const useCase = getJoinLeagueUseCase();
+      await useCase.execute({ leagueId, driverId: currentDriverId });
+
       onMembershipChange?.();
       setShowConfirmDialog(false);
     } catch (err) {

apps/website/components/leagues/LeagueAdmin.tsx

@@ -20,6 +20,7 @@ import {
   type LeagueAdminProtestsViewModel,
 } from '@/lib/presenters/LeagueAdminPresenter';
 import type { LeagueConfigFormModel } from '@gridpilot/racing/application';
+import type { LeagueSummaryViewModel } from '@/lib/presenters/LeagueAdminPresenter';
 import { LeagueBasicsSection } from './LeagueBasicsSection';
 import { LeagueStructureSection } from './LeagueStructureSection';
 import { LeagueScoringSection } from './LeagueScoringSection';
@@ -37,13 +38,7 @@ import { AlertTriangle, CheckCircle, Clock, XCircle, Flag, Calendar, User, Dolla
 type JoinRequest = LeagueJoinRequestViewModel;
 
 interface LeagueAdminProps {
-  league: {
-    id: string;
-    ownerId: string;
-    settings: {
-      pointsSystem: string;
-    };
-  };
+  league: LeagueSummaryViewModel;
   onLeagueUpdate?: () => void;
 }
 
@@ -83,7 +78,7 @@ export default function LeagueAdmin({ league, onLeagueUpdate }: LeagueAdminProps
   useEffect(() => {
     async function loadOwner() {
       try {
-        const summary = await loadLeagueOwnerSummary(league);
+        const summary = await loadLeagueOwnerSummary({ ownerId: league.ownerId });
         setOwnerSummary(summary);
       } catch (err) {
         console.error('Failed to load league owner:', err);

apps/website/components/leagues/LeagueBasicsSection.tsx

@@ -3,9 +3,7 @@
 import React from 'react';
 import { FileText, Gamepad2, AlertCircle, Check } from 'lucide-react';
 import Input from '@/components/ui/Input';
-import type {
-  LeagueConfigFormModel,
-} from '@gridpilot/racing/application';
+import type { LeagueConfigFormModel } from '@gridpilot/racing/application';
 
 interface LeagueBasicsSectionProps {
   form: LeagueConfigFormModel;

apps/website/components/leagues/LeagueDropSection.tsx

@@ -259,13 +259,19 @@ export function LeagueDropSection({
     if (disabled || !onChange) return;
     
     const option = DROP_OPTIONS.find((o) => o.value === strategy);
-    onChange({
+    const next: LeagueConfigFormModel = {
       ...form,
-      dropPolicy: {
-        strategy,
-        n: strategy === 'none' ? undefined : (dropPolicy.n ?? option?.defaultN),
-      },
-    });
+      dropPolicy:
+        strategy === 'none'
+          ? {
+              strategy,
+            }
+          : {
+              strategy,
+              n: dropPolicy.n ?? option?.defaultN ?? 1,
+            },
+    };
+    onChange(next);
   };
 
   const handleNChange = (delta: number) => {

apps/website/components/leagues/LeagueMembers.tsx

@@ -136,7 +136,7 @@ export default function LeagueMembers({
           <label className="text-sm text-gray-400">Sort by:</label>
           <select
             value={sortBy}
-            onChange={(e) => setSortBy(e.target.value as any)}
+            onChange={(e) => setSortBy(e.target.value as typeof sortBy)}
             className="px-3 py-1 bg-deep-graphite border border-charcoal-outline rounded text-white text-sm focus:outline-none focus:ring-2 focus:ring-primary-blue"
           >
             <option value="rating">Rating</option>

apps/website/components/leagues/LeagueScoringSection.tsx

@@ -357,20 +357,33 @@ export function LeagueScoringSection({
       },
     });
   };
- 
-  const patternPanel = (
-    <ScoringPatternSection
-      scoring={form.scoring}
-      presets={presets}
-      readOnly={readOnly}
-      onChangePatternId={!readOnly && onChange ? handleSelectPreset : undefined}
-      onToggleCustomScoring={disabled ? undefined : handleToggleCustomScoring}
-    />
-  );
 
-  const championshipsPanel = (
-    <ChampionshipsSection form={form} onChange={onChange} readOnly={readOnly} />
-  );
+  const patternProps: ScoringPatternSectionProps = {
+    scoring: form.scoring,
+    presets,
+    readOnly: !!readOnly,
+  };
+
+  if (!readOnly && onChange) {
+    patternProps.onChangePatternId = handleSelectPreset;
+  }
+
+  if (!disabled) {
+    patternProps.onToggleCustomScoring = handleToggleCustomScoring;
+  }
+
+  const patternPanel = <ScoringPatternSection {...patternProps} />;
+
+  const championshipsProps: ChampionshipsSectionProps = {
+    form,
+    readOnly: !!readOnly,
+  };
+
+  if (onChange) {
+    championshipsProps.onChange = onChange;
+  }
+
+  const championshipsPanel = <ChampionshipsSection {...championshipsProps} />;
 
   if (patternOnly) {
     return <div>{patternPanel}</div>;

apps/website/components/leagues/LeagueSponsorshipsSection.tsx

@@ -11,6 +11,7 @@ import {
   getRejectSponsorshipRequestUseCase,
   getSeasonRepository,
 } from '@/lib/di-container';
+import { PendingSponsorshipRequestsPresenter } from '@/lib/presenters/PendingSponsorshipRequestsPresenter';
 import { useEffectiveDriverId } from '@/lib/currentDriver';
 
 interface SponsorshipSlot {
@@ -72,11 +73,18 @@ export function LeagueSponsorshipsSection({
     setRequestsLoading(true);
     try {
       const useCase = getGetPendingSponsorshipRequestsUseCase();
-      await useCase.execute({
-        entityType: 'season',
-        entityId: seasonId,
-      });
-      setPendingRequests(result.requests);
+      const presenter = new PendingSponsorshipRequestsPresenter();
+
+      await useCase.execute(
+        {
+          entityType: 'season',
+          entityId: seasonId,
+        },
+        presenter,
+      );
+
+      const viewModel = presenter.getViewModel();
+      setPendingRequests(viewModel?.requests ?? []);
     } catch (err) {
       console.error('Failed to load pending requests:', err);
     } finally {
@@ -108,7 +116,7 @@ export function LeagueSponsorshipsSection({
       await useCase.execute({
         requestId,
         respondedBy: currentDriverId,
-        reason,
+        ...(reason ? { reason } : {}),
       });
       await loadPendingRequests();
     } catch (err) {
@@ -118,16 +126,21 @@ export function LeagueSponsorshipsSection({
   };
 
   const handleEditPrice = (index: number) => {
+    const slot = slots[index];
+    if (!slot) return;
     setEditingIndex(index);
-    setTempPrice(slots[index].price.toString());
+    setTempPrice(slot.price.toString());
   };
 
   const handleSavePrice = (index: number) => {
     const price = parseFloat(tempPrice);
     if (!isNaN(price) && price > 0) {
       const updated = [...slots];
-      updated[index].price = price;
-      setSlots(updated);
+      const slot = updated[index];
+      if (slot) {
+        slot.price = price;
+        setSlots(updated);
+      }
     }
     setEditingIndex(null);
     setTempPrice('');

apps/website/components/leagues/LeagueStructureSection.tsx

@@ -159,13 +159,10 @@ export function LeagueStructureSection({
     }
 
     if (nextStructure.mode === 'solo') {
+      const { maxTeams, driversPerTeam, ...restStructure } = nextStructure;
       nextForm = {
         ...nextForm,
-        structure: {
-          ...nextStructure,
-          maxTeams: undefined,
-          driversPerTeam: undefined,
-        },
+        structure: restStructure,
       };
     }
 
@@ -178,8 +175,6 @@ export function LeagueStructureSection({
       updateStructure({
         mode: 'solo',
         maxDrivers: structure.maxDrivers || 24,
-        maxTeams: undefined,
-        driversPerTeam: undefined,
       });
     } else {
       const maxTeams = structure.maxTeams ?? 12;

apps/website/components/leagues/LeagueTimingsSection.tsx

@@ -38,7 +38,10 @@ const TIME_ZONES = [
   { value: 'Australia/Sydney', label: 'Sydney (AU)', icon: Globe },
 ];
 
-type RecurrenceStrategy = NonNullable<LeagueConfigFormModel['timings']>['recurrenceStrategy'];
+type RecurrenceStrategy = Exclude<
+  NonNullable<LeagueConfigFormModel['timings']>['recurrenceStrategy'],
+  undefined
+>;
 
 interface LeagueTimingsSectionProps {
   form: LeagueConfigFormModel;
@@ -96,12 +99,16 @@ function RaceDayPreview({
   const effectiveRaceTime = raceTime || '20:00';
   
   const getStartTime = (sessionIndex: number) => {
-    const [hours, minutes] = effectiveRaceTime.split(':').map(Number);
+    const [hoursStr, minutesStr] = effectiveRaceTime.split(':');
+    const hours = Number(hoursStr ?? '0');
+    const minutes = Number(minutesStr ?? '0');
     let totalMinutes = hours * 60 + minutes;
-    
-    const active = allSessions.filter(s => s.active);
+
+    const active = allSessions.filter((s) => s.active);
     for (let i = 0; i < sessionIndex; i++) {
-      totalMinutes += active[i].duration + 10; // 10 min break between sessions
+      const session = active[i];
+      if (!session) continue;
+      totalMinutes += session.duration + 10; // 10 min break between sessions
     }
     
     const h = Math.floor(totalMinutes / 60) % 24;
@@ -231,10 +238,31 @@ function YearCalendarPreview({
 }) {
   // JavaScript getDay(): 0=Sunday, 1=Monday, 2=Tuesday, etc.
   const dayMap: Record<Weekday, number> = {
-    'Sun': 0, 'Mon': 1, 'Tue': 2, 'Wed': 3, 'Thu': 4, 'Fri': 5, 'Sat': 6
+    Sun: 0,
+    Mon: 1,
+    Tue: 2,
+    Wed: 3,
+    Thu: 4,
+    Fri: 5,
+    Sat: 6,
   };
 
-  const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+  const months = [
+    'Jan',
+    'Feb',
+    'Mar',
+    'Apr',
+    'May',
+    'Jun',
+    'Jul',
+    'Aug',
+    'Sep',
+    'Oct',
+    'Nov',
+    'Dec',
+  ] as const;
+
+  const getMonthLabel = (index: number): string => months[index] ?? '—';
   
   // Parse start and end dates
   const seasonStart = useMemo(() => {
@@ -279,7 +307,8 @@ function YearCalendarPreview({
         const spacing = totalPossible / rounds;
         for (let i = 0; i < rounds; i++) {
           const index = Math.min(Math.floor(i * spacing), totalPossible - 1);
-          dates.push(allPossibleDays[index]);
+          const chosen = allPossibleDays[index]!;
+          dates.push(chosen);
         }
       } else {
         // Not enough days - use all available
@@ -380,7 +409,7 @@ function YearCalendarPreview({
         }
         
         view.push({
-          month: months[targetMonth],
+          month: months[targetMonth] ?? '—',
           monthIndex: targetMonth,
           year: targetYear,
           days
@@ -391,8 +420,8 @@ function YearCalendarPreview({
     }
     
     // Get the range of months that contain races
-    const firstRaceDate = raceDates[0];
-    const lastRaceDate = raceDates[raceDates.length - 1];
+    const firstRaceDate = raceDates[0]!;
+    const lastRaceDate = raceDates[raceDates.length - 1]!;
     
     // Start from first race month, show 12 months total
     const startMonth = firstRaceDate.getMonth();
@@ -414,18 +443,19 @@ function YearCalendarPreview({
           rd.getDate() === date.getDate()
         );
         const isRace = raceIndex >= 0;
+        const raceNumber = isRace ? raceIndex + 1 : undefined;
         days.push({
           date,
           isRace,
           dayOfMonth: day,
           isStart: isSeasonStartDate(date),
           isEnd: isSeasonEndDate(date),
-          raceNumber: isRace ? raceIndex + 1 : undefined,
+          ...(raceNumber !== undefined ? { raceNumber } : {}),
         });
       }
       
       view.push({
-        month: months[targetMonth],
+        month: months[targetMonth] ?? '—',
         monthIndex: targetMonth,
         year: targetYear,
         days
@@ -438,9 +468,13 @@ function YearCalendarPreview({
   // Calculate season stats
   const firstRace = raceDates[0];
   const lastRace = raceDates[raceDates.length - 1];
-  const seasonDurationWeeks = firstRace && lastRace 
-    ? Math.ceil((lastRace.getTime() - firstRace.getTime()) / (7 * 24 * 60 * 60 * 1000))
-    : 0;
+  const seasonDurationWeeks =
+    firstRace && lastRace
+      ? Math.ceil(
+          (lastRace.getTime() - firstRace.getTime()) /
+            (7 * 24 * 60 * 60 * 1000),
+        )
+      : 0;
 
   return (
     <div className="space-y-4">
@@ -525,12 +559,18 @@ function YearCalendarPreview({
           <div className="text-[9px] text-gray-500">Rounds</div>
         </div>
         <div className="text-center">
-          <div className="text-lg font-bold text-white">{seasonDurationWeeks || '—'}</div>
+          <div className="text-lg font-bold text-white">
+            {seasonDurationWeeks || '—'}
+          </div>
           <div className="text-[9px] text-gray-500">Weeks</div>
         </div>
         <div className="text-center">
           <div className="text-lg font-bold text-primary-blue">
-            {firstRace ? `${months[firstRace.getMonth()]}–${months[lastRace?.getMonth() ?? 0]}` : '—'}
+            {firstRace && lastRace
+              ? `${getMonthLabel(firstRace.getMonth())}–${getMonthLabel(
+                  lastRace.getMonth(),
+                )}`
+              : '—'}
           </div>
           <div className="text-[9px] text-gray-500">Duration</div>
         </div>
@@ -986,7 +1026,9 @@ export function LeagueTimingsSection({
                     onClick={() =>
                       updateTimings({
                         recurrenceStrategy: opt.id as RecurrenceStrategy,
-                        intervalWeeks: opt.id === 'everyNWeeks' ? 2 : undefined,
+                        ...(opt.id === 'everyNWeeks'
+                          ? { intervalWeeks: 2 }
+                          : {}),
                       })
                     }
                     className={`
@@ -1054,7 +1096,7 @@ export function LeagueTimingsSection({
                 <Input
                   type="date"
                   value={timings.seasonStartDate ?? ''}
-                  onChange={(e) => updateTimings({ seasonStartDate: e.target.value || undefined })}
+                  onChange={(e) => updateTimings({ seasonStartDate: e.target.value })}
                   className="bg-iron-gray/30"
                 />
               </div>
@@ -1066,7 +1108,7 @@ export function LeagueTimingsSection({
                 <Input
                   type="date"
                   value={timings.seasonEndDate ?? ''}
-                  onChange={(e) => updateTimings({ seasonEndDate: e.target.value || undefined })}
+                  onChange={(e) => updateTimings({ seasonEndDate: e.target.value })}
                   className="bg-iron-gray/30"
                 />
               </div>
@@ -1086,7 +1128,7 @@ export function LeagueTimingsSection({
               <Input
                 type="time"
                 value={timings.raceStartTime ?? '20:00'}
-                onChange={(e) => updateTimings({ raceStartTime: e.target.value || undefined })}
+                onChange={(e) => updateTimings({ raceStartTime: e.target.value })}
                 className="bg-iron-gray/30"
               />
             </div>
@@ -1214,39 +1256,59 @@ export function LeagueTimingsSection({
 
             {/* Preview content */}
             <div className="p-4 min-h-[300px]">
-              {previewTab === 'day' && (
-                <RaceDayPreview
-                  template={showSprint ? 'sprintFeature' : 'feature'}
-                  practiceMin={timings.practiceMinutes ?? 20}
-                  qualifyingMin={timings.qualifyingMinutes ?? 15}
-                  sprintMin={showSprint ? (timings.sprintRaceMinutes ?? 20) : undefined}
-                  mainRaceMin={timings.mainRaceMinutes ?? 40}
-                  raceTime={timings.raceStartTime}
-                />
-              )}
+              {previewTab === 'day' && (() => {
+                const sprintMinutes = showSprint
+                  ? timings.sprintRaceMinutes ?? 20
+                  : undefined;
+                return (
+                  <RaceDayPreview
+                    template={showSprint ? 'sprintFeature' : 'feature'}
+                    practiceMin={timings.practiceMinutes ?? 20}
+                    qualifyingMin={timings.qualifyingMinutes ?? 15}
+                    {...(sprintMinutes !== undefined
+                      ? { sprintMin: sprintMinutes }
+                      : {})}
+                    mainRaceMin={timings.mainRaceMinutes ?? 40}
+                    {...(timings.raceStartTime
+                      ? { raceTime: timings.raceStartTime }
+                      : {})}
+                  />
+                );
+              })()}
 
               {previewTab === 'year' && (
                 <YearCalendarPreview
                   weekdays={weekdays}
                   frequency={recurrenceStrategy}
                   rounds={timings.roundsPlanned ?? 8}
-                  startDate={timings.seasonStartDate}
-                  endDate={timings.seasonEndDate}
+                  {...(timings.seasonStartDate
+                    ? { startDate: timings.seasonStartDate }
+                    : {})}
+                  {...(timings.seasonEndDate
+                    ? { endDate: timings.seasonEndDate }
+                    : {})}
                 />
               )}
 
-              {previewTab === 'stats' && (
-                <SeasonStatsPreview
-                  rounds={timings.roundsPlanned ?? 8}
-                  weekdays={weekdays}
-                  frequency={recurrenceStrategy}
-                  weekendTemplate={showSprint ? 'sprintFeature' : 'feature'}
-                  practiceMin={timings.practiceMinutes ?? 20}
-                  qualifyingMin={timings.qualifyingMinutes ?? 15}
-                  sprintMin={showSprint ? (timings.sprintRaceMinutes ?? 20) : undefined}
-                  mainRaceMin={timings.mainRaceMinutes ?? 40}
-                />
-              )}
+              {previewTab === 'stats' && (() => {
+                const sprintMinutes = showSprint
+                  ? timings.sprintRaceMinutes ?? 20
+                  : undefined;
+                return (
+                  <SeasonStatsPreview
+                    rounds={timings.roundsPlanned ?? 8}
+                    weekdays={weekdays}
+                    frequency={recurrenceStrategy}
+                    weekendTemplate={showSprint ? 'sprintFeature' : 'feature'}
+                    practiceMin={timings.practiceMinutes ?? 20}
+                    qualifyingMin={timings.qualifyingMinutes ?? 15}
+                    {...(sprintMinutes !== undefined
+                      ? { sprintMin: sprintMinutes }
+                      : {})}
+                    mainRaceMin={timings.mainRaceMinutes ?? 40}
+                  />
+                );
+              })()}
             </div>
           </div>
 

apps/website/components/leagues/ScheduleRaceForm.tsx

@@ -229,7 +229,7 @@ export default function ScheduleRaceForm({
         </label>
         <select
           value={formData.sessionType}
-          onChange={(e) => handleChange('sessionType', e.target.value as SessionType)}
+          onChange={(e) => handleChange('sessionType', e.target.value)}
           className="w-full px-4 py-2 bg-deep-graphite border border-charcoal-outline rounded-lg text-white focus:outline-none focus:ring-2 focus:ring-primary-blue"
         >
           <option value="practice">Practice</option>

apps/website/components/mockups/DriverProfileMockup.tsx

@@ -157,11 +157,11 @@ export default function DriverProfileMockup() {
               variants={itemVariants}
               className="bg-iron-gray/50 border border-charcoal-outline rounded-lg p-1.5 sm:p-2 md:p-3 text-center"
             >
-              <AnimatedCounter 
-                value={stat.value} 
+              <AnimatedCounter
+                value={stat.value}
                 shouldReduceMotion={shouldReduceMotion ?? false}
                 delay={index * 0.1}
-                suffix={stat.suffix}
+                suffix={stat.suffix ?? ''}
               />
               <div className="text-[8px] sm:text-[10px] md:text-xs text-gray-400 mt-0.5">{stat.label}</div>
             </motion.div>

apps/website/components/onboarding/OnboardingWizard.tsx

@@ -257,7 +257,10 @@ export default function OnboardingWizard() {
         generatedAvatars: [],
         selectedAvatarIndex: null,
       });
-      setErrors({ ...errors, facePhoto: undefined });
+      setErrors((prev) => {
+        const { facePhoto, ...rest } = prev;
+        return rest;
+      });
 
       // Validate face
       await validateFacePhoto(base64);
@@ -267,7 +270,10 @@ export default function OnboardingWizard() {
 
   const validateFacePhoto = async (photoData: string) => {
     setAvatarInfo(prev => ({ ...prev, isValidating: true }));
-    setErrors(prev => ({ ...prev, facePhoto: undefined }));
+    setErrors(prev => {
+      const { facePhoto, ...rest } = prev;
+      return rest;
+    });
 
     try {
       const response = await fetch('/api/avatar/validate-face', {
@@ -300,7 +306,10 @@ export default function OnboardingWizard() {
     }
 
     setAvatarInfo(prev => ({ ...prev, isGenerating: true, generatedAvatars: [], selectedAvatarIndex: null }));
-    setErrors(prev => ({ ...prev, avatar: undefined }));
+    setErrors(prev => {
+      const { avatar, ...rest } = prev;
+      return rest;
+    });
 
     try {
       const response = await fetch('/api/avatar/generate', {
@@ -490,7 +499,7 @@ export default function OnboardingWizard() {
                       setPersonalInfo({ ...personalInfo, country: value })
                     }
                     error={!!errors.country}
-                    errorMessage={errors.country}
+                    errorMessage={errors.country ?? ''}
                     disabled={loading}
                   />
                 </div>
@@ -600,17 +609,24 @@ export default function OnboardingWizard() {
                   {/* Preview area */}
                   <div className="w-32 flex flex-col items-center justify-center">
                     <div className="w-24 h-24 rounded-xl bg-iron-gray border border-charcoal-outline flex items-center justify-center overflow-hidden">
-                      {avatarInfo.selectedAvatarIndex !== null && avatarInfo.generatedAvatars[avatarInfo.selectedAvatarIndex] ? (
-                        <Image
-                          src={avatarInfo.generatedAvatars[avatarInfo.selectedAvatarIndex]}
-                          alt="Selected avatar"
-                          width={96}
-                          height={96}
-                          className="w-full h-full object-cover"
-                        />
-                      ) : (
-                        <User className="w-8 h-8 text-gray-600" />
-                      )}
+                      {(() => {
+                        const selectedAvatarUrl =
+                          avatarInfo.selectedAvatarIndex !== null
+                            ? avatarInfo.generatedAvatars[avatarInfo.selectedAvatarIndex]
+                            : undefined;
+                        if (!selectedAvatarUrl) {
+                          return <User className="w-8 h-8 text-gray-600" />;
+                        }
+                        return (
+                          <Image
+                            src={selectedAvatarUrl}
+                            alt="Selected avatar"
+                            width={96}
+                            height={96}
+                            className="w-full h-full object-cover"
+                          />
+                        );
+                      })()}
                     </div>
                     <p className="text-xs text-gray-500 mt-2 text-center">Your avatar</p>
                   </div>

apps/website/components/races/FileProtestModal.tsx

@@ -3,8 +3,7 @@
 import { useState } from 'react';
 import Modal from '@/components/ui/Modal';
 import Button from '@/components/ui/Button';
-import { getFileProtestUseCase, getDriverRepository } from '@/lib/di-container';
-import type { Driver } from '@gridpilot/racing/domain/entities/Driver';
+import { getFileProtestUseCase } from '@/lib/di-container';
 import type { ProtestIncident } from '@gridpilot/racing/domain/entities/Protest';
 import {
   AlertTriangle,
@@ -17,13 +16,18 @@ import {
   CheckCircle2,
 } from 'lucide-react';
 
+type ProtestParticipant = {
+  id: string;
+  name: string;
+};
+
 interface FileProtestModalProps {
   isOpen: boolean;
   onClose: () => void;
   raceId: string;
   leagueId?: string;
   protestingDriverId: string;
-  participants: Driver[];
+  participants: ProtestParticipant[];
 }
 
 export default function FileProtestModal({
@@ -70,18 +74,26 @@ export default function FileProtestModal({
       
       const incident: ProtestIncident = {
         lap: parseInt(lap, 10),
-        timeInRace: timeInRace ? parseInt(timeInRace, 10) : undefined,
         description: description.trim(),
+        ...(timeInRace
+          ? { timeInRace: parseInt(timeInRace, 10) }
+          : {}),
       };
 
-      await useCase.execute({
+      const command = {
         raceId,
         protestingDriverId,
         accusedDriverId,
         incident,
-        comment: comment.trim() || undefined,
-        proofVideoUrl: proofVideoUrl.trim() || undefined,
-      });
+        ...(comment.trim()
+          ? { comment: comment.trim() }
+          : {}),
+        ...(proofVideoUrl.trim()
+          ? { proofVideoUrl: proofVideoUrl.trim() }
+          : {}),
+      };
+
+      await useCase.execute(command);
 
       setStep('success');
     } catch (err) {

apps/website/components/races/ImportResultsForm.tsx

@@ -39,7 +39,8 @@ export default function ImportResultsForm({ raceId, onSuccess, onError }: Import
       throw new Error('CSV file is empty or invalid');
     }
 
-    const header = lines[0].toLowerCase().split(',').map((h) => h.trim());
+    const headerLine = lines[0]!;
+    const header = headerLine.toLowerCase().split(',').map((h) => h.trim());
     const requiredFields = ['driverid', 'position', 'fastestlap', 'incidents', 'startposition'];
 
     for (const field of requiredFields) {
@@ -50,7 +51,11 @@ export default function ImportResultsForm({ raceId, onSuccess, onError }: Import
 
     const rows: CSVRow[] = [];
     for (let i = 1; i < lines.length; i++) {
-      const values = lines[i].split(',').map((v) => v.trim());
+      const line = lines[i];
+      if (!line) {
+        continue;
+      }
+      const values = line.split(',').map((v) => v.trim());
 
       if (values.length !== header.length) {
         throw new Error(
@@ -63,11 +68,11 @@ export default function ImportResultsForm({ raceId, onSuccess, onError }: Import
         row[field] = values[index] ?? '';
       });
 
-      const driverId = row.driverid;
-      const position = parseInt(row.position, 10);
-      const fastestLap = parseFloat(row.fastestlap);
-      const incidents = parseInt(row.incidents, 10);
-      const startPosition = parseInt(row.startposition, 10);
+      const driverId = row['driverid'] ?? '';
+      const position = parseInt(row['position'] ?? '', 10);
+      const fastestLap = parseFloat(row['fastestlap'] ?? '');
+      const incidents = parseInt(row['incidents'] ?? '', 10);
+      const startPosition = parseInt(row['startposition'] ?? '', 10);
 
       if (!driverId || driverId.length === 0) {
         throw new Error(`Row ${i}: driverId is required`);

apps/website/components/races/ResultsTable.tsx

@@ -38,9 +38,9 @@ interface ResultsTableProps {
   results: ResultDTO[];
   drivers: DriverDTO[];
   pointsSystem: Record<number, number>;
-  fastestLapTime?: number;
+  fastestLapTime?: number | undefined;
   penalties?: PenaltyData[];
-  currentDriverId?: string;
+  currentDriverId?: string | undefined;
 }
 
 export default function ResultsTable({

apps/website/components/teams/JoinTeamButton.tsx

@@ -5,11 +5,19 @@ import Button from '@/components/ui/Button';
 import {
   getJoinTeamUseCase,
   getLeaveTeamUseCase,
-  getGetDriverTeamUseCase,
   getTeamMembershipRepository,
 } from '@/lib/di-container';
 import { useEffectiveDriverId } from '@/lib/currentDriver';
-import type { TeamMembership } from '@gridpilot/racing';
+
+type TeamMembershipStatus = 'active' | 'pending' | 'inactive';
+
+interface TeamMembership {
+  teamId: string;
+  driverId: string;
+  role: 'owner' | 'manager' | 'driver';
+  status: TeamMembershipStatus;
+  joinedAt: Date | string;
+}
 
 interface JoinTeamButtonProps {
   teamId: string;
@@ -25,25 +33,12 @@ export default function JoinTeamButton({
   const [loading, setLoading] = useState(false);
   const currentDriverId = useEffectiveDriverId();
   const [membership, setMembership] = useState<TeamMembership | null>(null);
-  const [currentTeamName, setCurrentTeamName] = useState<string | null>(null);
-  const [currentTeamId, setCurrentTeamId] = useState<string | null>(null);
 
   useEffect(() => {
     const load = async () => {
       const membershipRepo = getTeamMembershipRepository();
       const m = await membershipRepo.getMembership(teamId, currentDriverId);
-      setMembership(m);
-
-      const driverTeamUseCase = getGetDriverTeamUseCase();
-      await driverTeamUseCase.execute({ driverId: currentDriverId });
-      const viewModel = driverTeamUseCase.presenter.getViewModel();
-      if (viewModel.result) {
-        setCurrentTeamId(viewModel.result.team.id);
-        setCurrentTeamName(viewModel.result.team.name);
-      } else {
-        setCurrentTeamId(null);
-        setCurrentTeamName(null);
-      }
+      setMembership(m as TeamMembership | null);
     };
     void load();
   }, [teamId, currentDriverId]);
@@ -117,15 +112,6 @@ export default function JoinTeamButton({
     );
   }
 
-  // Already on another team
-  if (currentTeamId && currentTeamId !== teamId) {
-    return (
-      <Button variant="secondary" disabled>
-        Already on {currentTeamName}
-      </Button>
-    );
-  }
-
   // Can join
   return (
     <Button

apps/website/components/teams/TeamAdmin.tsx

@@ -39,7 +39,13 @@ export default function TeamAdmin({ team, onUpdate }: TeamAdminProps) {
     const load = async () => {
       setLoading(true);
       try {
-        const viewModel = await loadTeamAdminViewModel(team as any);
+        const viewModel = await loadTeamAdminViewModel({
+          id: team.id,
+          name: team.name,
+          tag: team.tag,
+          description: team.description,
+          ownerId: team.ownerId,
+        });
         setJoinRequests(viewModel.requests);
 
         const driversById: Record<string, DriverDTO> = {};

apps/website/components/teams/TeamCard.tsx

@@ -29,9 +29,9 @@ interface TeamCardProps {
   totalRaces?: number;
   performanceLevel?: 'beginner' | 'intermediate' | 'advanced' | 'pro';
   isRecruiting?: boolean;
-  specialization?: 'endurance' | 'sprint' | 'mixed';
+  specialization?: 'endurance' | 'sprint' | 'mixed' | undefined;
   region?: string;
-  languages?: string[];
+  languages?: string[] | undefined;
   leagues?: string[];
   onClick?: () => void;
 }

apps/website/components/teams/TeamRoster.tsx

@@ -7,8 +7,7 @@ import {
   getTeamRosterViewModel,
   type TeamRosterViewModel,
 } from '@/lib/presenters/TeamRosterPresenter';
-
-type TeamRole = 'owner' | 'manager' | 'driver';
+import type { TeamRole } from '@gridpilot/racing/domain/types/TeamMembership';
 
 interface TeamMembershipSummary {
   driverId: string;
@@ -39,7 +38,14 @@ export default function TeamRoster({
     const load = async () => {
       setLoading(true);
       try {
-        const vm = await getTeamRosterViewModel(memberships);
+        const fullMemberships = memberships.map((m) => ({
+          teamId,
+          driverId: m.driverId,
+          role: m.role,
+          joinedAt: m.joinedAt,
+          status: 'active' as const,
+        }));
+        const vm = await getTeamRosterViewModel(fullMemberships);
         setViewModel(vm);
       } finally {
         setLoading(false);
@@ -64,6 +70,19 @@ export default function TeamRoster({
     return role.charAt(0).toUpperCase() + role.slice(1);
   };
 
+  function getRoleOrder(role: TeamRole): number {
+    switch (role) {
+      case 'owner':
+        return 0;
+      case 'manager':
+        return 1;
+      case 'driver':
+        return 2;
+      default:
+        return 3;
+    }
+  }
+
   const sortedMembers = viewModel
     ? [...viewModel.members].sort((a, b) => {
         switch (sortBy) {
@@ -73,8 +92,7 @@ export default function TeamRoster({
             return ratingB - ratingA;
           }
           case 'role': {
-            const roleOrder: Record<TeamRole, number> = { owner: 0, manager: 1, driver: 2 };
-            return roleOrder[a.role] - roleOrder[b.role];
+            return getRoleOrder(a.role) - getRoleOrder(b.role);
           }
           case 'name': {
             return a.driver.name.localeCompare(b.driver.name);
@@ -110,7 +128,7 @@ export default function TeamRoster({
           <label className="text-sm text-gray-400">Sort by:</label>
           <select
             value={sortBy}
-            onChange={(e) => setSortBy(e.target.value as any)}
+            onChange={(e) => setSortBy(e.target.value as typeof sortBy)}
             className="px-3 py-1 bg-deep-graphite border border-charcoal-outline rounded text-white text-sm focus:outline-none focus:ring-2 focus:ring-primary-blue"
           >
             <option value="rating">Rating</option>

apps/website/components/ui/Input.tsx

@@ -2,7 +2,7 @@ import React, { InputHTMLAttributes, ReactNode } from 'react';
 
 interface InputProps extends InputHTMLAttributes<HTMLInputElement> {
   error?: boolean;
-  errorMessage?: string;
+  errorMessage?: string | undefined;
 }
 
 export default function Input({

apps/website/components/ui/Modal.tsx

@@ -70,7 +70,11 @@ export default function Modal({
       if (focusable.length === 0) return;
 
       const first = focusable[0];
-      const last = focusable[focusable.length - 1];
+      const last = focusable[focusable.length - 1] ?? first;
+
+      if (!first || !last) {
+        return;
+      }
 
       if (!event.shiftKey && document.activeElement === last) {
         event.preventDefault();

apps/website/components/ui/RangeField.tsx

@@ -10,7 +10,7 @@ interface RangeFieldProps {
   step?: number;
   onChange: (value: number) => void;
   helperText?: string;
-  error?: string;
+  error?: string | undefined;
   disabled?: boolean;
   unitLabel?: string;
   rangeHint?: string;

apps/website/lib/auth/InMemoryAuthService.ts

@@ -60,10 +60,14 @@ export class InMemoryAuthService implements AuthService {
     const provider = new IracingDemoIdentityProviderAdapter();
     const useCase = new StartAuthUseCase(provider);
 
-    const command: StartAuthCommandDTO = {
-      provider: 'IRACING_DEMO',
-      returnTo,
-    };
+    const command: StartAuthCommandDTO = returnTo
+      ? {
+          provider: 'IRACING_DEMO',
+          returnTo,
+        }
+      : {
+          provider: 'IRACING_DEMO',
+        };
 
     return useCase.execute(command);
   }
@@ -77,12 +81,18 @@ export class InMemoryAuthService implements AuthService {
     const sessionPort = new CookieIdentitySessionAdapter();
     const useCase = new HandleAuthCallbackUseCase(provider, sessionPort);
 
-    const command: AuthCallbackCommandDTO = {
-      provider: 'IRACING_DEMO',
-      code: params.code,
-      state: params.state,
-      returnTo: params.returnTo,
-    };
+    const command: AuthCallbackCommandDTO = params.returnTo
+      ? {
+          provider: 'IRACING_DEMO',
+          code: params.code,
+          state: params.state,
+          returnTo: params.returnTo,
+        }
+      : {
+          provider: 'IRACING_DEMO',
+          code: params.code,
+          state: params.state,
+        };
 
     return useCase.execute(command);
   }

apps/website/lib/currentDriver.ts

@@ -24,12 +24,23 @@ export function useEffectiveDriverId(): string {
 
   try {
     // Lazy-load to avoid importing DI facade at module evaluation time
-    const { getDriverRepository } = require('./di-container') as typeof import('./di-container');
+    const { getDriverRepository } =
+      require('./di-container') as typeof import('./di-container');
     const repo = getDriverRepository();
-    // In-memory repository is synchronous for findAll in the demo implementation
-    const allDrivers = repo.findAllSync?.() as Array<{ id: string }> | undefined;
-    if (allDrivers && allDrivers.length > 0) {
-      return allDrivers[0].id;
+
+    interface DriverRepositoryWithSyncFindAll {
+      findAllSync?: () => Array<{ id: string }>;
+    }
+
+    // In alpha/demo mode the in-memory repository exposes a synchronous finder;
+    // access it via a safe dynamic lookup to keep typing compatible with the port.
+    const repoWithSync = repo as DriverRepositoryWithSyncFindAll;
+    const allDrivers = repoWithSync.findAllSync?.();
+    if (Array.isArray(allDrivers) && allDrivers.length > 0) {
+      const firstDriver = allDrivers[0];
+      if (firstDriver) {
+        return firstDriver.id;
+      }
     }
   } catch {
     // Ignore and fall back to legacy default below

apps/website/lib/di-config.ts

@@ -10,7 +10,7 @@ import { Season } from '@gridpilot/racing/domain/entities/Season';
 import { Sponsor } from '@gridpilot/racing/domain/entities/Sponsor';
 import { SeasonSponsorship } from '@gridpilot/racing/domain/entities/SeasonSponsorship';
 import { Money } from '@gridpilot/racing/domain/value-objects/Money';
-import type { LeagueMembership, JoinRequest } from '@gridpilot/racing/domain/entities/LeagueMembership';
+import type { JoinRequest } from '@gridpilot/racing/domain/entities/LeagueMembership';
 
 import type { IDriverRepository } from '@gridpilot/racing/domain/repositories/IDriverRepository';
 import type { ILeagueRepository } from '@gridpilot/racing/domain/repositories/ILeagueRepository';
@@ -139,7 +139,6 @@ import { TransferLeagueOwnershipUseCase } from '@gridpilot/racing/application/us
 import { CancelRaceUseCase } from '@gridpilot/racing/application/use-cases/CancelRaceUseCase';
 import { ImportRaceResultsUseCase } from '@gridpilot/racing/application/use-cases/ImportRaceResultsUseCase';
 import { DriversLeaderboardPresenter } from './presenters/DriversLeaderboardPresenter';
-import { TeamsLeaderboardPresenter } from './presenters/TeamsLeaderboardPresenter';
 import { RacesPagePresenter } from './presenters/RacesPagePresenter';
 import { AllRacesPagePresenter } from './presenters/AllRacesPagePresenter';
 import { AllTeamsPresenter } from './presenters/AllTeamsPresenter';
@@ -195,7 +194,24 @@ export function configureDIContainer(): void {
   const primaryDriverId = seedData.drivers[0]!.id;
 
   // Create driver statistics from seed data
-  const driverStats = createDemoDriverStats(seedData.drivers);
+  type DemoDriverStatsEntry = {
+    rating?: number;
+    wins?: number;
+    podiums?: number;
+    dnfs?: number;
+    totalRaces?: number;
+    avgFinish?: number;
+    bestFinish?: number;
+    worstFinish?: number;
+    overallRank?: number;
+    consistency?: number;
+    percentile?: number;
+    driverId?: string;
+  };
+
+  type DemoDriverStatsMap = Record<string, DemoDriverStatsEntry>;
+
+  const driverStats: DemoDriverStatsMap = createDemoDriverStats(seedData.drivers);
 
   // Register repositories
   container.registerInstance<IDriverRepository>(
@@ -228,7 +244,11 @@ export function configureDIContainer(): void {
   );
 
   // Race registrations - seed from results for completed races, plus some upcoming races
-  const seedRaceRegistrations: Array<{ raceId: string; driverId: string; registeredAt: Date }> = [];
+  const seedRaceRegistrations: Array<{
+    raceId: string;
+    driverId: string;
+    registeredAt: Date;
+  }> = [];
 
   // For completed races, extract driver registrations from results
   for (const result of seedData.results) {
@@ -280,6 +300,8 @@ export function configureDIContainer(): void {
   const seededPenalties: Penalty[] = [];
   const seededProtests: Protest[] = [];
 
+  type ProtestProps = Parameters<(typeof Protest)['create']>[0];
+
   racesForProtests.forEach(({ race, leagueIndex: leagueIdx }, raceIndex) => {
     const raceResults = seedData.results.filter(r => r.raceId === race.id);
     if (raceResults.length < 4) return;
@@ -291,33 +313,51 @@ export function configureDIContainer(): void {
 
       if (!protestingResult || !accusedResult) continue;
 
-      const protestStatuses: Array<'pending' | 'under_review' | 'upheld' | 'dismissed'> = ['pending', 'under_review', 'upheld', 'dismissed'];
-      const status = protestStatuses[(raceIndex + i) % protestStatuses.length];
+      const protestStatuses = [
+        'pending',
+        'under_review',
+        'upheld',
+        'dismissed',
+      ] as const;
+      const status =
+        protestStatuses[(raceIndex + i) % protestStatuses.length] ?? 'pending';
 
-      const protest = Protest.create({
+      const protestProps: ProtestProps = {
         id: `protest-${race.id}-${i}`,
         raceId: race.id,
         protestingDriverId: protestingResult.driverId,
         accusedDriverId: accusedResult.driverId,
         incident: {
           lap: 5 + i * 3,
-          description: i === 0
-            ? 'Unsafe rejoining to the track after going off, causing contact'
-            : 'Aggressive defending, pushing competitor off track',
+          description:
+            i === 0
+              ? 'Unsafe rejoining to the track after going off, causing contact'
+              : 'Aggressive defending, pushing competitor off track',
         },
-        comment: i === 0
-          ? 'Driver rejoined directly into my racing line, causing contact and damaging my front wing.'
-          : 'Driver moved under braking multiple times, forcing me off the circuit.',
+        comment:
+          i === 0
+            ? 'Driver rejoined directly into my racing line, causing contact and damaging my front wing.'
+            : 'Driver moved under braking multiple times, forcing me off the circuit.',
         status,
         filedAt: new Date(Date.now() - (raceIndex + 1) * 24 * 60 * 60 * 1000),
-        reviewedBy: status !== 'pending' ? primaryDriverId : undefined,
-        decisionNotes: status === 'upheld'
-          ? 'After reviewing the evidence, the accused driver is found at fault. Penalty applied.'
-          : status === 'dismissed'
-          ? 'No clear fault found. Racing incident.'
-          : undefined,
-        reviewedAt: status !== 'pending' ? new Date(Date.now() - raceIndex * 24 * 60 * 60 * 1000) : undefined,
-      });
+      };
+
+      if (status !== 'pending') {
+        protestProps.reviewedBy = primaryDriverId;
+        protestProps.reviewedAt = new Date(
+          Date.now() - raceIndex * 24 * 60 * 60 * 1000,
+        );
+      }
+
+      if (status === 'upheld') {
+        protestProps.decisionNotes =
+          'After reviewing the evidence, the accused driver is found at fault. Penalty applied.';
+      } else if (status === 'dismissed') {
+        protestProps.decisionNotes =
+          'No clear fault found. Racing incident.';
+      }
+
+      const protest = Protest.create(protestProps);
 
       seededProtests.push(protest);
 
@@ -448,7 +488,15 @@ export function configureDIContainer(): void {
   );
 
   // League memberships
-  const seededMemberships: LeagueMembership[] = seedData.memberships.map((m) => ({
+  type SeedMembership = {
+    leagueId: string;
+    driverId: string;
+    role: 'member' | 'owner' | 'admin' | 'steward';
+    status: 'active';
+    joinedAt: Date;
+  };
+
+  const seededMemberships: SeedMembership[] = seedData.memberships.map((m) => ({
     leagueId: m.leagueId,
     driverId: m.driverId,
     role: 'member',
@@ -476,11 +524,11 @@ export function configureDIContainer(): void {
 
   // Ensure primary driver owns at least one league
   const hasPrimaryOwnerMembership = seededMemberships.some(
-    (m: LeagueMembership) => m.driverId === primaryDriverId && m.role === 'owner',
+    (m) => m.driverId === primaryDriverId && m.role === 'owner',
   );
   if (!hasPrimaryOwnerMembership && seedData.leagues.length > 0) {
     const targetLeague =
-      seedData.leagues.find((l) => l.ownerId === primaryDriverId) ?? seedData.leagues[0];
+      seedData.leagues.find((l) => l.ownerId === primaryDriverId) ?? seedData.leagues[0]!;
 
     const existingForPrimary = seededMemberships.find(
       (m) => m.leagueId === targetLeague.id && m.driverId === primaryDriverId,
@@ -574,23 +622,36 @@ export function configureDIContainer(): void {
         'Heard great things about this league. Can I join?',
         'Experienced driver looking for competitive racing.',
         'My friend recommended this league. Hope to race with you!',
-      ];
+      ] as const;
+      const message =
+        messages[(index + leagueIndex) % messages.length] ?? messages[0];
       seededJoinRequests.push({
         id: `join-${league.id}-${driver.id}`,
         leagueId: league.id,
         driverId: driver.id,
-        requestedAt: new Date(Date.now() - (index + 1 + leagueIndex) * 24 * 60 * 60 * 1000),
-        message: messages[(index + leagueIndex) % messages.length],
+        requestedAt: new Date(
+          Date.now() - (index + 1 + leagueIndex) * 24 * 60 * 60 * 1000,
+        ),
+        message,
       });
     });
   });
 
+  type InMemoryLeagueMembershipSeed = ConstructorParameters<
+    typeof InMemoryLeagueMembershipRepository
+  >[0];
+
   container.registerInstance<ILeagueMembershipRepository>(
     DI_TOKENS.LeagueMembershipRepository,
-    new InMemoryLeagueMembershipRepository(seededMemberships, seededJoinRequests)
+    new InMemoryLeagueMembershipRepository(
+      seededMemberships as InMemoryLeagueMembershipSeed,
+      seededJoinRequests,
+    )
   );
 
   // Team repositories
+  type InMemoryTeamSeed = ConstructorParameters<typeof InMemoryTeamRepository>[0];
+
   container.registerInstance<ITeamRepository>(
     DI_TOKENS.TeamRepository,
     new InMemoryTeamRepository(
@@ -602,8 +663,8 @@ export function configureDIContainer(): void {
         ownerId: seedData.drivers[0]!.id,
         leagues: [t.primaryLeagueId],
         createdAt: new Date(),
-      }))
-    )
+      })) as InMemoryTeamSeed,
+    ),
   );
 
   container.registerInstance<ITeamMembershipRepository>(
@@ -644,16 +705,13 @@ export function configureDIContainer(): void {
   );
 
   const sponsorRepo = new InMemorySponsorRepository();
-  // Use synchronous seeding via internal method
-  seededSponsors.forEach(sponsor => {
-    (sponsorRepo as any).sponsors.set(sponsor.id, sponsor);
-  });
+  sponsorRepo.seed(seededSponsors);
   container.registerInstance<ISponsorRepository>(
     DI_TOKENS.SponsorRepository,
     sponsorRepo
   );
 
-  const seededSponsorships = seedData.seasonSponsorships.map(ss =>
+  const seededSponsorships = seedData.seasonSponsorships.map((ss) =>
     SeasonSponsorship.create({
       id: ss.id,
       seasonId: ss.seasonId,
@@ -661,15 +719,12 @@ export function configureDIContainer(): void {
       tier: ss.tier,
       pricing: Money.create(ss.pricingAmount, ss.pricingCurrency),
       status: ss.status,
-      description: ss.description,
-    })
+      description: ss.description ?? '',
+    }),
   );
 
   const seasonSponsorshipRepo = new InMemorySeasonSponsorshipRepository();
-  // Use synchronous seeding via internal method
-  seededSponsorships.forEach(sponsorship => {
-    (seasonSponsorshipRepo as any).sponsorships.set(sponsorship.id, sponsorship);
-  });
+  seasonSponsorshipRepo.seed(seededSponsorships);
   container.registerInstance<ISeasonSponsorshipRepository>(
     DI_TOKENS.SeasonSponsorshipRepository,
     seasonSponsorshipRepo
@@ -691,9 +746,9 @@ export function configureDIContainer(): void {
   );
 
   // Seed sponsorship requests from demo data
-  seedData.sponsorshipRequests?.forEach(request => {
-    (sponsorshipRequestRepo as any).requests.set(request.id, request);
-  });
+  if (seedData.sponsorshipRequests && seedData.sponsorshipRequests.length > 0) {
+    sponsorshipRequestRepo.seed(seedData.sponsorshipRequests);
+  }
 
   // Social repositories
   container.registerInstance<IFeedRepository>(
@@ -732,7 +787,7 @@ export function configureDIContainer(): void {
   );
 
   // Register driver stats for access by utility functions
-  container.registerInstance(
+  container.registerInstance<DemoDriverStatsMap>(
     DI_TOKENS.DriverStats,
     driverStats
   );
@@ -741,7 +796,8 @@ export function configureDIContainer(): void {
   const driverRatingProvider: DriverRatingProvider = {
     getRating: (driverId: string): number | null => {
       const stats = driverStats[driverId];
-      return stats?.rating ?? null;
+      const rating = stats?.rating;
+      return typeof rating === 'number' ? rating : null;
     },
     getRatings: (driverIds: string[]): Map<string, number> => {
       const result = new Map<string, number>();
@@ -905,7 +961,7 @@ export function configureDIContainer(): void {
   const leagueStandingsPresenter = new LeagueStandingsPresenter();
   container.registerInstance(
     DI_TOKENS.GetLeagueStandingsUseCase,
-    new GetLeagueStandingsUseCase(standingRepository, leagueStandingsPresenter)
+    new GetLeagueStandingsUseCase(standingRepository),
   );
 
   const leagueDriverSeasonStatsPresenter = new LeagueDriverSeasonStatsPresenter();
@@ -919,7 +975,7 @@ export function configureDIContainer(): void {
       {
         getRating: (driverId: string) => {
           const stats = driverStats[driverId];
-          if (!stats) {
+          if (!stats || typeof stats.rating !== 'number') {
             return { rating: null, ratingChange: null };
           }
           const baseline = 1500;
@@ -930,8 +986,8 @@ export function configureDIContainer(): void {
           };
         },
       },
-      leagueDriverSeasonStatsPresenter
-    )
+      leagueDriverSeasonStatsPresenter,
+    ),
   );
 
   const allLeaguesWithCapacityPresenter = new AllLeaguesWithCapacityPresenter();
@@ -961,7 +1017,7 @@ export function configureDIContainer(): void {
   const leagueScoringPresetsPresenter = new LeagueScoringPresetsPresenter();
   container.registerInstance(
     DI_TOKENS.ListLeagueScoringPresetsUseCase,
-    new ListLeagueScoringPresetsUseCase(leagueScoringPresetProvider, leagueScoringPresetsPresenter)
+    new ListLeagueScoringPresetsUseCase(leagueScoringPresetProvider)
   );
 
   const leagueScoringConfigPresenter = new LeagueScoringConfigPresenter();
@@ -977,7 +1033,6 @@ export function configureDIContainer(): void {
     )
   );
 
-  const leagueFullConfigPresenter = new LeagueFullConfigPresenter();
   container.registerInstance(
     DI_TOKENS.GetLeagueFullConfigUseCase,
     new GetLeagueFullConfigUseCase(
@@ -985,14 +1040,13 @@ export function configureDIContainer(): void {
       seasonRepository,
       leagueScoringConfigRepository,
       gameRepository,
-      leagueFullConfigPresenter
     )
   );
 
   const leagueSchedulePreviewPresenter = new LeagueSchedulePreviewPresenter();
   container.registerInstance(
     DI_TOKENS.PreviewLeagueScheduleUseCase,
-    new PreviewLeagueScheduleUseCase(undefined, leagueSchedulePreviewPresenter)
+    new PreviewLeagueScheduleUseCase(undefined, leagueSchedulePreviewPresenter),
   );
 
   const raceWithSOFPresenter = new RaceWithSOFPresenter();
@@ -1031,6 +1085,8 @@ export function configureDIContainer(): void {
     new GetAllRacesPageDataUseCase(raceRepository, leagueRepository, allRacesPagePresenter)
   );
 
+  const imageService = container.resolve<ImageServicePort>(DI_TOKENS.ImageService);
+
   const raceDetailPresenter = new RaceDetailPresenter();
   container.registerInstance(
     DI_TOKENS.GetRaceDetailUseCase,
@@ -1075,38 +1131,38 @@ export function configureDIContainer(): void {
   // Create services for driver leaderboard query
   const rankingService = {
     getAllDriverRankings: () => {
-      const stats = getDIContainer().resolve<Record<string, any>>(DI_TOKENS.DriverStats);
-      return Object.entries(stats).map(([driverId, stat]) => ({
-        driverId,
-        rating: stat.rating,
-        overallRank: stat.overallRank,
-      })).sort((a, b) => b.rating - a.rating);
-    }
+      const stats = getDIContainer().resolve<DemoDriverStatsMap>(DI_TOKENS.DriverStats);
+      return Object.entries(stats)
+        .map(([driverId, stat]) => ({
+          driverId,
+          rating: stat.rating ?? 0,
+          overallRank: stat.overallRank ?? null,
+        }))
+        .sort((a, b) => (b.rating ?? 0) - (a.rating ?? 0));
+    },
   };
 
   const driverStatsService = {
     getDriverStats: (driverId: string) => {
-      const stats = getDIContainer().resolve<Record<string, any>>(DI_TOKENS.DriverStats);
-      return stats[driverId] || null;
-    }
+      const stats = getDIContainer().resolve<DemoDriverStatsMap>(DI_TOKENS.DriverStats);
+      return stats[driverId] ?? null;
+    },
   };
 
-  const imageService = getDIContainer().resolve<ImageServicePort>(DI_TOKENS.ImageService);
-
   const driversPresenter = new DriversLeaderboardPresenter();
   container.registerInstance(
     DI_TOKENS.GetDriversLeaderboardUseCase,
     new GetDriversLeaderboardUseCase(
       driverRepository,
-      rankingService as any,
-      driverStatsService as any,
+      rankingService,
+      driverStatsService,
       imageService,
       driversPresenter
     )
   );
 
   const getDriverStatsAdapter = (driverId: string) => {
-    const stats = getDIContainer().resolve<Record<string, any>>(DI_TOKENS.DriverStats);
+    const stats = getDIContainer().resolve<DemoDriverStatsMap>(DI_TOKENS.DriverStats);
     const stat = stats[driverId];
     if (!stat) return null;
     return {
@@ -1116,7 +1172,6 @@ export function configureDIContainer(): void {
     };
   };
 
-  const teamsPresenter = new TeamsLeaderboardPresenter();
   container.registerInstance(
     DI_TOKENS.GetTeamsLeaderboardUseCase,
     new GetTeamsLeaderboardUseCase(
@@ -1124,12 +1179,11 @@ export function configureDIContainer(): void {
       teamMembershipRepository,
       driverRepository,
       getDriverStatsAdapter,
-      teamsPresenter
     )
   );
 
   const getDriverStatsForDashboard = (driverId: string) => {
-    const stats = getDIContainer().resolve<Record<string, any>>(DI_TOKENS.DriverStats);
+    const stats = getDIContainer().resolve<DemoDriverStatsMap>(DI_TOKENS.DriverStats);
     const stat = stats[driverId];
     if (!stat) return null;
     return {
@@ -1143,7 +1197,7 @@ export function configureDIContainer(): void {
   };
 
   const getDriverStatsForProfile = (driverId: string) => {
-    const stats = getDIContainer().resolve<Record<string, any>>(DI_TOKENS.DriverStats);
+    const stats = getDIContainer().resolve<DemoDriverStatsMap>(DI_TOKENS.DriverStats);
     const stat = stats[driverId];
     if (!stat) return null;
     return {
@@ -1204,7 +1258,7 @@ export function configureDIContainer(): void {
   const allTeamsPresenter = new AllTeamsPresenter();
   container.registerInstance(
     DI_TOKENS.GetAllTeamsUseCase,
-    new GetAllTeamsUseCase(teamRepository, teamMembershipRepository, allTeamsPresenter)
+    new GetAllTeamsUseCase(teamRepository, teamMembershipRepository),
   );
 
   const teamDetailsPresenter = new TeamDetailsPresenter();
@@ -1216,13 +1270,18 @@ export function configureDIContainer(): void {
   const teamMembersPresenter = new TeamMembersPresenter();
   container.registerInstance(
     DI_TOKENS.GetTeamMembersUseCase,
-    new GetTeamMembersUseCase(teamMembershipRepository, driverRepository, imageService, teamMembersPresenter)
+    new GetTeamMembersUseCase(teamMembershipRepository, driverRepository, imageService, teamMembersPresenter),
   );
 
   const teamJoinRequestsPresenter = new TeamJoinRequestsPresenter();
   container.registerInstance(
     DI_TOKENS.GetTeamJoinRequestsUseCase,
-    new GetTeamJoinRequestsUseCase(teamMembershipRepository, driverRepository, imageService, teamJoinRequestsPresenter)
+    new GetTeamJoinRequestsUseCase(
+      teamMembershipRepository,
+      driverRepository,
+      imageService,
+      teamJoinRequestsPresenter,
+    ),
   );
 
   const driverTeamPresenter = new DriverTeamPresenter();
@@ -1235,13 +1294,13 @@ export function configureDIContainer(): void {
   const raceProtestsPresenter = new RaceProtestsPresenter();
   container.registerInstance(
     DI_TOKENS.GetRaceProtestsUseCase,
-    new GetRaceProtestsUseCase(protestRepository, driverRepository, raceProtestsPresenter)
+    new GetRaceProtestsUseCase(protestRepository, driverRepository)
   );
 
   const racePenaltiesPresenter = new RacePenaltiesPresenter();
   container.registerInstance(
     DI_TOKENS.GetRacePenaltiesUseCase,
-    new GetRacePenaltiesUseCase(penaltyRepository, driverRepository, racePenaltiesPresenter)
+    new GetRacePenaltiesUseCase(penaltyRepository, driverRepository)
   );
 
   // Register queries - Notifications
@@ -1286,13 +1345,11 @@ export function configureDIContainer(): void {
   const sponsorshipRequestRepository = container.resolve<ISponsorshipRequestRepository>(DI_TOKENS.SponsorshipRequestRepository);
   const sponsorshipPricingRepository = container.resolve<ISponsorshipPricingRepository>(DI_TOKENS.SponsorshipPricingRepository);
 
-  const pendingSponsorshipRequestsPresenter = new PendingSponsorshipRequestsPresenter();
   container.registerInstance(
     DI_TOKENS.GetPendingSponsorshipRequestsUseCase,
     new GetPendingSponsorshipRequestsUseCase(
       sponsorshipRequestRepository,
       sponsorRepository,
-      pendingSponsorshipRequestsPresenter
     )
   );
 

apps/website/lib/di-container.ts

@@ -6,6 +6,7 @@
 
 import { configureDIContainer, getDIContainer } from './di-config';
 import { DI_TOKENS } from './di-tokens';
+import { LeagueScoringPresetsPresenter } from './presenters/LeagueScoringPresetsPresenter';
 
 import type { IDriverRepository } from '@gridpilot/racing/domain/repositories/IDriverRepository';
 import type { ILeagueRepository } from '@gridpilot/racing/domain/repositories/ILeagueRepository';
@@ -97,6 +98,7 @@ import type { TransferLeagueOwnershipUseCase } from '@gridpilot/racing/applicati
 import type { DriverRatingProvider } from '@gridpilot/racing/application';
 import type { PreviewLeagueScheduleUseCase } from '@gridpilot/racing/application';
 import type { LeagueScoringPresetProvider } from '@gridpilot/racing/application/ports/LeagueScoringPresetProvider';
+import type { LeagueScoringPresetDTO } from '@gridpilot/racing/application/ports/LeagueScoringPresetProvider';
 import type { GetDashboardOverviewUseCase } from '@gridpilot/racing/application/use-cases/GetDashboardOverviewUseCase';
 import { createDemoDriverStats, getDemoLeagueRankings, type DriverStats } from '@gridpilot/testing-support';
 
@@ -613,6 +615,21 @@ export function getIsDriverRegisteredForRaceUseCase(): IsDriverRegisteredForRace
   return DIContainer.getInstance().isDriverRegisteredForRaceUseCase;
 }
 
+/**
+ * Query facade for checking if a driver is registered for a race.
+ */
+export function getIsDriverRegisteredForRaceQuery(): {
+  execute(input: { raceId: string; driverId: string }): Promise<boolean>;
+} {
+  const useCase = DIContainer.getInstance().isDriverRegisteredForRaceUseCase;
+  return {
+    async execute(input: { raceId: string; driverId: string }): Promise<boolean> {
+      const result = await useCase.execute(input);
+      return result as unknown as boolean;
+    },
+  };
+}
+
 export function getGetRaceRegistrationsUseCase(): GetRaceRegistrationsUseCase {
   return DIContainer.getInstance().getRaceRegistrationsUseCase;
 }
@@ -649,6 +666,24 @@ export function getListLeagueScoringPresetsUseCase(): ListLeagueScoringPresetsUs
   return DIContainer.getInstance().listLeagueScoringPresetsUseCase;
 }
 
+/**
+ * Lightweight query facade for listing league scoring presets.
+ * Returns an object with an execute() method for use in UI code.
+ */
+export function getListLeagueScoringPresetsQuery(): {
+  execute(): Promise<LeagueScoringPresetDTO[]>;
+} {
+  const useCase = DIContainer.getInstance().listLeagueScoringPresetsUseCase;
+  return {
+    async execute(): Promise<LeagueScoringPresetDTO[]> {
+      const presenter = new LeagueScoringPresetsPresenter();
+      await useCase.execute(undefined as void, presenter);
+      const viewModel = presenter.getViewModel();
+      return viewModel.presets;
+    },
+  };
+}
+
 export function getCreateLeagueWithSeasonAndScoringUseCase(): CreateLeagueWithSeasonAndScoringUseCase {
   return DIContainer.getInstance().createLeagueWithSeasonAndScoringUseCase;
 }

apps/website/lib/leagueMembership.ts

@@ -40,6 +40,7 @@ const leagueMemberships = new Map<string, LeagueMembership[]>();
       const memberships = await membershipRepo.getLeagueMembers(league.id);
 
       const mapped: LeagueMembership[] = memberships.map((membership) => ({
+        id: membership.id,
         leagueId: membership.leagueId,
         driverId: membership.driverId,
         role: membership.role,

apps/website/lib/leagueWizardService.ts

@@ -53,13 +53,13 @@ export function validateLeagueWizardStep(
     
     // Use LeagueName value object for validation
     const nameValidation = LeagueName.validate(form.basics.name);
-    if (!nameValidation.valid) {
+    if (!nameValidation.valid && nameValidation.error) {
       basicsErrors.name = nameValidation.error;
     }
     
     // Use LeagueDescription value object for validation
     const descValidation = LeagueDescription.validate(form.basics.description ?? '');
-    if (!descValidation.valid) {
+    if (!descValidation.valid && descValidation.error) {
       basicsErrors.description = descValidation.error;
     }
     
@@ -92,8 +92,10 @@ export function validateLeagueWizardStep(
           'Max drivers must be greater than 0 for solo leagues';
       } else {
         // Validate against game constraints
-        const driverValidation = gameConstraints.validateDriverCount(form.structure.maxDrivers);
-        if (!driverValidation.valid) {
+        const driverValidation = gameConstraints.validateDriverCount(
+          form.structure.maxDrivers,
+        );
+        if (!driverValidation.valid && driverValidation.error) {
           structureErrors.maxDrivers = driverValidation.error;
         }
       }
@@ -103,8 +105,10 @@ export function validateLeagueWizardStep(
           'Max teams must be greater than 0 for team leagues';
       } else {
         // Validate against game constraints
-        const teamValidation = gameConstraints.validateTeamCount(form.structure.maxTeams);
-        if (!teamValidation.valid) {
+        const teamValidation = gameConstraints.validateTeamCount(
+          form.structure.maxTeams,
+        );
+        if (!teamValidation.valid && teamValidation.error) {
           structureErrors.maxTeams = teamValidation.error;
         }
       }
@@ -114,8 +118,10 @@ export function validateLeagueWizardStep(
       }
       // Validate total driver count
       if (form.structure.maxDrivers) {
-        const driverValidation = gameConstraints.validateDriverCount(form.structure.maxDrivers);
-        if (!driverValidation.valid) {
+        const driverValidation = gameConstraints.validateDriverCount(
+          form.structure.maxDrivers,
+        );
+        if (!driverValidation.valid && driverValidation.error) {
           structureErrors.maxDrivers = driverValidation.error;
         }
       }
@@ -197,7 +203,7 @@ export function validateAllLeagueWizardSteps(
 
 export function hasWizardErrors(errors: WizardErrors): boolean {
   return Object.keys(errors).some((key) => {
-    const value = (errors as any)[key];
+    const value = errors[key as keyof WizardErrors];
     if (!value) return false;
     if (typeof value === 'string') return true;
     return Object.keys(value).length > 0;
@@ -213,27 +219,31 @@ export function buildCreateLeagueCommandFromConfig(
   ownerId: string,
 ): CreateLeagueWithSeasonAndScoringCommand {
   const structure = form.structure;
-  let maxDrivers: number | undefined;
-  let maxTeams: number | undefined;
+  let maxDrivers: number;
+  let maxTeams: number;
 
   if (structure.mode === 'solo') {
     maxDrivers =
-      typeof structure.maxDrivers === 'number' ? structure.maxDrivers : undefined;
-    maxTeams = undefined;
+      typeof structure.maxDrivers === 'number' && structure.maxDrivers > 0
+        ? structure.maxDrivers
+        : 0;
+    maxTeams = 0;
   } else {
     const teams =
-      typeof structure.maxTeams === 'number' ? structure.maxTeams : 0;
+      typeof structure.maxTeams === 'number' && structure.maxTeams > 0
+        ? structure.maxTeams
+        : 0;
     const perTeam =
-      typeof structure.driversPerTeam === 'number'
+      typeof structure.driversPerTeam === 'number' && structure.driversPerTeam > 0
         ? structure.driversPerTeam
         : 0;
-    maxTeams = teams > 0 ? teams : undefined;
-    maxDrivers = teams > 0 && perTeam > 0 ? teams * perTeam : undefined;
+    maxTeams = teams;
+    maxDrivers = teams > 0 && perTeam > 0 ? teams * perTeam : 0;
   }
 
   return {
     name: form.basics.name.trim(),
-    description: form.basics.description?.trim() || undefined,
+    description: (form.basics.description ?? '').trim(),
     visibility: form.basics.visibility,
     ownerId,
     gameId: form.basics.gameId,
@@ -243,7 +253,7 @@ export function buildCreateLeagueCommandFromConfig(
     enableTeamChampionship: form.championships.enableTeamChampionship,
     enableNationsChampionship: form.championships.enableNationsChampionship,
     enableTrophyChampionship: form.championships.enableTrophyChampionship,
-    scoringPresetId: form.scoring.patternId || undefined,
+    scoringPresetId: form.scoring.patternId ?? 'custom',
   };
 }
 
@@ -263,8 +273,8 @@ export async function createLeagueFromConfig(
   if (!currentDriver) {
     const error = new Error(
       'No driver profile found. Please create a driver profile first.',
-    );
-    (error as any).code = 'NO_DRIVER';
+    ) as Error & { code?: string };
+    error.code = 'NO_DRIVER';
     throw error;
   }
 
@@ -283,7 +293,9 @@ export function applyScoringPresetToConfig(
 ): LeagueConfigFormModel {
   const lowerPresetId = patternId.toLowerCase();
   const timings = form.timings ?? ({} as LeagueConfigFormModel['timings']);
-  let updatedTimings = { ...timings };
+  let updatedTimings: NonNullable<LeagueConfigFormModel['timings']> = {
+    ...timings,
+  };
 
   if (lowerPresetId.includes('sprint') || lowerPresetId.includes('double')) {
     updatedTimings = {
@@ -299,19 +311,19 @@ export function applyScoringPresetToConfig(
       ...updatedTimings,
       practiceMinutes: 30,
       qualifyingMinutes: 30,
-      sprintRaceMinutes: undefined,
       mainRaceMinutes: 90,
       sessionCount: 1,
     };
+    delete (updatedTimings as { sprintRaceMinutes?: number }).sprintRaceMinutes;
   } else {
     updatedTimings = {
       ...updatedTimings,
       practiceMinutes: 20,
       qualifyingMinutes: 30,
-      sprintRaceMinutes: undefined,
       mainRaceMinutes: 40,
       sessionCount: 1,
     };
+    delete (updatedTimings as { sprintRaceMinutes?: number }).sprintRaceMinutes;
   }
 
   return {

apps/website/lib/presenters/AllLeaguesWithCapacityAndScoringPresenter.ts

@@ -25,8 +25,8 @@ export class AllLeaguesWithCapacityAndScoringPresenter implements IAllLeaguesWit
           : 40;
       const timingSummary = `${qualifyingMinutes} min Quali • ${mainRaceMinutes} min Race`;
 
-      let scoringSummary: LeagueSummaryViewModel['scoring'] | undefined;
-      let scoringPatternSummary: string | undefined;
+      let scoringPatternSummary: string | null = null;
+      let scoringSummary: LeagueSummaryViewModel['scoring'];
 
       if (season && scoringConfig && game) {
         const dropPolicySummary =
@@ -47,9 +47,23 @@ export class AllLeaguesWithCapacityAndScoringPresenter implements IAllLeaguesWit
           dropPolicySummary,
           scoringPatternSummary,
         };
+      } else {
+        const dropPolicySummary = 'All results count';
+        const scoringPresetName = 'Custom';
+        scoringPatternSummary = scoringPatternSummary ?? `${scoringPresetName} • ${dropPolicySummary}`;
+
+        scoringSummary = {
+          gameId: 'unknown',
+          gameName: 'Unknown',
+          primaryChampionshipType: 'driver',
+          scoringPresetId: 'custom',
+          scoringPresetName,
+          dropPolicySummary,
+          scoringPatternSummary,
+        };
       }
 
-      return {
+      const base: LeagueSummaryViewModel = {
         id: league.id,
         name: league.name,
         description: league.description,
@@ -57,13 +71,16 @@ export class AllLeaguesWithCapacityAndScoringPresenter implements IAllLeaguesWit
         createdAt: league.createdAt,
         maxDrivers: safeMaxDrivers,
         usedDriverSlots,
-        maxTeams: undefined,
-        usedTeamSlots: undefined,
+        // Team capacity is not yet modeled here; use zero for now to satisfy strict typing.
+        maxTeams: 0,
+        usedTeamSlots: 0,
         structureSummary,
-        scoringPatternSummary,
+        scoringPatternSummary: scoringPatternSummary ?? '',
         timingSummary,
         scoring: scoringSummary,
       };
+
+      return base;
     });
 
     this.viewModel = {

apps/website/lib/presenters/AllLeaguesWithCapacityPresenter.ts

@@ -14,13 +14,13 @@ export class AllLeaguesWithCapacityPresenter implements IAllLeaguesWithCapacityP
   ): AllLeaguesWithCapacityViewModel {
     const leagueItems: LeagueWithCapacityViewModel[] = leagues.map((league) => {
       const usedSlots = memberCounts.get(league.id) ?? 0;
-      
+
       // Ensure we never expose an impossible state like 26/24:
       // clamp maxDrivers to at least usedSlots at the application boundary.
       const configuredMax = league.settings.maxDrivers ?? usedSlots;
       const safeMaxDrivers = Math.max(configuredMax, usedSlots);
 
-      return {
+      const base: LeagueWithCapacityViewModel = {
         id: league.id,
         name: league.name,
         description: league.description,
@@ -30,15 +30,33 @@ export class AllLeaguesWithCapacityPresenter implements IAllLeaguesWithCapacityP
           maxDrivers: safeMaxDrivers,
         },
         createdAt: league.createdAt.toISOString(),
-        socialLinks: league.socialLinks
-          ? {
-              discordUrl: league.socialLinks.discordUrl,
-              youtubeUrl: league.socialLinks.youtubeUrl,
-              websiteUrl: league.socialLinks.websiteUrl,
-            }
-          : undefined,
         usedSlots,
       };
+
+      if (!league.socialLinks) {
+        return base;
+      }
+
+      const socialLinks: NonNullable<LeagueWithCapacityViewModel['socialLinks']> = {};
+
+      if (league.socialLinks.discordUrl) {
+        socialLinks.discordUrl = league.socialLinks.discordUrl;
+      }
+      if (league.socialLinks.youtubeUrl) {
+        socialLinks.youtubeUrl = league.socialLinks.youtubeUrl;
+      }
+      if (league.socialLinks.websiteUrl) {
+        socialLinks.websiteUrl = league.socialLinks.websiteUrl;
+      }
+
+      if (Object.keys(socialLinks).length === 0) {
+        return base;
+      }
+
+      return {
+        ...base,
+        socialLinks,
+      };
     });
 
     this.viewModel = {

apps/website/lib/presenters/AllTeamsPresenter.ts

@@ -1,38 +1,34 @@
-import type { Team } from '@gridpilot/racing/domain/entities/Team';
 import type {
   IAllTeamsPresenter,
   TeamListItemViewModel,
   AllTeamsViewModel,
+  AllTeamsResultDTO,
 } from '@gridpilot/racing/application/presenters/IAllTeamsPresenter';
 
 export class AllTeamsPresenter implements IAllTeamsPresenter {
   private viewModel: AllTeamsViewModel | null = null;
 
-  present(teams: Array<Team & { memberCount?: number }>): AllTeamsViewModel {
-    const teamItems: TeamListItemViewModel[] = teams.map((team) => ({
+  reset(): void {
+    this.viewModel = null;
+  }
+
+  present(input: AllTeamsResultDTO): void {
+    const teamItems: TeamListItemViewModel[] = input.teams.map((team) => ({
       id: team.id,
       name: team.name,
       tag: team.tag,
       description: team.description,
       memberCount: team.memberCount ?? 0,
       leagues: team.leagues,
-      specialization: team.specialization as 'endurance' | 'sprint' | 'mixed' | undefined,
-      region: team.region,
-      languages: team.languages,
     }));
 
     this.viewModel = {
       teams: teamItems,
       totalCount: teamItems.length,
     };
-
-    return this.viewModel;
   }
 
-  getViewModel(): AllTeamsViewModel {
-    if (!this.viewModel) {
-      throw new Error('Presenter has not been called yet');
-    }
+  getViewModel(): AllTeamsViewModel | null {
     return this.viewModel;
   }
 }

apps/website/lib/presenters/DriverTeamPresenter.ts

@@ -1,17 +1,19 @@
-import type { Team, TeamMembership } from '@gridpilot/racing/domain/entities/Team';
 import type {
   IDriverTeamPresenter,
   DriverTeamViewModel,
+  DriverTeamResultDTO,
 } from '@gridpilot/racing/application/presenters/IDriverTeamPresenter';
 
 export class DriverTeamPresenter implements IDriverTeamPresenter {
   private viewModel: DriverTeamViewModel | null = null;
 
-  present(
-    team: Team,
-    membership: TeamMembership,
-    driverId: string
-  ): DriverTeamViewModel {
+  reset(): void {
+    this.viewModel = null;
+  }
+
+  present(input: DriverTeamResultDTO): void {
+    const { team, membership, driverId } = input;
+
     const isOwner = team.ownerId === driverId;
     const canManage = membership.role === 'owner' || membership.role === 'manager';
 
@@ -23,26 +25,18 @@ export class DriverTeamPresenter implements IDriverTeamPresenter {
         description: team.description,
         ownerId: team.ownerId,
         leagues: team.leagues,
-        specialization: team.specialization as 'endurance' | 'sprint' | 'mixed' | undefined,
-        region: team.region,
-        languages: team.languages,
       },
       membership: {
-        role: membership.role,
+        role: membership.role === 'driver' ? 'member' : membership.role,
         joinedAt: membership.joinedAt.toISOString(),
-        isActive: membership.isActive,
+        isActive: membership.status === 'active',
       },
       isOwner,
       canManage,
     };
-
-    return this.viewModel;
   }
 
-  getViewModel(): DriverTeamViewModel {
-    if (!this.viewModel) {
-      throw new Error('Presenter has not been called yet');
-    }
+  getViewModel(): DriverTeamViewModel | null {
     return this.viewModel;
   }
 }

apps/website/lib/presenters/EntitySponsorshipPricingPresenter.ts

@@ -1,5 +1,5 @@
-import type { IEntitySponsorshipPricingPresenter } from '@racing/application/presenters/IEntitySponsorshipPricingPresenter';
-import type { GetEntitySponsorshipPricingResultDTO } from '@racing/application/use-cases/GetEntitySponsorshipPricingUseCase';
+import type { IEntitySponsorshipPricingPresenter } from '@gridpilot/racing/application/presenters/IEntitySponsorshipPricingPresenter';
+import type { GetEntitySponsorshipPricingResultDTO } from '@gridpilot/racing/application/use-cases/GetEntitySponsorshipPricingUseCase';
 
 export class EntitySponsorshipPricingPresenter implements IEntitySponsorshipPricingPresenter {
   private data: GetEntitySponsorshipPricingResultDTO | null = null;

apps/website/lib/presenters/LeagueAdminPresenter.ts

@@ -3,6 +3,8 @@ import type { Protest } from '@gridpilot/racing/domain/entities/Protest';
 import type { Race } from '@gridpilot/racing/domain/entities/Race';
 import type { DriverDTO } from '@gridpilot/racing/application/dto/DriverDTO';
 import type { LeagueConfigFormModel } from '@gridpilot/racing/application';
+import type { LeagueConfigFormViewModel } from '@gridpilot/racing/application/presenters/ILeagueFullConfigPresenter';
+import { LeagueFullConfigPresenter } from '@/lib/presenters/LeagueFullConfigPresenter';
 import type { MembershipRole } from '@/lib/leagueMembership';
 import { EntityMappers } from '@gridpilot/racing/application/mappers/EntityMappers';
 import {
@@ -38,6 +40,14 @@ export interface LeagueOwnerSummaryViewModel {
   rank: number | null;
 }
 
+export interface LeagueSummaryViewModel {
+  id: string;
+  ownerId: string;
+  settings: {
+    pointsSystem: string;
+  };
+}
+
 export interface LeagueAdminProtestsViewModel {
   protests: Protest[];
   racesById: ProtestRaceSummary;
@@ -79,14 +89,23 @@ export async function loadLeagueJoinRequests(leagueId: string): Promise<LeagueJo
     driversById[dto.id] = dto;
   }
 
-  return requests.map((request) => ({
-    id: request.id,
-    leagueId: request.leagueId,
-    driverId: request.driverId,
-    requestedAt: request.requestedAt,
-    message: request.message,
-    driver: driversById[request.driverId],
-  }));
+  return requests.map((request) => {
+    const base: LeagueJoinRequestViewModel = {
+      id: request.id,
+      leagueId: request.leagueId,
+      driverId: request.driverId,
+      requestedAt: request.requestedAt,
+    };
+
+    const message = request.message;
+    const driver = driversById[request.driverId];
+
+    return {
+      ...base,
+      ...(typeof message === 'string' && message.length > 0 ? { message } : {}),
+      ...(driver ? { driver } : {}),
+    };
+  });
 }
 
 /**
@@ -104,6 +123,7 @@ export async function approveLeagueJoinRequest(
   }
 
   await membershipRepo.saveMembership({
+    id: request.id,
     leagueId: request.leagueId,
     driverId: request.driverId,
     role: 'member',
@@ -203,12 +223,17 @@ export async function updateLeagueMemberRole(
 /**
  * Load owner summary (DTO + rating/rank) for a league.
  */
-export async function loadLeagueOwnerSummary(league: League): Promise<LeagueOwnerSummaryViewModel | null> {
+export async function loadLeagueOwnerSummary(params: {
+  ownerId: string;
+}): Promise<LeagueOwnerSummaryViewModel | null> {
   const driverRepo = getDriverRepository();
-  const entity = await driverRepo.findById(league.ownerId);
+  const entity = await driverRepo.findById(params.ownerId);
   if (!entity) return null;
 
   const ownerDriver = EntityMappers.toDriverDTO(entity);
+  if (!ownerDriver) {
+    return null;
+  }
   const stats = getDriverStats(ownerDriver.id);
   const allRankings = getAllDriverRankings();
 
@@ -243,10 +268,52 @@ export async function loadLeagueOwnerSummary(league: League): Promise<LeagueOwne
 /**
  * Load league full config form.
  */
-export async function loadLeagueConfig(leagueId: string): Promise<LeagueAdminConfigViewModel> {
+export async function loadLeagueConfig(
+  leagueId: string,
+): Promise<LeagueAdminConfigViewModel> {
   const useCase = getGetLeagueFullConfigUseCase();
-  const form = await useCase.execute({ leagueId });
-  return { form };
+  const presenter = new LeagueFullConfigPresenter();
+
+  await useCase.execute({ leagueId }, presenter);
+  const fullConfig = presenter.getViewModel();
+
+  if (!fullConfig) {
+    return { form: null };
+  }
+
+  const formModel: LeagueConfigFormModel = {
+    leagueId: fullConfig.leagueId,
+    basics: {
+      ...fullConfig.basics,
+      visibility: fullConfig.basics.visibility as LeagueConfigFormModel['basics']['visibility'],
+    },
+    structure: {
+      ...fullConfig.structure,
+      mode: fullConfig.structure.mode as LeagueConfigFormModel['structure']['mode'],
+    },
+    championships: fullConfig.championships,
+    scoring: fullConfig.scoring,
+    dropPolicy: {
+      strategy: fullConfig.dropPolicy.strategy as LeagueConfigFormModel['dropPolicy']['strategy'],
+      ...(fullConfig.dropPolicy.n !== undefined ? { n: fullConfig.dropPolicy.n } : {}),
+    },
+    timings: fullConfig.timings,
+    stewarding: {
+      decisionMode: fullConfig.stewarding.decisionMode as LeagueConfigFormModel['stewarding']['decisionMode'],
+      ...(fullConfig.stewarding.requiredVotes !== undefined
+        ? { requiredVotes: fullConfig.stewarding.requiredVotes }
+        : {}),
+      requireDefense: fullConfig.stewarding.requireDefense,
+      defenseTimeLimit: fullConfig.stewarding.defenseTimeLimit,
+      voteTimeLimit: fullConfig.stewarding.voteTimeLimit,
+      protestDeadlineHours: fullConfig.stewarding.protestDeadlineHours,
+      stewardingClosesHours: fullConfig.stewarding.stewardingClosesHours,
+      notifyAccusedOnProtest: fullConfig.stewarding.notifyAccusedOnProtest,
+      notifyOnVoteRequired: fullConfig.stewarding.notifyOnVoteRequired,
+    },
+  };
+
+  return { form: formModel };
 }
 
 /**

apps/website/lib/presenters/LeagueDriverSeasonStatsPresenter.ts

@@ -42,8 +42,8 @@ export class LeagueDriverSeasonStatsPresenter implements ILeagueDriverSeasonStat
         driverId: standing.driverId,
         position: standing.position,
         driverName: '',
-        teamId: undefined,
-        teamName: undefined,
+        teamId: '',
+        teamName: '',
         totalPoints: standing.points + totalPenaltyPoints + bonusPoints,
         basePoints: standing.points,
         penaltyPoints: Math.abs(totalPenaltyPoints),

apps/website/lib/presenters/LeagueFullConfigPresenter.ts

@@ -8,7 +8,11 @@ import type {
 export class LeagueFullConfigPresenter implements ILeagueFullConfigPresenter {
   private viewModel: LeagueConfigFormViewModel | null = null;
 
-  present(data: LeagueFullConfigData): LeagueConfigFormViewModel {
+  reset(): void {
+    this.viewModel = null;
+  }
+
+  present(data: LeagueFullConfigData): void {
     const { league, activeSeason, scoringConfig, game } = data;
 
     const patternId = scoringConfig?.scoringPresetId;
@@ -32,12 +36,8 @@ export class LeagueFullConfigPresenter implements ILeagueFullConfigPresenter {
     const roundsPlanned = 8;
 
     let sessionCount = 2;
-    if (
-      primaryChampionship &&
-      Array.isArray((primaryChampionship as any).sessionTypes) &&
-      (primaryChampionship as any).sessionTypes.length > 0
-    ) {
-      sessionCount = (primaryChampionship as any).sessionTypes.length;
+    if (primaryChampionship && Array.isArray(primaryChampionship.sessionTypes)) {
+      sessionCount = primaryChampionship.sessionTypes.length;
     }
 
     const practiceMinutes = 20;
@@ -54,8 +54,6 @@ export class LeagueFullConfigPresenter implements ILeagueFullConfigPresenter {
       structure: {
         mode: 'solo',
         maxDrivers: league.settings.maxDrivers ?? 32,
-        maxTeams: undefined,
-        driversPerTeam: undefined,
         multiClassEnabled: false,
       },
       championships: {
@@ -65,17 +63,19 @@ export class LeagueFullConfigPresenter implements ILeagueFullConfigPresenter {
         enableTrophyChampionship: false,
       },
       scoring: {
-        patternId: patternId ?? undefined,
         customScoringEnabled: !patternId,
+        ...(patternId ? { patternId } : {}),
       },
       dropPolicy: dropPolicyForm,
       timings: {
         practiceMinutes,
         qualifyingMinutes,
-        sprintRaceMinutes,
         mainRaceMinutes,
         sessionCount,
         roundsPlanned,
+        ...(typeof sprintRaceMinutes === 'number'
+          ? { sprintRaceMinutes }
+          : {}),
       },
       stewarding: {
         decisionMode: 'admin_only',
@@ -88,11 +88,9 @@ export class LeagueFullConfigPresenter implements ILeagueFullConfigPresenter {
         notifyOnVoteRequired: true,
       },
     };
-
-    return this.viewModel;
   }
 
-  getViewModel(): LeagueConfigFormViewModel {
+  getViewModel(): LeagueConfigFormViewModel | null {
     if (!this.viewModel) {
       throw new Error('Presenter has not been called yet');
     }

apps/website/lib/presenters/LeagueSchedulePreviewPresenter.ts

@@ -1,5 +1,5 @@
-import type { ILeagueSchedulePreviewPresenter } from '@racing/application/presenters/ILeagueSchedulePreviewPresenter';
-import type { LeagueSchedulePreviewDTO } from '@racing/application/dto/LeagueScheduleDTO';
+import type { ILeagueSchedulePreviewPresenter } from '@gridpilot/racing/application/presenters/ILeagueSchedulePreviewPresenter';
+import type { LeagueSchedulePreviewDTO } from '@gridpilot/racing/application/dto/LeagueScheduleDTO';
 
 export class LeagueSchedulePreviewPresenter implements ILeagueSchedulePreviewPresenter {
   private data: LeagueSchedulePreviewDTO | null = null;

apps/website/lib/presenters/LeagueScoringConfigPresenter.ts

@@ -23,8 +23,8 @@ export class LeagueScoringConfigPresenter implements ILeagueScoringConfigPresent
       seasonId: data.seasonId,
       gameId: data.gameId,
       gameName: data.gameName,
-      scoringPresetId: data.scoringPresetId,
-      scoringPresetName: data.preset?.name,
+      scoringPresetId: data.scoringPresetId ?? 'custom',
+      scoringPresetName: data.preset?.name ?? 'Custom',
       dropPolicySummary,
       championships,
     };
@@ -61,7 +61,7 @@ export class LeagueScoringConfigPresenter implements ILeagueScoringConfigPresent
   }
 
   private buildPointsPreview(
-    tables: Record<string, any>,
+    tables: Record<string, { getPointsForPosition: (position: number) => number }>,
   ): Array<{ sessionType: string; position: number; points: number }> {
     const preview: Array<{
       sessionType: string;

apps/website/lib/presenters/LeagueScoringPresetsPresenter.ts

@@ -1,19 +1,23 @@
-import type { LeagueScoringPresetDTO } from '@gridpilot/racing/application/ports/LeagueScoringPresetProvider';
 import type {
   ILeagueScoringPresetsPresenter,
   LeagueScoringPresetsViewModel,
+  LeagueScoringPresetsResultDTO,
 } from '@gridpilot/racing/application/presenters/ILeagueScoringPresetsPresenter';
 
 export class LeagueScoringPresetsPresenter implements ILeagueScoringPresetsPresenter {
   private viewModel: LeagueScoringPresetsViewModel | null = null;
 
-  present(presets: LeagueScoringPresetDTO[]): LeagueScoringPresetsViewModel {
+  reset(): void {
+    this.viewModel = null;
+  }
+
+  present(dto: LeagueScoringPresetsResultDTO): void {
+    const { presets } = dto;
+
     this.viewModel = {
       presets,
       totalCount: presets.length,
     };
-
-    return this.viewModel;
   }
 
   getViewModel(): LeagueScoringPresetsViewModel {

apps/website/lib/presenters/LeagueStandingsPresenter.ts

@@ -1,38 +1,44 @@
-import type { Standing } from '@gridpilot/racing/domain/entities/Standing';
 import type {
   ILeagueStandingsPresenter,
-  StandingItemViewModel,
+  LeagueStandingsResultDTO,
   LeagueStandingsViewModel,
+  StandingItemViewModel,
 } from '@gridpilot/racing/application/presenters/ILeagueStandingsPresenter';
 
 export class LeagueStandingsPresenter implements ILeagueStandingsPresenter {
   private viewModel: LeagueStandingsViewModel | null = null;
 
-  present(standings: Standing[]): LeagueStandingsViewModel {
-    const standingItems: StandingItemViewModel[] = standings.map((standing) => ({
-      id: standing.id,
-      leagueId: standing.leagueId,
-      seasonId: standing.seasonId,
-      driverId: standing.driverId,
-      position: standing.position,
-      points: standing.points,
-      wins: standing.wins,
-      podiums: standing.podiums,
-      racesCompleted: standing.racesCompleted,
-    }));
-
-    this.viewModel = {
-      leagueId: standings[0]?.leagueId ?? '',
-      standings: standingItems,
-    };
-
-    return this.viewModel;
+  reset(): void {
+    this.viewModel = null;
   }
 
-  getViewModel(): LeagueStandingsViewModel {
-    if (!this.viewModel) {
-      throw new Error('Presenter has not been called yet');
-    }
+  present(dto: LeagueStandingsResultDTO): void {
+    const standingItems: StandingItemViewModel[] = dto.standings.map((standing) => {
+      const raw = standing as unknown as {
+        seasonId?: string;
+        podiums?: number;
+      };
+
+      return {
+        id: standing.id,
+        leagueId: standing.leagueId,
+        seasonId: raw.seasonId ?? '',
+        driverId: standing.driverId,
+        position: standing.position,
+        points: standing.points,
+        wins: standing.wins,
+        podiums: raw.podiums ?? 0,
+        racesCompleted: standing.racesCompleted,
+      };
+    });
+
+    this.viewModel = {
+      leagueId: dto.standings[0]?.leagueId ?? '',
+      standings: standingItems,
+    };
+  }
+
+  getViewModel(): LeagueStandingsViewModel | null {
     return this.viewModel;
   }
 }

apps/website/lib/presenters/PendingSponsorshipRequestsPresenter.ts

@@ -1,14 +1,21 @@
-import type { IPendingSponsorshipRequestsPresenter } from '@racing/application/presenters/IPendingSponsorshipRequestsPresenter';
-import type { GetPendingSponsorshipRequestsResultDTO } from '@racing/application/use-cases/GetPendingSponsorshipRequestsUseCase';
+import type {
+  IPendingSponsorshipRequestsPresenter,
+  PendingSponsorshipRequestsViewModel,
+} from '@gridpilot/racing/application/presenters/IPendingSponsorshipRequestsPresenter';
+import type { GetPendingSponsorshipRequestsResultDTO } from '@gridpilot/racing/application/use-cases/GetPendingSponsorshipRequestsUseCase';
 
 export class PendingSponsorshipRequestsPresenter implements IPendingSponsorshipRequestsPresenter {
-  private data: GetPendingSponsorshipRequestsResultDTO | null = null;
+  private viewModel: PendingSponsorshipRequestsViewModel | null = null;
+
+  reset(): void {
+    this.viewModel = null;
+  }
 
   present(data: GetPendingSponsorshipRequestsResultDTO): void {
-    this.data = data;
+    this.viewModel = data;
   }
 
-  getData(): GetPendingSponsorshipRequestsResultDTO | null {
-    return this.data;
+  getViewModel(): PendingSponsorshipRequestsViewModel | null {
+    return this.viewModel;
   }
 }

apps/website/lib/presenters/RacePenaltiesPresenter.ts

@@ -1,60 +1,55 @@
 import type {
   IRacePenaltiesPresenter,
   RacePenaltyViewModel,
+  RacePenaltiesResultDTO,
   RacePenaltiesViewModel,
 } from '@gridpilot/racing/application/presenters/IRacePenaltiesPresenter';
-import type { PenaltyType, PenaltyStatus } from '@gridpilot/racing/domain/entities/Penalty';
 
 export class RacePenaltiesPresenter implements IRacePenaltiesPresenter {
   private viewModel: RacePenaltiesViewModel | null = null;
 
-  present(
-    penalties: Array<{
-      id: string;
-      raceId: string;
-      driverId: string;
-      type: PenaltyType;
-      value?: number;
-      reason: string;
-      protestId?: string;
-      issuedBy: string;
-      status: PenaltyStatus;
-      issuedAt: Date;
-      appliedAt?: Date;
-      notes?: string;
-      getDescription(): string;
-    }>,
-    driverMap: Map<string, string>
-  ): RacePenaltiesViewModel {
-    const penaltyViewModels: RacePenaltyViewModel[] = penalties.map(penalty => ({
-      id: penalty.id,
-      raceId: penalty.raceId,
-      driverId: penalty.driverId,
-      driverName: driverMap.get(penalty.driverId) || 'Unknown',
-      type: penalty.type,
-      value: penalty.value,
-      reason: penalty.reason,
-      protestId: penalty.protestId,
-      issuedBy: penalty.issuedBy,
-      issuedByName: driverMap.get(penalty.issuedBy) || 'Unknown',
-      status: penalty.status,
-      description: penalty.getDescription(),
-      issuedAt: penalty.issuedAt.toISOString(),
-      appliedAt: penalty.appliedAt?.toISOString(),
-      notes: penalty.notes,
-    }));
+  reset(): void {
+    this.viewModel = null;
+  }
+
+  present(dto: RacePenaltiesResultDTO): void {
+    const { penalties, driverMap } = dto;
+
+    const penaltyViewModels: RacePenaltyViewModel[] = penalties.map((penalty) => {
+      const value = typeof penalty.value === 'number' ? penalty.value : 0;
+      const protestId = penalty.protestId;
+      const appliedAt = penalty.appliedAt ? penalty.appliedAt.toISOString() : undefined;
+      const notes = penalty.notes;
+
+      const base: RacePenaltyViewModel = {
+        id: penalty.id,
+        raceId: penalty.raceId,
+        driverId: penalty.driverId,
+        driverName: driverMap.get(penalty.driverId) || 'Unknown',
+        type: penalty.type,
+        value,
+        reason: penalty.reason,
+        issuedBy: penalty.issuedBy,
+        issuedByName: driverMap.get(penalty.issuedBy) || 'Unknown',
+        status: penalty.status,
+        description: penalty.getDescription(),
+        issuedAt: penalty.issuedAt.toISOString(),
+      };
+
+      return {
+        ...base,
+        ...(protestId ? { protestId } : {}),
+        ...(appliedAt ? { appliedAt } : {}),
+        ...(typeof notes === 'string' && notes.length > 0 ? { notes } : {}),
+      };
+    });
 
     this.viewModel = {
       penalties: penaltyViewModels,
     };
-
-    return this.viewModel;
   }
 
-  getViewModel(): RacePenaltiesViewModel {
-    if (!this.viewModel) {
-      throw new Error('Presenter has not been called yet');
-    }
+  getViewModel(): RacePenaltiesViewModel | null {
     return this.viewModel;
   }
 }

apps/website/lib/presenters/RaceProtestsPresenter.ts

@@ -1,59 +1,60 @@
 import type {
   IRaceProtestsPresenter,
   RaceProtestViewModel,
+  RaceProtestsResultDTO,
   RaceProtestsViewModel,
 } from '@gridpilot/racing/application/presenters/IRaceProtestsPresenter';
-import type { ProtestStatus, ProtestIncident } from '@gridpilot/racing/domain/entities/Protest';
 
 export class RaceProtestsPresenter implements IRaceProtestsPresenter {
   private viewModel: RaceProtestsViewModel | null = null;
 
-  present(
-    protests: Array<{
-      id: string;
-      raceId: string;
-      protestingDriverId: string;
-      accusedDriverId: string;
-      incident: ProtestIncident;
-      comment?: string;
-      proofVideoUrl?: string;
-      status: ProtestStatus;
-      reviewedBy?: string;
-      decisionNotes?: string;
-      filedAt: Date;
-      reviewedAt?: Date;
-    }>,
-    driverMap: Map<string, string>
-  ): RaceProtestsViewModel {
-    const protestViewModels: RaceProtestViewModel[] = protests.map(protest => ({
-      id: protest.id,
-      raceId: protest.raceId,
-      protestingDriverId: protest.protestingDriverId,
-      protestingDriverName: driverMap.get(protest.protestingDriverId) || 'Unknown',
-      accusedDriverId: protest.accusedDriverId,
-      accusedDriverName: driverMap.get(protest.accusedDriverId) || 'Unknown',
-      incident: protest.incident,
-      comment: protest.comment,
-      proofVideoUrl: protest.proofVideoUrl,
-      status: protest.status,
-      reviewedBy: protest.reviewedBy,
-      reviewedByName: protest.reviewedBy ? driverMap.get(protest.reviewedBy) : undefined,
-      decisionNotes: protest.decisionNotes,
-      filedAt: protest.filedAt.toISOString(),
-      reviewedAt: protest.reviewedAt?.toISOString(),
-    }));
+  reset(): void {
+    this.viewModel = null;
+  }
+
+  present(dto: RaceProtestsResultDTO): void {
+    const { protests, driverMap } = dto;
+
+    const protestViewModels: RaceProtestViewModel[] = protests.map((protest) => {
+      const base: RaceProtestViewModel = {
+        id: protest.id,
+        raceId: protest.raceId,
+        protestingDriverId: protest.protestingDriverId,
+        protestingDriverName: driverMap.get(protest.protestingDriverId) || 'Unknown',
+        accusedDriverId: protest.accusedDriverId,
+        accusedDriverName: driverMap.get(protest.accusedDriverId) || 'Unknown',
+        incident: protest.incident,
+        filedAt: protest.filedAt.toISOString(),
+        status: protest.status,
+      };
+
+      const comment = protest.comment;
+      const proofVideoUrl = protest.proofVideoUrl;
+      const reviewedBy = protest.reviewedBy;
+      const reviewedByName =
+        protest.reviewedBy !== undefined
+          ? driverMap.get(protest.reviewedBy) ?? 'Unknown'
+          : undefined;
+      const decisionNotes = protest.decisionNotes;
+      const reviewedAt = protest.reviewedAt?.toISOString();
+
+      return {
+        ...base,
+        ...(comment !== undefined ? { comment } : {}),
+        ...(proofVideoUrl !== undefined ? { proofVideoUrl } : {}),
+        ...(reviewedBy !== undefined ? { reviewedBy } : {}),
+        ...(reviewedByName !== undefined ? { reviewedByName } : {}),
+        ...(decisionNotes !== undefined ? { decisionNotes } : {}),
+        ...(reviewedAt !== undefined ? { reviewedAt } : {}),
+      };
+    });
 
     this.viewModel = {
       protests: protestViewModels,
     };
-
-    return this.viewModel;
   }
 
-  getViewModel(): RaceProtestsViewModel {
-    if (!this.viewModel) {
-      throw new Error('Presenter has not been called yet');
-    }
+  getViewModel(): RaceProtestsViewModel | null {
     return this.viewModel;
   }
 }

apps/website/lib/presenters/RacesPagePresenter.ts

@@ -4,26 +4,59 @@ import type {
   RaceListItemViewModel,
 } from '@gridpilot/racing/application/presenters/IRacesPagePresenter';
 
+interface RacesPageInput {
+  id: string;
+  track: string;
+  car: string;
+  scheduledAt: string | Date;
+  status: string;
+  leagueId: string;
+  leagueName: string;
+  strengthOfField: number | null;
+  isUpcoming: boolean;
+  isLive: boolean;
+  isPast: boolean;
+}
+
 export class RacesPagePresenter implements IRacesPagePresenter {
   private viewModel: RacesPageViewModel | null = null;
 
-  present(races: any[]): void {
+  present(races: RacesPageInput[]): void {
     const now = new Date();
     const nextWeek = new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000);
 
-    const raceViewModels: RaceListItemViewModel[] = races.map(race => ({
-      id: race.id,
-      track: race.track,
-      car: race.car,
-      scheduledAt: race.scheduledAt,
-      status: race.status,
-      leagueId: race.leagueId,
-      leagueName: race.leagueName,
-      strengthOfField: race.strengthOfField,
-      isUpcoming: race.isUpcoming,
-      isLive: race.isLive,
-      isPast: race.isPast,
-    }));
+    const raceViewModels: RaceListItemViewModel[] = races.map((race) => {
+      const scheduledAt =
+        typeof race.scheduledAt === 'string'
+          ? race.scheduledAt
+          : race.scheduledAt.toISOString();
+
+      const allowedStatuses: RaceListItemViewModel['status'][] = [
+        'scheduled',
+        'running',
+        'completed',
+        'cancelled',
+      ];
+
+      const status: RaceListItemViewModel['status'] =
+        allowedStatuses.includes(race.status as RaceListItemViewModel['status'])
+          ? (race.status as RaceListItemViewModel['status'])
+          : 'scheduled';
+
+      return {
+        id: race.id,
+        track: race.track,
+        car: race.car,
+        scheduledAt,
+        status,
+        leagueId: race.leagueId,
+        leagueName: race.leagueName,
+        strengthOfField: race.strengthOfField,
+        isUpcoming: race.isUpcoming,
+        isLive: race.isLive,
+        isPast: race.isPast,
+      };
+    });
 
     const stats = {
       total: raceViewModels.length,

apps/website/lib/presenters/SponsorDashboardPresenter.ts

@@ -1,5 +1,5 @@
-import type { ISponsorDashboardPresenter } from '@racing/application/presenters/ISponsorDashboardPresenter';
-import type { SponsorDashboardDTO } from '@racing/application/use-cases/GetSponsorDashboardUseCase';
+import type { ISponsorDashboardPresenter } from '@gridpilot/racing/application/presenters/ISponsorDashboardPresenter';
+import type { SponsorDashboardDTO } from '@gridpilot/racing/application/use-cases/GetSponsorDashboardUseCase';
 
 export class SponsorDashboardPresenter implements ISponsorDashboardPresenter {
   private data: SponsorDashboardDTO | null = null;

apps/website/lib/presenters/SponsorSponsorshipsPresenter.ts

@@ -1,5 +1,5 @@
-import type { ISponsorSponsorshipsPresenter } from '@racing/application/presenters/ISponsorSponsorshipsPresenter';
-import type { SponsorSponsorshipsDTO } from '@racing/application/use-cases/GetSponsorSponsorshipsUseCase';
+import type { ISponsorSponsorshipsPresenter } from '@gridpilot/racing/application/presenters/ISponsorSponsorshipsPresenter';
+import type { SponsorSponsorshipsDTO } from '@gridpilot/racing/application/use-cases/GetSponsorSponsorshipsUseCase';
 
 export class SponsorSponsorshipsPresenter implements ISponsorSponsorshipsPresenter {
   private data: SponsorSponsorshipsDTO | null = null;

apps/website/lib/presenters/TeamAdminPresenter.ts

@@ -1,4 +1,3 @@
-import type { Team, TeamJoinRequest } from '@gridpilot/racing';
 import type { DriverDTO } from '@gridpilot/racing/application/dto/DriverDTO';
 import { EntityMappers } from '@gridpilot/racing/application/mappers/EntityMappers';
 import {
@@ -34,7 +33,9 @@ export interface TeamAdminViewModel {
 /**
  * Load join requests plus driver DTOs for a team.
  */
-export async function loadTeamAdminViewModel(team: Team): Promise<TeamAdminViewModel> {
+export async function loadTeamAdminViewModel(
+  team: TeamAdminTeamSummaryViewModel,
+): Promise<TeamAdminViewModel> {
   const requests = await loadTeamJoinRequests(team.id);
   return {
     team: {
@@ -48,10 +49,18 @@ export async function loadTeamAdminViewModel(team: Team): Promise<TeamAdminViewM
   };
 }
 
-export async function loadTeamJoinRequests(teamId: string): Promise<TeamAdminJoinRequestViewModel[]> {
+export async function loadTeamJoinRequests(
+  teamId: string,
+): Promise<TeamAdminJoinRequestViewModel[]> {
   const getRequestsUseCase = getGetTeamJoinRequestsUseCase();
-  await getRequestsUseCase.execute({ teamId });
-  const presenterVm = getRequestsUseCase.presenter.getViewModel();
+  const presenter = new (await import('./TeamJoinRequestsPresenter')).TeamJoinRequestsPresenter();
+
+  await getRequestsUseCase.execute({ teamId }, presenter);
+
+  const presenterVm = presenter.getViewModel();
+  if (!presenterVm) {
+    return [];
+  }
 
   const driverRepo = getDriverRepository();
   const allDrivers = await driverRepo.findAll();
@@ -64,14 +73,29 @@ export async function loadTeamJoinRequests(teamId: string): Promise<TeamAdminJoi
     }
   }
 
-  return presenterVm.requests.map((req) => ({
-    id: req.requestId,
-    teamId: req.teamId,
-    driverId: req.driverId,
-    requestedAt: new Date(req.requestedAt),
-    message: req.message,
-    driver: driversById[req.driverId],
-  }));
+  return presenterVm.requests.map((req: {
+    requestId: string;
+    teamId: string;
+    driverId: string;
+    requestedAt: string;
+    message?: string;
+  }): TeamAdminJoinRequestViewModel => {
+    const base: TeamAdminJoinRequestViewModel = {
+      id: req.requestId,
+      teamId: req.teamId,
+      driverId: req.driverId,
+      requestedAt: new Date(req.requestedAt),
+    };
+
+    const message = req.message;
+    const driver = driversById[req.driverId];
+
+    return {
+      ...base,
+      ...(message !== undefined ? { message } : {}),
+      ...(driver !== undefined ? { driver } : {}),
+    };
+  });
 }
 
 /**

apps/website/lib/presenters/TeamDetailsPresenter.ts

@@ -1,4 +1,5 @@
-import type { Team, TeamMembership } from '@gridpilot/racing/domain/entities/Team';
+import type { Team } from '@gridpilot/racing/domain/entities/Team';
+import type { TeamMembership } from '@gridpilot/racing/domain/types/TeamMembership';
 import type {
   ITeamDetailsPresenter,
   TeamDetailsViewModel,
@@ -14,7 +15,7 @@ export class TeamDetailsPresenter implements ITeamDetailsPresenter {
   ): TeamDetailsViewModel {
     const canManage = membership?.role === 'owner' || membership?.role === 'manager';
 
-    this.viewModel = {
+    const viewModel: TeamDetailsViewModel = {
       team: {
         id: team.id,
         name: team.name,
@@ -22,21 +23,20 @@ export class TeamDetailsPresenter implements ITeamDetailsPresenter {
         description: team.description,
         ownerId: team.ownerId,
         leagues: team.leagues,
-        specialization: team.specialization as 'endurance' | 'sprint' | 'mixed' | undefined,
-        region: team.region,
-        languages: team.languages,
       },
       membership: membership
         ? {
-            role: membership.role,
+            role: membership.role === 'driver' ? 'member' : membership.role,
             joinedAt: membership.joinedAt.toISOString(),
-            isActive: membership.isActive,
+            isActive: membership.status === 'active',
           }
         : null,
       canManage,
     };
 
-    return this.viewModel;
+    this.viewModel = viewModel;
+
+    return viewModel;
   }
 
   getViewModel(): TeamDetailsViewModel {

apps/website/lib/presenters/TeamJoinRequestsPresenter.ts

@@ -1,26 +1,26 @@
-import type { TeamJoinRequest } from '@gridpilot/racing/domain/entities/Team';
 import type {
   ITeamJoinRequestsPresenter,
   TeamJoinRequestViewModel,
   TeamJoinRequestsViewModel,
+  TeamJoinRequestsResultDTO,
 } from '@gridpilot/racing/application/presenters/ITeamJoinRequestsPresenter';
 
 export class TeamJoinRequestsPresenter implements ITeamJoinRequestsPresenter {
   private viewModel: TeamJoinRequestsViewModel | null = null;
 
-  present(
-    requests: TeamJoinRequest[],
-    driverNames: Record<string, string>,
-    avatarUrls: Record<string, string>
-  ): TeamJoinRequestsViewModel {
-    const requestItems: TeamJoinRequestViewModel[] = requests.map((request) => ({
+  reset(): void {
+    this.viewModel = null;
+  }
+
+  present(input: TeamJoinRequestsResultDTO): void {
+    const requestItems: TeamJoinRequestViewModel[] = input.requests.map((request) => ({
       requestId: request.id,
       driverId: request.driverId,
-      driverName: driverNames[request.driverId] ?? 'Unknown Driver',
+      driverName: input.driverNames[request.driverId] ?? 'Unknown Driver',
       teamId: request.teamId,
-      status: request.status,
+      status: 'pending',
       requestedAt: request.requestedAt.toISOString(),
-      avatarUrl: avatarUrls[request.driverId] ?? '',
+      avatarUrl: input.avatarUrls[request.driverId] ?? '',
     }));
 
     const pendingCount = requestItems.filter((r) => r.status === 'pending').length;
@@ -30,14 +30,9 @@ export class TeamJoinRequestsPresenter implements ITeamJoinRequestsPresenter {
       pendingCount,
       totalCount: requestItems.length,
     };
-
-    return this.viewModel;
   }
 
-  getViewModel(): TeamJoinRequestsViewModel {
-    if (!this.viewModel) {
-      throw new Error('Presenter has not been called yet');
-    }
+  getViewModel(): TeamJoinRequestsViewModel | null {
     return this.viewModel;
   }
 }

apps/website/lib/presenters/TeamMembersPresenter.ts

@@ -1,25 +1,25 @@
-import type { TeamMembership } from '@gridpilot/racing/domain/entities/Team';
 import type {
   ITeamMembersPresenter,
   TeamMemberViewModel,
   TeamMembersViewModel,
+  TeamMembersResultDTO,
 } from '@gridpilot/racing/application/presenters/ITeamMembersPresenter';
 
 export class TeamMembersPresenter implements ITeamMembersPresenter {
   private viewModel: TeamMembersViewModel | null = null;
 
-  present(
-    memberships: TeamMembership[],
-    driverNames: Record<string, string>,
-    avatarUrls: Record<string, string>
-  ): TeamMembersViewModel {
-    const members: TeamMemberViewModel[] = memberships.map((membership) => ({
+  reset(): void {
+    this.viewModel = null;
+  }
+
+  present(input: TeamMembersResultDTO): void {
+    const members: TeamMemberViewModel[] = input.memberships.map((membership) => ({
       driverId: membership.driverId,
-      driverName: driverNames[membership.driverId] ?? 'Unknown Driver',
-      role: membership.role,
+      driverName: input.driverNames[membership.driverId] ?? 'Unknown Driver',
+      role: membership.role === 'driver' ? 'member' : membership.role,
       joinedAt: membership.joinedAt.toISOString(),
-      isActive: membership.isActive,
-      avatarUrl: avatarUrls[membership.driverId] ?? '',
+      isActive: membership.status === 'active',
+      avatarUrl: input.avatarUrls[membership.driverId] ?? '',
     }));
 
     const ownerCount = members.filter((m) => m.role === 'owner').length;
@@ -33,14 +33,9 @@ export class TeamMembersPresenter implements ITeamMembersPresenter {
       managerCount,
       memberCount,
     };
-
-    return this.viewModel;
   }
 
-  getViewModel(): TeamMembersViewModel {
-    if (!this.viewModel) {
-      throw new Error('Presenter has not been called yet');
-    }
+  getViewModel(): TeamMembersViewModel | null {
     return this.viewModel;
   }
 }

apps/website/lib/presenters/TeamRosterPresenter.ts

@@ -1,4 +1,4 @@
-import type { TeamMembership, TeamRole } from '@gridpilot/racing';
+import type { TeamMembership, TeamRole } from '@gridpilot/racing/domain/types/TeamMembership';
 import type { DriverDTO } from '@gridpilot/racing/application/dto/DriverDTO';
 import { EntityMappers } from '@gridpilot/racing/application/mappers/EntityMappers';
 import { getDriverRepository, getDriverStats } from '@/lib/di-container';

apps/website/lib/presenters/TeamsLeaderboardPresenter.ts

@@ -3,12 +3,36 @@ import type {
   TeamsLeaderboardViewModel,
   TeamLeaderboardItemViewModel,
   SkillLevel,
+  TeamsLeaderboardResultDTO,
 } from '@gridpilot/racing/application/presenters/ITeamsLeaderboardPresenter';
 
+interface TeamLeaderboardInput {
+  id: string;
+  name: string;
+  memberCount: number;
+  rating: number | null;
+  totalWins: number;
+  totalRaces: number;
+  performanceLevel: SkillLevel;
+  isRecruiting: boolean;
+  createdAt: Date;
+  description?: string | null;
+  specialization?: string | null;
+  region?: string | null;
+  languages?: string[];
+}
+
 export class TeamsLeaderboardPresenter implements ITeamsLeaderboardPresenter {
   private viewModel: TeamsLeaderboardViewModel | null = null;
 
-  present(teams: any[], recruitingCount: number): void {
+  reset(): void {
+    this.viewModel = null;
+  }
+
+  present(input: TeamsLeaderboardResultDTO): void {
+    const teams = (input.teams ?? []) as TeamLeaderboardInput[];
+    const recruitingCount = input.recruitingCount ?? 0;
+
     const transformedTeams = teams.map((team) => this.transformTeam(team));
 
     const groupsBySkillLevel = transformedTeams.reduce<Record<SkillLevel, TeamLeaderboardItemViewModel[]>>(
@@ -41,14 +65,22 @@ export class TeamsLeaderboardPresenter implements ITeamsLeaderboardPresenter {
     };
   }
 
-  getViewModel(): TeamsLeaderboardViewModel {
-    if (!this.viewModel) {
-      throw new Error('ViewModel not yet generated. Call present() first.');
-    }
+  getViewModel(): TeamsLeaderboardViewModel | null {
     return this.viewModel;
   }
 
-  private transformTeam(team: any): TeamLeaderboardItemViewModel {
+  private transformTeam(team: TeamLeaderboardInput): TeamLeaderboardItemViewModel {
+    let specialization: TeamLeaderboardItemViewModel['specialization'];
+    if (
+      team.specialization === 'endurance' ||
+      team.specialization === 'sprint' ||
+      team.specialization === 'mixed'
+    ) {
+      specialization = team.specialization;
+    } else {
+      specialization = undefined;
+    }
+
     return {
       id: team.id,
       name: team.name,
@@ -56,13 +88,13 @@ export class TeamsLeaderboardPresenter implements ITeamsLeaderboardPresenter {
       rating: team.rating,
       totalWins: team.totalWins,
       totalRaces: team.totalRaces,
-      performanceLevel: team.performanceLevel as SkillLevel,
+      performanceLevel: team.performanceLevel,
       isRecruiting: team.isRecruiting,
       createdAt: team.createdAt,
-      description: team.description,
-      specialization: team.specialization,
-      region: team.region,
-      languages: team.languages,
+      description: team.description ?? '',
+      specialization: specialization ?? 'mixed',
+      region: team.region ?? '',
+      languages: team.languages ?? [],
     };
   }
 }