From a4c3d542173979eae0e8ba75de65c606bb1599aa Mon Sep 17 00:00:00 2001 From: Ryan <7389646+ryanbarlow97@users.noreply.github.com> Date: Wed, 6 May 2026 20:35:45 +0100 Subject: [PATCH 1/8] [bugfix] add detailCache = null; (#3868) ## Description: fixed issue when leaving and trying to rejoin a clan without a reload ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced ## Please put your Discord username so you can be contacted if a bug or regression is found: w.o.n --- src/client/ClanModal.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/client/ClanModal.ts b/src/client/ClanModal.ts index a0989811b..e611fc424 100644 --- a/src/client/ClanModal.ts +++ b/src/client/ClanModal.ts @@ -198,6 +198,7 @@ export class ClanModal extends BaseModal { this.selectedClan = null; this.selectedClanTag = ""; this.myRole = null; + this.detailCache = null; this.view = "list"; this.loadMyClans(); }} @@ -290,6 +291,7 @@ export class ClanModal extends BaseModal { this.selectedClan = null; this.selectedClanTag = ""; this.myRole = null; + this.detailCache = null; this.view = "list"; this.loadMyClans(); }} From 30caea0c40a644194547267738c90ceca94fd93f Mon Sep 17 00:00:00 2001 From: Evan Date: Wed, 6 May 2026 14:28:20 -0600 Subject: [PATCH 2/8] Add loading spinner while waiting for public lobbies to load (#3867) ## Description: Loading spinner: https://github.com/user-attachments/assets/9033b707-7499-4a52-b0c6-d96d8f331ee3 ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced ## Please put your Discord username so you can be contacted if a bug or regression is found: evan --- src/client/GameModeSelector.ts | 82 +++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/src/client/GameModeSelector.ts b/src/client/GameModeSelector.ts index eb658253f..b2d7e0324 100644 --- a/src/client/GameModeSelector.ts +++ b/src/client/GameModeSelector.ts @@ -147,45 +147,53 @@ export class GameModeSelector extends LitElement { -
- - ${ffa - ? html`` - : nothing} + ${this.lobbies === null + ? html`
+ +
` + : html`
+ + ${ffa + ? html`` + : nothing} - - + + - -
- ${special ? this.renderSpecialLobbyCard(special) : nothing} -
-
- ${ffa - ? this.renderLobbyCard(ffa, this.getLobbyTitle(ffa)) - : nothing} -
-
- ${teams - ? this.renderLobbyCard(teams, this.getLobbyTitle(teams)) - : nothing} -
-
+ +
+ ${special ? this.renderSpecialLobbyCard(special) : nothing} +
+
+ ${ffa + ? this.renderLobbyCard(ffa, this.getLobbyTitle(ffa)) + : nothing} +
+
+ ${teams + ? this.renderLobbyCard(teams, this.getLobbyTitle(teams)) + : nothing} +
+
`}