Merged in bugfix/MRN-429_user_block (pull request #236)

MRN-429

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

ios/mirrorfly_rn.xcodeproj/project.pbxproj

@@ -674,7 +674,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.1;
+				MARKETING_VERSION = 3.3.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -707,7 +707,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.1;
+				MARKETING_VERSION = 3.3.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

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/index.js

@@ -75,6 +75,7 @@ const BigVideoTile = ({
                {/* Pulse animation view here */}
                <PulseAnimatedView animateToValue={1.3} baseStyle={styles.avatharPulseAnimatedView} />
                <Avathar
+                  userId={userId}
                   width={90}
                   height={90}
                   backgroundColor={userProfile.colorCode}

src/calls/components/BigVideoTile.js

@@ -54,6 +54,7 @@ const SmallVideoTile = ({
                <>
                   <View style={styles.smallVideoUserAvathar}>
                      <Avathar
+                        userId={userId}
                         width={50}
                         height={50}
                         backgroundColor={userProfile.colorCode}

src/calls/components/SmallVideoTile.js

@@ -96,6 +96,7 @@ const IncomingCall = ({ userId, userJid, callStatus }) => {
                </Text>
                <View style={commonStyles.marginTop_15}>
                   <Avathar
+                     userId={userId}
                      width={90}
                      height={90}
                      backgroundColor={userProfile.colorCode}

src/calls/screens/IncomingCall.js

@@ -120,6 +120,7 @@ const OutGoingCall = () => {
                   )}
                   <View style={[styles.avathar]}>
                      <Avathar
+                        userId={userID}
                         width={90}
                         height={90}
                         backgroundColor={userProfile.colorCode}

src/calls/screens/OutGoingCall.js

@@ -0,0 +1,11 @@
+import React from 'react';
+import AlertModal from './AlertModal';
+import { useAlertModalContent } from '../redux/reduxHook';
+
+function AlertModalRoot() {
+   const modalContent = useAlertModalContent();
+   console.log('modalContent ==> ', modalContent);
+   return modalContent && <AlertModal {...modalContent} />;
+}
+
+export default AlertModalRoot;