blockers

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

@@ -1,12 +1,12 @@
 'use client';
 
-import React, { useState, useEffect } from 'react';
-import { useParams, usePathname, useRouter } from 'next/navigation';
 import Breadcrumbs from '@/components/layout/Breadcrumbs';
 import LeagueHeader from '@/components/leagues/LeagueHeader';
-import { useEffectiveDriverId } from '@/lib/currentDriver';
+import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
 import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles';
 import type { League } from '@core/racing/domain/entities/League';
+import { useParams, usePathname, useRouter } from 'next/navigation';
+import React, { useEffect, useState } from 'react';
 
 // Main sponsor info for "by XYZ" display
 interface MainSponsorInfo {

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

@@ -1,33 +1,32 @@
 'use client';
 
-import { useState, useEffect, useMemo } from 'react';
-import { useRouter, useParams } from 'next/navigation';
-import Button from '@/components/ui/Button';
-import Card from '@/components/ui/Card';
+import DriverIdentity from '@/components/drivers/DriverIdentity';
+import EndRaceModal from '@/components/leagues/EndRaceModal';
 import JoinLeagueButton from '@/components/leagues/JoinLeagueButton';
 import LeagueActivityFeed from '@/components/leagues/LeagueActivityFeed';
-import EndRaceModal from '@/components/leagues/EndRaceModal';
-import DriverIdentity from '@/components/drivers/DriverIdentity';
-import DriverSummaryPill from '@/components/profile/DriverSummaryPill';
 import SponsorInsightsCard, {
-  useSponsorMode,
   MetricBuilders,
   SlotTemplates,
+  useSponsorMode,
   type SponsorMetric,
 } from '@/components/sponsors/SponsorInsightsCard';
+import Button from '@/components/ui/Button';
+import Card from '@/components/ui/Card';
+import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
+import { getLeagueMembers, getMembership } from '@/lib/leagueMembership';
+import { getLeagueRoleDisplay } from '@/lib/leagueRoles';
+import { LeagueScoringConfigPresenter } from '@/lib/presenters/LeagueScoringConfigPresenter';
 import {
-  League,
   Driver,
   EntityMappers,
+  League,
+  Race,
   type DriverDTO,
   type LeagueScoringConfigDTO,
-  Race,
 } from '@core/racing';
-import { LeagueScoringConfigPresenter } from '@/lib/presenters/LeagueScoringConfigPresenter';
-import { Trophy, Star, ExternalLink, Calendar, Users } from 'lucide-react';
-import { getMembership, getLeagueMembers } from '@/lib/leagueMembership';
-import { useEffectiveDriverId } from '@/lib/currentDriver';
-import { getLeagueRoleDisplay } from '@/lib/leagueRoles';
+import { Calendar, ExternalLink, Star, Trophy, Users } from 'lucide-react';
+import { useParams, useRouter } from 'next/navigation';
+import { useEffect, useMemo, useState } from 'react';
 
 // Sponsor info type
 interface SponsorInfo {

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

@@ -1,13 +1,11 @@
 'use client';
 
-import { useParams } from 'next/navigation';
-import Card from '@/components/ui/Card';
 import LeagueSchedule from '@/components/leagues/LeagueSchedule';
-import ScheduleRaceForm from '@/components/leagues/ScheduleRaceForm';
-import { useState, useEffect } from 'react';
-import { useRouter } from 'next/navigation';
-import { useEffectiveDriverId } from '@/lib/currentDriver';
+import Card from '@/components/ui/Card';
+import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
 import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles';
+import { useParams, useRouter } from 'next/navigation';
+import { useEffect, useState } from 'react';
 
 export default function LeagueSchedulePage() {
   const params = useParams();

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

@@ -1,23 +1,21 @@
 'use client';
 
-import { useState, useEffect, useMemo } from 'react';
-import { useParams, useRouter } from 'next/navigation';
-import Card from '@/components/ui/Card';
+import { ReadonlyLeagueInfo } from '@/components/leagues/ReadonlyLeagueInfo';
+import DriverSummaryPill from '@/components/profile/DriverSummaryPill';
 import Button from '@/components/ui/Button';
+import Card from '@/components/ui/Card';
+import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
+import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles';
 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';
-import { LeagueDropSection } from '@/components/leagues/LeagueDropSection';
-import { ReadonlyLeagueInfo } from '@/components/leagues/ReadonlyLeagueInfo';
 import type { LeagueConfigFormModel } from '@core/racing/application';
-import type { League } from '@core/racing/domain/entities/League';
 import type { DriverDTO } from '@core/racing/application/dto/DriverDTO';
-import type { LeagueScoringPresetDTO } from '@core/racing/application/ports/LeagueScoringPresetProvider';
 import { EntityMappers } from '@core/racing/application/mappers/EntityMappers';
-import DriverSummaryPill from '@/components/profile/DriverSummaryPill';
-import { AlertTriangle, Settings, Trophy, Calendar, TrendingDown, Edit, Users, UserCog } from 'lucide-react';
+import type { LeagueScoringPresetDTO } from '@core/racing/application/ports/LeagueScoringPresetProvider';
+import type { League } from '@core/racing/domain/entities/League';
+import { AlertTriangle, Settings, UserCog } from 'lucide-react';
+import { useParams, useRouter } from 'next/navigation';
+import { useEffect, useMemo, useState } from 'react';
 
 export default function LeagueSettingsPage() {
   const params = useParams();

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

@@ -1,14 +1,13 @@
 'use client';
 
-import { useState, useEffect } from 'react';
-import { useParams } from 'next/navigation';
-import Card from '@/components/ui/Card';
-import Button from '@/components/ui/Button';
 import { LeagueSponsorshipsSection } from '@/components/leagues/LeagueSponsorshipsSection';
-import { useEffectiveDriverId } from '@/lib/currentDriver';
+import Card from '@/components/ui/Card';
+import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
 import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles';
-import { AlertTriangle, Building, DollarSign } from 'lucide-react';
 import type { League } from '@core/racing/domain/entities/League';
+import { AlertTriangle, Building } from 'lucide-react';
+import { useParams } from 'next/navigation';
+import { useEffect, useState } from 'react';
 
 export default function LeagueSponsorshipsPage() {
   const params = useParams();

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

@@ -1,16 +1,15 @@
 'use client';
 
-import { useState, useEffect, useCallback } from 'react';
-import { useParams } from 'next/navigation';
-import Card from '@/components/ui/Card';
 import StandingsTable from '@/components/leagues/StandingsTable';
-import { getLeagueStandings } from '@/lib/services/leagues/LeagueService';
-import { useEffectiveDriverId } from '@/lib/currentDriver';
+import Card from '@/components/ui/Card';
+import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
+import type { DriverDto, LeagueMembership } from '@/lib/dtos';
 import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles';
+import { getLeagueStandings } from '@/lib/services/leagues/LeagueService';
 import type { LeagueStandingsViewModel } from '@/lib/view-models';
 import type { StandingEntryViewModel } from '@/lib/view-models/StandingEntryViewModel';
-import type { DriverDto } from '@/lib/dtos';
-import type { LeagueMembership } from '@/lib/dtos';
+import { useParams } from 'next/navigation';
+import { useCallback, useEffect, useState } from 'react';
 
 export default function LeagueStandingsPage() {
   const params = useParams();

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

@@ -1,24 +1,32 @@
 'use client';
 
-import { useState, useEffect, useMemo } from 'react';
-import { useParams } from 'next/navigation';
-import Link from 'next/link';
-import Card from '@/components/ui/Card';
-import Button from '@/components/ui/Button';
-import { ReviewProtestModal } from '@/components/leagues/ReviewProtestModal';
-import QuickPenaltyModal from '@/components/leagues/QuickPenaltyModal';
 import PenaltyFAB from '@/components/leagues/PenaltyFAB';
-import { useEffectiveDriverId } from '@/lib/currentDriver';
+import QuickPenaltyModal from '@/components/leagues/QuickPenaltyModal';
+import { ReviewProtestModal } from '@/components/leagues/ReviewProtestModal';
+import Button from '@/components/ui/Button';
+import Card from '@/components/ui/Card';
+import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
 import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles';
-import type { Protest } from '@core/racing/domain/entities/Protest';
-import type { Race } from '@core/racing/domain/entities/Race';
-import type { Penalty, PenaltyType } from '@core/racing/domain/entities/Penalty';
 import type { DriverDTO } from '@core/racing/application/dto/DriverDTO';
 import { EntityMappers } from '@core/racing/application/mappers/EntityMappers';
+import type { Penalty, PenaltyType } from '@core/racing/domain/entities/Penalty';
+import type { Protest } from '@core/racing/domain/entities/Protest';
+import type { Race } from '@core/racing/domain/entities/Race';
 import {
-  AlertTriangle, Clock, CheckCircle, Flag, ChevronRight,
-  Calendar, MapPin, AlertCircle, Video, Gavel
+  AlertCircle,
+  AlertTriangle,
+  Calendar,
+  CheckCircle,
+  ChevronRight,
+  Clock,
+  Flag,
+  Gavel,
+  MapPin,
+  Video
 } from 'lucide-react';
+import Link from 'next/link';
+import { useParams } from 'next/navigation';
+import { useEffect, useMemo, useState } from 'react';
 
 interface RaceWithProtests {
   race: Race;

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

@@ -1,42 +1,39 @@
 'use client';
 
-import { useState, useEffect, useMemo } from 'react';
-import { useParams, useRouter } from 'next/navigation';
-import Link from 'next/link';
-import Card from '@/components/ui/Card';
 import Button from '@/components/ui/Button';
-import { useEffectiveDriverId } from '@/lib/currentDriver';
+import Card from '@/components/ui/Card';
+import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
 import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles';
+import type { DriverDTO } from '@core/racing/application/dto/DriverDTO';
+import { EntityMappers } from '@core/racing/application/mappers/EntityMappers';
+import type { PenaltyType } from '@core/racing/domain/entities/Penalty';
 import type { Protest } from '@core/racing/domain/entities/Protest';
 import type { Race } from '@core/racing/domain/entities/Race';
-import type { DriverDTO } from '@core/racing/application/dto/DriverDTO';
-import type { PenaltyType } from '@core/racing/domain/entities/Penalty';
-import { EntityMappers } from '@core/racing/application/mappers/EntityMappers';
 import {
   AlertCircle,
-  Video,
-  Clock,
-  Grid3x3,
-  TrendingDown,
-  XCircle,
-  CheckCircle,
-  ArrowLeft,
-  Flag,
   AlertTriangle,
-  ShieldAlert,
-  Ban,
-  DollarSign,
-  FileWarning,
-  User,
+  ArrowLeft,
   Calendar,
+  CheckCircle,
+  ChevronDown,
+  Clock,
+  ExternalLink,
+  Flag,
+  Gavel,
+  Grid3x3,
   MapPin,
   MessageCircle,
-  Shield,
-  Gavel,
   Send,
-  ChevronDown,
-  ExternalLink
+  Shield,
+  ShieldAlert,
+  TrendingDown,
+  User,
+  Video,
+  XCircle
 } from 'lucide-react';
+import Link from 'next/link';
+import { useParams, useRouter } from 'next/navigation';
+import { useEffect, useMemo, useState } from 'react';
 
 // Timeline event types
 interface TimelineEvent {