+
+
+
+ {!messages ? (
+
Loading...
+ ) : (
+
Header,
+ EmptyPlaceholder: () => Empty,
+ }}
+ />
+ )}
+
+
diff --git a/src/app/chat/components/item.tsx b/src/app/chat/components/item.tsx
index 227fc330..f6022844 100644
--- a/src/app/chat/components/item.tsx
+++ b/src/app/chat/components/item.tsx
@@ -20,6 +20,7 @@ export function ChatsListItem({ data }: { data: any }) {
) : (
twMerge(
"inline-flex h-9 items-center gap-2.5 rounded-md px-2.5",
diff --git a/src/app/chat/components/messages/item.tsx b/src/app/chat/components/messages/item.tsx
index 28486635..e99a4c64 100644
--- a/src/app/chat/components/messages/item.tsx
+++ b/src/app/chat/components/messages/item.tsx
@@ -26,7 +26,11 @@ export function ChatMessageItem({
return (
-
+
{content.parsed}
diff --git a/src/app/chat/components/modal.tsx b/src/app/chat/components/modal.tsx
index 1aac7b76..ee4fcfa8 100644
--- a/src/app/chat/components/modal.tsx
+++ b/src/app/chat/components/modal.tsx
@@ -94,7 +94,7 @@ export function NewMessageModal() {
-
+
{status === "loading" || isFetching ? (
Loading...
) : (
diff --git a/src/app/chat/components/self.tsx b/src/app/chat/components/self.tsx
index 2aff0685..480855c5 100644
--- a/src/app/chat/components/self.tsx
+++ b/src/app/chat/components/self.tsx
@@ -20,6 +20,7 @@ export function ChatsListSelfItem({ data }: { data: any }) {
) : (
twMerge(
"inline-flex h-9 items-center gap-2.5 rounded-md px-2.5",
diff --git a/src/app/chat/index.tsx b/src/app/chat/index.tsx
index f01d2318..f54358a2 100644
--- a/src/app/chat/index.tsx
+++ b/src/app/chat/index.tsx
@@ -52,39 +52,37 @@ export function ChatScreen() {
>
Encrypted Chat
-
- {account && (
-
+
+
+
{status === "loading" ? (
Loading...
) : (
-
- Empty,
- }}
- />
-
- )}
-
- Empty,
+ }}
/>
-
+ )}
- )}
+
+
+
+
@@ -92,18 +90,16 @@ export function ChatScreen() {
data-tauri-drag-region
className="h-11 w-full shrink-0 inline-flex items-center justify-center border-b border-zinc-900"
/>
- {pubkey && }
+
);
}
const Empty = (
-
-
- Nothing to see here yet
-
-
+
+
🙌
+
You two didn't talk yet, let's send first message
diff --git a/src/app/root.tsx b/src/app/root.tsx
index 2ddc0ca9..ebc57200 100644
--- a/src/app/root.tsx
+++ b/src/app/root.tsx
@@ -8,7 +8,7 @@ import {
getLastLogin,
} from "@libs/storage";
import { NDKFilter } from "@nostr-dev-kit/ndk";
-import { LumeIcon } from "@shared/icons";
+import { LoaderIcon, LumeIcon } from "@shared/icons";
import { RelayContext } from "@shared/relayProvider";
import { dateToUnix, getHourAgo } from "@utils/date";
import { useAccount } from "@utils/hooks/useAccount";
@@ -177,27 +177,7 @@ export function Root() {
diff --git a/src/app/space/components/addFeed.tsx b/src/app/space/components/addFeed.tsx
index adfd7589..6ed79538 100644
--- a/src/app/space/components/addFeed.tsx
+++ b/src/app/space/components/addFeed.tsx
@@ -1,12 +1,15 @@
import { Dialog, Transition } from "@headlessui/react";
+import { createBlock } from "@libs/storage";
import { CancelIcon } from "@shared/icons";
-import { useActiveAccount } from "@stores/accounts";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useAccount } from "@utils/hooks/useAccount";
import { nip19 } from "nostr-tools";
import { Fragment, useState } from "react";
import { useForm } from "react-hook-form";
export function AddFeedBlock({ parentState }: { parentState: any }) {
- const addBlock = useActiveAccount((state: any) => state.addBlock);
+ const queryClient = useQueryClient();
+ const { account } = useAccount();
const [loading, setLoading] = useState(false);
const [isOpen, setIsOpen] = useState(true);
@@ -18,6 +21,13 @@ export function AddFeedBlock({ parentState }: { parentState: any }) {
parentState(false);
};
+ const block = useMutation({
+ mutationFn: (data: any) => createBlock(data.kind, data.title, data.content),
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ["blocks"] });
+ },
+ });
+
const {
register,
handleSubmit,
@@ -35,7 +45,7 @@ export function AddFeedBlock({ parentState }: { parentState: any }) {
}
// insert to database
- addBlock(1, data.title, pubkey);
+ block.mutate({ kind: 1, title: data.title, content: pubkey });
setTimeout(() => {
setLoading(false);
@@ -43,7 +53,7 @@ export function AddFeedBlock({ parentState }: { parentState: any }) {
reset();
// close modal
closeModal();
- }, 1000);
+ }, 1200);
};
return (
@@ -70,7 +80,7 @@ export function AddFeedBlock({ parentState }: { parentState: any }) {
leaveFrom="opacity-100 scale-100"
leaveTo="opacity-0 scale-95"
>
-
+
@@ -102,7 +112,7 @@ export function AddFeedBlock({ parentState }: { parentState: any }) {