diff --git a/src/actions/helpers.ts b/src/actions/helpers.ts
index 6522b69..812980d 100644
--- a/src/actions/helpers.ts
+++ b/src/actions/helpers.ts
@@ -23,22 +23,22 @@ export const apiRequest = async <T = any, K = any>(
 
         return response.data;
     } catch (err) {
-        // const {
-        //     response: {
-        //         status: responseCode = null,
-        //         statusText = '',
-        //         data: { message = '', status: errorKey = '' } = {},
-        //     } = {},
-        //     code: statusCode = '',
-        // } = err as AxiosError;
-        //
-        // throw new Error(
-        //     JSON.stringify({
-        //         statusCode,
-        //         statusMessage: message || statusText,
-        //         responseCode,
-        //         errorKey,
-        //     }),
-        // );
+        const {
+            response: {
+                status: responseCode = null,
+                statusText = '',
+                data,
+            } = {},
+            code: statusCode = '',
+        } = err as AxiosError;
+
+        throw new Error(
+            JSON.stringify({
+                statusCode,
+                statusMessage: statusText,
+                responseCode,
+                details: data
+            }),
+        );
     }
 };
diff --git a/src/components/Experts/ExpertDetails.tsx b/src/components/Experts/ExpertDetails.tsx
index 7fe4283..f598f57 100644
--- a/src/components/Experts/ExpertDetails.tsx
+++ b/src/components/Experts/ExpertDetails.tsx
@@ -15,9 +15,9 @@ import { getStorageValue } from '../../hooks/useLocalStorage';
 import { AUTH_TOKEN_KEY, SESSION_DATA } from '../../constants/common';
 import { ScheduleModal } from '../Modals/ScheduleModal';
 import { ScheduleModalResult } from '../Modals/ScheduleModalResult';
-import SignalrConnection from "../../lib/signalr-connection";
-import {useRouter} from "../../navigation";
-import {useLocalStorage} from "../../hooks/useLocalStorage";
+import SignalrConnection from '../../lib/signalr-connection';
+import { useRouter } from '../../navigation';
+import { useLocalStorage } from '../../hooks/useLocalStorage';
 
 type ExpertDetailsProps = {
     expert: ExpertDetails;
@@ -38,30 +38,28 @@ export const ExpertCard: FC<ExpertDetailsProps> = ({ expert, locale, expertId })
     const isRus = locale === Locale.ru;
     const { publicCoachDetails: { tags = [], sessionCost = 0, sessionDuration = 0, coachLanguages = [] , id, botUserId} } = expert || {};
     const [jwt] = useLocalStorage(AUTH_TOKEN_KEY, '');
-    const { joinChatPerson, addListener } = SignalrConnection();
+    const { joinChatPerson, addListener, closeConnection } = SignalrConnection();
     const router = useRouter();
 
     const onConnected = (flag: boolean)=>{
         if (flag){
-
+            console.log('here');
         }
     }
 
     useEffect(() => {
-        addListener('onConnected', onConnected)
+        addListener('onConnected', onConnected);
+        document?.addEventListener('show_pay_form', handleShowPayForm);
+
+        return () => {
+            closeConnection();
+            document?.removeEventListener('show_pay_form', handleShowPayForm);
+        }
     }, []);
 
-    const handleJoinChat = () =>{
-        joinChatPerson(id).then((res: any) =>{
-            console.log('RES', res)
-            router.push(`/account/messages/${res.id}`);
-        })
-    }
-
-    const handleJoinAIChat = () =>{
-        joinChatPerson(botUserId).then((res: any) =>{
-            console.log('RES', res)
-            router.push(`/account/messages/${res.id}`);
+    const handleJoinChat = (id: number) => {
+        joinChatPerson(id).then((res: any) => {
+            router.push(`/account/messages/${res.id}` as string);
         })
     }
 
@@ -74,7 +72,7 @@ export const ExpertCard: FC<ExpertDetailsProps> = ({ expert, locale, expertId })
             } else {
                 setShowSchedulerModal(false);
                 const showAuth = new Event('show_auth_enter');
-                document.dispatchEvent(showAuth);
+                document?.dispatchEvent(showAuth);
             }
         }
     }
@@ -84,13 +82,6 @@ export const ExpertCard: FC<ExpertDetailsProps> = ({ expert, locale, expertId })
         setMode('pay');
     }
 
-    useEffect(() => {
-        document.addEventListener('show_pay_form', handleShowPayForm);
-        return () => {
-            document.removeEventListener('show_pay_form', handleShowPayForm);
-        };
-    }, []);
-
     const onSchedulerHandle = () => {
         setMode('data');
         setShowSchedulerModal(true);
@@ -116,18 +107,24 @@ export const ExpertCard: FC<ExpertDetailsProps> = ({ expert, locale, expertId })
                         </div>
                     </div>
                 </div>
-                <div className="expert-card__wrap-btn">
-                    <Button className="btn-apply" onClick={onSchedulerHandle}>
-                        <img src="/images/calendar-outline.svg" className="" alt="" />
-                        {i18nText('schedule', locale)}
-                    </Button>
-                    {/*
-                        <a href="#" className="btn-video">
-                            <img src="/images/videocam-outline.svg" className="" alt=""/>
-                            Video
-                        </a>
-                    */}
-                </div>
+                {jwt && (
+                    <div className="expert-card__wrap-btn">
+                        <Button className="btn-apply" onClick={() => handleJoinChat(id)}>
+                            {i18nText('chat.join', locale)}
+                        </Button>
+                        {botUserId && (
+                            <Button className="btn-apply" onClick={() => handleJoinChat(botUserId)}>
+                                {i18nText('chat.joinAI', locale)}
+                            </Button>
+                        )}
+                        {/*
+                            <a href="#" className="btn-video">
+                                <img src="/images/videocam-outline.svg" className="" alt=""/>
+                                Video
+                            </a>
+                        */}
+                    </div>
+                )}
             </div>
             <div className="expert-info">
                 {/* <h2 className="title-h2">{}</h2> */}
@@ -158,19 +155,6 @@ export const ExpertCard: FC<ExpertDetailsProps> = ({ expert, locale, expertId })
                 <div className="wrap-btn-prise__text">
                     {`${sessionCost}€`} <span>/ {`${sessionDuration}${isRus ? 'мин' : 'min'}`}</span>
                 </div>
-                {jwt && (
-                    <div className="w-100" style={{textAlign: 'end'}}>
-
-                        <FilledYellowButton
-                            onClick={handleJoinChat}
-                        >{i18nText('chat.join', locale)}</FilledYellowButton>
-                        &nbsp;
-                        {botUserId && (
-                            <FilledYellowButton
-                                onClick={handleJoinAIChat}>{i18nText('chat.joinAI', locale)}</FilledYellowButton>
-                        )}
-                    </div>
-                )}
             </div>
             <ScheduleModal
                 open={showSchedulerModal}
diff --git a/src/i18nKeys/de.ts b/src/i18nKeys/de.ts
index 7134d77..4e4e75c 100644
--- a/src/i18nKeys/de.ts
+++ b/src/i18nKeys/de.ts
@@ -185,6 +185,10 @@ export default {
     sessionWishes: 'Schreiben Sie Ihre Wünsche zur Sitzung',
     successPayment: 'Erfolgreiche Zahlung',
     errorPayment: 'Zahlungsfehler',
+    chat: {
+        join: 'Chat starten',
+        joinAI: 'Start AI chat'
+    },
     errors: {
         invalidEmail: 'Die E-Mail-Adresse ist ungültig',
         emptyEmail: 'Bitte geben Sie Ihre E-Mail ein',
diff --git a/src/i18nKeys/en.ts b/src/i18nKeys/en.ts
index fab0990..e94cf1f 100644
--- a/src/i18nKeys/en.ts
+++ b/src/i18nKeys/en.ts
@@ -185,6 +185,10 @@ export default {
     sessionWishes: 'Write your wishes about the session',
     successPayment: 'Successful Payment',
     errorPayment: 'Payment Error',
+    chat: {
+        join: 'Start chat',
+        joinAI: 'Start AI chat'
+    },
     errors: {
         invalidEmail: 'The email address is not valid',
         emptyEmail: 'Please enter your E-mail',
diff --git a/src/i18nKeys/es.ts b/src/i18nKeys/es.ts
index a68ff8b..63cf967 100644
--- a/src/i18nKeys/es.ts
+++ b/src/i18nKeys/es.ts
@@ -185,6 +185,10 @@ export default {
     sessionWishes: 'Escribe tus deseos sobre la sesión',
     successPayment: 'Pago Exitoso',
     errorPayment: 'Error de Pago',
+    chat: {
+        join: 'Empezar un chat',
+        joinAI: 'Start AI chat'
+    },
     errors: {
         invalidEmail: 'La dirección de correo electrónico no es válida',
         emptyEmail: 'Introduce tu correo electrónico',
diff --git a/src/i18nKeys/fr.ts b/src/i18nKeys/fr.ts
index 5d49044..fd25838 100644
--- a/src/i18nKeys/fr.ts
+++ b/src/i18nKeys/fr.ts
@@ -185,6 +185,10 @@ export default {
     sessionWishes: 'Écrivez vos souhaits concernant la session',
     successPayment: 'Paiement Réussi',
     errorPayment: 'Erreur de Paiement',
+    chat: {
+        join: 'Commencer la discussion',
+        joinAI: 'Start AI chat'
+    },
     errors: {
         invalidEmail: 'L\'adresse e-mail n\'est pas valide',
         emptyEmail: 'Veuillez saisir votre e-mail',
diff --git a/src/i18nKeys/it.ts b/src/i18nKeys/it.ts
index a6b5db8..7a8db8a 100644
--- a/src/i18nKeys/it.ts
+++ b/src/i18nKeys/it.ts
@@ -185,6 +185,10 @@ export default {
     sessionWishes: 'Scrivi i tuoi desideri riguardo alla sessione',
     successPayment: 'Pagamento Riuscito',
     errorPayment: 'Errore di Pagamento',
+    chat: {
+        join: 'Avvia chat',
+        joinAI: 'Start AI chat'
+    },
     errors: {
         invalidEmail: 'L\'indirizzo e-mail non è valido',
         emptyEmail: 'Inserisci l\'e-mail',
diff --git a/src/i18nKeys/ru.ts b/src/i18nKeys/ru.ts
index e313458..d45abc2 100644
--- a/src/i18nKeys/ru.ts
+++ b/src/i18nKeys/ru.ts
@@ -186,8 +186,8 @@ export default {
     successPayment: 'Успешная оплата',
     errorPayment: 'Ошибка оплаты',
     chat: {
-        join: 'начать чат',
-        joinAI: 'начать чат с ИИ'
+        join: 'Начать чат',
+        joinAI: 'Начать чат с ИИ'
     },
     errors: {
         invalidEmail: 'Адрес электронной почты недействителен',
diff --git a/src/lib/signalr-connection.ts b/src/lib/signalr-connection.ts
index d45e9ad..03bfcb4 100644
--- a/src/lib/signalr-connection.ts
+++ b/src/lib/signalr-connection.ts
@@ -1,9 +1,7 @@
 import { HubConnection, HubConnectionBuilder, LogLevel } from '@microsoft/signalr';
-import {AUTH_TOKEN_KEY} from "../constants/common";
-import {IHttpConnectionOptions} from "@microsoft/signalr/src/IHttpConnectionOptions";
-import {IChatMessage} from "../types/chat";
-
-const URL = 'https://api.bbuddy.expert/api/hubs/chat'
+import { IHttpConnectionOptions } from "@microsoft/signalr/src/IHttpConnectionOptions";
+import { AUTH_TOKEN_KEY, BASE_URL } from '../constants/common';
+import { IChatMessage } from '../types/chat';
 
 const chatMessageMethodName = 'ReceiveMessage';
 const chatUserStatusChangeMethodName = 'chatUserStatusChange';
@@ -33,7 +31,7 @@ class SignalConnector {
             accessTokenFactory: () => localStorage.getItem(AUTH_TOKEN_KEY)
         } as IHttpConnectionOptions;
         this.connection = new HubConnectionBuilder()
-            .withUrl(URL, options)
+            .withUrl(`${BASE_URL}/hubs/chat`, options)
             .withAutomaticReconnect()
             .configureLogging(LogLevel.Debug)
             .build();
@@ -52,7 +50,7 @@ class SignalConnector {
         this.events[name] = func;
     }
 
-    public closeConnection = () =>{
+    public closeConnection = () => {
         this.connection.stop();
     }
 
diff --git a/src/styles/_default.scss b/src/styles/_default.scss
index c871c19..01dcb18 100644
--- a/src/styles/_default.scss
+++ b/src/styles/_default.scss
@@ -823,6 +823,7 @@ a {
     flex: 0 0 100%;
     display: flex;
     gap: 16px;
+    flex-direction: column;
 
     .btn-apply,
     .btn-video {