chore: update and fix dependencies

packages/ark/package.json

@@ -9,7 +9,7 @@
 		"@lume/ndk-cache-tauri": "workspace:^",
 		"@lume/storage": "workspace:^",
 		"@lume/utils": "workspace:^",
-		"@nostr-dev-kit/ndk": "^2.3.2",
+		"@nostr-dev-kit/ndk": "^2.3.3",
 		"@nostr-fetch/adapter-ndk": "^0.15.0",
 		"@radix-ui/react-avatar": "^1.0.4",
 		"@radix-ui/react-collapsible": "^1.0.3",
@@ -18,7 +18,7 @@
 		"@radix-ui/react-hover-card": "^1.0.7",
 		"@radix-ui/react-popover": "^1.0.7",
 		"@radix-ui/react-tooltip": "^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-clipboard-manager": "2.0.0-alpha.5",
 		"@tauri-apps/plugin-dialog": "2.0.0-alpha.5",
@@ -30,7 +30,7 @@
 		"@tauri-apps/plugin-updater": "2.0.0-alpha.5",
 		"@tauri-apps/plugin-upload": "2.0.0-alpha.5",
 		"get-urls": "^12.1.0",
-		"jotai": "^2.6.1",
+		"jotai": "^2.6.2",
 		"linkify-react": "^4.1.3",
 		"linkifyjs": "^4.1.3",
 		"media-chrome": "^2.0.1",

packages/ark/src/components/column/root.tsx

@@ -1,7 +1,7 @@
+import { cn } from "@lume/utils";
 import { Resizable } from "re-resizable";
 import { ReactNode, useState } from "react";
 import { MemoryRouter, UNSAFE_LocationContext } from "react-router-dom";
-import { twMerge } from "tailwind-merge";
 
 export function ColumnRoot({
 	children,
@@ -22,7 +22,7 @@ export function ColumnRoot({
 				}}
 				minWidth={420}
 				maxWidth={600}
-				className={twMerge(
+				className={cn(
 					"relative flex flex-col border-r-2 border-neutral-50 hover:border-neutral-100 dark:border-neutral-950 dark:hover:border-neutral-900",
 					className,
 				)}

packages/ark/src/components/note/buttons/repost.tsx

@@ -1,12 +1,11 @@
 import { LoaderIcon, ReplyIcon, RepostIcon } from "@lume/icons";
-import { editorAtom, editorValueAtom } from "@lume/utils";
+import { cn, editorAtom, editorValueAtom } from "@lume/utils";
 import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
 import * as Tooltip from "@radix-ui/react-tooltip";
 import { useSetAtom } from "jotai";
 import { nip19 } from "nostr-tools";
 import { useState } from "react";
 import { toast } from "sonner";
-import { twMerge } from "tailwind-merge";
 import { useNoteContext } from "../provider";
 
 export function NoteRepost() {
@@ -71,7 +70,7 @@ export function NoteRepost() {
 									<LoaderIcon className="size-4 animate-spin" />
 								) : (
 									<RepostIcon
-										className={twMerge(
+										className={cn(
 											"size-5 group-hover:text-blue-600",
 											isRepost ? "text-blue-500" : "",
 										)}

packages/ark/src/components/note/thread.tsx

@@ -1,7 +1,6 @@
 import { PinIcon } from "@lume/icons";
-import { COL_TYPES } from "@lume/utils";
+import { COL_TYPES, cn } from "@lume/utils";
 import { Link } from "react-router-dom";
-import { twMerge } from "tailwind-merge";
 import { Note } from ".";
 import { useArk } from "../../hooks/useArk";
 import { useColumnContext } from "../column/provider";
@@ -24,7 +23,7 @@ export function NoteThread({
 	if (!thread) return null;
 
 	return (
-		<div className={twMerge("w-full px-3", className)}>
+		<div className={cn("w-full px-3", className)}>
 			<div className="flex flex-col w-full gap-3 p-3 rounded-lg h-min bg-neutral-100 dark:bg-neutral-900">
 				{thread.rootEventId ? (
 					<Note.Child eventId={thread.rootEventId} isRoot />