From 187fbea0730275810b02cc415d69a81edd443266 Mon Sep 17 00:00:00 2001
From: catloversg <152669316+catloversg@users.noreply.github.com>
Date: Mon, 31 Mar 2025 01:56:21 +0700
Subject: [PATCH] UI: Show faction enemies even after joining (#2046)

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

diff --git a/src/Faction/ui/FactionsRoot.tsx b/src/Faction/ui/FactionsRoot.tsx
index 858e51156..0c7942bd8 100644
--- a/src/Faction/ui/FactionsRoot.tsx
+++ b/src/Faction/ui/FactionsRoot.tsx
@@ -154,7 +154,7 @@ const FactionElement = (props: FactionElementProps): React.ReactElement => {
                 </Tooltip>
               )}
 
-              {!props.faction.isMember && facInfo.enemies.length > 0 && (
+              {facInfo.enemies.length > 0 && (
                 <Tooltip
                   title={
                     <Typography component="div">
@@ -164,7 +164,7 @@ const FactionElement = (props: FactionElementProps): React.ReactElement => {
                           <li key={enemy}>{enemy}</li>
                         ))}
                       </ul>
-                      Joining this Faction will prevent you from joining its enemies
+                      {!props.faction.isMember && <>Joining this Faction will prevent you from joining its enemies</>}
                     </Typography>
                   }
                 >
diff --git a/src/Faction/ui/Info.tsx b/src/Faction/ui/Info.tsx
index 5d4636de4..18b294810 100644
--- a/src/Faction/ui/Info.tsx
+++ b/src/Faction/ui/Info.tsx
@@ -52,6 +52,12 @@ export function Info(props: IProps): React.ReactElement {
   return (
     <>
       <Typography classes={{ root: classes.noformat }}>{props.factionInfo.infoText}</Typography>
+      {props.factionInfo.enemies.length > 0 && (
+        <Typography component="div">
+          <br />
+          This faction is enemies with: {props.factionInfo.enemies.join(", ")}.
+        </Typography>
+      )}
       <Typography>-------------------------</Typography>
       <Box display="flex">
         <Tooltip