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

dev/supplier-email-drawer
LiaoYijun 5 months ago
commit 756cd7935f

@ -33,7 +33,7 @@ const MessagesList = ({ ...listProps }) => {
setChatItemMessages((prevValue) => [].concat(data, prevValue)); setChatItemMessages((prevValue) => [].concat(data, prevValue));
const loadPrePage = !(data.length === 0 || data.length < BIG_PAGE_SIZE); const loadPrePage = !(data.length === 0 || data.length < BIG_PAGE_SIZE);
if (data.length > 0) { if (data.length > 0) {
setParamsForMsgList({ loadPrePage, pretime: data[0].orgmsgtime }); setParamsForMsgList({ loadPrePage, pretime: data[0].msgtime });
} }
}; };
const getMessagesNext = async (chatItem) => { const getMessagesNext = async (chatItem) => {
@ -45,7 +45,7 @@ const MessagesList = ({ ...listProps }) => {
setChatItemMessages((prevValue) => [].concat(prevValue, data)); setChatItemMessages((prevValue) => [].concat(prevValue, data));
const loadNextPage = !(data.length === 0 || data.length < BIG_PAGE_SIZE); const loadNextPage = !(data.length === 0 || data.length < BIG_PAGE_SIZE);
if (data.length > 0) { if (data.length > 0) {
setParamsForMsgList({ loadNextPage, lasttime: data[data.length - 1].orgmsgtime }); setParamsForMsgList({ loadNextPage, lasttime: data[data.length - 1].msgtime });
} }
}; };
@ -74,8 +74,8 @@ const MessagesList = ({ ...listProps }) => {
firstActionPageParams.loadPrePage = true; firstActionPageParams.loadPrePage = true;
} }
if (!isEmpty(formValues?.search) && !isEmpty(selectedConversation.matchMsgList)) { if (!isEmpty(formValues?.search) && !isEmpty(selectedConversation.matchMsgList)) {
firstActionPageParams.pretime = selectedConversation.matchMsgList[0].orgmsgtime; firstActionPageParams.pretime = selectedConversation.matchMsgList[0].msgtime;
firstActionPageParams.lasttime = selectedConversation.matchMsgList[0].orgmsgtime; firstActionPageParams.lasttime = selectedConversation.matchMsgList[0].msgtime;
firstActionPageParams.loadPrePage = true; firstActionPageParams.loadPrePage = true;
} }
setParamsForMsgList(firstActionPageParams); setParamsForMsgList(firstActionPageParams);
@ -106,7 +106,7 @@ const MessagesList = ({ ...listProps }) => {
// , // ,
useEffect(() => { useEffect(() => {
if (chatItemMessages.length > 0) { if (chatItemMessages.length > 0) {
// setParamsForMsgList({ pretime: chatItemMessages[0].orgmsgtime, lasttime: chatItemMessages[chatItemMessages.length - 1].orgmsgtime }); // setParamsForMsgList({ pretime: chatItemMessages[0].msgtime, lasttime: chatItemMessages[chatItemMessages.length - 1].msgtime });
const album = chatItemMessages.filter((ele) => ele.whatsapp_msg_type === 'image').map((ele) => ele.data.uri); const album = chatItemMessages.filter((ele) => ele.whatsapp_msg_type === 'image').map((ele) => ele.data.uri);
setImageAlbumList(album); setImageAlbumList(album);
} }

Loading…
Cancel
Save