Merged in uat (pull request #238)

MRN-429, MRN-778

Approved-by: vanitha.g

Author: karthikeyan-se-contus

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.3"
         /** Add this for react-native-camera */
         missingDimensionStrategy 'react-native-camera', 'general'
         multiDexEnabled true

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",
       )

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"
 	)

ios/mirrorfly_rn.xcodeproj/project.pbxproj

@@ -674,7 +674,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.7;
+				MARKETING_VERSION = 3.3.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -707,14 +707,14 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.7;
+				MARKETING_VERSION = 3.3.3;
 				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";

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",

rollup.config.js

@@ -60,7 +60,6 @@ export default {
       'react-native-progress',
       'react-native-safe-area-context',
       'react-native-screens',
-      'react-native-simple-toast',
       'react-native-sound',
       'react-native-svg',
       'react-native-svg-transformer',
@@ -82,7 +81,6 @@ export default {
       'react-native-material-menu',
       'react-native-keyevent',
       'react-native-ringer-mode',
-      'react-native-simple-toast',
    ],
    plugins: [
       replace({

src/Navigation/stackNavigation.js

@@ -2,6 +2,8 @@ import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import React from 'react';
 import { Provider } from 'react-redux';
 import VideoPlayer from '../Media/VideoPlayer';
+import AlertModalRoot from '../common/AlertModalRoot';
+import ToastMessage from '../common/ToastMessage';
 import store from '../redux/store';
 import ArchivedScreen from '../screens/ArchivedScreen';
 import BlockedContactListScreen from '../screens/BlockedContactListScreen';
@@ -71,7 +73,6 @@ import {
    VIEWALLMEDIA,
 } from '../screens/constants';
 import { getCurrentScreen } from '../uikitMethods';
-import ToastMessage from '../common/ToastMessage';
 
 const Stack = createNativeStackNavigator();
 
@@ -182,6 +183,7 @@ function StackNavigationPage() {
             <Stack.Screen name={GROUP_STACK}>{prop => <GroupScreenStackNavigation {...prop} />}</Stack.Screen>
          </Stack.Navigator>
          <ToastMessage />
+         <AlertModalRoot />
       </Provider>
    );
 }

src/SDK/SDK.js

@@ -1,4 +1,4 @@
-import './index';
+import 'mirrorfly-reactnative-sdk';
 
 const SDK = global.SDK;
 

src/SDK/index.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;