Sourav

src/components/Patient/diagnosis/DiagnosisTable.tsx

@@ -101,8 +101,8 @@ export function DiagnosisTable({
                     className="w-4 h-4"
                     imageUrl={diagnosis.created_by?.profile_picture_url}
                   />
-                  <span className="text-sm">
-                    {formatName(diagnosis.created_by)}
+                  <span className="text-sm font-medium">
+                    {diagnosis.created_by?.username || "Unknown"}
                   </span>
                 </TableCell>
               </TableRow>

src/components/Patient/symptoms/SymptomTable.tsx

@@ -12,7 +12,7 @@ import {
 
 import { Avatar } from "@/components/Common/Avatar";
 
-import { formatName } from "@/Utils/utils";
+// import { formatName } from "@/Utils/utils";
 import { Symptom } from "@/types/emr/symptom/symptom";
 
 export const getStatusBadgeStyle = (status: string) => {
@@ -103,12 +103,12 @@ export function SymptomTable({
                 </TableCell>
                 <TableCell className="whitespace-nowrap flex items-center gap-2">
                   <Avatar
-                    name={formatName(symptom.created_by)}
-                    className="w-4 h-4"
+                    name={symptom.created_by?.username || "Unknown"}
+                    className="w-6 h-6"
                     imageUrl={symptom.created_by?.profile_picture_url}
                   />
-                  <span className="text-sm">
-                    {formatName(symptom.created_by)}
+                  <span className="text-sm font-medium">
+                    {symptom.created_by?.username || "Unknown"}
                   </span>
                 </TableCell>
               </TableRow>

src/components/Questionnaire/QuestionnaireForm.tsx

@@ -6,8 +6,6 @@ import { toast } from "sonner";
 
 import { cn } from "@/lib/utils";
 
-import CareIcon from "@/CAREUI/icons/CareIcon";
-
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 
@@ -381,25 +379,6 @@ export function QuestionnaireForm({
                   </p>
                 )}
               </div>
-
-              {form.questionnaire.id !== questionnaireData?.id && (
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="sm"
-                  onClick={() => {
-                    setQuestionnaireForms((prev) =>
-                      prev.filter(
-                        (f) => f.questionnaire.id !== form.questionnaire.id,
-                      ),
-                    );
-                  }}
-                  disabled={isPending}
-                >
-                  <CareIcon icon="l-times-circle" />
-                  <span>Remove</span>
-                </Button>
-              )}
             </div>
 
             <QuestionRenderer

src/components/Users/UserForm.tsx

@@ -486,7 +486,7 @@ export default function UserForm({
           </>
         )}
 
-        {!isEditMode && (
+        {
           <FormField
             control={form.control}
             name="email"
@@ -505,7 +505,7 @@ export default function UserForm({
               </FormItem>
             )}
           />
-        )}
+        }
 
         <div className="grid grid-cols-2 gap-4">
           <FormField

src/types/user/user.ts

@@ -30,7 +30,4 @@ export type CreateUserModel = {
   geo_organization: string;
 };
 
-export type UpdateUserModel = Omit<
-  CreateUserModel,
-  "username" | "password" | "email"
->;
+export type UpdateUserModel = Omit<CreateUserModel, "username" | "password">;