From c0c3b6309a797e9432e7f53c7d585915309f09e5 Mon Sep 17 00:00:00 2001 From: Lukas Obermann Date: Thu, 29 Feb 2024 19:02:35 +0100 Subject: [PATCH] fix: adjust tabs display based on finished character creation --- src/main_window/hooks/visibleTabs.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main_window/hooks/visibleTabs.ts b/src/main_window/hooks/visibleTabs.ts index f3546b22..116c2a6b 100644 --- a/src/main_window/hooks/visibleTabs.ts +++ b/src/main_window/hooks/visibleTabs.ts @@ -4,6 +4,7 @@ import { selectCanRemove } from "../selectors/characterSelectors.ts" import { selectCurrentCulture } from "../selectors/cultureSelectors.ts" import { selectCurrentRace } from "../selectors/raceSelectors.ts" import { selectIsBlessedOne, selectIsSpellcaster } from "../selectors/traditionSelectors.ts" +import { selectIsCharacterCreationFinished } from "../slices/characterSlice.ts" import { RoutePath, selectRoute } from "../slices/routeSlice.ts" import { useAppSelector } from "./redux.ts" @@ -73,6 +74,7 @@ export const useVisibleTabs = () => { const phase = 3 as number const isHitZoneArmorEnabled = true as boolean const arePactsAvailable = true as boolean + const isCharacterCreationFinished = useAppSelector(selectIsCharacterCreationFinished) const isRemovingEnabled = useAppSelector(selectCanRemove) const isRaceSelected = useAppSelector(selectCurrentRace) !== undefined const isCultureSelected = useAppSelector(selectCurrentCulture) !== undefined @@ -92,8 +94,8 @@ export const useVisibleTabs = () => { routes: filterNonNullable([ "profile" as const, // "personal_data", - phase === 3 ? ("character_sheet" as const) : undefined, - phase > 1 && arePactsAvailable ? ("pact" as const) : undefined, // "US25102", "US25008") + isCharacterCreationFinished ? ("character_sheet" as const) : undefined, + arePactsAvailable ? ("pact" as const) : undefined, // "US25102", "US25008" "rules" as const, ]).map(route => ["characters", characterId, route]), }, @@ -152,14 +154,14 @@ export const useVisibleTabs = () => { ]), [ characterId, - isHitZoneArmorEnabled, - isRemovingEnabled, - phase, + isCharacterCreationFinished, arePactsAvailable, isRaceSelected, isCultureSelected, + isRemovingEnabled, isSpellcaster, isBlessedOne, + isHitZoneArmorEnabled, ], )