From 3e453054b75cc557ef1bb600e7354237faf37885 Mon Sep 17 00:00:00 2001
From: Charles Bochet <charles@twenty.com>
Date: Mon, 8 Jul 2024 18:13:10 +0200
Subject: [PATCH] Fix contactCreation ignoring connectedAccount mainHandle

---
 .../src/modules/object-record/hooks/useFindOneRecord.ts     | 2 +-
 ...ng-save-messages-and-enqueue-contact-creation.service.ts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecord.ts
index af72ad296..76c9645bd 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFindOneRecord.ts
@@ -1,5 +1,5 @@
-import { useMemo } from 'react';
 import { useQuery } from '@apollo/client';
+import { useMemo } from 'react';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-save-messages-and-enqueue-contact-creation.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-save-messages-and-enqueue-contact-creation.service.ts
index bc177114f..42467f2fd 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-save-messages-and-enqueue-contact-creation.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-save-messages-and-enqueue-contact-creation.service.ts
@@ -82,9 +82,9 @@ export class MessagingSaveMessagesAndEnqueueContactCreationService {
                 const isMessageSentByConnectedAccount =
                   emailAliases.includes(fromHandle);
 
-                const isParticipantConnectedAccount = emailAliases.includes(
-                  participant.handle,
-                );
+                const isParticipantConnectedAccount =
+                  emailAliases.includes(participant.handle) ||
+                  participant.handle === connectedAccount.handle;
 
                 const isExcludedByNonProfessionalEmails =
                   messageChannel.excludeNonProfessionalEmails &&