Merge branch 'develop' into noufalrahim/feat/added-units-to-pressure-…

…sore

.example.env

@@ -69,7 +69,6 @@ REACT_STILL_WATCHING_PROMPT_DURATION=
 # Feature flags
 REACT_ENABLE_HCX=true
 REACT_ENABLE_ABDM=true
-REACT_ENABLE_SCRIBE=true
 REACT_WARTIME_SHIFTING=true
 
 # JWT token refresh interval (in milliseconds) (default: 5 minutes)

README.md

@@ -70,6 +70,10 @@ Authenticate to staging API with any of the following credentials
 - Once the code review is done, the PR will be marked with a "Needs Testing" label where it'll be queued for QA testing.
 - Once tested, the PR would be marked with a "Tested" label and would be queued for merge.
 
+### Translations
+
+All strings must be encased in i18n translations. New translation strings must be specified in `src`->`Locale`->`en`. Do not add translations for languages other than english through pull requests. Other language translations can be contributed through [Crowdin](https://crowdin.com/project/ohccarefe)
+
 ### Testing
 
 To ensure the quality of our pull requests, we use a variety of tools:

care.config.ts

@@ -103,10 +103,6 @@ const careConfig = {
   abdm: {
     enabled: (env.REACT_ENABLE_ABDM ?? "true") === "true",
   },
-
-  scribe: {
-    enabled: env.REACT_ENABLE_SCRIBE === "true",
-  },
 } as const;
 
 export default careConfig;

cypress/e2e/users_spec/UsersCreation.cy.ts

@@ -149,7 +149,7 @@ describe("User Creation", () => {
     userCreationPage.setInputDate("date_of_birth", "date-input", "25081999");
     userCreationPage.selectDropdownOption("user_type", "Doctor");
     userCreationPage.typeIntoElementById("c_password", "Test@123");
-    userCreationPage.typeIntoElementById("doctor_qualification", "MBBS");
+    userCreationPage.typeIntoElementById("qualification", "MBBS");
     userCreationPage.typeIntoElementById("doctor_experience_commenced_on", "2");
     userCreationPage.typeIntoElementById(
       "doctor_medical_council_registration",
@@ -172,7 +172,7 @@ describe("User Creation", () => {
       "home_facility",
       "Dummy Shifting Center",
     );
-    userCreationPage.verifyElementContainsText("doctor-qualification", "MBBS");
+    userCreationPage.verifyElementContainsText("qualification", "MBBS");
     userCreationPage.verifyElementContainsText("doctor-experience", "2");
     userCreationPage.verifyElementContainsText(
       "medical-council-registration",

cypress/e2e/users_spec/UsersProfile.cy.ts

@@ -12,7 +12,7 @@ describe("Manage User Profile", () => {
   const email = "[email protected]";
   const phone = "+918899887788";
   const workinghours = "8";
-  const doctorQualification = "MBBS";
+  const qualification = "MBBS";
   const doctorYoE = "10";
   const medicalCouncilRegistration = "1234567890";
 
@@ -40,7 +40,7 @@ describe("Manage User Profile", () => {
     userProfilePage.typePhone(phone);
     userProfilePage.typeWhatsApp(phone);
     userProfilePage.typeWorkingHours(workinghours);
-    userProfilePage.typeDoctorQualification(doctorQualification);
+    userProfilePage.typeQualification(qualification);
     userProfilePage.typeDoctorYoE(doctorYoE);
     userProfilePage.typeMedicalCouncilRegistration(medicalCouncilRegistration);
 

cypress/pageobject/Users/UserProfilePage.ts

@@ -42,8 +42,8 @@ export default class UserProfilePage {
     cy.get("#weekly_working_hours").click().clear().type(workinghours);
   }
 
-  typeDoctorQualification = (doctorQualification: string) => {
-    cy.get("#doctor_qualification").click().clear().type(doctorQualification);
+  typeQualification = (qualification: string) => {
+    cy.get("#qualification").click().clear().type(qualification);
   };
 
   typeDoctorYoE = (doctorYoE: string) => {