Fix the merge conflict error

Author: jhodapp

src/components/ui/members/member-card.tsx

@@ -63,16 +63,22 @@ export function MemberCard({
     (state: OrganizationStateStore) => state.currentOrganizationId
   );
   const { isACoach, userSession } = useAuthStore((state: AuthStore) => state);
-  const { error: deleteError, deleteNested: deleteUser } = useUserMutation(currentOrganizationId);
-  const { error: createError, createNested: createRelationship } = useCoachingRelationshipMutation(currentOrganizationId);
+  const { error: deleteError, deleteNested: deleteUser } = useUserMutation(
+    currentOrganizationId
+  );
+  const { error: createError, createNested: createRelationship } =
+    useCoachingRelationshipMutation(currentOrganizationId);
 
   console.log("is a coach", isACoach);
 
   // Check if current user is a coach in any of this user's relationships
   // and make sure we can't delete ourselves. Admins can delete any user.
-  const canDeleteUser = (userRelationships?.some(
-    (rel) => rel.coach_id === userSession.id && userId !== userSession.id
-  ) || (userSession.role === Role.Admin)) && userSession.id !== userId;
+  const canDeleteUser =
+    (userRelationships?.some(
+      (rel) => rel.coach_id === userSession.id && userId !== userSession.id
+    ) ||
+      userSession.role === Role.Admin) &&
+    userSession.id !== userId;
 
   const handleDelete = async () => {
     if (!confirm("Are you sure you want to delete this member?")) {
@@ -129,31 +135,16 @@ export function MemberCard({
       toast.error(`Error assigning ${assignMode}`);
       return;
     }
-    
-    toast.success(`Successfully assigned ${assignedMember.first_name} ${assignedMember.last_name} as ${assignMode} for ${selectedMember.first_name} ${selectedMember.last_name}`);
+
+    toast.success(
+      `Successfully assigned ${assignedMember.first_name} ${assignedMember.last_name} as ${assignMode} for ${selectedMember.first_name} ${selectedMember.last_name}`
+    );
     onRefresh();
     setAssignDialogOpen(false);
     setSelectedMember(null);
     setAssignedMember(null);
   };
 
-  // Placeholder – actual UI flows will be implemented later
-  const [assignDialogOpen, setAssignDialogOpen] = useState(false);
-  const [assignMode, setAssignMode] = useState<"coach" | "coachee">("coach");
-  const [selectedMemberId, setSelectedMemberId] = useState<Id | null>(null);
-
-  const handleCreateCoachingRelationship = () => {
-    if (!selectedMemberId) return;
-    if (assignMode === "coach") {
-      console.log("Assign", selectedMemberId, "as coach for", userId);
-    } else {
-      console.log("Assign", selectedMemberId, "as coachee for", userId);
-    }
-    // TODO: call mutation
-    setAssignDialogOpen(false);
-    setSelectedMemberId(null);
-  };
-
   return (
     <div className="flex items-center p-4 hover:bg-accent/50 transition-colors">
       <div className="flex-1">
@@ -163,49 +154,61 @@ export function MemberCard({
         {email && <p className="text-sm text-muted-foreground">{email}</p>}
       </div>
       {(isACoach || userSession.role === Role.Admin) && (
-      <DropdownMenu>
-        <DropdownMenuTrigger asChild>
-          <Button variant="ghost" size="icon" className="text-muted-foreground">
-            <MoreHorizontal className="h-4 w-4" />
-          </Button>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent align="end">
-          {userSession.role === Role.Admin && (
-            <>
-              <DropdownMenuItem
-                onClick={() => {
-                  setAssignMode("coach");
-                  setAssignDialogOpen(true);
-                  setSelectedMember({id: userId, first_name: firstName, last_name: lastName});
-                }}
-              >
-                Assign Coach
-              </DropdownMenuItem>
-              <DropdownMenuItem
-                onClick={() => {
-                  setAssignMode("coachee");
-                  setAssignDialogOpen(true);
-                  setSelectedMember({id: userId, first_name: firstName, last_name: lastName});
-                }}
-              >
-                Assign Coachee
-              </DropdownMenuItem>
-            </>
-          )}
-          {canDeleteUser && (
-            <>
-              <DropdownMenuSeparator />
-              <DropdownMenuItem
-                onClick={handleDelete}
-                className="text-destructive focus:text-destructive"
-              >
-                <Trash2 className="mr-2 h-4 w-4" /> Delete
-              </DropdownMenuItem>
-            </>
-          )}
-        </DropdownMenuContent>
-      </DropdownMenu>
-    )}
+        <DropdownMenu>
+          <DropdownMenuTrigger asChild>
+            <Button
+              variant="ghost"
+              size="icon"
+              className="text-muted-foreground"
+            >
+              <MoreHorizontal className="h-4 w-4" />
+            </Button>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent align="end">
+            {userSession.role === Role.Admin && (
+              <>
+                <DropdownMenuItem
+                  onClick={() => {
+                    setAssignMode("coach");
+                    setAssignDialogOpen(true);
+                    setSelectedMember({
+                      id: userId,
+                      first_name: firstName,
+                      last_name: lastName,
+                    });
+                  }}
+                >
+                  Assign Coach
+                </DropdownMenuItem>
+                <DropdownMenuItem
+                  onClick={() => {
+                    setAssignMode("coachee");
+                    setAssignDialogOpen(true);
+                    setSelectedMember({
+                      id: userId,
+                      first_name: firstName,
+                      last_name: lastName,
+                    });
+                  }}
+                >
+                  Assign Coachee
+                </DropdownMenuItem>
+              </>
+            )}
+            {canDeleteUser && (
+              <>
+                <DropdownMenuSeparator />
+                <DropdownMenuItem
+                  onClick={handleDelete}
+                  className="text-destructive focus:text-destructive"
+                >
+                  <Trash2 className="mr-2 h-4 w-4" /> Delete
+                </DropdownMenuItem>
+              </>
+            )}
+          </DropdownMenuContent>
+        </DropdownMenu>
+      )}
 
       {/* Assign Coach/Coachee Modal */}
       <Dialog open={assignDialogOpen} onOpenChange={setAssignDialogOpen}>
@@ -215,7 +218,8 @@ export function MemberCard({
               {assignMode === "coach" ? "Assign Coach" : "Assign Coachee"}
             </DialogTitle>
             <DialogDescription>
-              Select a member to be their {assignMode === "coach" ? "coach" : "coachee"}
+              Select a member to be their{" "}
+              {assignMode === "coach" ? "coach" : "coachee"}
             </DialogDescription>
           </DialogHeader>
           <Select
@@ -229,12 +233,17 @@ export function MemberCard({
               {users
                 .filter((m) => m.id !== userId)
                 .map((m) => (
-                  <SelectItem key={m.id} value={m.id.toString()}>{`${m.first_name} ${m.last_name}`}</SelectItem>
+                  <SelectItem
+                    key={m.id}
+                    value={m.id.toString()}
+                  >{`${m.first_name} ${m.last_name}`}</SelectItem>
                 ))}
             </SelectContent>
           </Select>
           <DialogFooter>
-            <Button onClick={handleCreateCoachingRelationship}>{assignMode === "coach" ? "Assign as Coach" : "Assign as Coachee"}</Button>
+            <Button onClick={handleCreateCoachingRelationship}>
+              {assignMode === "coach" ? "Assign as Coach" : "Assign as Coachee"}
+            </Button>
           </DialogFooter>
         </DialogContent>
       </Dialog>