Merge branch 'develop' into issue-ohcnetwork#10074

package.json

@@ -78,7 +78,7 @@
     "@radix-ui/react-tooltip": "^1.1.6",
     "@sentry/browser": "^8.50.0",
     "@tanstack/react-query": "^5.64.1",
-    "@tanstack/react-query-devtools": "^5.64.0",
+    "@tanstack/react-query-devtools": "^5.64.2",
     "@vitejs/plugin-react": "^4.3.4",
     "@yudiel/react-qr-scanner": "^2.1.0",
     "bowser": "^2.11.0",
@@ -102,7 +102,7 @@
     "i18next-http-backend": "^3.0.1",
     "input-otp": "^1.4.2",
     "lodash-es": "^4.17.21",
-    "lucide-react": "^0.471.1",
+    "lucide-react": "^0.473.0",
     "markdown-it": "^14.1.0",
     "next-themes": "^0.4.3",
     "postcss-loader": "^8.1.1",

public/locale/en.json

@@ -517,7 +517,6 @@
   "cannot_select_month_out_of_range": "Cannot select month out of range",
   "cannot_select_year_out_of_range": "Cannot select year out of range",
   "capture": "Capture",
-  "capture_cover_photo": "Capture Cover Photo",
   "card": "Card",
   "care": "CARE",
   "care_backend": "Care Backend",
@@ -676,8 +675,8 @@
   "copying_is_not_allowed": "Copying is not allowed",
   "could_not_load_page": "We are facing some difficulties showing the Page you were looking for. Our Engineers have been notified and we'll make sure that this is resolved on the fly!",
   "countries_travelled": "Countries travelled",
-  "cover_image_deleted.": "Cover image deleted.",
-  "cover_image_updated.": "Cover image updated.",
+  "cover_image_deleted": "Cover Image Deleted",
+  "cover_image_updated": "Cover Image Updated",
   "covid_19_cat_gov": "Covid_19 Clinical Category as per Govt. of Kerala guideline (A/B/C)",
   "covid_19_death_reporting_form_1": "Covid-19 Death Reporting : Form 1",
   "covid_details": "Covid Details",
@@ -962,6 +961,7 @@
   "enter_aadhaar_otp": "Enter OTP sent to the registered mobile with Aadhaar",
   "enter_abha_address": "Enter ABHA Address",
   "enter_any_id": "Enter any ID linked with your ABHA number",
+  "enter_dosage_instructions": "Enter Dosage Instructions",
   "enter_file_name": "Enter File Name",
   "enter_message": "Start typing...",
   "enter_mobile_number": "Enter Mobile Number",
@@ -1162,6 +1162,7 @@
   "insurance__policy_name": "Policy ID / Policy Name",
   "insurance_details_detail": "Include details of all the Insurance Policies held by the Patient for smooth insurance processing",
   "insurer_name_required": "Insurer Name is required",
+  "intended": "Intended",
   "intent": "Intent",
   "international_mobile": "International Mobile",
   "invalid_asset_id_msg": "Oops! The asset ID you entered does not appear to be valid.",
@@ -1313,6 +1314,7 @@
   "medical_council_registration_required": "Medical Council Registration is required",
   "medical_records": "Medical Records",
   "medical_worker": "Medical Worker",
+  "medication": "Medication",
   "medication_taken_between": "Medication Taken Between",
   "medicine": "Medicine",
   "medicine_administration_history": "Medicine Administration History",
@@ -1446,6 +1448,8 @@
   "noshow": "No-show",
   "not_eligible": "Not Eligible",
   "not_specified": "Not Specified",
+  "not_taken": "Not Taken",
+  "note": "Note",
   "notes": "Notes",
   "notes_placeholder": "Type your Notes",
   "notice_board": "Notice Board",
@@ -1469,6 +1473,7 @@
   "old_password": "Current Password",
   "on": "on",
   "on_emergency_basis": " on emergency basis",
+  "on_hold": "On Hold",
   "ongoing_medications": "Ongoing Medications",
   "only_indian_mobile_numbers_supported": "Currently only Indian numbers are supported",
   "onset": "Onset",
@@ -1667,6 +1672,7 @@
   "priority": "Priority",
   "prn_prescription": "PRN Prescription",
   "prn_prescriptions": "PRN Prescriptions",
