chore: Merge 4.60.0 into master (#6342)

Author: diegolmello

.eslintrc.js

@@ -196,24 +196,8 @@ module.exports = {
 				'react/jsx-no-undef': 'error',
 				'react/jsx-fragments': ['error', 'syntax'],
 				'@typescript-eslint/ban-ts-comment': 'off',
-				'@typescript-eslint/indent': [
-					'warn',
-					'tab',
-					{
-						SwitchCase: 1
-					}
-				],
-				'@typescript-eslint/no-extra-parens': [
-					'warn',
-					'all',
-					{
-						conditionalAssign: true,
-						nestedBinaryExpressions: false,
-						returnAssign: true,
-						ignoreJSX: 'all',
-						enforceForArrowConditionals: false
-					}
-				],
+				'@typescript-eslint/indent': 'off',
+				'@typescript-eslint/no-extra-parens': 'off',
 				'@typescript-eslint/no-dupe-class-members': 'error',
 				'@typescript-eslint/no-explicit-any': 'off',
 				'@typescript-eslint/no-unused-vars': [

android/app/build.gradle

@@ -88,7 +88,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "4.59.0"
+        versionName "4.60.0"
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
         missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60" // See note below!
@@ -145,7 +145,6 @@ dependencies {
         implementation jscFlavor
     }
 
-    implementation project(':@react-native-community_viewpager')
     implementation project(':react-native-notifications')
     implementation "com.google.firebase:firebase-messaging:23.3.1"
     implementation project(':watermelondb-jsi')

android/app/src/main/assets/fonts/custom.ttf

@@ -24,16 +24,13 @@ import com.bugsnag.android.Bugsnag
 import expo.modules.ApplicationLifecycleDispatcher
 import chat.rocket.reactnative.networking.SSLPinningPackage;
 import chat.rocket.reactnative.notification.CustomPushNotification;
-import com.reactnativecommunity.viewpager.RNCViewPagerPackage;
 
 open class MainApplication : Application(), ReactApplication, INotificationsApplication {
 
   override val reactNativeHost: ReactNativeHost =
       object : DefaultReactNativeHost(this) {
         override fun getPackages(): List<ReactPackage> =
             PackageList(this).packages.apply {
-              // Packages that cannot be autolinked yet can be added manually here, for example:
-              add(RNCViewPagerPackage())
               add(SSLPinningPackage())
             }
 

android/app/src/main/java/chat/rocket/reactnative/MainApplication.kt

@@ -1,6 +1,4 @@
 rootProject.name = 'RocketChatRN'
-include ':@react-native-community_viewpager'
-project(':@react-native-community_viewpager').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/viewpager/android')
 include ':watermelondb-jsi'
 project(':watermelondb-jsi').projectDir = new File(rootProject.projectDir, '../node_modules/@nozbe/watermelondb/native/android-jsi')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)

android/settings.gradle

@@ -53,9 +53,11 @@ export const CREATE_DISCUSSION = createRequestTypes('CREATE_DISCUSSION', [...def
 export const SELECTED_USERS = createRequestTypes('SELECTED_USERS', ['ADD_USER', 'REMOVE_USER', 'RESET', 'SET_LOADING']);
 export const SERVER = createRequestTypes('SERVER', [
 	...defaultTypes,
+	'CLEAR',
 	'SELECT_SUCCESS',
 	'SELECT_REQUEST',
 	'SELECT_FAILURE',
+	'SELECT_CANCEL',
 	'INIT_ADD',
 	'FINISH_ADD'
 ]);

app/actions/actionsTypes.ts

@@ -65,6 +65,18 @@ export function selectServerFailure(): Action {
 	};
 }
 
+export function selectServerCancel(): Action {
+	return {
+		type: SERVER.SELECT_CANCEL
+	};
+}
+
+export function selectServerClear(): Action {
+	return {
+		type: SERVER.CLEAR
+	};
+}
+
 export function serverRequest(server: string, username: string | null = null, fromServerHistory = false): IServerRequestAction {
 	return {
 		type: SERVER.REQUEST,

app/actions/server.ts

@@ -4,7 +4,7 @@ import { TextStyle, Text, StyleSheet } from 'react-native';
 import sharedStyles from '../../views/Styles';
 import { useTheme } from '../../theme';
 import I18n from '../../i18n';
-import { previewFormatText } from '../../lib/helpers/previewFormatText';
+import usePreviewFormatText from '../../lib/hooks/usePreviewFormatText';
 
 interface ICollapsibleText {
 	msg?: string;
@@ -29,12 +29,13 @@ const CollapsibleText = ({ msg, style = [], linesToTruncate = 1 }: ICollapsibleT
 	const [showTruncated, setShowTruncated] = useState(true);
 
 	const { colors } = useTheme();
+	const formattedText = usePreviewFormatText(msg ?? '');
 
 	if (!msg) {
 		return null;
 	}
 
-	const m = previewFormatText(msg);
+	const m = formattedText;
 
 	if (truncatedText && showTruncated) {
 		return (

app/containers/CollapsibleText/index.tsx

@@ -50,6 +50,8 @@ export const mappedIcons = {
 	'chat-close': 59701,
 	'chat-forward': 59702,
 	'check': 59703,
+	'check-double': 59875,
+	'check-single': 59876,
 	'checkbox-checked': 59654,
 	'checkbox-unchecked': 59653,
 	'chevron-down': 59704,