Merge branch 'main' of github.com:hainatravel/global-sales

src/views/ChatWindow.jsx

@@ -25,12 +25,12 @@ const ChatWindow = () => {
 
   return (
     <>
-      <Layout hasSider className='h-screen chatwindow-wrapper' style={{ maxHeight: 'calc(100% - 198px)', height: 'calc(100% - 198px)' }}>
+      <Layout hasSider className='h-screen chatwindow-wrapper' style={{ maxHeight: 'calc(100% - 166px)', height: 'calc(100% - 166px)' }}>
         <Sider
-          width={300}
+          width={340}
           theme={'light'}
           className='h-full overflow-y-auto h-parent'
-          style={{ maxHeight: 'calc(100vh - 198px)', height: 'calc(100vh - 198px)' }}
+          style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)' }}
           collapsible={true}
           breakpoint='xl'
           collapsedWidth={73}
@@ -43,7 +43,7 @@ const ChatWindow = () => {
           <ConversationsList />
         </Sider>
 
-        <Content style={{ maxHeight: 'calc(100vh - 198px)', height: 'calc(100vh - 198px)', minWidth: '360px' }}>
+        <Content style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)', minWidth: '360px' }}>
           <Layout className='h-full'>
             <Header className='px-1 ant-layout-sider-light ant-card h-auto flex justify-between gap-1 items-center'>
               {/* <Button type='text' icon={collapsedLeft ? <MenuUnfoldOutlined /> : <MenuFoldOutlined />} onClick={() => setCollapsedLeft(!collapsedLeft)} className=' rounded-none rounded-l' /> */}
@@ -63,10 +63,10 @@ const ChatWindow = () => {
         </Content>
 
         <Sider
-          width={300}
+          width={400}
           theme={'light'}
           className=' overflow-y-auto'
-          style={{ maxHeight: 'calc(100vh - 198px)', height: 'calc(100vh - 198px)' }}
+          style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)' }}
           collapsible={true}
           breakpoint='xl'
           collapsedWidth={0}

src/views/Conversations/Online/order/CustomerProfile.jsx

@@ -122,7 +122,7 @@ const CustomerProfile = () => {
 		setNewChatModalVisible(false);
 	};
 
-  const handleEmailClick = useCallback((emailItem) => {
+  const handle3rdEmailItemClick = useCallback((emailItem) => {
     const emailMsg = {
       conversationid: currentConversationID,
       order_opi: orderDetail.opi_sn,
@@ -293,7 +293,7 @@ const CustomerProfile = () => {
               <List.Item
                 className='hover:bg-stone-50 cursor-pointer'
                 onClick={() => {
-                  handleEmailClick(email)
+                  handle3rdEmailItemClick(email)
                 }}>
                   <Flex
                     vertical

src/views/DesktopApp.jsx

@@ -235,7 +235,7 @@ function DesktopApp() {
       <Layout>
         <Content
           style={{
-            padding: 24,
+            padding: 8,
             margin: 0,
             minHeight: 280,
             background: colorBgContainer,

wai-server/core/services/whatsappHandler.js

@@ -27,6 +27,7 @@ const webhookBodyBuilder = (messageData, messageType) => {
     waiMessage: {
       ...messageData,
       ...(messageData.updateTime ? { [timeField[messageData.status]]: messageData.updateTime } : {}),
+      wamid: messageData.id,
       direction: directionField[messageType],
       externalId: '', // todo:
     },