From 731f32abda3376a478defc723a6590c9f89c73ea Mon Sep 17 00:00:00 2001
From: DS Boyce <260543580+ds-boyce@users.noreply.github.com>
Date: Wed, 27 May 2026 08:05:51 -0700
Subject: [PATCH] Add XRPC error handling for creating new chats (#10622)

---
 src/components/dms/InitiateChatFlow.tsx      | 18 ++++--
 src/components/dms/dialogs/NewChatDialog.tsx | 68 ++++++++++++++++++--
 2 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/src/components/dms/InitiateChatFlow.tsx b/src/components/dms/InitiateChatFlow.tsx
index fdf37be24b..f58d168cbe 100644
--- a/src/components/dms/InitiateChatFlow.tsx
+++ b/src/components/dms/InitiateChatFlow.tsx
@@ -707,12 +707,14 @@ function NewGroupChatButton({onPress}: {onPress: () => void}) {
   const t = useTheme()
   const {t: l} = useLingui()
 
-  const handleOnPress = () => {
-    onPress()
-  }
-
   return (
-    <Button label={l`New group chat`} onPress={handleOnPress}>
+    <Button
+      label={l({
+        message: 'New group chat',
+        context: 'action',
+        comment: 'Button used to create a new group chat.',
+      })}
+      onPress={onPress}>
       {({hovered, pressed, focused}) => (
         <View
           style={[
@@ -740,7 +742,11 @@ function NewGroupChatButton({onPress}: {onPress: () => void}) {
           <View style={[a.flex_grow]}>
             <Text
               style={[a.text_md, a.font_medium, a.leading_snug, t.atoms.text]}>
-              <Trans>New group chat</Trans>
+              <Trans
+                context="action"
+                comment="Button used to create a new group chat.">
+                New group chat
+              </Trans>
             </Text>
           </View>
           <ChevronRightIcon size="md" fill={t.palette.contrast_1000} />
diff --git a/src/components/dms/dialogs/NewChatDialog.tsx b/src/components/dms/dialogs/NewChatDialog.tsx
index 6686a6ffe2..4ab5a16421 100644
--- a/src/components/dms/dialogs/NewChatDialog.tsx
+++ b/src/components/dms/dialogs/NewChatDialog.tsx
@@ -1,7 +1,12 @@
 import {useCallback} from 'react'
+import {
+  ChatBskyConvoGetConvoForMembers,
+  ChatBskyGroupCreateGroup,
+} from '@atproto/api'
 import {Trans, useLingui} from '@lingui/react/macro'
 
 import {useRequireEmailVerification} from '#/lib/hooks/useRequireEmailVerification'
+import {isNetworkError} from '#/lib/strings/errors'
 import {logger} from '#/logger'
 import {useCreateGroupChat} from '#/state/queries/messages/create-group-chat'
 import {useGetConvoForMembers} from '#/state/queries/messages/get-convo-for-members'
@@ -39,7 +44,32 @@ export function NewChat({
     },
     onError: error => {
       logger.error('Failed to create chat', {safeMessage: error})
-      Toast.show(l`An issue occurred starting the chat, please try again`, {
+      let errorMessage = l`An issue occurred starting the chat, please try again.`
+      if (isNetworkError(error)) {
+        errorMessage = l`A network error occurred. Please check your internet connection.`
+      } else if (
+        error instanceof ChatBskyConvoGetConvoForMembers.AccountSuspendedError
+      ) {
+        errorMessage = l`Suspended accounts cannot participate in chat.`
+      } else if (
+        error instanceof ChatBskyConvoGetConvoForMembers.BlockedActorError
+      ) {
+        errorMessage = l`This user has blocked you and cannot be messaged.`
+      } else if (
+        error instanceof ChatBskyConvoGetConvoForMembers.MessagesDisabledError
+      ) {
+        errorMessage = l`This user has disabled chat and cannot be messaged.`
+      } else if (
+        error instanceof
+        ChatBskyConvoGetConvoForMembers.NotFollowedBySenderError
+      ) {
+        errorMessage = l`Chat recipient is not followed by the sender.`
+      } else if (
+        error instanceof ChatBskyConvoGetConvoForMembers.RecipientNotFoundError
+      ) {
+        errorMessage = l`Unable to find the selected recipient.`
+      }
+      Toast.show(errorMessage, {
         type: 'error',
       })
     },
@@ -52,12 +82,36 @@ export function NewChat({
     },
     onError: error => {
       logger.error('Failed to create groupchat', {safeMessage: error})
-      Toast.show(
-        l`An issue occurred creating the group chat, please try again`,
-        {
-          type: 'error',
-        },
-      )
+      let errorMessage = l`An issue occurred creating the group chat, please try again.`
+      if (isNetworkError(error)) {
+        errorMessage = l`A network error occurred. Please check your internet connection.`
+      } else if (
+        error instanceof ChatBskyGroupCreateGroup.AccountSuspendedError
+      ) {
+        errorMessage = l`Suspended accounts cannot participate in a group chat.`
+      } else if (error instanceof ChatBskyGroupCreateGroup.BlockedActorError) {
+        errorMessage = l`One of the selected recipients has blocked you and cannot be messaged.`
+      } else if (
+        error instanceof
+        ChatBskyGroupCreateGroup.NewAccountCannotCreateGroupError
+      ) {
+        errorMessage = l`You cannot create a group chat yet.`
+      } else if (
+        error instanceof ChatBskyGroupCreateGroup.NotFollowedBySenderError
+      ) {
+        errorMessage = l`A selected recipient is not followed by the sender.`
+      } else if (
+        error instanceof ChatBskyGroupCreateGroup.RecipientNotFoundError
+      ) {
+        errorMessage = l`Unable to find a selected recipient.`
+      } else if (
+        error instanceof ChatBskyGroupCreateGroup.UserForbidsGroupsError
+      ) {
+        errorMessage = l`One of the selected recipients does not allow group chats.`
+      }
+      Toast.show(errorMessage, {
+        type: 'error',
+      })
     },
   })