wip

src/shared/accounts/active.tsx

@@ -1,26 +1,25 @@
+import { getLastLogin } from "@libs/storage";
 import { Image } from "@shared/image";
 import { NetworkStatusIndicator } from "@shared/networkStatusIndicator";
 import { RelayContext } from "@shared/relayProvider";
-import { useActiveAccount } from "@stores/accounts";
 import { useChannels } from "@stores/channels";
-import { useChatMessages, useChats } from "@stores/chats";
+import { useChats } from "@stores/chats";
 import { DEFAULT_AVATAR } from "@stores/constants";
 import { useProfile } from "@utils/hooks/useProfile";
 import { sendNativeNotification } from "@utils/notification";
-import { useContext } from "react";
-import useSWRSubscription from "swr/subscription";
+import { useContext, useEffect } from "react";
+
+const lastLogin = await getLastLogin();
 
 export function ActiveAccount({ data }: { data: any }) {
 	const ndk = useContext(RelayContext);
 
-	const lastLogin = useActiveAccount((state: any) => state.lastLogin);
 	const notifyChat = useChats((state: any) => state.add);
-	const saveChat = useChatMessages((state: any) => state.add);
 	const notifyChannel = useChannels((state: any) => state.add);
 
-	const { user } = useProfile(data.pubkey);
+	const { status, user } = useProfile(data.pubkey);
 
-	useSWRSubscription(user ? ["activeAccount", data.pubkey] : null, () => {
+	useEffect(() => {
 		const since = lastLogin > 0 ? lastLogin : Math.floor(Date.now() / 1000);
 		// subscribe to channel
 		const sub = ndk.subscribe(
@@ -41,8 +40,6 @@ export function ActiveAccount({ data }: { data: any }) {
 					sendNativeNotification("Someone mention you");
 					break;
 				case 4:
-					// save
-					saveChat(data.pubkey, event);
 					// update state
 					notifyChat(event.pubkey);
 					// send native notifiation
@@ -62,16 +59,20 @@ export function ActiveAccount({ data }: { data: any }) {
 		return () => {
 			sub.stop();
 		};
-	});
+	}, []);
 
 	return (
 		<button type="button" className="relative inline-block h-9 w-9">
-			<Image
-				src={user?.image}
-				fallback={DEFAULT_AVATAR}
-				alt={data.npub}
-				className="h-9 w-9 rounded object-cover"
-			/>
+			{status === "loading" ? (
+				<div className="w-9 h-9 rounded bg-zinc-800 animate-pulse" />
+			) : (
+				<Image
+					src={user.image}
+					fallback={DEFAULT_AVATAR}
+					alt={data.npub}
+					className="h-9 w-9 rounded object-cover"
+				/>
+			)}
 			<NetworkStatusIndicator />
 		</button>
 	);