Skip to content

Commit d97f7f1

Browse files
committed
fix(stage-tamagotchi): type error
1 parent 84bd9e4 commit d97f7f1

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

apps/stage-tamagotchi/src/renderer/layouts/settings.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ const routeHeaderMetadata = computed(() => {
6868

6969
<template>
7070
<div h-full w-full bg="$bg-color" flex="~ col">
71-
<WindowTitleBar :title="routeHeaderMetadata?.title" icon="i-solar:settings-bold" />
71+
<WindowTitleBar :title="routeHeaderMetadata?.title ?? ''" icon="i-solar:settings-bold" />
7272
<div
7373
:style="{
7474
paddingTop: `44px`,
@@ -82,8 +82,8 @@ const routeHeaderMetadata = computed(() => {
8282
<div ref="scrollContainer" relative h-full w-full overflow-y-auto scrollbar-none>
8383
<div flex="~ col" mx-auto h-full max-w-screen-xl>
8484
<PageHeader
85-
:title="routeHeaderMetadata?.title"
86-
:subtitle="routeHeaderMetadata?.subtitle"
85+
:title="routeHeaderMetadata?.title ?? ''"
86+
:subtitle="routeHeaderMetadata?.subtitle ?? ''"
8787
:disable-back-button="isStageTamagotchi() && route.path === '/settings'"
8888
px-4
8989
/>

apps/stage-tamagotchi/src/renderer/pages/settings/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ const settings = computed(() => {
2929
.filter(route => route.meta?.settingsEntry)
3030
.sort((a, b) => (Number(a.meta?.order ?? 0) - Number(b.meta?.order ?? 0)))
3131
.map(route => ({
32-
title: route.meta?.titleKey ? t(route.meta.titleKey as string) : (route.meta?.title as string | undefined),
32+
title: route.meta?.titleKey ? t(route.meta.titleKey as string) : (route.meta?.title as string | undefined) ?? '',
3333
description: route.meta?.descriptionKey ? t(route.meta.descriptionKey as string) : (route.meta?.description as string | undefined) || '',
34-
icon: route.meta?.icon as string | undefined,
34+
icon: (route.meta?.icon as string | undefined) ?? '',
3535
to: route.path,
3636
}))
3737
})

0 commit comments

Comments
 (0)