diff --git a/src/components/DndModal.jsx b/src/components/DndModal.jsx
index 5112c3f..b53da9c 100644
--- a/src/components/DndModal.jsx
+++ b/src/components/DndModal.jsx
@@ -54,7 +54,7 @@ const DnDModal = ({ children, open, setOpen, onCancel, onMove, onResize, initial
initialWidth={(mobile ? window.innerWidth : (initial.width ?? 680))} // window.innerWidth < 680
initialHeight={(mobile ? window.innerHeight : (initial.height ?? 600))} // window.innerHeight < 700
initialTop={mobile ? 0 : (initial.top ?? 74)}
- initialLeft={mobile ? 0 : (initial.left ?? (window.innerWidth - 700))}
+ initialLeft={mobile ? 0 : (initial.left ?? (window.innerWidth - 300))}
title={title}
minimizeButton={<>>}
onMove={onHandleMove}
diff --git a/src/views/Conversations/Online/Components/ChatListItem.jsx b/src/views/Conversations/Online/Components/ChatListItem.jsx
index 9f80556..f20b763 100644
--- a/src/views/Conversations/Online/Components/ChatListItem.jsx
+++ b/src/views/Conversations/Online/Components/ChatListItem.jsx
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react';
import { useParams, useNavigate } from 'react-router-dom';
-import { Dropdown, Input, Button, Tag, Popover, Form } from 'antd';
+import { Dropdown, Input, Button, Tag, Popover, Form, Tooltip } from 'antd';
import { CloseCircleOutlined, MinusCircleOutlined } from '@ant-design/icons';
import { fetchConversationItemClose, fetchConversationsSearch, fetchConversationItemUnread, fetchConversationItemTop, postConversationTags, deleteConversationTags } from '@/actions/ConversationActions';
import { ChatItem } from 'react-chat-elements';
@@ -17,9 +17,9 @@ import { whatsappMsgTypeMapped } from '@/channel/bubbleMsgUtils';
const OrderSignEmoji = ({ item }) => (
<>
- {OrderLabelDefaultOptionsMapped[String(item.order_label_id)]?.emoji}
- {OrderStatusDefaultOptionsMapped[String(item.order_state_id)]?.emoji}
- {item.intour === 1 && item.order_state_id===5 ? '👣' : ''}
+ {OrderLabelDefaultOptionsMapped[String(item.order_label_id)]?.emoji}
+ {OrderStatusDefaultOptionsMapped[String(item.order_state_id)]?.emoji}
+ {item.intour === 1 && item.order_state_id === 5 ? '👣' : ''}
>
)
diff --git a/src/views/Conversations/Online/Components/EmailDetail.jsx b/src/views/Conversations/Online/Components/EmailDetail.jsx
index f2ec918..39e5dc4 100644
--- a/src/views/Conversations/Online/Components/EmailDetail.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetail.jsx
@@ -137,7 +137,7 @@ const EmailDetail = ({ open, setOpen, emailMsg={}, ...props }) => {
{mailData.info?.MAI_Subject || emailMsg?.msgOrigin?.email?.subject}
>
}
- initial={{ top: 74 }}
+ initial={{ top: 74, left: 324 }}
onMove={onHandleMove}
onResize={onHandleResize}
footer={}>
diff --git a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
index d08e67a..42d6b11 100644
--- a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
+++ b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
@@ -451,10 +451,7 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, toEma
rootClassName='email-editor-wrapper !border-indigo-300 '
open={open}
setOpen={setOpen}
- // initial={{ top: isEmpty(quoteid) ? 20 : 74 }}
- initial={{ width: 1200, height: window.innerHeight-40, left: 300 + 24, top: 64 }}
- maximizeButton={<>>}
- initialStage={'FULLSCREEN'}
+ initial={{ width: window.innerWidth-600, height: window.innerHeight-40, left: 300 + 24, top: 20 }}
onCancel={() => {
form.resetFields();
}}