From 1f4c3d0d973b2f723f54f16630cbfc4214176a24 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Wed, 23 Feb 2022 17:12:56 +0200
Subject: [PATCH] Fix match score submit wrong order in some cases

---
 app/components/play/MapList.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/components/play/MapList.tsx b/app/components/play/MapList.tsx
index 92b507a6d..7b087d76a 100644
--- a/app/components/play/MapList.tsx
+++ b/app/components/play/MapList.tsx
@@ -78,7 +78,9 @@ export function MapList({ mapList, canSubmitScore, groupIds }: MapListProps) {
           </li>
         );
       })}
-      {canSubmitScore && <Submitter mapList={mapList} winners={winners} />}
+      {canSubmitScore && (
+        <Submitter mapList={mapList} winners={winners} groupIds={groupIds} />
+      )}
     </ol>
   );
 }
@@ -86,9 +88,14 @@ export function MapList({ mapList, canSubmitScore, groupIds }: MapListProps) {
 function Submitter({
   mapList,
   winners,
+  groupIds,
 }: {
   mapList: MapListProps["mapList"];
   winners: string[];
+  groupIds: {
+    our: string;
+    their: string;
+  };
 }) {
   const warningText = scoreValid(winners, mapList.length)
     ? undefined
@@ -98,10 +105,9 @@ function Submitter({
     return <div className="play-match__error-text">{warningText}</div>;
   }
 
-  const ids = Array.from(new Set(winners));
   const score = winners.reduce(
     (acc: [number, number], winnerId) => {
-      if (winnerId === ids[0]) acc[0]++;
+      if (winnerId === groupIds.our) acc[0]++;
       else acc[1]++;
 
       return acc;