Update publish-alpha (#2520)

* fix: show trophy only if peer has a score * fix: preserve attempted polls
100mslive · Feb 13, 2024 · b64edca · b64edca
1 parent d85daad
commit b64edca
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 26 deletions.
diff --git a/packages/roomkit-react/src/Prebuilt/components/Polls/CreatePollQuiz/PollsQuizMenu.tsx b/packages/roomkit-react/src/Prebuilt/components/Polls/CreatePollQuiz/PollsQuizMenu.tsx
@@ -1,9 +1,9 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import {
-  HMSPoll,
   HMSPollState,
   selectLocalPeerRoleName,
   selectPermissions,
+  selectPolls,
   useHMSActions,
   useHMSStore,
 } from '@100mslive/react-sdk';
@@ -133,7 +133,7 @@ const AddMenu = () => {
           active={interactionType === INTERACTION_TYPE.QUIZ}
         />
       </Flex>
-      <Flex direction="column">
+      <Flex direction="column" css={{ mb: '$10' }}>
         <Text variant="body2" css={{ mb: '$4' }}>{`Name this ${interactionType.toLowerCase()}`}</Text>
         <Input
           ref={inputRef}
@@ -194,42 +194,32 @@ const AddMenu = () => {
 
 const PrevMenu = () => {
   const hmsActions = useHMSActions();
-  const [polls, setPolls] = useState<HMSPoll[]>([]);
+  const polls = useHMSStore(selectPolls);
+  const permissions = useHMSStore(selectPermissions);
 
   useEffect(() => {
-    const listPolls = async () => {
-      const polls = await hmsActions.interactivityCenter.getPolls();
-      const sortedPolls = await polls
-        ?.sort((a, b) => (b.createdAt?.getTime() || 0) - (a.createdAt?.getTime() || 0))
-        ?.sort((a, b) => (b.state === 'started' ? 1 : 0) - (a.state === 'started' ? 1 : 0));
-      return sortedPolls;
-    };
-
     const updatePolls = async () => {
-      const sortedPolls = await listPolls();
-      setPolls(sortedPolls);
+      await hmsActions.interactivityCenter.getPolls();
     };
 
     updatePolls();
   }, [hmsActions.interactivityCenter]);
 
   return polls?.length ? (
     <Flex
+      direction="column"
       css={{
-        borderTop: '$space$px solid $border_bright',
-        mt: '$10',
-        pt: '$10',
+        width: '100%',
+        ...(permissions?.pollWrite ? { borderTop: '$space$px solid $border_bright', paddingTop: '$10' } : {}),
       }}
     >
-      <Flex direction="column" css={{ w: '100%' }}>
-        <Text variant="h6" css={{ c: '$on_surface_high' }}>
-          Previous Polls and Quizzes
-        </Text>
-        <Flex direction="column" css={{ gap: '$10', mt: '$8' }}>
-          {polls?.map(poll => (
-            <InteractionCard key={poll.id} id={poll.id} title={poll.title} status={poll.state} />
-          ))}
-        </Flex>
+      <Text variant="h6" css={{ c: '$on_surface_high' }}>
+        Previous Polls and Quizzes
+      </Text>
+      <Flex direction="column" css={{ gap: '$10', mt: '$8' }}>
+        {polls?.map(poll => (
+          <InteractionCard key={poll.id} id={poll.id} title={poll.title} status={poll.state} />
+        ))}
       </Flex>
     </Flex>
   ) : null;

diff --git a/packages/roomkit-react/src/Prebuilt/components/Polls/Voting/LeaderboardEntry.tsx b/packages/roomkit-react/src/Prebuilt/components/Polls/Voting/LeaderboardEntry.tsx
@@ -54,7 +54,7 @@ export const LeaderboardEntry = ({
       </Flex>
 
       <Flex align="center" css={{ gap: '$4', color: '$on_surface_medium' }}>
-        {position === 1 ? <TrophyFilledIcon height={16} width={16} /> : null}
+        {position === 1 && score ? <TrophyFilledIcon height={16} width={16} /> : null}
         {questionCount ? (
           <>
             <CheckCircleIcon height={16} width={16} />