From db2fdd1ab658da4e63ff296bbf0caf86211e5d7c Mon Sep 17 00:00:00 2001
From: alexlavrov <alex.s.lavrov@gmail.com>
Date: Mon, 4 Nov 2024 15:31:51 +0400
Subject: [PATCH] Fix chat.d.ts conflicts after rebase

---
 packages/devextreme/js/ui/chat.d.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/devextreme/js/ui/chat.d.ts b/packages/devextreme/js/ui/chat.d.ts
index 721bf804ca01..88cb9a41ad0b 100644
--- a/packages/devextreme/js/ui/chat.d.ts
+++ b/packages/devextreme/js/ui/chat.d.ts
@@ -92,7 +92,7 @@ export type User = {
      * @default undefined
      * @public
      */
-    avatarAlt?: string;
+    avatarAlt?: string | undefined;
 };
 
 /**
@@ -206,7 +206,7 @@ export interface dxChatOptions extends WidgetOptions<dxChat> {
      * @default undefined
      * @public
      */
-    errors?: Array<Alert> | undefined;
+    alerts?: Array<Alert> | undefined;
     /**
      * @docid
      * @default []
@@ -244,7 +244,7 @@ export interface dxChatOptions extends WidgetOptions<dxChat> {
      * @action
      * @public
      */
-    onMessageEntered?: ((e: MessageEnteredEvent) => void);
+    onMessageEntered?: ((e: MessageEnteredEvent) => void) | undefined;
     /**
      * @docid
      * @default undefined
@@ -252,7 +252,7 @@ export interface dxChatOptions extends WidgetOptions<dxChat> {
      * @action
      * @public
      */
-    onTypingStart?: ((e: TypingEndEvent) => void);
+    onTypingStart?: ((e: TypingEndEvent) => void) | undefined ;
     /**
      * @docid
      * @default undefined
@@ -260,7 +260,7 @@ export interface dxChatOptions extends WidgetOptions<dxChat> {
      * @action
      * @public
      */
-    onTypingEnd?: ((e: TypingEndEvent) => void);
+    onTypingEnd?: ((e: TypingEndEvent) => void) | undefined;
 }
 
 /**