From c9b474f8cc892b16af0974edfe13366ce0acde4b Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Fri, 14 Feb 2025 17:27:54 -0300
Subject: [PATCH 1/2] regression: auto translate not working (#6134)

---
 app/containers/markdown/index.tsx          |  4 ++--
 app/containers/message/Message.stories.tsx | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/containers/markdown/index.tsx b/app/containers/markdown/index.tsx
index 0efb1f7ff3..5add8e39b4 100644
--- 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
index 78e8d9602c..610ff20495 100644
--- 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
+		/>
 	</>
 );
 

From 7111c4b2e89e872bb504cb84ddb2388c26edd484 Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Fri, 14 Feb 2025 17:34:45 -0300
Subject: [PATCH 2/2] Set version to 4.58.2

---
 android/app/build.gradle                   | 2 +-
 ios/RocketChatRN.xcodeproj/project.pbxproj | 4 ++--
 ios/RocketChatRN/Info.plist                | 2 +-
 ios/ShareRocketChatRN/Info.plist           | 2 +-
 package.json                               | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index ba890b5f8b..a32f32b1f8 100644
--- 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.58.0"
+        versionName "4.57.2"
         vectorDrawables.useSupportLibrary = true
         if (!isFoss) {
             manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj
index 465a6ae48d..dae136676c 100644
--- 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.58.0;
+				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.58.0;
+				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
index f9405c63de..67dd1af86a 100644
--- 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.58.0</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
index 688841f420..9397f3c350 100644
--- 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.58.0</string>
+	<string>4.57.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>KeychainGroup</key>
diff --git a/package.json b/package.json
index ae072c6ba4..8c17d9587d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket-chat-reactnative",
-	"version": "4.58.0",
+	"version": "4.57.2",
 	"private": true,
 	"scripts": {
 		"start": "react-native start",