@droppii-org/chat-mobile 0.2.98 → 0.2.100

package/src/screens/chat-detail/components/ChatDetailLoading.tsx

@@ -0,0 +1,31 @@
+import { KColors, KContainer, KNavigation } from '@droppii/libs';
+import { ActivityIndicator } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+
+export const ChatDetailLoading = () => {
+  const navigation = useNavigation();
+  return (
+    <KContainer.Page flex edges={['bottom']}>
+      <KNavigation.Header
+        theme="light"
+        alignment="left"
+        size="small"
+        disableCenterSpace
+        shadow
+        leftButton={{
+          id: 'back',
+          icon: {
+            size: 24,
+            vectorName: 'arrow-left-o',
+            vectorProvider: 'DroppiiNew',
+            tintColor: KColors.primary.normal,
+          },
+          onPress: navigation.goBack,
+        }}
+      />
+      <KContainer.View flex center>
+        <ActivityIndicator size="small" color={KColors.primary.normal} />
+      </KContainer.View>
+    </KContainer.Page>
+  );
+};

package/src/store/message.ts

@@ -193,7 +193,7 @@ export const useMessageStore = create<MessageStore>()((set, get) => ({
           initLoading: false,
         });
 
-        const targetMessage = currentMessages.find(
+        const targetMessage = newMessages.find(
           (msg) => msg.clientMsgID === startClientMsgId
         );
 

package/src/utils/conversation.ts

@@ -65,3 +65,34 @@ export const isGroupConversation = (
 ) => {
   return conversation?.peerType === PeerType.Group;
 };
+
+const GROUP_CONVERSATION_ID_PREFIX = 'sg_';
+
+/**
+ * Group conversationIds are formatted as "sg_<groupID>" — derive the groupID
+ * straight from the id when a full ConversationItem isn't available yet (e.g.
+ * a non-member previewing a public group via deeplink has no synced
+ * conversation object to read groupID off of).
+ */
+export const getGroupIdFromConversationId = (conversationId?: string) =>
+  conversationId?.startsWith(GROUP_CONVERSATION_ID_PREFIX)
+    ? conversationId.slice(GROUP_CONVERSATION_ID_PREFIX.length)
+    : '';
+
+const SINGLE_CONVERSATION_ID_PREFIX = 'si_';
+
+export const isSingleConversationId = (conversationId: string): boolean =>
+  conversationId.startsWith(SINGLE_CONVERSATION_ID_PREFIX);
+
+/**
+ * A 1v1 conversationId is "si_<userA>_<userB>" (see `getConversationID`), with
+ * no fixed order between the two — same as the forward/reverse match
+ * `isSameConversation` does above. Used to tell whether the logged-in user is
+ * actually a participant when no local conversation record has synced (e.g. a
+ * deeplink into a 1v1 the current account has no access to). Only meaningful
+ * once `isSingleConversationId` is true.
+ */
+export const isConversationParticipant = (
+  conversationId: string,
+  userId?: string
+): boolean => !!userId && conversationId.split('_').includes(userId);

package/src/utils/message.ts

@@ -4,7 +4,10 @@ import {
   type ConversationItem,
   type MessageItem,
 } from '@droppii/openim-rn-client-sdk';
-import { getConversationID } from './conversation';
+import {
+  getConversationID,
+  getGroupIdFromConversationId,
+} from './conversation';
 
 /**
  * Canonical timestamp for a message. `sendTime` is 0 until the SDK stamps an
@@ -153,9 +156,9 @@ export const getReceiverId = (conversation?: ConversationItem) => {
   if (conversation == null) return { groupID: '', recvID: '' };
 
   if (conversation.peerType === PeerType.Group) {
-    // Group conversation: groupID is embedded after the "sg_" prefix
     const groupID =
-      conversation.groupID || conversation.conversationID.slice(3);
+      conversation.groupID ||
+      getGroupIdFromConversationId(conversation.conversationID);
     return { groupID: groupID ?? '', recvID: '' };
   }