Merge pull request #787 from wickathou/hotfix/winner-page-fix

Hotfix - Voting results not showing on organizer winner tab

Author: wickathou

frontend/src/components/projects/ProjectsGridItem/index.js

@@ -68,6 +68,7 @@ const ProjectsGridItem = ({
     showTags = false,
     showReviewers = false,
     showScore = false,
+    votingResults = null,
 }) => {
     const [openReviewModal, setOpenReviewModal] = useState(false)
     const isReviewingOpen = EventHelpers.isReviewingOpen(event, moment)
@@ -191,7 +192,6 @@ const ProjectsGridItem = ({
                             </div>
                             {project?.punchline && (
                                 <Typography variant="body1" component="p">
-                                    {showTableLocation && showScore}
                                     {_.truncate(project.punchline, {
                                         length: styling.punchlineMaxLength,
                                     })}
@@ -225,6 +225,7 @@ const ProjectsGridItem = ({
                                 )}
                             </div>
                         )}
+                        {votingResults && <>{votingResults}</>}
                     </div>
                 </CardContent>
                 <CardActions className="tw-flex tw-flex-col tw-justify-center tw-items-center tw-px-4 tw-pb-4 tw-pt-0 tw-gap-4">

frontend/src/pages/_dashboard/renderDashboard/organiser/projects/winners/index.js

@@ -64,8 +64,8 @@ export default () => {
             if (partnerVotes) {
                 setTokenVoterResults(partnerVotes)
             }
-            setLoading(false)
         }
+        setLoading(false)
     }, [
         event.overallReviewMethod,
         event.slug,
@@ -87,7 +87,7 @@ export default () => {
 
         return (
             <>
-                <strong>{total}</strong> <br />
+                <strong>Total votes received: {total}</strong> <br />
                 Participant votes: {scoreFromUsers} <br />
                 Token votes: {scoreFromTokenVoters}
             </>
@@ -102,7 +102,7 @@ export default () => {
                     <ProjectsGridItem
                         project={project}
                         event={event}
-                        score={getScoreText(project._id)}
+                        votingResults={getScoreText(project._id)}
                         onClickMore={() => setSelected(project)}
                         showScore={true}
                     />