Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(email): parse Outlook-style 'LastName, FirstName' sender names (#7429)

Jacob Beckerman0f104322ddb2
diff --git a/apps/web/src/features/email-message/core/name.test.ts b/apps/web/src/features/email-message/core/name.test.ts
new file mode 100644
index 0000000000..5ee9df74fe
--- /dev/null
+++ b/apps/web/src/features/email-message/core/name.test.ts
@@ -0,0 +1,41 @@
+import { describe, expect, it } from 'vitest';
+import { getFirstName } from './name';
+
+describe('getFirstName', () => {
+ it('returns the first name from a standard "FirstName LastName" format', () => {
+ expect(getFirstName('John Doe')).toBe('John');
+ expect(getFirstName('Jane Smith')).toBe('Jane');
+ });
+
+ it('returns the first name from "LastName, FirstName" format (Outlook style)', () => {
+ expect(getFirstName('Sexton, Firstname')).toBe('Firstname');
+ expect(getFirstName('Doe, John')).toBe('John');
+ expect(getFirstName('Smith, Jane')).toBe('Jane');
+ });
+
+ it('returns the first name from "LastName, FirstName MiddleInitial" format', () => {
+ expect(getFirstName('Doe, John A')).toBe('John');
+ expect(getFirstName('Doe, John A.')).toBe('John');
+ expect(getFirstName('Smith, Jane M')).toBe('Jane');
+ });
+
+ it('preserves names starting with "the"', () => {
+ expect(getFirstName('The Company')).toBe('The Company');
+ expect(getFirstName('the team,')).toBe('the team');
+ });
+
+ it('strips trailing commas', () => {
+ expect(getFirstName('John,')).toBe('John');
+ });
+
+ it('handles empty or null input', () => {
+ expect(getFirstName('')).toBe('');
+ expect(getFirstName(null)).toBe('');
+ expect(getFirstName(undefined)).toBe('');
+ });
+
+ it('handles single word names', () => {
+ expect(getFirstName('John')).toBe('John');
+ expect(getFirstName('Madonna')).toBe('Madonna');
+ });
+});
diff --git a/apps/web/src/features/email-message/core/name.ts b/apps/web/src/features/email-message/core/name.ts
index 27c5537ac4..ebd417c281 100644
--- a/apps/web/src/features/email-message/core/name.ts
+++ b/apps/web/src/features/email-message/core/name.ts
@@ -1,5 +1,17 @@
export function getFirstName(name: string | null | undefined) {
if (!name) return '';
if (name.toLowerCase().startsWith('the ')) return name.replace(/,+$/, '');
- return name.split(' ')[0].replace(/,+$/, '');
+
+ const trimmed = name.trim();
+
+ // Handle "LastName, FirstName [MiddleInitial]" format (common in Outlook)
+ if (trimmed.includes(',')) {
+ const [, rest] = trimmed.split(',', 2);
+ if (rest) {
+ const firstName = rest.trim().split(/\s+/)[0];
+ if (firstName) return firstName.replace(/,+$/, '');
+ }
+ }
+
+ return trimmed.split(' ')[0].replace(/,+$/, '');
}