Skip to content

A full-featured CRM built with React, shadcn/ui, and Supabase.

Fix contact list breaks when a contact has no creation date

François Zaninotto2b26e390f476
diff --git a/src/contacts/ContactListContent.tsx b/src/contacts/ContactListContent.tsx
index 15901652..4be5bacd 100644
--- a/src/contacts/ContactListContent.tsx
+++ b/src/contacts/ContactListContent.tsx
@@ -94,25 +94,27 @@ export const ContactListContent = () => {
</>
}
/>
- <ListItemSecondaryAction
- sx={{
- top: '10px',
- transform: 'none',
- }}
- >
- <Typography
- variant="body2"
- color="textSecondary"
- title={contact.last_seen}
+ {contact.last_seen && (
+ <ListItemSecondaryAction
+ sx={{
+ top: '10px',
+ transform: 'none',
+ }}
>
- {!isSmall && 'last activity '}
- {formatRelative(
- contact.last_seen,
- now
- )}{' '}
- <Status status={contact.status} />
- </Typography>
- </ListItemSecondaryAction>
+ <Typography
+ variant="body2"
+ color="textSecondary"
+ title={contact.last_seen}
+ >
+ {!isSmall && 'last activity '}
+ {formatRelative(
+ contact.last_seen,
+ now
+ )}{' '}
+ <Status status={contact.status} />
+ </Typography>
+ </ListItemSecondaryAction>
+ )}
</ListItem>
</RecordContextProvider>
))}
diff --git a/src/contacts/useContactImport.tsx b/src/contacts/useContactImport.tsx
index 5d1d7006..dec06435 100644
--- a/src/contacts/useContactImport.tsx
+++ b/src/contacts/useContactImport.tsx
@@ -24,6 +24,7 @@ export type ContactImportSchema = {
};
export function useContactImport() {
+ const today = new Date().toISOString();
const user = useGetIdentity();
const dataProvider = useDataProvider();
@@ -177,10 +178,10 @@ export function useContactImport() {
background,
first_seen: first_seen
? new Date(first_seen).toISOString()
- : undefined,
+ : today,
last_seen: last_seen
? new Date(last_seen).toISOString()
- : undefined,
+ : today,
has_newsletter,
status,
company_id: company.id,
@@ -193,7 +194,14 @@ export function useContactImport() {
)
);
},
- [dataProvider, getCompanies, parseTags, getTags, user?.identity?.id]
+ [
+ dataProvider,
+ getCompanies,
+ parseTags,
+ getTags,
+ user?.identity?.id,
+ today,
+ ]
);
return {
diff --git a/src/providers/commons/activity.ts b/src/providers/commons/activity.ts
index cd8b5455..4b63147e 100644
--- a/src/providers/commons/activity.ts
+++ b/src/providers/commons/activity.ts
@@ -29,7 +29,7 @@ export async function getActivityLog(
getDealsLog(dataProvider, sales, companies),
]);
return companies.companiesLog.concat(contactsLog, dealsLog).sort(
- (a, b) => a.date.localeCompare(b.date) * -1 // sort by date desc
+ (a, b) => (a.date && b.date ? a.date.localeCompare(b.date) * -1 : 0) // sort by date desc
);
}