From 550829a1c31a85034271acab406a1e91c2ef8fad Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Wed, 27 Dec 2023 04:35:58 -0500
Subject: [PATCH] Fix #944 merge errors

---
 src/Go/ui/GoGameboardWrapper.tsx     | 2 +-
 src/Go/ui/GoHistoryPage.tsx          | 6 +++++-
 src/Go/ui/GoSubnetSearch.tsx         | 6 +++---
 src/Locations/ui/GenericLocation.tsx | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Go/ui/GoGameboardWrapper.tsx b/src/Go/ui/GoGameboardWrapper.tsx
index 366c672f2..b6e9b19de 100644
--- a/src/Go/ui/GoGameboardWrapper.tsx
+++ b/src/Go/ui/GoGameboardWrapper.tsx
@@ -243,7 +243,7 @@ export function GoGameboardWrapper({ showInstructions }: IProps): React.ReactEle
           <br />
           <Typography variant={"h6"} className={classes.opponentLabel}>
             {opponent !== opponents.none ? "Subnet owner: " : ""}{" "}
-            {opponent === opponents.w0r1d_d43m0n ? <CorruptableText content={opponent} /> : opponent}
+            {opponent === opponents.w0r1d_d43m0n ? <CorruptableText content={opponent} spoiler={false} /> : opponent}
           </Typography>
           <br />
         </Box>
diff --git a/src/Go/ui/GoHistoryPage.tsx b/src/Go/ui/GoHistoryPage.tsx
index 0d44c6d87..417fa0c60 100644
--- a/src/Go/ui/GoHistoryPage.tsx
+++ b/src/Go/ui/GoHistoryPage.tsx
@@ -54,7 +54,11 @@ export const GoHistoryPage = (): React.ReactElement => {
               <Typography>
                 {" "}
                 <strong className={classes.keyText}>
-                  {faction === opponents.w0r1d_d43m0n ? <CorruptableText content="????????????" /> : faction}
+                  {faction === opponents.w0r1d_d43m0n ? (
+                    <CorruptableText content="????????????" spoiler={false} />
+                  ) : (
+                    faction
+                  )}
                 </strong>
               </Typography>
               <Table sx={{ display: "table", mb: 1, width: "100%" }}>
diff --git a/src/Go/ui/GoSubnetSearch.tsx b/src/Go/ui/GoSubnetSearch.tsx
index 27e984a92..e97a9ce50 100644
--- a/src/Go/ui/GoSubnetSearch.tsx
+++ b/src/Go/ui/GoSubnetSearch.tsx
@@ -73,7 +73,7 @@ export const GoSubnetSearch = ({ open, search, cancel, showInstructions }: IProp
             {opponentFactions.map((faction) => (
               <MenuItem key={faction} value={faction}>
                 {faction === opponents.w0r1d_d43m0n ? (
-                  <CorruptableText content="???????????????" />
+                  <CorruptableText content="???????????????" spoiler={false} />
                 ) : (
                   `${faction} (${opponentDetails[faction].description})`
                 )}
@@ -120,8 +120,8 @@ export const GoSubnetSearch = ({ open, search, cancel, showInstructions }: IProp
           <Typography>
             {opponent === opponents.w0r1d_d43m0n ? (
               <>
-                <CorruptableText content={opponentDetails[opponent].flavorText.slice(0, 40)} />
-                <CorruptableText content={opponentDetails[opponent].flavorText.slice(40)} />
+                <CorruptableText content={opponentDetails[opponent].flavorText.slice(0, 40)} spoiler={false} />
+                <CorruptableText content={opponentDetails[opponent].flavorText.slice(40)} spoiler={false} />
               </>
             ) : (
               opponentDetails[opponent].flavorText
diff --git a/src/Locations/ui/GenericLocation.tsx b/src/Locations/ui/GenericLocation.tsx
index 5f70c8063..4c3bc78fc 100644
--- a/src/Locations/ui/GenericLocation.tsx
+++ b/src/Locations/ui/GenericLocation.tsx
@@ -95,7 +95,7 @@ export function GenericLocation({ loc }: IProps): React.ReactElement {
     <>
       <Button onClick={() => Router.toPage(Page.City)}>Return to World</Button>
       <Typography variant="h4" sx={{ mt: 1 }}>
-        {backdoorInstalled ? (
+        {backdoorInstalled && serverMeta ? (
           <Tooltip title={`Backdoor installed on ${serverMeta.hostname}.`}>
             <span>
               <CorruptableText content={loc.name} spoiler={false} />