chore: clean up

packages/ark/package.json

@@ -23,7 +23,7 @@
 		"jotai": "^2.6.2",
 		"linkify-react": "^4.1.3",
 		"linkifyjs": "^4.1.3",
-		"media-chrome": "^2.0.1",
+		"media-chrome": "^2.1.0",
 		"minidenticons": "^4.2.0",
 		"nanoid": "^5.0.4",
 		"nostr-fetch": "^0.15.0",
@@ -32,7 +32,7 @@
 		"re-resizable": "^6.9.11",
 		"react": "^18.2.0",
 		"react-currency-input-field": "^3.6.14",
-		"react-router-dom": "^6.21.2",
+		"react-router-dom": "^6.21.3",
 		"react-string-replace": "^1.1.1",
 		"sonner": "^1.3.1",
 		"tippy.js": "^6.3.7",

packages/ark/src/components/user/nip05.tsx

@@ -1,5 +1,5 @@
 import { UnverifiedIcon, VerifiedIcon } from "@lume/icons";
-import { cn } from "@lume/utils";
+import { cn, displayNpub } from "@lume/utils";
 import { useQuery } from "@tanstack/react-query";
 import { useArk } from "../../hooks/useArk";
 import { useUserContext } from "./provider";
@@ -39,9 +39,9 @@ export function UserNip05({
 	return (
 		<div className="inline-flex items-center gap-1">
 			<p className={cn("text-sm font-medium", className)}>
-				{user.nip05.startsWith("_@")
-					? user.nip05.replace("_@", "")
-					: user.nip05}
+				{user?.nip05?.startsWith("_@")
+					? user?.nip05?.replace("_@", "")
+					: displayNpub(pubkey, 16)}
 			</p>
 			{!isLoading && verified ? (
 				<VerifiedIcon className="size-4 text-teal-500" />

packages/lume-column-activity/package.json

@@ -11,7 +11,7 @@
 		"@nostr-dev-kit/ndk": "^2.3.3",
 		"@tanstack/react-query": "^5.17.15",
 		"react": "^18.2.0",
-		"react-router-dom": "^6.21.2",
+		"react-router-dom": "^6.21.3",
 		"sonner": "^1.3.1",
 		"virtua": "^0.20.5"
 	},

packages/lume-column-antenas/package.json

@@ -11,7 +11,7 @@
 		"@nostr-dev-kit/ndk": "^2.3.3",
 		"@tanstack/react-query": "^5.17.15",
 		"react": "^18.2.0",
-		"react-router-dom": "^6.21.2",
+		"react-router-dom": "^6.21.3",
 		"sonner": "^1.3.1",
 		"virtua": "^0.20.5"
 	},

packages/lume-column-default/package.json

@@ -11,7 +11,7 @@
 		"@nostr-dev-kit/ndk": "^2.3.3",
 		"@tanstack/react-query": "^5.17.15",
 		"react": "^18.2.0",
-		"react-router-dom": "^6.21.2",
+		"react-router-dom": "^6.21.3",
 		"sonner": "^1.3.1",
 		"virtua": "^0.20.5"
 	},

packages/lume-column-group/package.json

@@ -11,7 +11,7 @@
 		"@nostr-dev-kit/ndk": "^2.3.3",
 		"@tanstack/react-query": "^5.17.15",
 		"react": "^18.2.0",
-		"react-router-dom": "^6.21.2",
+		"react-router-dom": "^6.21.3",
 		"sonner": "^1.3.1",
 		"virtua": "^0.20.5"
 	},

packages/lume-column-hashtag/package.json

@@ -11,7 +11,7 @@
 		"@nostr-dev-kit/ndk": "^2.3.3",
 		"@tanstack/react-query": "^5.17.15",
 		"react": "^18.2.0",
-		"react-router-dom": "^6.21.2",
+		"react-router-dom": "^6.21.3",
 		"sonner": "^1.3.1",
 		"virtua": "^0.20.5"
 	},

