Merge remote-tracking branch 'origin/dev/2025a' into dev/2025a

src/views/ChatWindow.jsx

@@ -4,12 +4,11 @@ import { RightCircleOutlined, RightOutlined, ReloadOutlined, MenuFoldOutlined, M
 // import { useParams, useNavigate } from 'react-router-dom';
 import MessagesHeader from './Conversations/Online/MessagesHeader';
 import MessagesWrapper from './Conversations/Online/MessagesWrapper';
-import InputComposer from './Conversations/Online/Input/InputComposer';
 import ConversationsList from './Conversations/Online/ConversationsList';
-import CustomerProfile from './Conversations/Online/order/CustomerProfile';
-// import { useAuthContext } from '@/stores/AuthContext';
-// import useConversationStore from '@/stores/ConversationStore';
+import OrderProfile from '@/components/OrderProfile'
 import ReplyWrapper from './Conversations/Online/ReplyWrapper';
+import useConversationStore from '@/stores/ConversationStore';
+import { useShallow } from 'zustand/react/shallow';
 
 import './Conversations/Conversations.css';
 import EmailEditorPopup from './Conversations/Online/Input/EmailEditorPopup';
@@ -24,6 +23,9 @@ const ChatWindow = () => {
   const [collapsedLeft, setCollapsedLeft] = useState(false);
   const [collapsedRight, setCollapsedRight] = useState(true);
 
+
+    const currentOrder = useConversationStore(useShallow(state => state.currentConversation?.coli_sn || ""));
+
   return (
     <>
       <Layout hasSider className='h-screen chatwindow-wrapper' style={{ maxHeight: 'calc(100% - 166px)', height: 'calc(100% - 166px)' }}>
@@ -73,7 +75,7 @@ const ChatWindow = () => {
           collapsedWidth={0}
           trigger={null}
           collapsed={collapsedRight}>
-          <CustomerProfile disabled />
+          <OrderProfile coliSN={currentOrder} />
         </Sider>
       </Layout>
       <EmailEditorPopup key='email-editor-online' />