From 3d1c545892f6c14c2597a7d655780ca4eae277d7 Mon Sep 17 00:00:00 2001
From: m5r <mokht@rmi.al>
Date: Mon, 30 Aug 2021 08:34:37 +0800
Subject: [PATCH] fix hook order error

---
 app/messages/components/conversation.tsx        |  4 ++--
 app/messages/components/conversations-list.tsx  |  4 ++--
 app/messages/pages/messages/[recipient].tsx     | 15 ++-------------
 app/phone-calls/components/phone-calls-list.tsx |  2 +-
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/app/messages/components/conversation.tsx b/app/messages/components/conversation.tsx
index 888188b..d12f989 100644
--- a/app/messages/components/conversation.tsx
+++ b/app/messages/components/conversation.tsx
@@ -42,14 +42,14 @@ export default function Conversation() {
 								{(!isPreviousMessageFromSameSender || !shouldGroupMessages) && (
 									<div className="flex py-2 space-x-1 text-xs justify-center">
 										<strong>
-											{new Date(message.sentAt).toLocaleDateString("fr-FR", {
+											{new Date(message.sentAt).toLocaleDateString("en-US", {
 												weekday: "long",
 												day: "2-digit",
 												month: "short",
 											})}
 										</strong>
 										<span>
-											{new Date(message.sentAt).toLocaleTimeString("fr-FR", {
+											{new Date(message.sentAt).toLocaleTimeString("en-US", {
 												hour: "2-digit",
 												minute: "2-digit",
 											})}
diff --git a/app/messages/components/conversations-list.tsx b/app/messages/components/conversations-list.tsx
index 65148b6..8450c18 100644
--- a/app/messages/components/conversations-list.tsx
+++ b/app/messages/components/conversations-list.tsx
@@ -43,7 +43,7 @@ function formatMessageDate(date: Date): string {
 
 	const isToday = diff.days > -1;
 	if (isToday) {
-		return messageDate.toFormat("HH:mm", { locale: "fr-FR" });
+		return messageDate.toFormat("HH:mm", { locale: "en-US" });
 	}
 
 	const isDuringLastWeek = diff.days > -8;
@@ -51,5 +51,5 @@ function formatMessageDate(date: Date): string {
 		return messageDate.weekdayLong;
 	}
 
-	return messageDate.toFormat("dd/MM/yyyy", { locale: "fr-FR" });
+	return messageDate.toFormat("dd/MM/yyyy", { locale: "en-US" });
 }
diff --git a/app/messages/pages/messages/[recipient].tsx b/app/messages/pages/messages/[recipient].tsx
index 3db6aea..98444c3 100644
--- a/app/messages/pages/messages/[recipient].tsx
+++ b/app/messages/pages/messages/[recipient].tsx
@@ -14,10 +14,11 @@ const ConversationPage: BlitzPage = () => {
 
 	const router = useRouter();
 	const recipient = decodeURIComponent(router.params.recipient);
+	const pageTitle = `Messages with ${recipient}`;
 	const conversation = useConversation(recipient)[0];
 
 	return (
-		<>
+		<Layout title={pageTitle} hideFooter>
 			<header className="absolute top-0 w-screen h-12 backdrop-filter backdrop-blur-sm bg-white bg-opacity-75 border-b grid grid-cols-3 items-center">
 				<span className="col-start-1 col-span-1 pl-2 cursor-pointer" onClick={router.back}>
 					<FontAwesomeIcon size="lg" className="h-8 w-8" icon={faLongArrowLeft} />
@@ -31,18 +32,6 @@ const ConversationPage: BlitzPage = () => {
 			<Suspense fallback={<div className="pt-12">Loading messages with {recipient}</div>}>
 				<Conversation />
 			</Suspense>
-		</>
-	);
-};
-
-ConversationPage.getLayout = function ConversationLayout(page) {
-	const router = useRouter();
-	const recipient = decodeURIComponent(router.params.recipient);
-	const pageTitle = `Messages with ${recipient}`;
-
-	return (
-		<Layout title={pageTitle} hideFooter>
-			{page}
 		</Layout>
 	);
 };
diff --git a/app/phone-calls/components/phone-calls-list.tsx b/app/phone-calls/components/phone-calls-list.tsx
index e5b721f..fe0bc21 100644
--- a/app/phone-calls/components/phone-calls-list.tsx
+++ b/app/phone-calls/components/phone-calls-list.tsx
@@ -15,7 +15,7 @@ export default function PhoneCallsList() {
 				return (
 					<li key={phoneCall.id} className="flex flex-row justify-between py-2">
 						<div>{recipient}</div>
-						<div>{new Date(phoneCall.createdAt).toLocaleString("fr-FR")}</div>
+						<div>{new Date(phoneCall.createdAt).toLocaleString("en-US")}</div>
 					</li>
 				);
 			})}