Merge pull request #1088 from dacadeorg/fix/reconcile-hardcoded-values-for-spiced-challenge

Fix/reconcile hardcoded values for spiced challenge

Author: musayann

public/locales/bg/common.json

@@ -133,7 +133,7 @@
   "communities.challenge.criteria.subtitle": "Следните учебни материали ще ви дадат необходимата техническа експертиза, за да се справите успешно с предизвикателството.",
   "communities.challenge.criteria.points": "Points",
   "communities.challenge.passing.score.description": "За да  {{coinPlaceholder}} <strong>{{amount}}</strong> <strong>{{token}}</strong>, трябва да получите поне <strong>{{minPoints}}</strong> от <strong>{{maxPoints}}</strong> точки в този предизвикателство.",
-  "communities.challenge.hackathon.passing.score": "Трябва да получите <strong>90%</strong>, за да влезете в наградния фонд и да спечелите награди на стойност <strong>7 000 щатски долара.</strong>",
+  "communities.challenge.hackathon.passing.score": "Трябва да получите <strong>{{threshold}}%</strong>, за да влезете в наградния фонд и да спечелите награди на стойност <strong>{{prizePool}} щатски долара.</strong>",
   "communities.challenge.submission": "заявка",
   "communities.challenge.submit": "Изпращане",
   "communities.challenge.feedback": "обратна връзка",

public/locales/en/common.json

@@ -118,7 +118,7 @@
   "communities.overview.challenge.subtitle": "Upon successful completion",
   "communities.overview.challenge.expiry": "Challenge expiry date:",
   "communities.overview.challenge.learning.title": "The following learning materials will equip you with the technical expertise required to successfully address the challenge.",
-  "communities.overview.challenge.learning.start": "start now",
+  "communities.overview.challenge.learning.start": "Start now",
   "communities.overview.challenge.team.setup.title": "Form your team",
   "communities.overview.challenge.team.setup.description": "Select from 1 to 3 members to join you in the challenge.",
   "communities.overview.challenge.team.setup.info": "To complete the team challenge, you need to follow these steps:",
@@ -134,7 +134,7 @@
   "communities.challenge.criteria.subtitle": "The following learning materials will equip you with the technical expertise required to successfully address the challenge.",
   "communities.challenge.criteria.points": "Points",
   "communities.challenge.passing.score.description": "In order to earn {{coinPlaceholder}} <strong>{{amount}}</strong> <strong>{{token}}</strong> you must get at least <strong>{{minPoints}}</strong> out of <strong>{{maxPoints}}</strong> Points in this challenge.",
-  "communities.challenge.hackathon.passing.score": "You need to get <strong>90%</strong> to get into the prize pool and earn prizes worth of <strong>USD 7,000.</strong>",
+  "communities.challenge.hackathon.passing.score": "You need to get <strong>{{threshold}}%</strong> to get into the prize pool and earn prizes worth of <strong>{{prizePool}}</strong>. Earn some extra points through your localization's implementations.",
   "communities.challenge.submission": "Submission",
   "communities.challenge.submit": "Submit",
   "communities.challenge.feedback": "Feedback",

public/locales/es/common.json

@@ -117,7 +117,7 @@
   "communities.overview.challenge.subtitle": "Al completar con éxito",
   "communities.overview.challenge.expiry": "Fecha de vencimiento del desafío:",
   "communities.overview.challenge.learning.title": "Los siguientes materiales de aprendizaje le proporcionarán la experiencia técnica necesaria para abordar con éxito el desafío.",
-  "communities.overview.challenge.learning.start": "comenzar ahora",
+  "communities.overview.challenge.learning.start": "Comenzar ahora",
   "communities.overview.challenge.team.setup.title": "Forma tu equipo",
   "communities.overview.challenge.team.setup.description": "Selecciona de 1 a 3 miembros para que se unan a ti en el desafío.",
   "communities.overview.challenge.team.setup.info": "Para completar el desafío en equipo, debes seguir estos pasos:",
@@ -134,7 +134,7 @@
   "communities.challenge.criteria.subtitle": "Los siguientes materiales de aprendizaje lo equiparán con la experiencia técnica necesaria para abordar con éxito el desafío.",
   "communities.challenge.criteria.points": "Puntos",
   "communities.challenge.passing.score.description": "Para ganar {{coinPlaceholder}} <strong>{{amount}}</strong> <strong>{{token}}</strong>, debes obtener al menos <strong>{{minPoints}}</strong> de <strong>{{maxPoints}}</strong> puntos en este desafío.",
