Merge branch 'develop' into develop

Author: divyanshu-patil

app/containers/TwoFactor/styles.ts

@@ -6,6 +6,7 @@ export default StyleSheet.create({
 	container: {
 		flex: 1,
 		justifyContent: 'center',
+		alignItems: 'center',
 		padding: 16
 	},
 	content: {

app/i18n/locales/hi-IN.json

@@ -292,7 +292,7 @@
   "Enter_manually": "मैन्युअल रूप से दर्ज करें",
   "Error_Download_file": "फ़ाइल डाउनलोड करते समय त्रुटि",
   "Error_incorrect_password": "गलत पासवर्ड",
-  "Error_prefix": "त्रुटि: {{संदेश}}",
+  "Error_prefix": "त्रुटि: {{message}}",
   "Error_uploading": "अपलोड करने में त्रुटि",
   "error-action-not-allowed": "{{action}} की अनुमति नहीं है",
   "error-avatar-invalid-url": "अवैध अवतार URL: {{url}}",
@@ -595,7 +595,7 @@
   "Pinned": "पिन किया गया",
   "Pinned_a_message": "एक संदेश को पिन किया गया है:",
   "Place_chat_on_hold": "चैट को होल्ड पर रखें",
-  "Play": "खेल_PLAY",
+  "Play": "चलाएँ",
   "Playback_speed": "प्लेबैक गति",
   "Please_add_a_comment": "कृपया एक टिप्पणी जोड़ें",
   "Please_enter_your_password": "कृपया अपना पासवर्ड डालें",

app/i18n/locales/ta-IN.json

@@ -72,7 +72,7 @@
   "At_Least_1_Number": "குறைந்தது 1 எண்",
   "At_Least_1_Symbol": "குறைந்தது 1 சின்னம்",
   "At_Least_1_Uppercase_Letter": "குறைந்தது 1 பெரிய எழுத்து இருப்பதாக இருக்கும்",
-  "At_Least_Characters": "کم از کم {{quantity}} حروف",
+  "At_Least_Characters": "குறைந்தது {{quantity}} எழுத்துக்கள்",
   "At_Most_24_Characters": "அதிகபட்சம் 24 எழுத்துக்கள்",
   "At_Most_Characters": "அதிகபட்சம் {{quantity}} எழுத்துகள்",
   "Attention": "கவனம்",

app/i18n/locales/te-IN.json

@@ -32,7 +32,7 @@ import { getUserPresence, subscribeUsersPresence } from '../lib/methods/getUsers
 import { logout, removeServerData, removeServerDatabase } from '../lib/methods/logout';
 import { subscribeSettings } from '../lib/methods/getSettings';
 import { connect, loginWithPassword, login } from '../lib/services/connect';
-import { saveUserProfile, registerPushToken, getUsersRoles } from '../lib/services/restApi';
+import { saveUserProfile, registerPushToken, getUsersRoles, setUserPresenceAway } from '../lib/services/restApi';
 import { setUsersRoles } from '../actions/usersRoles';
 import { getServerById } from '../lib/database/services/Server';
 import appNavigation from '../lib/navigation/appNavigation';
@@ -223,6 +223,23 @@ const fetchUsersRoles = function* fetchRoomsFork() {
 	}
 };
 
+const checkBackgroundAndSetAway = function* checkBackgroundAndSetAway() {
+	try {
+		const { background, root } = yield select(state => state.app);
+		if (root !== RootEnum.ROOT_INSIDE || !background) {
+			return;
+		}
+		const isAuthenticated = yield select(state => state.login.isAuthenticated);
+		const isConnected = yield select(state => state.meteor.connected);
+		if (!isAuthenticated || !isConnected) {
+			return;
+		}
+		yield setUserPresenceAway();
+	} catch (e) {
+		log(e);
+	}
+};
+
 const handleLoginSuccess = function* handleLoginSuccess({ user }) {
 	try {
 		getUserPresence(user.id);
@@ -239,6 +256,7 @@ const handleLoginSuccess = function* handleLoginSuccess({ user }) {
 		yield fork(fetchEnterpriseModulesFork, { user });
 		yield fork(subscribeSettingsFork);
 		yield fork(fetchUsersRoles);
+		yield fork(checkBackgroundAndSetAway);
 
 		setLanguage(user?.language);
 

app/sagas/login.js

@@ -1,6 +1,5 @@
 import { select, takeLatest } from 'redux-saga/effects';
 
-import Navigation from '../lib/navigation/appNavigation';
 import log from '../lib/methods/helpers/log';
 import { localAuthenticate, saveLastLocalAuthenticationSession } from '../lib/methods/helpers/localAuthentication';
 import { APP_STATE } from '../actions/actionsTypes';
@@ -9,25 +8,24 @@ import { checkAndReopen } from '../lib/services/connect';
 import { setUserPresenceOnline, setUserPresenceAway } from '../lib/services/restApi';
 import { checkPendingNotification } from '../lib/notifications';
 
+const isAuthAndConnected = function* isAuthAndConnected() {
+	const login = yield select(state => state.login);
+	const meteor = yield select(state => state.meteor);
+	return login.isAuthenticated && meteor.connected;
+};
+
 const appHasComeBackToForeground = function* appHasComeBackToForeground() {
 	const appRoot = yield select(state => state.app.root);
-	if (appRoot === RootEnum.ROOT_OUTSIDE) {
+	if (appRoot !== RootEnum.ROOT_INSIDE) {
 		return;
 	}
-	const login = yield select(state => state.login);
-	const server = yield select(state => state.server);
-	if (
-		!login.isAuthenticated ||
-		login.isFetching ||
-		server.connecting ||
-		server.loading ||
-		server.changingServer ||
-		!Navigation.navigationRef.current
-	) {
+	const isReady = yield isAuthAndConnected();
+	if (!isReady) {
 		return;
 	}
 	try {
-		yield localAuthenticate(server.server);
+		const server = yield select(state => state.server.server);
+		yield localAuthenticate(server);
 		checkAndReopen();
 		// Check for pending notification when app comes to foreground (Android - notification tap while in background)
 		checkPendingNotification().catch((e) => {
@@ -41,13 +39,16 @@ const appHasComeBackToForeground = function* appHasComeBackToForeground() {
 
 const appHasComeBackToBackground = function* appHasComeBackToBackground() {
 	const appRoot = yield select(state => state.app.root);
-	if (appRoot === RootEnum.ROOT_OUTSIDE) {
+	if (appRoot !== RootEnum.ROOT_INSIDE) {
+		return;
+	}
+	const isReady = yield isAuthAndConnected();
+	if (!isReady) {
 		return;
 	}
 	try {
 		const server = yield select(state => state.server.server);
 		yield saveLastLocalAuthenticationSession(server);
-
 		yield setUserPresenceAway();
 	} catch (e) {
 		log(e);

app/sagas/state.js

@@ -2327,7 +2327,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNImageCropPicker (0.50.1):
+  - RNImageCropPicker (0.51.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -2351,10 +2351,10 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNImageCropPicker/QBImagePickerController (= 0.50.1)
+    - RNImageCropPicker/QBImagePickerController (= 0.51.0)
     - TOCropViewController (~> 2.7.4)
     - Yoga
-  - RNImageCropPicker/QBImagePickerController (0.50.1):
+  - RNImageCropPicker/QBImagePickerController (0.51.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -3172,7 +3172,7 @@ SPEC CHECKSUMS:
   RNFBCrashlytics: 8a49978bb953d3fc052813093fecd4b447bbabf8
   RNFileViewer: f9424017fa643c115c1444e11292e84fb16ddd68
   RNGestureHandler: 8ff2b1434b0ff8bab28c8242a656fb842990bbc8
-  RNImageCropPicker: b219389d3a300679b396e81d501e8c8169ffa3c0
+  RNImageCropPicker: c78ee80ea778f90cb850f4d26696fd9c1a7bcfbb
   RNLocalize: ca86348d88b9a89da0e700af58d428ab3f343c4e
   RNReanimated: f52ccd5ceea2bae48d7421eec89b3f0c10d7b642
   RNScreens: b13e4c45f0406f33986a39c0d8da0324bff94435

ios/Podfile.lock

@@ -98,7 +98,7 @@
 		"react-native-easy-toast": "2.3.0",
 		"react-native-file-viewer": "2.1.4",
 		"react-native-gesture-handler": "2.24.0",
-		"react-native-image-crop-picker": "RocketChat/react-native-image-crop-picker#5346870b0be10d300dc53924309dc6adc9946d50",
+		"react-native-image-crop-picker": "RocketChat/react-native-image-crop-picker#f028aac24373d05166747ef6d9e59bb037fe3224",
 		"react-native-katex": "git+https://github.com/RocketChat/react-native-katex.git",
 		"react-native-keyboard-controller": "^1.17.1",
 		"react-native-linear-gradient": "2.6.2",

package.json

@@ -12698,9 +12698,9 @@ react-native-gesture-handler@2.24.0:
     hoist-non-react-statics "^3.3.0"
     invariant "^2.2.4"
 
-react-native-image-crop-picker@RocketChat/react-native-image-crop-picker#5346870b0be10d300dc53924309dc6adc9946d50:
-  version "0.50.1"
-  resolved "https://codeload.github.com/RocketChat/react-native-image-crop-picker/tar.gz/5346870b0be10d300dc53924309dc6adc9946d50"
+react-native-image-crop-picker@RocketChat/react-native-image-crop-picker#f028aac24373d05166747ef6d9e59bb037fe3224:
+  version "0.51.0"
+  resolved "https://codeload.github.com/RocketChat/react-native-image-crop-picker/tar.gz/f028aac24373d05166747ef6d9e59bb037fe3224"
 
 react-native-is-edge-to-edge@1.1.6:
   version "1.1.6"