diff --git a/src/Faction/ui/FactionsRoot.tsx b/src/Faction/ui/FactionsRoot.tsx index fbed0ae67..918d87b7e 100644 --- a/src/Faction/ui/FactionsRoot.tsx +++ b/src/Faction/ui/FactionsRoot.tsx @@ -5,6 +5,14 @@ import { Factions } from "../Factions"; import { Faction } from "../Faction"; import { joinFaction } from "../FactionHelpers"; +import Typography from "@mui/material/Typography"; +import Box from "@mui/material/Box"; +import Link from "@mui/material/Link"; +import Button from "@mui/material/Button"; +import TableBody from "@mui/material/TableBody"; +import { Table, TableCell } from "../../ui/React/Table"; +import TableRow from "@mui/material/TableRow"; + interface IProps { player: IPlayer; router: IRouter; @@ -17,7 +25,7 @@ export function FactionsRoot(props: IProps): React.ReactElement { props.router.toFaction(faction); } - function acceptInvitation(event: React.MouseEvent, faction: string): void { + function acceptInvitation(event: React.MouseEvent, faction: string): void { if (!event.isTrusted) return; joinFaction(Factions[faction]); setRerender((x) => !x); @@ -25,41 +33,43 @@ export function FactionsRoot(props: IProps): React.ReactElement { return ( <> -

Factions

-

Lists all factions you have joined

+ + Factions + + Lists all factions you have joined
- +
-

Outstanding Faction Invitations

-

- Lists factions you have been invited to. You can accept these faction invitations at any time. -

- + {props.player.factionInvitations.length > 0 && ( + <> + + Outstanding Faction Invitations + + + Lists factions you have been invited to. You can accept these faction invitations at any time. + + + + {props.player.factionInvitations.map((faction: string) => ( + + + {faction} + + + + + + ))} + +
+ + )} ); } diff --git a/src/ui/React/GameOptionsRoot.tsx b/src/ui/React/GameOptionsRoot.tsx index 0174c3d01..04bed320e 100644 --- a/src/ui/React/GameOptionsRoot.tsx +++ b/src/ui/React/GameOptionsRoot.tsx @@ -486,13 +486,13 @@ export function GameOptionsRoot(props: IProps): React.ReactElement { export}> import}>