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

src/views/AuthApp.jsx

@@ -136,7 +136,7 @@ function AuthApp() {
           colorPrimary: colorPrimary,
           borderRadius: borderRadius,
           fontFamily:
-            "-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,'Helvetica Neue',Arial,'Noto Sans',sans-serif,'Noto Color Emoji','Apple Color Emoji','Segoe UI Emoji','Segoe UI Symbol'",
+            "-apple-system,BlinkMacSystemFont,Roboto,'Helvetica Neue',Arial,'Noto Sans',sans-serif,'Noto Color Emoji','Apple Color Emoji'",
         },
         algorithm: theme.defaultAlgorithm,
       }}

src/views/Conversations/Conversations.css

@@ -140,7 +140,7 @@
 .chatwindow-wrapper .epr-emoji-native,
 .chatwindow-wrapper .ant-input-textarea-affix-wrapper.ant-input-affix-wrapper >textarea.ant-input
 {
-    font-family: 'Open Sans', 'Noto Sans',"Noto Color Emoji", 'Apple Color Emoji', 'Twemoji Mozilla', 'Segoe UI Emoji', 'Segoe UI Symbol', 'EmojiOne Color', 'Android Emoji', Arial, sans-serif!important;
+    font-family: 'Open Sans', 'Noto Sans',"Noto Color Emoji", 'Apple Color Emoji', 'Twemoji Mozilla', 'EmojiOne Color', 'Android Emoji', Arial, sans-serif!important;
     font-weight: 400;
 }
 .chatwindow-wrapper .failed-msg .rce-mbox-forward{

src/views/Conversations/Online/Components/BubbleIM.jsx

@@ -126,7 +126,7 @@ const BubbleIM = ({ handlePreview, handleContactClick, setNewChatModalVisible, s
           dateString: `${message.wabaName} - ${message.dateString}`,
         })}
       className={[
-        'whitespace-pre-wrap',
+        'whitespace-pre-wrap', '[&_.rce-mbox-reply-message]:line-clamp-3',
         message.whatsapp_msg_type === 'sticker' ? 'bg-transparent' : '',
         // message.sender === 'me' ? 'whatsappme-container' : '',
         focusMsg === message.id ? 'message-box-focus' : '',

src/views/Conversations/Online/Input/InputComposer.jsx

@@ -322,7 +322,7 @@ const InputComposer = ({ channel, currentActive, lastWABAMsg = {} }) => {
           <div className='flex flex-col referrer-msg border-l-3 border-y-0 border-r-0 border-slate-300 border-solid pl-2 pr-1 py-1'>
             <span className=' text-primary pr-1 italic align-top'>{referenceMsg.senderName}</span>
             {referenceMsg.type === 'photo' && <Image width={100} src={referenceMsg.data.uri} />}
-            <span className='px-1 whitespace-pre-wrap line-clamp-3 overflow-hidden text-ellipsis break-words'>{referenceMsg.originText}</span>
+            <span className='px-1 whitespace-pre-wrap line-clamp-3 overflow-hidden text-ellipsis break-words break-all'>{referenceMsg.originText}</span>
           </div>
           <Button type='text' title='取消引用' className=' rounded-none text-slate-500' icon={<CloseCircleOutlined />} size={'middle'} onClick={() => setReferenceMsg({})} />
         </Flex>