Merge branch 'develop' of https://github.com/shauryag2002/care_fe int…

…o shaurya/fix-notes

.example.env

@@ -72,3 +72,6 @@ REACT_DEFAULT_ENCOUNTER_TYPE=
 
 # Available languages to switch between (2 Digit language code seperated by comas. See src->Locale->config.ts for available codes)
 REACT_ALLOWED_LOCALES="en,hi,ta,ml,mr,kn"
+
+# ISO 3166-1 Alpha-2 code for the default country code (default: "IN")
+REACT_DEFAULT_COUNTRY=

.github/dependabot.yml

@@ -1,24 +1,25 @@
 version: 2
 updates:
-  - package-ecosystem: "yarn"
+  - package-ecosystem: npm
     directory: "/"
     schedule:
       interval: "daily"
+    open-pull-requests-limit: 0
     allow:
       - dependency-name: "*"
         dependency-type: "production"
     assignees:
       - "tomahawk_pilot"
     labels:
-      - "yarn"
       - "dependencies"
 
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "daily"
-        assignees:
+    open-pull-requests-limit: 0
+    assignees:
       - "tomahawk_pilot"
     labels:
       - "ci"
-      - "dependencies"
+      - "dependencies"

.github/workflows/codeql-analysis.yml

@@ -16,7 +16,7 @@ jobs:
       contents: read
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:

.github/workflows/cypress.yaml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout 📥
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Determine PR Origin
         id: pr_origin

.github/workflows/deploy.yaml

@@ -34,7 +34,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Cache Docker layers
         uses: actions/cache@v4
@@ -45,7 +45,7 @@ jobs:
             ${{ runner.os }}-buildx-test-
 
       - name: Test build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: Dockerfile
@@ -113,7 +113,7 @@ jobs:
             ${{ runner.os }}-buildx-build-
 
       - name: Build and push image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: Dockerfile

.github/workflows/issue-automation.yml

@@ -13,7 +13,7 @@ jobs:
     if: github.repository == 'ohcnetwork/care_fe' && github.event_name == 'issues' && github.event.action == 'opened' || github.event.action == 'reopened'
     steps:
       - name: 'Move issue to "Triage"'
-        uses: leonsteinhaeuser/project-beta-automations@v1.3.0
+        uses: leonsteinhaeuser/project-beta-automations@v2.2.1
         with:
           gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
           organization: ohcnetwork
@@ -26,7 +26,7 @@ jobs:
     if: github.repository == 'ohcnetwork/care_fe' &&  github.event_name == 'issues' && github.event.action == 'closed'
     steps:
       - name: 'Moved issue to "Done"'
-        uses: leonsteinhaeuser/project-beta-automations@v1.3.0
+        uses: leonsteinhaeuser/project-beta-automations@v2.2.1
         with:
           gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
           organization: ohcnetwork
@@ -39,7 +39,7 @@ jobs:
     if: github.repository == 'ohcnetwork/care_fe' &&  github.event_name == 'issues' && github.event.action == 'assigned'
     steps:
       - name: 'Move issue to "In Progress"'
-        uses: leonsteinhaeuser/project-beta-automations@v1.3.0
+        uses: leonsteinhaeuser/project-beta-automations@v2.2.1
         with:
           gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
           organization: ohcnetwork

.github/workflows/label-merge-conflict.yml

@@ -16,13 +16,14 @@ jobs:
     if: github.repository == 'ohcnetwork/care_fe'
     runs-on: ubuntu-24.04-arm
     steps:
-      - uses: prince-chrismc/label-merge-conflicts-action@v2
+      - uses: prince-chrismc/label-merge-conflicts-action@v3
         with:
           conflict_label_name: "merge conflict"
           github_token: ${{ secrets.GITHUB_TOKEN }}
           max_retries: 5
           wait_ms: 15000
           detect_merge_changes: false
           conflict_comment: |
-            :wave: Hi, @${author},
             Conflicts have been detected against the base branch. Please rebase your branch against the base branch.
+            cc: @${author}
+            > _See: https://docs.ohc.network/docs/contributing#how-to-resolve-merge-conflicts_

.github/workflows/linter.yml

@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - develop
-      - master
   merge_group:
 
 jobs:
@@ -22,7 +21,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "22"
 
       - name: Install dependencies
         run: npm ci

.github/workflows/ossar-analysis.yml

@@ -30,7 +30,7 @@ jobs:
 
       # Run open source static analysis tools
       - name: Run OSSAR
-        uses: github/ossar-action@fae13e456b9973657a670eef6bccc3a4c2b5153d
+        uses: github/ossar-action@v1
         id: ossar
 
         # Upload results to the Security tab

.github/workflows/release.yml

@@ -11,9 +11,9 @@ permissions:
 jobs:
   release:
     name: Release on Push
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Necessary to fetch all tags
 

.github/workflows/stale.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-24.04-arm
     if: github.repository == 'ohcnetwork/care_fe'
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-label: "stale"