chore: Merge 4.73.1 into master (#7370)

Author: diegolmello

CLAUDE.md

@@ -40,10 +40,6 @@ pnpm storybook:start       # Start Metro with Storybook UI
 pnpm storybook-generate    # Generate story snapshots
 ```
 
-## Worktree contract
-
-When using worktrees (`wt`), the post-start hook runs `pnpm install` only. `wt step copy-ignored` is opt-in and only used when the worktree will perform a native build (iOS/Android/Pods/Gradle/Bundler caches).
-
 ## Code Style
 
 - **Prettier**: tabs, single quotes, 130 char width, no trailing commas, arrow parens avoid, bracket same line

README.md

@@ -26,7 +26,7 @@ Also check the [#react-native](https://open.rocket.chat/channel/react-native) co
 Are you a dev and would like to help? Found a bug that you would like to report or a missing feature that you would like to work on? Great! We have written down a [Contribution guide](https://github.com/RocketChat/Rocket.Chat.ReactNative/blob/develop/CONTRIBUTING.md) so you can start easily.
 
 ## Whitelabel
-Do you want to make the app run on your own server only? [Follow our whitelabel documentation.](https://developer.rocket.chat/mobile-app/mobile-app-white-labelling)
+Do you want to make the app run on your own server only? [Follow our whitelabel documentation.](https://developer.rocket.chat/mobile-app-white-labelling)
 
 ## Engage with us
 ### Share your story

android/app/build.gradle

@@ -90,7 +90,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "4.73.0"
+        versionName "4.73.1"
         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

@@ -170,3 +170,4 @@ class NotificationIntentHandler {
         }
     }
 }
+

app/actions/actionsTypes.ts

@@ -22,7 +22,9 @@ export const ROOM = createRequestTypes('ROOM', [
 	'FORWARD',
 	'USER_TYPING',
 	'HISTORY_REQUEST',
-	'HISTORY_FINISHED'
+	'HISTORY_FINISHED',
+	'HISTORY_UI_LOADER_PUSH',
+	'HISTORY_UI_LOADER_POP'
 ]);
 export const INQUIRY = createRequestTypes('INQUIRY', [
 	...defaultTypes,

app/actions/room.ts

@@ -59,14 +59,24 @@ export interface IRoomHistoryFinished extends Action {
 	loaderId: string;
 }
 
+export interface IRoomHistoryUiLoaderPush extends Action {
+	loaderId: string;
+}
+
+export interface IRoomHistoryUiLoaderPop extends Action {
+	loaderId: string;
+}
+
 export type TActionsRoom = TSubscribeRoom &
 	TUnsubscribeRoom &
 	ILeaveRoom &
 	IDeleteRoom &
 	IForwardRoom &
 	IUserTyping &
 	IRoomHistoryRequest &
-	IRoomHistoryFinished;
+	IRoomHistoryFinished &
+	IRoomHistoryUiLoaderPush &
+	IRoomHistoryUiLoaderPop;
 
 export function subscribeRoom(rid: string): TSubscribeRoom {
 	return {
@@ -138,3 +148,17 @@ export function roomHistoryFinished({ loaderId }: { loaderId: string }): IRoomHi
 		loaderId
 	};
 }
+
+export function roomHistoryUiLoaderPush({ loaderId }: { loaderId: string }): IRoomHistoryUiLoaderPush {
+	return {
+		type: ROOM.HISTORY_UI_LOADER_PUSH,
+		loaderId
+	};
+}
+
+export function roomHistoryUiLoaderPop({ loaderId }: { loaderId: string }): IRoomHistoryUiLoaderPop {
+	return {
+		type: ROOM.HISTORY_UI_LOADER_POP,
+		loaderId
+	};
+}

app/containers/markdown/index.tsx

@@ -18,6 +18,7 @@ import Paragraph from './components/Paragraph';
 import { Code } from './components/code';
 import Heading from './components/Heading';
 import log from '../../lib/methods/helpers/log';
+import styles from './styles';
 
 export { default as MarkdownPreview } from './components/Preview';
 
@@ -35,6 +36,71 @@ interface IMarkdownProps {
 	textStyle?: StyleProp<TextStyle>;
 }
 
+type MarkdownBlock = Root[number];
+
+const PARSE_CACHE_MAX = 200;
+const parseCache = new Map<string, Root>();
+
+const parseMessage = (msg: string): Root => {
+	const cached = parseCache.get(msg);
+	if (cached) {
+		return cached;
+	}
+
+	const result = parse(msg);
+
+	if (parseCache.size >= PARSE_CACHE_MAX) {
+		const oldestKey = parseCache.keys().next().value;
+		if (oldestKey !== undefined) {
+			parseCache.delete(oldestKey);
+		}
+	}
+
+	parseCache.set(msg, result);
+	return result;
+};
+
+const resolveTokens = (msg: string, md: Root | undefined, isTranslated?: boolean): Root => {
+	if (!isTranslated && md) {
+		return md;
+	}
+
+	return parseMessage(typeof msg === 'string' ? msg : String(msg || ''));
+};
+
+const MarkdownBlockView = ({ block }: { block: MarkdownBlock }) => {
+	'use memo';
+
+	switch (block.type) {
+		case 'BIG_EMOJI':
+			return <BigEmoji value={block.value} />;
+		case 'UNORDERED_LIST':
+			return <UnorderedList value={block.value} />;
+		case 'ORDERED_LIST':
+			return <OrderedList value={block.value} />;
+		case 'TASKS':
+			return <TaskList value={block.value} />;
+		case 'QUOTE':
+			return <Quote value={block.value} />;
+		case 'PARAGRAPH':
+			return <Paragraph value={block.value} />;
+		case 'CODE':
+			return <Code value={block.value} />;
+		case 'HEADING':
+			return <Heading value={block.value} level={block.level} />;
+		case 'LINE_BREAK':
+			return <LineBreak />;
+		// This prop exists, but not even on the web it is treated, so...
+		// https://github.com/RocketChat/Rocket.Chat/blob/develop/packages/gazzodown/src/Markup.tsx
+		// case 'LIST_ITEM':
+		// 	return <View />;
+		case 'KATEX':
+			return <KaTeX value={block.value} />;
+		default:
+			return null;
+	}
+};
+
 const Markdown: React.FC<IMarkdownProps> = ({
 	msg,
 	md,
@@ -48,60 +114,40 @@ const Markdown: React.FC<IMarkdownProps> = ({
 	isTranslated,
 	textStyle
 }: IMarkdownProps) => {
-	if (!msg) return null;
+	'use memo';
+
+	let tokens: Root | null = null;
+
+	if (msg) {
+		try {
+			const result = resolveTokens(msg, md, isTranslated);
+			tokens = isEmpty(result) ? null : result;
+		} catch (e) {
+			log(e);
+		}
+	}
+
+	const contextValue = {
+		mentions,
+		channels,
+		useRealName,
+		username,
+		navToRoomInfo,
+		getCustomEmoji,
+		onLinkPress,
+		textStyle
+	};
 
-	let tokens;
-	try {
-		tokens = !isTranslated && md ? md : parse(typeof msg === 'string' ? msg : String(msg || ''));
-	} catch (e) {
-		log(e);
+	if (!tokens) {
 		return null;
 	}
 
-	if (isEmpty(tokens)) return null;
 	return (
-		<View style={{ gap: 2 }}>
-			<MarkdownContext.Provider
-				value={{
-					mentions,
-					channels,
-					useRealName,
-					username,
-					navToRoomInfo,
-					getCustomEmoji,
-					onLinkPress,
-					textStyle
-				}}>
-				{tokens?.map(block => {
-					switch (block.type) {
-						case 'BIG_EMOJI':
-							return <BigEmoji value={block.value} />;
-						case 'UNORDERED_LIST':
-							return <UnorderedList value={block.value} />;
-						case 'ORDERED_LIST':
-							return <OrderedList value={block.value} />;
-						case 'TASKS':
-							return <TaskList value={block.value} />;
-						case 'QUOTE':
-							return <Quote value={block.value} />;
-						case 'PARAGRAPH':
-							return <Paragraph value={block.value} />;
-						case 'CODE':
-							return <Code value={block.value} />;
-						case 'HEADING':
-							return <Heading value={block.value} level={block.level} />;
-						case 'LINE_BREAK':
-							return <LineBreak />;
-						// This prop exists, but not even on the web it is treated, so...
-						// https://github.com/RocketChat/Rocket.Chat/blob/develop/packages/gazzodown/src/Markup.tsx
-						// case 'LIST_ITEM':
-						// 	return <View />;
-						case 'KATEX':
-							return <KaTeX value={block.value} />;
-						default:
-							return null;
-					}
-				})}
+		<View style={styles.blocks}>
+			<MarkdownContext.Provider value={contextValue}>
+				{tokens.map((block, index) => (
+					<MarkdownBlockView key={`${block.type}-${index}`} block={block} />
+				))}
 			</MarkdownContext.Provider>
 		</View>
 	);

app/containers/markdown/styles.ts

@@ -8,6 +8,9 @@ const codeFontFamily = Platform.select({
 });
 
 export default StyleSheet.create({
+	blocks: {
+		gap: 2
+	},
 	container: {
 		alignItems: 'flex-start',
 		flexDirection: 'row'

app/lib/hooks/useVideoConf/index.tsx

@@ -1,4 +1,4 @@
-import { useCameraPermissions } from 'expo-camera';
+import { Camera } from 'expo-camera';
 import React, { useMemo } from 'react';
 
 import { useActionSheet } from '../../../containers/ActionSheet';
@@ -33,7 +33,6 @@ export const useVideoConf = (
 	const serverVersion = useAppSelector(state => state.server.version);
 	const { callEnabled, disabledTooltip, roomType } = useVideoConfCall(rid);
 
-	const [permission, requestPermission] = useCameraPermissions();
 	const { showActionSheet } = useActionSheet();
 
 	const isServer5OrNewer = useMemo(() => compareServerVersion(serverVersion, 'greaterThanOrEqualTo', '5.0.0'), [serverVersion]);
@@ -66,9 +65,10 @@ export const useVideoConf = (
 					fullContainer: true
 				});
 
+				const permission = await Camera.getCameraPermissionsAsync();
 				if (!permission?.granted) {
 					try {
-						await requestPermission();
+						await Camera.requestCameraPermissionsAsync();
 						handleAndroidBltPermission();
 					} catch (error) {
 						log(error);

app/lib/hooks/useVideoConf/useVideoConfCall.ts

@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react';
+import { shallowEqual } from 'react-redux';
 
 import { SubscriptionType } from '../../../definitions';
 import { getUserSelector } from '../../../selectors/login';
@@ -8,7 +9,6 @@ import { compareServerVersion } from '../../methods/helpers/compareServerVersion
 import { isReadOnly } from '../../methods/helpers/isReadOnly';
 import { useAppSelector } from '../useAppSelector';
 import { usePermissions } from '../usePermissions';
-import { useSetting } from '../useSetting';
 
 export const useVideoConfCall = (
 	rid: string
@@ -17,18 +17,31 @@ export const useVideoConfCall = (
 	const [disabledTooltip, setDisabledTooltip] = useState(false);
 	const [roomType, setRoomType] = useState<SubscriptionType>();
 
+	// Read all call-related settings in a single subscription instead of one useSetting per key.
+	const settings = useAppSelector(
+		state => ({
+			jitsiEnabled: state.settings.Jitsi_Enabled,
+			jitsiEnableTeams: state.settings.Jitsi_Enable_Teams,
+			jitsiEnableChannels: state.settings.Jitsi_Enable_Channels,
+			videoConfEnableDMs: state.settings.VideoConf_Enable_DMs,
+			videoConfEnableChannels: state.settings.VideoConf_Enable_Channels,
+			videoConfEnableTeams: state.settings.VideoConf_Enable_Teams,
+			videoConfEnableGroups: state.settings.VideoConf_Enable_Groups,
+			omnichannelCallProvider: state.settings.Omnichannel_call_provider
+		}),
+		shallowEqual
+	);
+
 	// OLD SETTINGS
-	const jitsiEnabled = useSetting('Jitsi_Enabled');
-	const jitsiEnableTeams = useSetting('Jitsi_Enable_Teams');
-	const jitsiEnableChannels = useSetting('Jitsi_Enable_Channels');
+	const { jitsiEnabled, jitsiEnableTeams, jitsiEnableChannels } = settings;
 
 	// NEW SETTINGS
 	// Only disable video conf if the settings are explicitly FALSE - any falsy value counts as true
-	const enabledDMs = useSetting('VideoConf_Enable_DMs') !== false;
-	const enabledChannel = useSetting('VideoConf_Enable_Channels') !== false;
-	const enabledTeams = useSetting('VideoConf_Enable_Teams') !== false;
-	const enabledGroups = useSetting('VideoConf_Enable_Groups') !== false;
-	const enabledLiveChat = useSetting('Omnichannel_call_provider') === 'default-provider';
+	const enabledDMs = settings.videoConfEnableDMs !== false;
+	const enabledChannel = settings.videoConfEnableChannels !== false;
+	const enabledTeams = settings.videoConfEnableTeams !== false;
+	const enabledGroups = settings.videoConfEnableGroups !== false;
+	const enabledLiveChat = settings.omnichannelCallProvider === 'default-provider';
 
 	const serverVersion = useAppSelector(state => state.server.version);
 	const isServer5OrNewer = compareServerVersion(serverVersion, 'greaterThanOrEqualTo', '5.0.0');