From 3d083d3173a55473dabb460cc4aeec025fb9d56b Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Thu, 27 Jun 2024 12:19:38 +0300
Subject: [PATCH] Fix group sorting regression

---
 app/features/sendouq/core/groups.server.ts | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/features/sendouq/core/groups.server.ts b/app/features/sendouq/core/groups.server.ts
index a2da45b58..93244a98a 100644
--- a/app/features/sendouq/core/groups.server.ts
+++ b/app/features/sendouq/core/groups.server.ts
@@ -322,8 +322,20 @@ export function sortGroupsBySkillAndSentiment({
 				return aDiff - bDiff;
 			}
 
-			const aTier = a.tier?.name;
-			const bTier = b.tier?.name;
+			const aTier =
+				a.tier?.name ??
+				resolveGroupSkill({
+					group: a as LookingGroupWithInviteCode,
+					userSkills,
+					intervals,
+				})?.name;
+			const bTier =
+				b.tier?.name ??
+				resolveGroupSkill({
+					group: b as LookingGroupWithInviteCode,
+					userSkills,
+					intervals,
+				})?.name;
 
 			const aTierDiff = tierDiff(aTier);
 			const bTierDiff = tierDiff(bTier);