Merge pull request #180 from Team-Crops/fix/166-chat-notice-bubble

채팅창 공지사항 텍스트 표시
Team-Crops · Jun 22, 2024 · 2e56a9b · 2e56a9b
2 parents d1ae8ce + f3ea8d4
commit 2e56a9b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/components/molecules/NoticeBubble.tsx b/src/components/molecules/NoticeBubble.tsx
@@ -22,6 +22,6 @@ const Bubble = styled.div`
   margin: 0 auto;
   padding: 5px 20px;
 
-  background-color: rgb(238 238 238 / 100%);
+  background-color: #eee;
   border-radius: 20px;
 `;
diff --git a/src/hooks/use-chat.ts b/src/hooks/use-chat.ts
@@ -33,12 +33,13 @@ export function useChatSubscription(id: Chat['id']) {
 interface ChatMessagesResponse {
   pageResult: {
     values: {
-      content?: string;
-      imageUrl?: string;
-      messageId: number;
+      createdAt: string;
       messageType: 'TEXT' | 'IMAGE';
+      messageId: number;
       userId: number;
-      createdAt: string;
+      content?: string;
+      imageUrl?: string;
+      notice?: string;
     }[];
     hasNext: boolean;
   };
@@ -54,12 +55,13 @@ export function useChatMessagesQuery(id: Chat['id']) {
     const json = await fitFetcher<ChatMessagesResponse>(url);
     return {
       messages: json.pageResult.values.map((v) => ({
+        createdAt: v.createdAt,
+        messageType: v.messageType,
         id: v.messageId,
+        userId: v.userId,
         content: v.content,
         imageUrl: v.imageUrl,
-        userId: v.userId,
-        messageType: v.messageType,
-        createdAt: v.createdAt,
+        notice: v.notice,
       })),
       hasNext: json.pageResult.hasNext,
     } as { messages: Message[]; hasNext: boolean };