Merge branch 'dev' into stage

Author: musayann

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
- npx lint-staged
+ npx lint-staged && npm run check-branch-name

CONTRIBUTING.md

@@ -8,7 +8,7 @@ More on the [Conventional commits](https://www.conventionalcommits.org/en/v1.0.0
 
 <br>
 
-# Components conventions
+## Components conventions
 
 1. Use `functional components` instead of arrow components
 2. For typescript, use `interface` for props, and types if needed.

README.md

@@ -62,6 +62,7 @@ yarn start
 
 ```bash
 git clone https://github.com/dacadeorg/dacade-frontend-app.git
+cd dacade-frontend-app
 ```
 
 ### 2. Install Dependencies

check_branch_name.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+local_branch_name="$(git rev-parse --abbrev-ref HEAD)"
+
+# This regular expression is:
+# 1. checking for branch Names: "dev" or "main" 
+#    - ^(dev|main)$)
+# 2. checking for branch Name starting with fix,ft,ht,chore or doc follwed by a "/" then the "branch name"
+#    - ^((fix|ft|ht|chore|doc)\/[a-zA-Z0-9\-]+)$
+valid_branch_regex='^(dev|main)$|^((fix|ft|ht|chore|doc)\/[a-zA-Z0-9\-]+)$'
+
+green='\033[0;32m'
+red='\033[0;31m'
+clear='\033[0m'
+
+message="❌❌❌❌ Error: The branch name $local_branch_name does not adhere to the project guidelines.\nPlease refer to the CONTRIBUTING guide for the correct format.\nYour commit will be rejected. Rename your branch to a valid name and try again."
+
+if [[ ! $local_branch_name =~ $valid_branch_regex ]]; then
+    echo -e "${red}$message${clear}"
+    exit 1
+fi
+
+echo -e "${green}Branch name check passed ✅${clear}"
+exit 0

package.json

@@ -8,7 +8,8 @@
     "start": "next start",
     "lint": "eslint --ignore-path .eslintignore \"./**/*.{ts,tsx,js}\"",
     "prettier-format": "prettier --config .prettierrc 'src/**/*.{ts,tsx,js,jsx}' --write",
-    "postinstall": "chmod +x .husky/*"
+    "check-branch-name": "./check_branch_name.sh",
+    "prepare": "npx husky install && chmod +x .husky/* && chmod +x ./check_branch_name.sh"
   },
   "dependencies": {
     "@coingecko/cryptoformat": "^0.5.4",

public/locales/bg/common.json

@@ -149,6 +149,7 @@
   "communities.challenge.evaluation.total": "Total",
   "communities.challenge.evaluation.points": "Points",
   "communities.challenge.evaluation.message": "Congratulations you gained at least 70% of the available learning points.",
+  "communities.challenge.evaluation.message.nominated": "Поздравления, печеленето на 90% ви номинира за наградния фонд от:",
   "communities.submission.title": "Submissions",
   "communities.feedbacks": "Feedbacks",
   "communities.navigation.overview": "Преглед",

public/locales/en/common.json

@@ -150,6 +150,7 @@
   "communities.challenge.evaluation.total": "Total",
   "communities.challenge.evaluation.points": "Points",
   "communities.challenge.evaluation.message": "Congratulations you gained at least 70% of the available learning points.",
+  "communities.challenge.evaluation.message.nominated": "Congratulations, earning 90% nominates you for the prize pool of:",
   "communities.submission.title": "Submissions",
   "communities.feedbacks": "Feedbacks",
   "communities.navigation.overview": "Overview",

public/locales/es/common.json

@@ -153,6 +153,7 @@
   "communities.challenge.evaluation.total": "Total",
   "communities.challenge.evaluation.points": "Puntos",
   "communities.challenge.evaluation.message": "¡Felicidades, ha ganado al menos el 70% de los puntos disponibles!",
+  "communities.challenge.evaluation.message.nominated": "Felicitaciones, ganar el 90% te nominó para el fondo de premios de:",
   "communities.submission.title": "Propuestas",
   "communities.feedbacks": "Feedbacks",
   "communities.navigation.overview": "Vista general",

public/locales/hr/common.json

@@ -136,6 +136,7 @@
   "communities.challenge.evaluation.total": "Total",
   "communities.challenge.evaluation.points": "Points",
   "communities.challenge.evaluation.message": "Congratulations you gained at least 70% of the available learning points.",
+  "communities.challenge.evaluation.message.nominated": "Čestitamo, osvajanje 90% nominira vas za nagradni fond od:",
   "communities.submission.title": "Submissions",
   "communities.feedbacks": "Feedbacks",
   "communities.navigation.overview": "Pregled",

src/components/cards/profile/Request.tsx

@@ -25,7 +25,7 @@ export default function Request(): ReactElement {
     <div className="md:flex items-center justify-between text-sm ">
       <div className={`relative md:flex text-gray-500 items-center md:divide-x divide-solid ${referrals && referrals.length ? "" : "hidden"}`}>
         <div className="flex pr-3 items-center">
-          <div className="cursor-pointer" onClick={onClick}>
+          <div className="cursor-pointer flex" onClick={onClick}>
             {previewList?.map((referral, index) => (
               <Avatar key={referral.id} className={`border-2 border-solid border-white ${index > 0 && "-ml-3"}`} hideVerificationBadge useLink={false} user={referral.user} />
             ))}