-  "communities.challenge.hackathon.passing.score": "Necesitas obtener el <strong>90%</strong> para entrar en el fondo de premios y ganar premios por un valor de <strong>USD 7,000.</strong>",
+  "communities.challenge.hackathon.passing.score": "Necesitas obtener el <strong>{{threshold}}%</strong> para entrar en el fondo de premios y ganar premios por un valor de <strong>{{prizePool}}.</strong>",
   "communities.challenge.submission": "Propuesta",
   "communities.challenge.submit": "Entregar",
   "communities.challenge.feedback": "Feedback",

public/locales/hr/common.json

@@ -118,7 +118,7 @@
   "communities.challenge.criteria.subtitle": "Sljedeći materijali za učenje opremit će vas tehničkom stručnošću potrebnom za uspješno rješavanje izazova.",
   "communities.challenge.criteria.points": "bodova",
   "communities.challenge.passing.score.description": "U svrhu zarade {{coinPlaceholder}} <strong>{{amount}}</strong> <strong>{{token}}</strong>-ova morate osvojiti barem <strong>{{minPoints}}</strong> od <strong>{{maxPoints}}</strong> bodova u ovom izazovu.",
-  "communities.challenge.hackathon.passing.score": "Trebate dobiti <strong>90%</strong> kako biste ušli u nagradni fond i osvojili nagrade u vrijednosti od <strong>7.000 američkih dolara.</strong>",
+  "communities.challenge.hackathon.passing.score": "Trebate dobiti <strong>{{threshold}}%</strong> kako biste ušli u nagradni fond i osvojili nagrade u vrijednosti od <strong>{{prizePool}}</strong>",
   "communities.challenge.submission": "predaji zadatka",
   "communities.challenge.submit": "podnijeti",
   "communities.challenge.feedback": "povratnoj informaciji",
@@ -165,7 +165,7 @@
   "communities.overview.challenge.certificate": "Certificate",
   "communities.overview.challenge.expiry": "Datum isteka izazova:",
   "communities.overview.challenge.learning.title": "Sljedeći materijali za učenje opskrbit će vas tehničkim stručnostima potrebnim za uspješno rješavanje izazova.",
-  "communities.overview.challenge.learning.start": "počnite sada",
+  "communities.overview.challenge.learning.start": "Počnite sada",
   "communities.overview.challenge.team.setup.title": "Sastavite svoj tim",
   "communities.overview.challenge.team.setup.description": "Odaberite između 1 do 3 člana koji će vam se pridružiti u izazovu.",
   "communities.overview.challenge.team.setup.info": "Da biste završili timski izazov, trebate slijediti ove korake:",

src/components/cards/challenge/_partials/FormTeam.tsx

