Merge branch 'develop' into doctor-notes-enhancement

package.json

@@ -86,7 +86,7 @@
     "events": "^3.3.0",
     "hi-profiles": "^1.1.0",
     "i18next": "^23.16.4",
-    "i18next-browser-languagedetector": "^8.0.0",
+    "i18next-browser-languagedetector": "^8.0.2",
     "i18next-http-backend": "^3.0.1",
     "postcss-loader": "^8.1.1",
     "qrcode.react": "^4.1.0",

public/locale/en.json

@@ -1254,8 +1254,8 @@
   "req_atleast_one_uppercase": "Require at least one upper case",
   "request-sample-test": "Service Request",
   "request_consent": "Request Consent",
-  "request_description": "Description of Request",
-  "request_description_placeholder": "Type your description here",
+  "request_reason": "Reason of Request",
+  "request_reason_placeholder": "Type your description here",
   "request_sample_test": "Request Sample Test",
   "request_title": "Request Title",
   "request_title_placeholder": "Type your title here",

public/locale/hi.json

@@ -643,8 +643,8 @@
   "req_atleast_one_lowercase": "कम से कम एक लोअर केस अक्षर की आवश्यकता है",
   "req_atleast_one_symbol": "कम से कम एक प्रतीक की आवश्यकता है",
   "req_atleast_one_uppercase": "कम से कम एक अपर केस की आवश्यकता है",
-  "request_description": "अनुरोध का विवरण",
-  "request_description_placeholder": "अपना विवरण यहाँ लिखें",
+  "request_reason": "अनुरोध का विवरण",
+  "request_reason_placeholder": "अपना विवरण यहाँ लिखें",
   "request_title": "शीर्षक का अनुरोध करें",
   "request_title_placeholder": "अपना शीर्षक यहाँ लिखें",
   "required": "आवश्यक",

public/locale/kn.json

@@ -645,8 +645,8 @@
   "req_atleast_one_lowercase": "ಕನಿಷ್ಠ ಒಂದು ಸಣ್ಣ ಅಕ್ಷರದ ಅಗತ್ಯವಿದೆ",
   "req_atleast_one_symbol": "ಕನಿಷ್ಠ ಒಂದು ಚಿಹ್ನೆಯ ಅಗತ್ಯವಿದೆ",
   "req_atleast_one_uppercase": "ಕನಿಷ್ಠ ಒಂದು ದೊಡ್ಡ ಪ್ರಕರಣದ ಅಗತ್ಯವಿದೆ",
-  "request_description": "ವಿನಂತಿಯ ವಿವರಣೆ",
-  "request_description_placeholder": "ನಿಮ್ಮ ವಿವರಣೆಯನ್ನು ಇಲ್ಲಿ ಟೈಪ್ ಮಾಡಿ",
+  "request_reason": "ವಿನಂತಿಯ ವಿವರಣೆ",
+  "request_reason_placeholder": "ನಿಮ್ಮ ವಿವರಣೆಯನ್ನು ಇಲ್ಲಿ ಟೈಪ್ ಮಾಡಿ",
   "request_title": "ವಿನಂತಿ ಶೀರ್ಷಿಕೆ",
   "request_title_placeholder": "ನಿಮ್ಮ ಶೀರ್ಷಿಕೆಯನ್ನು ಇಲ್ಲಿ ಟೈಪ್ ಮಾಡಿ",
   "required": "ಅಗತ್ಯವಿದೆ",

public/locale/ml.json

@@ -644,8 +644,8 @@
   "req_atleast_one_lowercase": "കുറഞ്ഞത് ഒരു ചെറിയ അക്ഷരമെങ്കിലും ആവശ്യമാണ്",
   "req_atleast_one_symbol": "കുറഞ്ഞത് ഒരു ചിഹ്നമെങ്കിലും ആവശ്യമാണ്",
   "req_atleast_one_uppercase": "കുറഞ്ഞത് ഒരു വലിയ കേസെങ്കിലും ആവശ്യമാണ്",
-  "request_description": "അഭ്യർത്ഥനയുടെ വിവരണം",
-  "request_description_placeholder": "നിങ്ങളുടെ വിവരണം ഇവിടെ ടൈപ്പ് ചെയ്യുക",
+  "request_reason": "അഭ്യർത്ഥനയുടെ വിവരണം",
+  "request_reason_placeholder": "നിങ്ങളുടെ വിവരണം ഇവിടെ ടൈപ്പ് ചെയ്യുക",
   "request_title": "പേര് അഭ്യർത്ഥിക്കുക",
   "request_title_placeholder": "നിങ്ങളുടെ തലക്കെട്ട് ഇവിടെ ടൈപ്പ് ചെയ്യുക",
   "required": "ആവശ്യമാണ്",

