Merge branch 'develop' into improvement.sort-native

.circleci/config.yml

@@ -3,7 +3,7 @@ defaults: &defaults
 
 macos: &macos
   macos:
-    xcode: "11.2.1"
+    xcode: "11.5.0"
 
 bash-env: &bash-env
   BASH_ENV: "~/.nvm/nvm.sh"
@@ -33,14 +33,12 @@ save-npm-cache-mac: &save-npm-cache-mac
     - ./node_modules
 
 install-node: &install-node
-  name: Install Node 10
+  name: Install Node
   command: |
-    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.6/install.sh | bash
+    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
     source ~/.nvm/nvm.sh
-    # https://github.com/creationix/nvm/issues/1394
-    set +e
-    nvm install 10
-    echo 'export PATH="/home/circleci/.nvm/versions/node/v10.20.1/bin:$PATH"' >> ~/.bash_profile
+    INSTALLED_NODE=`nvm which current`
+    echo "export PATH=\"${INSTALLED_NODE%%/node}:\$PATH\"" >> ~/.bash_profile
     source ~/.bash_profile
 
 restore-gems-cache: &restore-gems-cache

.gitignore

@@ -59,3 +59,5 @@ buck-out/
 coverage
 
 .vscode/
+e2e/docker/rc_test_env/docker-compose.yml
+e2e/docker/data/db

android/app/build.gradle

@@ -139,7 +139,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "4.9.0"
+        versionName "4.10.0"
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
         missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60" // See note below!

app/containers/Avatar.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { View } from 'react-native';
-import FastImage from 'react-native-fast-image';
+import FastImage from '@rocket.chat/react-native-fast-image';
 import Touchable from 'react-native-platform-touchable';
 import { settings as RocketChatSettings } from '@rocket.chat/sdk';
 