@@ -28,7 +28,7 @@ export default function FormTeamCard({ index = 1, title, description }: FormTeam
           </div>
           <div className="text-sm font-normal text-gray-700 mt-3 max-w-xxs pb-6">{description}</div>
         </div>
-        <Link href="https://discord.gg/gBQghCPeV7" target="_blank">
+        <Link href="https://t.me/+0oJye8IwAuxkMDY0" target="_blank">
           <ArrowButton communityStyles={true} variant="outline-primary">
             Start now
           </ArrowButton>

src/components/sections/challenges/Objectives.tsx

@@ -26,15 +26,17 @@ export default function Objectives(): ReactElement {
       <div className="space-y-5">
         <ObjectiveList objectives={challenge?.objectives} />
         {expirationDate && <ExpiryDate expiresAt={expirationDate} />}
-        {containsLink.test(challenge?.hint as string) && (
-          <Hint>
+        <Hint>
+          {containsLink.test(challenge?.hint as string) ? (
             <span
               dangerouslySetInnerHTML={{
                 __html: challenge?.hint as string,
               }}
             />
-          </Hint>
-        )}
+          ) : (
+            <>{challenge?.hint}</>
+          )}
+        </Hint>
       </div>
     </Section>
   );

src/components/sections/challenges/Rubric.tsx

@@ -53,7 +53,7 @@ export default function RubricHeader({ ratingCriteria, selected, hideTitle = fal
     });
 
     const passingScoreParts = passingScore.split("{{coinPlaceholder}}");
-    const hackatonPassingScore = t("communities.challenge.hackathon.passing.score");
+    const hackatonPassingScore = t("communities.challenge.hackathon.passing.score", { threshold: challenge?.threshold, prizePool: `USD ${reward?.amount}` });
 
     return (
       <div className="text-base font-normal text-slate-700 pt-8 md:w-182.5 inline-flex flex-wrap items-center gap-1">

src/components/sections/challenges/SetupTeamChallenge.tsx

@@ -26,7 +26,7 @@ export default function SetupTeamChallenge(): JSX.Element {
     <Section title="Submission">
       <div className="text-base font-normal text-slate-700 pt-8 pb-7 md:w-182.5">{t("communities.overview.challenge.team.setup.info")}</div>
       <div className="md:flex flex-row gap-5">
-        <FormTeamCard index={1} title="Form your team" description="Open discord channel #icp-ai-web3-hachathon and find your teammates to complete the challenge with you." />
+        <FormTeamCard index={1} title="Form your team" description="Join DeArk - ICP.Hub Germany telegram group and find your teammates to complete the challenge with you." />
         {invite && !invite.team?.locked ? (
           <ConfirmTeamInvitation index={2} title="Submit your team" text={`The maximum team members for this challenge is ${challenge?.teamLimit || "3"} people`} invite={invite} />
         ) : (

src/components/sections/challenges/TeamChallenge.tsx

@@ -1,6 +1,7 @@
-import React from "react";
+import React, { useMemo } from "react";
 import Section from "@/components/sections/communities/_partials/Section";
 import TeamChallengeCard from "@/components/cards/TeamChallenge";
+import { useSelector } from "@/hooks/useTypedSelector";
 
 /**
  * Data structure for a card.
@@ -15,9 +16,30 @@ interface CardData {
  * TeamChallenge component.
  *
  * @returns {JSX.Element} The TeamChallenge component JSX element.
+ *  * @interface TeamChallengeCard
  */
+
 export default function TeamChallenge(): JSX.Element {
-  const TeamChallengeData: CardData[] = [
+  const challenge = useSelector((state) => state.challenges.current);
+
+  const hackathonChallengeSteps: CardData[] = [
+    {
+      index: 1,
+      title: "Form your team",
+      text: "Open Telegram group and find your teammates to complete the challenge with you",
+    },
+    {
+      index: 2,
+      title: "Confirm your team",
+      text: "Make sure your teammates accept notification to confirm your team",
+    },
+    {
+      index: 3,
+      title: "Submit!",
+      text: "Once you have completed the challenge, only one person needs to submit it at the end of this page",
+    },
+  ];
+  const teamChallengeSteps: CardData[] = [
     {
       index: 1,
       title: "Form your team",
@@ -31,16 +53,20 @@ export default function TeamChallenge(): JSX.Element {
     {
       index: 3,
       title: "Submit!",
-      text: "Once you have completed the challenge, only person needs to submit it at the end of this page",
+      text: "Once you have completed the challenge, only one person needs to submit it at the end of this page",
     },
   ];
 
+  const steps: CardData[] = useMemo(() => {
+    return challenge?.isHackathon ? hackathonChallengeSteps : teamChallengeSteps;
+  }, [challenge?.isTeamChallenge]);
+
   return (
     <Section title="Team Challenge">
       <div className="text-base font-normal text-slate-700 pt-8 pb-7 md:w-182.5">To complete the team challenge, you need to follow these steps:</div>
       <div className="md:flex flex-row gap-20 md:divide-y-0 divide-y divide-gray-900 divide-dotted space-y-5 md:space-y-0 space-x-0">
-        {TeamChallengeData.map((card) => (
-          <TeamChallengeCard key={`TeamChallenge-card-data-${card.index}`} index={card.index} title={card.title} text={card.text} />
+        {steps.map((step) => (
+          <TeamChallengeCard key={`TeamChallenge-card-data-${step.index}`} index={step.index} title={step.title} text={step.text} />
         ))}
       </div>
     </Section>

src/pages/bounties/index.tsx

@@ -56,7 +56,6 @@ export default function Bounties() {
     bounties: (state: IRootState) => state.bounties.bountiesList,
   });
 
-
   return (
     <div className="flex justify-center content-wrapper">
       <div className="hidden lg:block w-1/4 mt-28 py-3 pr-10 lg:py-14">