Fixed missing greeting when no custom messages present

This commit is contained in:
2025-06-19 19:40:00 -05:00
parent c5b84c732c
commit 446f9e4e41
3 changed files with 6 additions and 6 deletions

View File

@@ -39,7 +39,7 @@ export function Homepage() {
} = useCommonHooks();
const [personal, setPersonal] = useState<PersonalData>();
const [message, setMessage] = useState<Message>();
const [displayedGreeting, setDisplayedGreeting] = useState('');
const [displayedGreeting, setDisplayedGreeting] = useState<string | undefined>('');
const [weatherModalOpened, { open: openWeatherModal, close: closeWeatherModal }] =
useDisclosure(false);
const dateOptions: Intl.DateTimeFormatOptions = !isMobile
@@ -63,7 +63,7 @@ export function Homepage() {
}
}, [personalData, personalIsFetched]);
useEffect(() => {
if (message !== undefined && personal) {
if (personal) {
setDisplayedGreeting(() => {
if (Math.floor(Math.random() * 100) > 10 || message === undefined) {
switch (Math.floor(new Date().getHours() / 6)) {
@@ -77,7 +77,7 @@ export function Homepage() {
return `Good evening, ${personal?.firstName}!`;
}
}
return message.message;
return message?.message;
});
}
}, [message, personal, isMessagesFetching]);

View File

@@ -13,7 +13,7 @@ function Header({
basicWeather,
openWeatherModal,
}: {
greet: string;
greet: string | undefined;
date: string;
current: CurrentWeather;
setCurrent: (current: CurrentWeather) => void;

View File

@@ -11,7 +11,7 @@ function LargeHeader({
weather,
basicWeather,
}: {
greet: string;
greet: string | undefined;
date: string;
weather: any;
basicWeather: any;
@@ -73,7 +73,7 @@ function LargeHeader({
fz={isMobile ? '2rem' : '6rem'}
>
{greet
.replace('$firstName', currentUser.firstName)
?.replace('$firstName', currentUser.firstName)
.replace('$lastName', currentUser.lastName)
.replace('$^firstName', currentUser.firstName.toUpperCase())
.replace('$^lastName', currentUser.lastName.toUpperCase())}