app/containers/EmojiPicker/CustomEmoji.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import FastImage from 'react-native-fast-image';
+import FastImage from '@rocket.chat/react-native-fast-image';
 import PropTypes from 'prop-types';
 
 const CustomEmoji = React.memo(({ baseUrl, emoji, style }) => (

app/containers/InAppNotification/NotifierComponent.js

@@ -90,6 +90,8 @@ const NotifierComponent = React.memo(({
 
 		if (isMasterDetail) {
 			Navigation.navigate('DrawerNavigator');
+		} else {
+			Navigation.navigate('RoomsListView');
 		}
 		goRoom({ item, isMasterDetail });
 		hideNotification();

app/containers/LoginServices.js

@@ -5,29 +5,32 @@ import {
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { Base64 } from 'js-base64';
+import * as AppleAuthentication from 'expo-apple-authentication';
 
 import { withTheme } from '../theme';
 import sharedStyles from '../views/Styles';
 import { themes } from '../constants/colors';
-import { loginRequest as loginRequestAction } from '../actions/login';
 import Button from './Button';
 import OrSeparator from './OrSeparator';
 import Touch from '../utils/touch';
 import I18n from '../i18n';
 import random from '../utils/random';
+import RocketChat from '../lib/rocketchat';
 
+const BUTTON_HEIGHT = 48;
 const SERVICE_HEIGHT = 58;
+const BORDER_RADIUS = 2;
 const SERVICES_COLLAPSED_HEIGHT = 174;
 
 const styles = StyleSheet.create({
 	serviceButton: {
-		borderRadius: 2,
+		borderRadius: BORDER_RADIUS,
 		marginBottom: 10
 	},
 	serviceButtonContainer: {
-		borderRadius: 2,
+		borderRadius: BORDER_RADIUS,
 		width: '100%',
-		height: 48,
+		height: BUTTON_HEIGHT,
 		flexDirection: 'row',
 		alignItems: 'center',
 		justifyContent: 'center',
@@ -187,6 +190,21 @@ class LoginServices extends React.PureComponent {
 		this.openOAuth({ url, ssoToken, authType: 'cas' });
 	}
 
+	onPressAppleLogin = async() => {
+		try {
+			const { fullName, email, identityToken } = await AppleAuthentication.signInAsync({
+				requestedScopes: [
+					AppleAuthentication.AppleAuthenticationScope.FULL_NAME,
+					AppleAuthentication.AppleAuthenticationScope.EMAIL
+				]
+			});
+
+			await RocketChat.loginOAuthOrSso({ fullName, email, identityToken });
+		} catch {
+			// Do nothing
+		}
+	}
+
 	getOAuthState = () => {
 		const credentialToken = random(43);
 		return Base64.encodeURI(JSON.stringify({ loginStyle: 'popup', credentialToken, isCordova: true }));
@@ -262,6 +280,7 @@ class LoginServices extends React.PureComponent {
 	}
 
 	renderItem = (service) => {
+		const { CAS_enabled, theme } = this.props;
 		let { name } = service;
 		name = name === 'meteor-developer' ? 'meteor' : name;
 		const icon = `icon_${ name }`;
@@ -285,11 +304,27 @@ class LoginServices extends React.PureComponent {
 				onPress = () => this.onPressCas();
 				break;
 			}
+			case 'apple': {
+				onPress = () => this.onPressAppleLogin();
+				break;
+			}
 			default:
 				break;
 		}
+
+		if (name === 'apple') {
+			return (
+				<AppleAuthentication.AppleAuthenticationButton
+					buttonType={AppleAuthentication.AppleAuthenticationButtonType.CONTINUE}
+					buttonStyle={theme === 'light' ? AppleAuthentication.AppleAuthenticationButtonStyle.BLACK : AppleAuthentication.AppleAuthenticationButtonStyle.WHITE}
+					cornerRadius={BORDER_RADIUS}
+					style={[styles.serviceButton, { height: BUTTON_HEIGHT }]}
+					onPress={onPress}
+				/>
+			);
+		}
+
 		name = name.charAt(0).toUpperCase() + name.slice(1);
-		const { CAS_enabled, theme } = this.props;
 		let buttonText;
 		if (isSaml || (service.service === 'cas' && CAS_enabled)) {
 			buttonText = <Text style={[styles.serviceName, isSaml && { color: service.buttonLabelColor }]}>{name}</Text>;
@@ -356,8 +391,4 @@ const mapStateToProps = state => ({
 	services: state.login.services
 });
 
-const mapDispatchToProps = dispatch => ({
-	loginRequest: params => dispatch(loginRequestAction(params))
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(withTheme(LoginServices));
+export default connect(mapStateToProps)(withTheme(LoginServices));

app/containers/MessageActions/index.js

@@ -201,7 +201,13 @@ const MessageActions = React.memo(forwardRef(({
 		hideActionSheet();
 	};
 
-	const handleReadReceipt = message => Navigation.navigate('ReadReceiptsView', { messageId: message.id });
+	const handleReadReceipt = (message) => {
+		if (isMasterDetail) {
+			Navigation.navigate('ModalStackNavigator', { screen: 'ReadReceiptsView', params: { messageId: message.id } });
+		} else {
+			Navigation.navigate('ReadReceiptsView', { messageId: message.id });
+		}
+	};
 
 	const handleToggleTranslation = async(message) => {
 		try {

app/containers/MessageBox/CommandsPreview/Item.js

@@ -1,7 +1,7 @@
 import React, { useContext, useState } from 'react';
 import PropTypes from 'prop-types';
 import { TouchableOpacity } from 'react-native';
-import FastImage from 'react-native-fast-image';
+import FastImage from '@rocket.chat/react-native-fast-image';
 
 import styles from '../styles';
 import { CustomIcon } from '../../../lib/Icons';

app/containers/MessageBox/index.js

@@ -908,7 +908,7 @@ class MessageBox extends Component {
 		return (
 			<>
 				{commandsPreviewAndMentions}
-				<View style={[styles.composer, { borderTopColor: themes[theme].separatorColor }]}>
+				<View style={[styles.composer, { borderTopColor: themes[theme].borderColor }]}>
 					{replyPreview}
 					<View
 						style={[

app/containers/MessageBox/styles.js

@@ -15,7 +15,7 @@ export default StyleSheet.create({
 	},
 	composer: {
 		flexDirection: 'column',
-		borderTopWidth: StyleSheet.hairlineWidth
+		borderTopWidth: 1
 	},
 	textArea: {
 		flexDirection: 'row',

app/containers/UIKit/Image.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { View, StyleSheet } from 'react-native';
-import FastImage from 'react-native-fast-image';
+import FastImage from '@rocket.chat/react-native-fast-image';
 import PropTypes from 'prop-types';
 import { BLOCK_CONTEXT } from '@rocket.chat/ui-kit';
 

app/containers/UIKit/MultiSelect/Chips.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { Text, View } from 'react-native';
 import PropTypes from 'prop-types';
 import Touchable from 'react-native-platform-touchable';
-import FastImage from 'react-native-fast-image';
+import FastImage from '@rocket.chat/react-native-fast-image';
 
 import { themes } from '../../../constants/colors';
 import { textParser } from '../utils';

app/containers/UIKit/MultiSelect/Items.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { Text, FlatList } from 'react-native';
 import PropTypes from 'prop-types';
 import Touchable from 'react-native-platform-touchable';
-import FastImage from 'react-native-fast-image';
+import FastImage from '@rocket.chat/react-native-fast-image';
 
 import Separator from '../../Separator';
 import Check from '../../Check';

app/containers/markdown/index.js

@@ -383,9 +383,9 @@ class Markdown extends PureComponent {
 		m = m.replace(/^\[([\s]]*)\]\(([^)]*)\)\s/, '').trim();
 
 		if (preview) {
-			m = m.replace(/\n+/g, ' ');
 			m = shortnameToUnicode(m);
 			m = removeMarkdown(m);
+			m = m.replace(/\n+/g, ' ');
 			return (
 				<Text accessibilityLabel={m} style={[styles.text, { color: themes[theme].bodyText }, ...style]} numberOfLines={numberOfLines} testID={testID}>
 					{m}

app/containers/message/Image.js

@@ -1,7 +1,7 @@
 import React, { useContext } from 'react';
 import { View } from 'react-native';
 import PropTypes from 'prop-types';
-import FastImage from 'react-native-fast-image';
+import FastImage from '@rocket.chat/react-native-fast-image';
 import equal from 'deep-equal';
 import { createImageProgress } from 'react-native-image-progress';
 import * as Progress from 'react-native-progress';

app/containers/message/Urls.js

@@ -3,7 +3,7 @@ import {
 	View, Text, StyleSheet, Clipboard
 } from 'react-native';
 import PropTypes from 'prop-types';
-import FastImage from 'react-native-fast-image';
+import FastImage from '@rocket.chat/react-native-fast-image';
 import isEqual from 'lodash/isEqual';
 
 import Touchable from './Touchable';