fix contact createion in new chat dialog not working with leading or …

…trailing spaces. closes #3357
deltachat · Aug 28, 2023 · ef4e4a0 · ef4e4a0
1 parent c24b8a7
commit ef4e4a0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Changed
 
 ### Fixed
+- fix contact createion in new chat dialog not working with leading or trailing spaces. #3357
 
 <a id="1_40_0"></a>
 

diff --git a/src/renderer/components/chat/ChatList.tsx b/src/renderer/components/chat/ChatList.tsx
@@ -137,7 +137,7 @@ export default function ChatList(props: {
 
     const contactId = await BackendRemote.rpc.createContact(
       selectedAccountId(),
-      queryStr,
+      queryStr.trim(),
       null
     )
     await createChatByContactIdAndSelectIt(contactId)
@@ -398,7 +398,7 @@ export default function ChatList(props: {
                     queryStrIsValidEmail && (
                       <div style={{ width: width }}>
                         <PseudoListItemAddContact
-                          queryStr={queryStr || ''}
+                          queryStr={queryStr?.trim() || ''}
                           queryStrIsEmail={queryStrIsValidEmail}
                           onClick={addContactOnClick}
                         />

diff --git a/src/renderer/components/contact/ContactList.tsx b/src/renderer/components/contact/ContactList.tsx
@@ -171,10 +171,10 @@ export function useContactIds(listFlags: number, queryStr: string | undefined) {
         const contactIds = await BackendRemote.rpc.getContactIds(
           accountId,
           listFlags,
-          queryStr || null
+          queryStr?.trim() || null
         )
         const queryStrIsValidEmail = await BackendRemote.rpc.checkEmailValidity(
-          queryStr || ''
+          queryStr?.trim() || ''
         )
         setState({ contactIds, queryStrIsValidEmail })
       }, 200),

diff --git a/src/renderer/components/dialogs/CreateChat.tsx b/src/renderer/components/dialogs/CreateChat.tsx
@@ -111,7 +111,7 @@ export default function CreateChat(props: {
 
     const contactId = await BackendRemote.rpc.createContact(
       selectedAccountId(),
-      queryStr,
+      queryStr.trim(),
       null
     )
     await createChatByContactIdAndSelectIt(contactId)
@@ -122,13 +122,13 @@ export default function CreateChat(props: {
     if (
       queryStr === '' ||
       (contacts.length === 1 &&
-        contacts[0].address.toLowerCase() === queryStr.toLowerCase())
+        contacts[0].address.toLowerCase() === queryStr.trim().toLowerCase())
     ) {
       return null
     }
     return (
       <PseudoListItemAddContact
-        queryStr={queryStr}
+        queryStr={queryStr.trim()}
         queryStrIsEmail={queryStrIsValidEmail}
         onClick={addContactOnClick}
       />