+  "prn_reason": "PRN Reason",
   "procedure_suggestions": "Procedure Suggestions",
   "procedures_select_placeholder": "Select procedures to add details",
   "professional_info": "Professional Information",
@@ -1722,6 +1728,7 @@
   "register_patient": "Register Patient",
   "reject": "Reject",
   "rejected": "Rejected",
+  "related_person": "Related Person",
   "reload": "Reload",
   "remarks": "Remarks",
   "remarks_placeholder": "Enter remarks",
@@ -1875,6 +1882,7 @@
   "select_eligible_policy": "Select an Eligible Insurance Policy",
   "select_facility": "Select Facility",
   "select_facility_description": "Select the healthcare facility that will provide the requested resource.",
+  "select_facility_feature": "Select Facility Features",
   "select_facility_for_discharged_patients_warning": "Facility needs to be selected to view discharged patients.",
   "select_facility_type": "Select Facility Type",
   "select_for_administration": "Select for Administration",
@@ -1993,6 +2001,7 @@
   "status": "Status",
   "stop": "Stop",
   "stop_recording": "Stop Recording",
+  "stopped": "Stopped",
   "stream_stop_due_to_inativity": "The live feed will stop streaming due to inactivity",
   "stream_stopped_due_to_inativity": "The live feed has stopped streaming due to inactivity",
   "stream_uuid": "Stream UUID",

public/locale/hi.json

@@ -200,7 +200,6 @@
   "camera_permission_denied": "कैमरा अनुमति नहीं दी गई",
   "cancel": "रद्द करना",
   "capture": "कब्जा",
-  "capture_cover_photo": "कवर फ़ोटो कैप्चर करें",
   "care": "देखभाल",
   "category": "वर्ग",
   "caution": "सावधानी",

public/locale/kn.json

@@ -202,7 +202,6 @@
   "camera_permission_denied": "ಕ್ಯಾಮೆರಾ ಅನುಮತಿ ನಿರಾಕರಿಸಲಾಗಿದೆ",
   "cancel": "ರದ್ದುಮಾಡಿ",
   "capture": "ಸೆರೆಹಿಡಿಯಿರಿ",
-  "capture_cover_photo": "ಕವರ್ ಫೋಟೋ ಸೆರೆಹಿಡಿಯಿರಿ",
   "care": "ಕಾಳಜಿ",
   "category": "ವರ್ಗ",
   "caution": "ಎಚ್ಚರಿಕೆ",

public/locale/ml.json

@@ -484,7 +484,6 @@
   "cancel_appointment": "അപ്പോയിൻ്റ്മെൻ്റ് റദ്ദാക്കുക",
   "cancelled": "റദ്ദാക്കി",
   "capture": "ക്യാപ്ചർ",
-  "capture_cover_photo": "മുഖചിത്രം എടുക്കുക",
   "card": "കാർഡ്",
   "care": "കെയർ",
   "category": "വിഭാഗം",

public/locale/ta.json

@@ -201,7 +201,6 @@
   "camera_permission_denied": "கேமரா அனுமதி நிராகரித்தது",
   "cancel": "ரத்து செய்",
   "capture": "பிடிப்பு",
-  "capture_cover_photo": "அட்டைப் படத்தைப் பிடிக்கவும்",
   "care": "கவனிப்பு",
   "category": "வகை",
   "caution": "எச்சரிக்கை",

src/components/Common/AvatarEditModal.tsx

@@ -326,11 +326,6 @@ const AvatarEditModal = ({
             </>
           ) : (
             <>
-              <div className="mb-1 mt-2 flex flex-col">
-                <span className="text-xl font-medium">
-                  {t("capture_cover_photo")}
-                </span>
-              </div>
               <div className="flex flex-1 items-center justify-center">
                 {!previewImage ? (
                   <>

src/components/Common/ComboboxQuantityInput.tsx

@@ -92,6 +92,14 @@ export function ComboboxQuantityInput({
     }
   };
 
+  React.useEffect(() => {
+    setInputValue(quantity?.value.toString() || "");
+  }, [quantity?.value]);
+
+  React.useEffect(() => {
+    setSelectedUnit(quantity?.unit);
+  }, [quantity?.unit]);
+
   return (
     <div className="relative flex w-full lg:max-w-[200px] flex-col gap-1">
       <Popover open={open && showDropdown} onOpenChange={setOpen}>