Merge branch 'develop' into valueset_bugs

ohcnetwork · Feb 20, 2025 · 440d9c0 · 440d9c0
2 parents a5c47d9 + 213fb25
commit 440d9c0
Show file tree

Hide file tree

Showing 10 changed files with 220 additions and 223 deletions.
diff --git a/public/locale/en.json b/public/locale/en.json
@@ -803,6 +803,7 @@
   "edit_caution_note": "A new prescription will be added to the consultation with the edited details and the current prescription will be discontinued.",
   "edit_cover_photo": "Edit Cover Photo",
   "edit_facility": "Edit Facility",
+  "edit_facility_details": "Edit Facility Details",
   "edit_history": "Edit History",
   "edit_location": "Edit Location",
   "edit_location_description": "Edit the Location to make any changes",

diff --git a/src/components/Common/AvatarEditModal.tsx b/src/components/Common/AvatarEditModal.tsx
@@ -62,8 +62,8 @@ const AvatarEditModal = ({
   const [selectedFile, setSelectedFile] = useState<File>();
   const [preview, setPreview] = useState<string>();
   const [isCameraOpen, setIsCameraOpen] = useState<boolean>(false);
-  const webRef = useRef<any>(null);
-  const [previewImage, setPreviewImage] = useState(null);
+  const webRef = useRef<Webcam>(null);
+  const [previewImage, setPreviewImage] = useState<string | null>(null);
   const [isCaptureImgBeingUploaded, setIsCaptureImgBeingUploaded] =
     useState(false);
   const [constraint, setConstraint] = useState<IVideoConstraint>(
@@ -81,16 +81,35 @@ const AvatarEditModal = ({
   }, []);
 
   const captureImage = () => {
-    setPreviewImage(webRef.current.getScreenshot());
-    const canvas = webRef.current.getCanvas();
-    canvas?.toBlob((blob: Blob) => {
-      const myFile = new File([blob], "image.png", {
-        type: blob.type,
-      });
-      setSelectedFile(myFile);
+    if (webRef.current) {
+      setPreviewImage(webRef.current.getScreenshot());
+    }
+    const canvas = webRef.current?.getCanvas();
+    canvas?.toBlob((blob) => {
+      if (blob) {
+        const myFile = new File([blob], "image.png", {
+          type: blob.type,
+        });
+        setSelectedFile(myFile);
+      } else {
+        toast.error(t("failed_to_capture_image"));
+      }
     });
   };
-
+  const stopCamera = useCallback(() => {
+    try {
+      if (webRef.current) {
+        const openCamera = webRef.current?.video?.srcObject as MediaStream;
+        if (openCamera) {
+          openCamera.getTracks().forEach((track) => track.stop());
+        }
+      }
+    } catch {
+      toast.error("Failed to stop camera");
+    } finally {
+      setIsCameraOpen(false);
+    }
+  }, []);
   const closeModal = () => {
     setPreview(undefined);
     setIsProcessing(false);
@@ -410,7 +429,7 @@ const AvatarEditModal = ({
                     onClick={() => {
                       setPreviewImage(null);
                       setIsCameraOpen(false);
-                      webRef.current.stopCamera();
+                      stopCamera();
                     }}
                     disabled={isProcessing}
                   >

diff --git a/src/components/Common/ContactLink.tsx b/src/components/Common/ContactLink.tsx
@@ -7,14 +7,8 @@ type ContactLinkProps =
 export default function ContactLink(props: ContactLinkProps) {
   return (
     <div>
-      <a
-        href={props.tel ? `tel:${props.tel}` : `mailto:${props.mailto}`}
-        className="flex items-center gap-2 border-b border-blue-500 text-base font-medium tracking-wider text-blue-500"
-      >
-        <CareIcon
-          icon={props.tel ? "l-outgoing-call" : "l-envelope-alt"}
-          className="h-5 fill-secondary-700"
-        />
+      <a href={props.tel ? `tel:${props.tel}` : `mailto:${props.mailto}`}>
+        <CareIcon icon={props.tel ? "l-outgoing-call" : "l-envelope-alt"} />
         {props.tel ? props.tel : props.mailto}
       </a>
     </div>

diff --git a/src/components/Common/UserSelector.tsx b/src/components/Common/UserSelector.tsx
@@ -71,7 +71,7 @@ export default function UserSelector({
                 className="size-6 rounded-full"
               />
               <TooltipComponent content={formatName(selected)} side="bottom">
-                <p className="font-medium text-gray-900 truncate max-w-56 sm:max-w-48 md:max-w-64 lg:max-w-64 xl:max-w-36">
+                <p className="font-medium text-gray-900 truncate max-w-48 sm:max-w-56 md:max-w-64">
                   {formatName(selected)}
                 </p>
               </TooltipComponent>