Merge branch 'pre' into release

store/index.ts

@@ -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) {

xim/index.ts

@@ -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`));
                     }
                     }