pokemon/nuzlocke-tracker
1
1
Fork 0
Code Issues Pull Requests 10 Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix: TypeScript build errors in RunEncounters.tsx' (#71) from feature/fix-typescript-build-errors-in-runencounterstsx into develop
All checks were successful
CI / backend-tests (push) Successful in 27s
Details
CI / frontend-tests (push) Successful in 29s
Details

Browse Source 
Reviewed-on: #71
This commit was merged in pull request #71.
This commit is contained in:
TheFurya
2026-03-21 12:26:34 +01:00
parent 7276f05dd2 5c10041b8b
commit 7e7c5e7536
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/pages/RunEncounters.tsx
View File

@@ -34,6 +34,8 @@ import type {
CreateEncounterInput, CreateEncounterInput,
BossBattle, BossBattle,
BossPokemon, BossPokemon,
BossResult,
BossResultTeamMember,
} from '../types' } from '../types'
type TeamSortKey = 'route' | 'level' | 'species' | 'dex' type TeamSortKey = 'route' | 'level' | 'species' | 'dex'
@@ -690,7 +692,7 @@ export function RunEncounters() {
// Map boss battle ID to result for team snapshot // Map boss battle ID to result for team snapshot
const bossResultByBattleId = useMemo(() => { const bossResultByBattleId = useMemo(() => {
const map = new Map<number, (typeof bossResults)[number]>() const map = new Map<number, BossResult>()
if (bossResults) { if (bossResults) {
for (const r of bossResults) { for (const r of bossResults) {
map.set(r.bossBattleId, r) map.set(r.bossBattleId, r)
@@ -1598,7 +1600,7 @@ export function RunEncounters() {
<div className="mt-3 pt-3 border-t border-border-default"> <div className="mt-3 pt-3 border-t border-border-default">
<p className="text-xs font-medium text-text-secondary mb-2">Your Team</p> <p className="text-xs font-medium text-text-secondary mb-2">Your Team</p>
<div className="flex gap-2 flex-wrap"> <div className="flex gap-2 flex-wrap">
{result.team.map((tm) => { {result.team.map((tm: BossResultTeamMember) => {
const enc = encounterById.get(tm.encounterId) const enc = encounterById.get(tm.encounterId)
if (!enc) return null if (!enc) return null
const dp = enc.currentPokemon ?? enc.pokemon const dp = enc.currentPokemon ?? enc.pokemon