From f77e1760ad990d38c1df2a7fa05e5a65761ed7e1 Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Tue, 24 Sep 2024 10:00:16 -0300
Subject: [PATCH 1/6] feat: E2EE messages mentions (#5744)

---
 app/lib/constants/defaultSettings.ts |  6 ++++++
 app/lib/encryption/room.ts           |  2 ++
 app/lib/encryption/utils.ts          | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/app/lib/constants/defaultSettings.ts b/app/lib/constants/defaultSettings.ts
index ab1b4ea150..290d447ff7 100644
--- a/app/lib/constants/defaultSettings.ts
+++ b/app/lib/constants/defaultSettings.ts
@@ -258,5 +258,11 @@ export const defaultSettings = {
 	Accounts_ConfirmPasswordPlaceholder: {
 		type: 'valueAsString'
 	},
+	E2E_Enabled_Mentions: {
+		type: 'valueAsBoolean'
+	},
+	UTF8_User_Names_Validation: {
+		type: 'valueAsString'
+	},
 	...deprecatedSettings
 } as const;
diff --git a/app/lib/encryption/room.ts b/app/lib/encryption/room.ts
index 10cd50fda0..247d6f9f87 100644
--- a/app/lib/encryption/room.ts
+++ b/app/lib/encryption/room.ts
@@ -16,6 +16,7 @@ import {
 	bufferToB64,
 	bufferToB64URI,
 	bufferToUtf8,
+	getE2EEMentions,
 	encryptAESCTR,
 	exportAESCTR,
 	generateAESCTRKey,
@@ -245,6 +246,7 @@ export default class EncryptionRoom {
 				t: E2E_MESSAGE_TYPE,
 				e2e: E2E_STATUS.PENDING,
 				msg,
+				e2eMentions: getE2EEMentions(message.msg),
 				content: {
 					algorithm: 'rc.v1.aes-sha2' as const,
 					ciphertext: await this.encryptText(
diff --git a/app/lib/encryption/utils.ts b/app/lib/encryption/utils.ts
index a79a55a6cd..71787799f1 100644
--- a/app/lib/encryption/utils.ts
+++ b/app/lib/encryption/utils.ts
@@ -59,6 +59,24 @@ export const toString = (thing: string | ByteBuffer | Buffer | ArrayBuffer | Uin
 	// @ts-ignore
 	return new ByteBuffer.wrap(thing).toString('binary');
 };
+
+// https://github.com/RocketChat/Rocket.Chat/blob/b94db45cab297a3bcbafca4d135d83c898222380/apps/meteor/app/mentions/lib/MentionsParser.ts#L50
+const userMentionRegex = (pattern: string) => new RegExp(`(^|\\s|>)@(${pattern}(@(${pattern}))?(:([0-9a-zA-Z-_.]+))?)`, 'gm');
+const channelMentionRegex = (pattern: string) => new RegExp(`(^|\\s|>)#(${pattern}(@(${pattern}))?)`, 'gm');
+
+export const getE2EEMentions = (message?: string) => {
+	const e2eEnabledMentions = store.getState().settings.E2E_Enabled_Mentions;
+	if (!e2eEnabledMentions || !message) {
+		return undefined;
+	}
+	const utf8UserNamesValidation = store.getState().settings.UTF8_User_Names_Validation as string;
+
+	return {
+		e2eUserMentions: (message.match(userMentionRegex(utf8UserNamesValidation)) || []).map(match => match.trim()),
+		e2eChannelMentions: (message.match(channelMentionRegex(utf8UserNamesValidation)) || []).map(match => match.trim())
+	};
+};
+
 export const randomPassword = async (): Promise<string> => {
 	const random = await Promise.all(Array.from({ length: 4 }, () => SimpleCrypto.utils.getRandomValues(3)));
 	return `${random[0]}-${random[1]}-${random[2]}-${random[3]}`;

From e1f58bc79b1e9a40028569d21c80c5ae6e49cf8c Mon Sep 17 00:00:00 2001
From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Tue, 24 Sep 2024 22:06:35 +0530
Subject: [PATCH 2/6] feat(a11y): Color and contrast improvements (#5869)

---
 app/containers/Button/Button.stories.tsx            |  2 +-
 app/containers/Button/Button.test.tsx               |  4 ++--
 app/containers/Button/index.tsx                     |  2 +-
 app/containers/CallHeader.tsx                       |  2 +-
 app/containers/Check.tsx                            |  2 +-
 app/containers/TwoFactor/index.tsx                  | 13 +++----------
 app/containers/markdown/Hashtag.tsx                 |  4 ++--
 app/lib/constants/colors.ts                         |  4 ++--
 .../hooks/useVideoConf/StartACallActionSheet.tsx    |  8 +++-----
 app/lib/methods/helpers/navigation/index.ts         |  6 ++++--
 app/views/RoomsListView/ServersList.tsx             |  4 ++--
 11 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/app/containers/Button/Button.stories.tsx b/app/containers/Button/Button.stories.tsx
index d58fcdbe14..2ecf791037 100644
--- a/app/containers/Button/Button.stories.tsx
+++ b/app/containers/Button/Button.stories.tsx
@@ -4,7 +4,7 @@ import Button from '.';
 
 const buttonProps = {
 	title: 'Press me!',
-	type: 'primary',
+	type: 'primary' as const,
 	onPress: () => {},
 	testID: 'testButton'
 };
diff --git a/app/containers/Button/Button.test.tsx b/app/containers/Button/Button.test.tsx
index 6d89faa452..9fd76940fa 100644
--- a/app/containers/Button/Button.test.tsx
+++ b/app/containers/Button/Button.test.tsx
@@ -8,7 +8,7 @@ const onPressMock = jest.fn();
 
 const testProps = {
 	title: 'Press me!',
-	type: 'primary',
+	type: 'primary' as const,
 	onPress: onPressMock,
 	testID: 'testButton',
 	initialText: 'Initial text',
@@ -19,7 +19,7 @@ const TestButton = ({ loading = false, disabled = false }) => (
 	<View>
 		<Button
 			title={testProps.title}
-			type={testProps.title}
+			type={testProps.type}
 			onPress={testProps.onPress}
 			testID={testProps.testID}
 			accessibilityLabel={testProps.title}
diff --git a/app/containers/Button/index.tsx b/app/containers/Button/index.tsx
index 1632cded4a..1e3c56e04f 100644
--- a/app/containers/Button/index.tsx
+++ b/app/containers/Button/index.tsx
@@ -9,7 +9,7 @@ import ActivityIndicator from '../ActivityIndicator';
 interface IButtonProps extends PlatformTouchableProps {
 	title: string;
 	onPress: () => void;
-	type?: string; // primary | secondary
+	type?: 'primary' | 'secondary';
 	backgroundColor?: string;
 	loading?: boolean;
 	color?: string;
diff --git a/app/containers/CallHeader.tsx b/app/containers/CallHeader.tsx
index a0ca72520f..10fde5cd90 100644
--- a/app/containers/CallHeader.tsx
+++ b/app/containers/CallHeader.tsx
@@ -33,7 +33,7 @@ export const CallHeader = ({ mic, cam, setCam, setMic, title, avatar, uid, name,
 			if (enabled) return { button: colors.buttonBackgroundSecondaryDisabled, icon: colors.strokeExtraDark };
 			return { button: 'transparent', icon: colors.strokeLight };
 		}
-		if (enabled) return { button: colors.strokeHighlight, icon: colors.surfaceLight };
+		if (enabled) return { button: colors.buttonBackgroundPrimaryDefault, icon: colors.surfaceLight };
 		return { button: 'transparent', icon: colors.strokeExtraDark };
 	};
 
diff --git a/app/containers/Check.tsx b/app/containers/Check.tsx
index d97b71f9ee..5f47f52fb1 100644
--- a/app/containers/Check.tsx
+++ b/app/containers/Check.tsx
@@ -15,7 +15,7 @@ const styles = StyleSheet.create({
 
 const Check = React.memo(() => {
 	const { theme } = useTheme();
-	return <CustomIcon style={styles.icon} color={themes[theme].badgeBackgroundLevel2} size={22} name='check' />;
+	return <CustomIcon style={styles.icon} color={themes[theme].fontInfo} size={22} name='check' />;
 });
 
 export default Check;
diff --git a/app/containers/TwoFactor/index.tsx b/app/containers/TwoFactor/index.tsx
index b184227533..376f1fc98a 100644
--- a/app/containers/TwoFactor/index.tsx
+++ b/app/containers/TwoFactor/index.tsx
@@ -110,9 +110,8 @@ const TwoFactor = React.memo(({ isMasterDetail }: { isMasterDetail: boolean }) =
 					style={[
 						styles.content,
 						isMasterDetail && [sharedStyles.modalFormSheet, styles.tablet],
-						{ backgroundColor: themes[theme].surfaceHover }
-					]}
-				>
+						{ backgroundColor: themes[theme].surfaceTint }
+					]}>
 					<Text style={[styles.title, { color }]}>{I18n.t(method?.title || 'Two_Factor_Authentication')}</Text>
 					{method?.text ? <Text style={[styles.subtitle, { color }]}>{I18n.t(method.text)}</Text> : null}
 					<FormTextInput
@@ -133,13 +132,7 @@ const TwoFactor = React.memo(({ isMasterDetail }: { isMasterDetail: boolean }) =
 						</Text>
 					) : null}
 					<View style={styles.buttonContainer}>
-						<Button
-							title={I18n.t('Cancel')}
-							type='secondary'
-							backgroundColor={themes[theme].surfaceTint}
-							style={styles.button}
-							onPress={onCancel}
-						/>
+						<Button title={I18n.t('Cancel')} type='secondary' style={styles.button} onPress={onCancel} />
 						<Button title={I18n.t('Verify')} type='primary' style={styles.button} onPress={onSubmit} testID='two-factor-send' />
 					</View>
 				</View>
diff --git a/app/containers/markdown/Hashtag.tsx b/app/containers/markdown/Hashtag.tsx
index 2433ec897e..79b9912433 100644
--- a/app/containers/markdown/Hashtag.tsx
+++ b/app/containers/markdown/Hashtag.tsx
@@ -54,7 +54,7 @@ const Hashtag = React.memo(({ hashtag, channels, navToRoomInfo, style = [] }: IH
 				style={[
 					styles.mention,
 					{
-						color: themes[theme].badgeBackgroundLevel1
+						color: themes[theme].fontInfo
 					},
 					...style
 				]}
@@ -63,7 +63,7 @@ const Hashtag = React.memo(({ hashtag, channels, navToRoomInfo, style = [] }: IH
 			</Text>
 		);
 	}
-	return <Text style={[styles.text, { color: themes[theme].fontDefault }, ...style]}>{`#${hashtag}`}</Text>;
+	return <Text style={[styles.text, { color: themes[theme].fontInfo }, ...style]}>{`#${hashtag}`}</Text>;
 });
 
 export default Hashtag;
diff --git a/app/lib/constants/colors.ts b/app/lib/constants/colors.ts
index 52a10b2551..9e7753c20a 100644
--- a/app/lib/constants/colors.ts
+++ b/app/lib/constants/colors.ts
@@ -23,7 +23,7 @@ const light = {
 	strokeError: '#EC0D2A',
 
 	fontWhite: '#FFFFFF',
-	fontDisabled: '#CBCED1',
+	fontDisabled: '#FFFFFF',
 	fontAnnotation: '#9EA2A8',
 	fontHint: '#6C727A',
 	fontSecondaryInfo: '#6C727A',
@@ -152,7 +152,7 @@ const dark = {
 	userPresenceOffline: '#6C727A',
 	userPresenceDisabled: '#955828',
 
-	buttonBackgroundPrimaryDefault: '#3976D1',
+	buttonBackgroundPrimaryDefault: '#095AD2',
 	buttonBackgroundPrimaryPress: '#245399',
 	buttonBackgroundPrimaryDisabled: '#1D3963',
 
diff --git a/app/lib/hooks/useVideoConf/StartACallActionSheet.tsx b/app/lib/hooks/useVideoConf/StartACallActionSheet.tsx
index e2445d1c8e..c5a4601caf 100644
--- a/app/lib/hooks/useVideoConf/StartACallActionSheet.tsx
+++ b/app/lib/hooks/useVideoConf/StartACallActionSheet.tsx
@@ -47,8 +47,7 @@ export default function StartACallActionSheet({
 	return (
 		<View
 			style={[style.actionSheetContainer, { paddingBottom: bottom }]}
-			onLayout={e => setContainerWidth(e.nativeEvent.layout.width / 2)}
-		>
+			onLayout={e => setContainerWidth(e.nativeEvent.layout.width / 2)}>
 			{calling && roomType === SubscriptionType.DIRECT ? <Ringer ringer={ERingerSounds.DIALTONE} /> : null}
 			<CallHeader
 				title={calling && user.direct ? i18n.t('Calling') : i18n.t('Start_a_call')}
@@ -65,8 +64,7 @@ export default function StartACallActionSheet({
 				style={[
 					style.actionSheetPhotoContainer,
 					{ backgroundColor: cam ? undefined : colors.surfaceNeutral, width: containerWidth }
-				]}
-			>
+				]}>
 				{cam ? (
 					<Camera style={[style.cameraContainer, { width: containerWidth }]} type={CameraType.front} />
 				) : (
@@ -75,7 +73,7 @@ export default function StartACallActionSheet({
 			</View>
 			<Button
 				backgroundColor={calling ? colors.buttonBackgroundPrimaryDisabled : colors.buttonBackgroundPrimaryDefault}
-				color={calling ? colors.strokeDark : colors.surfaceLight}
+				color={calling ? colors.strokeDark : colors.fontWhite}
 				onPress={() => {
 					if (calling) {
 						dispatch(cancelCall({}));
diff --git a/app/lib/methods/helpers/navigation/index.ts b/app/lib/methods/helpers/navigation/index.ts
index e20101c47f..a7a8d43617 100644
--- a/app/lib/methods/helpers/navigation/index.ts
+++ b/app/lib/methods/helpers/navigation/index.ts
@@ -1,5 +1,6 @@
 import { StyleSheet } from 'react-native';
 import { DarkTheme, DefaultTheme } from '@react-navigation/native';
+import { StackNavigationOptions } from '@react-navigation/stack';
 
 import { themes } from '../../../constants';
 import { TSupportedThemes } from '../../../../theme';
@@ -7,11 +8,12 @@ import sharedStyles from '../../../../views/Styles';
 
 export * from './animations';
 
-export const defaultHeader = {
+export const defaultHeader: StackNavigationOptions = {
 	headerBackTitleVisible: false,
 	headerBackTestID: 'header-back',
 	cardOverlayEnabled: true,
-	cardStyle: { backgroundColor: 'transparent' }
+	cardStyle: { backgroundColor: 'transparent' },
+	headerTitleAlign: 'left'
 };
 
 export const cardStyle = {
diff --git a/app/views/RoomsListView/ServersList.tsx b/app/views/RoomsListView/ServersList.tsx
index b98eb41a78..452c2664ed 100644
--- a/app/views/RoomsListView/ServersList.tsx
+++ b/app/views/RoomsListView/ServersList.tsx
@@ -136,7 +136,7 @@ const ServersList = () => {
 			<View style={[styles.serversListContainerHeader, styles.serverHeader, { borderColor: colors.strokeLight }]}>
 				<Text style={[styles.serverHeaderText, { color: colors.fontSecondaryInfo }]}>{I18n.t('Server')}</Text>
 				<TouchableOpacity onPress={addServer} testID='rooms-list-header-server-add'>
-					<Text style={[styles.serverHeaderAdd, { color: colors.badgeBackgroundLevel2 }]}>{I18n.t('Add_Server')}</Text>
+					<Text style={[styles.serverHeaderAdd, { color: colors.fontInfo }]}>{I18n.t('Add_Server')}</Text>
 				</TouchableOpacity>
 			</View>
 			<FlatList
@@ -156,7 +156,7 @@ const ServersList = () => {
 				style={styles.buttonCreateWorkspace}
 				color={colors.badgeBackgroundLevel2}
 				backgroundColor={colors.surfaceRoom}
-				styleText={[styles.serverHeaderAdd, { textAlign: 'center' }]}
+				styleText={[styles.serverHeaderAdd, { textAlign: 'center', color: colors.fontInfo }]}
 			/>
 		</View>
 	);

From 19f0288411a696cbc5e67792d8480058058e0249 Mon Sep 17 00:00:00 2001
From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Tue, 24 Sep 2024 22:53:57 +0530
Subject: [PATCH 3/6] feat: Help page (#5855)

Co-authored-by: Diego Mello <diegolmello@gmail.com>
---
 app/containers/List/ListIcon.tsx              |  2 +-
 app/containers/NewWindowIcon.tsx              | 10 +++
 app/i18n/locales/ar.json                      |  5 ++
 app/i18n/locales/bn-IN.json                   |  5 ++
 app/i18n/locales/cs.json                      |  5 ++
 app/i18n/locales/de.json                      |  5 ++
 app/i18n/locales/en.json                      |  5 ++
 app/i18n/locales/es.json                      |  5 ++
 app/i18n/locales/fi.json                      |  5 ++
 app/i18n/locales/fr.json                      |  5 ++
 app/i18n/locales/hi-IN.json                   |  5 ++
 app/i18n/locales/hu.json                      |  5 ++
 app/i18n/locales/it.json                      |  5 ++
 app/i18n/locales/ja.json                      |  5 ++
 app/i18n/locales/nl.json                      |  5 ++
 app/i18n/locales/pt-BR.json                   |  5 ++
 app/i18n/locales/pt-PT.json                   |  5 ++
 app/i18n/locales/ru.json                      |  5 ++
 app/i18n/locales/sl-SI.json                   |  5 ++
 app/i18n/locales/sv.json                      |  5 ++
 app/i18n/locales/ta-IN.json                   |  5 ++
 app/i18n/locales/te-IN.json                   |  5 ++
 app/i18n/locales/tr.json                      |  5 ++
 app/i18n/locales/zh-CN.json                   |  5 ++
 app/i18n/locales/zh-TW.json                   |  5 ++
 app/stacks/InsideStack.tsx                    |  2 +
 app/stacks/types.ts                           |  1 +
 app/views/GetHelpView.tsx                     | 61 +++++++++++++++++++
 .../components/NotificationDelay.tsx          |  3 +-
 app/views/SettingsView/index.tsx              | 15 ++++-
 e2e/tests/assorted/04-setting.spec.ts         | 13 +++-
 31 files changed, 216 insertions(+), 6 deletions(-)
 create mode 100644 app/containers/NewWindowIcon.tsx
 create mode 100644 app/views/GetHelpView.tsx

diff --git a/app/containers/List/ListIcon.tsx b/app/containers/List/ListIcon.tsx
index df22f38719..2e074421ca 100644
--- a/app/containers/List/ListIcon.tsx
+++ b/app/containers/List/ListIcon.tsx
@@ -5,7 +5,7 @@ import { CustomIcon, TIconsName } from '../CustomIcon';
 import { ICON_SIZE } from './constants';
 import { useTheme } from '../../theme';
 
-interface IListIcon {
+export interface IListIcon {
 	name: TIconsName;
 	color?: string;
 	style?: StyleProp<ViewStyle>;
diff --git a/app/containers/NewWindowIcon.tsx b/app/containers/NewWindowIcon.tsx
new file mode 100644
index 0000000000..da984412c9
--- /dev/null
+++ b/app/containers/NewWindowIcon.tsx
@@ -0,0 +1,10 @@
+import React from 'react';
+import { I18nManager } from 'react-native';
+
+import ListIcon, { IListIcon } from './List/ListIcon';
+
+const NewWindowIcon = (props: Omit<IListIcon, 'name'>) => (
+	<ListIcon name='new-window' style={I18nManager.isRTL ? { transform: [{ rotateY: '180deg' }] } : null} {...props} />
+);
+
+export default NewWindowIcon;
diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json
index c3bac972bf..69252aec1b 100644
--- a/app/i18n/locales/ar.json
+++ b/app/i18n/locales/ar.json
@@ -1,6 +1,7 @@
 {
   "1_person_reacted": "تفاعل شخص واحد",
   "A_meaningful_name_for_the_discussion_room": "اسم معبر لغرفة النقاش",
+  "Accessibility_statement": "بيان الوصول",
   "Actions": "الإجراءات",
   "Activity": "النشاط",
   "Add_Server": "إضافة خادم",
@@ -163,6 +164,9 @@
   "Forward_to_user": "إعادة توجيه لمستخدم",
   "Full_table": "انقر لرؤية الجدول كاملاً",
   "Generate_New_Link": "إنشاء رابط جديد",
+  "Get_help": "احصل على المساعدة",
+  "Glossary_of_simplified_terms": "مسرد المصطلحات المبسطة",
+  "Help": "مساعدة",
   "Hide_room": "إخفاء",
   "Hide_System_Messages": "إخفاء رسائل النظام",
   "Hide_type_messages": "إخفاء رسائل \"{{type}}\"",
@@ -352,6 +356,7 @@
   "Review_app_unable_store": "لم يتمكن من فتح {{store}}",
   "Review_app_yes": "أكيد!",
   "Review_this_app": "تقييم هذا التطبيق",
+  "Rocket_Chat_Documentation": "توثيق Rocket.Chat",
   "Roles": "أدوار",
   "Room_Info": "معلومات الغرفة",
   "Room_Info_Edit": "تعديل معلومات الغرفة",
diff --git a/app/i18n/locales/bn-IN.json b/app/i18n/locales/bn-IN.json
index 06719eb495..bd3fda9693 100644
--- a/app/i18n/locales/bn-IN.json
+++ b/app/i18n/locales/bn-IN.json
@@ -6,6 +6,7 @@
   "A_new_owner_will_be_assigned_automatically_to__count__room": "{{count}} রুমে নতুন মালিক স্বয়ংক্রিয়ভাবে নির্ধারণ করা হবে।",
   "A_new_owner_will_be_assigned_automatically_to__count__rooms": "{{count}} রুমে নতুন মালিক স্বয়ংক্রিয়ভাবে নির্ধারণ করা হবে।",
   "accept": "গ্রহণ করুন",
+  "Accessibility_statement": "অ্যাক্সেসিবিলিটি বিবৃতি",
   "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "ব্যবহারকারীদের 'সেইমসঙ্গে চ্যানেলে প্রেরণ করুন' আচরণ নির্ধারণ করার অনুমতি দিন",
   "Actions": "ক্রিয়াবলী",
   "Activity": "ক্রিয়া",
@@ -275,9 +276,12 @@
   "Forward_to_user": "ব্যবহারকারীকে ফরোয়ার্ড",
   "Full_table": "পুরো টেবিল দেখতে ক্লিক করুন",
   "Generate_New_Link": "নতুন লিঙ্ক তৈরি করুন",
+  "Get_help": "সাহায্য পান",
   "Get_link": "লিঙ্ক পান",
+  "Glossary_of_simplified_terms": "সরলীকৃত শর্তগুলির গ্লোসারি",
   "Group_by": "দ্বারা গ্রুপ করুন",
   "Has_left_the_team": "দল ছেড়ে দিয়েছে",
+  "Help": "সাহায্য",
   "Hide_System_Messages": "সিস্টেম বার্তা লুকান",
   "Hide_type_messages": "\"{{type}}\" বার্তা লুকান",
   "How_It_Works": "এটি কীভাবে কাজ করে",
@@ -542,6 +546,7 @@
   "Review_app_unable_store": "{{store}} খোলতে অক্ষম",
   "Review_app_yes": "হ্যাঁ!",
   "Review_this_app": "এই অ্যাপটি পর্যালোচনা করুন",
+  "Rocket_Chat_Documentation": "Rocket.Chat ডকুমেন্টেশন",
   "Roles": "ভূমিকা",
   "room_allowed_reactions": "রিয়েকশন অনুমতি দেওয়া হয়েছে",
   "room_archived": "আর্কাইভ করা রুম",
diff --git a/app/i18n/locales/cs.json b/app/i18n/locales/cs.json
index a5334a0ec1..a561550396 100644
--- a/app/i18n/locales/cs.json
+++ b/app/i18n/locales/cs.json
@@ -6,6 +6,7 @@
   "A_new_owner_will_be_assigned_automatically_to__count__room": "K {{count}} místnosti bude automaticky přiřazen nový vlastník.",
   "A_new_owner_will_be_assigned_automatically_to__count__rooms": "K {{count}} místnostem bude automaticky přiřazen nový vlastník.",
   "accept": "Akceptovat",
+  "Accessibility_statement": "Prohlášení o přístupnosti",
   "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Povolit uživatelům vybrat chování 'Také odeslat do kanálu'",
   "Actions": "Akce",
   "Activity": "Aktivita",
@@ -294,10 +295,13 @@
   "Forward_to_user": "Přeposlat uživateli",
   "Full_table": "Kliknutím zobrazíte celou tabulku",
   "Generate_New_Link": "Vygenerovat nový odkaz",
+  "Get_help": "Získat pomoc",
   "Get_link": "Získat odkaz",
+  "Glossary_of_simplified_terms": "Slovník zjednodušených termínů",
   "Go_to_your_device_settings_and_allow_microphone": "Přejděte do nastavení zařízení a povolte přístup k mikrofonu pro Rocket.Chat",
   "Group_by": "Skupina vytvořená",
   "Has_left_the_team": "opustil tým",
+  "Help": "Pomoc",
   "Hide_room": "Skrýt",
   "Hide_System_Messages": "Skrýt systémové zprávy",
   "Hide_type_messages": "Skrýt \"{{type}}\" zprávy",
@@ -592,6 +596,7 @@
   "Review_app_unable_store": "Nelze otevřít {{store}}",
   "Review_app_yes": "Tak určitě!",
   "Review_this_app": "Zkontrolovat tuto aplikaci",
+  "Rocket_Chat_Documentation": "Dokumentace Rocket.Chat",
   "Roles": "Role",
   "room_allowed_reactions": "povolené reakce",
   "room_archived": "archivovaná místnost",
diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json
index bf58637a52..dc565d4a07 100644
--- a/app/i18n/locales/de.json
+++ b/app/i18n/locales/de.json
@@ -6,6 +6,7 @@
   "A_new_owner_will_be_assigned_automatically_to__count__room": "Ein neuer Besitzer wird automatisch zu {{count}} Raum zugeordnet.",
   "A_new_owner_will_be_assigned_automatically_to__count__rooms": "Ein neuer Besitzer wird automatisch zu {{count}} Räumen zugeordnet.",
   "accept": "Annehmen",
+  "Accessibility_statement": "Barrierefreiheits-Erklärung",
   "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Nutzern erlauben das Verhalten für \"auch an den Kanal senden\" zu bestimmen.",
   "Actions": "Aktionen",
   "Activity": "Aktivität",
@@ -268,9 +269,12 @@
   "Forward_to_user": "Weiterleiten an Benutzer",
   "Full_table": "Klicken, um die ganze Tabelle anzuzeigen",
   "Generate_New_Link": "Neuen Link erstellen",
+  "Get_help": "Hilfe holen",
   "Get_link": "Link erhalten",
+  "Glossary_of_simplified_terms": "Glossar vereinfachter Begriffe",
   "Group_by": "Gruppieren nach",
   "Has_left_the_team": "Hat das Team verlassen",
+  "Help": "Hilfe",
   "Hide_room": "Raum verstecken",
   "Hide_System_Messages": "Systemnachrichten ausblenden",
   "Hide_type_messages": "\"{{type}}\"-Nachrichten ausblenden",
@@ -530,6 +534,7 @@
   "Review_app_unable_store": "Kann {{store}} nicht öffnen",
   "Review_app_yes": "Sicher!",
   "Review_this_app": "App bewerten",
+  "Rocket_Chat_Documentation": "Rocket.Chat Dokumentation",
   "Roles": "Rollen",
   "room_allowed_reactions": "hat Reaktionen erlaubt",
   "room_archived": "hat den Raum archiviert",
diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json
index ab49887112..95a36428d9 100644
--- a/app/i18n/locales/en.json
+++ b/app/i18n/locales/en.json
@@ -6,6 +6,7 @@
   "A_new_owner_will_be_assigned_automatically_to__count__room": "A new owner will be assigned automatically to {{count}} room.",
   "A_new_owner_will_be_assigned_automatically_to__count__rooms": "A new owner will be assigned automatically to {{count}} rooms.",
   "accept": "Accept",
+  "Accessibility_statement": "Accessibility statement",
   "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Allow users to select the 'Also send to channel' behavior",
   "Actions": "Actions",
   "Activity": "Activity",
@@ -310,10 +311,13 @@
   "Forward_to_user": "Forward to user",
   "Full_table": "Click to see full table",
   "Generate_New_Link": "Generate new link",
+  "Get_help": "Get help",
   "Get_link": "Get link",
+  "Glossary_of_simplified_terms": "Glossary of simplified terms",
   "Go_to_your_device_settings_and_allow_microphone": "Go to your device settings and allow microphone access for Rocket.Chat",
   "Group_by": "Group by",
   "Has_left_the_team": "has left the team",
+  "Help": "Help",
   "Hide_room": "Hide",
   "Hide_System_Messages": "Hide system messages",
   "Hide_type_messages": "Hide \"{{type}}\" messages",
@@ -611,6 +615,7 @@
   "Review_app_unable_store": "Unable to open {{store}}",
   "Review_app_yes": "Sure!",
   "Review_this_app": "Review this app",
+  "Rocket_Chat_Documentation": "Rocket.Chat documentation",
   "Roles": "Roles",
   "room_allowed_reactions": "allowed reactions",
   "room_archived": "archived room",
diff --git a/app/i18n/locales/es.json b/app/i18n/locales/es.json
index 6273ba700c..e8f766c798 100644
--- a/app/i18n/locales/es.json
+++ b/app/i18n/locales/es.json
@@ -1,5 +1,6 @@
 {
   "1_person_reacted": "1 persona reaccionó",
+  "Accessibility_statement": "Declaración de accesibilidad",
   "Actions": "Acciones",
   "Activity": "Actividad",
   "Add_Server": "Añadir servidor",
@@ -108,7 +109,10 @@
   "Forgot_password": "¿Ha olvidado su contraseña?",
   "Forgot_password_If_this_email_is_registered": "Si este email está registrado, te enviaremos las instrucciones para resetear tu contraseña. Si no recibes un email en breve, vuelve aquí e inténtalo de nuevo.",
   "Full_table": "Click para ver la tabla completa",
+  "Get_help": "Obtener ayuda",
   "Get_link": "Obtener enlace",
+  "Glossary_of_simplified_terms": "Glosario de términos simplificados",
+  "Help": "Ayuda",
   "Hide_room": "Ocultar",
   "In_App_And_Desktop": "En la aplicación y en el escritorio",
   "In_App_and_Desktop_Alert_info": "Muestra un banner en la parte superior de la pantalla cuando la aplicación esté abierta y muestra una notificación en el escritorio",
@@ -203,6 +207,7 @@
   "RESET": "RESET",
   "Reset_password": "Resetear contraseña",
   "resetting_password": "reseteando contraseña",
+  "Rocket_Chat_Documentation": "Documentación de Rocket.Chat",
   "Roles": "Roles",
   "Room_Info": "Información de la sala",
   "Room_Info_Edit": "Editar información de la sala",
diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json
index 97f5504a4c..04210d90cf 100644
--- a/app/i18n/locales/fi.json
+++ b/app/i18n/locales/fi.json
@@ -5,6 +5,7 @@
   "A_meaningful_name_for_the_discussion_room": "Mielekäs nimi keskusteluhuoneelle",
   "A_new_owner_will_be_assigned_automatically_to__count__room": "Uusi omistaja liitetään automaattisesti {{count}} huoneeseen.",
   "A_new_owner_will_be_assigned_automatically_to__count__rooms": "Uusi omistaja liitetään automaattisesti {{count}} huoneeseen.",
+  "Accessibility_statement": "Saavutettavuusilmoitus",
   "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Salli käyttäjien valita Lähetä myös kanavalle -toiminta",
   "Actions": "Toimet",
   "Activity": "Toiminta",
@@ -253,9 +254,12 @@
   "Forward_to_user": "Välitä käyttäjälle",
   "Full_table": "Näytä koko taulukko napsauttamalla",
   "Generate_New_Link": "Luo uusi linkki",
+  "Get_help": "Hae apua",
   "Get_link": "Hanki linkki",
+  "Glossary_of_simplified_terms": "Yksinkertaistetut termit -sanasto",
   "Group_by": "Ryhmittelyperuste",
   "Has_left_the_team": "on poistunut tiimistä",
+  "Help": "Apua",
   "Hide_room": "Piilota",
   "Hide_System_Messages": "Piilota järjestelmäilmoitukset",
   "Hide_type_messages": "Piilota \"{{type}}\"-viestit",
@@ -505,6 +509,7 @@
   "Review_app_unable_store": "Ei voida avata: {{store}}",
   "Review_app_yes": "Selvä!",
   "Review_this_app": "Arvioi tämä sovellus",
+  "Rocket_Chat_Documentation": "Rocket.Chat dokumentaatio",
   "Roles": "Roolit",
   "room_allowed_reactions": "salli reaktiot",
   "room_archived": "arkistoi huoneen",
diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json
index 0458384c79..69c14e3545 100644
--- a/app/i18n/locales/fr.json
+++ b/app/i18n/locales/fr.json
@@ -1,6 +1,7 @@
 {
   "1_person_reacted": "1 personne a réagi",
   "A_meaningful_name_for_the_discussion_room": "Un nom significatif pour le salon de discussion",
+  "Accessibility_statement": "Déclaration d'accessibilité",
   "Actions": "Actions",
   "Activity": "Activité",
   "Add_Channel_to_Team": "Ajouter un canal à l'équipe",
@@ -217,9 +218,12 @@
   "Forward_to_user": "Transmettre à l'utilisateur",
   "Full_table": "Cliquez pour voir le tableau complet",
   "Generate_New_Link": "Générer un nouveau lien",
+  "Get_help": "Obtenez de l'aide",
   "Get_link": "Obtenir le lien",
+  "Glossary_of_simplified_terms": "Glossaire des termes simplifiés",
   "Group_by": "Grouper par",
   "Has_left_the_team": "a quitté l'équipe",
+  "Help": "Aide",
   "Hide_room": "Masquer",
   "Hide_System_Messages": "Masquer les messages système",
   "Hide_type_messages": "Masquer les messages \"{{type}}\"",
@@ -458,6 +462,7 @@
   "Review_app_unable_store": "Impossible d'ouvrir {{store}}",
   "Review_app_yes": "Bien sûr !",
   "Review_this_app": "Donnez votre avis sur cette application",
+  "Rocket_Chat_Documentation": "Documentation Rocket.Chat",
   "Roles": "Rôles",
   "Room_Info": "Info sur le salon",
   "Room_Info_Edit": "Modifier les informations du salon",
diff --git a/app/i18n/locales/hi-IN.json b/app/i18n/locales/hi-IN.json
index a3b9d1b525..99ecdb2469 100644
--- a/app/i18n/locales/hi-IN.json
+++ b/app/i18n/locales/hi-IN.json
@@ -6,6 +6,7 @@
   "A_new_owner_will_be_assigned_automatically_to__count__room": "{{count}} कमरे को स्वच्छता से नया मालिक सौंपा जाएगा।",
   "A_new_owner_will_be_assigned_automatically_to__count__rooms": "{{count}} कमरों को स्वच्छता से नया मालिक सौंपा जाएगा।",
   "accept": "स्वीकार करें",
+  "Accessibility_statement": "पहुंच उपलब्धता विवरण",
   "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "उपयोगकर्ताओं को 'चैनल में भी भेजें' व्यवहार का चयन करने की अनुमति दें",
   "Actions": "क्रियाएँ",
   "Activity": "गतिविधि",
@@ -275,9 +276,12 @@
   "Forward_to_user": "उपयोगकर्ता को आगे बढ़ाएं",
   "Full_table": "पूर्ण तालिका देखने के लिए क्लिक करें",
   "Generate_New_Link": "नई लिंक बनाएं",
+  "Get_help": "सहायता प्राप्त करें",
   "Get_link": "लिंक प्राप्त करें",
+  "Glossary_of_simplified_terms": "सरल शब्दावली",
   "Group_by": "इसके अनुसार समूहीकृत करें",
   "Has_left_the_team": "टीम छोड़ गया है",
+  "Help": "मदद",
   "Hide_System_Messages": "सिस्टम संदेश छुपाएं",
   "Hide_type_messages": "\"{{type}}\" संदेश छुपाएं",
   "How_It_Works": "यह कैसे काम करता है",
@@ -542,6 +546,7 @@
   "Review_app_unable_store": "{{store}} नहीं खोल सका जा रहा है",
   "Review_app_yes": "बिल्कुल!",
   "Review_this_app": "इस ऐप की समीक्षा करें",
+  "Rocket_Chat_Documentation": "Rocket.Chat दस्तावेज़ीकरण",
   "Roles": "भूमिकाएँ",
   "room_allowed_reactions": "प्रतिक्रियाएँ अनुमत हैं",
   "room_archived": "संग्रहित कमरा",
diff --git a/app/i18n/locales/hu.json b/app/i18n/locales/hu.json
index 1964200302..ff0c549126 100644
--- a/app/i18n/locales/hu.json
+++ b/app/i18n/locales/hu.json
@@ -6,6 +6,7 @@
   "A_new_owner_will_be_assigned_automatically_to__count__room": "Az új tulajdonos automatikus hozzárendelésre kerül {{count}} szobához.",
   "A_new_owner_will_be_assigned_automatically_to__count__rooms": "Az új tulajdonos automatikus hozzárendelésre kerül {{count}} szobához.",
   "accept": "Elfogadom",
+  "Accessibility_statement": "Hozzáférhetőségi nyilatkozat",
   "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Engedélyezze a felhasználóknak a \"Küldés a csatornára is” viselkedés kiválasztását",
   "Actions": "Tevékenységek",
   "Activity": "Aktivitás",
@@ -275,9 +276,12 @@
   "Forward_to_user": "Továbbítás a felhasználónak",
   "Full_table": "Kattintson a teljes táblázat megtekintéséhez",
   "Generate_New_Link": "Új hivatkozás létrehozása",
+  "Get_help": "Kérjen segítséget",
   "Get_link": "Hivatkozás lekérése",
+  "Glossary_of_simplified_terms": "Egyszerűsített kifejezések szótára",
   "Group_by": "Csoportosítás",
   "Has_left_the_team": "elhagyta a csapatot",
+  "Help": "Segítség",
   "Hide_System_Messages": "Rendszerüzenetek elrejtése",
   "Hide_type_messages": "\"{{type}}\" üzenetek elrejtése",
   "How_It_Works": "Hogyan működik",
@@ -543,6 +547,7 @@
   "Review_app_unable_store": "Nem lehet megnyitni {{store}}",
   "Review_app_yes": "Persze!",
   "Review_this_app": "App értékelése",
+  "Rocket_Chat_Documentation": "Rocket.Chat dokumentáció",
   "Roles": "Szerepek",
   "room_allowed_reactions": "reagálások engedélyezve",
   "room_archived": "archivált szoba",
diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json
index d894666f8f..5b6f54fd8c 100644
--- a/app/i18n/locales/it.json
+++ b/app/i18n/locales/it.json
@@ -5,6 +5,7 @@
   "A_meaningful_name_for_the_discussion_room": "Un nome significativo per il canale di discussione",
   "A_new_owner_will_be_assigned_automatically_to__count__room": "Un nuovo proprietario verrà assegnato automaticamente alla stanza {{count}}.",
   "A_new_owner_will_be_assigned_automatically_to__count__rooms": "Un nuovo proprietario verrà assegnato automaticamente a {{count}} stanze.",
+  "Accessibility_statement": "Dichiarazione di accessibilità",
   "Actions": "Azioni",
   "Activity": "Attività",
   "Add_Server": "Aggiungi server",
@@ -190,8 +191,11 @@
   "Forward_to_user": "Inoltra ad udente",
   "Full_table": "Clicca per la tabella completa",
   "Generate_New_Link": "Genera nuovo link",
+  "Get_help": "Ottieni aiuto",
   "Get_link": "Ottieni link",
+  "Glossary_of_simplified_terms": "Glossario dei termini semplificati",
   "Has_left_the_team": "Ha lasciato il team",
+  "Help": "Aiuto",
   "Hide_room": "Nascondi il canale",
   "Hide_System_Messages": "Nascondi messaggi di sistema",
   "Hide_type_messages": "Nascondi messaggi di \"{{type}}\"",
@@ -388,6 +392,7 @@
   "Review_app_unable_store": "Impossibile aprire {{store}}",
   "Review_app_yes": "Certo!",
   "Review_this_app": "Recensisci questa app",
+  "Rocket_Chat_Documentation": "Documentazione Rocket.Chat",
   "Roles": "Ruoli",
   "Room_Info": "Informazioni stanza",
   "Room_Info_Edit": "Modifica informazioni stanza",
diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json
index 4641bf86aa..c510d13697 100644
--- a/app/i18n/locales/ja.json
+++ b/app/i18n/locales/ja.json
@@ -1,6 +1,7 @@
 {
   "1_person_reacted": "1人がリアクション",
   "A_meaningful_name_for_the_discussion_room": "ディスカッションルームわかりやすい名前",
+  "Accessibility_statement": "アクセシビリティ声明",
   "Actions": "アクション",
   "Activity": "アクティビティ順",
   "Add_Server": "サーバーを追加",
@@ -163,7 +164,10 @@
   "Forward_to_user": "ユーザーに転送する",
   "Full_table": "クリックしてテーブル全体を見る",
   "Generate_New_Link": "新しいリンクを生成",
+  "Get_help": "ヘルプを得る",
+  "Glossary_of_simplified_terms": "簡易用語集",
   "Has_left_the_team": "チームを退出しました",
+  "Help": "助け",
   "Hide_room": "ルームを非表示",
   "Hide_System_Messages": "システムメッセージを非表示にする",
   "Hide_type_messages": "\"{{type}}\"メッセージを非表示にする",
@@ -301,6 +305,7 @@
   "Review_app_unable_store": "{{store}}を開けません。",
   "Review_app_yes": "はい！",
   "Review_this_app": "アプリをレビューする",
+  "Rocket_Chat_Documentation": "Rocket.Chat ドキュメント",
   "Roles": "ロール",
   "Room_Info": "ルーム情報",
   "Room_Info_Edit": "ルーム情報を編集",
diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json
index 8a003fd2b7..b44e2b70a5 100644
--- a/app/i18n/locales/nl.json
+++ b/app/i18n/locales/nl.json
@@ -1,6 +1,7 @@
 {
   "1_person_reacted": "1 persoon heeft gereageerd",
   "A_meaningful_name_for_the_discussion_room": "Een betekenisvolle naam voor de discussieruimte",
+  "Accessibility_statement": "Toegankelijkheidsverklaring",
   "Actions": "Acties",
   "Activity": "Activiteit",
   "Add_Channel_to_Team": "Kanaal toevoegen aan team",
@@ -217,9 +218,12 @@
   "Forward_to_user": "Doorsturen naar gebruiker",
   "Full_table": "Klik om de volledige tabel te zien",
   "Generate_New_Link": "Nieuwe link genereren",
+  "Get_help": "Hulp krijgen",
   "Get_link": "Link krijgen",
+  "Glossary_of_simplified_terms": "Glossarium van vereenvoudigde termen",
   "Group_by": "Groeperen op",
   "Has_left_the_team": "heeft het team verlaten",
+  "Help": "Hulp",
   "Hide_room": "Kamer verbergen",
   "Hide_System_Messages": "Verberg systeemberichten",
   "Hide_type_messages": "Verberg \"{{type}}\" berichten",
@@ -458,6 +462,7 @@
   "Review_app_unable_store": "Kan {{store}} niet openen",
   "Review_app_yes": "Zeker!",
   "Review_this_app": "Beoordeel deze app",
+  "Rocket_Chat_Documentation": "Rocket.Chat documentatie",
   "Roles": "Rollen",
   "Room_Info": "Kamer info",
   "Room_Info_Edit": "Kamer info bewerken",
diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json
index 54fb56cf32..da40be94f7 100644
--- a/app/i18n/locales/pt-BR.json
+++ b/app/i18n/locales/pt-BR.json
@@ -6,6 +6,7 @@
   "A_new_owner_will_be_assigned_automatically_to__count__room": "Um novo proprietário será atribuído automaticamente a {{count}} sala.",
   "A_new_owner_will_be_assigned_automatically_to__count__rooms": "Um novo proprietário será atribuído automaticamente a {{count}} salas.",
   "accept": "Aceitar",
+  "Accessibility_statement": "Declaração de acessibilidade",
   "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Permitir que os usuários selecionem o comportamento Também enviar para o canal",
   "Actions": "Ações",
   "Activity": "Atividade",
@@ -305,10 +306,13 @@
   "Forward_to_user": "Encaminhar para usuário",
   "Full_table": "Clique para ver a tabela completa",
   "Generate_New_Link": "Gerar novo convite",
+  "Get_help": "Obter ajuda",
   "Get_link": "Obter link",
+  "Glossary_of_simplified_terms": "Glossário de termos simplificados",
   "Go_to_your_device_settings_and_allow_microphone": "Vá para as configurações do seu dispositivo e permita o acesso ao microfone pelo aplicativo Rocket.Chat",
   "Group_by": "Agrupar por",
   "Has_left_the_team": "saiu do time",
+  "Help": "Ajuda",
   "Hide_room": "Ocultar",
   "Hide_System_Messages": "Esconder mensagens do sistema",
   "Hide_type_messages": "Esconder mensagens de \"{{type}}\"",
@@ -599,6 +603,7 @@
   "Review_app_unable_store": "Não foi possível abrir {{store}}",
   "Review_app_yes": "Claro!",
   "Review_this_app": "Avaliar esse app",
+  "Rocket_Chat_Documentation": "Documentação do Rocket.Chat",
   "Roles": "Papéis",
   "room_allowed_reactions": "adicionou permissão de reagir",
   "room_archived": "arquivou a sala",
diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json
index f789e1f6ab..4c61335d44 100644
--- a/app/i18n/locales/pt-PT.json
+++ b/app/i18n/locales/pt-PT.json
@@ -1,6 +1,7 @@
 {
   "1_person_reacted": "1 pessoa reagiu",
   "A_meaningful_name_for_the_discussion_room": "Um nome significativo para a sala de discussão",
+  "Accessibility_statement": "Declaração de acessibilidade",
   "Actions": "Acções",
   "Activity": "Actividade",
   "Add_Server": "Adicionar Servidor",
@@ -158,7 +159,10 @@
   "Forward_to_user": "Reencaminhar para o utilizador",
   "Full_table": "Clique para ver a tabela completa",
   "Generate_New_Link": "Gerar Novo Link",
+  "Get_help": "Obter ajuda",
   "Get_link": "Obter Ligação",
+  "Glossary_of_simplified_terms": "Glossário de termos simplificados",
+  "Help": "Ajuda",
   "Hide_room": "Esconder sala",
   "Hide_System_Messages": "Esconder mensagens do sistema",
   "Hide_type_messages": "Esconder mensagens \"{{type}}\"",
@@ -305,6 +309,7 @@
   "RESET": "REPOR",
   "Reset_password": "Repor palavra-passe",
   "resetting_password": "a repor palavra-passe",
+  "Rocket_Chat_Documentation": "Documentação do Rocket.Chat",
   "Roles": "Funções",
   "Room_Info": "Informação da Sala",
   "Room_Info_Edit": "Editar Informação da Sala",
diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json
index 96a69220b3..94f2015dcb 100644
--- a/app/i18n/locales/ru.json
+++ b/app/i18n/locales/ru.json
@@ -5,6 +5,7 @@
   "A_meaningful_name_for_the_discussion_room": "Осмысленное имя для обсуждения",
   "A_new_owner_will_be_assigned_automatically_to__count__room": "Новый владелец будет автоматически назначен на {{count}} чатов.",
   "A_new_owner_will_be_assigned_automatically_to__count__rooms": "Новый владелец будет автоматически назначен на {{count}} чатов.",
+  "Accessibility_statement": "Заявление о доступности",
   "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Разрешить пользователям выбирать поведение \"Также отправить в чат\"",
   "Actions": "Действия",
   "Activity": "Активность",
@@ -243,9 +244,12 @@
   "Forward_to_user": "Перенаправить пользователю",
   "Full_table": "Нажмите, чтобы увидеть полную таблицу",
   "Generate_New_Link": "Сгенерировать Новую Ссылку",
+  "Get_help": "Получить помощь",
   "Get_link": "Получить ссылку",
+  "Glossary_of_simplified_terms": "Глоссарий упрощенных терминов",
   "Group_by": "Группировка",
   "Has_left_the_team": "покинул Команду",
+  "Help": "Помощь",
   "Hide_room": "Скрыть комнату",
   "Hide_System_Messages": "Скрыть Системные Сообщения",
   "Hide_type_messages": "Скрыть \"{{type}}\" сообщения",
@@ -492,6 +496,7 @@
   "Review_app_unable_store": "Невозможно открыть {{store}}",
   "Review_app_yes": "Конечно!",
   "Review_this_app": "Оценить это приложение",
+  "Rocket_Chat_Documentation": "Документация Rocket.Chat",
   "Roles": "Роли",
   "Room_Info": "Информация о канале",
   "Room_Info_Edit": "Изменить информацию о чате",
diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json
index 9d3fed05d7..94b6959bb4 100644
--- a/app/i18n/locales/sl-SI.json
+++ b/app/i18n/locales/sl-SI.json
@@ -5,6 +5,7 @@
   "A_meaningful_name_for_the_discussion_room": "Pomenljivo ime za pogovorno sobo",
   "A_new_owner_will_be_assigned_automatically_to__count__room": "Novi lastnik bo samodejno dodeljen {{count}} sobi.",
   "A_new_owner_will_be_assigned_automatically_to__count__rooms": "Novi lastnik bo samodejno dodeljen {{count}} sobam.",
+  "Accessibility_statement": "Izjava o dostopnosti",
   "Actions": "Dejanja",
   "Activity": "Aktivnost",
   "Add_Channel_to_Team": "Dodajte kanal v ekipo",
@@ -228,8 +229,11 @@
   "Forward_to_user": "Posreduj uporabniku",
   "Full_table": "Kliknite za ogled celotne tabele",
   "Generate_New_Link": "Ustvari novo povezavo",
+  "Get_help": "Pridobite pomoč",
+  "Glossary_of_simplified_terms": "Glosarij poenostavljenih izrazov",
   "Group_by": "Skupina po",
   "Has_left_the_team": "je zapustil ekipo",
+  "Help": "Pomoč",
   "Hide_room": "Skrij sobo",
   "Hide_System_Messages": "Skrij sistemska sporočila",
   "Hide_type_messages": "Skrij sporočila \"{{type}}\"",
@@ -471,6 +475,7 @@
   "Review_app_unable_store": "Ne morem odpreti {{store}}",
   "Review_app_yes": "Zagotovo!",
   "Review_this_app": "Preglejte to aplikacijo",
+  "Rocket_Chat_Documentation": "Dokumentacija Rocket.Chat",
   "Roles": "Vloge",
   "Room_Info": "Informacije o sobi",
   "Room_Info_Edit": "Uredi informacije o sobi",
diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json
index 376b7e61c0..38acee28f1 100644
--- a/app/i18n/locales/sv.json
+++ b/app/i18n/locales/sv.json
@@ -5,6 +5,7 @@
   "A_meaningful_name_for_the_discussion_room": "Ett beskrivande namn på diskussionsrummet",
   "A_new_owner_will_be_assigned_automatically_to__count__room": "En ny ägare utses automatiskt för {{count}} rum.",
   "A_new_owner_will_be_assigned_automatically_to__count__rooms": "En ny ägare utses automatiskt för {{count}} rum.",
+  "Accessibility_statement": "Tillgänglighetsredogörelse",
   "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Tillåt användare att välja alternativet Skicka även till kanal",
   "Actions": "Åtgärder",
   "Activity": "Aktivitet",
@@ -252,9 +253,12 @@
   "Forward_to_user": "Vidarebefordra till användare",
   "Full_table": "Klicka för att visa hela tabellen",
   "Generate_New_Link": "Generera ny länk",
+  "Get_help": "Få hjälp",
   "Get_link": "Hämta länk",
+  "Glossary_of_simplified_terms": "Ordlista över förenklade termer",
   "Group_by": "Gruppera per",
   "Has_left_the_team": "har lämnat kanalen",
+  "Help": "Hjälp",
   "Hide_room": "Dölj rum",
   "Hide_System_Messages": "Dölj systemmeddelanden",
   "Hide_type_messages": "Dölj meddelanden av typen {{type}}",
@@ -504,6 +508,7 @@
   "Review_app_unable_store": "Det går inte att öppna {{store}}",
   "Review_app_yes": "Visst!",
   "Review_this_app": "Betygsätt appen",
+  "Rocket_Chat_Documentation": "Rocket.Chat dokumentation",
   "Roles": "Roller",
   "room_allowed_reactions": "tillåtna reaktioner",
   "room_archived": "arkiverade rum",
diff --git a/app/i18n/locales/ta-IN.json b/app/i18n/locales/ta-IN.json
index 8923e20e4a..9c115a4790 100644
--- a/app/i18n/locales/ta-IN.json
+++ b/app/i18n/locales/ta-IN.json
@@ -6,6 +6,7 @@
   "A_new_owner_will_be_assigned_automatically_to__count__room": "{{count}} அறைக்கு புதிய உரிமையாளர் தானாகவே முடிந்துவிடப்படும்.",
   "A_new_owner_will_be_assigned_automatically_to__count__rooms": "{{count}} அறைகளுக்கு புதிய உரிமையாளர் தானாகவே முடிந்துவிடப்படும்.",
   "accept": "ஏற்றுக்கொள்",
+  "Accessibility_statement": "அணுகல் கூற்று",
   "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "பயனர்களுக்கு 'சேனலுக்கும் அனுப்புக' செய்தி நடவடிக்கையை தேர்ந்தெடுத்துக் கொள்ள அனுமதிக்கு",
   "Actions": "செயல்கள்",
   "Activity": "செயல்திருத்தம்",
@@ -275,9 +276,12 @@
   "Forward_to_user": "பயனருக்கு முன்னேற்று",
   "Full_table": "முழு அட்டவணையைக் காண கிளிக் செய்க",
   "Generate_New_Link": "புதிய இணைப்பை உருவாக்கு",
+  "Get_help": "உதவி பெறுங்கள்",
   "Get_link": "இணைப்பைப் பெறுக",
+  "Glossary_of_simplified_terms": "எளிதாக்கப்பட்ட சொற்கள் குறியீடு",
   "Group_by": "குழுப்படுத்து",
   "Has_left_the_team": "குழுவை விட்டுவிட்டார்",
+  "Help": "உதவி",
   "Hide_System_Messages": "அமைப்பு செய்திகளை மறைக்க",
   "Hide_type_messages": "\"{{type}}\" செய்திகளை மறைக்க",
   "How_It_Works": "இது எப்படி வேலை செய்கின்றது",
@@ -542,6 +546,7 @@
   "Review_app_unable_store": "{{store}} கொள்ளையைத் திறக்க முடியவில்லை",
   "Review_app_yes": "உண்டு!",
   "Review_this_app": "இந்த ஆப்பை பரிசோதிக்க",
+  "Rocket_Chat_Documentation": "Rocket.Chat ஆவணக்காப்பு",
   "Roles": "பங்குகள்",
   "room_allowed_reactions": "பிரதிகிதங்களை அனுமதிக்கப்பட்டுள்ளது",
   "room_archived": "கோப்பு சேகரிக்கப்பட்ட அறை",
diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json
index 1af32b3aa1..853d2d21e7 100644
--- a/app/i18n/locales/te-IN.json
+++ b/app/i18n/locales/te-IN.json
@@ -6,6 +6,7 @@
   "A_new_owner_will_be_assigned_automatically_to__count__room": "కొత్త యజమాని స్వయంగా నియమించబడుతుంది {{count}} అంగడాయినందు.",
   "A_new_owner_will_be_assigned_automatically_to__count__rooms": "కొత్త యజమాని స్వయంగా నియమించబడుతుంది {{count}} అంగడులకు.",
   "accept": "అంగీకరించు",
+  "Accessibility_statement": "పేరుబట్టి వివరణ",
   "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "వాడాకు 'కూడా చానల్‌కు పంపండి' పనికి అనుమతిస్తుంది",
   "Actions": "చర్యలు",
   "Activity": "చట్టం",
@@ -275,9 +276,12 @@
   "Forward_to_user": "వాడికి అగ్రగామించండి",
   "Full_table": "పూర్తి పటం చూడండి కొరకు క్లిక్ చేయండి",
   "Generate_New_Link": "కొత్త లింక్‌ను రూపొందించండి",
+  "Get_help": "సహాయం పొందండి",
   "Get_link": "లింక్ పొందండి",
+  "Glossary_of_simplified_terms": "సరళీకృత పదాల పదకోశం",
   "Group_by": "గ్రూప్ చేయండి",
   "Has_left_the_team": "టీమ్ ను వదిలిపోయారు",
+  "Help": "సహాయం",
   "Hide_System_Messages": "వ్యవస్థ సందేశాలను దాచండి",
   "Hide_type_messages": "{{type}} సందేశాలను దాచండి",
   "How_It_Works": "ఇది ఎలా పని చేస్తుంది",
@@ -542,6 +546,7 @@
   "Review_app_unable_store": "{{store}} తెరవలేకపోయింది",
   "Review_app_yes": "అవును!",
   "Review_this_app": "ఈ యాప్‌ను సమీక్షించండి",
+  "Rocket_Chat_Documentation": "Rocket.Chat డాక్యుమెంటేషన్",
   "Roles": "పాత్రలు",
   "room_allowed_reactions": "గదిలో ప్రతిక్రియలను అనుమతించారు",
   "room_archived": "అభిలోఖిత కొరకు ఉన్నది",
diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json
index e28f4727b4..e7c446590a 100644
--- a/app/i18n/locales/tr.json
+++ b/app/i18n/locales/tr.json
@@ -1,6 +1,7 @@
 {
   "1_person_reacted": "1 kişi tepki verdi.",
   "A_meaningful_name_for_the_discussion_room": "Tartışma odası için anlamlı bir isim",
+  "Accessibility_statement": "Erişilebilirlik beyanı",
   "Actions": "İşlemler",
   "Activity": "Etkinlik",
   "Add_Server": "Sunucu ekle",
@@ -177,7 +178,10 @@
   "Forward_to_user": "Kullanıcıya İlet",
   "Full_table": "Tam tabloyu görmek için tıklayın",
   "Generate_New_Link": "Yeni Bağlantı Oluştur",
+  "Get_help": "Yardım alın",
   "Get_link": "Bağlantıyı Al",
+  "Glossary_of_simplified_terms": "Basitleştirilmiş terimler sözlüğü",
+  "Help": "Yardım",
   "Hide_room": "Gizle",
   "Hide_System_Messages": "Sistem İletilerını Gizle",
   "Hide_type_messages": "\"{{type}}\" iletilerini gizle",
@@ -371,6 +375,7 @@
   "Review_app_unable_store": "{{store}} açılamıyor!",
   "Review_app_yes": "Elbette!",
   "Review_this_app": "Bu uygulamayı değerlendirin",
+  "Rocket_Chat_Documentation": "Rocket.Chat dokümantasyonu",
   "Roles": "Roller",
   "Room_Info": "Oda Bilgisi",
   "Room_Info_Edit": "Oda Bilgilerini Düzenle",
diff --git a/app/i18n/locales/zh-CN.json b/app/i18n/locales/zh-CN.json
index 8f434a0cfd..b79a5d164c 100644
--- a/app/i18n/locales/zh-CN.json
+++ b/app/i18n/locales/zh-CN.json
@@ -1,6 +1,7 @@
 {
   "1_person_reacted": "1 人回复了",
   "A_meaningful_name_for_the_discussion_room": "取一个有意义的讨论区的名称",
+  "Accessibility_statement": "无障碍声明",
   "Actions": "操作",
   "Activity": "按活动时间排列",
   "Add_Server": "創建服务器",
@@ -172,6 +173,9 @@
   "Forward_to_user": "转发给用戶",
   "Full_table": "点击以查看完整表格",
   "Generate_New_Link": "产生新的链接",
+  "Get_help": "获取帮助",
+  "Glossary_of_simplified_terms": "简化术语词汇表",
+  "Help": "帮助",
   "Hide_System_Messages": "隐藏系统信息",
   "Hide_type_messages": "隐藏 \"{{type}}\" 信息",
   "How_It_Works": "运作方式",
@@ -351,6 +355,7 @@
   "Review_app_unable_store": "无法开启 {{store}}",
   "Review_app_yes": "没问题",
   "Review_this_app": "评分此 App",
+  "Rocket_Chat_Documentation": "Rocket.Chat 文档",
   "Roles": "角色",
   "Room_Info": "聊天室信息",
   "Room_Info_Edit": "聊天室信息编辑",
diff --git a/app/i18n/locales/zh-TW.json b/app/i18n/locales/zh-TW.json
index f9a9114e10..821d1c669d 100644
--- a/app/i18n/locales/zh-TW.json
+++ b/app/i18n/locales/zh-TW.json
@@ -1,6 +1,7 @@
 {
   "1_person_reacted": "1 人回覆了",
   "A_meaningful_name_for_the_discussion_room": "取一個有意義的討論區名稱",
+  "Accessibility_statement": "无障碍声明",
   "Actions": "操作",
   "Activity": "以活動時間排序",
   "Add_Server": "新增伺服器",
@@ -180,7 +181,10 @@
   "Forward_to_user": "轉發給使用者",
   "Full_table": "點擊以查看完整表格",
   "Generate_New_Link": "產生新的連結",
+  "Get_help": "獲取幫助",
   "Get_link": "取得連結",
+  "Glossary_of_simplified_terms": "簡化術語詞彙表",
+  "Help": "幫助",
   "Hide_room": "隱藏",
   "Hide_System_Messages": "隱藏系統訊息",
   "Hide_type_messages": "隱藏 '{{type}}' 訊息",
@@ -369,6 +373,7 @@
   "Review_app_unable_store": "無法開啟 {{store}}",
   "Review_app_yes": "沒問題",
   "Review_this_app": "評分此 App",
+  "Rocket_Chat_Documentation": "Rocket.Chat 文件",
   "Roles": "角色",
   "Room_Info": "聊天室資訊",
   "Room_Info_Edit": "修改聊天室資訊",
diff --git a/app/stacks/InsideStack.tsx b/app/stacks/InsideStack.tsx
index b74fcdbbd2..751188099c 100644
--- a/app/stacks/InsideStack.tsx
+++ b/app/stacks/InsideStack.tsx
@@ -42,6 +42,7 @@ import DisplayPrefsView from '../views/DisplayPrefsView';
 // Settings Stack
 import SettingsView from '../views/SettingsView';
 import SecurityPrivacyView from '../views/SecurityPrivacyView';
+import GetHelpView from '../views/GetHelpView';
 import PushTroubleshootView from '../views/PushTroubleshootView';
 import E2EEncryptionSecurityView from '../views/E2EEncryptionSecurityView';
 import LanguageView from '../views/LanguageView';
@@ -185,6 +186,7 @@ const SettingsStackNavigator = () => {
 			<SettingsStack.Screen name='ThemeView' component={ThemeView} />
 			<SettingsStack.Screen name='DefaultBrowserView' component={DefaultBrowserView} />
 			<SettingsStack.Screen name='MediaAutoDownloadView' component={MediaAutoDownloadView} />
+			<SettingsStack.Screen name='GetHelpView' component={GetHelpView} />
 			<SettingsStack.Screen
 				name='ScreenLockConfigView'
 				// @ts-ignore
diff --git a/app/stacks/types.ts b/app/stacks/types.ts
index da4af05999..27fbdba913 100644
--- a/app/stacks/types.ts
+++ b/app/stacks/types.ts
@@ -211,6 +211,7 @@ export type SettingsStackParamList = {
 	DisplayPrefsView: undefined;
 	MediaAutoDownloadView: undefined;
 	PushTroubleshootView: undefined;
+	GetHelpView: undefined;
 };
 
 export type AdminPanelStackParamList = {
diff --git a/app/views/GetHelpView.tsx b/app/views/GetHelpView.tsx
new file mode 100644
index 0000000000..82fa1eb2c7
--- /dev/null
+++ b/app/views/GetHelpView.tsx
@@ -0,0 +1,61 @@
+import { useLayoutEffect } from 'react';
+import { useNavigation } from '@react-navigation/native';
+import { StackNavigationProp } from '@react-navigation/stack';
+
+import SafeAreaView from '../containers/SafeAreaView';
+import * as List from '../containers/List';
+import StatusBar from '../containers/StatusBar';
+import NewWindowIcon from '../containers/NewWindowIcon';
+import { SettingsStackParamList } from '../stacks/types';
+import i18n from '../i18n';
+import openLink from '../lib/methods/helpers/openLink';
+import { useTheme } from '../theme';
+
+const DOCS_LINK = 'https://docs.rocket.chat/';
+const ACCESSIBILITY_LINK = 'https://go.rocket.chat/i/accessibility';
+const GLOSSARY_LINK = 'https://go.rocket.chat/i/glossary';
+
+const GetHelpView = () => {
+	const navigation = useNavigation<StackNavigationProp<SettingsStackParamList, 'GetHelpView'>>();
+	const { theme } = useTheme();
+
+	useLayoutEffect(() => {
+		navigation.setOptions({
+			title: i18n.t('Help')
+		});
+	}, [navigation]);
+
+	return (
+		<SafeAreaView>
+			<StatusBar />
+			<List.Container>
+				<List.Section>
+					<List.Separator />
+					<List.Item
+						title='Rocket_Chat_Documentation'
+						right={() => <NewWindowIcon />}
+						onPress={() => openLink(DOCS_LINK, theme)}
+						testID='settings-view-get-help-documentation'
+					/>
+					<List.Separator />
+					<List.Item
+						title='Accessibility_statement'
+						right={() => <NewWindowIcon />}
+						onPress={() => openLink(ACCESSIBILITY_LINK, theme)}
+						testID='settings-view-get-help-accessibility-statement'
+					/>
+					<List.Separator />
+					<List.Item
+						title='Glossary_of_simplified_terms'
+						right={() => <NewWindowIcon />}
+						onPress={() => openLink(GLOSSARY_LINK, theme)}
+						testID='settings-view-get-help-glossary'
+					/>
+					<List.Separator />
+				</List.Section>
+			</List.Container>
+		</SafeAreaView>
+	);
+};
+
+export default GetHelpView;
diff --git a/app/views/PushTroubleshootView/components/NotificationDelay.tsx b/app/views/PushTroubleshootView/components/NotificationDelay.tsx
index 5b32a412db..9b1994de7d 100644
--- a/app/views/PushTroubleshootView/components/NotificationDelay.tsx
+++ b/app/views/PushTroubleshootView/components/NotificationDelay.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { Linking } from 'react-native';
 
+import NewWindowIcon from '../../../containers/NewWindowIcon';
 import * as List from '../../../containers/List';
 import { useTheme } from '../../../theme';
 
@@ -15,7 +16,7 @@ export default function NotificationDelay(): React.ReactElement {
 			<List.Item
 				title='Documentation'
 				onPress={openNotificationDocumentation}
-				right={() => <List.Icon size={32} name='new-window' color={colors.fontAnnotation} />}
+				right={() => <NewWindowIcon size={32} color={colors.fontAnnotation} />}
 				testID='push-troubleshoot-view-notification-delay'
 			/>
 			<List.Separator />
diff --git a/app/views/SettingsView/index.tsx b/app/views/SettingsView/index.tsx
index c8dc406e3e..5c7a15783f 100644
--- a/app/views/SettingsView/index.tsx
+++ b/app/views/SettingsView/index.tsx
@@ -11,6 +11,7 @@ import { appStart } from '../../actions/app';
 import { logout } from '../../actions/login';
 import { selectServerRequest } from '../../actions/server';
 import * as HeaderButton from '../../containers/HeaderButton';
+import NewWindowIcon from '../../containers/NewWindowIcon';
 import * as List from '../../containers/List';
 import SafeAreaView from '../../containers/SafeAreaView';
 import StatusBar from '../../containers/StatusBar';
@@ -238,9 +239,17 @@ const SettingsView = (): React.ReactElement => {
 						testID='settings-view-security-privacy'
 						left={() => <List.Icon name='locker' />}
 					/>
+					<List.Separator />
 				</List.Section>
 
 				<List.Section>
+					<List.Item
+						title='Get_help'
+						left={() => <List.Icon name='support' />}
+						showActionIndicator
+						onPress={() => navigateToScreen('GetHelpView')}
+						testID='settings-view-get-help'
+					/>
 					<List.Separator />
 					<List.Item
 						title='Share_this_app'
@@ -255,7 +264,7 @@ const SettingsView = (): React.ReactElement => {
 						onPress={sendEmail}
 						testID='settings-view-contact'
 						left={() => <List.Icon name='mail' />}
-						right={() => <List.Icon name='new-window' />}
+						right={() => <NewWindowIcon />}
 					/>
 					<List.Separator />
 					{!isFDroidBuild ? (
@@ -265,7 +274,7 @@ const SettingsView = (): React.ReactElement => {
 								onPress={onReviewPress}
 								testID='settings-view-review-app'
 								left={() => <List.Icon name='star' />}
-								right={() => <List.Icon name='new-window' />}
+								right={() => <NewWindowIcon />}
 							/>
 						</>
 					) : null}
@@ -275,7 +284,7 @@ const SettingsView = (): React.ReactElement => {
 						onPress={onPressLicense}
 						testID='settings-view-license'
 						left={() => <List.Icon name='file-document' />}
-						right={() => <List.Icon name='new-window' />}
+						right={() => <NewWindowIcon />}
 					/>
 					<List.Separator />
 					<List.Item
diff --git a/e2e/tests/assorted/04-setting.spec.ts b/e2e/tests/assorted/04-setting.spec.ts
index e866ad9c75..dc178fdfe2 100644
--- a/e2e/tests/assorted/04-setting.spec.ts
+++ b/e2e/tests/assorted/04-setting.spec.ts
@@ -1,6 +1,6 @@
 import { device, waitFor, element, by, expect } from 'detox';
 
-import { navigateToLogin, login, platformTypes, TTextMatcher } from '../../helpers/app';
+import { navigateToLogin, login, platformTypes, TTextMatcher, tapBack } from '../../helpers/app';
 import { createRandomRoom, createRandomUser, ITestUser } from '../../helpers/data_setup';
 
 describe('Settings screen', () => {
@@ -76,6 +76,17 @@ describe('Settings screen', () => {
 		it('should have server version', async () => {
 			await expect(element(by.id('settings-view-server-version'))).toExist();
 		});
+
+		it('should have get help', async () => {
+			await expect(element(by.id('settings-view-get-help'))).toExist();
+			await element(by.id('settings-view-get-help')).tap();
+			await waitFor(element(by.id('settings-view-get-help-documentation')))
+				.toBeVisible()
+				.withTimeout(2000);
+			await expect(element(by.id('settings-view-get-help-accessibility-statement'))).toExist();
+			await expect(element(by.id('settings-view-get-help-glossary'))).toExist();
+			await tapBack();
+		});
 	});
 
 	describe('Usage', () => {

From bc35b092a43b7c1ab5caa47d763af128de038568 Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Tue, 24 Sep 2024 17:14:04 -0300
Subject: [PATCH 4/6] fix: Image viewer loosing quality (#5878)

---
 app/containers/ImageViewer/ImageComponent.ts | 24 --------------------
 app/containers/ImageViewer/ImageViewer.tsx   |  9 +++-----
 app/containers/ImageViewer/index.ts          |  2 --
 app/containers/ImageViewer/types.ts          |  4 ----
 app/views/ShareView/Preview.tsx              | 16 ++++---------
 app/views/ShareView/index.tsx                |  1 -
 6 files changed, 7 insertions(+), 49 deletions(-)
 delete mode 100644 app/containers/ImageViewer/ImageComponent.ts
 delete mode 100644 app/containers/ImageViewer/types.ts

diff --git a/app/containers/ImageViewer/ImageComponent.ts b/app/containers/ImageViewer/ImageComponent.ts
deleted file mode 100644
index ad307ee440..0000000000
--- a/app/containers/ImageViewer/ImageComponent.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import { Image } from 'react-native';
-import { FastImageProps } from 'react-native-fast-image';
-
-import { types } from './types';
-import { LOCAL_DOCUMENT_DIRECTORY } from '../../lib/methods/handleMediaDownload';
-
-export function ImageComponent({
-	type,
-	uri
-}: {
-	type?: string;
-	uri: string;
-}): React.ComponentType<Partial<Image> | FastImageProps> {
-	let Component;
-	if (type === types.REACT_NATIVE_IMAGE || (LOCAL_DOCUMENT_DIRECTORY && uri.startsWith(LOCAL_DOCUMENT_DIRECTORY))) {
-		const { Image } = require('react-native');
-		Component = Image;
-	} else {
-		const FastImage = require('react-native-fast-image');
-		Component = FastImage;
-	}
-	return Component;
-}
diff --git a/app/containers/ImageViewer/ImageViewer.tsx b/app/containers/ImageViewer/ImageViewer.tsx
index c47ca1296c..09fb450418 100644
--- a/app/containers/ImageViewer/ImageViewer.tsx
+++ b/app/containers/ImageViewer/ImageViewer.tsx
@@ -2,9 +2,9 @@ import React, { useState } from 'react';
 import { LayoutChangeEvent, StyleSheet, StyleProp, ViewStyle, ImageStyle, View } from 'react-native';
 import { Gesture, GestureDetector } from 'react-native-gesture-handler';
 import Animated, { withTiming, useSharedValue, useAnimatedStyle, withSpring } from 'react-native-reanimated';
+import FastImage from 'react-native-fast-image';
 
 import { useTheme } from '../../theme';
-import { ImageComponent } from './ImageComponent';
 
 interface ImageViewerProps {
 	style?: StyleProp<ImageStyle>;
@@ -12,7 +12,6 @@ interface ImageViewerProps {
 	imageContainerStyle?: StyleProp<ViewStyle>;
 
 	uri: string;
-	imageComponentType?: string;
 	width: number;
 	height: number;
 	onLoadEnd?: () => void;
@@ -27,7 +26,7 @@ const styles = StyleSheet.create({
 	}
 });
 
-export const ImageViewer = ({ uri = '', imageComponentType, width, height, ...props }: ImageViewerProps): React.ReactElement => {
+export const ImageViewer = ({ uri = '', width, height, ...props }: ImageViewerProps): React.ReactElement => {
 	const [centerX, setCenterX] = useState(0);
 	const [centerY, setCenterY] = useState(0);
 
@@ -109,15 +108,13 @@ export const ImageViewer = ({ uri = '', imageComponentType, width, height, ...pr
 
 	const gesture = Gesture.Simultaneous(pinchGesture, panGesture, doubleTapGesture);
 
-	const Component = ImageComponent({ type: imageComponentType, uri });
-
 	const { colors } = useTheme();
 
 	return (
 		<View style={[styles.flex, { width, height, backgroundColor: colors.surfaceNeutral }]}>
 			<GestureDetector gesture={gesture}>
 				<Animated.View onLayout={onLayout} style={[styles.flex, style]}>
-					<Component
+					<FastImage
 						// @ts-ignore
 						style={styles.image}
 						resizeMode='contain'
diff --git a/app/containers/ImageViewer/index.ts b/app/containers/ImageViewer/index.ts
index bf629ae84b..69943f2ff5 100644
--- a/app/containers/ImageViewer/index.ts
+++ b/app/containers/ImageViewer/index.ts
@@ -1,3 +1 @@
 export * from './ImageViewer';
-export * from './types';
-export * from './ImageComponent';
diff --git a/app/containers/ImageViewer/types.ts b/app/containers/ImageViewer/types.ts
deleted file mode 100644
index 56c4a7d27d..0000000000
--- a/app/containers/ImageViewer/types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const types = {
-	FAST_IMAGE: 'FAST_IMAGE',
-	REACT_NATIVE_IMAGE: 'REACT_NATIVE'
-};
diff --git a/app/views/ShareView/Preview.tsx b/app/views/ShareView/Preview.tsx
index 3b7cb6a091..16a0f25264 100644
--- a/app/views/ShareView/Preview.tsx
+++ b/app/views/ShareView/Preview.tsx
@@ -6,7 +6,7 @@ import prettyBytes from 'pretty-bytes';
 import { useHeaderHeight } from '@react-navigation/elements';
 
 import { CustomIcon, TIconsName } from '../../containers/CustomIcon';
-import { ImageViewer, types } from '../../containers/ImageViewer';
+import { ImageViewer } from '../../containers/ImageViewer';
 import sharedStyles from '../Styles';
 import I18n from '../../i18n';
 import { THUMBS_HEIGHT } from './constants';
@@ -60,11 +60,10 @@ const IconPreview = React.memo(({ iconName, title, description, theme, width, he
 interface IPreview {
 	item: IShareAttachment;
 	theme: TSupportedThemes;
-	isShareExtension: boolean;
 	length: number;
 }
 
-const Preview = React.memo(({ item, theme, isShareExtension, length }: IPreview) => {
+const Preview = React.memo(({ item, theme, length }: IPreview) => {
 	const type = item?.mime;
 	const { width, height } = useWindowDimensions();
 	const insets = useSafeAreaInsets();
@@ -98,17 +97,10 @@ const Preview = React.memo(({ item, theme, isShareExtension, length }: IPreview)
 			);
 		}
 
-		// Disallow preview of images too big in order to prevent memory issues on iOS share extension
 		if (type?.match(/image/)) {
-			return (
-				<ImageViewer
-					uri={item.path}
-					imageComponentType={isShareExtension ? types.REACT_NATIVE_IMAGE : types.FAST_IMAGE}
-					width={width}
-					height={calculatedHeight}
-				/>
-			);
+			return <ImageViewer uri={item.path} width={width} height={calculatedHeight} />;
 		}
+
 		return (
 			<IconPreview
 				iconName={'attach'}
diff --git a/app/views/ShareView/index.tsx b/app/views/ShareView/index.tsx
index 3d58e816ff..50e12ddd7f 100644
--- a/app/views/ShareView/index.tsx
+++ b/app/views/ShareView/index.tsx
@@ -382,7 +382,6 @@ class ShareView extends Component<IShareViewProps, IShareViewState> {
 							item={selected}
 							length={attachments.length}
 							theme={theme}
-							isShareExtension={this.isShareExtension}
 						/>
 						<MessageComposerContainer ref={this.messageComposerRef}>
 							<Thumbs

From e0816e9f63b915f04a21f2adaded2f6ccd71785c Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Thu, 26 Sep 2024 09:36:35 -0300
Subject: [PATCH 5/6] fix: Scroll issue when trying to see older posts (#5863)

---
 app/views/RoomView/List/index.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/RoomView/List/index.tsx b/app/views/RoomView/List/index.tsx
index a4c666be59..ac24d66a43 100644
--- a/app/views/RoomView/List/index.tsx
+++ b/app/views/RoomView/List/index.tsx
@@ -72,6 +72,10 @@ const ListContainer = forwardRef<IListContainerRef, IListContainerProps>(
 						viewabilityConfigCallbackPairs={viewabilityConfigCallbackPairs.current}
 						jumpToBottom={jumpToBottom}
 						isThread={!!tmid}
+						maintainVisibleContentPosition={{
+							minIndexForVisible: 0,
+							autoscrollToTopThreshold: 0
+						}}
 					/>
 				</Container>
 			</>

From 79134296bc3a3d44fbab42574794f99162e5a902 Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Thu, 26 Sep 2024 09:53:40 -0300
Subject: [PATCH 6/6] chore: Bump version to 4.53.0 (#5882)

---
 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 b634e7607f..dd54861b6c 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.52.0"
+        versionName "4.53.0"
         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 c281dc2b6b..a23d27730a 100644
--- a/ios/RocketChatRN.xcodeproj/project.pbxproj
+++ b/ios/RocketChatRN.xcodeproj/project.pbxproj
@@ -2847,7 +2847,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.52.0;
+				MARKETING_VERSION = 4.53.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -2891,7 +2891,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.52.0;
+				MARKETING_VERSION = 4.53.0;
 				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 64e5d24cd4..efb1b9702c 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.52.0</string>
+	<string>4.53.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist
index 6c60a7052e..d373b4f75b 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.52.0</string>
+	<string>4.53.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>KeychainGroup</key>
diff --git a/package.json b/package.json
index b83b975b19..a3d3de48c4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket-chat-reactnative",
-	"version": "4.52.0",
+	"version": "4.53.0",
 	"private": true,
 	"scripts": {
 		"start": "react-native start",