Fix: default matomo siteId and multiple winners (#588)

* fix: open terms and package.json details * fix: open github commit from current version * feat: set matomo env vars * feat: parse matomo project id * feat: add trackEvents * feat: set VITE_MATOMO_PROJECT_ID 1 by default * fix: remove debugs * fix: update status page * feat: multiple winners
cardano-foundation · Sep 23, 2024 · 7762d57 · 7762d57
1 parent f26badf
commit 7762d57
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 37 deletions.
diff --git a/ui/summit-2024/src/common/constants/env.ts b/ui/summit-2024/src/common/constants/env.ts
@@ -18,7 +18,7 @@ const MATOMO_BASE_URL =
 const MATOMO_PROJECT_ID =
   window._env_?.VITE_MATOMO_PROJECT_ID ||
   import.meta.env.VITE_MATOMO_PROJECT_ID ||
-  "0";
+  "1";
 const DISCORD_CHANNEL_URL =
   window._env_?.VITE_DISCORD_CHANNEL_URL ||
   import.meta.env.VITE_DISCORD_CHANNEL_URL;

diff --git a/ui/summit-2024/src/components/Footer/Footer.tsx b/ui/summit-2024/src/components/Footer/Footer.tsx
@@ -139,7 +139,7 @@ const Footer = () => {
                     </span>
                     (
                     <Link
-                      href="https://status.voting.summit.cardano.org/"
+                      href="https://status2024.voting.summit.cardano.org"
                       target="_blank"
                       rel="noopener"
                       sx={{

diff --git a/ui/summit-2024/src/pages/Categories/components/ViewReceipt.tsx b/ui/summit-2024/src/pages/Categories/components/ViewReceipt.tsx
@@ -21,7 +21,7 @@ import {
   setVoteReceipt,
   setVotes,
 } from "../../../store/reducers/votesCache";
-import { copyToClipboard } from "../../../utils/utils";
+import { copyToClipboard, resolveCardanoNetwork } from "../../../utils/utils";
 import { getUserInSession, tokenIsExpired } from "../../../utils/session";
 import {
   getVoteReceipt,
@@ -31,6 +31,8 @@ import { eventBus, EventName } from "../../../utils/EventBus";
 import { ToastType } from "../../../components/common/Toast/Toast.types";
 import { parseError } from "../../../common/constants/errors";
 import { verifyVote } from "../../../common/api/verificationService";
+import { env } from "../../../common/constants/env";
+import { NetworkType } from "../../../components/ConnectWalletList/ConnectWalletList.types";
 
 const ViewReceipt: React.FC<ViewReceiptProps> = ({ categoryId, close }) => {
   const session = getUserInSession();
@@ -77,10 +79,11 @@ const ViewReceipt: React.FC<ViewReceiptProps> = ({ categoryId, close }) => {
 
   const viewOnChainVote = () => {
     if (receipt?.merkleProof?.transactionHash) {
-      window.open(
-        `https://preprod.cardanoscan.io/transaction/${receipt?.merkleProof?.transactionHash}`,
-        "_blank",
-      );
+      let url = `https://explorer.cardano.org/transaction?id=${receipt?.merkleProof?.transactionHash}`;
+      if (resolveCardanoNetwork(env.TARGET_NETWORK) === NetworkType.TESTNET) {
+        url = `https://preprod.cardanoscan.io/transaction/${receipt?.merkleProof?.transactionHash}`;
+      }
+      window.open(url, "_blank");
     }
   };
 
@@ -204,7 +207,7 @@ const ViewReceipt: React.FC<ViewReceiptProps> = ({ categoryId, close }) => {
           ),
           title: "In Progress",
           description:
-            "Your transaction has been sent and is awaiting confirmation from the Cardano network (this could be 5-10 minutes). Once this has been confirmed you’ll be able to verify your vote.",
+            "Your transaction has been sent and is awaiting for the event's grace period to finish. Once it ends you'll be able to verify your vote.",
           iconBottom: (
             <RefreshIcon
               sx={{
@@ -260,7 +263,7 @@ const ViewReceipt: React.FC<ViewReceiptProps> = ({ categoryId, close }) => {
           ),
           title: "In Progress",
           description:
-            "Your transaction has been sent and is awaiting confirmation from the Cardano network (this could be 5-10 minutes). Once this has been confirmed you’ll be able to verify your vote.",
+            "Your transaction has been sent and is awaiting for the event's grace period to finish. Once it ends you'll be able to verify your vote.",
           iconBottom: (
             <RefreshIcon
               sx={{

diff --git a/ui/summit-2024/src/pages/Categories/components/Winners.tsx b/ui/summit-2024/src/pages/Categories/components/Winners.tsx
@@ -67,10 +67,12 @@ const Winners: React.FC<WinnersProps> = ({
     (v) => v.categoryId === categoryId,
   )?.proposalId;
 
-  let nominees =
+  const nominees =
     extendedCategoryData.find((c) => c.id === categoryId)?.proposals || [];
-  const winner = nominees[0];
-  nominees.shift();
+
+  const maxVotes = Math.max(...nominees.map((n) => n.votes || 0));
+  const winners = nominees.filter((n) => n.votes === maxVotes);
+  const remainingNominees = nominees.filter((n) => n.votes !== maxVotes);
 
   useEffect(() => {
     getVotingResults().then((response) => {
@@ -169,7 +171,7 @@ const Winners: React.FC<WinnersProps> = ({
             zIndex: 3,
           }}
         >
-          {votedFor === winner.id ? (
+          {winners.find((w) => w.id === votedFor) ? (
             <TickIcon circleSize={28} tickSize={20} />
           ) : null}
         </Box>
@@ -188,32 +190,45 @@ const Winners: React.FC<WinnersProps> = ({
             marginBottom: "40px",
           }}
         >
-          Winner!
+          Winner
+          {winners.length > 1 ? "s" : ""}!
         </Typography>
-        <Box component="div" display="flex" justifyContent="center" mt={2}>
-          <img src={awardImg} alt="Placeholder" height={148} />
-        </Box>
-        <Typography
-          onClick={(event: React.MouseEvent<HTMLDivElement, MouseEvent>) =>
-            handleLearnMoreClick(event, "")
-          }
-          align="center"
+        <Box
+          component="div"
+          display="flex"
+          justifyContent="center"
           mt={2}
           sx={{
-            color: theme.palette.text.neutralLightest,
-            textAlign: "center",
-            textShadow: "0px 0px 12px rgba(18, 18, 18, 0.20)",
-            fontFamily: "Dosis",
-            fontSize: "28px",
-            fontStyle: "normal",
-            fontWeight: 700,
-            lineHeight: "32px",
-            marginTop: "40px",
-            cursor: "pointer",
+            marginBottom: "30px",
           }}
         >
-          {winner?.name}
-        </Typography>
+          <img src={awardImg} alt="Placeholder" height={148} />
+        </Box>
+        {winners.map((winner) => {
+          return (
+            <Typography
+              onClick={(event: React.MouseEvent<HTMLDivElement, MouseEvent>) =>
+                handleLearnMoreClick(event, "")
+              }
+              align="center"
+              mt={2}
+              sx={{
+                color: theme.palette.text.neutralLightest,
+                textAlign: "center",
+                textShadow: "0px 0px 12px rgba(18, 18, 18, 0.20)",
+                fontFamily: "Dosis",
+                fontSize: "28px",
+                fontStyle: "normal",
+                fontWeight: 700,
+                lineHeight: "32px",
+                marginTop: "10px",
+                cursor: "pointer",
+              }}
+            >
+              {winner?.name}
+            </Typography>
+          );
+        })}
         <Box
           component="div"
           sx={{
@@ -275,10 +290,9 @@ const Winners: React.FC<WinnersProps> = ({
                 marginTop: "4px",
               }}
             >
-              {winner?.votes}
+              {winners[0].votes}
             </Typography>
           </Box>
-
           <Box
             component="div"
             sx={{
@@ -421,7 +435,7 @@ const Winners: React.FC<WinnersProps> = ({
           </TableRow>
         </TableHead>
         <TableBody>
-          {nominees?.map((nominee, index) => (
+          {remainingNominees?.map((nominee, index) => (
             <TableRow
               key={index}
               sx={{