public/locale/ta.json

@@ -643,8 +643,8 @@
   "req_atleast_one_lowercase": "குறைந்தபட்சம் ஒரு சிறிய எழுத்து தேவை",
   "req_atleast_one_symbol": "குறைந்தது ஒரு சின்னம் தேவை",
   "req_atleast_one_uppercase": "குறைந்தபட்சம் ஒரு பெரிய வழக்கு தேவை",
-  "request_description": "கோரிக்கையின் விளக்கம்",
-  "request_description_placeholder": "உங்கள் விளக்கத்தை இங்கே தட்டச்சு செய்யவும்",
+  "request_reason": "கோரிக்கையின் விளக்கம்",
+  "request_reason_placeholder": "உங்கள் விளக்கத்தை இங்கே தட்டச்சு செய்யவும்",
   "request_title": "தலைப்பு கோரிக்கை",
   "request_title_placeholder": "உங்கள் தலைப்பை இங்கே தட்டச்சு செய்யவும்",
   "required": "தேவை",

src/components/Facility/ConsultationDetails/index.tsx

@@ -331,7 +331,7 @@ export const ConsultationDetails = (props: any) => {
               </div>
               <div className="flex flex-col justify-between gap-2 px-4 py-1 md:flex-row">
                 <div className="font-base flex flex-col text-xs leading-relaxed text-secondary-700">
-                  <div className="flex">
+                  <div className="flex items-center">
                     <span className="text-secondary-900">Created: </span>&nbsp;
                     <RelativeDateUserMention
                       actionDate={consultationData.created_date}
@@ -342,7 +342,7 @@ export const ConsultationDetails = (props: any) => {
                   </div>
                 </div>
                 <div className="font-base flex flex-col text-xs leading-relaxed text-secondary-700 md:text-right">
-                  <div className="flex">
+                  <div className="flex items-center">
                     <span className="text-secondary-900">Last Modified: </span>
                     &nbsp;
                     <RelativeDateUserMention

src/components/Form/FormFields/PhoneNumberFormField.tsx

@@ -3,6 +3,8 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import React from "react";
 import { useTranslation } from "react-i18next";
 
+import { cn } from "@/lib/utils";
+
 import CareIcon from "@/CAREUI/icons/CareIcon";
 
 import {
@@ -20,7 +22,6 @@ import phoneCodesJson from "@/common/static/countryPhoneAndFlags.json";
 
 import {
   CountryData,
-  classNames,
   formatPhoneNumber as formatPhoneNumberUtil,
   getCountryCode,
   humanizeStrings,
@@ -138,7 +139,7 @@ const PhoneNumberFormField = React.forwardRef<HTMLInputElement, Props>(
                     id={field.id}
                     name={field.name}
                     autoComplete={props.autoComplete ?? "tel"}
-                    className={classNames(
+                    className={cn(
                       "cui-input-base h-full pl-14 tracking-widest sm:leading-6",
                       field.error && "border-danger-500",
                       field.className,

src/components/Resource/ResourceCreate.tsx

@@ -309,11 +309,11 @@ export default function ResourceCreate(props: resourceProps) {
 
         <div className="md:col-span-2">
           <TextAreaFormField
-            label={t("request_description")}
+            label={t("request_reason")}
             name="reason"
             rows={5}
             required
-            placeholder={t("request_description_placeholder")}
+            placeholder={t("request_reason_placeholder")}
             value={state.form.reason}
             onChange={handleChange}
             error={state.errors.reason}

src/components/Resource/ResourceDetails.tsx

@@ -127,7 +127,7 @@ export default function ResourceDetails(props: { id: string }) {
             </div>
             <div className="mt-1">
               <span className="font-semibold leading-relaxed">
-                Description of Request:{" "}
+                Reason of Request{" "}
               </span>
               {data.reason || "--"}
             </div>

src/components/Resource/ResourceDetailsUpdate.tsx

@@ -297,7 +297,7 @@ export const ResourceDetailsUpdate = (props: resourceProps) => {
                 placeholder="Type your description here"
                 value={state.form.reason}
                 onChange={handleChange}
-                label="Description of request*"
+                label="Reason of Request*"
                 error={state.errors.reason}
               />
             </div>