fix previous commit

This commit is contained in:
Snarling 2022-09-12 18:05:48 -04:00
parent a21b1029d7
commit c9ee938bc6
2 changed files with 41 additions and 43 deletions

@ -476,49 +476,47 @@ export function GameRoot(): React.ReactElement {
}
return (
<Context.Player.Provider value={Player}>
<Context.Router.Provider value={Router}>
<ErrorBoundary key={errorBoundaryKey} softReset={softReset}>
<BypassWrapper content={bypassGame ? mainPage : null}>
<SnackbarProvider>
<Overview mode={ITutorial.isRunning ? "tutorial" : "overview"}>
{!ITutorial.isRunning ? (
<CharacterOverview save={() => saveObject.saveGame()} killScripts={killAllScripts} />
) : (
<InteractiveTutorialRoot />
)}
</Overview>
{withSidebar ? (
<Box display="flex" flexDirection="row" width="100%">
<SidebarRoot
page={page}
opened={sidebarOpened}
onToggled={(isOpened) => {
setSideBarOpened(isOpened);
Settings.IsSidebarOpened = isOpened;
}}
/>
<Box className={classes.root}>{mainPage}</Box>
</Box>
<>
<ErrorBoundary key={errorBoundaryKey} softReset={softReset}>
<BypassWrapper content={bypassGame ? mainPage : null}>
<SnackbarProvider>
<Overview mode={ITutorial.isRunning ? "tutorial" : "overview"}>
{!ITutorial.isRunning ? (
<CharacterOverview save={() => saveObject.saveGame()} killScripts={killAllScripts} />
) : (
<InteractiveTutorialRoot />
)}
</Overview>
{withSidebar ? (
<Box display="flex" flexDirection="row" width="100%">
<SidebarRoot
page={page}
opened={sidebarOpened}
onToggled={(isOpened) => {
setSideBarOpened(isOpened);
Settings.IsSidebarOpened = isOpened;
}}
/>
<Box className={classes.root}>{mainPage}</Box>
)}
<Unclickable />
{withPopups && (
<>
<LogBoxManager />
<AlertManager />
<PromptManager />
<InvitationModal />
<Snackbar />
</>
)}
<Apr1 />
</SnackbarProvider>
</BypassWrapper>
</ErrorBoundary>
<V2Modal />
</Context.Router.Provider>
</Context.Player.Provider>
</Box>
) : (
<Box className={classes.root}>{mainPage}</Box>
)}
<Unclickable />
{withPopups && (
<>
<LogBoxManager />
<AlertManager />
<PromptManager />
<InvitationModal />
<Snackbar />
</>
)}
<Apr1 />
</SnackbarProvider>
</BypassWrapper>
</ErrorBoundary>
<V2Modal />
</>
);
}

@ -212,7 +212,7 @@ function Work(): React.ReactElement {
);
innerText = (
<>
<Reputation reputation={companyWork.getCompany().PlayerReputation} /> rep
<Reputation reputation={companyWork.getCompany().playerReputation} /> rep
<br />(
<ReputationRate reputation={companyWork.getGainRates().reputation * (1000 / CONSTANTS._idleSpeed)} />)
</>