fix: handle multiple quiz/polls

100mslive · May 21, 2024 · a621d15 · a621d15
1 parent 523f6c0
commit a621d15
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/roomkit-react/src/Prebuilt/common/utils.js b/packages/roomkit-react/src/Prebuilt/common/utils.js
@@ -142,7 +142,7 @@ export const getPeerResponses = (questions, peerid, userid) => {
   return questions.map(question =>
     question.responses?.filter(
       response =>
-        ((response && response.peer?.peerid === peerid) || response.peer?.userid === userid) && !response.skipped,
+        response && (response.peer?.peerid === peerid || response.peer?.userid === userid) && !response.skipped,
     ),
   );
 };

diff --git a/packages/roomkit-react/src/Prebuilt/components/Polls/Voting/Voting.tsx b/packages/roomkit-react/src/Prebuilt/components/Polls/Voting/Voting.tsx
@@ -36,6 +36,7 @@ export const Voting = ({ id, toggleVoting }: { id: string; toggleVoting: () => v
   // To reset whenever a different poll is opened
   useEffect(() => {
     fetchedInitialResponses.current = false;
+    setSavedPollResponses('');
   }, [id, setSavedPollResponses]);
 
   useEffect(() => {
@@ -60,14 +61,15 @@ export const Voting = ({ id, toggleVoting }: { id: string; toggleVoting: () => v
   useEffect(() => {
     if (poll?.questions) {
       const localPeerResponses = getPeerResponses(poll.questions, localPeerId);
-
       // @ts-ignore
-      localPeerResponses.forEach(response => {
-        if (response) updateSavedResponses(response.questionIndex, response.option, response.options);
+      localPeerResponses?.forEach(response => {
+        if (response) {
+          updateSavedResponses(response[0]?.questionIndex, response[0]?.option, response[0]?.options);
+        }
       });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [localPeerId, poll?.questions]);
+  }, [localPeerId, poll?.questions, id]);
 
   if (!poll) {
     return null;