resolved merge conflict

Author: Ghazi1212

.babelrc

@@ -1,3 +1,7 @@
 {
-  "presets": ["react-app"]
-}
+  "presets": ["@babel/preset-env", "@babel/preset-react"],
+  "plugins": [
+    "@babel/plugin-transform-optional-chaining",
+    "@babel/plugin-transform-nullish-coalescing-operator"
+  ]
+}

.eslintignore

@@ -0,0 +1,39 @@
+name: Close PRs from Forks
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - synchronize
+
+jobs:
+  check-fork:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Check if PR is from a fork
+        id: check
+        run: |
+          echo "PR head repo: ${{ github.event.pull_request.head.repo.full_name }}"
+          echo "Base repo: ${{ github.event.repository.full_name }}"
+          if [[ "${{ github.event.pull_request.head.repo.full_name }}" != "${{ github.event.repository.full_name }}" ]]; then
+            echo "PR is from a fork"
+            echo "is_fork=true" >> $GITHUB_ENV
+          else
+            echo "PR is not from a fork"
+            echo "is_fork=false" >> $GITHUB_ENV
+          fi
+
+      - name: Close PR and add comment
+        if: env.is_fork == 'true'
+        run: |
+          PR_NUMBER=${{ github.event.pull_request.number }}
+          GH_REPO=${{ github.repository }}
+          echo "Closing PR #$PR_NUMBER in repository $GH_REPO"
+          gh pr close \
+            "$PR_NUMBER" \
+            --repo "${{ github.repository }}" \
+            --comment "This PR has been closed because PRs from forks are not allowed. Please create a branch directly off the origin repository and resubmit your PR."
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.eslintrc.js

@@ -22,15 +22,15 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 14
-          cache: 'npm'
+          node-version: 20
+          cache: 'yarn'
       - name: Install Dependencies
-        run: npm ci
+        run: yarn install --frozen-lockfile
       # We don't run tests here since we assume it's already done during PR process.
       # - name: Update Browser List
       #   run: npx browserslist@latest --update-db
       - name: Build React App
-        run: npm run build && cp build/index.html build/200.html 
+        run: yarn run build && cp build/index.html build/200.html 
         env:
           NODE_ENV: ${{ github.ref_name == 'main' && 'production' || 'development' }}
           REACT_APP_APIENDPOINT: ${{ vars.REACT_APP_API_ENDPOINT }}

.eslintrc.json

@@ -3,18 +3,21 @@ name: Pull Request Unit Test
 on:
   pull_request:
     branches:
-      - main
       - development
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+      with:
+          fetch-depth: 0
     - uses: actions/setup-node@v4
       with:
-        node-version: 14
-        cache: 'npm'
+        node-version: 20
+        cache: 'yarn'
     - name: Install Dependencies
-      run: npm ci
-    - name: Run Unit Tests
-      run: npm test
+      run: yarn install --frozen-lockfile
+    - name: Run Unit Tests for Changed Files Only
+      run: yarn run test:changed
+    - name: Run Lint
+      run: yarn run lint

.github/workflows/close-fork-pr.yml

@@ -0,0 +1,32 @@
+name: Test React App
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js & cache Yarn
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: yarn
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Run tests
+        run: yarn test
+
+      - name: Upload test results
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results
+          path: test-results # Adjust the path to your test results if necessary

.github/workflows/deploy.yml

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npm run lint
+npm run test

.github/workflows/pull_request_test.yml

@@ -1,5 +1,24 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
 
-npm run lint
-npm run test
+echo ""
+echo "🛡️  Husky pre-commit hook triggered"
+echo "🛠️  Attempting to auto-fix lint issues (if possible)..."
+echo "🔍 Running ESLint via lint-staged on staged files:"
+git diff --cached --name-only --diff-filter=ACM | grep -E '\.(js|jsx|ts|tsx)$' || echo "No JS/TS files staged."
+
+# Run lint-staged only if relevant files are staged
+if git diff --cached --name-only | grep -qE '\.(js|jsx|ts|tsx)$'; then
+  npx lint-staged
+  lint_exit_code=$?
+
+  if [ $lint_exit_code -eq 0 ]; then
+    echo "✅ Lint passed or was auto-fixed. Proceeding with commit."
+  else
+    echo "❌ Lint failed. Some issues couldn't be auto-fixed. Commit aborted."
+    echo "💡 Please fix the errors and try again."
+    exit $lint_exit_code
+  fi
+else
+  echo "ℹ️  No JS/TS files to lint. Skipping lint-staged."
+fi