Cleanup

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

@@ -36,8 +36,8 @@ public class MainApplication extends Application implements ReactApplication {
         protected List<ReactPackage> getPackages() {
           @SuppressWarnings("UnnecessaryLocalVariable")
           List<ReactPackage> packages = new PackageList(this).getPackages();
-          packages.add(new SSLPinningPackage());
           packages.add(new RNCViewPagerPackage());
+          packages.add(new SSLPinningPackage());
           List<ReactPackage> additionalModules = new AdditionalModules().getAdditionalModules(MainApplication.this);
           packages.addAll(additionalModules);
           return packages;

android/settings.gradle

@@ -11,14 +11,6 @@ apply from: file("../node_modules/@react-native-community/cli-platform-android/n
 include ':app'
 
 includeBuild('../node_modules/@react-native/gradle-plugin')
-// includeBuild('../node_modules/react-native') {
-//     dependencySubstitution {
-//         substitute(module("com.facebook.react:react-android")).using(project(":ReactAndroid"))
-//         substitute(module("com.facebook.react:react-native")).using(project(":ReactAndroid"))
-//         substitute(module("com.facebook.react:hermes-android")).using(project(":ReactAndroid:hermes-engine"))
-//         substitute(module("com.facebook.react:hermes-engine")).using(project(":ReactAndroid:hermes-engine"))
-//     }
-// }
 includeBuild('../node_modules/react-native') {
     dependencySubstitution {
         substitute(module("com.facebook.react:react-android")).using(project(":packages:react-native:ReactAndroid"))

app/lib/services/connect.ts

@@ -402,9 +402,7 @@ function disconnect() {
 async function getServerInfo(server: string) {
 	try {
 		const response = await RNFetchBlob.fetch('GET', `${server}/api/info`, { ...RocketChatSettings.customHeaders });
-		// const response = await fetch(`${server}/api/info`, { ...RocketChatSettings.customHeaders })
 		try {
-			console.log('🚀 ~ file: connect.ts:406 ~ getServerInfo ~ response:', response);
 			// Try to resolve as json
 			const jsonRes: { version?: string; success: boolean } = response.json();
 			if (!jsonRes?.success) {

app/stacks/InsideStack.tsx

@@ -233,8 +233,6 @@ const DrawerNavigator = () => {
 		<Drawer.Navigator
 			// @ts-ignore
 			drawerContent={({ navigation, state }) => <Sidebar navigation={navigation} state={state} />}
-			// Performance issues on Android when disabled
-			// useLegacyImplementation
 			screenOptions={{
 				swipeEnabled: false,
 				headerShown: false,

app/views/RoomView/List/index.tsx

@@ -3,7 +3,6 @@ import { dequal } from 'dequal';
 import moment from 'moment';
 import React from 'react';
 import { FlatListProps, View, ViewToken, StyleSheet, Platform } from 'react-native';
-// import { event, Value } from 'react-native-reanimated';
 import { Observable, Subscription } from 'rxjs';
 
 import ActivityIndicator from '../../../containers/ActivityIndicator';
@@ -14,7 +13,6 @@ import { animateNextTransition } from '../../../lib/methods/helpers/layoutAnimat
 import log from '../../../lib/methods/helpers/log';
 import EmptyRoom from '../EmptyRoom';
 import List, { IListProps, TListRef } from './List';
-// import NavBottomFAB from './NavBottomFAB';
 import { loadMissedMessages, loadThreadMessages } from '../../../lib/methods';
 import { Services } from '../../../lib/services';
 import RefreshControl from './RefreshControl';
@@ -31,18 +29,6 @@ const styles = StyleSheet.create({
 	}
 });
 
-// const onScroll = ({ y }: { y: Value<number> }) =>
-// 	event(
-// 		[
-// 			{
-// 				nativeEvent: {
-// 					contentOffset: { y }
-// 				}
-// 			}
-// 		],
-// 		{ useNativeDriver: true }
-// 	);
-
 export { type IListProps };
 
 export interface IListContainerProps {
@@ -71,8 +57,6 @@ class ListContainer extends React.Component<IListContainerProps, IListContainerS
 	private animated = false;
 	private jumping = false;
 	private cancelJump = false;
-	// private y = new Value(0);
-	// private onScroll = onScroll({ y: this.y });
 	private unsubscribeFocus: () => void;
 	private viewabilityConfig = {
 		itemVisiblePercentThreshold: 10