@realtimexsco/live-chat 1.3.0 → 1.3.2

package/dist/index.mjs

@@ -370,7 +370,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();
@@ -379,7 +378,6 @@ var init_socket_service = __esm({
         this.socket = 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();
         });
@@ -557,7 +555,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 || "");
@@ -572,21 +570,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;
@@ -609,15 +618,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;
@@ -792,7 +792,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();
@@ -806,6 +806,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;
@@ -880,13 +914,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) {
@@ -1086,13 +1136,109 @@ var init_connection_actions = __esm({
     });
   }
 });
-var chatClientId, chatAccessToken, chatBaseUrl, chatSocketUrl, setChatClientId, getChatClientId, setChatAccessToken, setChatBaseURL, getChatBaseUrl, setChatSocketUrl, getChatSocketUrl, 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 && 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;
+}
+var CHAT_GET_API_KEYS, CHAT_API_KEYS;
+var init_query_params = __esm({
+  "src/services/api/query-params.ts"() {
+    CHAT_GET_API_KEYS = [
+      "users",
+      "conversations",
+      "conversationInfo",
+      "messages",
+      "pinnedMessages",
+      "starredMessages",
+      "searchMessages",
+      "searchMessagesContext"
+    ];
+    CHAT_API_KEYS = [
+      "all",
+      /** All GET endpoints listed in CHAT_GET_API_KEYS */
+      "get",
+      "login",
+      ...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, setChatClientId, getChatClientId, setChatAccessToken, setChatBaseURL, getChatBaseUrl, setChatSocketUrl, getChatSocketUrl, setChatQueryParams, getChatQueryParams, setChatQueryParamApis, getChatQueryParamApis, setChatQueryParamsByApi, getChatQueryParamsByApi, 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 = {};
     setChatClientId = (id) => {
       chatClientId = id.trim();
     };
@@ -1109,6 +1255,22 @@ var init_client = __esm({
       chatSocketUrl = url.trim();
     };
     getChatSocketUrl = () => chatSocketUrl;
+    setChatQueryParams = (params) => {
+      chatQueryParams = normalizeQueryParams(params);
+    };
+    getChatQueryParams = () => ({ ...chatQueryParams });
+    setChatQueryParamApis = (apis) => {
+      if (!apis?.length) {
+        chatQueryParamApis = ["get"];
+        return;
+      }
+      chatQueryParamApis = [...apis];
+    };
+    getChatQueryParamApis = () => [...chatQueryParamApis];
+    setChatQueryParamsByApi = (byApi) => {
+      chatQueryParamsByApi = normalizeQueryParamsByApi(byApi);
+    };
+    getChatQueryParamsByApi = () => ({ ...chatQueryParamsByApi });
     rateLimitResetAt = 0;
     isRateLimited = () => Date.now() < rateLimitResetAt;
     apiClient = axios.create({
@@ -1125,6 +1287,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;
@@ -2842,28 +3009,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;
@@ -3124,25 +3279,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") {
@@ -3157,7 +3301,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 };
             });
@@ -4310,6 +4454,9 @@ var Chat = ({
   loggedUserDetails,
   apiUrl,
   socketUrl,
+  queryParams,
+  queryParamApis,
+  queryParamsByApi,
   channelsData,
   messagesData,
   onMessageReceived,
@@ -4329,6 +4476,9 @@ var Chat = ({
       if (!clientId || !loggedUserDetails) return;
       setSessionReady(false);
       setChatClientId(clientId);
+      setChatQueryParams(queryParams);
+      setChatQueryParamApis(queryParamApis);
+      setChatQueryParamsByApi(queryParamsByApi);
       const resolvedApiUrl = resolveApiUrl(apiUrl);
       const resolvedSocketUrl = resolveSocketUrl(socketUrl, resolvedApiUrl);
       if (resolvedApiUrl) setChatBaseURL(resolvedApiUrl);
@@ -4398,9 +4548,22 @@ var Chat = ({
     initializeChat();
     return () => {
       setSessionReady(false);
+      setChatQueryParams({});
+      setChatQueryParamApis(["get"]);
+      setChatQueryParamsByApi({});
       socket_service_default.disconnect();
     };
   }, [client?.id, loggedUserDetails?._id, loggedUserDetails?.email, accessToken, apiUrl, socketUrl, setSession, setSessionReady]);
+  const queryConfigKey = JSON.stringify({
+    queryParams: queryParams ?? {},
+    queryParamApis: queryParamApis ?? ["get"],
+    queryParamsByApi: queryParamsByApi ?? {}
+  });
+  React2.useEffect(() => {
+    setChatQueryParams(queryParams);
+    setChatQueryParamApis(queryParamApis);
+    setChatQueryParamsByApi(queryParamsByApi);
+  }, [queryConfigKey]);
   React2.useEffect(() => {
     if (lastDM && onMessageReceived) {
       onMessageReceived(lastDM);
@@ -5272,19 +5435,6 @@ function SheetTitle({
     }
   );
 }
-function SheetDescription({
-  className,
-  ...props
-}) {
-  return /* @__PURE__ */ jsx(
-    Dialog$1.Description,
-    {
-      "data-slot": "sheet-description",
-      className: cn("text-muted-foreground text-sm", className),
-      ...props
-    }
-  );
-}
 function AlertDialog({
   ...props
 }) {
@@ -5612,7 +5762,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,
@@ -6024,14 +6174,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__ */ jsxs("div", { className: "shrink-0 border-b border-(--chat-border) bg-(--chat-surface) px-3 pb-3 pt-3", children: [
     /* @__PURE__ */ jsxs("div", { className: "flex min-w-0 items-center gap-2.5", children: [
       /* @__PURE__ */ jsxs("div", { className: "relative shrink-0", children: [
         /* @__PURE__ */ jsxs(Avatar, { className: "size-8 ring-1 ring-(--chat-surface)", children: [
-          /* @__PURE__ */ jsx(AvatarImage, { src: user?.image, alt: user?.name }),
-          /* @__PURE__ */ jsx(AvatarFallback, { className: "bg-(--chat-theme-10) text-[10px] font-medium text-(--chat-theme)", children: user.name.charAt(0).toUpperCase() })
+          user.image ? /* @__PURE__ */ jsx(AvatarImage, { src: user.image, alt: user.name }) : null,
+          /* @__PURE__ */ jsx(AvatarFallback, { className: "bg-(--chat-theme-10) text-[10px] font-medium text-(--chat-theme)", children: (user.name || "?").charAt(0).toUpperCase() })
         ] }),
         /* @__PURE__ */ jsx("span", { className: "absolute -bottom-0.5 -right-0.5 size-2 rounded-full border-2 border-(--chat-surface) bg-(--chat-online)" })
       ] }),
@@ -6650,7 +6800,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;
@@ -6666,15 +6816,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,
@@ -6688,12 +6836,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"
         }
@@ -6722,7 +6869,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__ */ jsxs(
     "div",
@@ -6735,7 +6882,7 @@ function ChannelListItem({ channel, activeChannel, onChannelSelect }) {
       children: [
         /* @__PURE__ */ jsxs("div", { className: "relative shrink-0", children: [
           /* @__PURE__ */ jsxs(Avatar, { className: "size-9", children: [
-            /* @__PURE__ */ jsx(AvatarImage, { src: channel.image, alt: channel.name }),
+            channel.image ? /* @__PURE__ */ jsx(AvatarImage, { src: channel.image, alt: channel.name }) : null,
             /* @__PURE__ */ jsx(AvatarFallback, { className: cn(
               "text-[10px] font-medium",
               isActive ? "bg-(--chat-theme-20) text-(--chat-theme)" : "bg-(--chat-input-bg) text-(--chat-muted)"
@@ -8377,34 +8524,33 @@ function MessageForwardedLabel({ isSender, className, overlay }) {
     }
   );
 }
+function GroupSenderName({ name, className }) {
+  return /* @__PURE__ */ 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)",
@@ -10219,8 +10365,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"
@@ -10228,7 +10372,7 @@ function MessageAttachmentsView({
               })
             ),
             children: [
-              !isSender && showSenderLabel && senderName && /* @__PURE__ */ jsx("span", { className: "px-0.5 pb-1 text-[13px] font-bold leading-tight text-(--chat-text)", children: senderName }),
+              !isSender && showSenderLabel && senderName && /* @__PURE__ */ jsx("div", { className: "px-0.5 pb-1", children: /* @__PURE__ */ jsx(GroupSenderName, { name: senderName }) }),
               isBubbleLayout && isForwarded && !isForwardedImageOnly && /* @__PURE__ */ jsx(MessageForwardedLabel, { isSender, className: "px-0 pt-0 pb-0" }),
               isBubbleLayout && replySnippet ? /* @__PURE__ */ jsx("div", { className: "px-2 pb-1", children: replySnippet }) : null,
               /* @__PURE__ */ jsxs("div", { className: cn(
@@ -11640,42 +11784,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__ */ jsx(Sheet, { open: isOpen, onOpenChange, children: /* @__PURE__ */ jsxs(ChatSheetContent, { className: "flex h-full w-full flex-col p-0 sm:max-w-md", children: [
-    /* @__PURE__ */ jsx("div", { className: "p-6 border-b", children: /* @__PURE__ */ jsxs(SheetHeader, { children: [
-      /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3 mb-2", children: [
-        /* @__PURE__ */ jsx("div", { className: "p-2 bg-primary/10 rounded-lg text-primary", children: /* @__PURE__ */ jsx(UserKey, { size: 20 }) }),
-        /* @__PURE__ */ jsx(SheetTitle, { className: "text-xl font-bold", children: "Group Permissions" })
+  return /* @__PURE__ */ jsx(Sheet, { open: isOpen, onOpenChange, children: /* @__PURE__ */ jsxs(ChatSheetContent, { showCloseButton: true, className: "sm:max-w-[380px]", children: [
+    /* @__PURE__ */ jsxs(SheetHeader, { className: chatSheetHeaderClass, children: [
+      /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
+        /* @__PURE__ */ jsx(UserKey, { size: 15, className: "shrink-0 text-(--chat-theme)" }),
+        /* @__PURE__ */ jsx(SheetTitle, { className: chatSheetTitleClass, children: "Group Permissions" })
       ] }),
-      /* @__PURE__ */ jsx(SheetDescription, { children: "Manage what members can and cannot do in this group." })
-    ] }) }),
-    /* @__PURE__ */ jsx("div", { className: "flex-1 overflow-y-auto p-6 space-y-6", children: permissionItems.map((item) => /* @__PURE__ */ jsxs("div", { className: "flex items-start justify-between gap-4", children: [
-      /* @__PURE__ */ jsxs("div", { className: "space-y-0.5", children: [
-        /* @__PURE__ */ jsx("p", { className: "text-sm font-semibold text-(--chat-text)", children: item.label }),
-        /* @__PURE__ */ jsx("p", { className: "text-xs leading-relaxed text-(--chat-muted)", children: item.desc })
+      /* @__PURE__ */ jsx("p", { className: chatSheetSubtitleClass, children: "Manage what members can and cannot do in this group." })
+    ] }),
+    /* @__PURE__ */ jsxs("div", { className: cn(chatSheetBodyClass, "flex flex-col px-2.5 py-2"), children: [
+      /* @__PURE__ */ jsxs("section", { className: "mb-2.5 flex-1", children: [
+        /* @__PURE__ */ jsx("h3", { className: "mb-1 px-0.5 text-[10px] font-semibold uppercase tracking-wide text-(--chat-muted)", children: "Permissions" }),
+        /* @__PURE__ */ jsx("div", { className: "rounded-lg border border-(--chat-border) px-3", children: permissionItems.map((item, index) => /* @__PURE__ */ 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__ */ jsxs("div", { className: "min-w-0 space-y-0.5", children: [
+                /* @__PURE__ */ jsx("p", { className: "text-[12px] font-semibold leading-snug text-(--chat-text)", children: item.label }),
+                /* @__PURE__ */ jsx("p", { className: "text-[10px] leading-relaxed text-(--chat-muted)", children: item.desc })
+              ] }),
+              /* @__PURE__ */ 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__ */ jsx(
-        Switch,
+      /* @__PURE__ */ jsx("div", { className: "sticky bottom-0 border-t border-(--chat-border) bg-(--chat-surface) px-0.5 pt-2.5 pb-1", children: /* @__PURE__ */ 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__ */ jsxs(Fragment, { children: [
+            /* @__PURE__ */ jsx(Loader2, { className: "mr-1 size-3 animate-spin" }),
+            "Saving..."
+          ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+            /* @__PURE__ */ jsx(Save, { className: "mr-1 size-3" }),
+            "Save Permissions"
+          ] })
         }
-      )
-    ] }, item.key)) }),
-    /* @__PURE__ */ jsx("div", { className: "border-t border-(--chat-border) bg-(--chat-elevated) p-6", children: /* @__PURE__ */ jsx(
-      Button,
-      {
-        className: "w-full h-11 font-bold shadow-sm",
-        onClick: handleSave,
-        disabled: isSaving,
-        children: isSaving ? /* @__PURE__ */ jsxs(Fragment, { children: [
-          /* @__PURE__ */ jsx(Loader2, { className: "mr-2 h-4 w-4 animate-spin" }),
-          "Saving Changes..."
-        ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
-          /* @__PURE__ */ jsx(Save, { className: "mr-2 h-4 w-4" }),
-          "Save Permissions"
-        ] })
-      }
-    ) })
+      ) })
+    ] })
   ] }) });
 };
 var PermissionDrawer_default = PermissionDrawer;
@@ -12846,7 +13008,7 @@ var MessageToolbar = ({
           }
         ),
         /* @__PURE__ */ jsxs(Popover, { open: isReactionOpen, onOpenChange: setIsReactionOpen, children: [
-          /* @__PURE__ */ jsx(PopoverTrigger, { asChild: true, children: /* @__PURE__ */ 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__ */ jsx(Smile, { className: "size-3.5" }) }) }),
+          /* @__PURE__ */ jsx(PopoverTrigger, { asChild: true, children: /* @__PURE__ */ jsx(Button, { variant: "ghost", size: "icon", className: "size-7 rounded-full text-(--chat-text) hover:bg-(--chat-hover)", children: /* @__PURE__ */ jsx(Smile, { className: "size-3.5" }) }) }),
           /* @__PURE__ */ jsx(
             PopoverContent,
             {
@@ -13663,8 +13825,6 @@ function MessageItemTextBubble({
 }) {
   const bubbleClasses = (extra) => getChatBubbleClasses({
     isSender,
-    isGroupedWithPrev,
-    isGroupedWithNext,
     className: extra
   });
   return /* @__PURE__ */ jsxs(
@@ -13682,7 +13842,7 @@ function MessageItemTextBubble({
       ),
       children: [
         isForwarded && /* @__PURE__ */ jsx(MessageForwardedLabel, { isSender, className: "px-0 pt-0 pb-0" }),
-        !isSender && showSenderLabel && senderName && /* @__PURE__ */ jsx("span", { className: "text-[13px] font-bold leading-tight text-(--chat-text)", children: senderName }),
+        !isSender && showSenderLabel && senderName && /* @__PURE__ */ jsx(GroupSenderName, { name: senderName, className: "mb-0.5" }),
         /* @__PURE__ */ jsx(
           MessageReplySnippet_default,
           {
@@ -13957,8 +14117,6 @@ function MessageItemView(props) {
   const showMessageSelectionRadio = selectionMode && !isDeletedForEveryone && !!mid && !hasMultiAttachments;
   const bubbleClasses = (extra) => getChatBubbleClasses({
     isSender,
-    isGroupedWithPrev,
-    isGroupedWithNext,
     className: extra
   });
   return /* @__PURE__ */ jsxs(
@@ -15965,7 +16123,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),
@@ -16433,6 +16591,9 @@ var ChatMain = ({
   accessToken,
   apiUrl,
   socketUrl,
+  queryParams,
+  queryParamApis,
+  queryParamsByApi,
   themeColor = "#7494ec",
   theme,
   uiConfig,
@@ -16499,6 +16660,9 @@ var ChatMain = ({
               uiConfig: uiConfigObj,
               apiUrl,
               socketUrl,
+              queryParams,
+              queryParamApis,
+              queryParamsByApi,
               children: /* @__PURE__ */ jsx(
                 ChatAlertsProvider,
                 {
@@ -16706,7 +16870,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__ */ jsxs(
     "div",
@@ -16892,6 +17056,6 @@ var packageDefaultComponents = {
 // src/index.ts
 var index_default = ChatMain_default;
 
-export { Channel, ChannelHeaderView_default as ChannelHeader, ChannelListView_default as ChannelList, ChannelListItem_default as ChannelListItem, Chat, ChatAlertsProvider, ChatAvatar_default as ChatAvatar, ChatCustomizationProvider, ChatLayout_default as ChatLayout, ChatLocaleProvider, ChatMain_default as ChatMain, ChatThemeProvider, ChatViewport, DefaultChannelListItem, DefaultChatAvatar, DefaultChatLayout_default as DefaultChatLayout, ForwardModalView as ForwardModal, HeaderCallActions_default as HeaderCallActions, LoggedUserDetails_default as LoggedUserDetails, ChannelMessageBoxView_default as MessageInput, MessageItemView as MessageItem, ActiveChannelMessagesView_default as MessageList, capitalizeFirst, index_default as default, defaultChatClassNames, defaultChatComponents, defaultChatFeatures, defaultChatLayoutConfig, downloadFile, getChatBaseUrl, getChatSocketUrl, getFirstAndLastNameOneCharacter, getResponsiveWidth, getSocketConfig, isEmpty, mergeChatCustomization, mergeChatLayoutConfig, packageDefaultComponents, resolveApiUrl, resolveSocketUrl, setChatAccessToken, setChatBaseURL, setChatClientId, setChatSocketUrl, showNotification, socket_service_default as socketService, uniqueList, useChatAlerts, useChatContext, useChatController, useChatCustomization, useChatCustomizationOptional, useChatFeatures, useChatFeaturesOptional, useChatLocale, useStore as useChatStore, useChatTheme };
+export { CHAT_API_KEYS, CHAT_GET_API_KEYS, Channel, ChannelHeaderView_default as ChannelHeader, ChannelListView_default as ChannelList, ChannelListItem_default as ChannelListItem, Chat, ChatAlertsProvider, ChatAvatar_default as ChatAvatar, ChatCustomizationProvider, ChatLayout_default as ChatLayout, ChatLocaleProvider, ChatMain_default as ChatMain, ChatThemeProvider, ChatViewport, DefaultChannelListItem, DefaultChatAvatar, DefaultChatLayout_default as DefaultChatLayout, ForwardModalView as ForwardModal, HeaderCallActions_default as HeaderCallActions, LoggedUserDetails_default as LoggedUserDetails, ChannelMessageBoxView_default as MessageInput, MessageItemView as MessageItem, ActiveChannelMessagesView_default as MessageList, capitalizeFirst, index_default as default, defaultChatClassNames, defaultChatComponents, defaultChatFeatures, defaultChatLayoutConfig, downloadFile, getChatBaseUrl, getChatQueryParamApis, getChatQueryParams, getChatQueryParamsByApi, getChatSocketUrl, getFirstAndLastNameOneCharacter, getResponsiveWidth, getSocketConfig, isEmpty, mergeChatCustomization, mergeChatLayoutConfig, packageDefaultComponents, resolveApiUrl, resolveChatApiKey, resolveSocketUrl, setChatAccessToken, setChatBaseURL, setChatClientId, setChatQueryParamApis, setChatQueryParams, setChatQueryParamsByApi, setChatSocketUrl, showNotification, socket_service_default as socketService, uniqueList, useChatAlerts, useChatContext, useChatController, useChatCustomization, useChatCustomizationOptional, useChatFeatures, useChatFeaturesOptional, useChatLocale, useStore as useChatStore, useChatTheme };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map