From 47a67260a0d55c57180a46b5a882c50edcb65c3d Mon Sep 17 00:00:00 2001
From: gofnnp <itkataev@gmail.com>
Date: Wed, 20 Aug 2025 00:25:06 +0400
Subject: [PATCH 1/2] subscription-button

change button style
---
 .../SubscriptionTable/SubscriptionTable.module.scss      | 9 +++++++++
 .../SubscriptionTable/SubscriptionTable.tsx              | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/domains/profile/subscriptions/SubscriptionTable/SubscriptionTable.module.scss b/src/components/domains/profile/subscriptions/SubscriptionTable/SubscriptionTable.module.scss
index 02b59df..c781020 100644
--- a/src/components/domains/profile/subscriptions/SubscriptionTable/SubscriptionTable.module.scss
+++ b/src/components/domains/profile/subscriptions/SubscriptionTable/SubscriptionTable.module.scss
@@ -31,3 +31,12 @@
     font-weight: 600;
   }
 }
+
+.buttonCancel.buttonCancel {
+  background-color: transparent;
+  padding: 0;
+
+  & > .buttonCancelText {
+    text-decoration: underline;
+  }
+}
diff --git a/src/components/domains/profile/subscriptions/SubscriptionTable/SubscriptionTable.tsx b/src/components/domains/profile/subscriptions/SubscriptionTable/SubscriptionTable.tsx
index 81e7fb0..1883776 100644
--- a/src/components/domains/profile/subscriptions/SubscriptionTable/SubscriptionTable.tsx
+++ b/src/components/domains/profile/subscriptions/SubscriptionTable/SubscriptionTable.tsx
@@ -71,7 +71,7 @@ export default function SubscriptionTable({ subscription }: ITableProps) {
           className={styles.buttonCancel}
           onClick={() => open(subscription)}
         >
-          <Typography color="white">
+          <Typography color="muted" className={styles.buttonCancelText}>
             {t("table.cancel_subscription")}
           </Typography>
         </Button>,

From 56e117b45484e9552578a1029ebb98ad40eace1c Mon Sep 17 00:00:00 2001
From: "dev.daminik00" <dev.daminik00@gmail.com>
Date: Tue, 19 Aug 2025 23:02:20 +0200
Subject: [PATCH 2/2] Fix online status

---
 src/components/domains/chat/CategoryChats/CategoryChats.tsx     | 2 +-
 src/components/domains/chat/ChatHeader/ChatHeader.tsx           | 2 +-
 .../chat/CorrespondenceStarted/CorrespondenceStarted.tsx        | 2 +-
 src/components/domains/chat/NewMessages/NewMessages.tsx         | 2 +-
 src/entities/chats/types.ts                                     | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/domains/chat/CategoryChats/CategoryChats.tsx b/src/components/domains/chat/CategoryChats/CategoryChats.tsx
index 5215927..0c5c30c 100644
--- a/src/components/domains/chat/CategoryChats/CategoryChats.tsx
+++ b/src/components/domains/chat/CategoryChats/CategoryChats.tsx
@@ -31,7 +31,7 @@ export default function CategoryChats({
           userAvatar={{
             src: chat.assistantAvatar,
             alt: chat.assistantName,
-            isOnline: chat.status === "active",
+            isOnline: chat.assistantStatus === "online",
           }}
           name={chat.assistantName}
           messagePreiew={
diff --git a/src/components/domains/chat/ChatHeader/ChatHeader.tsx b/src/components/domains/chat/ChatHeader/ChatHeader.tsx
index f54befe..69be1bf 100644
--- a/src/components/domains/chat/ChatHeader/ChatHeader.tsx
+++ b/src/components/domains/chat/ChatHeader/ChatHeader.tsx
@@ -72,7 +72,7 @@ export default function ChatHeader() {
           <Typography weight="semiBold" className={styles.name}>
             {currentChat?.assistantName}
             <OnlineIndicator
-              isOnline={currentChat?.status === "active"}
+              isOnline={currentChat?.assistantStatus === "online"}
               className={styles.onlineIndicator}
             />
           </Typography>
diff --git a/src/components/domains/chat/CorrespondenceStarted/CorrespondenceStarted.tsx b/src/components/domains/chat/CorrespondenceStarted/CorrespondenceStarted.tsx
index 7053a1f..5af6d8f 100644
--- a/src/components/domains/chat/CorrespondenceStarted/CorrespondenceStarted.tsx
+++ b/src/components/domains/chat/CorrespondenceStarted/CorrespondenceStarted.tsx
@@ -52,7 +52,7 @@ export default function CorrespondenceStarted({
             userAvatar={{
               src: chat.assistantAvatar,
               alt: chat.assistantName,
-              isOnline: chat.status === "active",
+              isOnline: chat.assistantStatus === "online",
             }}
             name={chat.assistantName}
             messagePreiew={
diff --git a/src/components/domains/chat/NewMessages/NewMessages.tsx b/src/components/domains/chat/NewMessages/NewMessages.tsx
index 7997c2f..7fefd64 100644
--- a/src/components/domains/chat/NewMessages/NewMessages.tsx
+++ b/src/components/domains/chat/NewMessages/NewMessages.tsx
@@ -51,7 +51,7 @@ export default function NewMessages({
             userAvatar={{
               src: chat.assistantAvatar,
               alt: chat.assistantName,
-              isOnline: chat.status === "active",
+              isOnline: chat.assistantStatus === "online",
             }}
             name={chat.assistantName}
             messagePreiew={
diff --git a/src/entities/chats/types.ts b/src/entities/chats/types.ts
index 6914571..de675eb 100644
--- a/src/entities/chats/types.ts
+++ b/src/entities/chats/types.ts
@@ -22,6 +22,7 @@ const ChatSchema = z.object({
   unreadCount: z.number(),
   updatedAt: z.string(),
   status: z.string(),
+  assistantStatus: z.string(),
   category: z.string(),
 });