Merged in bugfix/MRN-778_edit_message (pull request #237)

karthikeyan-se-contus · Vanithacontus · commit 9bb8e842a2ca · 2025-04-02T04:33:52.000Z
MRN-778

Approved-by: vanitha.g
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -98,7 +98,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "3.2.7"
+        versionName "3.3.1"
         /** Add this for react-native-camera */
         missingDimensionStrategy 'react-native-camera', 'general'
         multiDexEnabled true
diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile
@@ -54,7 +54,7 @@ platform :android do
       firebase_app_distribution(
         app: "1:235373697524:android:8b3becf8d8ff9be3a0c1a1",
         groups: "reactnative",
-        release_notes: "React-Native ios build for MRN-947",
+        release_notes: "React-Native ios build for MRN-908, MRN-901",
         apk_path: "../android/app/build/outputs/apk/release/app-release.apk",
         firebase_cli_token: "1//0gfTJ_oWJ0mHNCgYIARAAGBASNwF-L9IrYZM4cUIV5EB8gVnSvtMC6Q7aAtgrgG8R1ybhSY1Np_5r5UuZu28N144_weOQDyONcW4",
       )
diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
@@ -28,7 +28,7 @@ lane :qa_firebase do
 	firebase_app_distribution(
 		app: "1:235373697524:ios:0e9bd66b524978a0a0c1a1",
 		groups: "reactnative",
-		release_notes: "React-Native ios build for MRN-947",
+		release_notes: "React-Native ios build for MRN-908, MRN-901",
 		firebase_cli_path: "/usr/local/bin/firebase",
 		firebase_cli_token: "1//0g53oUKW5j5bJCgYIARAAGBASNwF-L9Ir7Ei_6NzWEsyHOMMXytlesfgXShhLeJWRwbcf2MC3e7BaC5dwYlUZB-_osuQFsxy0Du0"
 	)
diff --git a/ios/mirrorfly_rn.xcodeproj/project.pbxproj b/ios/mirrorfly_rn.xcodeproj/project.pbxproj
@@ -674,7 +674,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.7;
+				MARKETING_VERSION = 3.3.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -707,14 +707,14 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.7;
+				MARKETING_VERSION = 3.3.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.mirrorfly.reactnativeuikit.qa;
-				PRODUCT_NAME = mirrorfly_rn;	
+				PRODUCT_NAME = mirrorfly_rn;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "ReactNative Adhoc";
 				SWIFT_OBJC_BRIDGING_HEADER = "mirrorfly_rn-Bridging-Header.h";
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "mirrorfly-uikit-react-native",
-   "version": "1.5.0",
+   "version": "2.1.0",
    "description": "React-Native based UI kit for Mirrorfly",
    "main": "dist/index.js",
    "module": "dist/index.js",
diff --git a/src/SDK/SDK.js b/src/SDK/SDK.js
@@ -1,4 +1,4 @@
-import './index';
+import 'mirrorfly-reactnative-sdk';
 
 const SDK = global.SDK;
 
diff --git a/src/SDK/index.js b/src/SDK/index.js
diff --git a/src/SDK/sdkCallBacks.js b/src/SDK/sdkCallBacks.js
@@ -709,7 +709,7 @@ export const callBacks = {
                store.dispatch(addChatMessageItem(res));
             }
 
-            if (isShowNotification) {
+            if (isShowNotification && !res?.editMessageId) {
                pushNotify(res.msgId, getNotifyNickName(res), getNotifyMessage(res), res?.fromUserJid);
             }
             break;
diff --git a/src/SDK/utils.js b/src/SDK/utils.js
@@ -4,9 +4,7 @@ import config from '../config/config';
 import {
    calculateWidthAndHeight,
    getCurrentChatUser,
-   getThumbImage,
    getUserIdFromJid,
-   getVideoThumbImage,
    handleConversationScollToBottom,
    handleUploadNextImage,
    isLocalUser,
@@ -110,7 +108,6 @@ export const fetchMessagesFromSDK = async ({ fromUserJId, forceGetFromSDK = fals
       hasNextChatPage[userId] = false;
       return;
    }
-   const page = chatPage[userId] || 1;
 
    const {
       statusCode,
@@ -121,15 +118,12 @@ export const fetchMessagesFromSDK = async ({ fromUserJId, forceGetFromSDK = fals
       toJid: fromUserJId,
       lastMessageId,
       size: config.chatMessagesSizePerPage,
-      source: 'db',
    });
    if (statusCode === 200) {
       let hasEqualDataFetched = data.length === config.chatMessagesSizePerPage;
-      if (data.length && hasEqualDataFetched) {
-         chatPage[userId] = page + 1;
-      }
+
       hasNextChatPage[userId] = hasEqualDataFetched;
-      store.dispatch(setChatMessages({ userJid, data, forceUpdate: page === 1 }));
+      store.dispatch(setChatMessages({ userJid, data }));
    }
    if (statusCode !== 200) {
       showToast(message);
@@ -529,8 +523,10 @@ export const getUserSettings = async (iq = false) => {
 
 export const updateNotificationSettings = async () => {
    let {
+      data,
       data: { archive = 0, muteNotification = false, notificationSound = true, notificationVibrate = false },
    } = await SDK.getUserSettings();
+   console.log('data ==>', JSON.stringify(data, null, 2));
    store.dispatch(toggleArchiveSetting(Number(archive)));
    store.dispatch(updateNotificationSetting({ muteNotification, notificationSound, notificationVibrate }));
 };
diff --git a/src/components/ArchivedHeader.js b/src/components/ArchivedHeader.js
@@ -9,7 +9,7 @@ import Text from '../common/Text';
 import { getUserIdFromJid, showToast, toggleArchive } from '../helpers/chatHelpers';
 import { MIX_BARE_JID } from '../helpers/constants';
 import { getStringSet, replacePlaceholders } from '../localization/stringSet';
-import { deleteRecentChats, resetChatSelections } from '../redux/recentChatDataSlice';
+import { clearRecentChatData, deleteRecentChats, resetChatSelections } from '../redux/recentChatDataSlice';
 import {
    getArchiveSelectedChats,
    getUserNameFromStore,
@@ -20,6 +20,7 @@ import { ARCHIVED_SCREEN } from '../screens/constants';
 import SDK from '../SDK/SDK';
 import commonStyles from '../styles/commonStyles';
 import MuteChat from './MuteChat';
+import { clearChatMessageData } from '../redux/chatMessageDataSlice';
 
 function ArchivedHeader() {
    const stringSet = getStringSet();
@@ -60,13 +61,13 @@ function ArchivedHeader() {
    };
 
    const handleRemoveClose = () => {
-      const isUserLeft = filtered.every(res => (MIX_BARE_JID.test(res.userJid) ? res.userType === '' : true));
-      if (!isUserLeft && filtered.length > 1) {
+      const _isUserLeft = filtered.every(res => (MIX_BARE_JID.test(res.userJid) ? res.userType === '' : true));
+      if (!_isUserLeft && filtered.length > 1) {
          toggleModalContent();
          return showToast(stringSet.COMMON_TEXT.YOU_ARE_A_MEMBER);
       }
 
-      if (!isUserLeft) {
+      if (!_isUserLeft) {
          toggleModalContent();
          return showToast(stringSet.COMMON_TEXT.YOU_ARE_A_PARTICIPANT);
       }
@@ -75,6 +76,9 @@ function ArchivedHeader() {
 
       userJids.forEach(item => {
          SDK.deleteChat(item);
+         SDK.clearChat(item);
+         dispatch(clearChatMessageData(getUserIdFromJid(item)));
+         dispatch(clearRecentChatData(item));
       });
 
       dispatch(deleteRecentChats(ARCHIVED_SCREEN));
diff --git a/src/components/ReplyContainer.js b/src/components/ReplyContainer.js
@@ -12,13 +12,14 @@ import ReplyImage from './ReplyImage';
 import ReplyLocation from './ReplyLocation';
 import ReplyText from './ReplyText';
 import ReplyVideo from './ReplyVideo';
-import { useReplyMessage } from '../redux/reduxHook';
+import { useBlockedStatus, useReplyMessage } from '../redux/reduxHook';
 
 function ReplyContainer({ chatUser }) {
    const stringSet = getStringSet();
    const userId = getUserIdFromJid(chatUser);
    const replyMessage = useReplyMessage(userId) || {};
    const dispatch = useDispatch();
+   const blockedStaus = useBlockedStatus(userId);
    const { msgBody = {}, deleteStatus = 0, recallStatus = 0, msgBody: { message_type = '' } = {} } = replyMessage;
    const handleCloseReplyContainer = () => {
       dispatch(setReplyMessage({ userId, message: {} }));
@@ -77,7 +78,7 @@ function ReplyContainer({ chatUser }) {
       }
    };
 
-   if (Object.keys(replyMessage).length === 0) {
+   if (Object.keys(replyMessage).length === 0 || blockedStaus) {
       return null;
    }
 
diff --git a/src/components/TextCard.js b/src/components/TextCard.js
@@ -106,14 +106,18 @@ export const ChatConversationHighlightedText = ({ textStyle = {}, text, searchVa
 
             // If no match, render normally
             const urlStyle = segment.isUrl ? styles.underline : {};
-            return (
+            return segment.isUrl ? (
                <Text
                   key={randomString()}
                   style={[textStyle, urlStyle]}
                   onPress={() => segment.isUrl && handlePress(segment.content)}
                   suppressHighlighting={!segment.isUrl}>
                   {content}
                </Text>
+            ) : (
+               <Text key={randomString()} style={[textStyle]}>
+                  {content}
+               </Text>
             );
          })}
       </Text>
diff --git a/src/helpers/chatHelpers.js b/src/helpers/chatHelpers.js
@@ -26,7 +26,6 @@ import {
    GalleryIcon,
    HeadSetIcon,
    LocationIcon,
-   LogIcon,
    NotificationSettingsIcon,
    ProfileIcon,
    SandTimer,
@@ -42,7 +41,7 @@ import {
    requestStoragePermission,
 } from '../common/permissions';
 import { changeTimeFormat } from '../common/timeStamp';
-import { cancelAudioRecord } from '../components/ChatInput';
+import { stopAudioRecord } from '../components/ChatInput';
 import { conversationFlatListRef } from '../components/ConversationList';
 import config from '../config/config';
 import {
@@ -84,7 +83,7 @@ import {
    toggleIsChatSearching,
    updateMediaStatus,
 } from '../redux/chatMessageDataSlice';
-import { setReplyMessage, setTextMessage } from '../redux/draftSlice';
+import { setReplyMessage } from '../redux/draftSlice';
 import {
    clearRecentChatData,
    deleteMessagesForEveryoneInRecentChat,
@@ -1442,9 +1441,7 @@ export const handleUpdateBlockUser = (userId, isBlocked, chatUser) => async () =
       if (isBlocked) {
          const res = await SDK.blockUser(chatUser);
          if (res.statusCode === 200) {
-            cancelAudioRecord();
-            store.dispatch(setReplyMessage({ userId, message: {} }));
-            store.dispatch(setTextMessage({ userId, message: '' }));
+            stopAudioRecord();
             showToast(`You have blocked ${getUserNameFromStore(userId)}`);
             store.dispatch(updateBlockUser({ userId, isBlocked }));
          } else {
diff --git a/src/screens/ForwardMessage.js b/src/screens/ForwardMessage.js
@@ -22,6 +22,7 @@ import {
    getRecentChatMsgObjForward,
    getUserIdFromJid,
    handleUpdateBlockUser,
+   setCurrentChatUser,
    showCheckYourInternetToast,
    showToast,
 } from '../helpers/chatHelpers';
@@ -580,18 +581,22 @@ const ForwardMessage = () => {
       await SDK.forwardMessagesToMultipleUsers(contactsToForward, msgIds, true, newMsgIds);
       // navigating the user after setTimeout to finish all the running things in background to avoid unwanted issues
       setTimeout(() => {
+         const jid = Object.values(selectedUsers)[0]?.userJid;
+         const userId = getUserIdFromJid(jid);
          setShowLoader(false);
          onMessageForwaded?.();
          if (Object.values(selectedUsers).length === 1) {
+            dispatch(clearChatMessageData(userId));
             navigation.reset({
                index: 0,
                routes: [
                   {
                      name: CONVERSATION_SCREEN,
-                     params: { jid: Object.values(selectedUsers)[0]?.userJid },
+                     params: { jid },
                   },
                ],
             });
+            setCurrentChatUser(jid);
          } else {
             navigation.goBack();
          }
diff --git a/src/uikitMethods.js b/src/uikitMethods.js
@@ -21,6 +21,7 @@ import { setRoasterData } from './redux/rosterDataSlice';
 import store from './redux/store';
 import { updateTheme, updateThemeColor } from './redux/themeColorDataSlice';
 import { RECENTCHATSCREEN, REGISTERSCREEN } from './screens/constants';
+import { NOTIFICATION } from './helpers/constants';
 
 let uiKitCallbackListenersVal = {},
    appInitialized = false,
@@ -68,18 +69,22 @@ export const mirrorflyNotificationHandler = async remoteMessage => {
          return;
       }
       if (notify?.statusCode === 200) {
-         if (
-            notify?.data?.type === 'receiveMessage' ||
-            notify?.data?.msgType === 'groupCreated' ||
-            notify?.data?.msgType === 'groupProfileUpdated'
-         ) {
+         const { data = {}, data: { msgType, archiveStatus } = {} } = notify;
+         notify.data.archiveSetting = getArchive();
+         const isReceiveMessage = ['receiveMessage', 'carbonReceiveMessage'].includes(msgType);
+         const archiveSettingAndStatus = archiveStatus ? !notify.data.archiveSetting : true;
+         const isNotificationMessage =
+            data.msgBody.message_type === NOTIFICATION.toLowerCase() &&
+            data.msgBody.message === '2' &&
+            getCurrentUserJid() === data.toUserJid;
+         const isShowNotification = (archiveSettingAndStatus && isReceiveMessage) || isNotificationMessage;
+         if (isShowNotification) {
             pushNotify(
                notify?.data?.msgId,
                getNotifyNickName(notify?.data),
                getNotifyMessage(notify?.data),
                notify?.data?.fromUserJid,
             );
-            notify.data.archiveSetting = getArchive();
             store.dispatch(addRecentChatItem(notify?.data));
             store.dispatch(addChatMessageItem(notify?.data));
          }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ platform :android do`
`54`	`54`	`firebase_app_distribution(`
`55`	`55`	`app: "1:235373697524:android:8b3becf8d8ff9be3a0c1a1",`
`56`	`56`	`groups: "reactnative",`
`57`		`- release_notes: "React-Native ios build for MRN-947",`
	`57`	`+ release_notes: "React-Native ios build for MRN-908, MRN-901",`
`58`	`58`	`apk_path: "../android/app/build/outputs/apk/release/app-release.apk",`
`59`	`59`	`firebase_cli_token: "1//0gfTJ_oWJ0mHNCgYIARAAGBASNwF-L9IrYZM4cUIV5EB8gVnSvtMC6Q7aAtgrgG8R1ybhSY1Np_5r5UuZu28N144_weOQDyONcW4",`
`60`	`60`	`)`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ lane :qa_firebase do`
`28`	`28`	`firebase_app_distribution(`
`29`	`29`	`app: "1:235373697524:ios:0e9bd66b524978a0a0c1a1",`
`30`	`30`	`groups: "reactnative",`
`31`		`- release_notes: "React-Native ios build for MRN-947",`
	`31`	`+ release_notes: "React-Native ios build for MRN-908, MRN-901",`
`32`	`32`	`firebase_cli_path: "/usr/local/bin/firebase",`
`33`	`33`	`firebase_cli_token: "1//0g53oUKW5j5bJCgYIARAAGBASNwF-L9Ir7Ei_6NzWEsyHOMMXytlesfgXShhLeJWRwbcf2MC3e7BaC5dwYlUZB-_osuQFsxy0Du0"`
`34`	`34`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "mirrorfly-uikit-react-native",`
`3`		`- "version": "1.5.0",`
	`3`	`+ "version": "2.1.0",`
`4`	`4`	`"description": "React-Native based UI kit for Mirrorfly",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"module": "dist/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import './index';`
	`1`	`+import 'mirrorfly-reactnative-sdk';`
`2`	`2`
`3`	`3`	`const SDK = global.SDK;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -709,7 +709,7 @@ export const callBacks = {`
`709`	`709`	`store.dispatch(addChatMessageItem(res));`
`710`	`710`	`}`
`711`	`711`
`712`		`- if (isShowNotification) {`
	`712`	`+ if (isShowNotification && !res?.editMessageId) {`
`713`	`713`	`pushNotify(res.msgId, getNotifyNickName(res), getNotifyMessage(res), res?.fromUserJid);`
`714`	`714`	`}`
`715`	`715`	`break;`