packages/lume-column-thread/package.json

@@ -11,7 +11,7 @@
 		"@nostr-dev-kit/ndk": "^2.3.3",
 		"@tanstack/react-query": "^5.17.15",
 		"react": "^18.2.0",
-		"react-router-dom": "^6.21.2",
+		"react-router-dom": "^6.21.3",
 		"sonner": "^1.3.1",
 		"virtua": "^0.20.5"
 	},

packages/lume-column-timeline/package.json

@@ -11,7 +11,7 @@
 		"@nostr-dev-kit/ndk": "^2.3.3",
 		"@tanstack/react-query": "^5.17.15",
 		"react": "^18.2.0",
-		"react-router-dom": "^6.21.2",
+		"react-router-dom": "^6.21.3",
 		"sonner": "^1.3.1",
 		"virtua": "^0.20.5"
 	},

packages/lume-column-user/package.json

@@ -11,7 +11,7 @@
 		"@nostr-dev-kit/ndk": "^2.3.3",
 		"@tanstack/react-query": "^5.17.15",
 		"react": "^18.2.0",
-		"react-router-dom": "^6.21.2",
+		"react-router-dom": "^6.21.3",
 		"sonner": "^1.3.1",
 		"virtua": "^0.20.5"
 	},

packages/storage/src/storage.ts

@@ -65,8 +65,6 @@ export class LumeStorage {
 
 		const account = await this.getActiveAccount();
 		if (account) this.currentUser = account;
-
-		this.nwc = await this.loadPrivkey("Nostr Wallet Connect");
 	}
 
 	async #keyring_save(key: string, value: string) {
@@ -427,10 +425,14 @@ export class LumeStorage {
 	}
 
 	public async logout() {
-		this.currentUser = null;
-		return await this.#db.execute(
+		const res = await this.#db.execute(
 			"UPDATE accounts SET is_active = '0' WHERE id = $1;",
 			[this.currentUser.id],
 		);
+
+		if (res) {
+			this.currentUser = null;
+			this.nwc = null;
+		}
 	}
 }

packages/ui/package.json

@@ -26,7 +26,7 @@
 		"react-dom": "^18.2.0",
 		"react-hook-form": "^7.49.3",
 		"react-hotkeys-hook": "^4.4.4",
-		"react-router-dom": "^6.21.2",
+		"react-router-dom": "^6.21.3",
 		"slate": "^0.101.5",
 		"slate-react": "^0.101.5",
 		"sonner": "^1.3.1",

packages/ui/src/account/logout.tsx

@@ -1,3 +1,4 @@
+import { useArk } from "@lume/ark";
 import { LogoutIcon } from "@lume/icons";
 import { useStorage } from "@lume/storage";
 import * as AlertDialog from "@radix-ui/react-alert-dialog";
@@ -6,10 +7,10 @@ import { useNavigate } from "react-router-dom";
 import { toast } from "sonner";
 
 export function Logout() {
+	const ark = useArk();
 	const storage = useStorage();
-
-	const navigate = useNavigate();
 	const queryClient = useQueryClient();
+	const navigate = useNavigate();
 
 	const logout = async () => {
 		try {
@@ -18,11 +19,14 @@ export function Logout() {
 
 			// clear cache
 			queryClient.clear();
+			ark.account = null;
+			ark.ndk.signer = null;
+			ark.ndk.activeUser = null;
 
 			// redirect to welcome screen
-			navigate("/auth/welcome");
+			navigate("/auth/");
 		} catch (e) {
-			toast.error(e);
+			toast.error(String(e));
 		}
 	};
 

packages/ui/src/avatarUploadButton.tsx

@@ -23,7 +23,7 @@ export function AvatarUploadButton({
 			}
 		} catch (e) {
 			setLoading(false);
-			toast.error(e);
+			toast.error(String(e));
 		}
 	};