diff --git a/app/components/match-page/MatchActionTab.tsx b/app/components/match-page/MatchActionTab.tsx index 632ccad79..d20e1aa24 100644 --- a/app/components/match-page/MatchActionTab.tsx +++ b/app/components/match-page/MatchActionTab.tsx @@ -133,7 +133,7 @@ export function MatchActionTab({ diff --git a/app/features/tournament-match/components/TournamentMatchActionTab.tsx b/app/features/tournament-match/components/TournamentMatchActionTab.tsx index c626d0d32..77d8bf766 100644 --- a/app/features/tournament-match/components/TournamentMatchActionTab.tsx +++ b/app/features/tournament-match/components/TournamentMatchActionTab.tsx @@ -21,7 +21,7 @@ export function TournamentMatchActionTab({ ownTeamId, }: { data: TournamentMatchLoaderData; - ownTeamId: number; + ownTeamId: number | null; }) { const { t } = useTranslation(["q"]); const tournament = useTournament(); diff --git a/app/features/tournament-match/components/TournamentMatchTabs.tsx b/app/features/tournament-match/components/TournamentMatchTabs.tsx index 54b9cf462..3cc7ea12d 100644 --- a/app/features/tournament-match/components/TournamentMatchTabs.tsx +++ b/app/features/tournament-match/components/TournamentMatchTabs.tsx @@ -62,7 +62,12 @@ export function TournamentMatchTabs({ const opponentTwoId = teamTwo.id; const pickBanTeams: [MatchPageTeam, MatchPageTeam] = [teamOne, teamTwo]; - const userTeamId = tournament.teamMemberOfByUser(user)?.id; + const userTournamentTeamId = tournament.teamMemberOfByUser(user)?.id; + const userTeamId = + userTournamentTeamId === opponentOneId || + userTournamentTeamId === opponentTwoId + ? userTournamentTeamId + : null; const pickBanData = resolveTimelinePickBanData( data, @@ -102,10 +107,7 @@ export function TournamentMatchTabs({ turnOfResult={turnOfResult} /> ) : ( - + ) ) : null} {tabs.includes(TAB_KEYS.ADMIN) ? (