From dc5f709223bfada0537d3d566b65fd489f7c36da Mon Sep 17 00:00:00 2001
From: phyzical <phyzicaly@hotmail.com>
Date: Sun, 20 Mar 2022 20:58:42 +0800
Subject: [PATCH] combine !faction check modals

---
 src/ui/WorkInProgressRoot.tsx | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/ui/WorkInProgressRoot.tsx b/src/ui/WorkInProgressRoot.tsx
index 7a4c1802a..b1d2cf871 100644
--- a/src/ui/WorkInProgressRoot.tsx
+++ b/src/ui/WorkInProgressRoot.tsx
@@ -37,23 +37,12 @@ export function WorkInProgressRoot(): React.ReactElement {
 
   if (player.workType == CONSTANTS.WorkTypeFaction) {
     const faction = Factions[player.currentWorkFactionName];
-    if (!faction) {
-      return (
-        <Grid container direction="column" justifyContent="center" alignItems="center" style={{ minHeight: "100vh" }}>
-          <Grid item>
-            <Typography>
-              Something has gone wrong, you cannot work for {player.currentWorkFactionName || "(Faction not found)"} at
-              this time.
-            </Typography>
-          </Grid>
-        </Grid>
-      );
-    }
     if (!faction) {
       return (
         <>
           <Typography variant="h4" color="primary">
-            You have not joined {faction} yet!
+            You have not joined {player.currentWorkFactionName || "(Faction not found)"} yet or cannot work at this time,
+            please try again if you think this should have worked
           </Typography>
           <Button onClick={() => router.toFactions()}>Back to Factions</Button>
         </>