From 6b627254c035d8e0cbee761a070aac22b82da2f5 Mon Sep 17 00:00:00 2001
From: yougotwill <willmgrant@gmail.com>
Date: Fri, 9 Aug 2024 13:49:50 +1000
Subject: [PATCH] fix: use a constant for the fallback timestamp

---
 ts/components/conversation/Timestamp.tsx | 4 ++--
 ts/receiver/configMessage.ts             | 6 ++++--
 ts/session/constants.ts                  | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ts/components/conversation/Timestamp.tsx b/ts/components/conversation/Timestamp.tsx
index c2eb0abec..a46b1445c 100644
--- a/ts/components/conversation/Timestamp.tsx
+++ b/ts/components/conversation/Timestamp.tsx
@@ -3,6 +3,7 @@ import moment from 'moment';
 import useInterval from 'react-use/lib/useInterval';
 import useUpdate from 'react-use/lib/useUpdate';
 import styled from 'styled-components';
+import { CONVERSATION } from '../../session/constants';
 
 type Props = {
   timestamp?: number;
@@ -42,8 +43,7 @@ export const Timestamp = (props: Props) => {
   let title = '';
   let dateString = '';
 
-  // NOTE some existing groups might not have a joinedAtSeconds and we use a fallback value of 1 in order to poll and show up in the conversations list
-  if (timestamp !== 1) {
+  if (timestamp !== CONVERSATION.LAST_JOINED_FALLBACK_TIMESTAMP) {
     const momentValue = moment(timestamp);
     // this is a hack to make the date string shorter, looks like moment does not have a localized way of doing this for now.
 
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index cc5dc3775..a0ebac3ef 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -52,6 +52,7 @@ import { HexKeyPair } from './keypairs';
 import { queueAllCachedFromSource } from './receiver';
 import { EnvelopePlus } from './types';
 import { ConversationTypeEnum, CONVERSATION_PRIORITIES } from '../models/types';
+import { CONVERSATION } from '../session/constants';
 
 function groupByNamespace(incomingConfigs: Array<RetrieveMessageItemWithNamespace>) {
   const groupedByVariant: Map<
@@ -603,8 +604,9 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
     const members = fromWrapper.members.map(m => m.pubkeyHex);
     const admins = fromWrapper.members.filter(m => m.isAdmin).map(m => m.pubkeyHex);
 
-    // NOTE some existing groups might not have a joinedAtSeconds and we need a truthy fallback value in order to poll and show up in the conversations list
-    const creationTimestamp = fromWrapper.joinedAtSeconds ? fromWrapper.joinedAtSeconds * 1000 : 1;
+    const creationTimestamp = fromWrapper.joinedAtSeconds
+      ? fromWrapper.joinedAtSeconds * 1000
+      : CONVERSATION.LAST_JOINED_FALLBACK_TIMESTAMP;
 
     // then for all the existing legacy group in the wrapper, we need to override the field of what we have in the DB with what is in the wrapper
     // We only set group admins on group creation
diff --git a/ts/session/constants.ts b/ts/session/constants.ts
index 8351b2cf5..fa3782faf 100644
--- a/ts/session/constants.ts
+++ b/ts/session/constants.ts
@@ -62,6 +62,8 @@ export const CONVERSATION = {
   MAX_VOICE_MESSAGE_DURATION: 300,
   MAX_CONVO_UNREAD_COUNT: 999,
   MAX_GLOBAL_UNREAD_COUNT: 99, // the global one does not look good with 4 digits (999+) so we have a smaller one for it
+  /** NOTE some existing groups might not have joinedAtSeconds and we need a fallback value that is not falsy in order to poll and show up in the conversations list */
+  LAST_JOINED_FALLBACK_TIMESTAMP: 1,
 } as const;
 
 /**