From c8243023473aa50306a5508caac9d81c5cacf341 Mon Sep 17 00:00:00 2001
From: m5r <mokht@rmi.al>
Date: Sun, 22 May 2022 01:45:13 +0200
Subject: [PATCH] fetching messages state

---
 .../core/components/phone-init-loader.tsx     |  1 +
 .../components/conversations-list.tsx         |  4 +--
 app/features/messages/loaders/messages.ts     | 26 ++++++++++---------
 app/routes/__app/messages.tsx                 | 10 +++++--
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/app/features/core/components/phone-init-loader.tsx b/app/features/core/components/phone-init-loader.tsx
index cf92795..bf02075 100644
--- a/app/features/core/components/phone-init-loader.tsx
+++ b/app/features/core/components/phone-init-loader.tsx
@@ -16,6 +16,7 @@ export default function PhoneInitLoader() {
 			</svg>
 			<p>We&#39;re finalizing your &#128026;phone initialization.</p>
 			<p>
+				{/* TODO */}
 				You don&#39;t have to refresh this page, we will do it automatically for you when your phone is ready.
 			</p>
 		</div>
diff --git a/app/features/messages/components/conversations-list.tsx b/app/features/messages/components/conversations-list.tsx
index d877234..a6c8f58 100644
--- a/app/features/messages/components/conversations-list.tsx
+++ b/app/features/messages/components/conversations-list.tsx
@@ -8,9 +8,9 @@ import EmptyMessages from "./empty-messages";
 import type { MessagesLoaderData } from "~/features/messages/loaders/messages";
 
 export default function ConversationsList() {
-	const { conversations } = useLoaderData<MessagesLoaderData>();
+	const { conversations, isFetchingMessages } = useLoaderData<MessagesLoaderData>();
 
-	if (!conversations) {
+	if (isFetchingMessages || !conversations) {
 		// we're still importing messages from twilio
 		return <PhoneInitLoader />;
 	}
diff --git a/app/features/messages/loaders/messages.ts b/app/features/messages/loaders/messages.ts
index a26c45c..ced9155 100644
--- a/app/features/messages/loaders/messages.ts
+++ b/app/features/messages/loaders/messages.ts
@@ -1,13 +1,14 @@
 import type { LoaderFunction } from "@remix-run/node";
 import { json } from "superjson-remix";
 import { parsePhoneNumber } from "awesome-phonenumber";
-import { type Message, Prisma } from "@prisma/client";
+import { type Message, type PhoneNumber, Prisma } from "@prisma/client";
 
 import db from "~/utils/db.server";
-import { requireLoggedIn, type SessionData } from "~/utils/auth.server";
+import { requireLoggedIn } from "~/utils/auth.server";
 
 export type MessagesLoaderData = {
-	user: { hasPhoneNumber: boolean };
+	hasPhoneNumber: boolean;
+	isFetchingMessages: boolean | null;
 	conversations: Conversations | undefined;
 };
 
@@ -18,9 +19,15 @@ type Conversation = {
 };
 
 const loader: LoaderFunction = async ({ request }) => {
-	const { phoneNumber } = await requireLoggedIn(request);
+	const sessionData = await requireLoggedIn(request);
+	const phoneNumber =
+		sessionData.phoneNumber &&
+		(await db.phoneNumber.findUnique({
+			where: { id: sessionData.phoneNumber.id },
+		}));
 	return json<MessagesLoaderData>({
-		user: { hasPhoneNumber: Boolean(phoneNumber) },
+		hasPhoneNumber: Boolean(phoneNumber),
+		isFetchingMessages: phoneNumber?.isFetchingMessages ?? null,
 		conversations: await getConversations(phoneNumber),
 	});
 };
@@ -29,13 +36,8 @@ export default loader;
 
 type Conversations = Record<string, Conversation>;
 
-async function getConversations(sessionPhoneNumber: SessionData["phoneNumber"]) {
-	if (!sessionPhoneNumber) {
-		return;
-	}
-
-	const phoneNumber = await db.phoneNumber.findUnique({ where: { id: sessionPhoneNumber.id } });
-	if (!phoneNumber || phoneNumber.isFetchingMessages) {
+async function getConversations(phoneNumber: PhoneNumber | null) {
+	if (!phoneNumber) {
 		return;
 	}
 
diff --git a/app/routes/__app/messages.tsx b/app/routes/__app/messages.tsx
index 826197a..e9af71e 100644
--- a/app/routes/__app/messages.tsx
+++ b/app/routes/__app/messages.tsx
@@ -1,3 +1,4 @@
+import type { MetaFunction } from "@remix-run/node";
 import { useLoaderData } from "superjson-remix";
 import { atom, useAtom } from "jotai";
 
@@ -7,14 +8,19 @@ import MissingTwilioCredentials from "~/features/core/components/missing-twilio-
 import ConversationsList from "~/features/messages/components/conversations-list";
 import NewMessageButton from "~/features/messages/components/new-message-button";
 import NewMessageBottomSheet from "~/features/messages/components/new-message-bottom-sheet";
+import { getSeoMeta } from "~/utils/seo";
+
+export const meta: MetaFunction = () => ({
+	...getSeoMeta({ title: "Messages" }),
+});
 
 export const loader = messagesLoader;
 
 export default function MessagesPage() {
-	const { user } = useLoaderData<MessagesLoaderData>();
+	const { hasPhoneNumber } = useLoaderData<MessagesLoaderData>();
 	const setIsNewMessageSheetOpen = useAtom(bottomSheetOpenAtom)[1];
 
-	if (!user.hasPhoneNumber) {
+	if (!hasPhoneNumber) {
 		return (
 			<>
 				<MissingTwilioCredentials />