Merge branch 'issue/10158/patient-user-card-fix' of https://github.co…

…m/rajku-dev/care_fe into issue/10158/patient-user-card-fix

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

@@ -24,5 +24,6 @@ jobs:
           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

cypress/e2e/facility_spec/facility_creation.cy.ts

@@ -3,6 +3,8 @@ import { generatePhoneNumber } from "@/utils/commonUtils";
 import { generateFacilityData } from "@/utils/facilityData";
 
 const LOCATION_HIERARCHY = {
+  state: "Kerala",
+  district: "Ernakulam",
   localBody: "Aluva",
   ward: "4",
 };

cypress/pageObject/facility/FacilityCreation.ts

@@ -126,7 +126,18 @@ export class FacilityCreation {
       .should("not.be.empty");
   }
 
-  fillLocationHierarchy(location: { localBody: string; ward: string }) {
+  fillLocationHierarchy(location: {
+    state: string;
+    district: string;
+    localBody: string;
+    ward: string;
+  }) {
+    cy.typeAndSelectOption('[data-cy="select-state"]', location.state, false);
+    cy.typeAndSelectOption(
+      '[data-cy="select-district"]',
+      location.district,
+      false,
+    );
     // Don't verify selection for local body (false parameter)
     cy.typeAndSelectOption(
       '[data-cy="select-local_body"]',

index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta
       name="viewport"
-      content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no"
+      content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no, interactive-widget=resizes-content"
     />
     <title>%REACT_APP_TITLE%</title>
     <meta name="description" content="%REACT_APP_META_DESCRIPTION%" />