fix(merge): conflict_resolve

softeerbootcamp4th · Aug 21, 2024 · c7d8ebd · c7d8ebd
1 parent 4c6b676
commit c7d8ebd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/packages/admin/src/components/chat/RealTimeChatting.tsx b/packages/admin/src/components/chat/RealTimeChatting.tsx
@@ -2,14 +2,14 @@ import { ChatList } from '@softeer/common/components';
 import { useRef } from 'react';
 import { AdminSocketReturnType } from 'src/hooks/socket/index.ts';
 import { useAlert } from 'src/store/provider/AlertProvider.tsx';
-import { Button } from '../ui/button.js';
-import { Input } from '../ui/input.js';
+import { Button } from '../ui/button.tsx';
+import { Input } from '../ui/input.tsx';
 import Chat from './Chat.js';
 
 /** 실시간 기대평 섹션 */
 
 function RealTimeChatting({
-	chatSocket: { messages, onBlock, onNotice, notice, onRequestMessageHistory },
+	chatSocket: { messages, onBlock, onNotice, notice },
 }: Pick<AdminSocketReturnType, 'chatSocket'>) {
 	const { openAlert, addAlertCallback } = useAlert();
 	const noticeInputRef = useRef<HTMLInputElement>(null);

diff --git a/packages/common/src/constants/socket.ts b/packages/common/src/constants/socket.ts
@@ -7,15 +7,9 @@ export const CHAT_SOCKET_ENDPOINTS = {
 	PUBLISH_BLOCK: '/app/chat.sendBlock',
 	SUBSCRIBE_NOTICE: '/topic/notice',
 	PUBLISH_NOTICE: '/app/chat.sendNotice',
-<<<<<<< HEAD
-	SUBSCRIBE_MESSAGE_HISTORY: '/user/queue/chatHistory',
-	PUBLISH_MESSAGE_HISTORY: '/app/chat.getHistory',
-=======
 	SUBSCRIBE_MESSAGE_HISTORY: '/user/queue/chatHistory',
 	PUBLISH_MESSAGE_HISTORY: '/app/chat.getHistory',
 	SUBSCRIBE_ERROR: '/user/queue/errors',
-
->>>>>>> main
 } as const;
 
 export const RACING_SOCKET_ENDPOINTS = {