diff --git a/backend/src/app.module.ts b/backend/src/app.module.ts
index d51f92ab..54c12693 100644
--- a/backend/src/app.module.ts
+++ b/backend/src/app.module.ts
@@ -3,8 +3,8 @@ import { APP_GUARD, APP_INTERCEPTOR } from '@nestjs/core';
 import { ConfigModule, ConfigService } from '@nestjs/config';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { EventEmitterModule } from '@nestjs/event-emitter';
-import { APP_GUARD, APP_INTERCEPTOR } from '@nestjs/core';
 import { ThrottlerGuard, ThrottlerModule } from '@nestjs/throttler';
+import { ThrottlerStorageRedisService } from '@nest-lab/throttler-storage-redis';
 
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
@@ -45,6 +45,7 @@ import { TransparencyModule } from './transparency/transparency.module';
 import { UserActivityModule } from './user-activity/user-activity.module';
 import { ActivityLoggingInterceptor } from './user-activity/interceptors/activity-logging.interceptor';
 import { UsersModule } from './users/users.module';
+import { ReportingModule } from './reporting/reporting.module';
 
 @Module({
   imports: [
@@ -118,6 +119,7 @@ import { UsersModule } from './users/users.module';
     BatchImportModule,
     WorkflowModule,
     SurgeSimulationModule,
+    ReportingModule,
   ],
   controllers: [AppController],
   providers: [
diff --git a/backend/src/auth/enums/permission.enum.ts b/backend/src/auth/enums/permission.enum.ts
index 3ce55bcc..32b05403 100644
--- a/backend/src/auth/enums/permission.enum.ts
+++ b/backend/src/auth/enums/permission.enum.ts
@@ -69,4 +69,5 @@ export enum Permission {
   // ── Admin ─────────────────────────────────────────────────────────────
   ADMIN_ACCESS = 'admin:access',
   MANAGE_ROLES = 'manage:roles',
+  READ_ANALYTICS = 'read:analytics',
 }
diff --git a/backend/src/orders/entities/order.entity.ts b/backend/src/orders/entities/order.entity.ts
index 5a7d3793..e106f21f 100644
--- a/backend/src/orders/entities/order.entity.ts
+++ b/backend/src/orders/entities/order.entity.ts
@@ -5,11 +5,16 @@ import {
   CreateDateColumn,
   UpdateDateColumn,
   VersionColumn,
+  Index,
 } from 'typeorm';
 
 import { OrderStatus } from '../enums/order-status.enum';
 
 @Entity('orders')
+@Index('IDX_ORDERS_HOSPITAL_ID', ['hospitalId'])
+@Index('IDX_ORDERS_BLOOD_BANK_ID', ['bloodBankId'])
+@Index('IDX_ORDERS_STATUS', ['status'])
+@Index('IDX_ORDERS_CREATED_AT', ['createdAt'])
 export class OrderEntity {
   @PrimaryGeneratedColumn('uuid')
   id: string;
diff --git a/backend/src/reporting/reporting.controller.ts b/backend/src/reporting/reporting.controller.ts
new file mode 100644
index 00000000..e78e6870
--- /dev/null
+++ b/backend/src/reporting/reporting.controller.ts
@@ -0,0 +1,50 @@
+import {
+  Controller,
+  Get,
+  Query,
+  Res,
+  HttpStatus,
+  UseGuards,
+  ValidationPipe,
+} from '@nestjs/common';
+import { Response } from 'express';
+import { ReportingService, ReportingFilterDto } from './reporting.service';
+import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
+import { PermissionsGuard } from '../auth/guards/permissions.guard';
+import { RequirePermissions } from '../auth/decorators/permissions.decorator';
+import { Permission } from '../auth/enums/permission.enum';
+
+@Controller('reporting')
+@UseGuards(JwtAuthGuard, PermissionsGuard)
+export class ReportingController {
+  constructor(private readonly reportingService: ReportingService) {}
+
+  @Get('search')
+  @RequirePermissions(Permission.READ_ANALYTICS)
+  async search(@Query(new ValidationPipe({ transform: true })) filters: ReportingFilterDto) {
+    return this.reportingService.search(filters);
+  }
+
+  @Get('summary')
+  @RequirePermissions(Permission.READ_ANALYTICS)
+  async getSummary(@Query(new ValidationPipe({ transform: true })) filters: ReportingFilterDto) {
+    return this.reportingService.getSummary(filters);
+  }
+
+  @Get('export')
+  @RequirePermissions(Permission.READ_ANALYTICS)
+  async export(
+    @Query(new ValidationPipe({ transform: true })) filters: ReportingFilterDto,
+    @Res() res: Response,
+  ) {
+    const buffer = await this.reportingService.exportToExcel(filters);
+    
+    res.set({
+      'Content-Type': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      'Content-Disposition': 'attachment; filename=report.xlsx',
+      'Content-Length': buffer.length,
+    });
+
+    res.status(HttpStatus.OK).send(buffer);
+  }
+}
diff --git a/backend/src/reporting/reporting.module.ts b/backend/src/reporting/reporting.module.ts
new file mode 100644
index 00000000..8e8615fa
--- /dev/null
+++ b/backend/src/reporting/reporting.module.ts
@@ -0,0 +1,27 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { ReportingController } from './reporting.controller';
+import { ReportingService } from './reporting.service';
+import { UserEntity } from '../users/entities/user.entity';
+import { BloodUnit } from '../blood-units/entities/blood-unit.entity';
+import { OrderEntity } from '../orders/entities/order.entity';
+import { DisputeEntity } from '../disputes/entities/dispute.entity';
+import { OrganizationEntity } from '../organizations/entities/organization.entity';
+import { BloodRequestEntity } from '../blood-requests/entities/blood-request.entity';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([
+      UserEntity,
+      BloodUnit,
+      OrderEntity,
+      DisputeEntity,
+      OrganizationEntity,
+      BloodRequestEntity,
+    ]),
+  ],
+  controllers: [ReportingController],
+  providers: [ReportingService],
+  exports: [ReportingService],
+})
+export class ReportingModule {}
diff --git a/backend/src/reporting/reporting.service.ts b/backend/src/reporting/reporting.service.ts
new file mode 100644
index 00000000..d4f4ce95
--- /dev/null
+++ b/backend/src/reporting/reporting.service.ts
@@ -0,0 +1,202 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository, SelectQueryBuilder, Between, In } from 'typeorm';
+import { UserEntity } from '../users/entities/user.entity';
+import { BloodUnit } from '../blood-units/entities/blood-unit.entity';
+import { OrderEntity } from '../orders/entities/order.entity';
+import { DisputeEntity } from '../disputes/entities/dispute.entity';
+import { OrganizationEntity } from '../organizations/entities/organization.entity';
+import { BloodRequestEntity } from '../blood-requests/entities/blood-request.entity';
+import * as ExcelJS from 'exceljs';
+
+export interface ReportingFilterDto {
+  startDate?: string;
+  endDate?: string;
+  statusGroups?: string[];
+  location?: string;
+  bloodType?: string;
+  domain?: 'donors' | 'units' | 'orders' | 'disputes' | 'organizations' | 'requests' | 'all';
+  limit?: number;
+  offset?: number;
+}
+
+@Injectable()
+export class ReportingService {
+  private readonly logger = new Logger(ReportingService.name);
+
+  constructor(
+    @InjectRepository(UserEntity)
+    private readonly userRepository: Repository<UserEntity>,
+    @InjectRepository(BloodUnit)
+    private readonly unitRepository: Repository<BloodUnit>,
+    @InjectRepository(OrderEntity)
+    private readonly orderRepository: Repository<OrderEntity>,
+    @InjectRepository(DisputeEntity)
+    private readonly disputeRepository: Repository<DisputeEntity>,
+    @InjectRepository(OrganizationEntity)
+    private readonly organizationRepository: Repository<OrganizationEntity>,
+    @InjectRepository(BloodRequestEntity)
+    private readonly requestRepository: Repository<BloodRequestEntity>,
+  ) {}
+
+  async search(filters: ReportingFilterDto) {
+    const domain = filters.domain || 'all';
+    const results: any = {};
+
+    if (domain === 'all' || domain === 'donors') {
+      results.donors = await this.queryDonors(filters);
+    }
+    if (domain === 'all' || domain === 'units') {
+      results.units = await this.queryUnits(filters);
+    }
+    if (domain === 'all' || domain === 'orders') {
+      results.orders = await this.queryOrders(filters);
+    }
+    if (domain === 'all' || domain === 'disputes') {
+      results.disputes = await this.queryDisputes(filters);
+    }
+    if (domain === 'all' || domain === 'organizations') {
+      results.organizations = await this.queryOrganizations(filters);
+    }
+    if (domain === 'all' || domain === 'requests') {
+      results.requests = await this.queryRequests(filters);
+    }
+
+    return results;
+  }
+
+  private async queryDonors(filters: ReportingFilterDto) {
+    const query = this.userRepository.createQueryBuilder('user');
+    query.where('user.role = :role', { role: 'donor' });
+    this.applyCommonFilters(query, 'user', filters);
+    if (filters.bloodType) {
+      query.andWhere("user.profile->>'bloodType' = :bloodType", { bloodType: filters.bloodType });
+    }
+    if (filters.location) {
+      query.andWhere('user.region ILIKE :location', { location: `%${filters.location}%` });
+    }
+    return query.take(filters.limit || 50).skip(filters.offset || 0).getManyAndCount();
+  }
+
+  private async queryUnits(filters: ReportingFilterDto) {
+    const query = this.unitRepository.createQueryBuilder('unit');
+    this.applyCommonFilters(query, 'unit', filters);
+    if (filters.bloodType) {
+      query.andWhere('unit.bloodType = :bloodType', { bloodType: filters.bloodType });
+    }
+    if (filters.statusGroups && filters.statusGroups.length > 0) {
+      query.andWhere('unit.status IN (:...statuses)', { statuses: filters.statusGroups });
+    }
+    return query.take(filters.limit || 50).skip(filters.offset || 0).getManyAndCount();
+  }
+
+  private async queryOrders(filters: ReportingFilterDto) {
+    const query = this.orderRepository.createQueryBuilder('order');
+    this.applyCommonFilters(query, 'order', filters);
+    if (filters.statusGroups && filters.statusGroups.length > 0) {
+      query.andWhere('order.status IN (:...statuses)', { statuses: filters.statusGroups });
+    }
+    return query.take(filters.limit || 50).skip(filters.offset || 0).getManyAndCount();
+  }
+
+  private async queryDisputes(filters: ReportingFilterDto) {
+    const query = this.disputeRepository.createQueryBuilder('dispute');
+    this.applyCommonFilters(query, 'dispute', filters);
+    if (filters.statusGroups && filters.statusGroups.length > 0) {
+      query.andWhere('dispute.status IN (:...statuses)', { statuses: filters.statusGroups });
+    }
+    return query.take(filters.limit || 50).skip(filters.offset || 0).getManyAndCount();
+  }
+
+  private async queryOrganizations(filters: ReportingFilterDto) {
+    const query = this.organizationRepository.createQueryBuilder('org');
+    this.applyCommonFilters(query, 'org', filters);
+    if (filters.location) {
+      query.andWhere('(org.city ILIKE :loc OR org.country ILIKE :loc)', { loc: `%${filters.location}%` });
+    }
+    return query.take(filters.limit || 50).skip(filters.offset || 0).getManyAndCount();
+  }
+
+  private async queryRequests(filters: ReportingFilterDto) {
+    const query = this.requestRepository.createQueryBuilder('req');
+    this.applyCommonFilters(query, 'req', filters);
+    if (filters.bloodType) {
+      query.andWhere('req.bloodType = :bloodType', { bloodType: filters.bloodType });
+    }
+    if (filters.statusGroups && filters.statusGroups.length > 0) {
+      query.andWhere('req.status IN (:...statuses)', { statuses: filters.statusGroups });
+    }
+    return query.take(filters.limit || 50).skip(filters.offset || 0).getManyAndCount();
+  }
+
+  private applyCommonFilters(query: SelectQueryBuilder<any>, alias: string, filters: ReportingFilterDto) {
+    if (filters.startDate && filters.endDate) {
+      query.andWhere(`${alias}.createdAt BETWEEN :start AND :end`, {
+        start: new Date(filters.startDate),
+        end: new Date(filters.endDate),
+      });
+    } else if (filters.startDate) {
+      query.andWhere(`${alias}.createdAt >= :start`, { start: new Date(filters.startDate) });
+    } else if (filters.endDate) {
+      query.andWhere(`${alias}.createdAt <= :end`, { end: new Date(filters.endDate) });
+    }
+  }
+
+  async getSummary(filters: ReportingFilterDto) {
+    // Generate high-level metrics
+    const [donorCount] = await this.queryDonors({ ...filters, limit: 0 });
+    const [unitCount] = await this.queryUnits({ ...filters, limit: 0 });
+    const [orderCount] = await this.queryOrders({ ...filters, limit: 0 });
+    const [disputeCount] = await this.queryDisputes({ ...filters, limit: 0 });
+
+    return {
+      donors: donorCount[1],
+      units: unitCount[1],
+      orders: orderCount[1],
+      disputes: disputeCount[1],
+    };
+  }
+
+  async exportToExcel(filters: ReportingFilterDto): Promise<Buffer> {
+    const workbook = new ExcelJS.Workbook();
+    const data = await this.search({ ...filters, limit: 10000 }); // Large limit for export
+
+    if (data.donors) {
+      const sheet = workbook.addWorksheet('Donors');
+      sheet.columns = [
+        { header: 'ID', key: 'id' },
+        { header: 'Email', key: 'email' },
+        { header: 'Name', key: 'name' },
+        { header: 'Region', key: 'region' },
+        { header: 'Created At', key: 'createdAt' },
+      ];
+      data.donors[0].forEach((d: any) => sheet.addRow(d));
+    }
+
+    if (data.units) {
+      const sheet = workbook.addWorksheet('Units');
+      sheet.columns = [
+        { header: 'Unit Code', key: 'unitCode' },
+        { header: 'Blood Type', key: 'bloodType' },
+        { header: 'Status', key: 'status' },
+        { header: 'Volume (ml)', key: 'volumeMl' },
+        { header: 'Expires At', key: 'expiresAt' },
+      ];
+      data.units[0].forEach((u: any) => sheet.addRow(u));
+    }
+
+    if (data.orders) {
+      const sheet = workbook.addWorksheet('Orders');
+      sheet.columns = [
+        { header: 'ID', key: 'id' },
+        { header: 'Hospital ID', key: 'hospitalId' },
+        { header: 'Blood Type', key: 'bloodType' },
+        { header: 'Quantity', key: 'quantity' },
+        { header: 'Status', key: 'status' },
+      ];
+      data.orders[0].forEach((o: any) => sheet.addRow(o));
+    }
+
+    return workbook.xlsx.writeBuffer() as Promise<Buffer>;
+  }
+}
diff --git a/backend/src/users/entities/user.entity.ts b/backend/src/users/entities/user.entity.ts
index 9cefb1a9..978b8de8 100644
--- a/backend/src/users/entities/user.entity.ts
+++ b/backend/src/users/entities/user.entity.ts
@@ -20,6 +20,9 @@ import { TwoFactorAuthEntity } from './two-factor-auth.entity';
 @Entity('users')
 @Index('IDX_USERS_EMAIL', ['email'], { unique: true })
 @Index('IDX_USERS_ORGANIZATION_ID', ['organizationId'])
