Merge pull request #16 from AmityCo/develop

Develop
AmityCo · Sep 27, 2024 · 80b4a36 · 80b4a36
2 parents 24628aa + 11db3e6
commit 80b4a36
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 16 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,18 @@
+**Jira ticket :**
+
+-
+
+**Description :**
+
+-
+
+**Check lists :**
+
+- [ ] Test code
+- [ ] Build local pass (optional)
+- [ ] Code is the same level as origin/develop branch
+
+**Screen shot :**
+
+
+**Note (optional) :**
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@amityco/react-native-cli-chat-ui-kit",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Chat UIKit",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -174,7 +174,7 @@
     ]
   },
   "dependencies": {
-    "@amityco/ts-sdk-react-native": "^6.29.1",
+    "@amityco/ts-sdk-react-native": "^6.30.2",
     "@reduxjs/toolkit": "^2.2.5",
     "i18next": "22.4.10",
     "moment": "2.29.4",

diff --git a/src/screens/ChatRoom/ChatRoom.tsx b/src/screens/ChatRoom/ChatRoom.tsx
@@ -395,7 +395,13 @@ const ChatRoom: ChatRoomScreenComponentType = ({ route }) => {
                 </View>
               </View>
             ) : (
-              <Menu>
+              <Menu
+                style={[
+                  isUserChat
+                    ? styles.currentUserMessage
+                    : styles.friendUserMessage,
+                ]}
+              >
                 <MenuTrigger
                   onAlternativeAction={() =>
                     openFullImage(message.image as string, message.messageType)
@@ -445,12 +451,10 @@ const ChatRoom: ChatRoomScreenComponentType = ({ route }) => {
                   customStyles={{
                     optionsContainer: {
                       ...styles.optionsContainer,
-                      marginLeft: isUserChat
-                        ? 240 +
-                          (message.text && message.text.length < 5
-                            ? message.text.length * 10
-                            : 10)
-                        : 0,
+                      marginTop:
+                        isUserChat && message.messageType === 'text'
+                          ? -75
+                          : -50,
                     },
                   }}
                 >

diff --git a/src/screens/ChatRoom/styles.ts b/src/screens/ChatRoom/styles.ts
@@ -29,11 +29,15 @@ export const useStyles = () => {
       marginVertical: 5,
       borderRadius: 10,
     },
-    userBubble: {
+    currentUserMessage: {
       alignSelf: 'flex-end',
+    },
+    friendUserMessage: {
+      alignSelf: 'flex-start',
+    },
+    userBubble: {
       backgroundColor: theme.colors.chatBubbles?.userBubble,
       maxWidth: '100%',
-      marginLeft: 60,
     },
     userMessageDelete: {
       alignSelf: 'flex-end',

diff --git a/yarn.lock b/yarn.lock
@@ -43,7 +43,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@amityco/react-native-cli-chat-ui-kit@workspace:."
   dependencies:
-    "@amityco/ts-sdk-react-native": ^6.29.1
+    "@amityco/ts-sdk-react-native": 6.30.2
     "@commitlint/config-conventional": ^17.0.2
     "@evilmartians/lefthook": ^1.5.0
     "@react-native-async-storage/async-storage": ^1.22.3
@@ -98,9 +98,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@amityco/ts-sdk-react-native@npm:^6.29.1":
-  version: 6.29.1
-  resolution: "@amityco/ts-sdk-react-native@npm:6.29.1"
+"@amityco/ts-sdk-react-native@npm:6.30.2":
+  version: 6.30.2
+  resolution: "@amityco/ts-sdk-react-native@npm:6.30.2"
   dependencies:
     "@react-native-async-storage/async-storage": ^1.17.7
     "@react-native-community/netinfo": ^9.4.1
@@ -118,7 +118,7 @@ __metadata:
     ts-jest: ^28.0.3
   peerDependencies:
     react-native: ^0.70.13
-  checksum: f72199cb7a17a66bca4ae4971bb7f8c9b8215511d6f77ea4e6f92e9cffb436004d0dd8ba65f8eda22d4e2e38634cfa374ca18cb798183813dd03359b6d22312c
+  checksum: 7f44348ff745d143e3426c3441868ccb3fa57a4137e34d6135edf33c2398ddfc8e848243ff76825511cc989e25e9321cbf9972bf135f1814b1c8c3fcbe648453
   languageName: node
   linkType: hard