chore: Merge 4.50.1 into master (#5783)

README.md

@@ -1,7 +1,7 @@
 # Rocket.Chat Mobile
 
 - **Supported server versions:** 0.70.0+
-- **Supported iOS versions**: 12+
+- **Supported iOS versions**: 13.4+
 - **Supported Android versions**: 6.0+
 
 ## Download

android/app/build.gradle

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

app/containers/MessageComposer/MessageComposer.test.tsx

@@ -100,8 +100,10 @@ describe('MessageComposer', () => {
 		const onSendMessage = jest.fn();
 		render(<Render context={{ onSendMessage }} />);
 		expect(screen.getByTestId('message-composer-send-audio')).toBeOnTheScreen();
+		expect(screen.queryByTestId('message-composer-send')).not.toBeOnTheScreen();
 
 		await user.type(screen.getByTestId('message-composer-input'), 'test');
+		expect(screen.getByTestId('message-composer-input')).not.toBe('');
 		expect(screen.queryByTestId('message-composer-send-audio')).not.toBeOnTheScreen();
 		expect(screen.getByTestId('message-composer-send')).toBeOnTheScreen();
 

app/containers/MessageComposer/components/ComposerInput.tsx

@@ -12,8 +12,14 @@ import { useSubscription, useAutoSaveDraft } from '../hooks';
 import sharedStyles from '../../../views/Styles';
 import { useTheme } from '../../../theme';
 import { userTyping } from '../../../actions/room';
-import { getRoomTitle, parseJson } from '../../../lib/methods/helpers';
-import { MAX_HEIGHT, MIN_HEIGHT, NO_CANNED_RESPONSES, MARKDOWN_STYLES } from '../constants';
+import { getRoomTitle, isTablet, parseJson } from '../../../lib/methods/helpers';
+import {
+	MAX_HEIGHT,
+	MIN_HEIGHT,
+	NO_CANNED_RESPONSES,
+	MARKDOWN_STYLES,
+	COMPOSER_INPUT_PLACEHOLDER_MAX_LENGTH
+} from '../constants';
 import database from '../../../lib/database';
 import Navigation from '../../../lib/navigation/appNavigation';
 import { emitter } from '../../../lib/methods/helpers/emitter';
@@ -44,6 +50,9 @@ export const ComposerInput = memo(
 		let placeholder = tmid ? I18n.t('Add_thread_reply') : '';
 		if (subscription && !tmid) {
 			placeholder = I18n.t('Message_roomname', { roomName: (subscription.t === 'd' ? '@' : '#') + getRoomTitle(subscription) });
+			if (!isTablet && placeholder.length > COMPOSER_INPUT_PLACEHOLDER_MAX_LENGTH) {
+				placeholder = `${placeholder.slice(0, COMPOSER_INPUT_PLACEHOLDER_MAX_LENGTH)}...`;
+			}
 		}
 		const route = useRoute<RouteProp<ChatsStackParamList, 'RoomView'>>();
 		const usedCannedResponse = route.params?.usedCannedResponse;
@@ -143,7 +152,8 @@ export const ComposerInput = memo(
 		}));
 
 		const setInput: TSetInput = (text, selection) => {
-			textRef.current = text;
+			const message = text.trim();
+			textRef.current = message;
 			if (inputRef.current) {
 				inputRef.current.setNativeProps({ text });
 			}
@@ -154,7 +164,7 @@ export const ComposerInput = memo(
 					selectionRef.current = selection;
 				}, 50);
 			}
-			setMicOrSend(text.length === 0 ? 'mic' : 'send');
+			setMicOrSend(message.length === 0 ? 'mic' : 'send');
 		};
 
 		const focus = () => {

app/containers/MessageComposer/constants.ts

@@ -35,3 +35,5 @@ export const MARKDOWN_STYLES: Record<TMarkdownStyle, string> = {
 	code: '`',
 	'code-block': '```'
 };
+
+export const COMPOSER_INPUT_PLACEHOLDER_MAX_LENGTH = 30;

app/containers/message/Components/Attachments/Image.tsx

@@ -93,7 +93,6 @@ const ImageContainer = ({
 }: IMessageImage): React.ReactElement | null => {
 	const { id, baseUrl, user } = useContext(MessageContext);
 	const [imageCached, setImageCached] = useFile(file, id);
-	console.log('🚀 ~ imageCached:', id, imageCached);
 	const [cached, setCached] = useState(false);
 	const [loading, setLoading] = useState(true);
 	const { theme } = useTheme();
@@ -107,7 +106,6 @@ const ImageContainer = ({
 		const handleCache = async () => {
 			if (img) {
 				const isImageCached = await handleGetMediaCache();
-				console.log('🚀 ~ handleCache ~ isImageCached:', isImageCached);
 				if (isImageCached) {
 					return;
 				}

app/lib/methods/helpers/fileDownload.ts

@@ -24,13 +24,17 @@ export const fileDownload = async (url: string, attachment?: IAttachment, fileNa
 
 export const fileDownloadAndPreview = async (url: string, attachment: IAttachment, messageId: string): Promise<void> => {
 	try {
-		const file = await fileDownload(url, attachment);
+		let file = url;
+		// If url starts with file://, we assume it's a local file and we don't download/decrypt it
+		if (!file.startsWith('file://')) {
+			file = await fileDownload(file, attachment);
 
-		if (attachment.encryption) {
-			if (!attachment.hashes?.sha256) {
-				throw new Error('Missing checksum');
+			if (attachment.encryption) {
+				if (!attachment.hashes?.sha256) {
+					throw new Error('Missing checksum');
+				}
+				await Encryption.addFileToDecryptFileQueue(messageId, file, attachment.encryption, attachment.hashes?.sha256);
 			}
-			await Encryption.addFileToDecryptFileQueue(messageId, file, attachment.encryption, attachment.hashes?.sha256);
 		}
 
 		await FileViewer.open(file, {

app/lib/methods/sendFileMessage/sendFileMessageV2.ts

@@ -18,7 +18,6 @@ export async function sendFileMessageV2(
 	let uploadPath: string | null = '';
 	let uploadRecord: TUploadModel | null;
 	try {
-		console.log('sendFileMessage', rid, fileInfo);
 		const { id, token } = user;
 		const headers = {
 			...RocketChatSettings.customHeaders,

app/views/RoomView/List/hooks/useMessages.ts

@@ -111,7 +111,5 @@ export const useMessages = ({
 		subscription.current?.unsubscribe();
 	};
 
-	// console.log(messages[0]);
-
 	return [messages, messagesIds, fetchMessages] as const;
 };

ios/RocketChatRN.xcodeproj/project.pbxproj

@@ -3135,7 +3135,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.50.0;
+				MARKETING_VERSION = 4.50.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -3179,7 +3179,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.50.0;
+				MARKETING_VERSION = 4.50.1;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService;

ios/RocketChatRN/Info.plist

@@ -28,7 +28,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.50.0</string>
+	<string>4.50.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

ios/ShareRocketChatRN/Info.plist

@@ -26,7 +26,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.50.0</string>
+	<string>4.50.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>KeychainGroup</key>

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rocket-chat-reactnative",
-	"version": "4.50.0",
+	"version": "4.50.1",
 	"private": true,
 	"scripts": {
 		"start": "react-native start",