+@Index('IDX_USERS_ROLE', ['role'])
+@Index('IDX_USERS_REGION', ['region'])
+@Index('IDX_USERS_CREATED_AT', ['createdAt'])
 export class UserEntity extends BaseEntity {
   @PrimaryGeneratedColumn('uuid')
   id: string;
diff --git a/frontend/health-chain/app/admin/anomalies/page.tsx b/frontend/health-chain/app/[locale]/admin/anomalies/page.tsx
similarity index 100%
rename from frontend/health-chain/app/admin/anomalies/page.tsx
rename to frontend/health-chain/app/[locale]/admin/anomalies/page.tsx
diff --git a/frontend/health-chain/app/admin/batch-import/page.tsx b/frontend/health-chain/app/[locale]/admin/batch-import/page.tsx
similarity index 100%
rename from frontend/health-chain/app/admin/batch-import/page.tsx
rename to frontend/health-chain/app/[locale]/admin/batch-import/page.tsx
diff --git a/frontend/health-chain/app/admin/dashboard/page.tsx b/frontend/health-chain/app/[locale]/admin/dashboard/page.tsx
similarity index 100%
rename from frontend/health-chain/app/admin/dashboard/page.tsx
rename to frontend/health-chain/app/[locale]/admin/dashboard/page.tsx
diff --git a/frontend/health-chain/app/admin/disputes/page.tsx b/frontend/health-chain/app/[locale]/admin/disputes/page.tsx
similarity index 100%
rename from frontend/health-chain/app/admin/disputes/page.tsx
rename to frontend/health-chain/app/[locale]/admin/disputes/page.tsx
diff --git a/frontend/health-chain/app/admin/donor-eligibility/page.tsx b/frontend/health-chain/app/[locale]/admin/donor-eligibility/page.tsx
similarity index 100%
rename from frontend/health-chain/app/admin/donor-eligibility/page.tsx
rename to frontend/health-chain/app/[locale]/admin/donor-eligibility/page.tsx
diff --git a/frontend/health-chain/app/admin/expiration-forecast/page.tsx b/frontend/health-chain/app/[locale]/admin/expiration-forecast/page.tsx
similarity index 100%
rename from frontend/health-chain/app/admin/expiration-forecast/page.tsx
rename to frontend/health-chain/app/[locale]/admin/expiration-forecast/page.tsx
diff --git a/frontend/health-chain/app/admin/fee-policies/page.tsx b/frontend/health-chain/app/[locale]/admin/fee-policies/page.tsx
similarity index 100%
rename from frontend/health-chain/app/admin/fee-policies/page.tsx
rename to frontend/health-chain/app/[locale]/admin/fee-policies/page.tsx
diff --git a/frontend/health-chain/app/[locale]/admin/reporting/page.tsx b/frontend/health-chain/app/[locale]/admin/reporting/page.tsx
new file mode 100644
index 00000000..c5029bca
--- /dev/null
+++ b/frontend/health-chain/app/[locale]/admin/reporting/page.tsx
@@ -0,0 +1,96 @@
+'use client';
+
+import React from 'react';
+import { FilterPanel } from '@/components/admin/reporting/FilterPanel';
+import { SummaryCards } from '@/components/admin/reporting/SummaryCards';
+import { ReportingTable } from '@/components/admin/reporting/ReportingTable';
+import { useAuth } from '@/components/providers/auth-provider';
+import { toast } from 'sonner';
+
+export default function ReportingPage() {
+  const [data, setData] = React.useState<any>(null);
+  const [summary, setSummary] = React.useState<any>(null);
+  const [loading, setLoading] = React.useState(false);
+  const { user } = useAuth();
+
+  const fetchSummary = async (filters: any) => {
+    try {
+      const queryParams = new URLSearchParams(filters).toString();
+      const res = await fetch(`/api/reporting/summary?${queryParams}`);
+      if (!res.ok) throw new Error('Failed to fetch summary');
+      const json = await res.json();
+      setSummary(json);
+    } catch (err) {
+      console.error(err);
+    }
+  };
+
+  const handleSearch = async (filters: any) => {
+    setLoading(true);
+    try {
+      const queryParams = new URLSearchParams(filters).toString();
+      
+      // Fetch both search results and updated summary
+      const [searchRes, summaryRes] = await Promise.all([
+        fetch(`/api/reporting/search?${queryParams}`),
+        fetch(`/api/reporting/summary?${queryParams}`)
+      ]);
+
+      if (!searchRes.ok || !summaryRes.ok) throw new Error('Failed to fetch records');
+
+      const [searchData, summaryData] = await Promise.all([
+        searchRes.json(),
+        summaryRes.json()
+      ]);
+
+      setData(searchData);
+      setSummary(summaryData);
+      toast.success('Search completed successfully');
+    } catch (err: any) {
+      toast.error(err.message || 'Error fetching reporting data');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleExport = async (filters: any) => {
+    try {
+      const queryParams = new URLSearchParams(filters).toString();
+      window.open(`/api/reporting/export?${queryParams}`, '_blank');
+      toast.info('Export started. Check your downloads.');
+    } catch (err) {
+      toast.error('Failed to trigger export');
+    }
+  };
+
+  // Initial fetch
+  React.useEffect(() => {
+    handleSearch({ domain: 'all' });
+  }, []);
+
+  return (
+    <div className="min-h-screen bg-slate-50 dark:bg-slate-950 p-8 space-y-12">
+      <div className="max-w-7xl mx-auto">
+        <header className="mb-12">
+          <h1 className="text-4xl font-extrabold tracking-tight text-slate-900 dark:text-white mb-2">
+            Operations Reporting <span className="bg-blue-100 text-blue-600 px-3 py-1 rounded-full text-sm font-semibold ml-2">Beta</span>
+          </h1>
+          <p className="text-slate-500 dark:text-slate-400 max-w-2xl">
+            Analyze records across donors, units, and orders with shared filters.
+            Export reports for compliance and auditing.
+          </p>
+        </header>
+
+        <SummaryCards data={summary} isLoading={loading} />
+
+        <FilterPanel 
+          onSearch={handleSearch} 
+          onExport={() => handleExport(data?.filters || { domain: 'all' })} 
+          isLoading={loading} 
+        />
+
+        <ReportingTable data={data} isLoading={loading} />
+      </div>
+    </div>
+  );
+}
diff --git a/frontend/health-chain/app/admin/retention/page.tsx b/frontend/health-chain/app/[locale]/admin/retention/page.tsx
similarity index 100%
rename from frontend/health-chain/app/admin/retention/page.tsx
rename to frontend/health-chain/app/[locale]/admin/retention/page.tsx
diff --git a/frontend/health-chain/app/admin/riders/page.tsx b/frontend/health-chain/app/[locale]/admin/riders/page.tsx
similarity index 100%
rename from frontend/health-chain/app/admin/riders/page.tsx
rename to frontend/health-chain/app/[locale]/admin/riders/page.tsx
diff --git a/frontend/health-chain/app/auth/signin/page.tsx b/frontend/health-chain/app/[locale]/auth/signin/page.tsx
similarity index 100%
rename from frontend/health-chain/app/auth/signin/page.tsx
rename to frontend/health-chain/app/[locale]/auth/signin/page.tsx
diff --git a/frontend/health-chain/app/auth/signup/donor/page.tsx b/frontend/health-chain/app/[locale]/auth/signup/donor/page.tsx
similarity index 100%
rename from frontend/health-chain/app/auth/signup/donor/page.tsx
rename to frontend/health-chain/app/[locale]/auth/signup/donor/page.tsx
diff --git a/frontend/health-chain/app/auth/signup/hospital/page.tsx b/frontend/health-chain/app/[locale]/auth/signup/hospital/page.tsx
similarity index 100%
rename from frontend/health-chain/app/auth/signup/hospital/page.tsx
rename to frontend/health-chain/app/[locale]/auth/signup/hospital/page.tsx
diff --git a/frontend/health-chain/app/auth/signup/page.tsx b/frontend/health-chain/app/[locale]/auth/signup/page.tsx
similarity index 100%
rename from frontend/health-chain/app/auth/signup/page.tsx
rename to frontend/health-chain/app/[locale]/auth/signup/page.tsx
diff --git a/frontend/health-chain/app/dashboard/campaigns/page.tsx b/frontend/health-chain/app/[locale]/dashboard/campaigns/page.tsx
similarity index 100%
rename from frontend/health-chain/app/dashboard/campaigns/page.tsx
rename to frontend/health-chain/app/[locale]/dashboard/campaigns/page.tsx
diff --git a/frontend/health-chain/app/dashboard/cold-chain/page.tsx b/frontend/health-chain/app/[locale]/dashboard/cold-chain/page.tsx
similarity index 100%
rename from frontend/health-chain/app/dashboard/cold-chain/page.tsx
rename to frontend/health-chain/app/[locale]/dashboard/cold-chain/page.tsx
diff --git a/frontend/health-chain/app/dashboard/donation-lifecycle/page.tsx b/frontend/health-chain/app/[locale]/dashboard/donation-lifecycle/page.tsx
similarity index 100%
rename from frontend/health-chain/app/dashboard/donation-lifecycle/page.tsx
rename to frontend/health-chain/app/[locale]/dashboard/donation-lifecycle/page.tsx
diff --git a/frontend/health-chain/app/dashboard/donor-impact/page.tsx b/frontend/health-chain/app/[locale]/dashboard/donor-impact/page.tsx
similarity index 100%
rename from frontend/health-chain/app/dashboard/donor-impact/page.tsx
rename to frontend/health-chain/app/[locale]/dashboard/donor-impact/page.tsx
diff --git a/frontend/health-chain/app/dashboard/healthcare-registry/page.tsx b/frontend/health-chain/app/[locale]/dashboard/healthcare-registry/page.tsx
similarity index 100%
rename from frontend/health-chain/app/dashboard/healthcare-registry/page.tsx
rename to frontend/health-chain/app/[locale]/dashboard/healthcare-registry/page.tsx
diff --git a/frontend/health-chain/app/dashboard/layout.tsx b/frontend/health-chain/app/[locale]/dashboard/layout.tsx
similarity index 100%
rename from frontend/health-chain/app/dashboard/layout.tsx
rename to frontend/health-chain/app/[locale]/dashboard/layout.tsx
diff --git a/frontend/health-chain/app/dashboard/live-ops/page.tsx b/frontend/health-chain/app/[locale]/dashboard/live-ops/page.tsx
similarity index 100%
rename from frontend/health-chain/app/dashboard/live-ops/page.tsx
rename to frontend/health-chain/app/[locale]/dashboard/live-ops/page.tsx
diff --git a/frontend/health-chain/app/dashboard/operations/surge-simulation/page.tsx b/frontend/health-chain/app/[locale]/dashboard/operations/surge-simulation/page.tsx
similarity index 100%
rename from frontend/health-chain/app/dashboard/operations/surge-simulation/page.tsx
rename to frontend/health-chain/app/[locale]/dashboard/operations/surge-simulation/page.tsx
diff --git a/frontend/health-chain/app/dashboard/orders/new/page.tsx b/frontend/health-chain/app/[locale]/dashboard/orders/new/page.tsx
similarity index 100%
rename from frontend/health-chain/app/dashboard/orders/new/page.tsx
rename to frontend/health-chain/app/[locale]/dashboard/orders/new/page.tsx
diff --git a/frontend/health-chain/app/dashboard/orders/page.tsx b/frontend/health-chain/app/[locale]/dashboard/orders/page.tsx
similarity index 100%
rename from frontend/health-chain/app/dashboard/orders/page.tsx
rename to frontend/health-chain/app/[locale]/dashboard/orders/page.tsx
diff --git a/frontend/health-chain/app/dashboard/page.tsx b/frontend/health-chain/app/[locale]/dashboard/page.tsx
similarity index 52%
rename from frontend/health-chain/app/dashboard/page.tsx
rename to frontend/health-chain/app/[locale]/dashboard/page.tsx
index 4231ad8f..d006742b 100644
--- a/frontend/health-chain/app/dashboard/page.tsx
+++ b/frontend/health-chain/app/[locale]/dashboard/page.tsx
@@ -1,169 +1,185 @@
-import React from "react";
-import Image from "next/image";
-import { Syringe, Clock, Truck, Users, Bell } from "lucide-react";
-
-export default function DashboardOverview() {
-  return (
-    <div className="w-full font-poppins">
-      
-      {/* --- HEADER SECTION --- */}
-      <div className="flex flex-col md:flex-row justify-between items-start md:items-center mb-[60px] gap-6 md:gap-0">
-        
-        {/* Title Text */}
-        <div className="flex flex-col gap-[2px]">
-            <h1 className="text-[24px] font-bold text-black tracking-[0.05em] leading-[36px]">Admin Overview</h1>
-            <p className="text-[12px] font-medium text-[#484646] tracking-[0.05em] leading-[18px]">
-                Monitoring blood distribution and emergency requests.
-            </p>
-        </div>
-
-        {/* Actions Group: Notification, Button, Profile */}
-        <div className="flex items-center gap-[20px]">
-            <button className="w-[45px] h-[44px] bg-white rounded-[8px] shadow-[0_4px_13.1px_-4px_rgba(0,0,0,0.25)] flex items-center justify-center relative">
-                <Bell className="w-[21px] h-[23px] text-[#827D7D]" />
-            </button>
-
-            <button className="h-[44px] px-[20px] bg-[#D32F2F] rounded-[8px] text-[#F2F3F3] font-poppins font-medium text-[16px] tracking-[0.05em] shadow-sm hover:opacity-90 transition">
-                Create Request
-            </button>
-
-            <div className="hidden md:block w-[44px] h-[44px] rounded-full overflow-hidden bg-[#D9D9D9] border border-gray-200">
-                <Image src="/health-agency.jpg" alt="Profile" width={44} height={44} className="object-cover" />
-            </div>
-        </div>
-      </div>
-
-      {/* --- STATS GRID --- */}
-      <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-4 gap-[12px] mb-[40px]">
-        {[
-          { label: "Total Blood Units", value: "2,300 Units", icon: Syringe, color: "text-[#D32F2F]", bg: "bg-red-50" },
-          { label: "Pending Requests", value: "42 Requests", icon: Clock, color: "text-gray-700", bg: "bg-[#F5F5F5]" },
-          { label: "Active Deliveries", value: "18 Riders", icon: Truck, color: "text-gray-700", bg: "bg-[#F5F5F5]" },
-          { label: "Total Donors", value: "120", icon: Users, color: "text-gray-700", bg: "bg-[#F5F5F5]" },
-        ].map((stat, index) => (
-          <div key={index} className="bg-white w-full xl:w-[242px] h-[199px] rounded-[24px] shadow-sm flex flex-col justify-center pl-[47px]">
-            <div className="flex flex-col gap-[24px]">
-                <div className={`w-[56px] h-[56px] rounded-[12px] flex items-center justify-center ${stat.bg} ${stat.color}`}>
-                    <stat.icon className="w-[28px] h-[28px]" />
-                </div>
-                <div>
-                    <p className="text-[#5C5B5B] font-medium text-[14px] tracking-[0.05em] mb-1">{stat.label}</p>
-                    <h3 className="text-black font-semibold text-[20px] tracking-[0.05em]">{stat.value}</h3>
-                </div>
-            </div>
-          </div>
-        ))}
-      </div>
-
-      {/* --- Table & Activity --- */}
-      <div className="flex flex-col xl:flex-row gap-[16px]">
-        
-        {/* --- Table --- */}
-        <div className="flex-1 bg-white rounded-[12px] shadow-sm p-[30px] min-h-[557px]">
-          <h2 className="font-bold text-[20px] text-black tracking-[0.05em] mb-[40px]">Critical Requests</h2>
-          
-          <div className="overflow-x-auto">
-            <table className="w-full text-left min-w-[600px]">
-              <thead>
-                <tr className="border-b border-gray-100">
-                  <th className="pb-4 font-bold text-[14px] uppercase tracking-[0.05em] text-black w-[25%]">Blood Type</th>
-                  <th className="pb-4 font-bold text-[14px] uppercase tracking-[0.05em] text-black w-[40%]">Hospital</th>
-                  <th className="pb-4 font-bold text-[14px] uppercase tracking-[0.05em] text-black w-[20%]">Status</th>
-                  <th className="pb-4 font-bold text-[14px] uppercase tracking-[0.05em] text-black text-right w-[15%]">Unit</th>
-                </tr>
-              </thead>
-              <tbody className="space-y-[10px]">
-                {[
-                  { type: "O+", hospital: "Lagos State Teaching Hospital", time: "2 Minutes Ago", status: "Critical", unit: 5 },
-                  { type: "A+", hospital: "Lagos State Teaching Hospital", time: "", status: "Urgent", unit: 12 },
-                  { type: "A-", hospital: "Lagos State Teaching Hospital", time: "", status: "Critical", unit: 15 },
-                  { type: "A-", hospital: "Lagos State Teaching Hospital", time: "", status: "Critical", unit: 15 },
-                  { type: "A-", hospital: "Lagos State Teaching Hospital", time: "", status: "Critical", unit: 15 },
-                  { type: "O-", hospital: "Lagos State Teaching Hospital", time: "", status: "Normal", unit: 5 },
-                ].map((row, i) => (
-                  <tr key={i} className="bg-[#FAF6F6] h-[62px] border-b-[5px] border-white">
-                    <td className="pl-4 font-medium text-[16px] text-black">{row.type}</td>
-                    <td className="py-2">
-                      <div className="font-medium text-[14px] text-black">{row.hospital}</div>
-                      {row.time && <div className="text-[10px] text-[#827D7D]">Lagos State - {row.time}</div>}
-                    </td>
-                    <td className="py-2">
-                      <span className={`px-3 py-1 rounded-[4px] text-[10px] font-bold uppercase tracking-[0.05em]
-                        ${row.status === "Critical" ? "bg-[#FFE5E5] text-[#D32F2F]" : ""}
-                        ${row.status === "Urgent" ? "bg-[#E5F0FF] text-[#007AFF]" : ""}
-                        ${row.status === "Normal" ? "bg-[#E5FFEA] text-[#00BFA5]" : ""}
-                      `}>
-                        {row.status}
-                      </span>
-                    </td>
-                    <td className="pr-4 text-right font-medium text-[18px] text-black">{row.unit}</td>
-                  </tr>
-                ))}
-              </tbody>
-            </table>
-          </div>
-        </div>
-
-        {/* --- RECENT ACTIVITY --- */}
-        <div className="w-full xl:w-[315px] bg-[#F6F6FA] rounded-[16px] p-[20px] min-h-[466px] relative">
-          <h2 className="font-bold text-[20px] text-black tracking-[0.05em] mb-[30px]">Recent Activity</h2>
-          
-          <div className="space-y-[30px] relative">
-            
-            {/* Timeline Item 1 */}
-            <div className="flex gap-[16px] relative">
-               {/* Color Gauge: Red for New */}
-               <div className="relative flex flex-col items-center">
-                  <div className="w-[12px] h-[12px] rounded-full bg-[#FF7F7F] z-10 shadow-[0_0_0_4px_#FFF]"></div>
-                  <div className="w-[2px] h-full bg-[#E0E0E0] absolute top-[12px] left-1/2 -translate-x-1/2"></div>
-               </div>
-               <div className="pb-4">
-                  <h4 className="font-bold text-[14px] text-black">New donor registered</h4>
-                  <p className="text-[12px] font-medium text-[#484646] mt-1 leading-[18px]">
-                    Sarah Johnson (A+) just signed up in Ikeja.
-                  </p>
-                  <span className="text-[10px] text-[#827D7D] mt-1 block uppercase">JUST NOW</span>
-               </div>
-            </div>
-
-            {/* Timeline Item 2 */}
-             <div className="flex gap-[16px] relative">
-               {/* Color Gauge: Blue for Delivery */}
-               <div className="relative flex flex-col items-center">
-                  <div className="w-[12px] h-[12px] rounded-full bg-[#82C3FF] z-10 shadow-[0_0_0_4px_#FFF]"></div>
-                  <div className="w-[2px] h-full bg-[#E0E0E0] absolute top-[12px] left-1/2 -translate-x-1/2"></div>
-               </div>
-               <div className="pb-4">
-                  <h4 className="font-bold text-[14px] text-black">Delivery Completed</h4>
-                  <p className="text-[12px] font-medium text-[#484646] mt-1 leading-[18px]">
-                    Rider #205 delivered 5 units to Abuja Hospital
-                  </p>
-                  <span className="text-[10px] text-[#827D7D] mt-1 block uppercase">2 HOURS AGO</span>
-               </div>
-            </div>
-
-             {/* Timeline Item 3 */}
-             <div className="flex gap-[16px] relative">
-               <div className="relative flex flex-col items-center">
-                  <div className="w-[12px] h-[12px] rounded-full bg-[#82C3FF] z-10 shadow-[0_0_0_4px_#FFF]"></div>
-               </div>
-               <div className="pb-4">
-                  <h4 className="font-bold text-[14px] text-black">Delivery Completed</h4>
-                  <p className="text-[12px] font-medium text-[#484646] mt-1 leading-[18px]">
-                     Rider #201 delivered 5 units to London Hospital
-                  </p>
-                  <span className="text-[10px] text-[#827D7D] mt-1 block uppercase">12 HOURS AGO</span>
-               </div>
-            </div>
-
-          </div>
-
-          <button className="absolute bottom-[20px] left-[91px] px-[10px] h-[38px] bg-[#EF7676] text-white text-[12px] rounded-[8px] font-medium">
-            View Activity Log
-          </button>
-        </div>
-
-      </div>
-    </div>
-  );
-}
\ No newline at end of file
+'use client';
+
+import React from "react";
+import Image from "next/image";
+import { Syringe, Clock, Truck, Users, Bell } from "lucide-react";
+import { useTranslations } from 'next-intl';
+
+export default function DashboardOverview() {
+  const t = useTranslations('Dashboard');
+  const commonT = useTranslations('Common');
+
+  const stats = [
+    { label: t('stats.bloodUnits'), value: "2,300 Units", icon: Syringe, color: "text-[#D32F2F]", bg: "bg-red-50" },
+    { label: t('stats.pendingRequests'), value: "42 Requests", icon: Clock, color: "text-gray-700", bg: "bg-[#F5F5F5]" },
+    { label: t('stats.activeDeliveries'), value: "18 Riders", icon: Truck, color: "text-gray-700", bg: "bg-[#F5F5F5]" },
+    { label: t('stats.totalDonors'), value: "120", icon: Users, color: "text-gray-700", bg: "bg-[#F5F5F5]" },
+  ];
+
+  const criticalRequests = [
+    { type: "O+", hospital: "Lagos State Teaching Hospital", time: "2 Minutes Ago", status: "Critical", unit: 5 },
+    { type: "A+", hospital: "Lagos State Teaching Hospital", time: "", status: "Urgent", unit: 12 },
+    { type: "A-", hospital: "Lagos State Teaching Hospital", time: "", status: "Critical", unit: 15 },
+    { type: "A-", hospital: "Lagos State Teaching Hospital", time: "", status: "Critical", unit: 15 },
+    { type: "A-", hospital: "Lagos State Teaching Hospital", time: "", status: "Critical", unit: 15 },
+    { type: "O-", hospital: "Lagos State Teaching Hospital", time: "", status: "Normal", unit: 5 },
+  ];
+
+  return (
+    <div className="w-full font-poppins" role="main">
+      
+      {/* --- HEADER SECTION --- */}
+      <div className="flex flex-col md:flex-row justify-between items-start md:items-center mb-[60px] gap-6 md:gap-0">
+        
+        {/* Title Text */}
+        <div className="flex flex-col gap-[2px]">
+            <h1 className="text-[24px] font-bold text-black tracking-[0.05em] leading-[36px]">{t('title')}</h1>
+            <p className="text-[12px] font-medium text-[#484646] tracking-[0.05em] leading-[18px]">
+                {t('description')}
+            </p>
+        </div>
+
+        {/* Actions Group: Notification, Button, Profile */}
+        <div className="flex items-center gap-[20px]">
+            <button 
+              className="w-[45px] h-[44px] bg-white rounded-[8px] shadow-[0_4px_13.1px_-4px_rgba(0,0,0,0.25)] flex items-center justify-center relative focus-visible:ring-2 focus-visible:ring-red-500 outline-none"
+              aria-label="Notifications"
+            >
+                <Bell className="w-[21px] h-[23px] text-[#827D7D]" />
+                <span className="sr-only">Notifications</span>
+            </button>
+
+            <button 
+              className="h-[44px] px-[20px] bg-[#D32F2F] rounded-[8px] text-[#F2F3F3] font-poppins font-medium text-[16px] tracking-[0.05em] shadow-sm hover:opacity-90 transition focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-red-500 outline-none"
+              aria-haspopup="dialog"
+            >
+                {commonT('createRequest')}
+            </button>
+
+            <div className="hidden md:block w-[44px] h-[44px] rounded-full overflow-hidden bg-[#D9D9D9] border border-gray-200">
+                <Image src="/health-agency.jpg" alt="Admin Profile" width={44} height={44} className="object-cover" />
+            </div>
+        </div>
+      </div>
+
+      {/* --- STATS GRID --- */}
+      <section className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-4 gap-[12px] mb-[40px]" aria-label="Statistics Summary">
+        {stats.map((stat, index) => (
+          <div key={index} className="bg-white w-full xl:w-[242px] h-[199px] rounded-[24px] shadow-sm flex flex-col justify-center pl-[47px]">
+            <div className="flex flex-col gap-[24px]">
+                <div 
+                  className={`w-[56px] h-[56px] rounded-[12px] flex items-center justify-center ${stat.bg} ${stat.color}`}
+                  aria-hidden="true"
+                >
+                    <stat.icon className="w-[28px] h-[28px]" />
+                </div>
+                <div>
+                    <h2 className="text-[#5C5B5B] font-medium text-[14px] tracking-[0.05em] mb-1">{stat.label}</h2>
+                    <p className="text-black font-semibold text-[20px] tracking-[0.05em]">{stat.value}</p>
+                </div>
+            </div>
+          </div>
+        ))}
+      </section>
+
+      {/* --- Table & Activity --- */}
+      <div className="flex flex-col xl:flex-row gap-[16px]">
+        
+        {/* --- Table --- */}
+        <section className="flex-1 bg-white rounded-[12px] shadow-sm p-[30px] min-h-[557px]" aria-labelledby="critical-requests-title">
+          <h2 id="critical-requests-title" className="font-bold text-[20px] text-black tracking-[0.05em] mb-[40px]">{t('criticalRequests')}</h2>
+          
+          <div className="overflow-x-auto">
+            <table className="w-full text-left min-w-[600px]">
+              <thead>
+                <tr className="border-b border-gray-100">
+                  <th scope="col" className="pb-4 font-bold text-[14px] uppercase tracking-[0.05em] text-black w-[25%]">{t('table.bloodType')}</th>
+                  <th scope="col" className="pb-4 font-bold text-[14px] uppercase tracking-[0.05em] text-black w-[40%]">{t('table.hospital')}</th>
+                  <th scope="col" className="pb-4 font-bold text-[14px] uppercase tracking-[0.05em] text-black w-[20%]">{t('table.status')}</th>
+                  <th scope="col" className="pb-4 font-bold text-[14px] uppercase tracking-[0.05em] text-black text-right w-[15%]">{t('table.unit')}</th>
+                </tr>
+              </thead>
+              <tbody className="space-y-[10px]">
+                {criticalRequests.map((row, i) => (
+                  <tr key={i} className="bg-[#FAF6F6] h-[62px] border-b-[5px] border-white hover:bg-red-50/30 transition-colors">
+                    <td className="pl-4 font-medium text-[16px] text-black">{row.type}</td>
+                    <td className="py-2">
+                      <div className="font-medium text-[14px] text-black">{row.hospital}</div>
+                      {row.time && <div className="text-[10px] text-[#827D7D]">Lagos State - {row.time}</div>}
+                    </td>
+                    <td className="py-2">
+                      <span className={`px-3 py-1 rounded-[4px] text-[10px] font-bold uppercase tracking-[0.05em]
+                        ${row.status === "Critical" ? "bg-[#FFE5E5] text-[#D32F2F]" : ""}
+                        ${row.status === "Urgent" ? "bg-[#E5F0FF] text-[#007AFF]" : ""}
+                        ${row.status === "Normal" ? "bg-[#E5FFEA] text-[#00BFA5]" : ""}
+                      `}>
+                        {row.status}
+                      </span>
+                    </td>
+                    <td className="pr-4 text-right font-medium text-[18px] text-black">{row.unit}</td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        </section>
+
+        {/* --- RECENT ACTIVITY --- */}
+        <section className="w-full xl:w-[315px] bg-[#F6F6FA] rounded-[16px] p-[20px] min-h-[466px] relative" aria-labelledby="recent-activity-title">
+          <h2 id="recent-activity-title" className="font-bold text-[20px] text-black tracking-[0.05em] mb-[30px]">{t('recentActivity')}</h2>
+          
+          <div className="space-y-[30px] relative">
+            <div className="flex gap-[16px] relative">
+               <div className="relative flex flex-col items-center" aria-hidden="true">
+                  <div className="w-[12px] h-[12px] rounded-full bg-[#FF7F7F] z-10 shadow-[0_0_0_4px_#FFF]"></div>
+                  <div className="w-[2px] h-full bg-[#E0E0E0] absolute top-[12px] left-1/2 -translate-x-1/2"></div>
+               </div>
+               <div className="pb-4">
+                  <h3 className="font-bold text-[14px] text-black">New donor registered</h3>
+                  <p className="text-[12px] font-medium text-[#484646] mt-1 leading-[18px]">
+                    Sarah Johnson (A+) just signed up in Ikeja.
+                  </p>
+                  <span className="text-[10px] text-[#827D7D] mt-1 block uppercase">JUST NOW</span>
+               </div>
+            </div>
+
+             <div className="flex gap-[16px] relative">
+               <div className="relative flex flex-col items-center" aria-hidden="true">
+                  <div className="w-[12px] h-[12px] rounded-full bg-[#82C3FF] z-10 shadow-[0_0_0_4px_#FFF]"></div>
+                  <div className="w-[2px] h-full bg-[#E0E0E0] absolute top-[12px] left-1/2 -translate-x-1/2"></div>
+               </div>
+               <div className="pb-4">
+                  <h4 className="font-bold text-[14px] text-black">Delivery Completed</h4>
+                  <p className="text-[12px] font-medium text-[#484646] mt-1 leading-[18px]">
+                    Rider #205 delivered 5 units to Abuja Hospital
+                  </p>
+                  <span className="text-[10px] text-[#827D7D] mt-1 block uppercase">2 HOURS AGO</span>
+               </div>
+            </div>
+
+             <div className="flex gap-[16px] relative">
+               <div className="relative flex flex-col items-center" aria-hidden="true">
+                  <div className="w-[12px] h-[12px] rounded-full bg-[#82C3FF] z-10 shadow-[0_0_0_4px_#FFF]"></div>
+               </div>
+               <div className="pb-4">
+                  <h4 className="font-bold text-[14px] text-black">Delivery Completed</h4>
+                  <p className="text-[12px] font-medium text-[#484646] mt-1 leading-[18px]">
+                     Rider #201 delivered 5 units to London Hospital
+                  </p>
+                  <span className="text-[10px] text-[#827D7D] mt-1 block uppercase">12 HOURS AGO</span>
+               </div>
+            </div>
+          </div>
+
+          <button 
+            className="absolute bottom-[20px] left-[91px] px-[10px] h-[38px] bg-[#EF7676] text-white text-[12px] rounded-[8px] font-medium hover:bg-red-500 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-red-400 outline-none transition"
+            aria-label={t('viewActivityLog')}
+          >
+            {t('viewActivityLog')}
+          </button>
+        </section>
+
+      </div>
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/frontend/health-chain/app/dashboard/time-locked-funds/page.tsx b/frontend/health-chain/app/[locale]/dashboard/time-locked-funds/page.tsx
similarity index 100%
rename from frontend/health-chain/app/dashboard/time-locked-funds/page.tsx
rename to frontend/health-chain/app/[locale]/dashboard/time-locked-funds/page.tsx
diff --git a/frontend/health-chain/app/dashboard/track-riders/page.tsx b/frontend/health-chain/app/[locale]/dashboard/track-riders/page.tsx
similarity index 100%
rename from frontend/health-chain/app/dashboard/track-riders/page.tsx
rename to frontend/health-chain/app/[locale]/dashboard/track-riders/page.tsx
diff --git a/frontend/health-chain/app/[locale]/layout.tsx b/frontend/health-chain/app/[locale]/layout.tsx
new file mode 100644
index 00000000..1ce1b877
--- /dev/null
+++ b/frontend/health-chain/app/[locale]/layout.tsx
@@ -0,0 +1,80 @@
+import type { Metadata } from "next";
+import React, { Suspense } from "react";
+import { Poppins, Roboto, Manrope, DM_Sans } from "next/font/google";
+import "../globals.css";
+import { ToastProvider } from "../../components/providers/ToastProvider";
+import { ReactQueryProvider } from "../../components/providers/ReactQueryProvider";
+import { NextIntlClientProvider } from 'next-intl';
+import { getMessages } from 'next-intl/server';
+import { notFound } from 'next-intl/navigation';
+import { routing } from '../../i18n/routing';
+
+const poppins = Poppins({
+  subsets: ["latin"],
+  weight: ["400"],
+  variable: "--font-poppins",
+});
+
+const roboto = Roboto({
+  subsets: ["latin"],
+  weight: ["400", "600", "700"],
+  variable: "--font-roboto",
+});
+
+const manrope = Manrope({
+  subsets: ["latin"],
+  weight: ["600", "700"],
+  variable: "--font-manrope",
+});
+
+const dmSans = DM_Sans({
+  subsets: ["latin"],
+  weight: ["400", "700"],
+  variable: "--font-dm-sans",
+});
+
+export const metadata: Metadata = {
+  title: "Health Chain",
+  description: "Transparent healthcare donation platform",
+};
+
+export default async function RootLayout({
+  children,
+  params
+}: {
+  children: React.ReactNode;
+  params: Promise<{locale: string}>;
+}) {
+  const { locale } = await params;
+
+  // Ensure that the incoming `locale` is valid
+  if (!routing.locales.includes(locale as any)) {
+    notFound();
+  }
+ 
+  // Providing all messages to the client
+  // side is the easiest way to get started
+  const messages = await getMessages();
+
+  return (
+    <html lang={locale}>
+      <body
+        className={`${poppins.variable} ${roboto.variable} ${manrope.variable} ${dmSans.variable} antialiased`}
+      >
+        <a 
+          href="#main-content" 
+          className="sr-only focus:not-sr-only focus:fixed focus:top-4 focus:left-4 focus:z-[100] focus:px-4 focus:py-2 focus:bg-white focus:text-red-600 focus:border-2 focus:border-red-600 focus:rounded-md focus:shadow-lg focus:outline-none"
+        >
+          Skip to content
+        </a>
+        <Suspense fallback={null}>
+          <NextIntlClientProvider messages={messages}>
+            <ReactQueryProvider>
+              <ToastProvider>{children}</ToastProvider>
+            </NextIntlClientProvider>
+          </NextIntlClientProvider>
+        </Suspense>
+      </body>
+    </html>
+  );
+}
diff --git a/frontend/health-chain/app/page.tsx b/frontend/health-chain/app/[locale]/page.tsx
similarity index 100%
rename from frontend/health-chain/app/page.tsx
rename to frontend/health-chain/app/[locale]/page.tsx
diff --git a/frontend/health-chain/app/transparency/TransparencyDashboard.tsx b/frontend/health-chain/app/[locale]/transparency/TransparencyDashboard.tsx
similarity index 100%
rename from frontend/health-chain/app/transparency/TransparencyDashboard.tsx
rename to frontend/health-chain/app/[locale]/transparency/TransparencyDashboard.tsx
diff --git a/frontend/health-chain/app/transparency/__tests__/transparency.metrics.spec.ts b/frontend/health-chain/app/[locale]/transparency/__tests__/transparency.metrics.spec.ts
similarity index 100%
rename from frontend/health-chain/app/transparency/__tests__/transparency.metrics.spec.ts
rename to frontend/health-chain/app/[locale]/transparency/__tests__/transparency.metrics.spec.ts
diff --git a/frontend/health-chain/app/transparency/page.tsx b/frontend/health-chain/app/[locale]/transparency/page.tsx
similarity index 100%
rename from frontend/health-chain/app/transparency/page.tsx
rename to frontend/health-chain/app/[locale]/transparency/page.tsx
diff --git a/frontend/health-chain/app/layout.tsx b/frontend/health-chain/app/layout.tsx
deleted file mode 100644
index 517c9055..00000000
--- a/frontend/health-chain/app/layout.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import type { Metadata } from "next";
-import React, { Suspense } from "react";
-import { Poppins, Roboto, Manrope, DM_Sans } from "next/font/google";
-import "./globals.css";
-import { ToastProvider } from "../components/providers/ToastProvider";
-import { ReactQueryProvider } from "../components/providers/ReactQueryProvider";
-
-const poppins = Poppins({
-  subsets: ["latin"],
-  weight: ["400"],
-  variable: "--font-poppins",
-});
-
-const roboto = Roboto({
-  subsets: ["latin"],
-  weight: ["400", "600", "700"],
-  variable: "--font-roboto",
-});
-
-const manrope = Manrope({
-  subsets: ["latin"],
-  weight: ["600", "700"],
-  variable: "--font-manrope",
-});
-
-const dmSans = DM_Sans({
-  subsets: ["latin"],
-  weight: ["400", "700"],
-  variable: "--font-dm-sans",
-});
-
-export const metadata: Metadata = {
-  title: "Health Chain",
-  description: "Transparent healthcare donation platform",
-};
-
-export default function RootLayout({
-  children,
-}: Readonly<{
-  children: React.ReactNode;
-}>) {
-  return (
-    <html lang="en">
-      <body
-        className={`${poppins.variable} ${roboto.variable} ${manrope.variable} ${dmSans.variable} antialiased`}
-      >
-        <Suspense fallback={null}>
-          <ReactQueryProvider>
-            <ToastProvider>{children}</ToastProvider>
-          </ReactQueryProvider>
-        </Suspense>
-      </body>
-    </html>
-  );
-}
diff --git a/frontend/health-chain/components/LanguageSwitcher.tsx b/frontend/health-chain/components/LanguageSwitcher.tsx
new file mode 100644
index 00000000..16a874bb
--- /dev/null
+++ b/frontend/health-chain/components/LanguageSwitcher.tsx
@@ -0,0 +1,31 @@
+'use client';
+
+import { useLocale, useTranslations } from 'next-intl';
+import { usePathname, useRouter } from '../i18n/routing';
+import { Globe } from 'lucide-react';
+
+export default function LanguageSwitcher() {
+  const locale = useLocale();
+  const router = useRouter();
+  const pathname = usePathname();
+  const t = useTranslations('Common');
+
+  const handleLanguageChange = (newLocale: string) => {
+    router.replace(pathname, { locale: newLocale });
+  };
+
+  return (
+    <div className="flex items-center gap-2">
+      <Globe className="w-4 h-4 text-gray-500" aria-hidden="true" />
+      <select
+        value={locale}
+        onChange={(e) => handleLanguageChange(e.target.value)}
+        className="bg-transparent text-[14px] font-medium text-brand-black outline-none cursor-pointer focus-visible:ring-1 focus-visible:ring-red-500 rounded px-1"
+        aria-label="Select Language"
+      >
+        <option value="en">English</option>
+        <option value="fr">Français</option>
+      </select>
+    </div>
+  );
+}
diff --git a/frontend/health-chain/components/Navbar.tsx b/frontend/health-chain/components/Navbar.tsx
index 7d412213..0b7c444d 100644
--- a/frontend/health-chain/components/Navbar.tsx
+++ b/frontend/health-chain/components/Navbar.tsx
@@ -1,86 +1,98 @@
-"use client";
-import { useState } from "react";
-import Image from "next/image";
-import Link from "next/link";
-
-export default function Navbar() {
-  const [isOpen, setIsOpen] = useState(false);
-
-  return (
-    <nav className="absolute top-0 md:top-[59px] w-full z-50 flex justify-center">
-      <div className="w-full max-w-[1288px] mx-auto flex items-center justify-between px-6 py-4 md:py-0">
-        
-        {/* Logo Section */}
-        <Link href="/" className="relative z-50 shrink-0">
-          <div className="w-[50px] h-[50px] md:w-[61px] md:h-[62px] bg-white rounded-full border-2 border-black flex items-center justify-center shadow-md">
-             <Image src="/logo-drop.svg" alt="Health Chain Logo" width={30} height={30} />
-          </div>
-        </Link>
-
-        {/* Hamburger Icon (Mobile Only) */}
-        <button 
-          className="md:hidden z-50 text-brand-black p-2"
-          onClick={() => setIsOpen(!isOpen)}
-        >
-          {isOpen ? (
-            <svg className="w-8 h-8" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M6 18L18 6M6 6l12 12" /></svg>
-          ) : (
-            <svg className="w-8 h-8" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M4 6h16M4 12h16M4 18h16" /></svg>
-          )}
-        </button>
-
-        {/* Desktop Navigation */}
-        <div className="hidden md:flex items-center gap-[40px] font-poppins text-brand-black text-[18px]">
-          <Link href="/" className="group relative py-2">
-            Home
-            <span className="absolute left-0 bottom-0 w-full h-[3px] bg-[#4b4949] transition-all duration-300"></span>
-          </Link>
-          <Link href="#about" className="group relative py-2 hover:text-brand-loginBtn transition-colors">
-            About Us
-            <span className="absolute left-0 bottom-0 w-0 h-[3px] bg-[#4b4949] group-hover:w-full transition-all duration-300"></span>
-          </Link>
-          <Link href="#find" className="group relative py-2 hover:text-brand-loginBtn transition-colors">
-            Find Blood
-            <span className="absolute left-0 bottom-0 w-0 h-[3px] bg-[#4b4949] group-hover:w-full transition-all duration-300"></span>
-          </Link>
-          <Link href="/transparency" className="group relative py-2 hover:text-brand-loginBtn transition-colors">
-            Transparency
-            <span className="absolute left-0 bottom-0 w-0 h-[3px] bg-[#4b4949] group-hover:w-full transition-all duration-300"></span>
-          </Link>
-          
-          <div className="flex items-center gap-2 cursor-pointer hover:text-brand-loginBtn transition group py-2 relative">
-            <Link href="/auth/signup" className="flex items-center gap-2">
-              Register Now 
-              <svg width="12" height="8" viewBox="0 0 12 8" fill="none" className="stroke-current transition-transform group-hover:rotate-180">
-                <path d="M1 1.5L6 6.5L11 1.5" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round"/>
-              </svg>
-            </Link>
-          </div>
-          
-          <Link href="/auth/signin">
-            <button className="bg-brand-loginBtn text-[#fffbfb] w-[167px] h-[49px] rounded shadow-md hover:opacity-90 transition font-roboto font-semibold text-base ml-8">
-              Enter App
-            </button>
-          </Link>
-        </div>
-
-        {/* Mobile Menu Dropdown */}
-        {isOpen && (
-          <div className="absolute top-full left-0 w-full bg-white shadow-xl flex flex-col items-center gap-6 py-8 md:hidden border-t border-gray-100 font-poppins">
-            <Link href="/" onClick={() => setIsOpen(false)} className="text-xl text-brand-black">Home</Link>
-            <Link href="#about" onClick={() => setIsOpen(false)} className="text-xl text-brand-black">About Us</Link>
-            <Link href="#find" onClick={() => setIsOpen(false)} className="text-xl text-brand-black">Find Blood</Link>
-            <Link href="/transparency" onClick={() => setIsOpen(false)} className="text-xl text-brand-black">Transparency</Link>
-            <Link href="/auth/signup" onClick={() => setIsOpen(false)} className="text-xl text-brand-black">Register Now</Link>
-            <Link href="/auth/signin" onClick={() => setIsOpen(false)}>
-              <button className="bg-brand-loginBtn text-[#fffbfb] w-[167px] h-[49px] rounded shadow-md font-roboto font-semibold text-base">
-                Enter App
-              </button>
-            </Link>
-          </div>
-        )}
-
-      </div>
-    </nav>
-  );
-}
\ No newline at end of file
+"use client";
+import React, { useState } from "react";
+import Image from "next/image";
+import { Link } from "@/i18n/routing";
+import { useTranslations } from 'next-intl';
+import LanguageSwitcher from "./LanguageSwitcher";
+
+export default function Navbar() {
+  const [isOpen, setIsOpen] = useState(false);
+  const t = useTranslations('Navbar');
+
+  return (
+    <nav className="absolute top-0 md:top-[59px] w-full z-50 flex justify-center" aria-label="Main Navigation">
+      <div className="w-full max-w-[1288px] mx-auto flex items-center justify-between px-6 py-4 md:py-0">
+        
+        {/* Logo Section */}
+        <Link href="/" className="relative z-50 shrink-0" aria-label="Health Chain Home">
+          <div className="w-[50px] h-[50px] md:w-[61px] md:h-[62px] bg-white rounded-full border-2 border-black flex items-center justify-center shadow-md">
+             <Image src="/logo-drop.svg" alt="Health Chain Logo" width={30} height={30} />
+          </div>
+        </Link>
+
+        {/* Hamburger Icon (Mobile Only) */}
+        <button 
+          className="md:hidden z-50 text-brand-black p-2 outline-none focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-red-500 rounded"
+          onClick={() => setIsOpen(!isOpen)}
+          aria-expanded={isOpen}
+          aria-label={isOpen ? "Close Menu" : "Open Menu"}
+        >
+          {isOpen ? (
+            <svg className="w-8 h-8" fill="none" stroke="currentColor" viewBox="0 0 24 24" aria-hidden="true"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M6 18L18 6M6 6l12 12" /></svg>
+          ) : (
+            <svg className="w-8 h-8" fill="none" stroke="currentColor" viewBox="0 0 24 24" aria-hidden="true"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M4 6h16M4 12h16M4 18h16" /></svg>
+          )}
+        </button>
+
+        {/* Desktop Navigation */}
+        <div className="hidden md:flex items-center gap-[40px] font-poppins text-brand-black text-[18px]">
+          <Link href="/" className="group relative py-2 outline-none focus-visible:text-red-600">
+            {t('home')}
+            <span className="absolute left-0 bottom-0 w-full h-[3px] bg-[#4b4949] transition-all duration-300"></span>
+          </Link>
+          <Link href="#about" className="group relative py-2 hover:text-brand-loginBtn transition-colors outline-none focus-visible:text-red-400">
+            {t('about')}
+            <span className="absolute left-0 bottom-0 w-0 h-[3px] bg-[#4b4949] group-hover:w-full transition-all duration-300"></span>
+          </Link>
+          <Link href="#find" className="group relative py-2 hover:text-brand-loginBtn transition-colors outline-none focus-visible:text-red-400">
+            {t('findBlood')}
+            <span className="absolute left-0 bottom-0 w-0 h-[3px] bg-[#4b4949] group-hover:w-full transition-all duration-300"></span>
+          </Link>
+          <Link href="/transparency" className="group relative py-2 hover:text-brand-loginBtn transition-colors outline-none focus-visible:text-red-400">
+            {t('transparency')}
+            <span className="absolute left-0 bottom-0 w-0 h-[3px] bg-[#4b4949] group-hover:w-full transition-all duration-300"></span>
+          </Link>
+          
+          <div className="flex items-center gap-2 cursor-pointer hover:text-brand-loginBtn transition group py-2 relative outline-none focus-visible:text-red-400">
+            <Link href="/auth/signup" className="flex items-center gap-2">
+              {t('register')} 
+              <svg width="12" height="8" viewBox="0 0 12 8" fill="none" className="stroke-current transition-transform group-hover:rotate-180" aria-hidden="true">
+                <path d="M1 1.5L6 6.5L11 1.5" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round"/>
+              </svg>
+            </Link>
+          </div>
+
+          <div className="ml-4 border-l pl-8 border-gray-200">
+            <LanguageSwitcher />
+          </div>
+          
+          <Link href="/auth/signin">
+            <button className="bg-brand-loginBtn text-[#fffbfb] w-[167px] h-[49px] rounded shadow-md hover:opacity-90 transition font-roboto font-semibold text-base ml-8 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-brand-loginBtn outline-none">
+              {t('enterApp')}
+            </button>
+          </Link>
+        </div>
+
+        {/* Mobile Menu Dropdown */}
+        {isOpen && (
+          <div className="absolute top-full left-0 w-full bg-white shadow-xl flex flex-col items-center gap-6 py-8 md:hidden border-t border-gray-100 font-poppins">
+            <Link href="/" onClick={() => setIsOpen(false)} className="text-xl text-brand-black">{t('home')}</Link>
+            <Link href="#about" onClick={() => setIsOpen(false)} className="text-xl text-brand-black">{t('about')}</Link>
+            <Link href="#find" onClick={() => setIsOpen(false)} className="text-xl text-brand-black">{t('findBlood')}</Link>
+            <Link href="/transparency" onClick={() => setIsOpen(false)} className="text-xl text-brand-black">{t('transparency')}</Link>
+            <Link href="/auth/signup" onClick={() => setIsOpen(false)} className="text-xl text-brand-black">{t('register')}</Link>
+            
+            <LanguageSwitcher />
+
+            <Link href="/auth/signin" onClick={() => setIsOpen(false)}>
+              <button className="bg-brand-loginBtn text-[#fffbfb] w-[167px] h-[49px] rounded shadow-md font-roboto font-semibold text-base">
+                {t('enterApp')}
+              </button>
+            </Link>
+          </div>
+        )}
+
+      </div>
+    </nav>
+  );
+}
\ No newline at end of file
diff --git a/frontend/health-chain/components/admin/VerificationConsole.tsx b/frontend/health-chain/components/admin/VerificationConsole.tsx
index 60b24b1f..8921d888 100644
--- a/frontend/health-chain/components/admin/VerificationConsole.tsx
+++ b/frontend/health-chain/components/admin/VerificationConsole.tsx
@@ -2,6 +2,7 @@
 
 import React, { useState, useEffect } from "react";
 import { AlertCircle, CheckCircle, Clock, XCircle, RefreshCw } from "lucide-react";
+import { useTranslations } from 'next-intl';
 
 interface VerificationStatus {
   id: string;
@@ -18,6 +19,9 @@ interface VerificationStatus {
 }
 
 export function VerificationConsole() {
+  const t = useTranslations('VerificationConsole');
+  const commonT = useTranslations('Common');
+  
   const [organizations, setOrganizations] = useState<VerificationStatus[]>([]);
   const [loading, setLoading] = useState(true);
   const [selectedOrg, setSelectedOrg] = useState<VerificationStatus | null>(null);
@@ -65,15 +69,15 @@ export function VerificationConsole() {
   const getSyncStatusIcon = (status: string) => {
     switch (status) {
       case "synced":
-        return <CheckCircle className="w-5 h-5 text-green-600" />;
+        return <CheckCircle className="w-5 h-5 text-green-600" aria-hidden="true" />;
       case "failed":
-        return <XCircle className="w-5 h-5 text-red-600" />;
+        return <XCircle className="w-5 h-5 text-red-600" aria-hidden="true" />;
       case "syncing":
-        return <Clock className="w-5 h-5 text-blue-600 animate-spin" />;
+        return <Clock className="w-5 h-5 text-blue-600 animate-spin" aria-hidden="true" />;
       case "mismatch":
-        return <AlertCircle className="w-5 h-5 text-yellow-600" />;
+        return <AlertCircle className="w-5 h-5 text-yellow-600" aria-hidden="true" />;
       default:
-        return <Clock className="w-5 h-5 text-gray-400" />;
+        return <Clock className="w-5 h-5 text-gray-400" aria-hidden="true" />;
     }
   };
 
@@ -93,35 +97,38 @@ export function VerificationConsole() {
   };
 
   if (loading) {
-    return <div className="p-6 text-center">Loading verification status...</div>;
+    return <div className="p-6 text-center" role="status">{commonT('loading')}</div>;
   }
 
   return (
-    <div className="p-6 space-y-6">
+    <div className="p-6 space-y-6" role="region" aria-labelledby="console-title">
       <div className="flex justify-between items-center">
-        <h2 className="text-2xl font-bold">Organization Verification Console</h2>
+        <h2 id="console-title" className="text-2xl font-bold">{t('title')}</h2>
         <button
           onClick={fetchPendingSyncs}
-          className="px-4 py-2 bg-brand-black text-white rounded hover:bg-gray-800"
+          className="px-4 py-2 bg-brand-black text-white rounded hover:bg-gray-800 transition focus-visible:ring-2 focus-visible:ring-black focus-visible:ring-offset-2 outline-none"
+          aria-label={commonT('refresh')}
         >
-          <RefreshCw className="w-4 h-4 inline mr-2" />
-          Refresh
+          <RefreshCw className="w-4 h-4 inline mr-2" aria-hidden="true" />
+          {commonT('refresh')}
         </button>
       </div>
 
       {organizations.length === 0 ? (
-        <div className="text-center py-12 text-gray-500">
-          No pending verifications
+        <div className="text-center py-12 text-gray-500" role="status">
+          {t('noPending')}
         </div>
       ) : (
-        <div className="grid gap-4">
+        <div className="grid gap-4" role="list" aria-label="Verification Tasks">
           {organizations.map((org) => (
             <div
               key={org.id}
-              className={`border rounded-lg p-4 cursor-pointer transition ${getSyncStatusColor(
+              className={`border rounded-lg p-4 cursor-pointer transition focus-within:ring-2 focus-within:ring-black ${getSyncStatusColor(
                 org.syncStatus
               )}`}
               onClick={() => setSelectedOrg(selectedOrg?.id === org.id ? null : org)}
+              role="listitem"
+              aria-expanded={selectedOrg?.id === org.id}
             >
               <div className="flex items-center justify-between">
                 <div className="flex items-center gap-3 flex-1">
@@ -129,13 +136,13 @@ export function VerificationConsole() {
                   <div>
                     <h3 className="font-semibold">{org.name}</h3>
                     <p className="text-sm text-gray-600">
-                      Status: {org.status} | Sync: {org.syncStatus}
+                      {t('syncStatuses.' + org.syncStatus)}
                     </p>
                   </div>
                 </div>
                 <div className="text-right">
                   <p className="text-xs text-gray-500">
-                    Retries: {org.syncRetryCount}/5
+                    {t('retries')}: {org.syncRetryCount}/5
                   </p>
                   {org.syncStatus === "failed" && org.syncRetryCount < 5 && (
                     <button
@@ -144,39 +151,39 @@ export function VerificationConsole() {
                         handleRetry(org.id);
                       }}
                       disabled={retrying === org.id}
-                      className="mt-2 px-3 py-1 bg-blue-600 text-white text-xs rounded hover:bg-blue-700 disabled:opacity-50"
+                      className="mt-2 px-3 py-1 bg-blue-600 text-white text-xs rounded hover:bg-blue-700 disabled:opacity-50 focus-visible:ring-2 focus-visible:ring-blue-500 outline-none"
                     >
-                      {retrying === org.id ? "Retrying..." : "Retry"}
+                      {retrying === org.id ? t('retrying') : t('retry')}
                     </button>
                   )}
                 </div>
               </div>
 
               {selectedOrg?.id === org.id && (
-                <div className="mt-4 pt-4 border-t space-y-2 text-sm">
+                <div className="mt-4 pt-4 border-t space-y-2 text-sm" role="region" aria-label={t('verifiedAt')}>
                   {org.verifiedAt && (
                     <p>
-                      <span className="font-semibold">Verified At:</span>{" "}
+                      <span className="font-semibold">{t('verifiedAt')}:</span>{" "}
                       {new Date(org.verifiedAt).toLocaleString()}
                     </p>
                   )}
                   {org.syncedAt && (
                     <p>
-                      <span className="font-semibold">Synced At:</span>{" "}
+                      <span className="font-semibold">{t('syncedAt')}:</span>{" "}
                       {new Date(org.syncedAt).toLocaleString()}
                     </p>
                   )}
                   {org.verificationTxHash && (
                     <p>
-                      <span className="font-semibold">TX Hash:</span>{" "}
+                      <span className="font-semibold">{t('txHash')}:</span>{" "}
                       <code className="bg-gray-200 px-2 py-1 rounded text-xs">
                         {org.verificationTxHash.slice(0, 16)}...
                       </code>
                     </p>
                   )}
                   {org.syncErrorMessage && (
-                    <p className="text-red-600">
-                      <span className="font-semibold">Error:</span>{" "}
+                    <p className="text-red-600" role="alert">
+                      <span className="font-semibold">{t('errorLabel')}:</span>{" "}
                       {org.syncErrorMessage}
                     </p>
                   )}
diff --git a/frontend/health-chain/components/admin/reporting/FilterPanel.tsx b/frontend/health-chain/components/admin/reporting/FilterPanel.tsx
new file mode 100644
index 00000000..db91e62c
--- /dev/null
+++ b/frontend/health-chain/components/admin/reporting/FilterPanel.tsx
@@ -0,0 +1,116 @@
+'use client';
+
+import React from 'react';
+import { Card, CardContent } from '@/components/ui/card';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+import { Button } from '@/components/ui/button';
+import { CalendarIcon, Download, Search } from 'lucide-react';
+
+interface FilterPanelProps {
+  onSearch: (filters: any) => void;
+  onExport: () => void;
+  isLoading?: boolean;
+}
+
+export function FilterPanel({ onSearch, onExport, isLoading }: FilterPanelProps) {
+  const [filters, setFilters] = React.useState({
+    startDate: '',
+    endDate: '',
+    domain: 'all',
+    status: '',
+    bloodType: '',
+    location: '',
+  });
+
+  const handleChange = (key: string, value: string) => {
+    setFilters(prev => ({ ...prev, [key]: value }));
+  };
+
+  const handleSearch = () => {
+    onSearch(filters);
+  };
+
+  return (
+    <Card className="mb-8 border-none bg-white/50 backdrop-blur-xl shadow-2xl dark:bg-slate-900/50">
+      <CardContent className="p-6">
+        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
+          <div className="space-y-2">
+            <Label>Date Range</Label>
+            <div className="flex gap-2">
+              <Input
+                type="date"
+                value={filters.startDate}
+                onChange={(e) => handleChange('startDate', e.target.value)}
+                className="bg-white/80 dark:bg-slate-800/80"
+              />
+              <Input
+                type="date"
+                value={filters.endDate}
+                onChange={(e) => handleChange('endDate', e.target.value)}
+                className="bg-white/80 dark:bg-slate-800/80"
+              />
+            </div>
+          </div>
+
+          <div className="space-y-2">
+            <Label>Search Domain</Label>
+            <Select value={filters.domain} onValueChange={(v) => handleChange('domain', v)}>
+              <SelectTrigger className="bg-white/80 dark:bg-slate-800/80">
+                <SelectValue placeholder="Select domain" />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="all">Global Search</SelectItem>
+                <SelectItem value="donors">Donors</SelectItem>
+                <SelectItem value="units">Blood Units</SelectItem>
+                <SelectItem value="orders">Orders</SelectItem>
+                <SelectItem value="disputes">Disputes</SelectItem>
+                <SelectItem value="organizations">Organizations</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+
+          <div className="space-y-2">
+            <Label>Blood Type</Label>
+            <Select value={filters.bloodType} onValueChange={(v) => handleChange('bloodType', v)}>
+              <SelectTrigger className="bg-white/80 dark:bg-slate-800/80">
+                <SelectValue placeholder="All types" />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="all">All Types</SelectItem>
+                <SelectItem value="A+">A+</SelectItem>
+                <SelectItem value="A-">A-</SelectItem>
+                <SelectItem value="B+">B+</SelectItem>
+                <SelectItem value="B-">B-</SelectItem>
+                <SelectItem value="O+">O+</SelectItem>
+                <SelectItem value="O-">O-</SelectItem>
+                <SelectItem value="AB+">AB+</SelectItem>
+                <SelectItem value="AB-">AB-</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+
+          <div className="space-y-2">
+            <Label>Location / Region</Label>
+            <Input
+              placeholder="Filter by city or region..."
+              value={filters.location}
+              onChange={(e) => handleChange('location', e.target.value)}
+              className="bg-white/80 dark:bg-slate-800/80"
+            />
+          </div>
+        </div>
+
+        <div className="mt-8 flex justify-end gap-3">
+          <Button variant="outline" onClick={onExport} disabled={isLoading} className="hover:bg-blue-50">
+            <Download className="mr-2 h-4 w-4" /> Export Report
+          </Button>
+          <Button onClick={handleSearch} disabled={isLoading} className="bg-gradient-to-r from-blue-600 to-indigo-600 text-white hover:from-blue-700 hover:to-indigo-700">
+            <Search className="mr-2 h-4 w-4" /> {isLoading ? 'Searching...' : 'Search Records'}
+          </Button>
+        </div>
+      </CardContent>
+    </Card>
+  );
+}
diff --git a/frontend/health-chain/components/admin/reporting/ReportingTable.tsx b/frontend/health-chain/components/admin/reporting/ReportingTable.tsx
new file mode 100644
index 00000000..f31c425a
--- /dev/null
+++ b/frontend/health-chain/components/admin/reporting/ReportingTable.tsx
@@ -0,0 +1,159 @@
+'use client';
+
+import React from 'react';
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from '@/components/ui/table';
+import { Card, CardContent } from '@/components/ui/card';
+import { Badge } from '@/components/ui/badge';
+import { format } from 'date-fns';
+
+interface ReportingTableProps {
+  data: any;
+  isLoading?: boolean;
+}
+
+export function ReportingTable({ data, isLoading }: ReportingTableProps) {
+  if (isLoading) {
+    return (
+      <div className="space-y-4">
+        {[...Array(5)].map((_, i) => (
+          <div key={i} className="h-16 w-full bg-slate-100 animate-pulse rounded-xl" />
+        ))}
+      </div>
+    );
+  }
+
+  const renderDonors = (donors: any[]) => (
+    <div className="space-y-4">
+      <h3 className="text-lg font-semibold flex items-center gap-2">
+        <span className="w-2 h-2 rounded-full bg-blue-500" /> Donors ({donors.length})
+      </h3>
+      <Table>
+        <TableHeader>
+          <TableRow>
+            <TableHead>Name</TableHead>
+            <TableHead>Email</TableHead>
+            <TableHead>Region</TableHead>
+            <TableHead>Blood Type</TableHead>
+            <TableHead>Joined</TableHead>
+          </TableRow>
+        </TableHeader>
+        <TableBody>
+          {donors.map((donor) => (
+            <TableRow key={donor.id} className="hover:bg-slate-50 transition-colors">
+              <TableCell className="font-medium">{donor.name || 'N/A'}</TableCell>
+              <TableCell>{donor.email}</TableCell>
+              <TableCell>{donor.region}</TableCell>
+              <TableCell>
+                <Badge variant="outline" className="bg-red-50 text-red-600 border-red-200">
+                  {donor.profile?.bloodType || 'Unknown'}
+                </Badge>
+              </TableCell>
+              <TableCell className="text-slate-500">
+                {format(new Date(donor.createdAt), 'MMM d, yyyy')}
+              </TableCell>
+            </TableRow>
+          ))}
+        </TableBody>
+      </Table>
+    </div>
+  );
+
+  const renderUnits = (units: any[]) => (
+    <div className="space-y-4">
+      <h3 className="text-lg font-semibold flex items-center gap-2">
+        <span className="w-2 h-2 rounded-full bg-red-500" /> Blood Units ({units.length})
+      </h3>
+      <Table>
+        <TableHeader>
+          <TableRow>
+            <TableHead>Unit Code</TableHead>
+            <TableHead>Type</TableHead>
+            <TableHead>Component</TableHead>
+            <TableHead>Status</TableHead>
+            <TableHead>Expires</TableHead>
+          </TableRow>
+        </TableHeader>
+        <TableBody>
+          {units.map((unit) => (
+            <TableRow key={unit.id} className="hover:bg-slate-50 transition-colors">
+              <TableCell className="font-mono font-bold text-blue-600">#{unit.unitCode}</TableCell>
+              <TableCell>
+                <Badge className="bg-red-600">{unit.bloodType}</Badge>
+              </TableCell>
+              <TableCell>{unit.component}</TableCell>
+              <TableCell>
+                <Badge variant={unit.status === 'AVAILABLE' ? 'default' : 'secondary'} className={unit.status === 'AVAILABLE' ? 'bg-green-600' : ''}>
+                  {unit.status}
+                </Badge>
+              </TableCell>
+              <TableCell className="text-slate-500">
+                {format(new Date(unit.expiresAt), 'MMM d, yyyy')}
+              </TableCell>
+            </TableRow>
+          ))}
+        </TableBody>
+      </Table>
+    </div>
+  );
+
+  const renderOrders = (orders: any[]) => (
+    <div className="space-y-4">
+      <h3 className="text-lg font-semibold flex items-center gap-2">
+        <span className="w-2 h-2 rounded-full bg-green-500" /> Market Orders ({orders.length})
+      </h3>
+      <Table>
+        <TableHeader>
+          <TableRow>
+            <TableHead>Order ID</TableHead>
+            <TableHead>Blood Type</TableHead>
+            <TableHead>Quantity</TableHead>
+            <TableHead>Status</TableHead>
+            <TableHead>Date</TableHead>
+          </TableRow>
+        </TableHeader>
+        <TableBody>
+          {orders.map((order) => (
+            <TableRow key={order.id} className="hover:bg-slate-50 transition-colors">
+              <TableCell className="font-mono text-xs">{order.id.slice(0, 8)}...</TableCell>
+              <TableCell><Badge variant="outline">{order.bloodType}</Badge></TableCell>
+              <TableCell>{order.quantity} units</TableCell>
+              <TableCell>
+                <Badge className={order.status === 'DELIVERED' ? 'bg-green-600' : 'bg-orange-500'}>
+                  {order.status}
+                </Badge>
+              </TableCell>
+              <TableCell className="text-slate-500">
+                {format(new Date(order.createdAt), 'MMM d, yyyy')}
+              </TableCell>
+            </TableRow>
+          ))}
+        </TableBody>
+      </Table>
+    </div>
+  );
+
+  return (
+    <Card className="border-none shadow-2xl bg-white/80 dark:bg-slate-900/80 backdrop-blur-xl">
+      <CardContent className="p-8 space-y-12">
+        {!data || (Array.isArray(data) && data.length === 0) ? (
+          <div className="text-center py-20 text-slate-400">
+            No records found. Adjust your filters to see results.
+          </div>
+        ) : (
+          <>
+            {data.donors && data.donors[0] && renderDonors(data.donors[0])}
+            {data.units && data.units[0] && renderUnits(data.units[0])}
+            {data.orders && data.orders[0] && renderOrders(data.orders[0])}
+          </>
+        )}
+      </CardContent>
+    </Card>
+  );
+}
diff --git a/frontend/health-chain/components/admin/reporting/SummaryCards.tsx b/frontend/health-chain/components/admin/reporting/SummaryCards.tsx
new file mode 100644
index 00000000..0ce38cec
--- /dev/null
+++ b/frontend/health-chain/components/admin/reporting/SummaryCards.tsx
@@ -0,0 +1,51 @@
+'use client';
+
+import React from 'react';
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
+import { Users, Droplet, ShoppingCart, AlertTriangle } from 'lucide-react';
+
+interface SummaryData {
+  donors: number;
+  units: number;
+  orders: number;
+  disputes: number;
+}
+
+interface SummaryCardsProps {
+  data?: SummaryData;
+  isLoading?: boolean;
+}
+
+export function SummaryCards({ data, isLoading }: SummaryCardsProps) {
+  const cards = [
+    { title: 'Total Donors', value: data?.donors || 0, icon: Users, color: 'text-blue-600', bg: 'bg-blue-50' },
+    { title: 'Blood Units', value: data?.units || 0, icon: Droplet, color: 'text-red-600', bg: 'bg-red-50' },
+    { title: 'Market Orders', value: data?.orders || 0, icon: ShoppingCart, color: 'text-green-600', bg: 'bg-green-50' },
+    { title: 'Active Disputes', value: data?.disputes || 0, icon: AlertTriangle, color: 'text-orange-600', bg: 'bg-orange-50' },
+  ];
+
+  return (
+    <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6 mb-8">
+      {cards.map((card, i) => (
+        <Card key={i} className="border-none shadow-xl bg-white/40 backdrop-blur-md overflow-hidden dark:bg-slate-800/40">
+          <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+            <CardTitle className="text-sm font-medium text-slate-500 dark:text-slate-400">{card.title}</CardTitle>
+            <div className={`p-2 rounded-xl ${card.bg} dark:bg-slate-700`}>
+              <card.icon className={`h-4 w-4 ${card.color}`} />
+            </div>
+          </CardHeader>
+          <CardContent>
+            {isLoading ? (
+              <div className="h-8 w-16 bg-slate-200 animate-pulse rounded" />
+            ) : (
+              <div className="text-3xl font-bold tracking-tight text-slate-900 dark:text-white">
+                {card.value.toLocaleString()}
+              </div>
+            )}
+            <p className="text-xs text-slate-400 mt-1">Based on current filters</p>
+          </CardContent>
+        </Card>
+      ))}
+    </div>
+  );
+}
diff --git a/frontend/health-chain/components/orders/new/Step1BloodSelection.tsx b/frontend/health-chain/components/orders/new/Step1BloodSelection.tsx
index f7782bd2..c52ddfff 100644
--- a/frontend/health-chain/components/orders/new/Step1BloodSelection.tsx
+++ b/frontend/health-chain/components/orders/new/Step1BloodSelection.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from "react";
 import { BloodType } from "@/lib/types/orders";
+import { useTranslations } from 'next-intl';
 
 const BLOOD_TYPES: BloodType[] = ["A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-"];
 
@@ -14,6 +15,7 @@ export const Step1BloodSelection: React.FC<Step1Props> = ({
   quantity: initialQuantity,
   onNext,
 }) => {
+  const t = useTranslations('CreateRequest.step1');
   const [selectedBloodType, setSelectedBloodType] = useState<BloodType | null>(
     initialBloodType,
   );
@@ -22,11 +24,11 @@ export const Step1BloodSelection: React.FC<Step1Props> = ({
 
   const handleNext = () => {
     if (!selectedBloodType) {
-      setError("Please select a blood type.");
+      setError(t('errorSelectType'));
       return;
     }
     if (quantity < 1 || quantity > 50) {
-      setError("Quantity must be between 1 and 50 units.");
+      setError(t('errorInvalidQuantity'));
       return;
     }
     setError(null);
@@ -34,24 +36,26 @@ export const Step1BloodSelection: React.FC<Step1Props> = ({
   };
 
   return (
-    <div>
-      <h2 className="text-xl font-bold text-gray-900 mb-1">
-        Select Blood Type & Quantity
+    <div role="group" aria-labelledby="step1-title">
+      <h2 id="step1-title" className="text-xl font-bold text-gray-900 mb-1">
+        {t('title')}
       </h2>
       <p className="text-sm text-gray-500 mb-6">
-        Choose the blood type and the number of units required.
+        {t('description')}
       </p>
 
       <div className="mb-6">
-        <label className="block text-sm font-semibold text-gray-700 mb-3">
-          Blood Type
+        <label id="blood-type-label" className="block text-sm font-semibold text-gray-700 mb-3">
+          {t('bloodType')}
         </label>
-        <div className="grid grid-cols-4 gap-3">
+        <div className="grid grid-cols-4 gap-3" role="radiogroup" aria-labelledby="blood-type-label">
           {BLOOD_TYPES.map((bt) => (
             <button
               key={bt}
               onClick={() => setSelectedBloodType(bt)}
-              className={`h-14 rounded-xl border-2 font-bold text-lg transition-all ${
+              aria-checked={selectedBloodType === bt}
+              role="radio"
+              className={`h-14 rounded-xl border-2 font-bold text-lg transition-all focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-black outline-none ${
                 selectedBloodType === bt
                   ? "border-black bg-black text-white"
                   : "border-gray-200 bg-white text-gray-700 hover:border-gray-400"
@@ -64,17 +68,19 @@ export const Step1BloodSelection: React.FC<Step1Props> = ({
       </div>
 
       <div className="mb-8">
-        <label className="block text-sm font-semibold text-gray-700 mb-3">
-          Quantity <span className="font-normal text-gray-400">(units)</span>
+        <label htmlFor="quantity-input" className="block text-sm font-semibold text-gray-700 mb-3">
+          {t('quantity')} <span className="font-normal text-gray-400">({t('quantity').toLowerCase() === 'quantity' ? 'units' : 'unités'})</span>
         </label>
         <div className="flex items-center gap-4">
           <button
             onClick={() => setQuantity((q) => Math.max(1, q - 1))}
-            className="w-10 h-10 rounded-full border-2 border-gray-200 flex items-center justify-center text-xl font-bold text-gray-600 hover:border-gray-400 transition-colors"
+            aria-label="Decrease quantity"
+            className="w-10 h-10 rounded-full border-2 border-gray-200 flex items-center justify-center text-xl font-bold text-gray-600 hover:border-gray-400 transition-colors focus-visible:ring-2 focus-visible:ring-black outline-none"
           >
             -
           </button>
           <input
+            id="quantity-input"
             type="number"
             min={1}
             max={50}
@@ -84,25 +90,26 @@ export const Step1BloodSelection: React.FC<Step1Props> = ({
           />
           <button
             onClick={() => setQuantity((q) => Math.min(50, q + 1))}
-            className="w-10 h-10 rounded-full border-2 border-gray-200 flex items-center justify-center text-xl font-bold text-gray-600 hover:border-gray-400 transition-colors"
+            aria-label="Increase quantity"
+            className="w-10 h-10 rounded-full border-2 border-gray-200 flex items-center justify-center text-xl font-bold text-gray-600 hover:border-gray-400 transition-colors focus-visible:ring-2 focus-visible:ring-black outline-none"
           >
             +
           </button>
-          <span className="text-sm text-gray-500">Max 50 units per order</span>
+          <span className="text-sm text-gray-500">{t('maxUnits')}</span>
         </div>
       </div>
 
       {error && (
-        <p className="mb-4 text-sm text-red-600 bg-red-50 px-3 py-2 rounded-lg">
+        <p className="mb-4 text-sm text-red-600 bg-red-50 px-3 py-2 rounded-lg" role="alert">
           {error}
         </p>
       )}
 
       <button
         onClick={handleNext}
-        className="w-full py-3 bg-black text-white font-semibold rounded-xl hover:bg-gray-800 transition-colors"
+        className="w-full py-3 bg-black text-white font-semibold rounded-xl hover:bg-gray-800 transition-colors focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-black outline-none"
       >
-        View Available Blood Banks
+        {t('cta')}
       </button>
     </div>
   );
diff --git a/frontend/health-chain/components/orders/new/Step2BloodBankSelection.tsx b/frontend/health-chain/components/orders/new/Step2BloodBankSelection.tsx
index 19ea5ffc..b2aa3977 100644
--- a/frontend/health-chain/components/orders/new/Step2BloodBankSelection.tsx
+++ b/frontend/health-chain/components/orders/new/Step2BloodBankSelection.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import { BloodBankAvailability, BloodType, StockLevel } from "@/lib/types/orders";
 import { BloodBankMap } from "./BloodBankMap";
 import { AlertCircle, Clock, MapPin, RefreshCw } from "lucide-react";
+import { useTranslations } from 'next-intl';
 
 interface Step2Props {
   bloodType: BloodType;
@@ -19,13 +20,6 @@ interface Step2Props {
   onRefresh: () => void;
 }
 
-const STOCK_BADGE: Record<StockLevel, { label: string; classes: string }> = {
-  adequate: { label: "Adequate", classes: "bg-green-100 text-green-700" },
-  low: { label: "Low Stock", classes: "bg-amber-100 text-amber-700" },
-  critical: { label: "Critical", classes: "bg-red-100 text-red-700" },
-  out_of_stock: { label: "Out of Stock", classes: "bg-gray-100 text-gray-500" },
-};
-
 export const Step2BloodBankSelection: React.FC<Step2Props> = ({
   bloodType,
   quantity,
@@ -41,6 +35,16 @@ export const Step2BloodBankSelection: React.FC<Step2Props> = ({
   onBack,
   onRefresh,
 }) => {
+  const t = useTranslations('CreateRequest.step2');
+  const commonT = useTranslations('Common');
+  
+  const STOCK_BADGE: Record<StockLevel, { label: string; classes: string }> = {
+    adequate: { label: t('stockLevels.adequate'), classes: "bg-green-100 text-green-700" },
+    low: { label: t('stockLevels.low'), classes: "bg-amber-100 text-amber-700" },
+    critical: { label: t('stockLevels.critical'), classes: "bg-red-100 text-red-700" },
+    out_of_stock: { label: t('stockLevels.outOfStock'), classes: "bg-gray-100 text-gray-500" },
+  };
+
   const selectedBank = bloodBanks.find((b) => b.id === selectedBankId);
   const canProceed =
     selectedBank &&
@@ -48,27 +52,26 @@ export const Step2BloodBankSelection: React.FC<Step2Props> = ({
     selectedBank.stockLevel !== "out_of_stock";
 
   return (
-    <div>
-      <h2 className="text-xl font-bold text-gray-900 mb-1">Select a Blood Bank</h2>
+    <div role="group" aria-labelledby="step2-title">
+      <h2 id="step2-title" className="text-xl font-bold text-gray-900 mb-1">{t('title')}</h2>
       <p className="text-sm text-gray-500 mb-2">
-        Showing availability for{" "}
-        <span className="font-semibold text-black">{bloodType}</span> — {quantity}{" "}
-        {quantity === 1 ? "unit" : "units"} needed. Sorted by distance.
+        {t('description')}
       </p>
 
       {/* Last updated + refresh */}
       <div className="flex items-center justify-between mb-4">
-        <span className="text-xs text-gray-400">
+        <span className="text-xs text-gray-400" aria-live="polite">
           {lastUpdated
-            ? `Updated ${Math.round((Date.now() - lastUpdated.getTime()) / 1000)}s ago`
-            : "Fetching availability..."}
+            ? t('lastUpdated', { seconds: Math.round((Date.now() - lastUpdated.getTime()) / 1000) })
+            : t('fetching')}
         </span>
         <button
           onClick={onRefresh}
-          className="flex items-center gap-1 text-xs text-gray-500 hover:text-black transition-colors"
+          className="flex items-center gap-1 text-xs text-gray-500 hover:text-black transition-colors focus-visible:ring-1 focus-visible:ring-black rounded px-1 outline-none"
+          aria-label={t('refreshCta')}
         >
-          <RefreshCw size={12} />
-          Refresh
+          <RefreshCw size={12} aria-hidden="true" />
+          {t('refreshCta')}
         </button>
       </div>
 
@@ -82,39 +85,38 @@ export const Step2BloodBankSelection: React.FC<Step2Props> = ({
           bloodType={bloodType}
           onSelect={onSelectBank}
         />
-        <div className="flex items-center gap-4 mt-2 text-xs text-gray-500">
+        <div className="flex items-center gap-4 mt-2 text-xs text-gray-500" aria-label="Stock level legend">
           <span className="flex items-center gap-1">
-            <span className="w-3 h-3 rounded-full bg-[#00BFA5] inline-block" /> Adequate
+            <span className="w-3 h-3 rounded-full bg-[#00BFA5] inline-block" aria-hidden="true" /> {t('stockLevels.adequate')}
           </span>
           <span className="flex items-center gap-1">
-            <span className="w-3 h-3 rounded-full bg-[#FFA500] inline-block" /> Low
+            <span className="w-3 h-3 rounded-full bg-[#FFA500] inline-block" aria-hidden="true" /> {t('stockLevels.low')}
           </span>
           <span className="flex items-center gap-1">
-            <span className="w-3 h-3 rounded-full bg-[#D32F2F] inline-block" /> Critical
+            <span className="w-3 h-3 rounded-full bg-[#D32F2F] inline-block" aria-hidden="true" /> {t('stockLevels.critical')}
           </span>
           <span className="flex items-center gap-1">
-            <span className="w-3 h-3 rounded-full bg-gray-400 inline-block" /> Out of
-            Stock
+            <span className="w-3 h-3 rounded-full bg-gray-400 inline-block" aria-hidden="true" /> {t('stockLevels.outOfStock')}
           </span>
         </div>
       </div>
 
       {error && (
-        <div className="mb-4 flex items-center gap-2 p-3 bg-red-50 border border-red-200 rounded-lg text-sm text-red-700">
-          <AlertCircle size={16} />
+        <div className="mb-4 flex items-center gap-2 p-3 bg-red-50 border border-red-200 rounded-lg text-sm text-red-700" role="alert">
+          <AlertCircle size={16} aria-hidden="true" />
           {error}
         </div>
       )}
 
       {/* Blood bank list */}
-      <div className="space-y-3 mb-6">
+      <div className="space-y-3 mb-6" role="list" aria-label="Available Blood Banks">
         {loading && bloodBanks.length === 0 ? (
           Array.from({ length: 3 }).map((_, i) => (
-            <div key={i} className="h-24 bg-gray-100 rounded-xl animate-pulse" />
+            <div key={i} className="h-24 bg-gray-100 rounded-xl animate-pulse" role="presentation" />
           ))
         ) : bloodBanks.length === 0 ? (
-          <div className="py-10 text-center text-gray-400">
-            No blood banks found nearby.
+          <div className="py-10 text-center text-gray-400" role="status">
+            {t('noBanksFound')}
           </div>
         ) : (
           bloodBanks.map((bank) => {
@@ -129,7 +131,9 @@ export const Step2BloodBankSelection: React.FC<Step2Props> = ({
                 key={bank.id}
                 onClick={() => !isOutOfStock && onSelectBank(bank.id)}
                 disabled={isOutOfStock}
-                className={`w-full text-left p-4 rounded-xl border-2 transition-all ${
+                role="listitem"
+                aria-selected={isSelected}
+                className={`w-full text-left p-4 rounded-xl border-2 transition-all focus-visible:ring-2 focus-visible:ring-black focus-visible:ring-offset-2 outline-none ${
                   isSelected
                     ? "border-black bg-gray-50"
                     : isOutOfStock
@@ -141,20 +145,19 @@ export const Step2BloodBankSelection: React.FC<Step2Props> = ({
                   <div className="flex-1 min-w-0">
                     <p className="font-semibold text-gray-900 truncate">{bank.name}</p>
                     <p className="flex items-center gap-1 text-xs text-gray-500 mt-0.5">
-                      <MapPin size={11} />
-                      {bank.distanceKm.toFixed(1)} km away
+                      <MapPin size={11} aria-hidden="true" />
+                      {t('distance', { distance: bank.distanceKm.toFixed(1) })}
                     </p>
                     {isOutOfStock && (
-                      <p className="mt-1 text-xs text-red-600 flex items-center gap-1">
-                        <AlertCircle size={11} />
-                        No {bloodType} stock available
+                      <p className="mt-1 text-xs text-red-600 flex items-center gap-1" role="status">
+                        <AlertCircle size={11} aria-hidden="true" />
+                        {t('noStock', { type: bloodType })}
                       </p>
                     )}
                     {!isOutOfStock && !hasEnough && (
-                      <p className="mt-1 text-xs text-amber-600 flex items-center gap-1">
-                        <AlertCircle size={11} />
-                        Only {stock} {stock === 1 ? "unit" : "units"} available — you need{" "}
-                        {quantity}
+                      <p className="mt-1 text-xs text-amber-600 flex items-center gap-1" role="status">
+                        <AlertCircle size={11} aria-hidden="true" />
+                        {t('notEnoughStock', { count: stock, needed: quantity })}
                       </p>
                     )}
                   </div>
@@ -165,10 +168,11 @@ export const Step2BloodBankSelection: React.FC<Step2Props> = ({
                       {badge.label}
                     </span>
                     <span className="text-xs text-gray-500 font-medium">
-                      {stock} units
+                      {t('unitsCount', { count: stock })}
                     </span>
                     <span className="flex items-center gap-1 text-xs text-gray-400">
-                      <Clock size={11} />~{bank.estimatedDeliveryMinutes} min
+                      <Clock size={11} aria-hidden="true" />
+                      ~{t('deliveryTime', { minutes: bank.estimatedDeliveryMinutes })}
                     </span>
                   </div>
                 </div>
@@ -181,16 +185,16 @@ export const Step2BloodBankSelection: React.FC<Step2Props> = ({
       <div className="flex gap-3">
         <button
           onClick={onBack}
-          className="flex-1 py-3 border-2 border-gray-200 text-gray-700 font-semibold rounded-xl hover:border-gray-400 transition-colors"
+          className="flex-1 py-3 border-2 border-gray-200 text-gray-700 font-semibold rounded-xl hover:border-gray-400 transition-colors focus-visible:ring-2 focus-visible:ring-black outline-none"
         >
-          Back
+          {commonT('back')}
         </button>
         <button
           onClick={onNext}
           disabled={!canProceed}
-          className="flex-1 py-3 bg-black text-white font-semibold rounded-xl hover:bg-gray-800 disabled:opacity-40 disabled:cursor-not-allowed transition-colors"
+          className="flex-1 py-3 bg-black text-white font-semibold rounded-xl hover:bg-gray-800 disabled:opacity-40 disabled:cursor-not-allowed transition-colors focus-visible:ring-2 focus-visible:ring-black outline-none"
         >
-          Review Order
+          {t('cta')}
         </button>
       </div>
     </div>
diff --git a/frontend/health-chain/components/orders/new/Step3Confirmation.tsx b/frontend/health-chain/components/orders/new/Step3Confirmation.tsx
index dd8778b0..315238b8 100644
--- a/frontend/health-chain/components/orders/new/Step3Confirmation.tsx
+++ b/frontend/health-chain/components/orders/new/Step3Confirmation.tsx
@@ -1,6 +1,7 @@
 import React, { useState } from "react";
 import { BloodBankAvailability, BloodType } from "@/lib/types/orders";
 import { CheckCircle2, Clock, MapPin, Droplets, Loader2 } from "lucide-react";
+import { useTranslations } from 'next-intl';
 
 interface Step3Props {
   bloodType: BloodType;
@@ -17,6 +18,11 @@ export const Step3Confirmation: React.FC<Step3Props> = ({
   onConfirm,
   onBack,
 }) => {
+  const t = useTranslations('CreateRequest.step3');
+  const step1T = useTranslations('CreateRequest.step1');
+  const step2T = useTranslations('CreateRequest.step2');
+  const commonT = useTranslations('Common');
+  
   const [submitting, setSubmitting] = useState(false);
   const [submitError, setSubmitError] = useState<string | null>(null);
 
@@ -27,51 +33,51 @@ export const Step3Confirmation: React.FC<Step3Props> = ({
       await onConfirm();
     } catch (err) {
       setSubmitError(
-        err instanceof Error ? err.message : "Failed to place order. Please try again.",
+        err instanceof Error ? err.message : t('submitError'),
       );
       setSubmitting(false);
     }
   };
 
   return (
-    <div>
-      <h2 className="text-xl font-bold text-gray-900 mb-1">Confirm Your Order</h2>
+    <div role="group" aria-labelledby="step3-title">
+      <h2 id="step3-title" className="text-xl font-bold text-gray-900 mb-1">{t('title')}</h2>
       <p className="text-sm text-gray-500 mb-6">
-        Review the details below before placing your order.
+        {t('description')}
       </p>
 
-      <div className="bg-gray-50 rounded-2xl p-5 space-y-4 mb-6">
+      <div className="bg-gray-50 rounded-2xl p-5 space-y-4 mb-6" role="region" aria-label={t('summary')}>
         {/* Blood type + quantity */}
         <div className="flex items-center gap-4">
-          <div className="w-12 h-12 bg-black text-white rounded-xl flex items-center justify-center font-bold text-lg shrink-0">
+          <div className="w-12 h-12 bg-black text-white rounded-xl flex items-center justify-center font-bold text-lg shrink-0" aria-hidden="true">
             {bloodType}
           </div>
           <div>
             <p className="text-xs text-gray-500 uppercase tracking-wide font-medium">
-              Blood Type
+              {step1T('bloodType')}
             </p>
             <p className="text-lg font-bold text-gray-900">{bloodType}</p>
           </div>
           <div className="ml-auto text-right">
             <p className="text-xs text-gray-500 uppercase tracking-wide font-medium">
-              Quantity
+              {step1T('quantity')}
             </p>
             <p className="text-lg font-bold text-gray-900">
-              {quantity} {quantity === 1 ? "unit" : "units"}
+              {step2T('unitsCount', { count: quantity })}
             </p>
           </div>
         </div>
 
-        <div className="border-t border-gray-200" />
+        <div className="border-t border-gray-200" aria-hidden="true" />
 
         {/* Blood bank */}
         <div className="flex items-start gap-3">
           <div className="w-8 h-8 rounded-full bg-white border border-gray-200 flex items-center justify-center shrink-0 mt-0.5">
-            <Droplets size={16} className="text-red-500" />
+            <Droplets size={16} className="text-red-500" aria-hidden="true" />
           </div>
           <div>
             <p className="text-xs text-gray-500 uppercase tracking-wide font-medium">
-              Blood Bank
+              {t('bankLabel')}
             </p>
             <p className="font-semibold text-gray-900">{bloodBank.name}</p>
           </div>
@@ -80,14 +86,14 @@ export const Step3Confirmation: React.FC<Step3Props> = ({
         {/* Location */}
         <div className="flex items-start gap-3">
           <div className="w-8 h-8 rounded-full bg-white border border-gray-200 flex items-center justify-center shrink-0 mt-0.5">
-            <MapPin size={16} className="text-gray-500" />
+            <MapPin size={16} className="text-gray-500" aria-hidden="true" />
           </div>
           <div>
             <p className="text-xs text-gray-500 uppercase tracking-wide font-medium">
-              Distance
+              {step1T('quantity').toLowerCase() === 'quantity' ? 'Distance' : 'Distance'}
             </p>
             <p className="font-semibold text-gray-900">
-              {bloodBank.distanceKm.toFixed(1)} km away
+              {step2T('distance', { distance: bloodBank.distanceKm.toFixed(1) })}
             </p>
           </div>
         </div>
@@ -95,32 +101,31 @@ export const Step3Confirmation: React.FC<Step3Props> = ({
         {/* Estimated delivery */}
         <div className="flex items-start gap-3">
           <div className="w-8 h-8 rounded-full bg-white border border-gray-200 flex items-center justify-center shrink-0 mt-0.5">
-            <Clock size={16} className="text-amber-500" />
+            <Clock size={16} className="text-amber-500" aria-hidden="true" />
           </div>
           <div>
             <p className="text-xs text-gray-500 uppercase tracking-wide font-medium">
-              Estimated Delivery
+              {t('deliveryLabel')}
             </p>
             <p className="font-semibold text-gray-900">
-              ~{bloodBank.estimatedDeliveryMinutes} minutes
+              ~{step2T('deliveryTime', { minutes: bloodBank.estimatedDeliveryMinutes })}
             </p>
           </div>
         </div>
 
-        <div className="border-t border-gray-200" />
+        <div className="border-t border-gray-200" aria-hidden="true" />
 
         {/* Confirmation note */}
         <div className="flex items-start gap-2">
-          <CheckCircle2 size={16} className="text-green-600 shrink-0 mt-0.5" />
+          <CheckCircle2 size={16} className="text-green-600 shrink-0 mt-0.5" aria-hidden="true" />
           <p className="text-xs text-gray-500 leading-relaxed">
-            By confirming, you authorize the placement of this order. A rider will be
-            dispatched once the blood bank confirms availability.
+            {t('confirmationNote')}
           </p>
         </div>
       </div>
 
       {submitError && (
-        <p className="mb-4 text-sm text-red-600 bg-red-50 px-3 py-2 rounded-lg">
+        <p className="mb-4 text-sm text-red-600 bg-red-50 px-3 py-2 rounded-lg" role="alert">
           {submitError}
         </p>
       )}
@@ -129,22 +134,22 @@ export const Step3Confirmation: React.FC<Step3Props> = ({
         <button
           onClick={onBack}
           disabled={submitting}
-          className="flex-1 py-3 border-2 border-gray-200 text-gray-700 font-semibold rounded-xl hover:border-gray-400 disabled:opacity-40 transition-colors"
+          className="flex-1 py-3 border-2 border-gray-200 text-gray-700 font-semibold rounded-xl hover:border-gray-400 disabled:opacity-40 transition-colors focus-visible:ring-2 focus-visible:ring-black outline-none"
         >
-          Back
+          {commonT('back')}
         </button>
         <button
           onClick={handleConfirm}
           disabled={submitting}
-          className="flex-1 py-3 bg-black text-white font-semibold rounded-xl hover:bg-gray-800 disabled:opacity-60 transition-colors flex items-center justify-center gap-2"
+          className="flex-1 py-3 bg-black text-white font-semibold rounded-xl hover:bg-gray-800 disabled:opacity-60 transition-colors flex items-center justify-center gap-2 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-black outline-none"
         >
           {submitting ? (
             <>
-              <Loader2 size={16} className="animate-spin" />
-              Placing Order...
+              <Loader2 size={16} className="animate-spin" aria-hidden="true" />
+              {t('submitting')}
             </>
           ) : (
-            "Place Order"
+            t('cta')
           )}
         </button>
       </div>
diff --git a/frontend/health-chain/components/providers/ToastProvider.tsx b/frontend/health-chain/components/providers/ToastProvider.tsx
index 31b0b0a0..6d993675 100644
--- a/frontend/health-chain/components/providers/ToastProvider.tsx
+++ b/frontend/health-chain/components/providers/ToastProvider.tsx
@@ -9,8 +9,10 @@ import { useEffect } from 'react';
 import { useSearchParams } from 'next/navigation';
 import { Toast } from '../ui/Toast';
 import { useToast } from '../../lib/hooks/useToast';
+import { useTranslations } from 'next-intl';
 
 export function ToastProvider({ children }: { children: React.ReactNode }) {
+  const t = useTranslations('Toasts');
   const { toasts, hideToast, error } = useToast();
   const searchParams = useSearchParams();
 
@@ -19,7 +21,7 @@ export function ToastProvider({ children }: { children: React.ReactNode }) {
     const reason = searchParams.get('reason');
     
     if (reason === 'session_expired') {
-      error('Your session has expired. Please sign in again.');
+      error(t('sessionExpired'));
       
       // Clean up URL
       if (typeof window !== 'undefined') {
@@ -28,12 +30,12 @@ export function ToastProvider({ children }: { children: React.ReactNode }) {
         window.history.replaceState({}, '', url.toString());
       }
     }
-  }, [searchParams, error]);
+  }, [searchParams, error, t]);
 
   return (
     <>
       {children}
-      <div className="fixed top-4 right-4 z-50 flex flex-col gap-2">
+      <div className="fixed top-4 right-4 z-50 flex flex-col gap-2" role="region" aria-live="polite" aria-label="Notifications">
         {toasts.map((toast) => (
           <Toast
             key={toast.id}
diff --git a/frontend/health-chain/i18n/request.ts b/frontend/health-chain/i18n/request.ts
new file mode 100644
index 00000000..4da9d1b1
--- /dev/null
+++ b/frontend/health-chain/i18n/request.ts
@@ -0,0 +1,17 @@
+import {getRequestConfig} from 'next-intl/server';
+import {routing} from './routing';
+ 
+export default getRequestConfig(async ({requestLocale}) => {
+  // This typically corresponds to the `[locale]` segment
+  let locale = await requestLocale;
+ 
+  // Ensure that a valid locale is used
+  if (!locale || !routing.locales.includes(locale as any)) {
+    locale = routing.defaultLocale;
+  }
+ 
+  return {
+    locale,
+    messages: (await import(`../messages/${locale}.json`)).default
+  };
+});
diff --git a/frontend/health-chain/i18n/routing.ts b/frontend/health-chain/i18n/routing.ts
new file mode 100644
index 00000000..f390f3dd
--- /dev/null
+++ b/frontend/health-chain/i18n/routing.ts
@@ -0,0 +1,15 @@
+import {defineRouting} from 'next-intl/routing';
+import {createNavigation} from 'next-intl/navigation';
+ 
+export const routing = defineRouting({
+  // A list of all locales that are supported
+  locales: ['en', 'fr'],
+ 
+  // Used when no locale matches
+  defaultLocale: 'en'
+});
+ 
+// Lightweight wrappers around Next.js navigation APIs
+// that will consider the routing configuration
+export const {Link, redirect, usePathname, useRouter, getPathname} =
+  createNavigation(routing);
diff --git a/frontend/health-chain/messages/en.json b/frontend/health-chain/messages/en.json
new file mode 100644
index 00000000..01df5708
--- /dev/null
+++ b/frontend/health-chain/messages/en.json
@@ -0,0 +1,91 @@
+{
+  "Dashboard": {
+    "title": "Admin Overview",
+    "description": "Monitoring blood distribution and emergency requests.",
+    "stats": {
+      "bloodUnits": "Total Blood Units",
+      "pendingRequests": "Pending Requests",
+      "activeDeliveries": "Active Deliveries",
+      "totalDonors": "Total Donors"
+    },
+    "criticalRequests": "Critical Requests",
+    "table": {
+      "bloodType": "Blood Type",
+      "hospital": "Hospital",
+      "status": "Status",
+      "unit": "Unit"
+    },
+    "recentActivity": "Recent Activity",
+    "viewActivityLog": "View Activity Log"
+  },
+  "Navbar": {
+    "home": "Home",
+    "about": "About Us",
+    "findBlood": "Find Blood",
+    "transparency": "Transparency",
+    "register": "Register Now",
+    "enterApp": "Enter App"
+  },
+  "Common": {
+    "createRequest": "Create Request",
+    "loading": "Loading...",
+    "error": "An unexpected error occurred",
+    "refresh": "Refresh",
+    "close": "Close",
+    "next": "Next",
+    "back": "Back",
+    "confirm": "Confirm"
+  },
+  "CreateRequest": {
+    "step1": {
+      "title": "Select Blood Type & Quantity",
+      "description": "Choose the blood type and the number of units required.",
+      "bloodType": "Blood Type",
+      "quantity": "Quantity",
+      "maxUnits": "Max 50 units per order",
+      "errorSelectType": "Please select a blood type.",
+      "errorInvalidQuantity": "Quantity must be between 1 and 50 units.",
+      "cta": "View Available Blood Banks"
+    },
+    "step2": {
+      "title": "Select Blood Bank",
+      "description": "Choose a nearby blood bank with available stock.",
+      "distance": "{distance} km away",
+      "available": "{count} units available",
+      "cta": "Review Request"
+    },
+    "step3": {
+      "title": "Confirm Request",
+      "description": "Review your request details before submitting.",
+      "summary": "Request Summary",
+      "cta": "Submit Request",
+      "bankLabel": "Blood Bank",
+      "deliveryLabel": "Estimated Delivery",
+      "confirmationNote": "By confirming, you authorize the placement of this order. A rider will be dispatched once the blood bank confirms availability."
+    }
+  },
+  "VerificationConsole": {
+    "title": "Organization Verification Console",
+    "noPending": "No pending verifications",
+    "verifiedAt": "Verified At",
+    "syncedAt": "Synced At",
+    "txHash": "TX Hash",
+    "errorLabel": "Error",
+    "retries": "Retries",
+    "retrying": "Retrying...",
+    "retry": "Retry",
+    "syncStatuses": {
+      "pending": "Pending",
+      "syncing": "Syncing",
+      "synced": "Synced",
+      "failed": "Failed",
+      "mismatch": "Mismatch"
+    }
+  },
+  "Toasts": {
+    "sessionExpired": "Your session has expired. Please sign in again.",
+    "errorOccurred": "An unexpected error occurred.",
+    "requestCreated": "Blood request created successfully.",
+    "syncRetrying": "Attempting to retry synchronization..."
+  }
+}
diff --git a/frontend/health-chain/messages/fr.json b/frontend/health-chain/messages/fr.json
new file mode 100644
index 00000000..65800e4f
--- /dev/null
+++ b/frontend/health-chain/messages/fr.json
@@ -0,0 +1,91 @@
+{
+  "Dashboard": {
+    "title": "Aperçu de l'administration",
+    "description": "Surveillance de la distribution du sang et des demandes d'urgence.",
+    "stats": {
+      "bloodUnits": "Unités totales de sang",
+      "pendingRequests": "Demandes en attente",
+      "activeDeliveries": "Livraisons actives",
+      "totalDonors": "Total des donneurs"
+    },
+    "criticalRequests": "Demandes critiques",
+    "table": {
+      "bloodType": "Groupe sanguin",
+      "hospital": "Hôpital",
+      "status": "Statut",
+      "unit": "Unité"
+    },
+    "recentActivity": "Activité récente",
+    "viewActivityLog": "Voir le journal d'activité"
+  },
+  "Navbar": {
+    "home": "Accueil",
+    "about": "À propos de nous",
+    "findBlood": "Trouver du sang",
+    "transparency": "Transparence",
+    "register": "S'inscrire maintenant",
+    "enterApp": "Entrer dans l'application"
+  },
+  "Common": {
+    "createRequest": "Créer une demande",
+    "loading": "Chargement...",
+    "error": "Une erreur inattendue s'est produite",
+    "refresh": "Actualiser",
+    "close": "Fermer",
+    "next": "Suivant",
+    "back": "Retour",
+    "confirm": "Confirmer"
+  },
+  "CreateRequest": {
+    "step1": {
+      "title": "Choisir le groupe sanguin et la quantité",
+      "description": "Choisissez le groupe sanguin et le nombre d'unités requises.",
+      "bloodType": "Groupe sanguin",
+      "quantity": "Quantité",
+      "maxUnits": "Max 50 unités par commande",
+      "errorSelectType": "Veuillez sélectionner un groupe sanguin.",
+      "errorInvalidQuantity": "La quantité doit être comprise entre 1 et 50 unités.",
+      "cta": "Voir les banques de sang disponibles"
+    },
+    "step2": {
+      "title": "Sélectionner une banque de sang",
+      "description": "Choisissez une banque de sang à proximité avec du stock disponible.",
+      "distance": "à {distance} km",
+      "available": "{count} unités disponibles",
+      "cta": "Réviser la demande"
+    },
+    "step3": {
+      "title": "Confirmer la demande",
+      "description": "Vérifiez les détails de votre demande avant de la soumettre.",
+      "summary": "Résumé de la demande",
+      "cta": "Soumettre la demande",
+      "bankLabel": "Banque de sang",
+      "deliveryLabel": "Livraison estimée",
+      "confirmationNote": "En confirmant, vous autorisez le placement de cette commande. Un coursier sera dépêché dès que la banque de sang aura confirmé la disponibilité."
+    }
+  },
+  "VerificationConsole": {
+    "title": "Console de vérification des organisations",
+    "noPending": "Aucune vérification en attente",
+    "verifiedAt": "Vérifié à",
+    "syncedAt": "Synchronisé à",
+    "txHash": "Hachage TX",
+    "errorLabel": "Erreur",
+    "retries": "Tentatives",
+    "retrying": "Nouvelle tentative...",
+    "retry": "Réessayer",
+    "syncStatuses": {
+      "pending": "En attente",
+      "syncing": "Synchronisation",
+      "synced": "Synchronisé",
+      "failed": "Échoué",
+      "mismatch": "Incohérence"
+    }
+  },
+  "Toasts": {
+    "sessionExpired": "Votre session a expiré. Veuillez vous reconnecter.",
+    "errorOccurred": "Une erreur inattendue s'est produite.",
+    "requestCreated": "Demande de sang créée avec succès.",
+    "syncRetrying": "Tentative de synchronisation en cours..."
+  }
+}
diff --git a/frontend/health-chain/middleware.ts b/frontend/health-chain/middleware.ts
index 69cf64a4..24f0461f 100644
--- a/frontend/health-chain/middleware.ts
+++ b/frontend/health-chain/middleware.ts
@@ -1,76 +1,58 @@
-/**
- * Next.js Middleware for server-side route protection
- * Checks auth state and redirects unauthenticated users
- */
+import createMiddleware from 'next-intl/middleware';
+import { NextRequest, NextResponse } from 'next/server';
+import { routing } from './i18n/routing';
 
-import { NextResponse } from 'next/server';
-import type { NextRequest } from 'next/server';
+const intlMiddleware = createMiddleware(routing);
 
 // Routes that require authentication
 const PROTECTED_ROUTES = ['/dashboard'];
-
 // Routes that should redirect to dashboard if already authenticated
 const AUTH_ROUTES = ['/auth/signin', '/auth/signup'];
-
-// Routes always publicly accessible — never redirect
+// Routes always publicly accessible
 const PUBLIC_ROUTES = ['/transparency'];
 
-export function middleware(request: NextRequest) {
+export default function middleware(request: NextRequest) {
   const { pathname } = request.nextUrl;
-
-  // Get auth token from cookie or session storage (via header)
-  const authCookie = request.cookies.get('auth-storage');
   
-  // Parse auth state from cookie
-  let isAuthenticated = false;
+  // 1. Run i18n middleware first to get the locale
+  const response = intlMiddleware(request);
   
+  // 2. Auth logic
+  const authCookie = request.cookies.get('auth-storage');
+  let isAuthenticated = false;
   if (authCookie) {
     try {
       const authState = JSON.parse(authCookie.value);
       isAuthenticated = authState?.state?.isAuthenticated === true;
     } catch {
-      // Invalid cookie, treat as unauthenticated
       isAuthenticated = false;
     }
   }
 
-  // Check if current route is protected
-  const isProtectedRoute = PROTECTED_ROUTES.some((route) =>
-    pathname.startsWith(route)
-  );
+  // Remove locale prefix for routing checks
+  const pathWithoutLocale = pathname.replace(/^\/(en|fr)/, '') || '/';
 
-  // Check if current route is an auth route
-  const isAuthRoute = AUTH_ROUTES.some((route) => pathname.startsWith(route));
+  const isProtectedRoute = PROTECTED_ROUTES.some((route) => pathWithoutLocale.startsWith(route));
+  const isAuthRoute = AUTH_ROUTES.some((route) => pathWithoutLocale.startsWith(route));
+  const isPublicRoute = PUBLIC_ROUTES.some((route) => pathWithoutLocale.startsWith(route));
 
-  // Never redirect public transparency routes
-  const isPublicRoute = PUBLIC_ROUTES.some((route) => pathname.startsWith(route));
-  if (isPublicRoute) return NextResponse.next();
+  if (isPublicRoute) return response;
 
-  // Redirect unauthenticated users from protected routes
   if (isProtectedRoute && !isAuthenticated) {
-    const url = new URL('/auth/signin', request.url);
-    url.searchParams.set('redirect', pathname);
-    return NextResponse.redirect(url);
+    const locale = pathname.split('/')[1] || 'en';
+    const loginUrl = new URL(`/${locale}/auth/signin`, request.url);
+    loginUrl.searchParams.set('redirect', pathname);
+    return NextResponse.redirect(loginUrl);
   }
 
-  // Redirect authenticated users from auth routes to dashboard
   if (isAuthRoute && isAuthenticated) {
-    return NextResponse.redirect(new URL('/dashboard', request.url));
+    const locale = pathname.split('/')[1] || 'en';
+    return NextResponse.redirect(new URL(`/${locale}/dashboard`, request.url));
   }
 
-  return NextResponse.next();
+  return response;
 }
 
 export const config = {
-  matcher: [
-    /*
-     * Match all request paths except:
-     * - _next/static (static files)
-     * - _next/image (image optimization files)
-     * - favicon.ico (favicon file)
-     * - public folder
-     * - api routes
-     */
-    '/((?!_next/static|_next/image|favicon.ico|.*\\.(?:svg|png|jpg|jpeg|gif|webp)$|api).*)',
-  ],
+  matcher: ['/', '/(en|fr)/:path*', '/((?!_next/static|_next/image|favicon.ico|.*\\.(?:svg|png|jpg|jpeg|gif|webp)$|api).*)']
 };