Skip to content

Commit 148c134

Browse files
Merge branch 'dev' into ft/incorporate-new-certificate
2 parents 271b2d8 + 6cfdf6e commit 148c134

File tree

9 files changed

+66
-7
lines changed

9 files changed

+66
-7
lines changed
Lines changed: 46 additions & 0 deletions
Loading

public/locales/bg/common.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
"communities.overview.challenge.learning.start": "започнете сега",
124124
"communities.overview.challenge.team.setup.title": "Създайте вашия екип",
125125
"communities.overview.challenge.team.setup.description": "Изберете от 1 до 3 члена, които да се присъединят към предизвикателството.",
126+
"communities.overview.challenge.team.organization": "Присъединете се към групата в Telegram на DeArk - ICP.Hub Germany и намерете своите отбори, за да завършите предизвикателството с вас.",
126127
"communities.overview.challenge.team.setup.info": "За да завършите предизвикателството с екип, трябва да следвате тези стъпки:",
127128
"communities.overview.challenge.team.setup.submit-title": "Изпратете вашия екип",
128129
"communities.overview.challenge.submission.description": "Поставете кода на вашия екип по-долу и той автоматично ще създаде връзки към всички профили.",

public/locales/en/common.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
"communities.overview.challenge.learning.start": "Start now",
130130
"communities.overview.challenge.team.setup.title": "Form your team",
131131
"communities.overview.challenge.team.setup.description": "Select from 1 to 3 members to join you in the challenge.",
132+
"communities.overview.challenge.team.organization": "Join DeArk - ICP.Hub Germany telegram group and find your teammates to complete the challenge with you..",
132133
"communities.overview.challenge.team.setup.info": "To complete the team challenge, you need to follow these steps:",
133134
"communities.overview.challenge.team.setup.submit-title": "Submit your team",
134135
"communities.overview.challenge.submission.description": "Paste the code of your team below and it will automatically link to all the profiles",
@@ -426,8 +427,8 @@
426427
"kyc.default.title": "Identity verification",
427428
"kyc.default.completed": "Your identity has been verified successfully.",
428429
"kyc.default.reason": "To ensure the safety and security of our platform, we require all users to verify their identity. This verification process helps us maintain a trusted community of members who are committed to upholding our standards. Please take a moment to complete your KYC verification to help us in our efforts to create a safe and secure environment for everyone.",
429-
"kyc.verification.pending":"Your verification is currently being processed. Thank you for your patience",
430-
"kyc.verification.rejected":"We regret to inform you that your verification process has been rejected. Please contact support team for more information.",
430+
"kyc.verification.pending": "Your verification is currently being processed. Thank you for your patience",
431+
"kyc.verification.rejected": "We regret to inform you that your verification process has been rejected. Please contact support team for more information.",
431432
"kyc.default.button": "Start verification",
432433
"kyc.default.button.completed": "Go to profile",
433434
"kyc.payout.reason": "To cashout, you need to verify your identity first.",

public/locales/es/common.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
"communities.overview.challenge.learning.start": "Comenzar ahora",
129129
"communities.overview.challenge.team.setup.title": "Forma tu equipo",
130130
"communities.overview.challenge.team.setup.description": "Selecciona de 1 a 3 miembros para que se unan a ti en el desafío.",
131+
"communities.overview.challenge.team.organization": "Únete al grupo de Telegram DeArk - ICP.Hub Germany y encuentra a tus compañeros de equipo para completar el desafío contigo.",
131132
"communities.overview.challenge.team.setup.info": "Para completar el desafío en equipo, debes seguir estos pasos:",
132133
"communities.overview.challenge.team.setup.submit-title": "Envía tu equipo",
133134
"communities.overview.challenge.submission.description": "Pega el código de tu equipo a continuación y se enlazará automáticamente a todos los perfiles.",

public/locales/hr/common.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@
176176
"communities.overview.challenge.learning.start": "Počnite sada",
177177
"communities.overview.challenge.team.setup.title": "Sastavite svoj tim",
178178
"communities.overview.challenge.team.setup.description": "Odaberite između 1 do 3 člana koji će vam se pridružiti u izazovu.",
179+
"communities.overview.challenge.team.organization": "Pridružite se DeArk - ICP.Hub Germany Telegram grupi i pronađite svoje timove kako biste zajedno završili izazov.",
179180
"communities.overview.challenge.team.setup.info": "Da biste završili timski izazov, trebate slijediti ove korake:",
180181
"communities.overview.challenge.team.setup.submit-title": "Pošaljite svoj tim",
181182
"communities.overview.challenge.submission.description": "Zalijepite kod svog tima u nastavku i automatski će se povezati sa svim profilima.",

src/components/sections/challenges/Rubric.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import Accordion from "@/components/ui/accordion/Accordion";
99
import { IRootState } from "@/store";
1010
import { Colors } from "@/types/community";
1111
import Coin from "@/components/ui/Coin";
12+
import { GRADING_CRITERIA } from "@/constants/challengeInfo";
1213

1314
/**
1415
* Rubic header component props interface
@@ -58,7 +59,7 @@ export default function RubricHeader({ ratingCriteria, selected, hideTitle = fal
5859
return (
5960
<div className="text-base font-normal text-slate-700 pt-8 md:w-182.5 inline-flex flex-wrap items-center gap-1">
6061
{challenge?.isHackathon ? (
61-
<div dangerouslySetInnerHTML={{ __html: hackatonPassingScore }} />
62+
<div dangerouslySetInnerHTML={{ __html: challenge?.additionalInfo?.[GRADING_CRITERIA].text || hackatonPassingScore }} />
6263
) : (
6364
passingScoreParts.map((part, index) => {
6465
if (index === passingScoreParts.length - 1) {
@@ -94,9 +95,8 @@ export default function RubricHeader({ ratingCriteria, selected, hideTitle = fal
9495
{criteria.rubric.map((rubric, k) => (
9596
<div
9697
key={`criteria-rubic-item-${k}`}
97-
className={`text-sm border border-transparent sm:border-gray-200 px-0 py-2 sm:p-3.5 rounded-2xl ${
98-
selected?.length && !selectedRubric(rubric.id) ? "opacity-40" : "relative"
99-
}`}
98+
className={`text-sm border border-transparent sm:border-gray-200 px-0 py-2 sm:p-3.5 rounded-2xl ${selected?.length && !selectedRubric(rubric.id) ? "opacity-40" : "relative"
99+
}`}
100100
>
101101
{selectedRubric(rubric.id) && (
102102
<span className="absolute right-2 bottom-3 w-3" style={{ color: colors?.textAccent }}>

0 commit comments

Comments
 (0)