diff --git a/android/app/build.gradle b/android/app/build.gradle index 6d21a7e49a8..7171d06bf85 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -90,7 +90,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode VERSIONCODE as Integer - versionName "4.71.1" + versionName "4.71.2" vectorDrawables.useSupportLibrary = true manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String] resValue "string", "rn_config_reader_custom_package", "chat.rocket.reactnative" diff --git a/app/containers/TwoFactor/index.tsx b/app/containers/TwoFactor/index.tsx index 6520d453d60..40c3d93c482 100644 --- a/app/containers/TwoFactor/index.tsx +++ b/app/containers/TwoFactor/index.tsx @@ -7,6 +7,7 @@ import useDeepCompareEffect from 'use-deep-compare-effect'; import { useForm } from 'react-hook-form'; import * as yup from 'yup'; import { yupResolver } from '@hookform/resolvers/yup'; +import { GestureHandlerRootView } from 'react-native-gesture-handler'; import { ControlledFormTextInput } from '../TextInput'; import I18n from '../../i18n'; @@ -157,7 +158,7 @@ const TwoFactor = React.memo(() => { useNativeDriver isVisible={visible} hideModalContentWhileAnimating> - + { - + ); }); diff --git a/app/views/ChangePasscodeView.tsx b/app/views/ChangePasscodeView.tsx index 4088d1f6009..a64081862b5 100644 --- a/app/views/ChangePasscodeView.tsx +++ b/app/views/ChangePasscodeView.tsx @@ -3,6 +3,7 @@ import { StyleSheet } from 'react-native'; import useDeepCompareEffect from 'use-deep-compare-effect'; import isEmpty from 'lodash/isEmpty'; import Modal from 'react-native-modal'; +import { GestureHandlerRootView } from 'react-native-gesture-handler'; import { hasNotch } from '../lib/methods/helpers'; import { PasscodeChoose } from '../containers/Passcode'; @@ -12,6 +13,11 @@ import { CHANGE_PASSCODE_EMITTER } from '../lib/constants/localAuthentication'; import Touch from '../containers/Touch'; const styles = StyleSheet.create({ + container: { + flex: 1, + justifyContent: 'center', + alignItems: 'center' + }, modal: { margin: 0 }, @@ -69,12 +75,14 @@ const ChangePasscodeView = React.memo(() => { return ( - - {!data?.force ? ( - - - - ) : null} + + + {!data?.force ? ( + + + + ) : null} + ); }); diff --git a/app/views/JitsiMeetView/JitsiAuthModal.tsx b/app/views/JitsiMeetView/JitsiAuthModal.tsx index a7fde8ae8ed..6ff7ed6e57b 100644 --- a/app/views/JitsiMeetView/JitsiAuthModal.tsx +++ b/app/views/JitsiMeetView/JitsiAuthModal.tsx @@ -2,6 +2,7 @@ import { useNavigation } from '@react-navigation/native'; import React from 'react'; import { Linking, StyleSheet, Text, View } from 'react-native'; import Modal from 'react-native-modal'; +import { GestureHandlerRootView } from 'react-native-gesture-handler'; import sharedStyles from '../Styles'; import Button from '../../containers/Button'; @@ -48,7 +49,7 @@ const JitsiAuthModal = ({ return ( - + {i18n.t('Jitsi_may_require_authentication')} {isAdmin ? ( @@ -75,7 +76,7 @@ const JitsiAuthModal = ({ }} /> - + ); }; diff --git a/app/views/RoomView/Banner.tsx b/app/views/RoomView/Banner.tsx index 047aa8f06a1..4c5fc1bf795 100644 --- a/app/views/RoomView/Banner.tsx +++ b/app/views/RoomView/Banner.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; -import { Text, View } from 'react-native'; -import { BorderlessButton, ScrollView } from 'react-native-gesture-handler'; +import { Text } from 'react-native'; +import { BorderlessButton, GestureHandlerRootView, ScrollView } from 'react-native-gesture-handler'; import Modal from 'react-native-modal'; import Markdown, { MarkdownPreview } from '../../containers/markdown'; @@ -42,12 +42,12 @@ const Banner = React.memo( isVisible={showModal} animationIn='fadeIn' animationOut='fadeOut'> - + {title} - + ); diff --git a/app/views/ScreenLockedView.tsx b/app/views/ScreenLockedView.tsx index 0733998516c..b3dbd450267 100644 --- a/app/views/ScreenLockedView.tsx +++ b/app/views/ScreenLockedView.tsx @@ -3,6 +3,7 @@ import React, { useEffect, useState } from 'react'; import { StyleSheet } from 'react-native'; import Modal from 'react-native-modal'; import useDeepCompareEffect from 'use-deep-compare-effect'; +import { GestureHandlerRootView } from 'react-native-gesture-handler'; import { PasscodeEnter } from '../containers/Passcode'; import { LOCAL_AUTHENTICATE_EMITTER } from '../lib/constants/localAuthentication'; @@ -19,6 +20,11 @@ interface IData { } const styles = StyleSheet.create({ + container: { + flex: 1, + justifyContent: 'center', + alignItems: 'center' + }, close: { position: 'absolute', top: hasNotch ? 50 : 30, @@ -73,12 +79,14 @@ const ScreenLockedView = (): JSX.Element => { style={{ margin: 0 }} animationIn='fadeIn' animationOut='fadeOut'> - - {data?.force ? ( - - - - ) : null} + + + {data?.force ? ( + + + + ) : null} + ); }; diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj index 3e127028d17..052f94703f7 100644 --- a/ios/RocketChatRN.xcodeproj/project.pbxproj +++ b/ios/RocketChatRN.xcodeproj/project.pbxproj @@ -3007,7 +3007,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 4.71.1; + MARKETING_VERSION = 4.71.2; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; @@ -3059,7 +3059,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 4.71.1; + MARKETING_VERSION = 4.71.2; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService; diff --git a/ios/RocketChatRN/Info.plist b/ios/RocketChatRN/Info.plist index b83df7e055c..bede36136d1 100644 --- a/ios/RocketChatRN/Info.plist +++ b/ios/RocketChatRN/Info.plist @@ -28,7 +28,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.71.1 + 4.71.2 CFBundleSignature ???? CFBundleURLTypes diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist index f38e8b2e6c2..dc48305940c 100644 --- a/ios/ShareRocketChatRN/Info.plist +++ b/ios/ShareRocketChatRN/Info.plist @@ -26,7 +26,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 4.71.1 + 4.71.2 CFBundleVersion 1 KeychainGroup diff --git a/package.json b/package.json index f1c1d71ae8a..45ad7f4a3e3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket-chat-reactnative", - "version": "4.71.1", + "version": "4.71.2", "private": true, "packageManager": "yarn@1.22.22", "scripts": {