From 3b372e9cad5c0a788964e94a8f17f8ea5945614d Mon Sep 17 00:00:00 2001
From: catloversg <152669316+catloversg@users.noreply.github.com>
Date: Tue, 17 Mar 2026 01:52:21 +0700
Subject: [PATCH] UI: Prevent joining banned factions via UI (#2573)

---
 src/Faction/ui/FactionInvitationManager.tsx | 4 ++--
 src/Faction/ui/FactionsRoot.tsx             | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Faction/ui/FactionInvitationManager.tsx b/src/Faction/ui/FactionInvitationManager.tsx
index 19bfd9841..d37d1af0a 100644
--- a/src/Faction/ui/FactionInvitationManager.tsx
+++ b/src/Faction/ui/FactionInvitationManager.tsx
@@ -44,7 +44,7 @@ export function FactionInvitationManager({ hidden }: { hidden: boolean }): React
 
   function close(): void {
     setFactions((currentFactions) => {
-      return currentFactions.slice(1);
+      return currentFactions.slice(1).filter((name) => !Factions[name].isBanned);
     });
   }
 
@@ -52,7 +52,7 @@ export function FactionInvitationManager({ hidden }: { hidden: boolean }): React
   const enemies = faction?.getInfo().enemies ?? [];
 
   function join(): void {
-    if (faction === null || !faction.alreadyInvited) {
+    if (faction === null || !faction.alreadyInvited || faction.isBanned) {
       return;
     }
     joinFaction(faction);
diff --git a/src/Faction/ui/FactionsRoot.tsx b/src/Faction/ui/FactionsRoot.tsx
index 512a7d036..7c74bb3ea 100644
--- a/src/Faction/ui/FactionsRoot.tsx
+++ b/src/Faction/ui/FactionsRoot.tsx
@@ -85,9 +85,11 @@ const FactionElement = (props: FactionElementProps): React.ReactElement => {
     Router.toPage(Page.FactionAugmentations, { faction });
   }
 
-  function acceptInvitation(event: React.MouseEvent<HTMLButtonElement>, faction: FactionName): void {
-    if (!event.isTrusted) return;
-    joinFaction(Factions[faction]);
+  function acceptInvitation(event: React.MouseEvent<HTMLButtonElement>, factionName: FactionName): void {
+    if (!event.isTrusted || !Factions[factionName].alreadyInvited || Factions[factionName].isBanned) {
+      return;
+    }
+    joinFaction(Factions[factionName]);
     props.rerender();
   }