From 7a412fdb0d6eb0c18fa3965b422c30031c28bcd0 Mon Sep 17 00:00:00 2001 From: mantikoros Date: Wed, 12 Oct 2022 17:29:56 -0500 Subject: [PATCH 1/2] add key props --- web/components/groups/group-overview.tsx | 2 +- web/pages/home/index.tsx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/web/components/groups/group-overview.tsx b/web/components/groups/group-overview.tsx index 1e8f7ee7..fc2faa14 100644 --- a/web/components/groups/group-overview.tsx +++ b/web/components/groups/group-overview.tsx @@ -264,7 +264,7 @@ export function PinnedItems(props: { )} {pinned.map((element, index) => ( -
+
{element} {editMode && onDeleteClicked(index)} />} diff --git a/web/pages/home/index.tsx b/web/pages/home/index.tsx index 87f2cfa9..1fb0c9ae 100644 --- a/web/pages/home/index.tsx +++ b/web/pages/home/index.tsx @@ -277,6 +277,7 @@ function renderSections( if (id === 'featured') { return ( Date: Wed, 12 Oct 2022 17:33:11 -0500 Subject: [PATCH 2/2] fix welcome dialog page freezing bug --- web/components/onboarding/welcome.tsx | 72 ++++++++++++++------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/web/components/onboarding/welcome.tsx b/web/components/onboarding/welcome.tsx index 2ef24764..692aa656 100644 --- a/web/components/onboarding/welcome.tsx +++ b/web/components/onboarding/welcome.tsx @@ -54,47 +54,48 @@ export default function Welcome() { if (isTwitch || !user || (!user.shouldShowWelcome && !groupSelectorOpen)) return <> - return ( - <> + if (groupSelectorOpen) + return ( setGroupSelectorOpen(false)} /> + ) - - - {page === 0 && } - {page === 1 && } - {page === 2 && } - {page === 3 && } - - - - - - - toggleOpen(false)} - > - I got the gist, exit welcome - - + return ( + + + {page === 0 && } + {page === 1 && } + {page === 2 && } + {page === 3 && } + + + + + + + toggleOpen(false)} + > + I got the gist, exit welcome + - - + + ) } @@ -117,6 +118,7 @@ function PageIndicator(props: { page: number; totalpages: number }) { {[...Array(totalpages)].map((e, i) => (