@realtimexsco/live-chat 1.3.0 → 1.3.2

package/dist/index.cjs

@@ -380,7 +380,6 @@ var init_socket_service = __esm({
           });
           this.disconnect();
         }
-        console.log("Socket: Starting connection to", config.url);
         this.currentConfig = config;
         this.isConnecting = true;
         const store = getStore();
@@ -389,7 +388,6 @@ var init_socket_service = __esm({
         this.socket = socket_ioClient.io(config.url, config.options);
         this.socket.on("connect", () => {
           this.isConnecting = false;
-          console.log("Connected to socket with ID:", this.socket?.id);
           setConnected({ socketId: this.socket?.id || "" });
           this.emitGetOnlineUsers();
         });
@@ -567,7 +565,7 @@ var init_group_display_helpers = __esm({
 });
 
 // src/store/helpers/message.helpers.ts
-var getMessageSenderId, extractMessageData, mergeLastMessage, messageHasPreviewBody, getLatestMessageFromList, isOwnMessage, getMessageContent, getMessageTimestamp, statusRank, preferHigherStatus, resolveMessageStatus, mergeChatMessages;
+var getMessageSenderId, extractMessageData, statusRank, preferHigherStatus, mergeLastMessage, messageHasPreviewBody, getLatestMessageFromList, isOwnMessage, getMessageContent, getMessageTimestamp, resolveMessageStatus, mergeChatMessages;
 var init_message_helpers = __esm({
   "src/store/helpers/message.helpers.ts"() {
     getMessageSenderId = (message) => String(message?.sender?._id || message?.sender?.id || message?.senderId || message?.fromUserId || message?.sender || "");
@@ -582,21 +580,32 @@ var init_message_helpers = __esm({
       const caption = payload.caption ?? payload.message?.caption ?? null;
       return { messageId, content, conversationId, status, isPinned, isStarred, attachmentId, caption };
     };
+    statusRank = { sent: 0, delivered: 1, read: 2 };
+    preferHigherStatus = (base, incoming) => {
+      const baseRank = statusRank[base?.status] ?? 0;
+      const incomingRank = statusRank[incoming?.status] ?? 0;
+      if (incomingRank > baseRank) {
+        return { ...base, status: incoming.status };
+      }
+      return base;
+    };
     mergeLastMessage = (existing, incoming) => {
       if (!incoming) return existing ?? null;
       if (!existing) return incoming;
       const content = incoming.content?.trim() ? incoming.content : existing.content;
       const createdAt = incoming.createdAt ?? incoming.timestamp ?? existing.createdAt ?? existing.timestamp;
-      const existingTime = new Date(existing.createdAt || existing.timestamp || 0).getTime();
-      const incomingTime = new Date(incoming.createdAt || incoming.timestamp || 0).getTime();
-      const newer = incomingTime >= existingTime ? incoming : existing;
+      const incomingSenderId = getMessageSenderId(incoming);
+      const resolvedSender = incomingSenderId ? incoming.sender ?? incoming.senderId ?? incoming.fromUserId : existing.sender ?? existing.senderId ?? existing.fromUserId ?? incoming.sender;
       return {
         ...existing,
         ...incoming,
         ...content !== void 0 ? { content } : {},
         ...createdAt !== void 0 ? { createdAt } : {},
         attachments: incoming.attachments?.length ? incoming.attachments : existing.attachments,
-        status: newer.status ?? existing.status ?? incoming.status
+        status: preferHigherStatus(existing, incoming).status ?? existing.status ?? incoming.status,
+        ...resolvedSender !== void 0 ? { sender: resolvedSender } : {},
+        senderId: incoming.senderId ?? existing.senderId,
+        fromUserId: incoming.fromUserId ?? existing.fromUserId
       };
     };
     messageHasPreviewBody = (message) => Boolean(String(message?.content || "").trim()) || Array.isArray(message?.attachments) && message.attachments.length > 0;
@@ -619,15 +628,6 @@ var init_message_helpers = __esm({
       const time = value ? new Date(value).getTime() : NaN;
       return Number.isFinite(time) ? time : 0;
     };
-    statusRank = { sent: 0, delivered: 1, read: 2 };
-    preferHigherStatus = (base, incoming) => {
-      const baseRank = statusRank[base?.status] ?? 0;
-      const incomingRank = statusRank[incoming?.status] ?? 0;
-      if (incomingRank > baseRank) {
-        return { ...base, status: incoming.status };
-      }
-      return base;
-    };
     resolveMessageStatus = (message, conversation, loggedUserId) => {
       const existing = message?.status || "sent";
       if (!loggedUserId || !isOwnMessage(message, loggedUserId)) return existing;
@@ -802,7 +802,7 @@ var init_unread_helpers = __esm({
 });
 
 // src/store/helpers/conversation.helpers.ts
-var findConversationIdByMessageId, isGroupConversation, normalizeConversationRecord, resolveConversationLastMessage, syncConversationLastMessage, upsertConversationInList, findConversationById, findConversationForChannel, resolveConversationIdForChannel;
+var findConversationIdByMessageId, applyMessageStatusToStore, isGroupConversation, normalizeConversationRecord, resolveConversationLastMessage, syncConversationLastMessage, upsertConversationInList, findConversationById, findConversationIdByLastMessageId, findConversationForChannel, resolveConversationIdForChannel;
 var init_conversation_helpers = __esm({
   "src/store/helpers/conversation.helpers.ts"() {
     init_group_display_helpers();
@@ -816,6 +816,40 @@ var init_conversation_helpers = __esm({
         )
       );
     };
+    applyMessageStatusToStore = (state, messageId, status, conversationId) => {
+      const normalizedMessageId = String(messageId);
+      const resolvedConversationId = conversationId ? String(conversationId) : findConversationIdByMessageId(state.messagesByConversation, normalizedMessageId) || findConversationIdByLastMessageId(state.conversations, normalizedMessageId) || null;
+      const nextConversations = state.conversations.map((conversation) => {
+        const lastMessageId = String(
+          conversation?.lastMessage?._id || conversation?.lastMessage?.id || ""
+        );
+        if (lastMessageId !== normalizedMessageId) return conversation;
+        return {
+          ...conversation,
+          lastMessage: mergeLastMessage(conversation.lastMessage, { status })
+        };
+      });
+      const nextMessagesByConversation = { ...state.messagesByConversation };
+      const patchMessages = (messages) => messages.map(
+        (message) => String(message._id || message.id) === normalizedMessageId ? preferHigherStatus(message, { status }) : message
+      );
+      if (resolvedConversationId && nextMessagesByConversation[resolvedConversationId]) {
+        nextMessagesByConversation[resolvedConversationId] = patchMessages(
+          nextMessagesByConversation[resolvedConversationId]
+        );
+      } else {
+        for (const cid of Object.keys(nextMessagesByConversation)) {
+          const patched = patchMessages(nextMessagesByConversation[cid]);
+          if (patched !== nextMessagesByConversation[cid]) {
+            nextMessagesByConversation[cid] = patched;
+          }
+        }
+      }
+      return {
+        conversations: nextConversations,
+        messagesByConversation: nextMessagesByConversation
+      };
+    };
     isGroupConversation = (conversation) => {
       if (!conversation) return false;
       return conversation.conversationType === "group" || !!conversation.isGroup;
@@ -890,13 +924,29 @@ var init_conversation_helpers = __esm({
         },
         existing
       );
-      const withoutExisting = index >= 0 ? conversations.filter((_, itemIndex) => itemIndex !== index) : conversations;
-      return [normalized, ...withoutExisting];
+      if (index < 0) {
+        return [normalized, ...conversations];
+      }
+      if (lastMessageChanged) {
+        const withoutExisting = conversations.filter((_, itemIndex) => itemIndex !== index);
+        return [normalized, ...withoutExisting];
+      }
+      const next = [...conversations];
+      next[index] = normalized;
+      return next;
     };
     findConversationById = (conversations, conversationId) => {
       if (!conversationId) return void 0;
       return conversations.find((c) => String(c._id) === String(conversationId));
     };
+    findConversationIdByLastMessageId = (conversations, messageId) => {
+      if (!messageId) return null;
+      const normalizedMessageId = String(messageId);
+      const match = conversations.find(
+        (conversation) => String(conversation?.lastMessage?._id || conversation?.lastMessage?.id || "") === normalizedMessageId
+      );
+      return match?._id ? String(match._id) : null;
+    };
     findConversationForChannel = (channel, loggedUserId, conversations) => {
       if (!channel || !loggedUserId) return void 0;
       if (channel.conversationId) {
@@ -1096,13 +1146,109 @@ var init_connection_actions = __esm({
     });
   }
 });
-var chatClientId, chatAccessToken, chatBaseUrl, chatSocketUrl; exports.setChatClientId = void 0; var getChatClientId; exports.setChatAccessToken = void 0; exports.setChatBaseURL = void 0; exports.getChatBaseUrl = void 0; exports.setChatSocketUrl = void 0; exports.getChatSocketUrl = void 0; var rateLimitResetAt, isRateLimited, apiClient;
+
+// src/services/api/query-params.ts
+function resolveChatApiKey(url) {
+  if (!url) return null;
+  const path = url.split("?")[0] || "";
+  if (path.includes("/user/login/client-user")) return "login";
+  if (path.includes("/user/list")) return "users";
+  if (path.includes("/conversation/list")) return "conversations";
+  if (path.includes("/conversation/get/information/")) return "conversationInfo";
+  if (path.includes("/message/get-all-from-conversation")) return "messages";
+  if (path.includes("message/pinned-messages") || path.includes("/message/pinned-messages")) {
+    return "pinnedMessages";
+  }
+  if (path.includes("message/starred-messages") || path.includes("/message/starred-messages")) {
+    return "starredMessages";
+  }
+  if (path.includes("/message/search-messages")) return "searchMessages";
+  if (path.includes("/message/searched-message/context")) return "searchMessagesContext";
+  if (path.includes("/conversation/group/create")) return "createGroup";
+  if (path.includes("/conversation/group/permission/update")) return "updateGroupPermissions";
+  if (path.includes("/conversation/group/information/update")) return "updateGroupInfo";
+  if (path.includes("/conversation/group/participants/add-remove")) return "manageMembers";
+  if (path.includes("/conversation/group/admins/add-remove")) return "manageAdmins";
+  if (path.includes("/user/block-unblock")) return "blockUnblock";
+  if (path.includes("/aws/upload/get-presigned-urls")) return "presignedUrls";
+  return null;
+}
+function isChatGetApiKey(key) {
+  return !!key && exports.CHAT_GET_API_KEYS.includes(key);
+}
+function normalizeQueryParams(params) {
+  if (!params || typeof params !== "object") return {};
+  const next = {};
+  for (const [key, value] of Object.entries(params)) {
+    if (value === void 0 || value === null) continue;
+    const trimmedKey = String(key).trim();
+    if (!trimmedKey) continue;
+    next[trimmedKey] = String(value);
+  }
+  return next;
+}
+function normalizeQueryParamsByApi(byApi) {
+  if (!byApi || typeof byApi !== "object") return {};
+  const next = {};
+  for (const [apiKey, params] of Object.entries(byApi)) {
+    if (apiKey === "all" || apiKey === "get") continue;
+    next[apiKey] = normalizeQueryParams(params);
+  }
+  return next;
+}
+exports.CHAT_GET_API_KEYS = void 0; exports.CHAT_API_KEYS = void 0;
+var init_query_params = __esm({
+  "src/services/api/query-params.ts"() {
+    exports.CHAT_GET_API_KEYS = [
+      "users",
+      "conversations",
+      "conversationInfo",
+      "messages",
+      "pinnedMessages",
+      "starredMessages",
+      "searchMessages",
+      "searchMessagesContext"
+    ];
+    exports.CHAT_API_KEYS = [
+      "all",
+      /** All GET endpoints listed in CHAT_GET_API_KEYS */
+      "get",
+      "login",
+      ...exports.CHAT_GET_API_KEYS,
+      "createGroup",
+      "updateGroupPermissions",
+      "updateGroupInfo",
+      "manageMembers",
+      "manageAdmins",
+      "blockUnblock",
+      "presignedUrls"
+    ];
+  }
+});
+function resolveParamsForRequest(url, method) {
+  const apiKey = resolveChatApiKey(url);
+  const httpMethod = (method || "get").toLowerCase();
+  const isGet = httpMethod === "get";
+  const perApi = apiKey ? chatQueryParamsByApi[apiKey] : void 0;
+  const applyShared = Object.keys(chatQueryParams).length > 0 && (chatQueryParamApis.includes("all") || chatQueryParamApis.includes("get") && isGet && isChatGetApiKey(apiKey) || apiKey != null && chatQueryParamApis.includes(apiKey));
+  if (!applyShared && !perApi) return {};
+  return {
+    ...applyShared ? chatQueryParams : {},
+    ...perApi || {}
+  };
+}
+var chatClientId, chatAccessToken, chatBaseUrl, chatSocketUrl, chatQueryParams, chatQueryParamApis, chatQueryParamsByApi; exports.setChatClientId = void 0; var getChatClientId; exports.setChatAccessToken = void 0; exports.setChatBaseURL = void 0; exports.getChatBaseUrl = void 0; exports.setChatSocketUrl = void 0; exports.getChatSocketUrl = void 0; exports.setChatQueryParams = void 0; exports.getChatQueryParams = void 0; exports.setChatQueryParamApis = void 0; exports.getChatQueryParamApis = void 0; exports.setChatQueryParamsByApi = void 0; exports.getChatQueryParamsByApi = void 0; var rateLimitResetAt, isRateLimited, apiClient;
 var init_client = __esm({
   "src/services/api/client.ts"() {
+    init_query_params();
+    init_query_params();
     chatClientId = "";
     chatAccessToken = "";
     chatBaseUrl = "";
     chatSocketUrl = "";
+    chatQueryParams = {};
+    chatQueryParamApis = ["get"];
+    chatQueryParamsByApi = {};
     exports.setChatClientId = (id) => {
       chatClientId = id.trim();
     };
@@ -1119,6 +1265,22 @@ var init_client = __esm({
       chatSocketUrl = url.trim();
     };
     exports.getChatSocketUrl = () => chatSocketUrl;
+    exports.setChatQueryParams = (params) => {
+      chatQueryParams = normalizeQueryParams(params);
+    };
+    exports.getChatQueryParams = () => ({ ...chatQueryParams });
+    exports.setChatQueryParamApis = (apis) => {
+      if (!apis?.length) {
+        chatQueryParamApis = ["get"];
+        return;
+      }
+      chatQueryParamApis = [...apis];
+    };
+    exports.getChatQueryParamApis = () => [...chatQueryParamApis];
+    exports.setChatQueryParamsByApi = (byApi) => {
+      chatQueryParamsByApi = normalizeQueryParamsByApi(byApi);
+    };
+    exports.getChatQueryParamsByApi = () => ({ ...chatQueryParamsByApi });
     rateLimitResetAt = 0;
     isRateLimited = () => Date.now() < rateLimitResetAt;
     apiClient = axios__default.default.create({
@@ -1135,6 +1297,11 @@ var init_client = __esm({
         config.headers.set("platform", "web");
         config.headers.set("is-tenant", "true");
         config.headers.set("x-client-id", chatClientId);
+        const requestUrl = String(config.url || "");
+        const scopedParams = resolveParamsForRequest(requestUrl, config.method);
+        if (Object.keys(scopedParams).length > 0) {
+          config.params = { ...scopedParams, ...config.params };
+        }
         try {
           const { useStore: useStore2 } = (init_useStore(), __toCommonJS(useStore_exports));
           const accessToken = useStore2.getState().accessToken || chatAccessToken;
@@ -2852,28 +3019,16 @@ var init_dm_actions = __esm({
       },
       receivedStatusUpdate: (payload) => {
         const data = extractMessageData(payload);
-        let { conversationId } = data;
         const { messageId, status } = data;
-        if (!messageId) return;
+        let { conversationId } = data;
+        if (!messageId || !status) return;
         set({ lastStatusUpdate: payload });
         if (!conversationId) {
-          conversationId = findConversationIdByMessageId(get().messagesByConversation, messageId);
+          conversationId = findConversationIdByMessageId(get().messagesByConversation, messageId) || findConversationIdByLastMessageId(get().conversations, messageId) || void 0;
         }
-        if (!conversationId || !status) return;
-        set((state) => {
-          const messages = state.messagesByConversation[conversationId] || [];
-          return {
-            messagesByConversation: {
-              ...state.messagesByConversation,
-              [conversationId]: messages.map(
-                (m) => String(m._id || m.id) === String(messageId) ? preferHigherStatus(m, { status }) : m
-              )
-            },
-            conversations: state.conversations.map(
-              (c) => String(c._id) === String(conversationId) && c.lastMessage && String(c.lastMessage._id || c.lastMessage.id) === String(messageId) ? { ...c, lastMessage: mergeLastMessage(c.lastMessage, { status }) } : c
-            )
-          };
-        });
+        set((state) => ({
+          ...applyMessageStatusToStore(state, String(messageId), status, conversationId)
+        }));
       },
       receivedDMMarkRead: (payload) => {
         const { conversationId } = payload;
@@ -3134,25 +3289,14 @@ var init_group_actions2 = __esm({
         let { conversationId } = data;
         const { messageId, status } = data;
         set({ lastStatusUpdate: payload });
+        if (!status) return;
         if (messageId) {
           if (!conversationId) {
-            conversationId = findConversationIdByMessageId(get().messagesByConversation, messageId);
+            conversationId = findConversationIdByMessageId(get().messagesByConversation, messageId) || findConversationIdByLastMessageId(get().conversations, messageId) || void 0;
           }
-          if (!conversationId) return;
-          set((state) => {
-            const messages = state.messagesByConversation[conversationId] || [];
-            return {
-              messagesByConversation: {
-                ...state.messagesByConversation,
-                [conversationId]: messages.map(
-                  (m) => String(m._id || m.id) === String(messageId) ? { ...m, status } : m
-                )
-              },
-              conversations: state.conversations.map(
-                (c) => String(c._id) === String(conversationId) && c.lastMessage && String(c.lastMessage._id || c.lastMessage.id) === String(messageId) ? { ...c, lastMessage: { ...c.lastMessage, status } } : c
-              )
-            };
-          });
+          set((state) => ({
+            ...applyMessageStatusToStore(state, String(messageId), status, conversationId)
+          }));
           return;
         }
         if (conversationId && status === "read") {
@@ -3167,7 +3311,7 @@ var init_group_actions2 = __esm({
               if (String(c._id) !== String(conversationId)) return c;
               let nextLastMessage = c.lastMessage;
               if (nextLastMessage && String(nextLastMessage.sender?._id || nextLastMessage.sender) === String(myId)) {
-                nextLastMessage = { ...nextLastMessage, status: "read" };
+                nextLastMessage = mergeLastMessage(nextLastMessage, { status: "read" });
               }
               return { ...c, lastMessage: nextLastMessage };
             });
@@ -4320,6 +4464,9 @@ var Chat = ({
   loggedUserDetails,
   apiUrl,
   socketUrl,
+  queryParams,
+  queryParamApis,
+  queryParamsByApi,
   channelsData,
   messagesData,
   onMessageReceived,
@@ -4339,6 +4486,9 @@ var Chat = ({
       if (!clientId || !loggedUserDetails) return;
       setSessionReady(false);
       exports.setChatClientId(clientId);
+      exports.setChatQueryParams(queryParams);
+      exports.setChatQueryParamApis(queryParamApis);
+      exports.setChatQueryParamsByApi(queryParamsByApi);
       const resolvedApiUrl = resolveApiUrl(apiUrl);
       const resolvedSocketUrl = resolveSocketUrl(socketUrl, resolvedApiUrl);
       if (resolvedApiUrl) exports.setChatBaseURL(resolvedApiUrl);
@@ -4408,9 +4558,22 @@ var Chat = ({
     initializeChat();
     return () => {
       setSessionReady(false);
+      exports.setChatQueryParams({});
+      exports.setChatQueryParamApis(["get"]);
+      exports.setChatQueryParamsByApi({});
       exports.socketService.disconnect();
     };
   }, [client?.id, loggedUserDetails?._id, loggedUserDetails?.email, accessToken, apiUrl, socketUrl, setSession, setSessionReady]);
+  const queryConfigKey = JSON.stringify({
+    queryParams: queryParams ?? {},
+    queryParamApis: queryParamApis ?? ["get"],
+    queryParamsByApi: queryParamsByApi ?? {}
+  });
+  React2__default.default.useEffect(() => {
+    exports.setChatQueryParams(queryParams);
+    exports.setChatQueryParamApis(queryParamApis);
+    exports.setChatQueryParamsByApi(queryParamsByApi);
+  }, [queryConfigKey]);
   React2__default.default.useEffect(() => {
     if (lastDM && onMessageReceived) {
       onMessageReceived(lastDM);
@@ -5282,19 +5445,6 @@ function SheetTitle({
     }
   );
 }
-function SheetDescription({
-  className,
-  ...props
-}) {
-  return /* @__PURE__ */ jsxRuntime.jsx(
-    radixUi.Dialog.Description,
-    {
-      "data-slot": "sheet-description",
-      className: cn("text-muted-foreground text-sm", className),
-      ...props
-    }
-  );
-}
 function AlertDialog({
   ...props
 }) {
@@ -5622,7 +5772,7 @@ function useCreateChatDialog({
     onUserSelect?.({
       id: user._id,
       name: user.name.charAt(0).toUpperCase() + user.name.slice(1),
-      image: user.image || `https://i.pravatar.cc/150?u=${user._id}`,
+      image: user.image || void 0,
       email: user.email,
       isOnline: onlineUsersIds.includes(user._id),
       isGroup: false,
@@ -6034,14 +6184,14 @@ var LoggedUserDetails = ({
     isActive: loggedUserDetails?.isActive ?? true,
     createdAt: loggedUserDetails?.createdAt ? new Date(loggedUserDetails.createdAt) : /* @__PURE__ */ new Date(),
     updatedAt: loggedUserDetails?.updatedAt ? new Date(loggedUserDetails.updatedAt) : /* @__PURE__ */ new Date(),
-    image: loggedUserDetails?.image || ""
+    image: loggedUserDetails?.image || void 0
   };
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "shrink-0 border-b border-(--chat-border) bg-(--chat-surface) px-3 pb-3 pt-3", children: [
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex min-w-0 items-center gap-2.5", children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "relative shrink-0", children: [
         /* @__PURE__ */ jsxRuntime.jsxs(Avatar, { className: "size-8 ring-1 ring-(--chat-surface)", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(AvatarImage, { src: user?.image, alt: user?.name }),
-          /* @__PURE__ */ jsxRuntime.jsx(AvatarFallback, { className: "bg-(--chat-theme-10) text-[10px] font-medium text-(--chat-theme)", children: user.name.charAt(0).toUpperCase() })
+          user.image ? /* @__PURE__ */ jsxRuntime.jsx(AvatarImage, { src: user.image, alt: user.name }) : null,
+          /* @__PURE__ */ jsxRuntime.jsx(AvatarFallback, { className: "bg-(--chat-theme-10) text-[10px] font-medium text-(--chat-theme)", children: (user.name || "?").charAt(0).toUpperCase() })
         ] }),
         /* @__PURE__ */ jsxRuntime.jsx("span", { className: "absolute -bottom-0.5 -right-0.5 size-2 rounded-full border-2 border-(--chat-surface) bg-(--chat-online)" })
       ] }),
@@ -6660,7 +6810,7 @@ function useChannelList({ debouncedSearch = "" }) {
       const conversationId = String(c._id);
       const { id: otherParticipantId, user: resolvedUser } = isGroup ? { id: conversationId, user: null } : resolveOtherParticipant(c, loggedUserDetails?._id, allUsers);
       const name = isGroup ? c.groupName || c.name || "Group Chat" : resolvedUser?.name || "Unknown User";
-      const image = isGroup ? resolveGroupImage(c) : resolvedUser?.image || (otherParticipantId ? `https://i.pravatar.cc/150?u=${otherParticipantId}` : void 0);
+      const image = isGroup ? resolveGroupImage(c) : resolvedUser?.image || void 0;
       const isOnline = isGroup ? false : otherParticipantId ? onlineUserIds.includes(otherParticipantId) : false;
       const unreadCount = normalizeUnreadCount(c.unreadCount, loggedUserDetails?._id);
       const isTyping = typingUsersByConv[String(c._id)]?.length > 0;
@@ -6676,15 +6826,13 @@ function useChannelList({ debouncedSearch = "" }) {
         }
       }
       const draftPreview = getConversationDraftPreview(conversationId);
-      const lastMsgSenderId = String(
-        resolvedLastMessage?.sender?._id || resolvedLastMessage?.sender || ""
-      );
-      const isOwnLastMessage = lastMsgSenderId === String(loggedUserDetails?._id);
-      const lastMessageStatus = resolveMessageStatus(
-        resolvedLastMessage,
-        c,
-        loggedUserDetails?._id
-      );
+      const storedLastMessage = c.lastMessage;
+      const storedLastMessageId = String(storedLastMessage?._id || storedLastMessage?.id || "");
+      const resolvedLastMessageId = String(resolvedLastMessage?._id || resolvedLastMessage?.id || "");
+      const lastMessageStatus = storedLastMessageId && resolvedLastMessageId && storedLastMessageId === resolvedLastMessageId ? preferHigherStatus(
+        { status: storedLastMessage?.status },
+        { status: resolvedLastMessage?.status }
+      ).status ?? storedLastMessage?.status ?? resolvedLastMessage?.status : storedLastMessage?.status;
       return {
         id: isGroup ? conversationId : otherParticipantId,
         conversationId,
@@ -6698,12 +6846,11 @@ function useChannelList({ debouncedSearch = "" }) {
         unreadCount,
         isTyping,
         draftPreview,
-        isOwnLastMessage,
         pinnedCount: c.pinnedCount,
         starredCount: c.starredCount,
         lastMessage: {
           content: lastMessageContent,
-          timestamp: resolvedLastMessage?.createdAt ? formatSidebarTime(resolvedLastMessage.createdAt) : "",
+          timestamp: resolvedLastMessage?.createdAt ? formatSidebarTime(resolvedLastMessage.createdAt) : c.lastMessage?.createdAt ? formatSidebarTime(c.lastMessage.createdAt) : "",
           status: lastMessageStatus,
           sender: "User"
         }
@@ -6732,7 +6879,7 @@ function useChannelList({ debouncedSearch = "" }) {
 init_store_helpers();
 function ChannelListItem({ channel, activeChannel, onChannelSelect }) {
   const isActive = activeChannel?.conversationId ? String(activeChannel.conversationId) === String(channel.conversationId) : activeChannel?.id === channel.id;
-  const showReadReceipt = channel.isOwnLastMessage && !channel.unreadCount && !channel.isTyping && !channel.draftPreview;
+  const showReadReceipt = !!channel.lastMessage?.status && !channel.unreadCount && !channel.isTyping && !channel.draftPreview;
   const lastStatus = channel.lastMessage?.status;
   return /* @__PURE__ */ jsxRuntime.jsxs(
     "div",
@@ -6745,7 +6892,7 @@ function ChannelListItem({ channel, activeChannel, onChannelSelect }) {
       children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "relative shrink-0", children: [
           /* @__PURE__ */ jsxRuntime.jsxs(Avatar, { className: "size-9", children: [
-            /* @__PURE__ */ jsxRuntime.jsx(AvatarImage, { src: channel.image, alt: channel.name }),
+            channel.image ? /* @__PURE__ */ jsxRuntime.jsx(AvatarImage, { src: channel.image, alt: channel.name }) : null,
             /* @__PURE__ */ jsxRuntime.jsx(AvatarFallback, { className: cn(
               "text-[10px] font-medium",
               isActive ? "bg-(--chat-theme-20) text-(--chat-theme)" : "bg-(--chat-input-bg) text-(--chat-muted)"
@@ -8387,34 +8534,33 @@ function MessageForwardedLabel({ isSender, className, overlay }) {
     }
   );
 }
+function GroupSenderName({ name, className }) {
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    "span",
+    {
+      className: cn(
+        "block max-w-full truncate text-[13px] font-semibold leading-[1.15] tracking-tight text-(--chat-incoming-text)",
+        className
+      ),
+      children: name
+    }
+  );
+}
 
 // src/chat/lib/chat-message-bubble.ts
-function getBubbleCornerClasses(isSender, isGroupedWithPrev, isGroupedWithNext) {
-  if (isSender) {
-    return cn(
-      "rounded-tl-[18px] rounded-bl-[18px]",
-      isGroupedWithPrev ? "rounded-tr-[6px]" : "rounded-tr-[18px]",
-      isGroupedWithNext ? "rounded-br-[6px]" : "rounded-br-[4px]"
-    );
-  }
-  return cn(
-    "rounded-tr-[18px] rounded-br-[18px]",
-    isGroupedWithPrev ? "rounded-tl-[6px]" : "rounded-tl-[18px]",
-    isGroupedWithNext ? "rounded-bl-[6px]" : "rounded-bl-[4px]"
-  );
+function getBubbleCornerClasses() {
+  return "rounded-tl-[18px] rounded-tr-[18px] rounded-br-[18px] rounded-bl-none";
 }
 function getChatBubbleClasses({
   isSender = false,
-  isGroupedWithPrev = false,
-  isGroupedWithNext = false,
   surface,
   className
 }) {
   const resolvedSurface = surface ?? (isSender ? "sent" : "received");
   const isNeutral = resolvedSurface === "neutral";
   return cn(
-    "relative shadow-[0_1px_2px_rgba(15,23,42,0.06)]",
-    getBubbleCornerClasses(isSender, isGroupedWithPrev, isGroupedWithNext),
+    "relative",
+    getBubbleCornerClasses(),
     resolvedSurface === "sent" && "chat-bubble-sent bg-(--chat-theme) text-white",
     resolvedSurface === "received" && "chat-bubble-received border border-(--chat-border)/60 bg-(--chat-incoming-bubble) text-(--chat-incoming-text)",
     isNeutral && "chat-bubble-received border border-(--chat-border)/60 bg-(--chat-incoming-bubble) text-(--chat-incoming-text)",
@@ -10229,8 +10375,6 @@ function MessageAttachmentsView({
               "relative w-full",
               isBubbleLayout && getChatBubbleClasses({
                 isSender,
-                isGroupedWithPrev,
-                isGroupedWithNext,
                 surface: bubbleSurface,
                 className: cn(
                   isImageOnlyBubble ? "p-0" : isForwarded ? "px-2 py-0.5" : "px-2.5 py-1"
@@ -10238,7 +10382,7 @@ function MessageAttachmentsView({
               })
             ),
             children: [
-              !isSender && showSenderLabel && senderName && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "px-0.5 pb-1 text-[13px] font-bold leading-tight text-(--chat-text)", children: senderName }),
+              !isSender && showSenderLabel && senderName && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-0.5 pb-1", children: /* @__PURE__ */ jsxRuntime.jsx(GroupSenderName, { name: senderName }) }),
               isBubbleLayout && isForwarded && !isForwardedImageOnly && /* @__PURE__ */ jsxRuntime.jsx(MessageForwardedLabel, { isSender, className: "px-0 pt-0 pb-0" }),
               isBubbleLayout && replySnippet ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-2 pb-1", children: replySnippet }) : null,
               /* @__PURE__ */ jsxRuntime.jsxs("div", { className: cn(
@@ -11650,42 +11794,60 @@ var PermissionDrawer = ({ isOpen, onOpenChange, conversationId, conversationInfo
     { key: "allowMemberRemove", label: "Only Admin Can Remove Members", desc: "Only administrators can remove other participants.", inverted: true },
     { key: "moderationEnabled", label: "Moderation Enabled", desc: "Enables advanced message moderation features." }
   ];
-  return /* @__PURE__ */ jsxRuntime.jsx(Sheet, { open: isOpen, onOpenChange, children: /* @__PURE__ */ jsxRuntime.jsxs(ChatSheetContent, { className: "flex h-full w-full flex-col p-0 sm:max-w-md", children: [
-    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-6 border-b", children: /* @__PURE__ */ jsxRuntime.jsxs(SheetHeader, { children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-3 mb-2", children: [
-        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-2 bg-primary/10 rounded-lg text-primary", children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.UserKey, { size: 20 }) }),
-        /* @__PURE__ */ jsxRuntime.jsx(SheetTitle, { className: "text-xl font-bold", children: "Group Permissions" })
+  return /* @__PURE__ */ jsxRuntime.jsx(Sheet, { open: isOpen, onOpenChange, children: /* @__PURE__ */ jsxRuntime.jsxs(ChatSheetContent, { showCloseButton: true, className: "sm:max-w-[380px]", children: [
+    /* @__PURE__ */ jsxRuntime.jsxs(SheetHeader, { className: chatSheetHeaderClass, children: [
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2", children: [
+        /* @__PURE__ */ jsxRuntime.jsx(lucideReact.UserKey, { size: 15, className: "shrink-0 text-(--chat-theme)" }),
+        /* @__PURE__ */ jsxRuntime.jsx(SheetTitle, { className: chatSheetTitleClass, children: "Group Permissions" })
       ] }),
-      /* @__PURE__ */ jsxRuntime.jsx(SheetDescription, { children: "Manage what members can and cannot do in this group." })
-    ] }) }),
-    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-1 overflow-y-auto p-6 space-y-6", children: permissionItems.map((item) => /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-start justify-between gap-4", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-0.5", children: [
-        /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm font-semibold text-(--chat-text)", children: item.label }),
-        /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs leading-relaxed text-(--chat-muted)", children: item.desc })
+      /* @__PURE__ */ jsxRuntime.jsx("p", { className: chatSheetSubtitleClass, children: "Manage what members can and cannot do in this group." })
+    ] }),
+    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: cn(chatSheetBodyClass, "flex flex-col px-2.5 py-2"), children: [
+      /* @__PURE__ */ jsxRuntime.jsxs("section", { className: "mb-2.5 flex-1", children: [
+        /* @__PURE__ */ jsxRuntime.jsx("h3", { className: "mb-1 px-0.5 text-[10px] font-semibold uppercase tracking-wide text-(--chat-muted)", children: "Permissions" }),
+        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "rounded-lg border border-(--chat-border) px-3", children: permissionItems.map((item, index) => /* @__PURE__ */ jsxRuntime.jsxs(
+          "div",
+          {
+            className: cn(
+              "flex items-start justify-between gap-3 py-2.5",
+              index < permissionItems.length - 1 && "border-b border-(--chat-border)"
+            ),
+            children: [
+              /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "min-w-0 space-y-0.5", children: [
+                /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-[12px] font-semibold leading-snug text-(--chat-text)", children: item.label }),
+                /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-[10px] leading-relaxed text-(--chat-muted)", children: item.desc })
+              ] }),
+              /* @__PURE__ */ jsxRuntime.jsx(
+                Switch,
+                {
+                  size: "sm",
+                  className: "mt-0.5 shrink-0 data-[state=checked]:bg-(--chat-theme) data-[state=unchecked]:bg-(--chat-border)",
+                  checked: "inverted" in item && item.inverted ? !permissions[item.key] : permissions[item.key],
+                  onCheckedChange: () => handleToggle(item.key)
+                }
+              )
+            ]
+          },
+          item.key
+        )) })
       ] }),
-      /* @__PURE__ */ jsxRuntime.jsx(
-        Switch,
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "sticky bottom-0 border-t border-(--chat-border) bg-(--chat-surface) px-0.5 pt-2.5 pb-1", children: /* @__PURE__ */ jsxRuntime.jsx(
+        Button,
         {
-          checked: "inverted" in item && item.inverted ? !permissions[item.key] : permissions[item.key],
-          onCheckedChange: () => handleToggle(item.key)
+          size: "sm",
+          className: "h-8 w-full border border-(--chat-theme) bg-(--chat-theme) text-[12px] text-white hover:opacity-90 disabled:opacity-50",
+          onClick: handleSave,
+          disabled: isSaving,
+          children: isSaving ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "mr-1 size-3 animate-spin" }),
+            "Saving..."
+          ] }) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Save, { className: "mr-1 size-3" }),
+            "Save Permissions"
+          ] })
         }
-      )
-    ] }, item.key)) }),
-    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "border-t border-(--chat-border) bg-(--chat-elevated) p-6", children: /* @__PURE__ */ jsxRuntime.jsx(
-      Button,
-      {
-        className: "w-full h-11 font-bold shadow-sm",
-        onClick: handleSave,
-        disabled: isSaving,
-        children: isSaving ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "mr-2 h-4 w-4 animate-spin" }),
-          "Saving Changes..."
-        ] }) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Save, { className: "mr-2 h-4 w-4" }),
-          "Save Permissions"
-        ] })
-      }
-    ) })
+      ) })
+    ] })
   ] }) });
 };
 var PermissionDrawer_default = PermissionDrawer;
@@ -12856,7 +13018,7 @@ var MessageToolbar = ({
           }
         ),
         /* @__PURE__ */ jsxRuntime.jsxs(Popover, { open: isReactionOpen, onOpenChange: setIsReactionOpen, children: [
-          /* @__PURE__ */ jsxRuntime.jsx(PopoverTrigger, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(Button, { variant: "ghost", size: "icon", className: "size-7 rounded-full text-(--chat-muted) transition-all hover:bg-(--chat-hover) hover:text-(--chat-text)", children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Smile, { className: "size-3.5" }) }) }),
+          /* @__PURE__ */ jsxRuntime.jsx(PopoverTrigger, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(Button, { variant: "ghost", size: "icon", className: "size-7 rounded-full text-(--chat-text) hover:bg-(--chat-hover)", children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Smile, { className: "size-3.5" }) }) }),
           /* @__PURE__ */ jsxRuntime.jsx(
             PopoverContent,
             {
@@ -13673,8 +13835,6 @@ function MessageItemTextBubble({
 }) {
   const bubbleClasses = (extra) => getChatBubbleClasses({
     isSender,
-    isGroupedWithPrev,
-    isGroupedWithNext,
     className: extra
   });
   return /* @__PURE__ */ jsxRuntime.jsxs(
@@ -13692,7 +13852,7 @@ function MessageItemTextBubble({
       ),
       children: [
         isForwarded && /* @__PURE__ */ jsxRuntime.jsx(MessageForwardedLabel, { isSender, className: "px-0 pt-0 pb-0" }),
-        !isSender && showSenderLabel && senderName && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-[13px] font-bold leading-tight text-(--chat-text)", children: senderName }),
+        !isSender && showSenderLabel && senderName && /* @__PURE__ */ jsxRuntime.jsx(GroupSenderName, { name: senderName, className: "mb-0.5" }),
         /* @__PURE__ */ jsxRuntime.jsx(
           MessageReplySnippet_default,
           {
@@ -13967,8 +14127,6 @@ function MessageItemView(props) {
   const showMessageSelectionRadio = selectionMode && !isDeletedForEveryone && !!mid && !hasMultiAttachments;
   const bubbleClasses = (extra) => getChatBubbleClasses({
     isSender,
-    isGroupedWithPrev,
-    isGroupedWithNext,
     className: extra
   });
   return /* @__PURE__ */ jsxRuntime.jsxs(
@@ -15975,7 +16133,7 @@ function useForwardModal({ isOpen, onClose, items, onForwardComplete }) {
         (u) => String(u._id) === otherParticipantId
       );
       const name = isGroup ? c.groupName || "Group Chat" : resolvedUser?.name || otherParticipantData?.name || "Unknown User";
-      const image = isGroup ? c.image || "" : resolvedUser?.image || otherParticipantData?.image || `https://i.pravatar.cc/150?u=${otherParticipantId}`;
+      const image = isGroup ? c.image || "" : resolvedUser?.image || otherParticipantData?.image || void 0;
       return {
         id: isGroup ? String(c._id) : otherParticipantId,
         conversationId: String(c._id),
@@ -16443,6 +16601,9 @@ var ChatMain = ({
   accessToken,
   apiUrl,
   socketUrl,
+  queryParams,
+  queryParamApis,
+  queryParamsByApi,
   themeColor = "#7494ec",
   theme,
   uiConfig,
@@ -16509,6 +16670,9 @@ var ChatMain = ({
               uiConfig: uiConfigObj,
               apiUrl,
               socketUrl,
+              queryParams,
+              queryParamApis,
+              queryParamsByApi,
               children: /* @__PURE__ */ jsxRuntime.jsx(
                 ChatAlertsProvider,
                 {
@@ -16716,7 +16880,7 @@ var DefaultChannelListItem = ({
   onSelect
 }) => {
   const { slotClassName } = useChatCustomizationOptional();
-  const showReadReceipt = channel.isOwnLastMessage && !channel.unreadCount && !channel.isTyping && !channel.draftPreview;
+  const showReadReceipt = !!channel.lastMessage?.status && !channel.unreadCount && !channel.isTyping && !channel.draftPreview;
   const lastStatus = channel.lastMessage?.status;
   return /* @__PURE__ */ jsxRuntime.jsxs(
     "div",
@@ -16939,6 +17103,7 @@ exports.mergeChatCustomization = mergeChatCustomization;
 exports.mergeChatLayoutConfig = mergeChatLayoutConfig;
 exports.packageDefaultComponents = packageDefaultComponents;
 exports.resolveApiUrl = resolveApiUrl;
+exports.resolveChatApiKey = resolveChatApiKey;
 exports.resolveSocketUrl = resolveSocketUrl;
 exports.showNotification = showNotification;
 exports.uniqueList = uniqueList;