diff --git a/src/stores/ConversationStore.js b/src/stores/ConversationStore.js index fa6501f..e95ca35 100644 --- a/src/stores/ConversationStore.js +++ b/src/stores/ConversationStore.js @@ -180,6 +180,7 @@ const websocketSlice = (set, get) => ({ ...(msgRender.type === 'photo' ? { image: msgRender.data.uri } : {}), }); } + // 其他通知, 不是消息 if ([ 'email.action.received', ].includes(resultType)) { @@ -445,7 +446,7 @@ export const useConversationStore = create( }, reset: () => set(initialConversationState), - }), '💬conversation') + }), 'conversationStore') ); export default useConversationStore; diff --git a/src/views/Conversations/Online/Components/ChatListItem.jsx b/src/views/Conversations/Online/Components/ChatListItem.jsx index 6ff473f..f418c0c 100644 --- a/src/views/Conversations/Online/Components/ChatListItem.jsx +++ b/src/views/Conversations/Online/Components/ChatListItem.jsx @@ -256,13 +256,13 @@ const ChatListItem = (({item, refreshConversationList,setListUpdateFlag,onSwitch {...item} key={item.sn} id={item.sn} - letterItem={{ id: item.whatsapp_name || item.whatsapp_phone_number, letter: (item.whatsapp_name || item.whatsapp_phone_number).slice(0, 5) }} + letterItem={{ id: item.whatsapp_name || item.whatsapp_phone_number, letter: (item.whatsapp_name || item.whatsapp_phone_number || '').slice(0, 5) }} alt={item.whatsapp_name} title={ {/* 🔝 */} {/* */} - {item.conversation_memo || item.whatsapp_name || item.whatsapp_phone_number} + {item.conversation_memo ?? (item.whatsapp_name ?? item.whatsapp_phone_number)} // item.conversation_memo || } @@ -289,6 +289,7 @@ const ChatListItem = (({item, refreshConversationList,setListUpdateFlag,onSwitch } date={item.lasttime || item.last_received_time || item.last_send_time} + dateString='' // 为了覆盖: 其他客户端发送的失败消息, 推送到此处产生新会话, 但是dataString是长字符串 unread={item.unread_msg_count > 99 ? 0 : item.unread_msg_count} // className={[ // String(item.sn) === String(currentConversation.sn) ? '__active text-primary bg-whatsapp-bg' : '',