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
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) && (
<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",
})}

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

@ -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" });
}