chore: update and fix dependencies

packages/ui/package.json

@@ -9,7 +9,7 @@
 		"@lume/icons": "workspace:^",
 		"@lume/storage": "workspace:^",
 		"@lume/utils": "workspace:^",
-		"@nostr-dev-kit/ndk": "^2.3.2",
+		"@nostr-dev-kit/ndk": "^2.3.3",
 		"@radix-ui/react-accordion": "^1.1.2",
 		"@radix-ui/react-alert-dialog": "^1.0.5",
 		"@radix-ui/react-avatar": "^1.0.4",
@@ -17,12 +17,12 @@
 		"@radix-ui/react-dropdown-menu": "^2.0.6",
 		"@radix-ui/react-hover-card": "^1.0.7",
 		"@radix-ui/react-popover": "^1.0.7",
-		"@tanstack/react-query": "^5.17.12",
+		"@tanstack/react-query": "^5.17.15",
 		"@tauri-apps/api": "2.0.0-alpha.13",
 		"@tauri-apps/plugin-http": "2.0.0-alpha.6",
 		"@tauri-apps/plugin-os": "2.0.0-alpha.6",
 		"framer-motion": "^10.18.0",
-		"jotai": "^2.6.1",
+		"jotai": "^2.6.2",
 		"minidenticons": "^4.2.0",
 		"nostr-tools": "~1.17.0",
 		"react": "^18.2.0",

packages/ui/src/layouts/app.tsx

@@ -1,6 +1,6 @@
+import { cn } from "@lume/utils";
 import { type Platform } from "@tauri-apps/plugin-os";
 import { Outlet } from "react-router-dom";
-import { twMerge } from "tailwind-merge";
 import { Editor } from "../editor/column";
 import { Navigation } from "../navigation";
 import { WindowTitleBar } from "../titlebar";
@@ -8,7 +8,7 @@ import { WindowTitleBar } from "../titlebar";
 export function AppLayout({ platform }: { platform: Platform }) {
 	return (
 		<div
-			className={twMerge(
+			className={cn(
 				"flex h-screen w-screen flex-col",
 				platform !== "macos" ? "bg-blue-50 dark:bg-blue-950" : "",
 			)}

packages/ui/src/mentions.tsx

@@ -7,9 +7,9 @@ import {
 	useImperativeHandle,
 	useState,
 } from "react";
-import { twMerge } from "tailwind-merge";
 
 import { NDKCacheUserProfile } from "@lume/types";
+import { cn } from "@lume/utils";
 
 type MentionListRef = {
 	onKeyDown: (props: { event: Event }) => boolean;
@@ -76,7 +76,7 @@ const List = (
 						type="button"
 						key={item.pubkey}
 						onClick={() => selectItem(index)}
-						className={twMerge(
+						className={cn(
 							"inline-flex h-11 items-center gap-2 rounded-md px-2",
 							index === selectedIndex
 								? "bg-neutral-100 dark:bg-neutral-900"

packages/ui/src/nip05.tsx

@@ -1,8 +1,8 @@
 import { UnverifiedIcon, VerifiedIcon } from "@lume/icons";
+import { cn } from "@lume/utils";
 import { useQuery } from "@tanstack/react-query";
 import { fetch } from "@tauri-apps/plugin-http";
 import { memo } from "react";
-import { twMerge } from "tailwind-merge";
 
 interface NIP05 {
 	names: {
@@ -61,7 +61,7 @@ export const NIP05 = memo(function NIP05({
 
 	return (
 		<div className="inline-flex items-center gap-1">
-			<p className={twMerge("text-sm font-medium", className)}>
+			<p className={cn("text-sm font-medium", className)}>
 				{nip05.startsWith("_@") ? nip05.replace("_@", "") : nip05}
 			</p>
 			{data === true ? (

packages/ui/src/replyList.tsx

@@ -4,7 +4,6 @@ import { NDKEventWithReplies } from "@lume/types";
 import { cn } from "@lume/utils";
 import { NDKKind, type NDKSubscription } from "@nostr-dev-kit/ndk";
 import { useEffect, useState } from "react";
-import { twMerge } from "tailwind-merge";
 import { ReplyForm } from "./editor/replyForm";
 
 export function ReplyList({