Merge pull request #3 from commt/feature/system-user

Feature  System User

Author: sedanurakcil

components/ChatHeader/index.tsx

@@ -32,8 +32,12 @@ const ChatHeader = ({
   const oppositeUserId = room
     ? room.groupName
       ? null
-      : room.participants.find((id) => id !== selfUser?._id)
-    : participants?.find((id) => id !== selfUser?._id);
+      : room.participants.find(
+          (id) => id !== selfUser?._id && !id.startsWith("system"),
+        )
+    : participants?.find(
+        (id) => id !== selfUser?._id && !id.startsWith("system"),
+      );
   const oppositeUser = users.find(({ _id }) => _id === oppositeUserId);
 
   const renderMembersOrOnline = () => {

components/MessageList/index.tsx

@@ -79,7 +79,7 @@ const MessageList = ({ onPress }: MessageListProps) => {
       return room.groupName.toLowerCase();
     } else {
       const oppositeUserId = room.participants.find(
-        (id) => id !== selfUser?._id,
+        (id) => id !== selfUser?._id && !id.startsWith("system"),
       );
       return (
         users

components/RoomCard/index.tsx

@@ -120,7 +120,9 @@ const RoomCard = ({ room, onClickAction }: RoomCardProps) => {
 
   const oppositeUserId = room.groupName
     ? null
-    : room.participants.find((id) => id !== selfUser?._id);
+    : room.participants.find(
+        (id) => id !== selfUser?._id && !id.startsWith("system"),
+      );
   const oppositeUser = oppositeUserId
     ? users.find((user: UserProps) => user._id === oppositeUserId)
     : null;

context/reducers/usersReducer.ts

@@ -4,11 +4,11 @@ export type UserProps = {
   _id: string;
   chatAuthId: string;
   username: string;
-  avatar: string;
+  avatar?: string;
   online: boolean;
   socketId?: string | undefined;
-  privateKey: string;
-  publicKey: string;
+  privateKey?: string;
+  publicKey?: string;
 };
 
 export type UserState = {

service/index.ts

@@ -4,16 +4,12 @@ import { ConfigsProps } from "../context/reducers/appReducer";
 import { RoomProps } from "../context/reducers/roomsReducer";
 import PackageJson from "../package.json";
 
-interface AuthKeysProps {
+export interface InitiateProps {
   apiKey: string;
   subscriptionKey: string;
 }
 
-export interface InitiateProps extends AuthKeysProps {
-  tenantId: string;
-}
-
-interface OnlineInfoProps extends AuthKeysProps {
+interface OnlineInfoProps extends InitiateProps {
   userIds: string;
 }
 
@@ -22,7 +18,7 @@ type OnlineInfoReturnProps = Pick<
   "chatAuthId" | "socketId" | "online"
 >;
 
-interface ReadTokenProps extends AuthKeysProps {
+interface ReadTokenProps extends InitiateProps {
   roomIds: string;
 }
 
@@ -103,7 +99,6 @@ export const getRoomsReadToken = async (props: ReadTokenProps) => {
         },
       },
     );
-
     return response.data;
   } catch {
     // TODO: Log error