From 895c2076e150f145f58bec901e9d4259c0b13096 Mon Sep 17 00:00:00 2001 From: mantikoros Date: Tue, 20 Sep 2022 18:55:32 -0500 Subject: [PATCH] don't show welcome dialog for twitch users --- web/components/onboarding/welcome.tsx | 33 +++++++++++++++++++++------ 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/web/components/onboarding/welcome.tsx b/web/components/onboarding/welcome.tsx index 654357c5..e13b7a9b 100644 --- a/web/components/onboarding/welcome.tsx +++ b/web/components/onboarding/welcome.tsx @@ -1,6 +1,8 @@ import { ChevronLeftIcon, ChevronRightIcon } from '@heroicons/react/solid' import clsx from 'clsx' -import { useState } from 'react' +import { User } from 'common/lib/user' +import { useRouter } from 'next/router' +import { useEffect, useState } from 'react' import { useUser } from 'web/hooks/use-user' import { updateUser } from 'web/lib/firebase/users' import { Col } from '../layout/col' @@ -27,16 +29,12 @@ export default function Welcome() { } } - async function setUserHasSeenWelcome() { - if (user) { - await updateUser(user.id, { ['shouldShowWelcome']: false }) - } + const setUserHasSeenWelcome = async () => { + if (user) await updateUser(user.id, { ['shouldShowWelcome']: false }) } const [groupSelectorOpen, setGroupSelectorOpen] = useState(false) - if (!user || (!user.shouldShowWelcome && !groupSelectorOpen)) return <> - const toggleOpen = (isOpen: boolean) => { setUserHasSeenWelcome() setOpen(isOpen) @@ -45,6 +43,12 @@ export default function Welcome() { setGroupSelectorOpen(true) } } + + const isTwitch = useIsTwitch(user) + + if (isTwitch || !user || (!user.shouldShowWelcome && !groupSelectorOpen)) + return <> + return ( <> { + const router = useRouter() + const isTwitch = router.pathname === '/twitch' + + useEffect(() => { + console.log('twich?', isTwitch) + + if (isTwitch && user?.shouldShowWelcome) { + updateUser(user.id, { ['shouldShowWelcome']: false }) + } + }, [isTwitch, user]) + + return isTwitch +} + function PageIndicator(props: { page: number; totalpages: number }) { const { page, totalpages } = props return (