chore: Merge 4.57.2 into master (#6141)

RocketChat · Feb 18, 2025 · 0e5e5c8 · 0e5e5c8
2 parents df051b9 + fd7c55f
commit 0e5e5c8
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 10 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -93,7 +93,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "4.57.1"
+        versionName "4.57.2"
         vectorDrawables.useSupportLibrary = true
         if (!isFoss) {
             manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]

diff --git a/app/containers/markdown/index.tsx b/app/containers/markdown/index.tsx
@@ -51,9 +51,9 @@ const Markdown: React.FC<IMarkdownProps> = ({
 	onLinkPress,
 	isTranslated
 }: IMarkdownProps) => {
-	if (!msg || isTranslated) return null;
+	if (!msg) return null;
 
-	const tokens = md ?? parse(msg);
+	const tokens = !isTranslated && md ? md : parse(msg);
 
 	if (isEmpty(tokens)) return null;
 

diff --git a/app/containers/message/Message.stories.tsx b/app/containers/message/Message.stories.tsx
@@ -135,8 +135,21 @@ export const Pinned = () => (
 
 export const Translated = () => (
 	<>
-		<Message msg='Message header' isTranslated />
-		<Message msg='Message without header' isTranslated isHeader={false} />
+		<Message
+			msg='Message translated'
+			md={[
+				{
+					type: 'PARAGRAPH',
+					value: [
+						{
+							type: 'PLAIN_TEXT',
+							value: 'md is never translated'
+						}
+					]
+				}
+			]}
+			isTranslated
+		/>
 	</>
 );
 

diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj
@@ -2983,7 +2983,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.57.1;
+				MARKETING_VERSION = 4.57.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -3027,7 +3027,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.57.1;
+				MARKETING_VERSION = 4.57.2;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService;

diff --git a/ios/RocketChatRN/Info.plist b/ios/RocketChatRN/Info.plist
@@ -28,7 +28,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.57.1</string>
+	<string>4.57.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist
@@ -26,7 +26,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.57.1</string>
+	<string>4.57.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>KeychainGroup</key>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket-chat-reactnative",
-	"version": "4.57.1",
+	"version": "4.57.2",
 	"private": true,
 	"scripts": {
 		"start": "react-native start",