Merge branch 'main' of https://github.com/PapillonApp/Papillon

Author: ecnivtwelve

src/utils/format/DateHelper.ts

@@ -1,6 +1,14 @@
 export const timestampToString = (timestamp: number) => {
+
+  if (!timestamp || Number.isNaN(timestamp)) {
+    return "Date invalide";
+  }
+
   const date = new Date(timestamp);
   const today = new Date();
+  if (Number.isNaN(date.getTime())) {
+    return "Date invalide";
+  }
 
   today.setHours(0, 0, 0, 0);
   date.setHours(0, 0, 0, 0);
@@ -13,32 +21,37 @@ export const timestampToString = (timestamp: number) => {
     date.getDate() - today.getDate(),
   ];
 
-  let yearDifference = Math.trunc(
-    dateDifference[0] + dateDifference[1] / 12 + dateDifference[2] / 365
-  );
-
-  let monthDifference = Math.trunc(
-    dateDifference[0] * 12 + dateDifference[1] + dateDifference[2] / 30.4
-  );
+  let yearDifference = dateDifference[0];
+  if (dateDifference[1] < 0 || (dateDifference[1] === 0 && dateDifference[2] < 0)) {
+    yearDifference--;
+  } else if (dateDifference[1] > 0 || (dateDifference[1] === 0 && dateDifference[2] > 0)) {
+    yearDifference++;
+  }
+  let monthDifference = dateDifference[0] * 12 + dateDifference[1];
 
+  if (dateDifference[2] < 0) {
+    monthDifference--;
+  } else if (dateDifference[2] > 0) {
+    monthDifference++;
+  }
   let dayDifference = Math.round(
     (date.getTime() - today.getTime()) / (1000 * 60 * 60 * 24)
   );
 
-  if (yearDifference <= -1) {
-    formattedDate = `Il y a ${0 - yearDifference} an${
-      yearDifference < -1 ? "s" : ""
+  if (yearDifference < 0) {
+    formattedDate = `Il y a ${Math.abs(yearDifference)} an${
+      Math.abs(yearDifference) > 1 ? "s" : ""
     }`;
-  } else if (yearDifference >= 1) {
+  } else if (yearDifference > 0) {
     formattedDate = `Dans ${yearDifference} an${yearDifference > 1 ? "s" : ""}`;
   } else {
     if (monthDifference < 0) {
-      formattedDate = `Il y a ${0 - monthDifference} mois`;
+      formattedDate = `Il y a ${Math.abs(monthDifference)} mois`;
     } else if (monthDifference > 0) {
       formattedDate = `Dans ${monthDifference} mois`;
     } else {
       if (dayDifference < -2) {
-        formattedDate = `Il y a ${0 - dayDifference} jours`;
+        formattedDate = `Il y a ${Math.abs(dayDifference)} jours`;
       } else if (dayDifference === -2) {
         formattedDate = "Avant-hier";
       } else if (dayDifference === -1) {

src/views/account/Chat/Messages.tsx

@@ -37,6 +37,7 @@ import InsetsBottomView from "@/components/Global/InsetsBottomView";
 import { TabLocation } from "pawnote";
 import {hasFeatureAccountSetup} from "@/utils/multiservice";
 import {MultiServiceFeature} from "@/stores/multiService/types";
+import { timestampToString } from "@/utils/format/DateHelper";
 
 // Voir la documentation de `react-navigation`.
 //
@@ -242,8 +243,8 @@ const Discussions: Screen<"Discussions"> = ({ navigation, route }) => {
                     )}
                     <NativeText variant={"subtitle"}>{getChatCreator(chat)}</NativeText>
                   </View>
-                  <NativeText>{chat.subject || "Aucun sujet"}</NativeText>
-                  <NativeText variant={"subtitle"}>Il y a {Math.floor((new Date().getTime() - new Date(chat.date).getTime()) / (1000 * 60 * 60 * 24))} jours</NativeText>
+                  <NativeText>{chat.subject || "Aucun sujet"}</NativeText>
+                  <NativeText variant={"subtitle"}>{timestampToString(chat.date.getTime())}</NativeText>
                 </NativeItem>
               ))}
             </NativeList>