Merge branch 'main' into dev/chat

# Conflicts:
#	src/actions/ConversationActions.js

src/actions/ConversationActions.js

@@ -32,7 +32,7 @@ export const fetchMessages = async (params) => {
     whatsappid: '',
     // lasttime: '',
     lasttime: '2024-01-01T00:25:30', // test:
-    pagesize: 100,
+    pagesize: 400,
   };
   const { errcode, result } = await fetchJSON(`${API_HOST}/getcusmessages`, {...defaultParams, ...params});
   return errcode !== 0 ? [] : parseRenderMessageList(result || []);

src/views/ChatHistory.jsx

@@ -22,7 +22,7 @@ const { RangePicker } = DatePicker;
 const SearchForm = memo(function ({ initialValues, onSubmit }) {
   const [form] = Form.useForm();
   function handleSubmit(values) {
-    onSubmit?.(values);
+    onSubmit?.({...values, travel: values?.agent?.value || -1});
   }
   return (
     <Form