src/app/pages/tournament-watch/tournament-watch.component.html

@@ -2,10 +2,10 @@
   <header class="watch-head">
     <a class="back-link" routerLink="/tournaments">← Tournaments</a>
     <div class="watch-title">
-      @if (snapshot?.white && snapshot?.black) {
-        <span class="player">{{ snapshot!.white!.name }}</span>
+      @if (whiteName && blackName) {
+        <span class="player">{{ whiteName }}</span>
         <span class="vs">vs</span>
-        <span class="player">{{ snapshot!.black!.name }}</span>
+        <span class="player">{{ blackName }}</span>
         @if (snapshot?.round) {
           <span class="round-tag">Round {{ snapshot!.round }}</span>
         }
@@ -24,12 +24,12 @@
   <div class="watch-layout">
     <div class="board-wrap">
       <div class="clock clock-top" [class.active]="status === 'ongoing' && turn === 'black'">
-        <span class="clock-label">{{ snapshot?.black?.name ?? 'Black' }}</span>
+        <span class="clock-label">{{ blackName ?? 'Black' }}</span>
         <span class="clock-time">{{ formatTime(clock?.blackTime) }}</span>
       </div>
       <app-chess-board [fen]="fen"></app-chess-board>
       <div class="clock clock-bot" [class.active]="status === 'ongoing' && turn === 'white'">
-        <span class="clock-label">{{ snapshot?.white?.name ?? 'White' }}</span>
+        <span class="clock-label">{{ whiteName ?? 'White' }}</span>
         <span class="clock-time">{{ formatTime(clock?.whiteTime) }}</span>
       </div>
     </div>

src/app/pages/tournament-watch/tournament-watch.component.ts

@@ -1,6 +1,7 @@
 import { Component, DestroyRef, OnInit, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { ActivatedRoute, RouterLink } from '@angular/router';
+import { from } from 'rxjs';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ChessBoardComponent } from '../../components/chess-board/chess-board.component';
 import { TournamentStreamService } from '../../services/tournament-stream.service';
@@ -25,6 +26,9 @@ export class TournamentWatchComponent implements OnInit {
   gameId = '';
   serverUrl = '';
 
+  whiteName: string | null = null;
+  blackName: string | null = null;
+
   fen = INITIAL_FEN;
   turn: 'white' | 'black' = 'white';
   status: GameStatus = 'pending';
@@ -51,6 +55,15 @@ export class TournamentWatchComponent implements OnInit {
       return;
     }
 
+    from(this.stream.fetchGame(this.serverUrl, this.tournamentId, this.gameId))
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe({
+        next: game => {
+          this.whiteName = game.white?.name ?? null;
+          this.blackName = game.black?.name ?? null;
+        },
+      });
+
     this.stream.streamGame(this.serverUrl, this.tournamentId, this.gameId)
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe({

src/app/services/tournament-stream.service.ts

@@ -1,6 +1,6 @@
 import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
-import { GameStreamEvent, TournamentStreamEvent } from '../models/tournament.models';
+import { GameStateSnapshot, GameStreamEvent, TournamentStreamEvent } from '../models/tournament.models';
 import { TournamentAuthService } from './tournament-auth.service';
 
 @Injectable({ providedIn: 'root' })
@@ -21,6 +21,16 @@ export class TournamentStreamService {
     );
   }
 
+  async fetchGame(serverUrl: string, tournamentId: string, gameId: string): Promise<GameStateSnapshot> {
+    const base = serverUrl.replace(/\/+$/, '');
+    const token = await this.auth.getToken(serverUrl);
+    const res = await fetch(`${base}/api/tournament/${tournamentId}/game/${gameId}`, {
+      headers: { Authorization: `Bearer ${token}` },
+    });
+    if (!res.ok) throw new Error(`Game fetch failed: ${res.status}`);
+    return res.json() as Promise<GameStateSnapshot>;
+  }
+
   private fullUrl(base: string, path: string): string {
     if (!base) return path;
     return `${base.replace(/\/+$/, '')}${path}`;