From 38c6b2c76df49595abe400c6f78cab12c84eec1a Mon Sep 17 00:00:00 2001
From: Ren Amamiya <123083837+reyamir@users.noreply.github.com>
Date: Wed, 26 Apr 2023 17:43:29 +0700
Subject: [PATCH] update chat page

---
 src/pages/chat/index.page.tsx | 94 +++++++++++++++++++++--------------
 src/utils/transform.tsx       |  9 ++++
 2 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/src/pages/chat/index.page.tsx b/src/pages/chat/index.page.tsx
index 699275b2..935b1ed8 100644
--- a/src/pages/chat/index.page.tsx
+++ b/src/pages/chat/index.page.tsx
@@ -1,20 +1,17 @@
 import { AccountContext } from '@components/accountProvider';
+import { MessageListItem } from '@components/chats/messageListItem';
 import FormChat from '@components/form/chat';
 import NewsfeedLayout from '@components/layouts/newsfeed';
 import { RelayContext } from '@components/relaysProvider';
 
-import { chatMessagesAtom } from '@stores/chat';
 import { FULL_RELAYS } from '@stores/constants';
 
 import { usePageContext } from '@utils/hooks/usePageContext';
+import { sortMessages } from '@utils/transform';
 
-import { useSetAtom } from 'jotai';
-import { useResetAtom } from 'jotai/utils';
-import { Suspense, lazy, useContext } from 'react';
+import { useContext } from 'react';
 import useSWRSubscription from 'swr/subscription';
 
-const MessageList = lazy(() => import('@components/chats/messageList'));
-
 export function Page() {
   const pageContext = usePageContext();
   const searchParams: any = pageContext.urlParsed.search;
@@ -24,43 +21,64 @@ export function Page() {
   const pool: any = useContext(RelayContext);
   const activeAccount: any = useContext(AccountContext);
 
-  const setChatMessages = useSetAtom(chatMessagesAtom);
-  const resetChatMessages = useResetAtom(chatMessagesAtom);
+  const { data, error } = useSWRSubscription(
+    pubkey
+      ? [
+          {
+            kinds: [4],
+            authors: [pubkey],
+            '#p': [activeAccount.pubkey],
+          },
+          {
+            kinds: [4],
+            authors: [activeAccount.pubkey],
+            '#p': [pubkey],
+          },
+        ]
+      : null,
+    (key, { next }) => {
+      const unsubscribe = pool.subscribe(key, FULL_RELAYS, (event: any) => {
+        next(null, (prev) => (prev ? [event, ...prev] : [event]));
+      });
 
-  useSWRSubscription(pubkey, () => {
-    // clear old messages
-    resetChatMessages();
-    // subscribe for next messages
-    const unsubscribe = pool.subscribe(
-      [
-        {
-          kinds: [4],
-          authors: [pubkey],
-          '#p': [activeAccount.pubkey],
-        },
-        {
-          kinds: [4],
-          authors: [activeAccount.pubkey],
-          '#p': [pubkey],
-        },
-      ],
-      FULL_RELAYS,
-      (event: any) => {
-        setChatMessages((prev) => [...prev, event]);
-      }
-    );
-
-    return () => {
-      unsubscribe();
-    };
-  });
+      return () => {
+        unsubscribe();
+      };
+    }
+  );
 
   return (
     <NewsfeedLayout>
       <div className="relative flex h-full w-full flex-col justify-between rounded-lg border border-zinc-800 bg-zinc-900 shadow-input shadow-black/20">
-        <Suspense fallback={<p>Loading...</p>}>
-          <MessageList />
-        </Suspense>
+        <div className="scrollbar-hide flex h-full w-full flex-col-reverse overflow-y-auto">
+          {error && <div>failed to load</div>}
+          {!data ? (
+            <div className="flex h-min min-h-min w-full animate-pulse select-text flex-col px-5 py-2 hover:bg-black/20">
+              <div className="flex flex-col">
+                <div className="group flex items-start gap-3">
+                  <div className="bg-zinc relative h-9 w-9 shrink rounded-md bg-zinc-700"></div>
+                  <div className="flex w-full flex-1 items-start justify-between">
+                    <div className="flex items-baseline gap-2 text-sm">
+                      <span className="h-2 w-16 bg-zinc-700"></span>
+                    </div>
+                  </div>
+                </div>
+                <div className="-mt-[17px] pl-[48px]">
+                  <div className="h-3 w-full bg-zinc-700"></div>
+                </div>
+              </div>
+            </div>
+          ) : (
+            sortMessages(data).map((message) => (
+              <MessageListItem
+                key={message.id}
+                data={message}
+                userPubkey={activeAccount.pubkey}
+                userPrivkey={activeAccount.privkey}
+              />
+            ))
+          )}
+        </div>
         <div className="shrink-0 p-3">
           <FormChat receiverPubkey={pubkey} />
         </div>
diff --git a/src/utils/transform.tsx b/src/utils/transform.tsx
index 1dd1d51e..1fb1caf2 100644
--- a/src/utils/transform.tsx
+++ b/src/utils/transform.tsx
@@ -49,3 +49,12 @@ export const getParentID = (arr: string[], fallback: string) => {
 
   return parentID;
 };
+
+// sort messages by timestamp
+export const sortMessages = (arr: any) => {
+  arr.sort((a, b) => {
+    return b.created_at - a.created_at;
+  });
+
+  return arr;
+};