Invalid profile contact issue fix

dm3-org · Dec 1, 2023 · 1a70261 · 1a70261
1 parent db0bf3b
commit 1a70261
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/packages/messenger-widget/src/components/Contacts/Contacts.tsx b/packages/messenger-widget/src/components/Contacts/Contacts.tsx
@@ -233,8 +233,10 @@ export function Contacts(props: DashboardProps) {
         ) {
             const defaultContactIndex = contacts.findIndex(
                 (contact) =>
+                    contact.contactDetails &&
+                    contact.contactDetails.account &&
                     contact.contactDetails.account.ensName ===
-                    props.dm3Props.config.defaultContact,
+                        props.dm3Props.config.defaultContact,
             );
             if (defaultContactIndex > -1) {
                 setContactSelected(defaultContactIndex);
@@ -302,7 +304,10 @@ export function Contacts(props: DashboardProps) {
                                     <div
                                         className="pb-1"
                                         title={
-                                            data.contactDetails.account.ensName
+                                            data.contactDetails
+                                                ? data.contactDetails.account
+                                                      .ensName
+                                                : ''
                                         }
                                     >
                                         <p className="display-name">

diff --git a/packages/messenger-widget/src/components/Contacts/bl.ts b/packages/messenger-widget/src/components/Contacts/bl.ts
@@ -95,11 +95,14 @@ export const fetchAndSetContacts = async (
     }
 
     const profileAccounts = actualContactList.filter(
-        (item) => item.contactDetails.account.profileSignature,
+        (item) =>
+            item.contactDetails && item.contactDetails.account.profileSignature,
     );
 
     const nonProfileAccounts = actualContactList.filter(
-        (item) => !item.contactDetails.account.profileSignature,
+        (item) =>
+            item.contactDetails &&
+            !item.contactDetails.account.profileSignature,
     );
 
     const uniqueProfileAccounts = [
@@ -162,9 +165,11 @@ export const setContactIndexSelectedFromCache = (
     const index = cacheContacts.findIndex(
         (data) =>
             (key &&
+                data.contactDetails &&
                 data.contactDetails.account.profile?.publicEncryptionKey ===
                     key) ||
-            name === data.contactDetails.account.ensName,
+            (data.contactDetails &&
+                name === data.contactDetails.account.ensName),
     );
 
     // close the loader
@@ -185,8 +190,9 @@ export const addNewConversationFound = async (
         state.accounts.contacts.forEach((contact) => {
             const data = existingList.filter(
                 (cacheContact) =>
+                    cacheContact.contactDetails &&
                     cacheContact.contactDetails.account.ensName ===
-                    contact.account.ensName,
+                        contact.account.ensName,
             );
             if (!data || !data.length) {
                 contactList.push(contact);
@@ -434,6 +440,7 @@ export const updateContactOnAccountChange = async (
                     }
                 } else {
                     let contactToAdd;
+
                     if (profile?.profile) {
                         const deliveryServiceProfile =
                             await getDeliveryServiceProfile(
@@ -465,6 +472,18 @@ export const updateContactOnAccountChange = async (
                         contactToAdd = itemList[0];
                     }
 
+                    if (!contactToAdd) {
+                        contactToAdd = {
+                            account: {
+                                ensName: state.modal.addConversation
+                                    .ensName as string,
+                                profile: undefined,
+                                profileSignature: undefined,
+                            },
+                            deliveryServiceProfile: undefined,
+                        };
+                    }
+
                     // update the contact details
                     item.contactDetails = contactToAdd;