From 9f34ce26f2ea5a34aa5a71d72ee76808c1e4d718 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Sun, 23 Feb 2025 11:46:49 +0200
Subject: [PATCH] Fix text when leaving a team as non-owner

---
 app/features/team/routes/t.$customUrl.tsx | 20 +++++++++++++++-----
 locales/en/team.json                      |  3 ++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/features/team/routes/t.$customUrl.tsx b/app/features/team/routes/t.$customUrl.tsx
index c825a8809..98e613a04 100644
--- a/app/features/team/routes/t.$customUrl.tsx
+++ b/app/features/team/routes/t.$customUrl.tsx
@@ -31,7 +31,12 @@ import {
 import type * as TeamRepository from "../TeamRepository.server";
 import { action } from "../actions/t.$customUrl.server";
 import { loader } from "../loaders/t.$customUrl.server";
-import { isTeamManager, isTeamMember, resolveNewOwner } from "../team-utils";
+import {
+	isTeamManager,
+	isTeamMember,
+	isTeamOwner,
+	resolveNewOwner,
+} from "../team-utils";
 import "../team.css";
 import { metaTags } from "~/utils/remix";
 export { action, loader };
@@ -202,10 +207,15 @@ function ActionButtons() {
 			) : null}
 			{isTeamMember({ user, team }) ? (
 				<FormWithConfirm
-					dialogHeading={t("team:leaveTeam.header", {
-						teamName: team.name,
-						newOwner: resolveNewOwner(team.members)?.username,
-					})}
+					dialogHeading={`${t(
+						isTeamOwner({ user, team })
+							? "team:leaveTeam.header.newOwner"
+							: "team:leaveTeam.header",
+						{
+							teamName: team.name,
+							newOwner: resolveNewOwner(team.members)?.username,
+						},
+					)}`}
 					deleteButtonText={t("team:actionButtons.leaveTeam.confirm")}
 					fields={[["_action", "LEAVE_TEAM"]]}
 				>
diff --git a/locales/en/team.json b/locales/en/team.json
index 5e8d7b00a..66154fdb3 100644
--- a/locales/en/team.json
+++ b/locales/en/team.json
@@ -3,7 +3,8 @@
 	"teamSearch.placeholder": "Search for a team or player...",
 	"actionButtons.leaveTeam": "Leave Team",
 	"actionButtons.makeMainTeam": "Make main team",
-	"leaveTeam.header": "Are you sure you want to leave {{teamName}}? New owner will be {{newOwner}}",
+	"leaveTeam.header": "Are you sure you want to leave {{teamName}}?",
+	"leaveTeam.header.newOwner": "Are you sure you want to leave {{teamName}}? New owner will be {{newOwner}}",
 	"actionButtons.leaveTeam.confirm": "Leave",
 	"actionButtons.editTeam": "Edit Team",
 	"actionButtons.manageRoster": "Manage Roster",