From 5c551348ed084eebe6f14116ff99302bd00f6312 Mon Sep 17 00:00:00 2001
From: Olivier Gagnon <oli.gagnon4418@gmail.com>
Date: Thu, 21 Jul 2022 15:24:03 -0400
Subject: [PATCH] fix some React errors

---
 src/Faction/ui/FactionsRoot.tsx               |  2 +-
 .../Player/PlayerObjectWorkMethods.ts         |  1 -
 src/Programs/ui/ProgramsRoot.tsx              | 62 ++++++++++---------
 3 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/Faction/ui/FactionsRoot.tsx b/src/Faction/ui/FactionsRoot.tsx
index fa7029174..181cdb582 100644
--- a/src/Faction/ui/FactionsRoot.tsx
+++ b/src/Faction/ui/FactionsRoot.tsx
@@ -232,7 +232,7 @@ export function FactionsRoot(props: IProps): React.ReactElement {
         sx={{
           gap: 1,
           gridTemplateColumns: (invitations.length > 0 ? "1fr " : "") + "2fr",
-          [theme.breakpoints.down("lg")]: { gridTemplateColumns: "1fr", "& > span:nth-child(1)": { order: 1 } },
+          [theme.breakpoints.down("lg")]: { gridTemplateColumns: "1fr", "& > span:nth-of-type(1)": { order: 1 } },
           gridTemplateRows: "minmax(0, 1fr)",
           "& > span > .MuiBox-root": {
             display: "grid",
diff --git a/src/PersonObjects/Player/PlayerObjectWorkMethods.ts b/src/PersonObjects/Player/PlayerObjectWorkMethods.ts
index 2c7e6f663..058c79b0c 100644
--- a/src/PersonObjects/Player/PlayerObjectWorkMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectWorkMethods.ts
@@ -15,7 +15,6 @@ export function process(this: IPlayer, cycles = 1): void {
   }
 }
 export function finish(this: IPlayer, cancelled: boolean): void {
-  console.error("finishing");
   if (this.currentWork === null) return;
   this.currentWork.finish(this, cancelled);
   this.currentWork = null;
diff --git a/src/Programs/ui/ProgramsRoot.tsx b/src/Programs/ui/ProgramsRoot.tsx
index d50e4750f..b5838c8d1 100644
--- a/src/Programs/ui/ProgramsRoot.tsx
+++ b/src/Programs/ui/ProgramsRoot.tsx
@@ -87,37 +87,39 @@ export function ProgramsRoot(): React.ReactElement {
               sx={{ p: 1, opacity: player.hasProgram(program.name) ? 0.75 : 1 }}
               key={program.name}
             >
-              <Typography variant="h6" sx={{ display: "flex", alignItems: "center", flexWrap: "wrap" }}>
-                {(player.hasProgram(program.name) && <Check sx={{ mr: 1 }} />) ||
-                  (create.req(player) && <Create sx={{ mr: 1 }} />) || <Lock sx={{ mr: 1 }} />}
-                {program.name}
-              </Typography>
-              {!player.hasProgram(program.name) && create.req(player) && (
-                <Button
-                  sx={{ my: 1, width: "100%" }}
-                  onClick={(event) => {
-                    if (!event.isTrusted) return;
-                    player.startWork(
-                      new CreateProgramWork({ player: player, singularity: false, programName: program.name }),
-                    );
-                    player.startFocusing();
-                    router.toWork();
-                  }}
-                >
-                  Create program
-                </Button>
-              )}
-              {player.hasProgram(program.name) || getHackingLevelRemaining(create.level) === 0 || (
-                <Typography color={Settings.theme.hack}>
-                  <b>Unlocks in:</b> {getHackingLevelRemaining(create.level)} hacking levels
+              <>
+                <Typography variant="h6" sx={{ display: "flex", alignItems: "center", flexWrap: "wrap" }}>
+                  {(player.hasProgram(program.name) && <Check sx={{ mr: 1 }} />) ||
+                    (create.req(player) && <Create sx={{ mr: 1 }} />) || <Lock sx={{ mr: 1 }} />}
+                  {program.name}
                 </Typography>
-              )}
-              {curCompletion !== -1 && (
-                <Typography color={Settings.theme.infolight}>
-                  <b>Current completion:</b> {curCompletion}%
-                </Typography>
-              )}
-              <Typography>{create.tooltip}</Typography>
+                {!player.hasProgram(program.name) && create.req(player) && (
+                  <Button
+                    sx={{ my: 1, width: "100%" }}
+                    onClick={(event) => {
+                      if (!event.isTrusted) return;
+                      player.startWork(
+                        new CreateProgramWork({ player: player, singularity: false, programName: program.name }),
+                      );
+                      player.startFocusing();
+                      router.toWork();
+                    }}
+                  >
+                    Create program
+                  </Button>
+                )}
+                {player.hasProgram(program.name) || getHackingLevelRemaining(create.level) === 0 || (
+                  <Typography color={Settings.theme.hack}>
+                    <b>Unlocks in:</b> {getHackingLevelRemaining(create.level)} hacking levels
+                  </Typography>
+                )}
+                {curCompletion !== -1 && (
+                  <Typography color={Settings.theme.infolight}>
+                    <b>Current completion:</b> {curCompletion}%
+                  </Typography>
+                )}
+                <Typography>{create.tooltip}</Typography>
+              </>
             </Box>
           );
         })}