diff --git a/src/Components/Views/StartMenu/StartMenu.tsx b/src/Components/Views/StartMenu/StartMenu.tsx index 3d71480..14f2053 100644 --- a/src/Components/Views/StartMenu/StartMenu.tsx +++ b/src/Components/Views/StartMenu/StartMenu.tsx @@ -8,7 +8,11 @@ import { useAnalytics } from '../../../Hooks/useAnalytics'; import { useGlobalSettings } from '../../../Hooks/useGlobalSettings'; import { usePlayers } from '../../../Hooks/usePlayers'; import { Cog, Info } from '../../../Icons/generated'; -import { InitialGameSettings, Orientation } from '../../../Types/Settings'; +import { + GameFormat, + InitialGameSettings, + Orientation, +} from '../../../Types/Settings'; import { InfoModal } from '../../Misc/InfoModal'; import { SettingsModal } from '../../Misc/SettingsModal'; import { Spacer } from '../../Misc/Spacer'; @@ -118,7 +122,7 @@ const Start = () => { startingLifeTotal: 40, useCommanderDamage: true, orientation: Orientation.Portrait, - gameFormat: 'commander', + gameFormat: GameFormat.Commander, } ); diff --git a/src/Providers/GlobalSettingsProvider.tsx b/src/Providers/GlobalSettingsProvider.tsx index 073962a..6c458bd 100644 --- a/src/Providers/GlobalSettingsProvider.tsx +++ b/src/Providers/GlobalSettingsProvider.tsx @@ -60,7 +60,10 @@ export const GlobalSettingsProvider = ({ useEffect(() => { console.log('initialGameSettings', JSON.parse(savedGameSettings as string)); - if (JSON.parse(savedGameSettings as string).gridArea) { + + if (savedGameSettings && JSON.parse(savedGameSettings).gridAreas) { + console.log('lmao1'); + removeLocalStorage(); return; } @@ -68,15 +71,19 @@ export const GlobalSettingsProvider = ({ //parse existing game settings with zod schema const parsedInitialGameSettings = InitialGameSettingsSchema.safeParse(initialGameSettings); + console.log('lmao2'); if (!parsedInitialGameSettings.success) { + console.log('lmao3'); removeLocalStorage(); return; } + console.log('llam'); + localStorage.setItem( 'initialGameSettings', - JSON.stringify(parsedInitialGameSettings.data) + JSON.stringify(initialGameSettings) ); }, [initialGameSettings]);