Merge pull request #9 from commt/feature/project-fields

Update Request Fields & Config

Author: mkilincaslan

.gitignore

@@ -1 +1,2 @@
-node_modules/
+node_modules/
+dist/

Readme.md

@@ -51,8 +51,8 @@ import { useInitiate } from "@commt/rn-sdk/hooks";
 
 const ClientConfig = {
   apiKey: "123456789?",
-  subscriptionKey: "0987654321?",
-  secret: "123456789018A_7JzPo?23F+4y#erPL" // This is just and example you don't have to add secret here for initialization
+  projectId: "0987654321?",
+  secret: "123456789018A_7JzPo?23F+4y#erPL"
 };
 
 function App(): JSX.Element {

package.json

@@ -1,21 +1,22 @@
 {
   "name": "@commt/rn-sdk",
-  "version": "0.0.2",
+  "version": "0.1.0",
   "description": "Ultimate chat plugin for react native applications",
-  "main": "src/index.tsx",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "rm -rf dist/* && npx tsc"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/commt/rn-sdk.git"
+    "url": "git+https://github.com/commt/commt-react-native.git"
   },
+  "files": ["dist"],
   "dependencies": {
     "dayjs": "^1.11.9",
     "axios": "^1.4.0",
     "node-forge": "^1.3.1",
-    "react": "18.2.0",
-    "react-native": "0.71.8",
     "styled-components": "^6.0.0-rc.3",
     "rn-emoji-keyboard": "^1.5.0",
     "socket.io-client": "^4.6.2",
@@ -28,6 +29,10 @@
     "@types/react": "^18.0.24",
     "@tsconfig/react-native": "^2.0.2"
   },
+  "peerDependencies": {
+    "react": "18.2.0",
+    "react-native": "0.71.8"
+  },
   "keywords": [
     "commt",
     "commt-chat-sdk",
@@ -50,7 +55,7 @@
     }
   ],
   "bugs": {
-    "url": "https://github.com/commt/rn-sdk.git/issues"
+    "url": "https://github.com/commt/commt-react-native.git/issues"
   },
   "homepage": "https://commt.co/doc",
   "license": "MIT",

src/components/Chat/index.tsx

@@ -47,7 +47,7 @@ const Chat = ({
       rooms,
       messages,
       app: {
-        configs: { indicators, tenantId, apiKey, subscriptionKey, projectName },
+        configs: { indicators, tenantId, apiKey, projectId },
       },
     },
     dispatch,
@@ -94,8 +94,7 @@ const Chat = ({
         //handle Log params
         {
           apiKey,
-          subscriptionKey,
-          projectName,
+          projectId,
           chatAuthId: selfUser!.chatAuthId,
         },
       );
@@ -114,8 +113,7 @@ const Chat = ({
         //handle Log params
         {
           apiKey,
-          subscriptionKey,
-          projectName,
+          projectId,
           chatAuthId: selfUser!.chatAuthId,
         },
       );
@@ -208,8 +206,7 @@ const Chat = ({
           //handle Log params
           {
             apiKey,
-            subscriptionKey,
-            projectName,
+            projectId,
             chatAuthId: selfUser!.chatAuthId,
           },
         );
@@ -245,9 +242,11 @@ const Chat = ({
         renderCustomView={(props: BubbleProps<ICustomMessage>) => (
           <CustomUsernameView {...props} activeRoom={activeRoom} />
         )}
-        renderAvatar={(props) => (
-          <CustomAvatar {...props} activeRoom={activeRoom} />
-        )}
+        renderAvatar={(props) =>
+          activeRoom?.groupAvatar && (
+            <CustomAvatar {...props} activeRoom={activeRoom} />
+          )
+        }
         renderAvatarOnTop={true}
         renderChatFooter={renderChatFooter}
         renderSystemMessage={CustomSystemMessage}

src/components/CustomAvatar/index.tsx

@@ -11,9 +11,7 @@ interface CustomAvatarProps extends AvatarProps<IMessage> {
 const CustomAvatar = (props: CustomAvatarProps) => {
   const theme = useTheme();
   // render user avatar just for community chat
-  if (props.activeRoom?.groupAvatar) {
-    return <Avatar {...props} imageStyle={styles(theme).avatarImageStle} />;
-  }
+  return <Avatar {...props} imageStyle={styles(theme).avatarImageStle} />;
 };
 
 export default CustomAvatar;

src/components/CustomBubble/index.tsx

@@ -46,6 +46,8 @@ const ReadInfo = ({ currentMessage, activeRoom }: ReadInfoProps) => {
       );
     }
   }
+
+  return <></>;
 };
 
 const CustomBubble = (props: CustomBubbleProps) => {

src/components/TextInput/index.tsx

@@ -3,7 +3,7 @@ import { StyleProp, TextInputProps, TextStyle } from "react-native";
 import { useTheme } from "styled-components/native";
 import { StyledTextInput } from "./styles";
 
-interface InputProps extends TextInputProps {
+export interface InputProps extends TextInputProps {
   style?: StyleProp<TextStyle>;
 }
 

src/context/reducers/appReducer.ts

@@ -14,9 +14,8 @@ export type ConfigsProps = {
   indicators: IndicatorProps[];
   tenantId: string;
   apiKey: string;
-  subscriptionKey: string;
   secretKey: string;
-  projectName: string;
+  projectId: string;
 };
 
 export type AppState = {
@@ -34,9 +33,8 @@ export const AppValues: AppState = {
     indicators: [],
     tenantId: "",
     apiKey: "",
-    subscriptionKey: "",
     secretKey: "",
-    projectName: "",
+    projectId: "",
   },
 };
 

src/hooks/useSendMessage.ts

@@ -18,7 +18,7 @@ const useSendMessage = () => {
       users: { selfUser, users },
       rooms,
       app: {
-        configs: { secretKey, apiKey, subscriptionKey, projectName, e2e },
+        configs: { secretKey, apiKey, projectId, e2e },
       },
     },
     dispatch,
@@ -89,8 +89,7 @@ const useSendMessage = () => {
       //handle Log params
       {
         apiKey,
-        subscriptionKey,
-        projectName,
+        projectId,
         chatAuthId: selfUser!.chatAuthId,
         chatRoomAuthId,
       },

src/hooks/useSetRooms.ts

@@ -10,7 +10,7 @@ const useSetRooms = () => {
     state: {
       users: { selfUser },
       app: {
-        configs: { apiKey, subscriptionKey, indicators, projectName },
+        configs: { apiKey, indicators, projectId },
       },
     },
     dispatch,
@@ -21,8 +21,7 @@ const useSetRooms = () => {
       const activeRooms = await getRoomsReadToken({
         roomIds: rooms.map((room) => room.chatRoomAuthId).join(","),
         apiKey,
-        subscriptionKey,
-        projectName,
+        projectId,
         chatAuthId: selfUser!.chatAuthId,
       });