Commit fbedbee7 by Sixong.Zhu

Merge branch 'pre' into release

parents 5f180569 261feed6
Showing with 2 additions and 2 deletions
...@@ -117,7 +117,7 @@ export const filterActiveChats = (items: RawChatItem[]) => { ...@@ -117,7 +117,7 @@ export const filterActiveChats = (items: RawChatItem[]) => {
!i.is_deleted && !i.is_deleted &&
allowedChatTypes.includes(i.type) allowedChatTypes.includes(i.type)
) )
.sort((x, y) => (x.update_time - y.update_time ? 1 : -1)); .sort((x, y) => y.last_msg_ts - x.last_msg_ts);
}; };
export function getLastMessageId(msgs: Message[] | any) { export function getLastMessageId(msgs: Message[] | any) {
......
...@@ -151,7 +151,7 @@ class Chat { ...@@ -151,7 +151,7 @@ class Chat {
.finally(() => { .finally(() => {
this.registerXimEvent(); this.registerXimEvent();
if (xim.isConnected()) { if (xim.isConnected()) {
setTimeout(resolve, 0); setTimeout(resolve, 200);
} else { } else {
reject(new Error(`xim is not connected`)); reject(new Error(`xim is not connected`));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment