Merge branch 'RocketChat:develop' into develop

Author: divyanshu-patil

.github/workflows/prettier.yml

@@ -46,5 +46,5 @@ jobs:
           git config user.name "${{ github.actor }}"
           git config user.email "${{ github.actor }}@users.noreply.github.com"
           git add .
-          git commit -m "chore: format code and fix lint issues [skip ci]"
+          git commit -m "chore: format code and fix lint issues"
           git push origin ${{ github.ref_name }}

android/app/build.gradle

@@ -90,7 +90,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "4.69.0"
+        versionName "4.70.0"
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
         resValue "string", "rn_config_reader_custom_package", "chat.rocket.reactnative"

android/app/src/main/java/chat/rocket/reactnative/notification/NotificationIntentHandler.kt

@@ -93,6 +93,20 @@ class NotificationIntentHandler {
             }
 
             try {
+                val notId = extras.getString("notId")
+                
+                // Clear the notification messages from the static map to prevent stacking
+                if (!notId.isNullOrEmpty()) {
+                    try {
+                        val notIdInt = notId.toIntOrNull()
+                        if (notIdInt != null) {
+                            CustomPushNotification.clearMessages(notIdInt)
+                        }
+                    } catch (e: Exception) {
+                        Log.e(TAG, "Error clearing notification messages for ID $notId: ${e.message}", e)
+                    }
+                }
+
                 // Extract all notification data from Intent extras
                 // Only include serializable types to avoid JSON serialization errors
                 val notificationData = mutableMapOf<String, Any?>()

app/containers/markdown/components/Katex.tsx

@@ -13,15 +13,34 @@ interface IKaTeXProps {
 	value: KaTeXProps['value'];
 }
 
+const BLOCK_ENV_PATTERN = /\\begin\s*\{\s*(array|matrix|pmatrix|bmatrix|Bmatrix|vmatrix|Vmatrix)\s*\}/;
+
 export const KaTeX = ({ value }: IKaTeXProps): React.ReactElement | null => {
 	const { colors } = useTheme();
 	const fixAndroidWebviewCrashStyle: StyleProp<ViewStyle> = isAndroid ? { opacity: 0.99, overflow: 'hidden' } : {};
+	// KaTeX array does not render correctly in MathView (shows gray box).
+	// MathView does not throw, so renderError is never triggered.
+	if (BLOCK_ENV_PATTERN.test(value)) {
+		return (
+			<Katex
+				expression={value}
+				displayMode={true}
+				style={[{ flex: 1, height: DEFAULT_MESSAGE_HEIGHT }, fixAndroidWebviewCrashStyle]}
+			/>
+		);
+	}
+
 	return (
 		<MathView
 			math={value}
+			config={{ inline: false }}
 			style={{ color: colors.fontDefault }}
 			renderError={() => (
-				<Katex expression={value} style={[{ flex: 1, height: DEFAULT_MESSAGE_HEIGHT }, fixAndroidWebviewCrashStyle]} />
+				<Katex
+					expression={value}
+					displayMode={true}
+					style={[{ flex: 1, height: DEFAULT_MESSAGE_HEIGHT }, fixAndroidWebviewCrashStyle]}
+				/>
 			)}
 		/>
 	);

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

@@ -7,13 +7,19 @@ import Audio from './Audio';
 import Video from './Video';
 import CollapsibleQuote from './CollapsibleQuote';
 import AttachedActions from './AttachedActions';
+import Reply from './Reply';
 import MessageContext from '../../Context';
 import { type IMessageAttachments } from '../../interfaces';
 import { type IAttachment } from '../../../../definitions';
 import { getMessageFromAttachment } from '../../utils';
 
 const removeQuote = (file?: IAttachment) =>
-	file?.image_url || file?.audio_url || file?.video_url || (file?.actions?.length || 0) > 0 || file?.collapsed;
+	file?.image_url ||
+	file?.audio_url ||
+	file?.video_url ||
+	file?.collapsed ||
+	(file?.actions?.length || 0) > 0 ||
+	(file?.attachments?.length || 0) > 0;
 
 const Attachments: React.FC<IMessageAttachments> = React.memo(
 	({ attachments, timeFormat, showAttachment, getCustomEmoji, author }: IMessageAttachments) => {
@@ -68,6 +74,19 @@ const Attachments: React.FC<IMessageAttachments> = React.memo(
 				return <CollapsibleQuote key={index} attachment={file} timeFormat={timeFormat} getCustomEmoji={getCustomEmoji} />;
 			}
 
+			if (file.attachments?.length) {
+				return (
+					<Reply
+						key={index}
+						attachment={file}
+						timeFormat={timeFormat}
+						getCustomEmoji={getCustomEmoji}
+						showAttachment={showAttachment}
+						msg={msg}
+					/>
+				);
+			}
+
 			return null;
 		});
 		return <View style={{ gap: 4 }}>{attachmentsElements}</View>;

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

@@ -11,6 +11,13 @@ import { getMessageFromAttachment } from '../../utils';
 const isQuoteAttachment = (file?: IAttachment): boolean => {
 	if (!file) return false;
 
+	if (file.collapsed) return false;
+
+	// Attachments with nested attachments (e.g. message link + quoted image) are rendered only by Attachments as Reply
+	if (file.attachments?.length) {
+		return false;
+	}
+
 	if (!file.color && !file.text && (file.image_url || file.audio_url || file.video_url || file.collapsed)) {
 		return false;
 	}

app/containers/message/Message.stories.tsx

@@ -1245,6 +1245,53 @@ export const MessageWithReplyLargeFont = () => (
 	</>
 );
 
+export const MessageWithNestedReplyAndFile = () => (
+	<>
+		<Message
+			msg='Forwarded message with file inside'
+			attachments={[
+				{
+					author_name: 'rocket.cat',
+					message_link: 'https://open.rocket.chat/group/msg-id',
+					ts: date,
+					timeFormat: 'LT',
+					text: '',
+					attachments: [
+						{
+							author_name: 'user',
+							ts: date,
+							timeFormat: 'LT',
+							type: 'file',
+							title: 'document.pdf',
+							title_link: '/file-upload/abc/document.pdf'
+						}
+					]
+				}
+			]}
+		/>
+		<Message
+			msg='Forwarded message with nested image'
+			attachments={[
+				{
+					author_name: 'rocket.cat',
+					ts: date,
+					timeFormat: 'LT',
+					text: '',
+					attachments: [
+						{
+							author_name: 'user',
+							ts: date,
+							timeFormat: 'LT',
+							description: 'Nested image from forwarded message',
+							image_url: 'https://octodex.github.com/images/yaktocat.png'
+						}
+					]
+				}
+			]}
+		/>
+	</>
+);
+
 export const MessageWithReplyAndFileLargeFont = () => (
 	<>
 		<MessageLargeFont
@@ -2191,6 +2238,20 @@ const collapsedAttachments = {
 		}
 	]
 };
+
+const collapsibleAttachmentWithText = {
+	collapsed: true,
+	title: 'Collapsed attachment block',
+	text: 'This attachment text should NOT appear as plain text above the message or duplicate before the block.',
+	description: 'Attachment description that might also leak as duplicate plain text.',
+	color: '#2c3e50',
+	fields: [
+		{ title: 'Field 1', value: 'Value 1', short: true },
+		{ title: 'Field 2', value: 'Value 2', short: true },
+		{ title: 'Long field', value: 'This field value could also contribute to duplicate text when expanded.', short: false }
+	]
+};
+
 export const CollapsedAttachments = () => (
 	<>
 		<Message msg='Message' attachments={[collapsedAttachments]} />
@@ -2207,6 +2268,23 @@ export const CollapsedAttachmentsLargeFont = () => (
 	</>
 );
 
+export const CollapsibleAttachmentWithText = () => (
+	<>
+		<Message msg='This is the main message body.' attachments={[collapsibleAttachmentWithText]} />
+		<Message msg='This is the main message body.' attachments={[{ ...collapsibleAttachmentWithText, collapsed: false }]} />
+	</>
+);
+
+export const CollapsibleAttachmentWithTextLargeFont = () => (
+	<>
+		<MessageLargeFont msg='This is the main message body.' attachments={[collapsibleAttachmentWithText]} />
+		<MessageLargeFont
+			msg='This is the main message body.'
+			attachments={[{ ...collapsibleAttachmentWithText, collapsed: false }]}
+		/>
+	</>
+);
+
 const attachmentWithTextAndLink = [
 	{
 		title: 'Rocket.Chat',
@@ -2238,6 +2316,25 @@ export const Katex = () => (
 );
 export const KatexLargeFont = () => <MessageLargeFont {...katex} />;
 
+const katexArray = {
+	msg: '\\begin{array}{|c|c|c|c|c|c|} \\hline \\text{...} & \\text{...} \\\\ \\hline \\end{array}',
+	md: [
+		{
+			type: 'KATEX',
+			value:
+				' \\begin{array}{|c|c|c|c|c|c|} \\hline \\text{testing} & \\text{testingII} & \\text{testing III} & \\text{testing IV} & \\text{testV} & \\text{testVI} \\\\ \\hline \\text{TEST} & \\text{TEST} & \\text{TEST} & \\text{TEST} & \\text{TEST} & \\text{TEST} \\\\ \\hline\\text{TEST} & \\text{✅} & \\text{test} & \\text{test} & \\text{test} & \\text{✅} \\\\ \\hline \\end{array} '
+		}
+	]
+};
+
+export const KatexArray = () => (
+	<>
+		<Message {...katexArray} />
+	</>
+);
+
+export const KatexArrayLargeFont = () => <MessageLargeFont {...katexArray} />;
+
 const inlineKatex = {
 	msg: '\\(xˆ2 + yˆ2 - zˆ2\\)',
 	md: [