Merge branch 'dev' into fix/avatar-achievements

Author: gabrielaacha

.github/workflows/pre.release.yml

@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - stage
+      - main
 
 permissions:
   contents: write
@@ -13,9 +13,7 @@ jobs:
   release-please:
     runs-on: ubuntu-latest
     steps:
-      - uses: google-github-actions/release-please-action@v3
+      - uses: google-github-actions/release-please-action@v4
         with:
           release-type: node
           target-branch: main
-          package-name: package.json
-          labels: "stable"

.github/workflows/stable.release.yaml renamed to .github/workflows/release.yaml

@@ -26,7 +26,7 @@ export default function Badges({ challenge, className }: BadgeProps) {
   }, [challenge.level]);
 
   return (
-    <div className={`uppercase flex gap-2 mb-6 ${className}`}>
+    <div className={`uppercase flex flex-wrap gap-2 mb-6 ${className}`}>
       {challenge?.level && <Tag>{t(challengeLevel)}</Tag>}
       {challenge?.isTeamChallenge && <Tag type="light">{challenge?.isHackathon ? "Hackathon" : "Team"} challenge</Tag>}
     </div>

src/components/cards/challenge/Badges.tsx

@@ -40,7 +40,7 @@ export default function ChallengeCard({ data, community, isCourseEnd }: Challeng
               <Badges challenge={data} className="md:hidden" />
             </div>
 
-            <div className="flex flex-col mb-6 lg:mb-0 mt-6 md:mt-0 rounded-full max-w-max text-sm">
+            <div className="flex flex-col mb-6 lg:mb-0 mt-6 md:mt-0 max-w-max text-sm">
               <div className="flex items-center mb-8 gap-2 md:gap-0">
                 <Certificate size="medium" name={community.slug} />
                 <div className="md:pl-2 max-w-max">
@@ -56,11 +56,9 @@ export default function ChallengeCard({ data, community, isCourseEnd }: Challeng
                 <Coin size="medium" token={reward?.token} />
                 <div className="md:pl-2 max-w-max">
                   <div className="flex text-sm text-gray-700">
-                    <span className="block font-medium pr-1">
-                      {data?.isHackathon && "$"}
-                      {totalReward}
+                    <span className="block font-medium">
+                      {`${data?.isHackathon ? "$" : ""} ${totalReward} ${data?.isHackathon ? `Prize Pool Rewards` : `${reward?.token} Rewards`}`}
                     </span>
-                    <span className="block font-medium">{data?.isHackathon ? `Prize Pool Rewards` : `${reward?.token} Rewards`}</span>
                   </div>
                   <div className="text-gray-400 text-xs font-normal">{data?.isHackathon ? "Top projects win money prizes" : "For submission and feedback"}</div>
                 </div>

src/components/cards/challenge/Challenge.tsx

@@ -84,7 +84,7 @@ export default function BountiesNavigation(): ReactElement {
                       "!text-blue-600": router.query.slug === item.link.split("/")[2],
                     })}
                   >
-                    <span className="absolute inline-block -left-6 nav-icon">{router.query.slug === item.link.split("/")[2] && <ChevronRightIcon />}</span>
+                    <span className="absolute !inline-block -left-6 nav-icon">{router.query.slug === item.link.split("/")[2] && <ChevronRightIcon />}</span>
                     <span className="nav-label">{item.label}</span>
                   </Link>
                 </li>

src/components/sections/bounties/Navigation.tsx

@@ -41,12 +41,13 @@ export default function LanguageSelector(): ReactElement {
       course.translations
         .filter((locale) => locale)
         .forEach((translation) => {
+          const code = translation.locale || "en";
           setLocales((prev) => [
             ...prev,
             {
               id: translation.id,
-              code: translation.locale,
-              name: languages[translation.locale],
+              code,
+              name: languages[code],
             },
           ]);
         });

src/components/sections/courses/_partials/LanguageSwitcher.tsx

@@ -111,18 +111,18 @@ export default function ProfileHeader() {
           <></>
         )}
       </div>
-      {canConnectDiscord && (
-        <div className="pt-5 space-x-3">
+      <div className="pt-5 space-x-3">
+        {canConnectDiscord && (
           <Button variant="outline-primary" className="flex mx-auto text-base" onClick={triggerDiscordOauth}>
             {t("profile.header.connect-discord")}
           </Button>
-          {!isKycVerified && (
-            <Button variant="outline-primary" className="flex mx-auto text-base" onClick={triggerKYCVerification}>
-              {t("profile.header.sumsub.verify")}
-            </Button>
-          )}
-        </div>
-      )}
+        )}
+        {!isKycVerified && (
+          <Button variant="outline-primary" className="flex mx-auto text-base" onClick={triggerKYCVerification}>
+            {t("profile.header.sumsub.verify")}
+          </Button>
+        )}
+      </div>
       <KYCVerification />
     </div>
   );

src/components/sections/profile/Header.tsx

@@ -107,7 +107,7 @@ export default function ProfileNagivation(): ReactElement {
                 <li key={`profile-menu-subItem-${k}`} className="text-sm relative text-primary">
                   <Link href={item.link} className={`relative text-gray-500 ${isCurrentMenuItem(item) && "text-primary"}`}>
                     {isCurrentMenuItem(item) && (
-                      <span className="inline-block absolute -left-6 nav-icon">
+                      <span className="!inline-block absolute -left-6 nav-icon">
                         <ChevronRightIcon />
                       </span>
                     )}

src/components/sections/profile/Navigation.tsx

@@ -34,7 +34,7 @@ export function NavItem({ item, isActive = false, expanded = false }: NavItemPro
   const { t } = useTranslation();
   return (
     <span>
-      <span style={{ display: isActive ? "inline-block" : "none" }} className="absolute top-0 inline-block -left-6 nav-icon">
+      <span style={{ display: isActive ? "!inline-block" : "none" }} className="absolute top-0 inline-block -left-6 nav-icon">
         <ChevronRightIcon className={`transition-transform duration-200 ${item.subitems && item.subitems.length && isActive && expanded ? "transform rotate-90" : ""}`} />
       </span>
       <span className="nav-label">{t(item.label)}</span>