mokhtar/shellphone.app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix hook order error

Browse Source
This commit is contained in:
m5r 2021-08-30 08:34:37 +08:00
parent 74f903cc9f
commit 3d1c545892
4 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/messages/components/conversation.tsx
View File

@ -42,14 +42,14 @@ export default function Conversation() {
{(!isPreviousMessageFromSameSender || !shouldGroupMessages) && ( {(!isPreviousMessageFromSameSender || !shouldGroupMessages) && (
<div className="flex py-2 space-x-1 text-xs justify-center"> <div className="flex py-2 space-x-1 text-xs justify-center">
<strong> <strong>
{new Date(message.sentAt).toLocaleDateString("fr-FR", { {new Date(message.sentAt).toLocaleDateString("en-US", {
weekday: "long", weekday: "long",
day: "2-digit", day: "2-digit",
month: "short", month: "short",
})} })}
</strong> </strong>
<span> <span>
{new Date(message.sentAt).toLocaleTimeString("fr-FR", { {new Date(message.sentAt).toLocaleTimeString("en-US", {
hour: "2-digit", hour: "2-digit",
minute: "2-digit", minute: "2-digit",
})} })}

4
app/messages/components/conversations-list.tsx
View File

@ -43,7 +43,7 @@ function formatMessageDate(date: Date): string {
const isToday = diff.days > -1; const isToday = diff.days > -1;
if (isToday) { if (isToday) {
return messageDate.toFormat("HH:mm", { locale: "fr-FR" }); return messageDate.toFormat("HH:mm", { locale: "en-US" });
} }
const isDuringLastWeek = diff.days > -8; const isDuringLastWeek = diff.days > -8;
@ -51,5 +51,5 @@ function formatMessageDate(date: Date): string {
return messageDate.weekdayLong; return messageDate.weekdayLong;
} }
return messageDate.toFormat("dd/MM/yyyy", { locale: "fr-FR" }); return messageDate.toFormat("dd/MM/yyyy", { locale: "en-US" });
} }

15
app/messages/pages/messages/[recipient].tsx
View File

@ -14,10 +14,11 @@ const ConversationPage: BlitzPage = () => {
const router = useRouter(); const router = useRouter();
const recipient = decodeURIComponent(router.params.recipient); const recipient = decodeURIComponent(router.params.recipient);
const pageTitle = `Messages with ${recipient}`;
const conversation = useConversation(recipient)[0]; const conversation = useConversation(recipient)[0];
return ( 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"> <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}> <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} /> <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>}> <Suspense fallback={<div className="pt-12">Loading messages with {recipient}</div>}>
<Conversation /> <Conversation />
</Suspense> </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> </Layout>
); );
}; };

2
app/phone-calls/components/phone-calls-list.tsx
View File

@ -15,7 +15,7 @@ export default function PhoneCallsList() {
return ( return (
<li key={phoneCall.id} className="flex flex-row justify-between py-2"> <li key={phoneCall.id} className="flex flex-row justify-between py-2">
<div>{recipient}</div> <div>{recipient}</div>
<div>{new Date(phoneCall.createdAt).toLocaleString("fr-FR")}</div> <div>{new Date(phoneCall.createdAt).toLocaleString("en-US")}</div>
</li> </li>
); );
})} })}