Merge 4.22.0 into single-server

.eslintrc.js

@@ -2,7 +2,7 @@ module.exports = {
 	settings: {
 		'import/resolver': {
 			node: {
-				extensions: ['.js', '.ios.js', '.android.js', '.native.js', '.ts', '.tsx']
+				extensions: ['.ts', '.tsx', '.js', '.ios.js', '.android.js', '.native.js']
 			}
 		}
 	},

__tests__/Storyshots.test.js

@@ -1,5 +1,21 @@
 import initStoryshots from '@storybook/addon-storyshots';
 
+jest.mock('rn-fetch-blob', () => ({
+	fs: {
+		dirs: {
+			DocumentDir: '/data/com.rocket.chat/documents',
+			DownloadDir: '/data/com.rocket.chat/downloads'
+		},
+		exists: jest.fn(() => null)
+	},
+	fetch: jest.fn(() => null),
+	config: jest.fn(() => null)
+}));
+
+jest.mock('react-native-file-viewer', () => ({
+	open: jest.fn(() => null)
+}));
+
 jest.mock('../app/lib/database', () => jest.fn(() => null));
 global.Date.now = jest.fn(() => new Date('2019-10-10').getTime());
 

android/app/build.gradle

@@ -144,7 +144,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "4.21.0"
+        versionName "4.22.0"
         vectorDrawables.useSupportLibrary = true
         if (!isFoss) {
             manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]

android/gradle.properties

@@ -25,6 +25,11 @@ org.gradle.jvmargs=-Xmx2048M -XX\:MaxHeapSize\=32g
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
+
+# Version of flipper SDK to use with React Native
+FLIPPER_VERSION=0.75.1
+
+# Application ID
 APPLICATION_ID=chat.rocket.reactnative
 VERSIONCODE=1
 BugsnagAPIKey=""

app/constants/colors.ts

@@ -65,6 +65,7 @@ export const themes: any = {
 		previewBackground: '#1F2329',
 		previewTintColor: '#ffffff',
 		backdropOpacity: 0.3,
+		attachmentLoadingOpacity: 0.7,
 		...mentions
 	},
 	dark: {
@@ -112,6 +113,7 @@ export const themes: any = {
 		previewBackground: '#030b1b',
 		previewTintColor: '#ffffff',
 		backdropOpacity: 0.9,
+		attachmentLoadingOpacity: 0.3,
 		...mentions
 	},
 	black: {
@@ -159,6 +161,7 @@ export const themes: any = {
 		previewBackground: '#000000',
 		previewTintColor: '#ffffff',
 		backdropOpacity: 0.9,
+		attachmentLoadingOpacity: 0.3,
 		...mentions
 	}
 };

app/constants/localPath.ts

@@ -0,0 +1,4 @@
+import RNFetchBlob from 'rn-fetch-blob';
+
+export const DOCUMENTS_PATH = `${RNFetchBlob.fs.dirs.DocumentDir}/`;
+export const DOWNLOAD_PATH = `${RNFetchBlob.fs.dirs.DownloadDir}/`;

app/containers/ActionSheet/Provider.tsx

@@ -17,7 +17,7 @@ export const useActionSheet = () => useContext(context);
 
 const { Provider, Consumer } = context;
 
-export const withActionSheet = (Component: React.FC) =>
+export const withActionSheet = <P extends object>(Component: React.ComponentType<P>) =>
 	forwardRef((props: any, ref: ForwardedRef<any>) => (
 		<Consumer>{(contexts: any) => <Component {...props} {...contexts} ref={ref} />}</Consumer>
 	));

app/containers/Avatar/interfaces.ts

@@ -16,7 +16,7 @@ export interface IAvatar {
 	onPress(): void;
 	getCustomEmoji(): any;
 	avatarETag: string;
-	isStatic: boolean;
+	isStatic: boolean | string;
 	rid: string;
 	blockUnauthenticatedAccess: boolean;
 	serverVersion: string;

app/containers/FormContainer.tsx

@@ -27,13 +27,11 @@ export const FormContainerInner = ({ children }: { children: React.ReactNode }):
 );
 
 const FormContainer = ({ children, theme, testID, ...props }: IFormContainer): JSX.Element => (
-	// @ts-ignore
 	<KeyboardView
 		style={{ backgroundColor: themes[theme].backgroundColor }}
 		contentContainerStyle={sharedStyles.container}
 		keyboardVerticalOffset={128}>
 		<StatusBar />
-		{/* @ts-ignore*/}
 		<ScrollView
 			style={sharedStyles.container}
 			contentContainerStyle={[sharedStyles.containerScrollView, styles.scrollView]}

app/containers/Passcode/PasscodeChoose.tsx

@@ -8,7 +8,7 @@ import I18n from '../../i18n';
 
 interface IPasscodeChoose {
 	theme: string;
-	force: boolean;
+	force?: boolean;
 	finishProcess: Function;
 }
 

app/containers/Status/Status.tsx

@@ -1,19 +1,20 @@
 import React from 'react';
+import { StyleProp, TextStyle } from 'react-native';
 
 import { CustomIcon } from '../../lib/Icons';
 import { STATUS_COLORS } from '../../constants/colors';
 
 interface IStatus {
 	status: string;
 	size: number;
-	style: any;
+	style?: StyleProp<TextStyle>;
 }
 
 const Status = React.memo(({ style, status = 'offline', size = 32, ...props }: IStatus) => {
 	const name = `status-${status}`;
 	const isNameValid = CustomIcon.hasIcon(name);
 	const iconName = isNameValid ? name : 'status-offline';
-	const calculatedStyle = [
+	const calculatedStyle: StyleProp<TextStyle> = [
 		{
 			width: size,
 			height: size,

app/containers/TextInput.tsx

@@ -58,7 +58,7 @@ interface IRCTextInputProps extends TextInputProps {
 	};
 	loading?: boolean;
 	containerStyle?: StyleProp<ViewStyle>;
-	inputStyle?: TextStyle;
+	inputStyle?: StyleProp<TextStyle>;
 	inputRef?: React.Ref<unknown>;
 	testID?: string;
 	iconLeft?: string;

app/containers/UIKit/MultiSelect/Input.tsx

@@ -8,10 +8,10 @@ import ActivityIndicator from '../../ActivityIndicator';
 import styles from './styles';
 
 interface IInput {
-	children: JSX.Element;
+	children?: JSX.Element;
 	onPress: Function;
 	theme: string;
-	inputStyle: object;
+	inputStyle?: object;
 	disabled?: boolean | object;
 	placeholder?: string;
 	loading?: boolean;