From 83c9815687491787aff85cb34eee0c294f7c2907 Mon Sep 17 00:00:00 2001
From: Jack <bartnikjack@gmail.com>
Date: Wed, 7 Apr 2021 00:05:53 +0100
Subject: [PATCH] added functions for showing and hiding leave queue button

---
 src/js/tribe/matchmaking.js | 12 +++++++++---
 src/js/tribe/tribe.js       | 19 ++++++-------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/js/tribe/matchmaking.js b/src/js/tribe/matchmaking.js
index 0936136cd..7d7d24f9d 100644
--- a/src/js/tribe/matchmaking.js
+++ b/src/js/tribe/matchmaking.js
@@ -25,9 +25,6 @@ export function resetBanner() {
 export function disableLobbyButtons() {
   $(".pageTribe .prelobby .matchmaking .buttons .button").addClass("disabled");
   $(".pageTribe .prelobby .privateRooms .button").addClass("disabled");
-  $(".pageTribe .prelobby .matchmaking .leaveMatchmakingButton").removeClass(
-    "hidden"
-  );
 }
 
 export function enableLobbyButtons() {
@@ -35,6 +32,15 @@ export function enableLobbyButtons() {
     "disabled"
   );
   $(".pageTribe .prelobby .privateRooms .button").removeClass("disabled");
+}
+
+export function showLeaveQueueButton() {
+  $(".pageTribe .prelobby .matchmaking .leaveMatchmakingButton").removeClass(
+    "hidden"
+  );
+}
+
+export function hideLeaveQueueButton() {
   $(".pageTribe .prelobby .matchmaking .leaveMatchmakingButton").addClass(
     "hidden"
   );
diff --git a/src/js/tribe/tribe.js b/src/js/tribe/tribe.js
index 1f13f92f9..ab1074935 100644
--- a/src/js/tribe/tribe.js
+++ b/src/js/tribe/tribe.js
@@ -1142,6 +1142,7 @@ socket.on("mp_room_leave", () => {
   resetLobby();
   resetRace();
   Matchmaking.enableLobbyButtons();
+  Matchmaking.hideLeaveQueueButton();
   Matchmaking.hideBanner();
   // swapElements($(".pageTribe .lobby"), $(".pageTribe .prelobby"), 250);
 });
@@ -1504,9 +1505,7 @@ socket.on("mp_room_state_update", (data) => {
   state = data.newState;
   Notifications.add(`state changed to ${data.newState}`, 0);
   if (data.newState === 8) {
-    $(".pageTribe .prelobby .matchmaking .leaveMatchmakingButton").addClass(
-      "hidden"
-    );
+    Matchmaking.hideLeaveQueueButton();
   }
 });
 
@@ -1980,12 +1979,9 @@ $(".pageTribe .prelobby .matchmaking .button").click((e) => {
   state = 6;
   lastQueue = queue;
   applyRoomConfig(TribeDefaultConfigs[queue]);
-  $(".pageTribe .prelobby .matchmaking .buttons .button").addClass("disabled");
-  $(".pageTribe .prelobby .privateRooms .button").addClass("disabled");
+  Matchmaking.disableLobbyButtons();
   setTimeout(() => {
-    $(".pageTribe .prelobby .matchmaking .leaveMatchmakingButton").removeClass(
-      "hidden"
-    );
+    Matchmaking.showLeaveQueueButton();
     socket.emit("mp_room_join", { queue: queue });
   }, 1000);
 });
@@ -1999,13 +1995,10 @@ $(".pageTest #result #queueAgainButton").click((e) => {
   state = 6;
   applyRoomConfig(TribeDefaultConfigs[lastQueue]);
   TestLogic.restart();
-  $(".pageTribe .prelobby .matchmaking .buttons .button").addClass("disabled");
-  $(".pageTribe .prelobby .privateRooms .button").addClass("disabled");
+  Matchmaking.disableLobbyButtons();
   setTimeout(() => {
     socket.emit("mp_room_join", { queue: lastQueue });
-    $(".pageTribe .prelobby .matchmaking .leaveMatchmakingButton").removeClass(
-      "hidden"
-    );
+    Matchmaking.showLeaveQueueButton();
     resetResult();
   }, 1000);
 });