Don't show add contact manually (by mail) in groups (#5363)

Author: nicodh

CHANGELOG.md

@@ -8,7 +8,7 @@
 ### Added
 
 ### Fixed
-
+- don't show "add contact manually" (by email address) for groups #5336
 - Make `Archived Chats` title non selectable
 
 <a id="2_8_0"></a>

packages/frontend/src/components/chat/ChatList.tsx

@@ -48,6 +48,7 @@ import type {
 import { isInviteLink } from '../../../../shared/util'
 import { RovingTabindexProvider } from '../../contexts/RovingTabindex'
 import { useRpcFetch } from '../../hooks/useFetch'
+import { useSettingsStore } from '../../stores/settings'
 
 const enum LoadStatus {
   FETCHING = 1,
@@ -202,6 +203,9 @@ export default function ChatList(props: {
   const tabindexWrapperElementContacts = useRef<HTMLDivElement>(null)
   const tabindexWrapperElementMessages = useRef<HTMLDivElement>(null)
 
+  const settingsStore = useSettingsStore()[0]
+  const isChatmail = settingsStore?.settings.is_chatmail === '1'
+
   const addContactOnClick = async () => {
     if (!queryStrIsValidEmail || !queryStr) return
 
@@ -526,7 +530,8 @@ export default function ChatList(props: {
                       >
                         {ChatListItemRowContact}
                       </ChatListPart>
-                      {contactIds.length === 0 &&
+                      {!isChatmail &&
+                        contactIds.length === 0 &&
                         chatListIds.length === 0 &&
                         queryStrIsValidEmail && (
                           <PseudoListItemAddContact

packages/frontend/src/components/dialogs/AddMember/AddMemberDialog.tsx

@@ -3,7 +3,7 @@ import { AddMemberInnerDialog } from './AddMemberInnerDialog'
 import { useLazyLoadedContacts } from '../../contact/ContactList'
 import Dialog from '../../Dialog'
 import Icon from '../../Icon'
-import type { T } from '@deltachat/jsonrpc-client'
+import { C, type T } from '@deltachat/jsonrpc-client'
 import type { DialogProps } from '../../../contexts/DialogContext'
 import { Avatar } from '../../Avatar'
 import styles from './styles.module.scss'
@@ -32,6 +32,10 @@ export function AddMemberDialog({
     queryStrIsValidEmail,
     refreshContacts,
   } = useLazyLoadedContacts(listFlags, queryStr)
+
+  // compare bitwise if address flag is set
+  const allowAddManually = (listFlags & C.DC_GCL_ADDRESS) !== 0
+
   return (
     <Dialog
       canOutsideClickClose={false}
@@ -59,6 +63,7 @@ export function AddMemberDialog({
         groupMembers,
         titleMembersOrRecipients,
         isVerificationRequired,
+        allowAddManually,
       })}
     </Dialog>
   )

packages/frontend/src/components/dialogs/AddMember/AddMemberInnerDialog.tsx

@@ -39,6 +39,7 @@ export function AddMemberInnerDialog({
   groupMembers,
   titleMembersOrRecipients,
   isVerificationRequired = false,
+  allowAddManually,
 }: {
   onOk: (addMembers: number[]) => void
   onCancel: Parameters<typeof OkCancelFooterAction>[0]['onCancel']
@@ -54,6 +55,7 @@ export function AddMemberInnerDialog({
   groupMembers: number[]
   titleMembersOrRecipients: 'members' | 'recipients'
   isVerificationRequired: boolean
+  allowAddManually: boolean
 }) {
   const tx = useTranslationFunction()
   const { openDialog } = useDialog()
@@ -157,8 +159,9 @@ export function AddMemberInnerDialog({
   useLayoutEffect(applyCSSHacks, [inputRef, contactIdsToAdd])
   useEffect(applyCSSHacks, [])
 
-  const showAddContact = queryStr !== '' && contactIds.length === 0
-  const itemCount = contactIds.length + (showAddContact ? 1 : 0)
+  const showAddContactManually =
+    queryStr !== '' && contactIds.length === 0 && allowAddManually
+  const itemCount = contactIds.length + (showAddContactManually ? 1 : 0)
 
   const addContactOnKeyDown = (ev: React.KeyboardEvent<HTMLInputElement>) => {
     if (ev.key === 'Enter') {

packages/frontend/src/components/dialogs/CreateChat/index.tsx

@@ -35,7 +35,6 @@ import Dialog, {
   FooterActionButton,
   FooterActions,
 } from '../../Dialog'
-import { ScreenContext } from '../../../contexts/ScreenContext'
 import useChat from '../../../hooks/chat/useChat'
 import useConfirmationDialog from '../../../hooks/dialog/useConfirmationDialog'
 import useCreateChatByContactId from '../../../hooks/chat/useCreateChatByContactId'
@@ -48,6 +47,8 @@ import {
 import { dirname } from 'path'
 import QrCode from '../QrCode'
 import { areAllContactsVerified } from '../../../backend/chat'
+import AlertDialog from '../AlertDialog'
+import { unknownErrorToString } from '../../helpers/unknownErrorToString'
 
 import type { T } from '@deltachat/jsonrpc-client'
 import type { DialogProps } from '../../../contexts/DialogContext'
@@ -161,7 +162,6 @@ type CreateChatMainProps = {
 function CreateChatMain(props: CreateChatMainProps) {
   const { setViewMode, onClose } = props
   const tx = useTranslationFunction()
-  const { userFeedback } = useContext(ScreenContext)
   const openConfirmationDialog = useConfirmationDialog()
   const accountId = selectedAccountId()
   const { openDialog } = useDialog()
@@ -180,9 +180,9 @@ function CreateChatMain(props: CreateChatMainProps) {
     try {
       await createChatByContactId(accountId, id)
     } catch (error: any) {
-      return userFeedback({
-        type: 'error',
-        text: error && (error.message || error),
+      const errorMessage = unknownErrorToString(error)
+      openDialog(AlertDialog, {
+        message: tx('error_x', errorMessage),
       })
     }
     onClose()
@@ -202,6 +202,7 @@ function CreateChatMain(props: CreateChatMainProps) {
   const showNewEmail = !isChatmail && queryStr.length === 0
 
   const showAddContact = !(
+    isChatmail ||
     queryStr === '' ||
     (contactIds.length === 1 &&
       contactCache[contactIds[0]]?.address.toLowerCase() ===
@@ -246,13 +247,20 @@ function CreateChatMain(props: CreateChatMainProps) {
   const addContactOnClick = async () => {
     if (!queryStrIsValidEmail) return
 
-    const contactId = await BackendRemote.rpc.createContact(
-      accountId,
-      queryStr.trim(),
-      null
-    )
-    await createChatByContactId(accountId, contactId)
-    onClose()
+    try {
+      const contactId = await BackendRemote.rpc.createContact(
+        accountId,
+        queryStr.trim(),
+        null
+      )
+      await createChatByContactId(accountId, contactId)
+      onClose()
+    } catch (error: any) {
+      const errorMessage = unknownErrorToString(error)
+      openDialog(AlertDialog, {
+        message: tx('error_x', errorMessage),
+      })
+    }
   }
 
   const { openContextMenu } = useContext(ContextMenuContext)
@@ -966,6 +974,8 @@ function useCreateGroup<
   groupMembers: number[]
 ) {
   const accountId = selectedAccountId()
+  const { openDialog } = useDialog()
+  const tx = useTranslationFunction()
 
   type ChatId = T.BasicChat['id']
   const createGroup = useCallback(async () => {
@@ -1017,7 +1027,15 @@ function useCreateGroup<
       return
     }
 
-    return createGroup()
+    try {
+      return await createGroup()
+    } catch (error) {
+      const errorMessage = unknownErrorToString(error)
+      openDialog(AlertDialog, {
+        message: tx('error_x', errorMessage),
+      })
+      return null
+    }
   }
 }