diff --git a/android/app/build.gradle b/android/app/build.gradle
index dd54861b6c..11cbd8bd9d 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.53.0"
+        versionName "4.54.0"
         vectorDrawables.useSupportLibrary = true
         if (!isFoss) {
             manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
diff --git a/app/AppContainer.tsx b/app/AppContainer.tsx
index bfd1a8cc66..079eb9e7a6 100644
--- a/app/AppContainer.tsx
+++ b/app/AppContainer.tsx
@@ -1,6 +1,6 @@
 import React, { useContext, memo, useEffect } from 'react';
 import { NavigationContainer } from '@react-navigation/native';
-import { createStackNavigator } from '@react-navigation/stack';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import { connect } from 'react-redux';
 
 import { SetUsernameStackParamList, StackParamList } from './definitions/navigationTypes';
@@ -18,6 +18,8 @@ import ShareExtensionStack from './stacks/ShareExtensionStack';
 import { ThemeContext } from './theme';
 import { setCurrentScreen } from './lib/methods/helpers/log';
 
+const createStackNavigator = createNativeStackNavigator;
+
 // SetUsernameStack
 const SetUsername = createStackNavigator<SetUsernameStackParamList>();
 const SetUsernameStack = () => (
@@ -57,7 +59,7 @@ const App = memo(({ root, isMasterDetail }: { root: string; isMasterDetail: bool
 				}
 				Navigation.routeNameRef.current = currentRouteName;
 			}}>
-			<Stack.Navigator screenOptions={{ headerShown: false, animationEnabled: false }}>
+			<Stack.Navigator screenOptions={{ headerShown: false, animation: 'none' }}>
 				{root === RootEnum.ROOT_LOADING || root === RootEnum.ROOT_LOADING_SHARE_EXTENSION ? (
 					<Stack.Screen name='AuthLoading' component={AuthLoadingView} />
 				) : null}
diff --git a/app/containers/Button/Button.stories.tsx b/app/containers/Button/Button.stories.tsx
index 2ecf791037..a61061ad53 100644
--- a/app/containers/Button/Button.stories.tsx
+++ b/app/containers/Button/Button.stories.tsx
@@ -23,6 +23,8 @@ export const DisabledButton = () => <Button disabled {...buttonProps} />;
 
 export const DisabledLoadingButton = () => <Button disabled loading {...buttonProps} />;
 
+export const SmallButton = () => <Button small {...buttonProps} />;
+
 export const CustomButton = () => (
 	<Button
 		{...buttonProps}
diff --git a/app/containers/Button/index.tsx b/app/containers/Button/index.tsx
index 1e3c56e04f..61be086558 100644
--- a/app/containers/Button/index.tsx
+++ b/app/containers/Button/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { StyleProp, StyleSheet, Text, TextStyle } from 'react-native';
+import { StyleProp, StyleSheet, Text, TextStyle, ViewStyle } from 'react-native';
 import Touchable, { PlatformTouchableProps } from 'react-native-platform-touchable';
 
 import { useTheme } from '../../theme';
@@ -14,16 +14,25 @@ interface IButtonProps extends PlatformTouchableProps {
 	loading?: boolean;
 	color?: string;
 	fontSize?: number;
+	style?: StyleProp<ViewStyle> | StyleProp<ViewStyle>[];
 	styleText?: StyleProp<TextStyle> | StyleProp<TextStyle>[];
+	small?: boolean;
 }
 
 const styles = StyleSheet.create({
 	container: {
+		marginBottom: 12,
+		borderRadius: 4
+	},
+	normalButton: {
 		paddingHorizontal: 14,
 		justifyContent: 'center',
-		height: 48,
-		borderRadius: 4,
-		marginBottom: 12
+		height: 48
+	},
+	smallButton: {
+		paddingHorizontal: 12,
+		paddingVertical: 8,
+		alignSelf: 'center'
 	},
 	text: {
 		...sharedStyles.textMedium,
@@ -45,6 +54,7 @@ const Button: React.FC<IButtonProps> = ({
 	color,
 	style,
 	styleText,
+	small,
 	...otherProps
 }) => {
 	const { colors } = useTheme();
@@ -58,13 +68,14 @@ const Button: React.FC<IButtonProps> = ({
 	const resolvedTextColor = color || (isPrimary ? colors.fontWhite : colors.fontDefault);
 
 	const containerStyle = [
+		small ? styles.smallButton : styles.normalButton,
 		styles.container,
 		{ backgroundColor: isDisabled ? disabledBackgroundColor : resolvedBackgroundColor },
 		isDisabled && backgroundColor ? styles.disabled : {},
 		style
 	];
 
-	const textStyle = [styles.text, { color: isDisabled ? colors.fontDisabled : resolvedTextColor, fontSize }, styleText];
+	const textStyle = [styles.text, { color: isDisabled ? colors.buttonPrimaryDisabled : resolvedTextColor, fontSize }, styleText];
 
 	return (
 		<Touchable
diff --git a/app/containers/HeaderButton/HeaderButtonContainer.tsx b/app/containers/HeaderButton/HeaderButtonContainer.tsx
index abf6db9e74..01cdd478ce 100644
--- a/app/containers/HeaderButton/HeaderButtonContainer.tsx
+++ b/app/containers/HeaderButton/HeaderButtonContainer.tsx
@@ -1,9 +1,12 @@
 import React from 'react';
-import { StyleSheet, View } from 'react-native';
+import { StyleSheet, View, ViewProps } from 'react-native';
+
+import { isAndroid, isTablet } from '../../lib/methods/helpers';
 
 interface IHeaderButtonContainer {
 	children?: React.ReactElement | (React.ReactElement | null)[] | null;
 	left?: boolean;
+	onLayout?: ViewProps['onLayout'];
 }
 
 const styles = StyleSheet.create({
@@ -13,15 +16,18 @@ const styles = StyleSheet.create({
 		justifyContent: 'center'
 	},
 	left: {
-		marginLeft: 5
+		marginLeft: isTablet ? 5 : -5,
+		marginRight: isAndroid ? 25 : 0
 	},
 	right: {
-		marginRight: 5
+		marginRight: isTablet ? 5 : -5
 	}
 });
 
-const Container = ({ children, left = false }: IHeaderButtonContainer): React.ReactElement => (
-	<View style={[styles.container, left ? styles.left : styles.right]}>{children}</View>
+const Container = ({ children, left = false, onLayout }: IHeaderButtonContainer): React.ReactElement => (
+	<View style={[styles.container, left ? styles.left : styles.right]} onLayout={onLayout || undefined}>
+		{children}
+	</View>
 );
 
 Container.displayName = 'HeaderButton.Container';
diff --git a/app/containers/MessageActions/index.tsx b/app/containers/MessageActions/index.tsx
index 2ebaac7314..0b5f8d1992 100644
--- a/app/containers/MessageActions/index.tsx
+++ b/app/containers/MessageActions/index.tsx
@@ -378,6 +378,17 @@ const MessageActions = React.memo(
 				const options: TActionSheetOptionsItem[] = [];
 				const videoConfBlock = message.t === 'videoconf';
 
+				// Edit
+				const isEditAllowed = allowEdit(message);
+				if (!videoConfBlock && (isOwn(message) || isEditAllowed)) {
+					options.push({
+						title: I18n.t('Edit'),
+						icon: 'edit',
+						onPress: () => handleEdit(message.id),
+						enabled: isEditAllowed
+					});
+				}
+
 				// Jump to message
 				const quoteMessageLink = getQuoteMessageLink(message.attachments);
 				if (quoteMessageLink && jumpToMessage) {
@@ -455,17 +466,6 @@ const MessageActions = React.memo(
 					onPress: () => handleShare(message)
 				});
 
-				// Edit
-				const isEditAllowed = allowEdit(message);
-				if (!videoConfBlock && (isOwn(message) || isEditAllowed)) {
-					options.push({
-						title: I18n.t('Edit'),
-						icon: 'edit',
-						onPress: () => handleEdit(message.id),
-						enabled: isEditAllowed
-					});
-				}
-
 				// Pin
 				if (Message_AllowPinning && !videoConfBlock) {
 					options.push({
diff --git a/app/containers/MessageComposer/components/ComposerInput.tsx b/app/containers/MessageComposer/components/ComposerInput.tsx
index f5e672c1e0..378b1729bc 100644
--- a/app/containers/MessageComposer/components/ComposerInput.tsx
+++ b/app/containers/MessageComposer/components/ComposerInput.tsx
@@ -172,9 +172,11 @@ export const ComposerInput = memo(
 		};
 
 		const focus = () => {
-			if (inputRef.current) {
-				inputRef.current.focus();
-			}
+			setTimeout(() => {
+				if (inputRef.current) {
+					inputRef.current.focus();
+				}
+			}, 300);
 		};
 
 		const onChangeText: TextInputProps['onChangeText'] = text => {
diff --git a/app/views/RoomView/Separator.tsx b/app/containers/MessageSeparator.tsx
similarity index 81%
rename from app/views/RoomView/Separator.tsx
rename to app/containers/MessageSeparator.tsx
index a4605a1ec2..0e0972bca6 100644
--- a/app/views/RoomView/Separator.tsx
+++ b/app/containers/MessageSeparator.tsx
@@ -2,10 +2,10 @@ import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 import moment from 'moment';
 
-import I18n from '../../i18n';
-import sharedStyles from '../Styles';
-import { themes } from '../../lib/constants';
-import { useTheme } from '../../theme';
+import I18n from '../i18n';
+import sharedStyles from '../views/Styles';
+import { themes } from '../lib/constants';
+import { useTheme } from '../theme';
 
 const styles = StyleSheet.create({
 	container: {
@@ -31,8 +31,13 @@ const styles = StyleSheet.create({
 	}
 });
 
-const DateSeparator = ({ ts, unread }: { ts: Date | string | null; unread: boolean }): React.ReactElement => {
+const MessageSeparator = ({ ts, unread }: { ts?: Date | string | null; unread?: boolean }): React.ReactElement | null => {
 	const { theme } = useTheme();
+
+	if (!ts && !unread) {
+		return null;
+	}
+
 	const date = ts ? moment(ts).format('LL') : null;
 	const unreadLine = { backgroundColor: themes[theme].buttonBackgroundDangerDefault };
 	const unreadText = { color: themes[theme].fontDanger };
@@ -62,4 +67,4 @@ const DateSeparator = ({ ts, unread }: { ts: Date | string | null; unread: boole
 	);
 };
 
-export default DateSeparator;
+export default MessageSeparator;
diff --git a/app/containers/RoomHeader/RoomHeader.tsx b/app/containers/RoomHeader/RoomHeader.tsx
index 72741eec3d..98a592bca2 100644
--- a/app/containers/RoomHeader/RoomHeader.tsx
+++ b/app/containers/RoomHeader/RoomHeader.tsx
@@ -8,6 +8,7 @@ import RoomTypeIcon from '../RoomTypeIcon';
 import { TUserStatus, IOmnichannelSource } from '../../definitions';
 import { useTheme } from '../../theme';
 import { useAppSelector } from '../../lib/hooks';
+import { isIOS } from '../../lib/methods/helpers';
 
 const HIT_SLOP = {
 	top: 5,
@@ -22,7 +23,6 @@ const getSubTitleSize = (scale: number) => SUBTITLE_SIZE * scale;
 
 const styles = StyleSheet.create({
 	container: {
-		flex: 1,
 		justifyContent: 'center'
 	},
 	titleContainer: {
@@ -75,6 +75,7 @@ interface IRoomHeader {
 	testID?: string;
 	sourceType?: IOmnichannelSource;
 	disabled?: boolean;
+	rightButtonsWidth?: number;
 }
 
 const SubTitle = React.memo(({ usersTyping, subtitle, renderFunc, scale }: TRoomHeaderSubTitle) => {
@@ -141,7 +142,8 @@ const Header = React.memo(
 		testID,
 		usersTyping = [],
 		sourceType,
-		disabled
+		disabled,
+		rightButtonsWidth = 0
 	}: IRoomHeader) => {
 		const { colors } = useTheme();
 		const portrait = height > width;
@@ -189,7 +191,8 @@ const Header = React.memo(
 				style={[
 					styles.container,
 					{
-						opacity: disabled ? 0.5 : 1
+						opacity: disabled ? 0.5 : 1,
+						width: width - rightButtonsWidth - (isIOS ? 60 : 80) - (isMasterDetail ? 350 : 0)
 					}
 				]}
 				disabled={disabled}
diff --git a/app/containers/RoomHeader/index.tsx b/app/containers/RoomHeader/index.tsx
index 79d261dd9c..d1c257998b 100644
--- a/app/containers/RoomHeader/index.tsx
+++ b/app/containers/RoomHeader/index.tsx
@@ -21,6 +21,7 @@ interface IRoomHeaderContainerProps {
 	sourceType?: IOmnichannelSource;
 	visitor?: IVisitor;
 	disabled?: boolean;
+	rightButtonsWidth?: number;
 }
 
 const RoomHeaderContainer = React.memo(
@@ -38,7 +39,8 @@ const RoomHeaderContainer = React.memo(
 		type,
 		sourceType,
 		visitor,
-		disabled
+		disabled,
+		rightButtonsWidth
 	}: IRoomHeaderContainerProps) => {
 		let subtitle: string | undefined;
 		let statusVisitor: TUserStatus | undefined;
@@ -89,6 +91,7 @@ const RoomHeaderContainer = React.memo(
 				onPress={onPress}
 				sourceType={sourceType}
 				disabled={disabled}
+				rightButtonsWidth={rightButtonsWidth}
 			/>
 		);
 	}
diff --git a/app/containers/TextInput/FormTextInput.tsx b/app/containers/TextInput/FormTextInput.tsx
index 8cd82f6d8e..1fe339060d 100644
--- a/app/containers/TextInput/FormTextInput.tsx
+++ b/app/containers/TextInput/FormTextInput.tsx
@@ -15,12 +15,13 @@ const styles = StyleSheet.create({
 		paddingTop: 5
 	},
 	inputContainer: {
-		marginBottom: 10
+		marginBottom: 10,
+		gap: 4
 	},
 	label: {
-		marginBottom: 10,
-		fontSize: 14,
-		...sharedStyles.textSemibold
+		fontSize: 16,
+		lineHeight: 22,
+		...sharedStyles.textMedium
 	},
 	input: {
 		...sharedStyles.textRegular,
diff --git a/app/containers/UserGeneratedContentRules.tsx b/app/containers/UserGeneratedContentRules.tsx
index 885d2a6fe5..4b1f53d508 100644
--- a/app/containers/UserGeneratedContentRules.tsx
+++ b/app/containers/UserGeneratedContentRules.tsx
@@ -15,14 +15,13 @@ const styles = StyleSheet.create({
 		marginHorizontal: 30
 	},
 	bottomContainerText: {
-		...sharedStyles.textRegular,
-		fontSize: 13,
+		...sharedStyles.textMedium,
+		fontSize: 14,
+		lineHeight: 22,
 		textAlign: 'center'
 	},
-	bottomContainerTextBold: {
-		...sharedStyles.textSemibold,
-		fontSize: 13,
-		textAlign: 'center'
+	bottomContainerTextUnderline: {
+		textDecorationLine: 'underline'
 	}
 });
 
@@ -40,22 +39,16 @@ const UGCRules = ({ styleContainer }: { styleContainer?: ViewStyle }) => {
 	};
 	return (
 		<View style={[styles.bottomContainer, styleContainer]}>
-			<Text style={[styles.bottomContainerText, { color: colors.fontSecondaryInfo }]}>
-				{`${I18n.t('Onboarding_agree_terms')}\n`}
-				<Text
-					style={[styles.bottomContainerTextBold, { color: colors.strokeHighlight }]}
-					onPress={() => openContract('terms-of-service')}
-				>
-					{I18n.t('Terms_of_Service')}
-				</Text>{' '}
-				{I18n.t('and')}
-				<Text
-					style={[styles.bottomContainerTextBold, { color: colors.strokeHighlight }]}
-					onPress={() => openContract('privacy-policy')}
-				>
-					{' '}
-					{I18n.t('Privacy_Policy')}
-				</Text>
+			<Text style={[styles.bottomContainerText, { color: colors.fontSecondaryInfo }]}>{I18n.t('Onboarding_agree_terms')}</Text>
+			<Text
+				style={[styles.bottomContainerTextUnderline, styles.bottomContainerText, { color: colors.fontInfo }]}
+				onPress={() => openContract('terms-of-service')}>
+				{I18n.t('Terms_of_Service')}
+			</Text>
+			<Text
+				style={[styles.bottomContainerTextUnderline, styles.bottomContainerText, { color: colors.fontInfo }]}
+				onPress={() => openContract('privacy-policy')}>
+				{I18n.t('Privacy_Policy')}
 			</Text>
 		</View>
 	);
diff --git a/app/containers/markdown/styles.ts b/app/containers/markdown/styles.ts
index d558ef4146..232d60d7f1 100644
--- a/app/containers/markdown/styles.ts
+++ b/app/containers/markdown/styles.ts
@@ -50,8 +50,8 @@ export default StyleSheet.create({
 		...sharedStyles.textRegular
 	},
 	customEmoji: {
-		width: 20,
-		height: 20
+		width: 15,
+		height: 15
 	},
 	customEmojiBig: {
 		width: 30,
diff --git a/app/containers/message/Message.stories.tsx b/app/containers/message/Message.stories.tsx
index ecb05a95f9..78e8d9602c 100644
--- a/app/containers/message/Message.stories.tsx
+++ b/app/containers/message/Message.stories.tsx
@@ -4,7 +4,7 @@ import { NavigationContainer } from '@react-navigation/native';
 
 import MessageComponent from './Message';
 import { E2E_MESSAGE_TYPE, messagesStatus, themes } from '../../lib/constants';
-import MessageSeparator from '../../views/RoomView/Separator';
+import MessageSeparator from '../MessageSeparator';
 import MessageContext from './Context';
 
 const _theme = 'light';
@@ -57,8 +57,7 @@ export default {
 							onDiscussionPress: () => {},
 							onReactionLongPress: () => {},
 							threadBadgeColor: themes.light.fontInfo
-						}}
-					>
+						}}>
 						<Story />
 					</MessageContext.Provider>
 				</ScrollView>
diff --git a/app/containers/message/index.tsx b/app/containers/message/index.tsx
index 37122689e2..768cfc8657 100644
--- a/app/containers/message/index.tsx
+++ b/app/containers/message/index.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement } from 'react';
+import React from 'react';
 import { Keyboard, ViewStyle } from 'react-native';
 
 import Message from './Message';
@@ -10,6 +10,7 @@ import openLink from '../../lib/methods/helpers/openLink';
 import { IAttachment, TAnyMessageModel, TGetCustomEmoji } from '../../definitions';
 import { IRoomInfoParam } from '../../views/SearchMessagesView';
 import { E2E_MESSAGE_TYPE, E2E_STATUS, messagesStatus } from '../../lib/constants';
+import MessageSeparator from '../MessageSeparator';
 
 interface IMessageContainerProps {
 	item: TAnyMessageModel;
@@ -60,7 +61,8 @@ interface IMessageContainerProps {
 	closeEmojiAndAction?: (action?: Function, params?: any) => void;
 	isBeingEdited?: boolean;
 	isPreview?: boolean;
-	separator?: ReactElement | null;
+	dateSeparator?: Date | string | null;
+	showUnreadSeparator?: boolean;
 }
 
 interface IMessageContainerState {
@@ -97,9 +99,24 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
 
 	shouldComponentUpdate(nextProps: IMessageContainerProps, nextState: IMessageContainerState) {
 		const { isManualUnignored } = this.state;
-		const { threadBadgeColor, isIgnored, highlighted, previousItem, autoTranslateRoom, autoTranslateLanguage, isBeingEdited } =
-			this.props;
+		const {
+			threadBadgeColor,
+			isIgnored,
+			highlighted,
+			previousItem,
+			autoTranslateRoom,
+			autoTranslateLanguage,
+			isBeingEdited,
+			showUnreadSeparator,
+			dateSeparator
+		} = this.props;
 
+		if (nextProps.showUnreadSeparator !== showUnreadSeparator) {
+			return true;
+		}
+		if (nextProps.dateSeparator !== dateSeparator) {
+			return true;
+		}
 		if (nextProps.highlighted !== highlighted) {
 			return true;
 		}
@@ -362,7 +379,8 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
 			highlighted,
 			isBeingEdited,
 			isPreview,
-			separator
+			showUnreadSeparator,
+			dateSeparator
 		} = this.props;
 		const {
 			id,
@@ -434,7 +452,7 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
 					translateLanguage: canTranslateMessage ? autoTranslateLanguage : undefined,
 					isEncrypted: this.isEncrypted
 				}}>
-				{separator || null}
+				<MessageSeparator ts={dateSeparator} unread={showUnreadSeparator} />
 				{/* @ts-ignore*/}
 				<Message
 					id={id}
diff --git a/app/definitions/ISubscription.ts b/app/definitions/ISubscription.ts
index 9e318cd1ce..90b99a1f07 100644
--- a/app/definitions/ISubscription.ts
+++ b/app/definitions/ISubscription.ts
@@ -93,7 +93,7 @@ export interface ISubscription {
 	livechatData?: any;
 	tags?: string[];
 	E2EKey?: string;
-	E2ESuggestedKey?: string;
+	E2ESuggestedKey?: string | null;
 	encrypted?: boolean;
 	e2eKeyId?: string;
 	avatarETag?: string;
@@ -153,7 +153,7 @@ export interface IServerSubscription extends IRocketChatRecord {
 	onHold?: boolean;
 	encrypted?: boolean;
 	E2EKey?: string;
-	E2ESuggestedKey?: string;
+	E2ESuggestedKey?: string | null;
 	unreadAlert?: 'default' | 'all' | 'mentions' | 'nothing';
 
 	fname?: unknown;
diff --git a/app/definitions/index.ts b/app/definitions/index.ts
index 5a0a171d40..b4bd3f0fd1 100644
--- a/app/definitions/index.ts
+++ b/app/definitions/index.ts
@@ -1,6 +1,6 @@
 import { RouteProp } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
 import { Dispatch } from 'redux';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
 import { TNavigation } from '../stacks/stackType';
 import { TColors, TSupportedThemes } from '../theme';
@@ -40,7 +40,7 @@ export * from './IDataSelect';
 export * from './TUserStatus';
 
 export interface IBaseScreen<T extends Record<string, object | undefined>, S extends string> {
-	navigation: StackNavigationProp<T & TNavigation, S>;
+	navigation: NativeStackNavigationProp<T & TNavigation, S>;
 	route: RouteProp<T, S>;
 	dispatch: Dispatch;
 	isMasterDetail: boolean;
diff --git a/app/definitions/navigationTypes.ts b/app/definitions/navigationTypes.ts
index cd8e34d123..93ab7dcc2a 100644
--- a/app/definitions/navigationTypes.ts
+++ b/app/definitions/navigationTypes.ts
@@ -1,5 +1,5 @@
 import { NavigatorScreenParams } from '@react-navigation/core';
-import { StackNavigationOptions } from '@react-navigation/stack';
+import { NativeStackNavigationOptions } from '@react-navigation/native-stack';
 
 import { TSubscriptionModel } from './ISubscription';
 import { TServerModel } from './IServer';
@@ -14,7 +14,7 @@ interface INavigationProps {
 }
 
 export type TNavigationOptions = {
-	navigationOptions?(props: INavigationProps): StackNavigationOptions;
+	navigationOptions?(props: INavigationProps): NativeStackNavigationOptions;
 };
 
 export type SetUsernameStackParamList = {
diff --git a/app/definitions/rest/v1/omnichannel.ts b/app/definitions/rest/v1/omnichannel.ts
index b18ea77a22..009a121f19 100644
--- a/app/definitions/rest/v1/omnichannel.ts
+++ b/app/definitions/rest/v1/omnichannel.ts
@@ -203,4 +203,18 @@ export type OmnichannelEndpoints = {
 			cannedResponses: ICannedResponse[];
 		}>;
 	};
+
+	'livechat/room.saveInfo': {
+		POST: (params: {
+			guestData: { _id: string; name?: string; email?: string; phone?: string; livechatData?: Record<string, string> };
+			roomData: {
+				_id: string;
+				topic?: string;
+				tags?: string[];
+				livechatData?: Record<string, string>;
+				priorityId?: string;
+				slaId?: string;
+			};
+		}) => void;
+	};
 };
diff --git a/app/ee/omnichannel/views/QueueListView.tsx b/app/ee/omnichannel/views/QueueListView.tsx
index 0c2ed27c61..54cc522c80 100644
--- a/app/ee/omnichannel/views/QueueListView.tsx
+++ b/app/ee/omnichannel/views/QueueListView.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useRef } from 'react';
 import { CompositeNavigationProp, useNavigation } from '@react-navigation/native';
-import { StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationOptions, NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { FlatList, ListRenderItem } from 'react-native';
 import { shallowEqual, useSelector } from 'react-redux';
 
@@ -22,8 +22,8 @@ import { MasterDetailInsideStackParamList } from '../../../stacks/MasterDetailSt
 import { getRoomAvatar, getRoomTitle, getUidDirectMessage, isIOS, isTablet } from '../../../lib/methods/helpers';
 
 type TNavigation = CompositeNavigationProp<
-	StackNavigationProp<ChatsStackParamList, 'QueueListView'>,
-	StackNavigationProp<MasterDetailInsideStackParamList>
+	NativeStackNavigationProp<ChatsStackParamList, 'QueueListView'>,
+	NativeStackNavigationProp<MasterDetailInsideStackParamList>
 >;
 
 const INITIAL_NUM_TO_RENDER = isTablet ? 20 : 12;
@@ -62,7 +62,7 @@ const QueueListView = React.memo(() => {
 	const queued = useSelector((state: IApplicationState) => getInquiryQueueSelector(state));
 
 	useEffect(() => {
-		const options: StackNavigationOptions = {
+		const options: NativeStackNavigationOptions = {
 			title: I18n.t('Queued_chats')
 		};
 		if (isMasterDetail) {
diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json
index 69252aec1b..00e53b2f7b 100644
--- a/app/i18n/locales/ar.json
+++ b/app/i18n/locales/ar.json
@@ -10,6 +10,9 @@
   "Admin_Panel": "لوحة الإدارة",
   "After_seconds_set_by_admin": "بعد {{seconds}} ثوان (حددها المدير)",
   "Agent": "المندوب",
+  "AirGapped_workspace_read_only_description": "يمكن للمسؤولين استعادة الوظائف الكاملة عن طريق الاتصال بالإنترنت أو الترقية إلى خطة متميزة.",
+  "AirGapped_workspace_read_only_share_extension_title": "المشاركة معطلة لأن مساحة العمل في وضع القراءة فق.",
+  "AirGapped_workspace_read_only_title": "مساحة العمل في وضع القراءة فقط.",
   "Alert": "إنذار",
   "alert": "إنذار",
   "alerts": "الإنذارات",
@@ -18,11 +21,12 @@
   "All_users_in_the_channel_can_write_new_messages": "يمكن لجميع المستخدمين في القناة كتابة رسائل جديدة",
   "All_users_in_the_team_can_write_new_messages": "يمكن لجميع المستخدمين في الفريق كتابة رسائل جديدة",
   "Allow_Reactions": "السماح للتفاعلات",
+  "Already_have_an_account": "هل لديك حساب بالفعل؟",
   "and": "و",
   "and_N_more": "و{{count}} آخرين",
   "Announcement": "إعلان",
   "announcement": "إعلان",
-  "Apply_Your_Certificate": "طبق شهادتك",
+  "Apply_Certificate": "تقديم الشهادة",
   "ARCHIVE": "أرشفة",
   "archive": "أرشفة",
   "are_typing": "يكتب",
@@ -107,7 +111,7 @@
   "Discussion_name": "اسم النقاش",
   "Discussions": "مناقشات",
   "Displays_action_text": "يعرض نص الإجراء",
-  "Do_you_have_a_certificate": "هل لديك شهادة؟",
+  "Do_you_have_a_certificate": "هل لديك شهادة لهذا المساحة؟",
   "Do_you_have_an_account": "هل لديك حساب؟",
   "Do_you_really_want_to_key_this_room_question_mark": "هل تريد حقاً {{key}} هذه الغرفة؟",
   "Dont_activate": "لا تقم بالتفعيل الآن",
@@ -162,6 +166,7 @@
   "Forward_Chat": "إعادة توجيه المحادثة",
   "Forward_to_department": "إعادة توجيه للقسم",
   "Forward_to_user": "إعادة توجيه لمستخدم",
+  "Full_name": "الاسم الكامل",
   "Full_table": "انقر لرؤية الجدول كاملاً",
   "Generate_New_Link": "إنشاء رابط جديد",
   "Get_help": "احصل على المساعدة",
@@ -178,6 +183,7 @@
   "Insert_Join_Code": "ضع رمز الانضمام",
   "Invalid_or_expired_invite_token": "رمز الدعوة غير صالح أو منتهي الصلاحية",
   "Invalid_server_version": "الخادم الذي تحاول الاتصال به يستخدم إصدارا لم يعد مدعوماً: {{currentVersion}}.\n\n النسخ المدعومة تبدأ من {{minVersion}}",
+  "Invalid_workspace_URL": "عنوان URL لمساحة العمل غير صالح",
   "Invisible": "غير مرئي",
   "Invite_Link": "رابط الدعوة",
   "Invite_user_to_join_channel": "دعوة مستخدم واحد إلى الانضمام إلى هذه القناة",
@@ -188,7 +194,6 @@
   "is_typing": "يكتب",
   "Join": "انضم",
   "Join_Code": "رمز الانضمام",
-  "Join_our_open_workspace": "انضم لمساحة عملنا المفتوحة",
   "Join_the_given_channel": "انضمام إلى القناة المحددة",
   "Just_invited_people_can_access_this_channel": "يمكن للأشخاص المدعوين فقط الوصول إلى هذه القناة",
   "Just_invited_people_can_access_this_team": "فقط الأشخاص المدعوين يمكنهم الوصول إلى هذا الفريق",
@@ -276,7 +281,7 @@
   "No_Read_Receipts": "لا إيصالات قراءة",
   "No_results_found": "لا نتائج",
   "No_starred_messages": "لا رسائل مميزة",
-  "Not_RC_Server": "هذا ليس بخادم Rocket.Chat.\n{{contact}}",
+  "Not_RC_Server": "اتصل بمسؤول مساحة العمل الخاصة بك أو ابحث في بريدك الإلكتروني عن دعوة إلى مساحة عمل Rocket.Chat.",
   "Nothing": "لا شيء",
   "Nothing_to_save": "لا شيء للحفظ!",
   "Notification_Preferences": "تفضيلات الإشعار",
@@ -286,7 +291,6 @@
   "Omnichannel": "القنوات الموحدة",
   "Omnichannel_enable_alert": "أنت غير متاح ",
   "Onboarding_agree_terms": "بالمواصلة أنت توافق على Rocket.Chat",
-  "Onboarding_join_open_description": "انضم لمساحة عملنا للتواصل مع فريق Rocket.Chat ومع المجتمع",
   "Onboarding_less_options": "خيارات أقل",
   "Onboarding_more_options": "خيارات أكثر",
   "Onboarding_subtitle": "ما بعد بيئة فريق تعاونية",
@@ -472,7 +476,8 @@
   "What_are_you_doing_right_now": "ما الذي تفعله حالياً؟",
   "Whats_the_password_for_your_certificate": "ماهي كلمة المرور للشهادة؟",
   "Without_Servers": "بدون خوادم",
-  "Workspaces": "مساحات العمل",
+  "Workspace_URL": "عنوان URL لمساحة العمل",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Would_you_like_to_return_the_inquiry": "هل ترغب بالرد على السؤال؟",
   "Write_External_Permission": "إذن معرض",
   "Write_External_Permission_Message": "يحتاج Rocket.Chat للوصول إلى معرض الصور الخاص بك حتى تتمكن من حفظ الصور",
@@ -484,6 +489,7 @@
   "You_are_in_preview_mode": "أنت في وضع المعاينة",
   "You_can_search_using_RegExp_eg": "يمكنك استخدام RegExp. مثال: `/^text$/i`",
   "You_colon": "أنت: ",
+  "You_dont_have_account": "ليس لديك حساب؟",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "تحتاج إلى الوصول إلى خادم Rocket.Chat واحد على الأقل لمشاركة شيء ما",
   "You_need_to_verifiy_your_email_address_to_get_notications": "يجب تأكيد البريد الإلكتروني حتى تصلك الإشعارات",
   "you_were_mentioned": "تمت الإشارة إليك",
diff --git a/app/i18n/locales/bn-IN.json b/app/i18n/locales/bn-IN.json
index bd3fda9693..68f1977fbe 100644
--- a/app/i18n/locales/bn-IN.json
+++ b/app/i18n/locales/bn-IN.json
@@ -27,6 +27,9 @@
   "admin-video-conf-provider-not-configured-header": "কনফারেন্স কল সক্ষম হয়নি",
   "After_seconds_set_by_admin": "{{seconds}} সেকেন্ড পরে (প্রশাসক দ্বারা সেট করা)",
   "Agent": "এজেন্ট",
+  "AirGapped_workspace_read_only_description": "অ্যাডমিনরা এটি ইন্টারনেটের সাথে সংযুক্ত করে বা একটি প্রিমিয়াম পরিকল্পনায় আপগ্রেড করে সম্পূর্ণ কার্যকারিতা পুনরুদ্ধার করতে পারেন।",
+  "AirGapped_workspace_read_only_share_extension_title": "কর্মস্থান পড়ার মোডে থাকার কারণে শেয়ারিং অক্ষম।",
+  "AirGapped_workspace_read_only_title": "কর্মস্থান পড়ার মোডে।",
   "Alert": "সতর্কতা",
   "alert": "সতর্কতা",
   "alerts": "সতর্কতা",
@@ -35,12 +38,13 @@
   "All_users_in_the_channel_can_write_new_messages": "চ্যানেলে সকল ব্যবহারকারী নতুন মেসেজ লেখতে পারবে",
   "All_users_in_the_team_can_write_new_messages": "দলে সকল ব্যবহারকারী নতুন মেসেজ লেখতে পারবে",
   "Allow_Reactions": "প্রতিক্রিয়া অনুমতি",
+  "Already_have_an_account": "আপনার কি ইতিমধ্যেই একটি অ্যাকাউন্ট আছে?",
   "Also_send_thread_message_to_channel_behavior": "সেইমসঙ্গে চ্যানেলে থ্রেড বার্তা প্রেরণ করুন",
   "and": "এবং",
   "and_N_more": "এবং {{count}} আর",
   "Announcement": "ঘোষণা",
   "announcement": "ঘোষণা",
-  "Apply_Your_Certificate": "আপনার সার্টিফিকেট প্রয়োগ করুন",
+  "Apply_Certificate": "সার্টিফিকেট প্রয়োগ করুন",
   "ARCHIVE": "সংরক্ষণাগার",
   "archive": "সংরক্ষণাগার",
   "are_typing": "টাইপ করছে",
@@ -192,7 +196,7 @@
   "Discussion_name": "আলোচনা নাম",
   "Discussions": "আলোচনা",
   "Display": "ডিসপ্লে",
-  "Do_you_have_a_certificate": "আপনার কি একটি সার্টিফিকেট আছে?",
+  "Do_you_have_a_certificate": "আপনার কি এই ওয়ার্কস্পেসের জন্য একটি সার্টিফিকেট আছে?",
   "Do_you_have_an_account": "আপনার কি একটি অ্যাকাউন্ট আছে?",
   "Do_you_really_want_to_key_this_room_question_mark": "আপনি কি সত্যিই চান যে আপনি এই রুমটি {{key}} করতে?",
   "Dont_activate": "এখন সক্রিয় করবেন না",
@@ -235,7 +239,6 @@
   "End_to_end_encrypted_room": "শেষ হতে শেষ এনক্রিপ্টেড রুম",
   "Enter_E2EE_Password": "E2EE পাসওয়ার্ড দিন",
   "Enter_E2EE_Password_description": "আপনার এনক্রিপ্টেড চ্যানেলগুলি এবং সরাসরি বার্তাগুলি অ্যাক্সেস করতে, আপনার এনক্রিপশন পাসওয়ার্ড লিখুন। এটি সার্ভারে সংরক্ষিত হয় না, তাই আপনাকে প্রতিটি ডিভাইসে এটি ব্যবহার করতে হবে।",
-  "Enter_workspace_URL": "ওয়ার্কস্পেস URL লিখুন",
   "Error_Download_file": "ফাইল ডাউনলোড করতে ত্রুটি",
   "Error_uploading": "আপলোড করার সময় ত্রুটি",
   "error-action-not-allowed": "{{action}} অনুমোদিত নয়",
@@ -274,6 +277,7 @@
   "Forward_message": "বার্তা প্রেরণ করুন",
   "Forward_to_department": "বিভাগে ফরোয়ার্ড",
   "Forward_to_user": "ব্যবহারকারীকে ফরোয়ার্ড",
+  "Full_name": "সম্পূর্ণ নাম",
   "Full_table": "পুরো টেবিল দেখতে ক্লিক করুন",
   "Generate_New_Link": "নতুন লিঙ্ক তৈরি করুন",
   "Get_help": "সাহায্য পান",
@@ -297,6 +301,7 @@
   "Insert_Join_Code": "যোগদান কোড প্রবেশ করুন",
   "Invalid_or_expired_invite_token": "অকার্যকর বা মেয়াদ উত্তীর্ণ ইনভাইট টোকেন",
   "Invalid_server_version": "আপনি যাচাই করতে চেষ্টা করছেন তার একটি সংস্করণ ব্যবহার করছেন যা এখনও অ্যাপ দ্বারা সাপোর্ট করা হয়নি: {{currentVersion}}।\n\nআমরা সংস্করণ {{minVersion}} প্রয়োজন প্রয়োজন",
+  "Invalid_workspace_URL": "অবৈধ ওয়ার্কস্পেস URL",
   "Invisible": "অদৃশ্য",
   "Invite_Link": "আমন্ত্রণ লিঙ্ক",
   "Invite_users": "ব্যবহারকারীদের আমন্ত্রণ করুন",
@@ -308,7 +313,6 @@
   "Jitsi_may_require_authentication": "জিতসি পূর্বাভাস নিতে পারে",
   "Join": "যোগদান করুন",
   "Join_Code": "যোগদান কোড",
-  "Join_our_open_workspace": "আমাদের খোলা ওয়ার্কস্পেসে যোগদান করুন",
   "Joined": "যোগদান করেছে",
   "Just_invited_people_can_access_this_channel": "এই চ্যানেলে শুধুমাত্র আমন্ত্রিত ব্যক্তিদের অ্যাক্সেস করতে পারবে",
   "Just_invited_people_can_access_this_team": "এই দলে শুধুমাত্র আমন্ত্রিত ব্যক্তিদের অ্যাক্সেস করতে পারবে",
@@ -441,7 +445,7 @@
   "no-active-video-conf-provider-header": "কনফারেন্স কল সক্ষম হয়নি",
   "no-videoconf-provider-app-body": "কনফারেন্স কল অ্যাপগুলি একটি কার্যক্ষম প্রশাসক দ্বারা রকেট.চ্যাট মার্কেটপ্লেসে ইনস্টল করা যেতে পারে।",
   "no-videoconf-provider-app-header": "কনফারেন্স কল পাওয়া যায়নি",
-  "Not_RC_Server": "এটি একটি Rocket.Chat ওয়ার্কস্পেস নয়।\n{{contact}}",
+  "Not_RC_Server": "আপনার ওয়ার্কস্পেস অ্যাডমিনের সাথে যোগাযোগ করুন অথবা আপনার ইমেইল ইনবক্সে একটি Rocket.Chat ওয়ার্কস্পেস আমন্ত্রণের জন্য অনুসন্ধান করুন।",
   "Nothing": "কিছুই না",
   "Nothing_to_save": "সংরক্ষণ করার জন্য কিছু নেই!",
   "Notification_Preferences": "বিজ্ঞপ্তি পছন্দ",
@@ -456,7 +460,6 @@
   "Omnichannel_queue": "অমনিচ্যানেল কিউ",
   "On_hold_Livechats": "অমনিচ্যানেল চ্যাটগুলি হোল্ডে",
   "Onboarding_agree_terms": "চলতি, আপনি Rocket.Chat এ একমত হন",
-  "Onboarding_join_open_description": "Rocket.Chat দল এবং সম্প্রদায়ের সাথে চ্যাট করতে আমাদের খোলা ওয়ার্কস্পেসে যোগদান করুন।",
   "Onboarding_less_options": "কম বিকল্প",
   "Onboarding_more_options": "আরও বিকল্প",
   "Onboarding_subtitle": "দল সহযোগিতা বাদ দিন",
@@ -732,7 +735,8 @@
   "Wi_Fi": "ওয়াই-ফাই",
   "Wi_Fi_and_mobile_data": "ওয়াই-ফাই এবং মোবাইল ডেটা",
   "Without_Servers": "ওয়ার্কস্পেস ছাড়া",
-  "Workspace_URL_Example": "উদাহরণ. your-company.rocket.chat",
+  "Workspace_URL": "ওয়ার্কস্পেস URL",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "ওয়ার্কস্পেস",
   "Would_like_to_place_on_hold": "আপনি কি এই চ্যাটটি হোল্ড করতে চান?",
   "Would_you_like_to_return_the_inquiry": "আপনি কি অনুসন্ধান ফিরিয়ে আসতে চান?",
@@ -750,6 +754,7 @@
   "You_are_leaving_the_team": "আপনি দলটি ছেড়ে যাচ্ছেন '{{team}}'",
   "You_can_search_using_RegExp_eg": "আপনি RegExp ব্যবহার করতে পারেন। যেমন: `/^text$/i`",
   "You_colon": "আপনি: ",
+  "You_dont_have_account": "অ্যাকাউন্ট নেই?",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "আপনাকে কিছু ভাগ করার জন্য কমপ্রয়োজন একটি Rocket.Chat ওয়ার্কস্পেসে অ্যাক্সেস করা।",
   "You_need_to_verifiy_your_email_address_to_get_notications": "আপনাকে বিজ্ঞপ্তিগুলি পেতে আপনার ইমেল ঠিকানা যাচাই করতে হবে",
   "you_were_mentioned": "আপনি উল্লেখ করা হয়েছিলেন",
diff --git a/app/i18n/locales/cs.json b/app/i18n/locales/cs.json
index a561550396..f46e295968 100644
--- a/app/i18n/locales/cs.json
+++ b/app/i18n/locales/cs.json
@@ -28,6 +28,9 @@
   "admin-video-conf-provider-not-configured-header": "Konferenční hovor není povolen",
   "After_seconds_set_by_admin": "Po {{seconds}} sekundách (nastaveno administrátorem)",
   "Agent": "Agent",
+  "AirGapped_workspace_read_only_description": "Správci mohou obnovit plnou funkčnost připojením k internetu nebo upgradem na prémiový plán.",
+  "AirGapped_workspace_read_only_share_extension_title": "Sdílení je zakázáno, protože pracovní prostor je v režimu pouze pro čtení.",
+  "AirGapped_workspace_read_only_title": "Pracoviště v režimu pouze pro čtení.",
   "Alert": "Upozornění",
   "alert": "upozornění",
   "alerts": "upozornění",
@@ -37,13 +40,14 @@
   "All_users_in_the_team_can_write_new_messages": "Všichni uživatelé v týmu mohou psát nové zprávy",
   "Allow_push_notifications_for_rocket_chat": "Povolit oznámení push pro Rocket.Chat",
   "Allow_Reactions": "Povolit reakce",
+  "Already_have_an_account": "Už máte účet?",
   "Also_send_thread_message_to_channel_behavior": "Také odeslat zprávu vlákna na kanál",
   "and": "a",
   "and_N_more": "a {{count}} dalších",
   "Announcement": "Oznámení",
   "announcement": "oznámení",
   "App_users_are_not_allowed_to_log_in_directly": "Uživatelé aplikace se nemohou přihlásit přímo.",
-  "Apply_Your_Certificate": "Použijte svůj certifikát",
+  "Apply_Certificate": "Použít certifikát",
   "ARCHIVE": "ARCHIV",
   "archive": "archiv",
   "are_typing": "píšou",
@@ -209,7 +213,7 @@
   "Discussions": "Diskuse",
   "Display": "Zobrazit",
   "Displays_action_text": "Zobrazí akční text",
-  "Do_you_have_a_certificate": "Máte certifikát?",
+  "Do_you_have_a_certificate": "Máte certifikát pro tento pracovní prostor?",
   "Do_you_have_an_account": "Máte účet?",
   "Do_you_really_want_to_key_this_room_question_mark": "Opravdu chcete {{key}} tento pokoj?",
   "Documentation": "Dokumentace",
@@ -250,7 +254,6 @@
   "Encryption_error_title": "Vaše heslo pro šifrování se zdá být špatné",
   "End_to_end_encrypted_room": "End to end šifrovaná místnost",
   "Enter_the_code": "Zadejte kód, který jsme vám právě poslali e-mailem.",
-  "Enter_workspace_URL": "Zadejte URL pracovního prostoru",
   "Enter_Your_E2E_Password": "Zadejte heslo E2E",
   "Enter_Your_Encryption_Password_desc1": "To vám umožní přístup k vašim zašifrovaným soukromým skupinám a přímým zprávám.",
   "Enter_Your_Encryption_Password_desc2": "Ke kódování/dekódování zpráv musíte zadat heslo na každém místě, kde používáte chat.",
@@ -293,6 +296,7 @@
   "Forward_message": "Přeposlat zprávu",
   "Forward_to_department": "Předat na oddělení",
   "Forward_to_user": "Přeposlat uživateli",
+  "Full_name": "Celé jméno",
   "Full_table": "Kliknutím zobrazíte celou tabulku",
   "Generate_New_Link": "Vygenerovat nový odkaz",
   "Get_help": "Získat pomoc",
@@ -321,6 +325,7 @@
   "Invalid_Email": "Neplatný e-mail",
   "Invalid_or_expired_invite_token": "Neplatný nebo vypršela platnost tokenu pozvánky",
   "Invalid_server_version": "Pracovní prostor, který se pokoušíte připojit, používá verzi, která již není aplikací podporována: {{currentVersion}}.\n\nPožadujeme verzi {{minVersion}}",
+  "Invalid_workspace_URL": "Neplatná URL adresa pracovního prostoru",
   "Invisible": "Neviditelný",
   "Invite_Link": "Odkaz na pozvánku",
   "Invite_user_to_join_channel": "Pozvat jednoho uživatele, aby se připojil k tomuto kanálu",
@@ -336,7 +341,6 @@
   "Jitsi_may_require_authentication": "Jitsi může vyžadovat ověření",
   "Join": "Připojit se",
   "Join_Code": "Připojit se ke kódu",
-  "Join_our_open_workspace": "Připojte se k našemu otevřenému pracovnímu prostoru",
   "Join_the_given_channel": "Připojte se k danému kanálu",
   "Joined": "Připojeno",
   "Jump_to_message": "Přejít na zprávu",
@@ -477,7 +481,7 @@
   "no-videoconf-provider-app-body": "Aplikace pro konferenční hovory může na Rocket.Chat Marketplace nainstalovat správce pracovního prostoru.",
   "no-videoconf-provider-app-header": "Konferenční hovor není k dispozici",
   "Not_in_channel": "Není v kanálu",
-  "Not_RC_Server": "Toto není pracovní prostor Rocket.Chat.\n{{kontakt}}",
+  "Not_RC_Server": "Kontaktujte správce svého pracovního prostoru nebo vyhledejte ve své e-mailové schránce pozvánku do pracovního prostoru Rocket.Chat.",
   "Nothing": "Nic",
   "Nothing_to_save": "Není co zachraňovat!",
   "Notification_delay": "Zpoždění oznámení",
@@ -494,7 +498,6 @@
   "Omnichannel_queue": "Omnikanálová fronta",
   "On_hold_Livechats": "Omnikanálové chaty pozastaveny",
   "Onboarding_agree_terms": "Pokračováním souhlasíte s Rocket.Chat",
-  "Onboarding_join_open_description": "Připojte se k našemu otevřenému pracovnímu prostoru a chatujte s týmem a komunitou Rocket.Chat.",
   "Onboarding_less_options": "Méně možností",
   "Onboarding_more_options": "Více možností",
   "Onboarding_subtitle": "Mimo týmovou spolupráci",
@@ -807,7 +810,8 @@
   "Without_Servers": "Bez pracovních prostorů",
   "Workspace_consumption": "Spotřeba pracovního prostoru",
   "Workspace_consumption_description": "Je stanovený počet push notifikací za měsíc",
-  "Workspace_URL_Example": "Např. vaše-společnost.rocket.chat",
+  "Workspace_URL": "URL pracovního prostoru",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "Pracovní prostory",
   "Would_like_to_place_on_hold": "Chcete tento chat pozastavit?",
   "Would_you_like_to_return_the_inquiry": "Chcete vrátit dotaz?",
@@ -825,6 +829,7 @@
   "You_are_leaving_the_team": "Opouštíte tým '{{team}}''",
   "You_can_search_using_RegExp_eg": "Můžete použít RegExp. např. `/^text$/i`",
   "You_colon": "Vy: ",
+  "You_dont_have_account": "Nemáte účet?",
   "You_dont_have_permission_to_perform_this_action": "Nemáte oprávnění k provedení této akce. Informujte se u správce pracovního prostoru.",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Abyste mohli něco sdílet, musíte mít přístup alespoň k jednomu pracovnímu prostoru Rocket.Chat.",
   "You_need_to_verifiy_your_email_address_to_get_notications": "Abyste mohli dostávat oznámení, musíte ověřit svou e-mailovou adresu",
diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json
index dc565d4a07..e899495fe9 100644
--- a/app/i18n/locales/de.json
+++ b/app/i18n/locales/de.json
@@ -27,6 +27,9 @@
   "admin-video-conf-provider-not-configured-header": "Telefonkonferenz nicht aktiviert",
   "After_seconds_set_by_admin": "Nach {{seconds}} Sekunden (durch den Admin gesetzt)",
   "Agent": "Agent",
+  "AirGapped_workspace_read_only_description": "Administratoren können die volle Funktionalität wiederherstellen, indem sie es mit dem Internet verbinden oder auf einen Premium-Plan upgraden.",
+  "AirGapped_workspace_read_only_share_extension_title": "Das Teilen ist deaktiviert, da der Arbeitsbereich im Nur-Lesen-Modus ist.",
+  "AirGapped_workspace_read_only_title": "Arbeitsbereich im Nur-Lesen-Modus.",
   "Alert": "Benachrichtigung",
   "alert": "Benachrichtigung",
   "alerts": "Benachrichtigungen",
@@ -35,12 +38,13 @@
   "All_users_in_the_channel_can_write_new_messages": "Alle Benutzer im Channel können neue Nachrichten schreiben",
   "All_users_in_the_team_can_write_new_messages": "Alle Mitglieder eines Teams können neue Nachrichten schreiben",
   "Allow_Reactions": "Reaktionen zulassen",
+  "Already_have_an_account": "Haben Sie bereits ein Konto?",
   "Also_send_thread_message_to_channel_behavior": "Die Nachricht auch an den Kanal senden",
   "and": "und",
   "and_N_more": "und {{count}} weitere",
   "Announcement": "Ankündigung",
   "announcement": "Ankündigung",
-  "Apply_Your_Certificate": "Wenden Sie ihr Zertifikat an",
+  "Apply_Certificate": "Zertifikat anwenden",
   "ARCHIVE": "ARCHIV",
   "archive": "Archiv",
   "are_typing": "tippen",
@@ -187,7 +191,7 @@
   "Discussions": "Diskussionen",
   "Display": "Anzeige",
   "Displays_action_text": "Zeigt den Aktionstext",
-  "Do_you_have_a_certificate": "Haben Sie ein Zertifikat?",
+  "Do_you_have_a_certificate": "Haben Sie ein Zertifikat für diesen Arbeitsbereich?",
   "Do_you_have_an_account": "Sie haben schon ein Konto?",
   "Do_you_really_want_to_key_this_room_question_mark": "Möchten Sie diesen Raum wirklich {{key}}?",
   "Dont_activate": "Jetzt nicht aktivieren",
@@ -229,7 +233,6 @@
   "End_to_end_encrypted_room": "Ende-zu-Ende-verschlüsselter Raum",
   "Enter_E2EE_Password": "E2EE-Passwort eingeben",
   "Enter_E2EE_Password_description": "Um auf Ihre verschlüsselten Kanäle und Direktnachrichten zuzugreifen, geben Sie Ihr Verschlüsselungspasswort ein. Dies wird nicht auf dem Server gespeichert, daher müssen Sie es auf jedem Gerät verwenden.",
-  "Enter_workspace_URL": "Arbeitsbereich-URL",
   "Error_Download_file": "Fehler beim Herunterladen der Datei",
   "Error_uploading": "Fehler beim Hochladen",
   "error-action-not-allowed": "{{action}} ist nicht erlaubt",
@@ -267,6 +270,7 @@
   "Forward_Chat": "Chat weiterleiten",
   "Forward_to_department": "Weiterleiten an Abteilung",
   "Forward_to_user": "Weiterleiten an Benutzer",
+  "Full_name": "Vollständiger Name",
   "Full_table": "Klicken, um die ganze Tabelle anzuzeigen",
   "Generate_New_Link": "Neuen Link erstellen",
   "Get_help": "Hilfe holen",
@@ -290,6 +294,7 @@
   "Insert_Join_Code": "Beitrittscode eingeben",
   "Invalid_or_expired_invite_token": "Ungültiger oder abgelaufener Einladungscode",
   "Invalid_server_version": "Der Server, mit dem Sie sich verbinden möchten, verwendet eine Version, die von der App nicht mehr unterstützt wird: {{currentVersion}}.\n\nWir benötigen Version {{minVersion}}.",
+  "Invalid_workspace_URL": "Ungültige Arbeitsbereichs-URL",
   "Invisible": "Unsichtbar",
   "Invite_Link": "Einladungs-Link",
   "Invite_user_to_join_channel": "Benutzer in diesen Channel einladen",
@@ -300,7 +305,6 @@
   "is_typing": "schreibt",
   "Join": "Beitreten",
   "Join_Code": "Beitrittscode",
-  "Join_our_open_workspace": "Treten Sie unserem offenen Arbeitsbereich bei",
   "Join_the_given_channel": "Diesem Channel beitreten",
   "Joined": "Beigetreten",
   "Just_invited_people_can_access_this_channel": "Nur eingeladene Personen können auf diesen Kanal zugreifen",
@@ -431,7 +435,7 @@
   "no-active-video-conf-provider-header": "Telefonkonferenz nicht aktiviert",
   "no-videoconf-provider-app-body": "Telefonkonferenz-Apps können auf dem Rocket.Chat-Marktplatz von einem Arbeitsbereich-Administrator installiert werden.",
   "no-videoconf-provider-app-header": "Telefonkonferenz nicht verfügbar",
-  "Not_RC_Server": "Dies ist kein Rocket.Chat-Server.\n{{contact}}",
+  "Not_RC_Server": "Kontaktieren Sie Ihren Workspace-Administrator oder durchsuchen Sie Ihren E-Mail-Posteingang nach einer Rocket.Chat-Workspace-Einladung.",
   "Nothing": "Nichts",
   "Nothing_to_save": "Nichts zu speichern!",
   "Notification_Preferences": "Benachrichtigungseinstellungen",
@@ -445,7 +449,6 @@
   "Omnichannel_queue": "Omnichannel-Warteschleife",
   "On_hold_Livechats": "Livechats in der Warteschleife",
   "Onboarding_agree_terms": "Durch fortfahren stimmen Sie Rocket.Chats Bedingungen zu",
-  "Onboarding_join_open_description": "Treten Sie unserem Arbeitsbereich bei, um mit dem Rocket.Chat-Team oder der Community zu chatten.",
   "Onboarding_less_options": "Weniger Optionen",
   "Onboarding_more_options": "Mehr Optionen",
   "Onboarding_subtitle": "Mehr als Team-Zusammenarbeit",
@@ -722,7 +725,8 @@
   "What_are_you_doing_right_now": "Was machen Sie gerade?",
   "Whats_the_password_for_your_certificate": "Wie lautet das Passwort für Ihr Zertifikat?",
   "Without_Servers": "Ohne Server",
-  "Workspace_URL_Example": "z.B. https://rocketchat.deine-firma.de",
+  "Workspace_URL": "Arbeitsbereichs-URL",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "Arbeitsbereiche",
   "Would_like_to_place_on_hold": "Möchten Sie diesen Chat in die Warteschleife legen?",
   "Would_you_like_to_return_the_inquiry": "Wollen Sie zur Anfrage zurück?",
@@ -740,6 +744,7 @@
   "You_are_leaving_the_team": "Sie verlassen das Team '{{team}}'",
   "You_can_search_using_RegExp_eg": "Sie können mit RegExp suchen. z.B. `/ ^ text $ / i`",
   "You_colon": "Sie: ",
+  "You_dont_have_account": "Haben Sie kein Konto?",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Sie benötigen Zugang zu mindestens einem Rocket.Chat-Server, um etwas zu teilen.",
   "You_need_to_verifiy_your_email_address_to_get_notications": "Sie müssen deine Email-Adresse bestätigen um Benachrichtigungen zu erhalten.",
   "you_were_mentioned": "Sie wurden erwähnt",
diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json
index 95a36428d9..8d3fb574cc 100644
--- a/app/i18n/locales/en.json
+++ b/app/i18n/locales/en.json
@@ -28,6 +28,9 @@
   "admin-video-conf-provider-not-configured-header": "Conference call not enabled",
   "After_seconds_set_by_admin": "After {{seconds}} seconds (set by admin)",
   "Agent": "Agent",
+  "AirGapped_workspace_read_only_description": "Admins can restore full functionality by connecting it to internet or upgrading to a premium plan.",
+  "AirGapped_workspace_read_only_share_extension_title": "Sharing is disabled because workspace is in read-only mode.",
+  "AirGapped_workspace_read_only_title": "Workspace in read-only mode.",
   "Alert": "Alert",
   "alert": "alert",
   "alerts": "alerts",
@@ -37,13 +40,14 @@
   "All_users_in_the_team_can_write_new_messages": "All users in the team can write new messages",
   "Allow_push_notifications_for_rocket_chat": "Allow push notifications for Rocket.Chat",
   "Allow_Reactions": "Allow reactions",
+  "Already_have_an_account": "Already have an account?",
   "Also_send_thread_message_to_channel_behavior": "Also send thread message to channel",
   "and": "and",
   "and_N_more": "and {{count}} more",
   "Announcement": "Announcement",
   "announcement": "announcement",
   "App_users_are_not_allowed_to_log_in_directly": "App users are not allowed to log in directly.",
-  "Apply_Your_Certificate": "Apply your certificate",
+  "Apply_Certificate": "Apply certificate",
   "ARCHIVE": "ARCHIVE",
   "archive": "archive",
   "are_typing": "are typing",
@@ -216,7 +220,7 @@
   "Discussions": "Discussions",
   "Display": "Display",
   "Displays_action_text": "Displays action text",
-  "Do_you_have_a_certificate": "Do you have a certificate?",
+  "Do_you_have_a_certificate": "Do you have a certificate for this workspace?",
   "Do_you_have_an_account": "Do you have an account?",
   "Do_you_really_want_to_key_this_room_question_mark": "Do you really want to {{key}} this room?",
   "Documentation": "Documentation",
@@ -246,6 +250,7 @@
   "Edit_Invite": "Edit invite",
   "Edit_Status": "Edit status",
   "Email": "E-mail",
+  "email": "Email",
   "Email_Notification_Mode_All": "Every mention/DM",
   "Email_Notification_Mode_Disabled": "Disabled",
   "Empty": "Empty",
@@ -268,7 +273,6 @@
   "Enter_E2EE_Password": "Enter E2EE password",
   "Enter_E2EE_Password_description": "To access your encrypted channels and direct messages, enter your encryption password. This is not stored on the server, so you’ll need to use it on every device.",
   "Enter_the_code": "Enter the code we just emailed you.",
-  "Enter_workspace_URL": "Enter workspace URL",
   "Error_Download_file": "Error while downloading file",
   "Error_play_video": "There was an error while playing this video",
   "Error_uploading": "Error uploading",
@@ -309,6 +313,7 @@
   "Forward_message": "Forward message",
   "Forward_to_department": "Forward to department",
   "Forward_to_user": "Forward to user",
+  "Full_name": "Full name",
   "Full_table": "Click to see full table",
   "Generate_New_Link": "Generate new link",
   "Get_help": "Get help",
@@ -337,6 +342,7 @@
   "Invalid_Email": "Invalid email",
   "Invalid_or_expired_invite_token": "Invalid or expired invite token",
   "Invalid_server_version": "The workspace you're trying to connect is using a version that's not supported by the app anymore: {{currentVersion}}.\n\nWe require version {{minVersion}}",
+  "Invalid_workspace_URL": "Invalid workspace URL",
   "Invisible": "Invisible",
   "Invite_Link": "Invite link",
   "Invite_user_to_join_channel": "Invite one user to join this channel",
@@ -352,7 +358,6 @@
   "Jitsi_may_require_authentication": "Jitsi may require authentication",
   "Join": "Join",
   "Join_Code": "Join code",
-  "Join_our_open_workspace": "Join our open workspace",
   "Join_the_given_channel": "Join the given channel",
   "Joined": "Joined",
   "Jump_to_message": "Jump to message",
@@ -495,7 +500,7 @@
   "no-videoconf-provider-app-body": "Conference call apps can be installed in the Rocket.Chat Marketplace by a workspace admin.",
   "no-videoconf-provider-app-header": "Conference call not available",
   "Not_in_channel": "Not in channel",
-  "Not_RC_Server": "This is not a Rocket.Chat workspace.\n{{contact}}",
+  "Not_RC_Server": "Contact your workspace admin or search your email inbox for a Rocket.Chat workspace invite.",
   "Nothing": "Nothing",
   "Nothing_to_save": "Nothing to save!",
   "Notification_delay": "Notification delay",
@@ -512,7 +517,6 @@
   "Omnichannel_queue": "Omnichannel queue",
   "On_hold_Livechats": "Omnichannel chats on hold",
   "Onboarding_agree_terms": "By continuing, you agree to Rocket.Chat",
-  "Onboarding_join_open_description": "Join our open workspace to chat with the Rocket.Chat team and community.",
   "Onboarding_less_options": "Less options",
   "Onboarding_more_options": "More options",
   "Onboarding_subtitle": "Beyond team collaboration",
@@ -827,8 +831,8 @@
   "Without_Servers": "Without workspaces",
   "Workspace_consumption": "Workspace consumption",
   "Workspace_consumption_description": "There’s a set amount of push notifications per month",
-  "Workspace_URL_Example": "Ex. your-company.rocket.chat",
-  "Workspaces": "Workspaces",
+  "Workspace_URL": "Workspace URL",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Would_like_to_place_on_hold": "Would you like to place this chat on hold?",
   "Would_you_like_to_return_the_inquiry": "Would you like to return the inquiry?",
   "Write_External_Permission": "Gallery permission",
@@ -845,6 +849,7 @@
   "You_are_leaving_the_team": "You are leaving the team '{{team}}'",
   "You_can_search_using_RegExp_eg": "You can use RegExp. e.g. `/^text$/i`",
   "You_colon": "You: ",
+  "You_dont_have_account": "Don’t have an account?",
   "You_dont_have_permission_to_perform_this_action": "You don’t have permission to perform this action. Check with a workspace administrator.",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "You need to access at least one Rocket.Chat workspace to share something.",
   "You_need_to_change_your_password": "You need to change your password",
@@ -861,6 +866,5 @@
   "Your_invite_link_will_expire_on__date__or_after__usesLeft__uses": "Your invite link will expire on {{date}} or after {{usesLeft}} uses.",
   "Your_invite_link_will_never_expire": "Your invite link will never expire.",
   "Your_password_is": "Your password is",
-  "Your_push_was_sent_to_s_devices": "Your push was sent to {{s}} devices",
-  "Your_workspace": "Your workspace"
+  "Your_push_was_sent_to_s_devices": "Your push was sent to {{s}} devices"
 }
\ No newline at end of file
diff --git a/app/i18n/locales/es.json b/app/i18n/locales/es.json
index e8f766c798..a79d291c95 100644
--- a/app/i18n/locales/es.json
+++ b/app/i18n/locales/es.json
@@ -6,6 +6,9 @@
   "Add_Server": "Añadir servidor",
   "Add_server": "Añadir servidor",
   "Admin_Panel": "Panel de Control",
+  "AirGapped_workspace_read_only_description": "Los administradores pueden restaurar la funcionalidad completa conectándolo a Internet o actualizando a un plan premium.",
+  "AirGapped_workspace_read_only_share_extension_title": "La compartición está deshabilitada porque el espacio de trabajo está en modo de solo lectura.",
+  "AirGapped_workspace_read_only_title": "Espacio de trabajo en modo de solo lectura.",
   "Alert": "Alerta",
   "alert": "alerta",
   "alerts": "alertas",
@@ -13,11 +16,12 @@
   "All_Messages": "Todos los mensajes",
   "All_users_in_the_channel_can_write_new_messages": "Todos los usuarios en el canal pueden escribir mensajes",
   "Allow_Reactions": "Permitir reacciones",
+  "Already_have_an_account": "¿Ya tienes una cuenta?",
   "and": "y",
   "and_N_more": "y {{count}} más",
   "Announcement": "Anuncio",
   "announcement": "anuncio",
-  "Apply_Your_Certificate": "Aplica tu certificado",
+  "Apply_Certificate": "Aplicar certificado",
   "ARCHIVE": "FICHERO",
   "archive": "fichero",
   "are_typing": "están escribiendo",
@@ -80,7 +84,7 @@
   "Directory": "Directorio",
   "Discussions": "Conversaciones",
   "Displays_action_text": "Mostrar texto de acción",
-  "Do_you_have_a_certificate": "¿Tienes un certificado?",
+  "Do_you_have_a_certificate": "¿Tienes un certificado para este espacio de trabajo?",
   "Do_you_really_want_to_key_this_room_question_mark": "¿Deseas {{key}} de esta sala?",
   "Dont_Have_An_Account": "¿Todavía no tienes una cuenta?",
   "Edit": "Editar",
@@ -108,6 +112,7 @@
   "For_your_security_you_must_enter_your_current_password_to_continue": "Por seguridad, debes introducir tu contraseña para continuar",
   "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_name": "Nombre completo",
   "Full_table": "Click para ver la tabla completa",
   "Get_help": "Obtener ayuda",
   "Get_link": "Obtener enlace",
@@ -117,6 +122,7 @@
   "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",
   "Invalid_server_version": "El servidor que intentas conectar está usando una versión que ya no está soportada por la aplicación : {{currentVersion}}. Se requiere una versión {{minVersion}}.",
+  "Invalid_workspace_URL": "URL del espacio de trabajo no válida",
   "Invisible": "Invisible",
   "Invite_user_to_join_channel": "Invitar a un usuario a unirse a este canal",
   "Invite_user_to_join_channel_all_from": "Invitar a todos los usuarios de [#channell] a que se unan a este canal",
@@ -163,7 +169,7 @@
   "No_Read_Receipts": "No hay confirmaciones de lectura",
   "No_results_found": "No hay resultados",
   "No_starred_messages": "No hay mensajes destacados",
-  "Not_RC_Server": "Esto no es un servidor de Rocket.Chat.\n{{contact}}",
+  "Not_RC_Server": "Contacta con el administrador de tu espacio de trabajo o busca en tu bandeja de entrada de correo una invitación a un espacio de trabajo de Rocket.Chat.",
   "Nothing": "Nada",
   "Nothing_to_save": "¡No hay nada por guardar!",
   "Notification_Preferences": "Configuración de notificaciones",
@@ -293,6 +299,8 @@
   "Websocket_disabled": "Websocket está deshabilitado para este servidor.\n{{contact}}",
   "Whats_the_password_for_your_certificate": "¿Cuál es la contraseña de tu certificado?",
   "Without_Servers": "Sin servidores",
+  "Workspace_URL": "URL del espacio de trabajo",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Yes_action_it": "Sí, ¡{{action}}!",
   "Yesterday": "Ayer",
   "You": "Tú",
@@ -300,6 +308,7 @@
   "You_are_in_preview_mode": "Estás en modo vista previa",
   "You_can_search_using_RegExp_eg": "Puedes usar expresiones regulares. Por ejemplo, `/^text$/i`",
   "You_colon": "Tú: ",
+  "You_dont_have_account": "¿No tienes una cuenta?",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Necesita acceder al menos a un servidor Rocket.Chat para compartir algo.",
   "you_were_mentioned": "has sido mencionado",
   "You_will_not_be_able_to_recover_this_message": "¡No podrás recuperar este mensaje!",
diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json
index 04210d90cf..00b9072435 100644
--- a/app/i18n/locales/fi.json
+++ b/app/i18n/locales/fi.json
@@ -20,6 +20,9 @@
   "Admin_Panel": "Hallintapaneeli",
   "After_seconds_set_by_admin": "{{seconds}} sekunnin kuluttua (järjestelmänvalvojan asettama)",
   "Agent": "Agentti",
+  "AirGapped_workspace_read_only_description": "Järjestelmänvalvojat voivat palauttaa täyden toiminnallisuuden liittämällä sen internetiin tai päivittämällä premium-suunnitelmaan.",
+  "AirGapped_workspace_read_only_share_extension_title": "Jakaminen on poistettu käytöstä, koska työtila on vain luku -tilassa.",
+  "AirGapped_workspace_read_only_title": "Työtila vain luku -tilassa.",
   "Alert": "Hälytys",
   "alert": "hälytys",
   "alerts": "hälytystä",
@@ -28,12 +31,13 @@
   "All_users_in_the_channel_can_write_new_messages": "Kaikki kanavan käyttäjät voivat kirjoittaa uusia viestejä",
   "All_users_in_the_team_can_write_new_messages": "Kaikki tiimin käyttäjät voivat kirjoittaa uusia viestejä",
   "Allow_Reactions": "Salli reaktiot",
+  "Already_have_an_account": "Onko sinulla jo tili?",
   "Also_send_thread_message_to_channel_behavior": "Lähetä ketjun viesti myös kanavalle",
   "and": "ja",
   "and_N_more": "ja {{count}} lisää",
   "Announcement": "Ilmoitus",
   "announcement": "ilmoitus",
-  "Apply_Your_Certificate": "Käytä varmennetta",
+  "Apply_Certificate": "Käytä sertifikaattia",
   "ARCHIVE": "ARKISTO",
   "archive": "arkisto",
   "are_typing": "kirjoittavat",
@@ -172,7 +176,7 @@
   "Discussions": "Keskustelut",
   "Display": "Näytä",
   "Displays_action_text": "Näyttää toimintotekstin",
-  "Do_you_have_a_certificate": "Onko sinulla varmenne?",
+  "Do_you_have_a_certificate": "Onko sinulla varmenne tälle työtilalle?",
   "Do_you_have_an_account": "Onko sinulla tili?",
   "Do_you_really_want_to_key_this_room_question_mark": "Haluatko varmasti {{key}} tämän huoneen?",
   "Dont_activate": "Älä aktivoi nyt",
@@ -214,7 +218,6 @@
   "End_to_end_encrypted_room": "Täysin salattu huone",
   "Enter_E2EE_Password": "Anna E2EE-salasana",
   "Enter_E2EE_Password_description": "Päästäksesi käsiksi salattuihin kanaviisi ja suoriin viesteihisi, syötä salaus salasanasi. Tätä ei tallenneta palvelimelle, joten sinun on käytettävä sitä jokaisella laitteella.",
-  "Enter_workspace_URL": "Anna työtilan URL-osoite",
   "Error_Download_file": "Virhe ladattaessa tiedostoa",
   "Error_uploading": "Virhe ladattaessa",
   "error-action-not-allowed": "{{action}} ei ole sallittu",
@@ -252,6 +255,7 @@
   "Forward_Chat": "Välitä keskustelu",
   "Forward_to_department": "Välitä osastolle",
   "Forward_to_user": "Välitä käyttäjälle",
+  "Full_name": "Koko nimi",
   "Full_table": "Näytä koko taulukko napsauttamalla",
   "Generate_New_Link": "Luo uusi linkki",
   "Get_help": "Hae apua",
@@ -272,6 +276,7 @@
   "Insert_Join_Code": "Lisää liittymiskoodi",
   "Invalid_or_expired_invite_token": "Virheellinen tai vanhentunut kutsutunnus",
   "Invalid_server_version": "Palvelin, johon yrität muodostaa yhteyttä, käyttää versiota, jota sovellus ei enää tue: {{currentVersion}}.\n\nEdellytämme versiota {{minVersion}}",
+  "Invalid_workspace_URL": "Virheellinen työtilan URL-osoite",
   "Invisible": "Näkymätön",
   "Invite_Link": "Kutsulinkki",
   "Invite_user_to_join_channel": "Kutsu käyttäjä liittymään tälle kanavalle",
@@ -282,7 +287,6 @@
   "is_typing": "kirjoittaa",
   "Join": "Liity",
   "Join_Code": "Liittymiskoodi",
-  "Join_our_open_workspace": "Liity avoimeen työtilaamme",
   "Join_the_given_channel": "Liity annetulle kanavalle",
   "Joined": "Liitytty",
   "Just_invited_people_can_access_this_channel": "Vain kutsutut ihmiset voivat käyttää tätä kanavaa",
@@ -408,7 +412,7 @@
   "No_threads": "Ei ketjuja",
   "No_threads_following": "Et seuraa ketjuja",
   "No_threads_unread": "Ei lukemattomia ketjuja",
-  "Not_RC_Server": "Tämä ei ole Rocket.Chat-palvelin.\n{{contact}}",
+  "Not_RC_Server": "Ota yhteyttä työtilasi järjestelmänvalvojaan tai etsi sähköpostistasi Rocket.Chat-työtilakutsua.",
   "Nothing": "Ei mitään",
   "Nothing_to_save": "Ei tallennettavaa!",
   "Notification_Preferences": "Ilmoitusasetukset",
@@ -422,7 +426,6 @@
   "Omnichannel_queue": "Omnichannel-jono",
   "On_hold_Livechats": "Pidossa olevat Omnichannel-keskustelut",
   "Onboarding_agree_terms": "Jatkamalla hyväksyt Rocket.Chatin",
-  "Onboarding_join_open_description": "Liity avoimeen työtilaamme keskustelemaan Rocket.Chat-tiimin ja -yhteisön kanssa.",
   "Onboarding_less_options": "Vähemmän vaihtoehtoja",
   "Onboarding_more_options": "Enemmän vaihtoehtoja",
   "Onboarding_subtitle": "Enemmän kuin ryhmäyhteistyötä",
@@ -694,7 +697,8 @@
   "What_are_you_doing_right_now": "Mitä teet juuri nyt?",
   "Whats_the_password_for_your_certificate": "Mikä on varmenteesi salasana?",
   "Without_Servers": "Ilman palvelimia",
-  "Workspace_URL_Example": "Esim. yrityksesi.rocket.chat",
+  "Workspace_URL": "Työtilan URL",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "Työtilat",
   "Would_like_to_place_on_hold": "Haluatko asettaa tämän keskustelun pitoon?",
   "Would_you_like_to_return_the_inquiry": "Haluatko palauttaa kyselyn?",
@@ -712,6 +716,7 @@
   "You_are_leaving_the_team": "Poistut tiimistä {{team}}",
   "You_can_search_using_RegExp_eg": "Voit käyttää säännöllisiä lausekkeita, esim. `/^teksti$/i`",
   "You_colon": "Sinä:",
+  "You_dont_have_account": "Ei ole tiliä?",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Tarvitset pääsyn vähintään Rocket.Chat-palvelimeen jakamista varten.",
   "You_need_to_verifiy_your_email_address_to_get_notications": "Vahvista sähköpostiosoitteesi, jotta saat ilmoituksia",
   "you_were_mentioned": "sinut mainittiin",
diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json
index 69c14e3545..81e9c9982e 100644
--- a/app/i18n/locales/fr.json
+++ b/app/i18n/locales/fr.json
@@ -13,6 +13,9 @@
   "Admin_Panel": "Panneau d'administration",
   "After_seconds_set_by_admin": "Après {{seconds}} secondes (défini par l'administrateur)",
   "Agent": "Agent",
+  "AirGapped_workspace_read_only_description": "Les administrateurs peuvent restaurer la fonctionnalité complète en le connectant à Internet ou en passant à un plan premium.",
+  "AirGapped_workspace_read_only_share_extension_title": "Le partage est désactivé car l'espace de travail est en mode lecture seule.",
+  "AirGapped_workspace_read_only_title": "Espace de travail en mode lecture seule.",
   "Alert": "Alerte",
   "alert": "alerte",
   "alerts": "alertes",
@@ -21,11 +24,12 @@
   "All_users_in_the_channel_can_write_new_messages": "Tous les utilisateurs du canal peuvent écrire de nouveaux messages",
   "All_users_in_the_team_can_write_new_messages": "Tous les utilisateurs de l'équipe peuvent écrire de nouveaux messages",
   "Allow_Reactions": "Autoriser les réactions",
+  "Already_have_an_account": "Vous avez déjà un compte ?",
   "and": "et",
   "and_N_more": "et {{count}} de plus",
   "Announcement": "Annonce",
   "announcement": "annonce",
-  "Apply_Your_Certificate": "Appliquer votre certificat",
+  "Apply_Certificate": "Appliquer le certificat",
   "ARCHIVE": "ARCHIVER",
   "archive": "archiver",
   "are_typing": "sont en train d'écrire",
@@ -139,7 +143,7 @@
   "Discussions": "Discussions",
   "Display": "Affichage",
   "Displays_action_text": "Affiche le texte d'action",
-  "Do_you_have_a_certificate": "Avez-vous un certificat ?",
+  "Do_you_have_a_certificate": "Avez-vous un certificat pour cet espace de travail ?",
   "Do_you_have_an_account": "Avez-vous un compte ?",
   "Do_you_really_want_to_key_this_room_question_mark": "Voulez-vous vraiment {{key}} ce salon ?",
   "Dont_activate": "Ne pas activer maintenant",
@@ -180,7 +184,6 @@
   "End_to_end_encrypted_room": "Salon crypté de bout en bout",
   "Enter_E2EE_Password": "Entrez le mot de passe E2EE",
   "Enter_E2EE_Password_description": "Pour accéder à vos canaux cryptés et à vos messages directs, entrez votre mot de passe de cryptage. Celui-ci n'est pas stocké sur le serveur, vous devrez donc l'utiliser sur chaque appareil.",
-  "Enter_workspace_URL": "Entrez l'URL de l'espace de travail",
   "Error_Download_file": "Erreur lors du téléchargement du fichier",
   "Error_uploading": "Erreur lors de l'envoi",
   "error-action-not-allowed": "{{action}} n'est pas autorisé",
@@ -216,6 +219,7 @@
   "Forward_Chat": "Transmettre la conversation",
   "Forward_to_department": "Transmettre au département",
   "Forward_to_user": "Transmettre à l'utilisateur",
+  "Full_name": "Nom complet",
   "Full_table": "Cliquez pour voir le tableau complet",
   "Generate_New_Link": "Générer un nouveau lien",
   "Get_help": "Obtenez de l'aide",
@@ -236,6 +240,7 @@
   "Insert_Join_Code": "Insérer le code d'adhésion",
   "Invalid_or_expired_invite_token": "Jeton d'invitation non valide ou expiré",
   "Invalid_server_version": "Le serveur auquel vous essayez de vous connecter utilise une version qui n'est plus prise en charge par l'application : {{currentVersion}}.\n\nNous exigeons la version {{minVersion}}",
+  "Invalid_workspace_URL": "URL d’espace de travail invalide",
   "Invisible": "Invisible",
   "Invite_Link": "Lien d'invitation",
   "Invite_user_to_join_channel": "Inviter un utilisateur à rejoindre le canal",
@@ -246,7 +251,6 @@
   "is_typing": "est en train d'écrire",
   "Join": "Rejoindre",
   "Join_Code": "Code d'adhésion",
-  "Join_our_open_workspace": "Rejoignez notre espace de travail ouvert",
   "Join_the_given_channel": "Rejoindre le canal indiqué",
   "Just_invited_people_can_access_this_channel": "Seuls les personnes invitées peuvent accéder à ce canal",
   "Just_invited_people_can_access_this_team": "Seules les personnes invitées peuvent accéder à cette équipe",
@@ -367,7 +371,7 @@
   "No_threads": "Il n'y a pas de fils",
   "No_threads_following": "Vous ne suivez aucun fil de discussion",
   "No_threads_unread": "Il n'y a pas de fils non lus",
-  "Not_RC_Server": "Ce n'est pas un serveur Rocket.Chat.\n{{contact}}",
+  "Not_RC_Server": "Contactez l'administrateur de votre espace de travail ou recherchez dans votre boîte de réception une invitation à un espace de travail Rocket.Chat.",
   "Nothing": "Rien",
   "Nothing_to_save": "Rien à enregistrer !",
   "Notification_Preferences": "Préférences de notification",
@@ -381,7 +385,6 @@
   "Omnichannel_queue": "File d'attente omnicanale",
   "On_hold_Livechats": "Chats omnicanaux en attente",
   "Onboarding_agree_terms": "En continuant, vous acceptez Rocket.Chat",
-  "Onboarding_join_open_description": "Rejoignez notre espace de travail ouvert pour discuter avec l'équipe et la communauté Rocket.Chat.",
   "Onboarding_less_options": "Moins d'options",
   "Onboarding_more_options": "Plus d'options",
   "Onboarding_subtitle": "Au-delà de la collaboration d'équipe",
@@ -613,7 +616,8 @@
   "What_are_you_doing_right_now": "Que fais-tu en ce moment ?",
   "Whats_the_password_for_your_certificate": "Quel est le mot de passe de votre certificat ?",
   "Without_Servers": "Sans serveurs",
-  "Workspace_URL_Example": "Ex. votre-société.rocket.chat",
+  "Workspace_URL": "URL de l'espace de travail",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "Espaces de travail",
   "Would_like_to_place_on_hold": "Souhaitez-vous mettre ce chat en attente ?",
   "Would_you_like_to_return_the_inquiry": "Souhaitez-vous retourner la demande ?",
@@ -631,6 +635,7 @@
   "You_are_leaving_the_team": "Vous quittez l'équipe '{{team}}'",
   "You_can_search_using_RegExp_eg": "Vous pouvez utiliser RegExp., par exemple `/^texte$/i`",
   "You_colon": "Vous: ",
+  "You_dont_have_account": "Vous n'avez pas de compte ?",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Vous devez accéder à au moins un serveur Rocket.Chat pour partager quelque chose.",
   "You_need_to_verifiy_your_email_address_to_get_notications": "Vous devez vérifier votre adresse e-mail pour recevoir des notifications",
   "you_were_mentioned": "vous avez été mentionné",
diff --git a/app/i18n/locales/hi-IN.json b/app/i18n/locales/hi-IN.json
index 99ecdb2469..2cb539c28d 100644
--- a/app/i18n/locales/hi-IN.json
+++ b/app/i18n/locales/hi-IN.json
@@ -27,6 +27,9 @@
   "admin-video-conf-provider-not-configured-header": "कॉन्फ़्रेंस कॉल सक्षम नहीं है",
   "After_seconds_set_by_admin": "{{seconds}} सेकंड्स के बाद (व्यवस्थापक द्वारा सेट किया गया है)",
   "Agent": "एजेंट",
+  "AirGapped_workspace_read_only_description": "व्यवस्थापकों के पास इसे इंटरनेट से कनेक्ट करके या प्रीमियम योजना में अपग्रेड करके पूर्ण कार्यक्षमता को पुनर्स्थापित करने का विकल्प है।",
+  "AirGapped_workspace_read_only_share_extension_title": "कार्यस्थान केवल-पढ़ने के मोड में होने के कारण साझा करना अक्षम है।",
+  "AirGapped_workspace_read_only_title": "कार्यस्थान केवल-पढ़ने के मोड में है।",
   "Alert": "चेतावनी",
   "alert": "चेतावनी",
   "alerts": "चेतावनियाँ",
@@ -35,12 +38,13 @@
   "All_users_in_the_channel_can_write_new_messages": "चैनल में सभी उपयोगकर्ता नए संदेश लिख सकते हैं",
   "All_users_in_the_team_can_write_new_messages": "टीम में सभी उपयोगकर्ता नए संदेश लिख सकते हैं",
   "Allow_Reactions": "प्रतिक्रियाओं की अनुमति दें",
+  "Already_have_an_account": "क्या आपके पास पहले से एक खाता है?",
   "Also_send_thread_message_to_channel_behavior": "थ्रेड संदेश को चैनल में भी भेजें",
   "and": "और",
   "and_N_more": "और {{count}} और",
   "Announcement": "घोषणा",
   "announcement": "घोषणा",
-  "Apply_Your_Certificate": "अपना प्रमाणपत्र लागू करें",
+  "Apply_Certificate": "प्रमाणपत्र लागू करें",
   "ARCHIVE": "संग्रह",
   "archive": "संग्रह",
   "are_typing": "टाइप कर रहे हैं",
@@ -192,7 +196,7 @@
   "Discussion_name": "चर्चा का नाम",
   "Discussions": "चर्चाएँ",
   "Display": "प्रदर्शन",
-  "Do_you_have_a_certificate": "क्या आपके पास प्रमाणपत्र है?",
+  "Do_you_have_a_certificate": "क्या आपके पास इस कार्यक्षेत्र के लिए प्रमाणपत्र है?",
   "Do_you_have_an_account": "क्या आपके पास एक खाता है?",
   "Do_you_really_want_to_key_this_room_question_mark": "क्या आप वाकई इस कमरे को {{key}} करना चाहते हैं?",
   "Dont_activate": "अब सक्रिय न करें",
@@ -235,7 +239,6 @@
   "End_to_end_encrypted_room": "इंड-टू-इंड एन्क्रिप्टेड कमरा",
   "Enter_E2EE_Password": "E2EE पासवर्ड डालें",
   "Enter_E2EE_Password_description": "अपने एन्क्रिप्टेड चैनल्स और डायरेक्ट मैसेजेस तक पहुँचने के लिए, अपना एन्क्रिप्शन पासवर्ड दर्ज करें। यह सर्वर पर संग्रहीत नहीं होता है, इसलिए आपको इसे हर डिवाइस पर उपयोग करना होगा।",
-  "Enter_workspace_URL": "कार्यस्थान URL दर्ज करें",
   "Error_Download_file": "फ़ाइल डाउनलोड करते समय त्रुटि",
   "Error_uploading": "अपलोड करने में त्रुटि",
   "error-action-not-allowed": "{{action}} की अनुमति नहीं है",
@@ -274,6 +277,7 @@
   "Forward_message": "संदेश आगे भेजें",
   "Forward_to_department": "विभाग को आगे बढ़ाएं",
   "Forward_to_user": "उपयोगकर्ता को आगे बढ़ाएं",
+  "Full_name": "पूरा नाम",
   "Full_table": "पूर्ण तालिका देखने के लिए क्लिक करें",
   "Generate_New_Link": "नई लिंक बनाएं",
   "Get_help": "सहायता प्राप्त करें",
@@ -297,6 +301,7 @@
   "Insert_Join_Code": "सामिल होने का कोड डालें",
   "Invalid_or_expired_invite_token": "अमान्य या समाप्त होने वाला निमंत्रण टोकन",
   "Invalid_server_version": "यह कार्यस्थान जिससे आप कनेक्ट करने का प्रयास कर रहे हैं, वह ऐप द्वारा अब समर्थित नहीं है: {{currentVersion}}।\n\nहमें {{minVersion}} संस्करण की आवश्यकता है",
+  "Invalid_workspace_URL": "अमान्य कार्यक्षेत्र URL",
   "Invisible": "अदृश्य",
   "Invite_Link": "निमंत्रण लिंक",
   "Invite_users": "उपयोगकर्ताओं को निमंत्रित करें",
@@ -308,7 +313,6 @@
   "Jitsi_may_require_authentication": "जिट्सी को पहले से पहले प्रमाणीकरण की आवश्यकता हो सकती है",
   "Join": "सामिल हों",
   "Join_Code": "सामिल होने का कोड",
-  "Join_our_open_workspace": "हमारे खुले कार्यस्थान में सामिल हों",
   "Joined": "शामिल हो गए",
   "Just_invited_people_can_access_this_channel": "केवल निमंत्रित लोग इस चैनल तक पहुंच सकते हैं",
   "Just_invited_people_can_access_this_team": "केवल निमंत्रित लोग इस टीम तक पहुंच सकते हैं",
@@ -441,7 +445,7 @@
   "no-active-video-conf-provider-header": "कॉन्फ़्रेंस कॉल सक्षम नहीं है",
   "no-videoconf-provider-app-body": "कॉन्फ़्रेंस कॉल एप्लिकेशन्स को कार्यक्षेत्र प्रबंधक द्वारा रॉकेट.चैट मार्केटप्लेस में स्थापित किया जा सकता है।",
   "no-videoconf-provider-app-header": "कॉन्फ़्रेंस कॉल उपलब्ध नहीं है",
-  "Not_RC_Server": "यह रॉकेट.चैट कार्यस्थान नहीं है।\n{{संपर्क}}",
+  "Not_RC_Server": "अपने कार्यक्षेत्र प्रशासक से संपर्क करें या अपने ईमेल इनबॉक्स में Rocket.Chat कार्यक्षेत्र आमंत्रण खोजें।",
   "Nothing": "कुछ नहीं",
   "Nothing_to_save": "कुछ भी सहेजने के लिए नहीं है!",
   "Notification_Preferences": "सूचना प्राथमिकताएँ",
@@ -456,7 +460,6 @@
   "Omnichannel_queue": "ओमनीचैनल कतार",
   "On_hold_Livechats": "होल्ड पर ओमनीचैनल चैट",
   "Onboarding_agree_terms": "जारी रखने पर, आप रॉकेट.चैट के साथ सहमत हैं",
-  "Onboarding_join_open_description": "हमारे खुले कार्यस्थान में जाकर रॉकेट.चैट टीम और समुदाय के साथ चैट करें।",
   "Onboarding_less_options": "कम विकल्प",
   "Onboarding_more_options": "अधिक विकल्प",
   "Onboarding_subtitle": "टीम सहयोग के पार",
@@ -732,7 +735,8 @@
   "Wi_Fi": "वाई-फाई",
   "Wi_Fi_and_mobile_data": "वाई-फाई और मोबाइल डेटा",
   "Without_Servers": "कार्यस्थान रहित",
-  "Workspace_URL_Example": "उदाहरण: your-company.rocket.chat",
+  "Workspace_URL": "कार्यस्थल URL",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "कार्यस्थान",
   "Would_like_to_place_on_hold": "क्या आप इस चैट को होल्ड पर रखना चाहेंगे?",
   "Would_you_like_to_return_the_inquiry": "क्या आप जांच को लौटना चाहेंगे?",
@@ -750,6 +754,7 @@
   "You_are_leaving_the_team": "आप टीम '{{team}}' को छोड़ रहे हैं",
   "You_can_search_using_RegExp_eg": "आप विन्यास (RegExp) का उपयोग कर सकते हैं। उदा. `/^text$/i`",
   "You_colon": "आप: ",
+  "You_dont_have_account": "क्या आपके पास खाता नहीं है?",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "आपको कुछ साझा करने के लिए कम से कम एक Rocket.Chat कार्यस्थान तक पहुँचना होगा।",
   "You_need_to_verifiy_your_email_address_to_get_notications": "आपको सूचनाएं प्राप्त करने के लिए अपनी ईमेल पता का सत्यापित करना होगा",
   "you_were_mentioned": "आपका उल्लेख किया गया था",
diff --git a/app/i18n/locales/hu.json b/app/i18n/locales/hu.json
index ff0c549126..dbd26db867 100644
--- a/app/i18n/locales/hu.json
+++ b/app/i18n/locales/hu.json
@@ -27,6 +27,9 @@
   "admin-video-conf-provider-not-configured-header": "Konferenciahívás nem engedélyezett",
   "After_seconds_set_by_admin": "{{seconds}} másodperc  (admin által beállított)",
   "Agent": "Ügyintéző",
+  "AirGapped_workspace_read_only_description": "A rendszergazdák visszaállíthatják a teljes funkcionalitást az internethez való csatlakozással vagy prémium tervre való frissítéssel.",
+  "AirGapped_workspace_read_only_share_extension_title": "A megosztás le van tiltva, mert a munkaterület csak olvasási módban van.",
+  "AirGapped_workspace_read_only_title": "Munkaterület csak olvasási módban.",
   "Alert": "Riasztás",
   "alert": "riasztás",
   "alerts": "riasztás",
@@ -35,12 +38,13 @@
   "All_users_in_the_channel_can_write_new_messages": "A csatorna minden felhasználója írhat új üzeneteket",
   "All_users_in_the_team_can_write_new_messages": "A csapat minden felhasználója írhat új üzeneteket",
   "Allow_Reactions": "Engedélyezze a reakciókat",
+  "Already_have_an_account": "Már van fiókja?",
   "Also_send_thread_message_to_channel_behavior": "Szál üzenetet is küld a csatornára",
   "and": "és",
   "and_N_more": "és{{count}} további",
   "Announcement": "Bejelentés",
   "announcement": "bejelentés",
-  "Apply_Your_Certificate": "Tanúsítvány alkalmazása",
+  "Apply_Certificate": "Tanúsítvány alkalmazása",
   "ARCHIVE": "ARCHÍVUM",
   "archive": "archívum",
   "are_typing": "éppen ír",
@@ -192,7 +196,7 @@
   "Discussion_name": "Megbeszélés neve",
   "Discussions": "Megbeszélések",
   "Display": "Megjelenítés",
-  "Do_you_have_a_certificate": "Van tanúsítványa?",
+  "Do_you_have_a_certificate": "Van tanúsítványa ehhez a munkaterülethez?",
   "Do_you_have_an_account": "Van fiókja?",
   "Do_you_really_want_to_key_this_room_question_mark": "Biztosan ez a kulcsot {{key}} szeretné ehhez a szobához?",
   "Dont_activate": "Ne aktiválja most",
@@ -235,7 +239,6 @@
   "End_to_end_encrypted_room": "Végponttól végpontig titkosított szoba",
   "Enter_E2EE_Password": "Adja meg az E2EE jelszót",
   "Enter_E2EE_Password_description": "Az titkosított csatornákhoz és közvetlen üzenetekhez való hozzáféréshez írja be a titkosítási jelszavát. Ez nincs tárolva a szerveren, így minden eszközön használnia kell.",
-  "Enter_workspace_URL": "Adja meg a munkaterület URL-címét",
   "Error_Download_file": "Hiba a fájl letöltése közben",
   "Error_uploading": "Hiba feltöltése",
   "error-action-not-allowed": "A(z) {{action}} tevékenység nem engedélyezett",
@@ -274,6 +277,7 @@
   "Forward_message": "Üzenet továbbítása",
   "Forward_to_department": "Továbbítás a részlegnek",
   "Forward_to_user": "Továbbítás a felhasználónak",
+  "Full_name": "Teljes név",
   "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",
@@ -297,6 +301,7 @@
   "Insert_Join_Code": "Csatlakozási kód beillesztése",
   "Invalid_or_expired_invite_token": "Érvénytelen vagy lejárt meghívási token",
   "Invalid_server_version": "A munkaterület, amelyhez csatlakozni próbál, olyan verziót használ, amelyet az alkalmazás már nem támogat: {{currentVersion}}. \n\nA {{minVersion}} verzióra van szükségünk",
+  "Invalid_workspace_URL": "Érvénytelen munkaterület URL",
   "Invisible": "Láthatatlan",
   "Invite_Link": "Meghívási hivatkozás",
   "Invite_users": "Felhasználók meghívása",
@@ -308,7 +313,6 @@
   "Jitsi_may_require_authentication": "A Jitsi hitelesítést igényelhet",
   "Join": "Csatlakozás",
   "Join_Code": "Csatlakozási kód",
-  "Join_our_open_workspace": "Ugrás a nyitott munkaterületére",
   "Joined": "Csatlakozva",
   "Jump_to_message": "Ugrás az üzenethez",
   "Just_invited_people_can_access_this_channel": "Csak a meghívott személyek férhetnek hozzá ehhez a csatornához.",
@@ -442,7 +446,7 @@
   "no-active-video-conf-provider-header": "Konferenciahívás nem engedélyezett",
   "no-videoconf-provider-app-body": "A konferenciahívás alkalmazásokat a Rocket.Chat piactéren a munkaterület adminisztrátora telepítheti.",
   "no-videoconf-provider-app-header": "Konferenciahívás nem elérhető",
-  "Not_RC_Server": "Ez nem egy Rocket.Chat munkaterület. {{contact}}",
+  "Not_RC_Server": "Lépjen kapcsolatba a munkaterület adminisztrátorával, vagy keressen egy Rocket.Chat munkaterület meghívót az e-mail postafiókjában.",
   "Nothing": "Semmi",
   "Nothing_to_save": "Nincs mit menteni!",
   "Notification_Preferences": "Értesítési beállítások",
@@ -457,7 +461,6 @@
   "Omnichannel_queue": "Összcsatorna várólista",
   "On_hold_Livechats": "Összcsatorna beszélgetések várakozás közben",
   "Onboarding_agree_terms": "A folytatással Ön elfogadja a Rocket.Chat-et",
-  "Onboarding_join_open_description": "Csatlakozz a nyílt munkaterületünkhöz, hogy beszélgess a Rocket.Chat csapatával és közösségével.",
   "Onboarding_less_options": "Kevesebb beállítás",
   "Onboarding_more_options": "Több beállítás",
   "Onboarding_subtitle": "A csoportos együttműködésen túl",
@@ -734,7 +737,8 @@
   "Wi_Fi": "Wi-Fi",
   "Wi_Fi_and_mobile_data": "Wi-Fi és mobiladatok",
   "Without_Servers": "Munkaterületek nélkül",
-  "Workspace_URL_Example": "Pl. our-company.rocket.chat",
+  "Workspace_URL": "Munkaterület URL",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "Munkaterületek",
   "Would_like_to_place_on_hold": "Szeretné várakoztatásba helyezni ezt a csevegést?",
   "Would_you_like_to_return_the_inquiry": "Vissza szeretné adni a lekérdezést?",
@@ -752,6 +756,7 @@
   "You_are_leaving_the_team": "Ön elhagyja ezt a csapatot {{team}}",
   "You_can_search_using_RegExp_eg": "Használhat RegExp-t. pl. `/^text$/i`",
   "You_colon": "Ön:",
+  "You_dont_have_account": "Nincs fiókja?",
   "You_dont_have_permission_to_perform_this_action": "Nincs jogosultsága a művelet végrehajtásához. Kérdezze meg a munkaterület rendszergazdáját.",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Legalább egy Rocket.Chat munkaterülethez hozzá kell férnie ahhoz, hogy megoszthasson valamit.",
   "You_need_to_verifiy_your_email_address_to_get_notications": "Ellenőriznie kell az e-mail-címét az értesítések fogadásához",
diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json
index 5b6f54fd8c..01844e841d 100644
--- a/app/i18n/locales/it.json
+++ b/app/i18n/locales/it.json
@@ -14,6 +14,9 @@
   "Admin_Panel": "Amministrazione",
   "After_seconds_set_by_admin": "Dopo {{seconds}} secondi (impostati dall'admin)",
   "Agent": "Agente",
+  "AirGapped_workspace_read_only_description": "Gli amministratori possono ripristinare la funzionalità completa collegandosi a Internet o aggiornando a un piano premium.",
+  "AirGapped_workspace_read_only_share_extension_title": "La condivisione è disabilitata perché l'area di lavoro è in modalità di sola lettura.",
+  "AirGapped_workspace_read_only_title": "Workspace in modalità di sola lettura.",
   "Alert": "Avviso",
   "alert": "avviso",
   "alerts": "avvisi",
@@ -22,11 +25,12 @@
   "All_users_in_the_channel_can_write_new_messages": "Tutti gli utenti nel canale possono scrivere messaggi",
   "All_users_in_the_team_can_write_new_messages": "Tutti gli utenti nel team possono scrivere nuovi messaggi",
   "Allow_Reactions": "Permetti reazioni",
+  "Already_have_an_account": "Hai già un account?",
   "and": "e",
   "and_N_more": "e altri {{count}}",
   "Announcement": "Annuncio",
   "announcement": "annuncio",
-  "Apply_Your_Certificate": "Applica il tuo certificato",
+  "Apply_Certificate": "Applica certificato",
   "ARCHIVE": "ARCHIVIO",
   "archive": "archivio",
   "are_typing": "stanno scrivendo",
@@ -118,7 +122,7 @@
   "Discussion_name": "Nome della discussione",
   "Discussions": "Discussioni",
   "Displays_action_text": "Mostra il testo di azione",
-  "Do_you_have_a_certificate": "Hai un certificato?",
+  "Do_you_have_a_certificate": "Hai un certificato per questo spazio di lavoro?",
   "Do_you_have_an_account": "Hai un account?",
   "Do_you_really_want_to_key_this_room_question_mark": "Sei sicuro di voler {{key}} questa stanza?",
   "Dont_activate": "Non attivare ora",
@@ -156,7 +160,6 @@
   "End_to_end_encrypted_room": "Stanza crittografata end to end",
   "Enter_E2EE_Password": "Inserisci la password E2EE",
   "Enter_E2EE_Password_description": "Per accedere ai tuoi canali criptati e ai messaggi diretti, inserisci la tua password di crittografia. Questa non viene memorizzata sul server, quindi dovrai usarla su ogni dispositivo.",
-  "Enter_workspace_URL": "Inserisci la url del workspace",
   "Error_uploading": "Errore nel caricamento di",
   "error-action-not-allowed": "{{action}} non autorizzata",
   "error-avatar-invalid-url": "URL avatar non valido: {{url}}",
@@ -189,6 +192,7 @@
   "Forward_Chat": "Inoltra Chat",
   "Forward_to_department": "Inoltra a dipartimento",
   "Forward_to_user": "Inoltra ad udente",
+  "Full_name": "Nome completo",
   "Full_table": "Clicca per la tabella completa",
   "Generate_New_Link": "Genera nuovo link",
   "Get_help": "Ottieni aiuto",
@@ -208,6 +212,7 @@
   "Insert_Join_Code": "Inserisci il codice d'accesso",
   "Invalid_or_expired_invite_token": "Token di invito non valido o scaduto",
   "Invalid_server_version": "Il server a cui stai cercando di connetterti sta utilizzando una versione non più supportata dall'app: {{currentVersion}}.\n\nVersione minima richiesta: {{minVersion}}",
+  "Invalid_workspace_URL": "URL dello spazio di lavoro non valido",
   "Invisible": "Invisibile",
   "Invite_Link": "Link di invito",
   "Invite_user_to_join_channel": "Invita un utente ad entrare in questo canale",
@@ -218,7 +223,6 @@
   "is_typing": "sta scrivendo",
   "Join": "Entra",
   "Join_Code": "Codice d'accesso",
-  "Join_our_open_workspace": "Unisciti al nostro workspace",
   "Join_the_given_channel": "Entra nel canale specificato",
   "Just_invited_people_can_access_this_channel": "Solo le persone invitate possono accedere a questo canale",
   "Just_invited_people_can_access_this_team": "Solo le persone invitate possono accedere a questo team",
@@ -311,7 +315,7 @@
   "No_threads": "Non ci sono thread",
   "No_threads_following": "Non stai seguendo alcun thread",
   "No_threads_unread": "Non ci sono thread non letti",
-  "Not_RC_Server": "Questo non è un server di Rocket.Chat.\n{{contact}}",
+  "Not_RC_Server": "Contatta l'amministratore del tuo workspace o cerca nella tua casella di posta elettronica un invito a uno workspace di Rocket.Chat.",
   "Nothing": "Niente",
   "Nothing_to_save": "Niente da salvare!",
   "Notification_Preferences": "Impostazioni notifiche",
@@ -321,7 +325,6 @@
   "Omnichannel": "Omnichannel",
   "Omnichannel_enable_alert": "Non sei ancora su Onmichannel. Vuoi attivarlo?",
   "Onboarding_agree_terms": "Procedendo, accetti Rocket.Chat",
-  "Onboarding_join_open_description": "Unisciti al nostro workspace per parlare con il team e la community di Rocket.Chat.",
   "Onboarding_less_options": "Meno opzioni",
   "Onboarding_more_options": "Più opzioni",
   "Onboarding_subtitle": "Oltre la collaborazione di gruppo",
@@ -520,7 +523,8 @@
   "What_are_you_doing_right_now": "Cosa stai facendo in questo momento?",
   "Whats_the_password_for_your_certificate": "Qual'è la password del tuo certificato?",
   "Without_Servers": "Senza server",
-  "Workspace_URL_Example": "Es. tua-azienda.rocket.chat",
+  "Workspace_URL": "URL dello spazio di lavoro",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "Workspace",
   "Would_you_like_to_return_the_inquiry": "Vorresti ritirare la tua domanda?",
   "Write_External_Permission": "Permesso galleria",
@@ -534,6 +538,7 @@
   "You_are_in_preview_mode": "Sei in modalità anteprima",
   "You_can_search_using_RegExp_eg": "Puoi usare espressioni regolari. es. `/^testo$/i`",
   "You_colon": "Tu: ",
+  "You_dont_have_account": "Non hai un account?",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Devi accedere ad almeno un server Rocket.Chat prima di condividere qualcosa.",
   "You_need_to_verifiy_your_email_address_to_get_notications": "Devi verificare il tuo indirizzo e-mail per ricevere le notifiche",
   "you_were_mentioned": "sei stato menzionato",
diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json
index c510d13697..12361ac312 100644
--- a/app/i18n/locales/ja.json
+++ b/app/i18n/locales/ja.json
@@ -9,6 +9,9 @@
   "Add_users": "ユーザーを追加",
   "Admin_Panel": "管理者パネル",
   "Agent": "エージェント",
+  "AirGapped_workspace_read_only_description": "管理者は、インターネットに接続するか、プレミアムプランにアップグレードすることで、完全な機能を復元できます。",
+  "AirGapped_workspace_read_only_share_extension_title": "共有は無効です。作業スペースが読み取り専用モードになっているため。",
+  "AirGapped_workspace_read_only_title": "ワークスペースは読み取り専用モードです。",
   "Alert": "アラート",
   "alert": "アラート",
   "alerts": "アラート",
@@ -17,11 +20,12 @@
   "All_users_in_the_channel_can_write_new_messages": "すべてのユーザーが新しいメッセージを書き込みできます",
   "All_users_in_the_team_can_write_new_messages": "チームのすべてのユーザーが新しいメッセージを書き込むことができます",
   "Allow_Reactions": "リアクションを許可",
+  "Already_have_an_account": "すでにアカウントをお持ちですか？",
   "and": "と",
   "and_N_more": "さらに{{count}}つ",
   "Announcement": "アナウンス",
   "announcement": "アナウンス",
-  "Apply_Your_Certificate": "証明書を適用する",
+  "Apply_Certificate": "証明書を適用",
   "ARCHIVE": "アーカイブ",
   "archive": "アーカイブ",
   "are_typing": "が入力中",
@@ -106,7 +110,7 @@
   "Discussion_name": "ディスカッション名",
   "Discussions": "ディスカッション",
   "Displays_action_text": "アクションテキストを表示",
-  "Do_you_have_a_certificate": "証明書を持っていますか？",
+  "Do_you_have_a_certificate": "このワークスペースの証明書をお持ちですか？",
   "Do_you_have_an_account": "アカウントをお持ちですか？",
   "Do_you_really_want_to_key_this_room_question_mark": "本当にこのルームを{{key}}しますか？",
   "Dont_Have_An_Account": "アカウントがありませんか？",
@@ -162,6 +166,7 @@
   "Forward_Chat": "チャットを転送する",
   "Forward_to_department": "部署に転送する",
   "Forward_to_user": "ユーザーに転送する",
+  "Full_name": "フルネーム",
   "Full_table": "クリックしてテーブル全体を見る",
   "Generate_New_Link": "新しいリンクを生成",
   "Get_help": "ヘルプを得る",
@@ -179,6 +184,7 @@
   "Insert_Join_Code": "参加コードを挿入する",
   "Invalid_or_expired_invite_token": "招待トークンが無効か、期限が切れています",
   "Invalid_server_version": "接続しようとしているサーバーのバージョン（{{currentVersion}}）はサポートされていません。\n\nサポートする最低バージョンは {{minVersion}} です",
+  "Invalid_workspace_URL": "無効なワークスペースのURL",
   "Invisible": "状態を隠す",
   "Invite_Link": "招待リンク",
   "Invite_user_to_join_channel": "1ユーザーをこのチャネルに招待",
@@ -189,7 +195,6 @@
   "is_typing": "が入力中",
   "Join": "参加",
   "Join_Code": "参加コード",
-  "Join_our_open_workspace": "開いているワークスペースに参加する",
   "Join_the_given_channel": "指定したチャネルに参加",
   "Just_invited_people_can_access_this_channel": "招待されたユーザーだけがこのチャンネルに参加できます",
   "Just_invited_people_can_access_this_team": "招待されたユーザーのみがこのチームにアクセスできます",
@@ -253,7 +258,7 @@
   "No_Read_Receipts": "未読通知はありません",
   "No_results_found": "結果なし",
   "No_starred_messages": "お気に入りされたメッセージはありません",
-  "Not_RC_Server": "Rocket.Chatサーバーではありません。\n{{contact}}",
+  "Not_RC_Server": "ワークスペース管理者に連絡するか、メールの受信トレイでRocket.Chatワークスペース招待を検索してください。",
   "Nothing": "何もなし",
   "Nothing_to_save": "保存するものはありません！",
   "Notification_Preferences": "通知設定",
@@ -397,6 +402,8 @@
   "Websocket_disabled": "Websocketはこのサーバーでは無効化されています。\n{{contact}}",
   "Whats_the_password_for_your_certificate": "証明書のパスワードはなんですか？",
   "Without_Servers": "サーバーを除く",
+  "Workspace_URL": "ワークスペースのURL",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Write_External_Permission": "ギャラリーへのアクセス許可",
   "Write_External_Permission_Message": "Rocket.Chatは画像を保存するためにギャラリーへのアクセスを求めています。",
   "Yes_action_it": "はい、{{action}}します！",
@@ -406,6 +413,7 @@
   "You_are_in_preview_mode": "プレビューモードです。",
   "You_can_search_using_RegExp_eg": "正規表現を利用できます。 例: `/^text$/i`",
   "You_colon": "あなた: ",
+  "You_dont_have_account": "アカウントをお持ちでないですか?",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "シェアするためには1つ以上のサーバーにアクセスする必要があります。",
   "you_were_mentioned": "あなたがメンションしました",
   "You_will_be_logged_out_of_this_application": "アプリからログアウトします。",
diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json
index b44e2b70a5..38e676b42c 100644
--- a/app/i18n/locales/nl.json
+++ b/app/i18n/locales/nl.json
@@ -13,6 +13,9 @@
   "Admin_Panel": "Admin Paneel",
   "After_seconds_set_by_admin": "Na {{seconds}} seconden (ingesteld door beheerder)",
   "Agent": "Agent",
+  "AirGapped_workspace_read_only_description": "Beheerders kunnen de volledige functionaliteit herstellen door deze met internet te verbinden of te upgraden naar een premiumplan.",
+  "AirGapped_workspace_read_only_share_extension_title": "Delen is uitgeschakeld omdat de werkruimte in alleen-lezen modus is.",
+  "AirGapped_workspace_read_only_title": "Werkruimte in alleen-lezen modus.",
   "Alert": "Waarschuwing",
   "alert": "waarschuwing",
   "alerts": "waarschuwingen",
@@ -21,11 +24,12 @@
   "All_users_in_the_channel_can_write_new_messages": "Alle gebruikers in het kanaal kunnen nieuwe berichten schrijven",
   "All_users_in_the_team_can_write_new_messages": "Alle gebruikers in het team kunnen nieuwe berichten schrijven",
   "Allow_Reactions": "Reacties toestaan",
+  "Already_have_an_account": "Heeft u al een account?",
   "and": "en",
   "and_N_more": "en nog {{count}}",
   "Announcement": "Aankondiging",
   "announcement": "aankondiging",
-  "Apply_Your_Certificate": "Pas jouw certificaat toe",
+  "Apply_Certificate": "Certificaat toepassen",
   "ARCHIVE": "ARCHIVEER",
   "archive": "archiveer",
   "are_typing": "zijn aan het typen",
@@ -139,7 +143,7 @@
   "Discussions": "Discussies",
   "Display": "Weergave",
   "Displays_action_text": "Geeft actietekst weer",
-  "Do_you_have_a_certificate": "Heb je een certificaat?",
+  "Do_you_have_a_certificate": "Heeft u een certificaat voor deze werkruimte?",
   "Do_you_have_an_account": "Heb je een account?",
   "Do_you_really_want_to_key_this_room_question_mark": "Wil je deze kamer echt {{key}}?",
   "Dont_activate": "Nu niet activeren",
@@ -180,7 +184,6 @@
   "End_to_end_encrypted_room": "End-to-end versleutelde kamer",
   "Enter_E2EE_Password": "Voer E2EE-wachtwoord in",
   "Enter_E2EE_Password_description": "Om toegang te krijgen tot uw versleutelde kanalen en directe berichten, voert u uw versleutelingswachtwoord in. Dit wordt niet op de server opgeslagen, dus u moet het op elk apparaat gebruiken.",
-  "Enter_workspace_URL": "Voer de werkruimte-URL in",
   "Error_Download_file": "Fout tijdens het downloaden van bestand",
   "Error_uploading": "Fout bij uploaden",
   "error-action-not-allowed": "{{action}} is niet toegestaan",
@@ -216,6 +219,7 @@
   "Forward_Chat": "Chat doorsturen",
   "Forward_to_department": "Doorsturen naar afdeling",
   "Forward_to_user": "Doorsturen naar gebruiker",
+  "Full_name": "Volledige naam",
   "Full_table": "Klik om de volledige tabel te zien",
   "Generate_New_Link": "Nieuwe link genereren",
   "Get_help": "Hulp krijgen",
@@ -236,6 +240,7 @@
   "Insert_Join_Code": "Deelnamecode invoegen",
   "Invalid_or_expired_invite_token": "Ongeldige of verlopen uitnodigingstoken",
   "Invalid_server_version": "De server waarmee je probeert te verbinden, gebruikt een versie die niet meer door de app wordt ondersteund: {{currentVersion}}.\n\nWe hebben versie {{minVersion}} nodig",
+  "Invalid_workspace_URL": "Ongeldige werkruimte-URL",
   "Invisible": "Onzichtbaar",
   "Invite_Link": "Uitnodigingslink",
   "Invite_user_to_join_channel": "Nodig een gebruiker uit om lid te worden van dit kanaal",
@@ -246,7 +251,6 @@
   "is_typing": "is aan het typen",
   "Join": "Doe mee",
   "Join_Code": "Deelnamecode",
-  "Join_our_open_workspace": "Word lid van onze open werkruimte",
   "Join_the_given_channel": "Word lid van het gegeven kanaal",
   "Just_invited_people_can_access_this_channel": "Alleen uitgenodigde mensen hebben toegang tot dit kanaal",
   "Just_invited_people_can_access_this_team": "Alleen uitgenodigde mensen hebben toegang tot dit team",
@@ -367,7 +371,7 @@
   "No_threads": "Er zijn geen discussies",
   "No_threads_following": "Je volgt geen discussies",
   "No_threads_unread": "Er zijn geen ongelezen discussies",
-  "Not_RC_Server": "Dit is geen Rocket.Chat-server.\n{{contact}}",
+  "Not_RC_Server": "Neem contact op met uw werkruimtebeheerder of zoek in uw e-mailinbox naar een Rocket.Chat werkruimte-uitnodiging.",
   "Nothing": "Niets",
   "Nothing_to_save": "Niets om op te slaan!",
   "Notification_Preferences": "Notificatievoorkeuren",
@@ -381,7 +385,6 @@
   "Omnichannel_queue": "Omnichannel-wachtrij",
   "On_hold_Livechats": "Omnichannels-chats in de wacht",
   "Onboarding_agree_terms": "Door verder te gaan, ga je akkoord met Rocket.Chat",
-  "Onboarding_join_open_description": "Word lid van onze open werkruimte om met het Rocket.Chat team en de community te chatten.",
   "Onboarding_less_options": "Minder opties",
   "Onboarding_more_options": "Meer opties",
   "Onboarding_subtitle": "Meer dan teamsamenwerking",
@@ -613,7 +616,8 @@
   "What_are_you_doing_right_now": "Wat doe je op dit moment?",
   "Whats_the_password_for_your_certificate": "Wat is het wachtwoord voor jouw certificaat?",
   "Without_Servers": "Zonder servers",
-  "Workspace_URL_Example": "Vb. uw-bedrijf.rocket.chat",
+  "Workspace_URL": "Werkruimte-URL",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "Werkruimten",
   "Would_like_to_place_on_hold": "Wil je deze chat in de wacht zetten?",
   "Would_you_like_to_return_the_inquiry": "Wil je de aanvraag retourneren?",
@@ -631,6 +635,7 @@
   "You_are_leaving_the_team": "Je verlaat het team '{{team}}'",
   "You_can_search_using_RegExp_eg": "Je kan RegExp. gebruiken, bijv. `/^tekst$/i`",
   "You_colon": "Jij: ",
+  "You_dont_have_account": "Heeft u geen account?",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Je moet minstens toegang hebben tot één Rocket.Chat-server om iets te delen.",
   "You_need_to_verifiy_your_email_address_to_get_notications": "Je moet je e-mailadres verifiëren om meldingen te ontvangen",
   "you_were_mentioned": "je bent vermeld",
diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json
index da40be94f7..83bd7664ed 100644
--- a/app/i18n/locales/pt-BR.json
+++ b/app/i18n/locales/pt-BR.json
@@ -27,6 +27,9 @@
   "admin-video-conf-provider-not-configured-header": "Video conferência não ativada",
   "After_seconds_set_by_admin": "Após {{seconds}} segundos (Configurado pelo adm)",
   "Agent": "Agente",
+  "AirGapped_workspace_read_only_description": "Os administradores podem restaurar a funcionalidade completa conectando-o à internet ou atualizando para um plano premium.",
+  "AirGapped_workspace_read_only_share_extension_title": "O compartilhamento está desativado porque o espaço de trabalho está em modo somente leitura.",
+  "AirGapped_workspace_read_only_title": "Espaço de trabalho em modo somente leitura.",
   "Alert": "Alerta",
   "alert": "alerta",
   "alerts": "alertas",
@@ -36,13 +39,14 @@
   "All_users_in_the_team_can_write_new_messages": "Todos usuários no canal podem enviar mensagens novas",
   "Allow_push_notifications_for_rocket_chat": "Permitir notificações push para Rocket.Chat",
   "Allow_Reactions": "Permitir reagir",
+  "Already_have_an_account": "Já tem uma conta?",
   "Also_send_thread_message_to_channel_behavior": "Também enviar mensagem do tópico para o canal",
   "and": "e",
   "and_N_more": "e mais {{count}}",
   "Announcement": "Anúncio",
   "announcement": "anúncio",
   "App_users_are_not_allowed_to_log_in_directly": "Usuários do aplicativo não estão autorizados a fazer login diretamente.",
-  "Apply_Your_Certificate": "Aplicar certificado",
+  "Apply_Certificate": "Aplicar certificado",
   "ARCHIVE": "ARQUIVAR",
   "archive": "arquivar",
   "are_typing": "estão digitando",
@@ -213,7 +217,7 @@
   "Discussions": "Discussões",
   "Display": "Display",
   "Displays_action_text": "Exibe texto da ação",
-  "Do_you_have_a_certificate": "Você tem um certificado?",
+  "Do_you_have_a_certificate": "Você tem um certificado para este workspace?",
   "Do_you_have_an_account": "Você tem uma conta?",
   "Do_you_really_want_to_key_this_room_question_mark": "Você quer realmente {{key}} esta sala?",
   "Documentation": "Documentação",
@@ -263,7 +267,6 @@
   "Enter_E2EE_Password": "Digite a senha E2EE",
   "Enter_E2EE_Password_description": "Para acessar seus canais criptografados e mensagens diretas, insira sua senha de criptografia. Isso não é armazenado no servidor, então você precisará usá-la em cada dispositivo.",
   "Enter_the_code": "Insira o código que acabamos de enviar por e-mail.",
-  "Enter_workspace_URL": "Digite a URL da sua workspace",
   "Error_Download_file": "Erro ao baixar o arquivo",
   "Error_play_video": "Houve um erro ao reproduzir esse vídeo",
   "Error_uploading": "Erro subindo",
@@ -304,6 +307,7 @@
   "Forward_message": "Encaminhar mensagem",
   "Forward_to_department": "Encaminhar para departamento",
   "Forward_to_user": "Encaminhar para usuário",
+  "Full_name": "Nome completo",
   "Full_table": "Clique para ver a tabela completa",
   "Generate_New_Link": "Gerar novo convite",
   "Get_help": "Obter ajuda",
@@ -331,6 +335,7 @@
   "Invalid_Email": "E-mail inválido",
   "Invalid_or_expired_invite_token": "Token de convite inválido ou vencido",
   "Invalid_server_version": "O servidor que você está conectando não é suportado mais por esta versão do aplicativo: {{currentVersion}}.\n\nEsta versão do aplicativo requer a versão {{minVersion}} da workspace para funcionar corretamente.",
+  "Invalid_workspace_URL": "URL de workspace inválida",
   "Invisible": "Invisível",
   "Invite_Link": "Link de convite",
   "Invite_user_to_join_channel": "Convidar um usuário para ingressar neste canal",
@@ -346,7 +351,6 @@
   "Jitsi_may_requires_authentication": "Jitsi pode exigir autenticação",
   "Join": "Entrar",
   "Join_Code": "Insira o código da sala",
-  "Join_our_open_workspace": "Entrar na nossa workspace pública",
   "Join_the_given_channel": "Entrar no canal informado",
   "Joined": "Ingressou",
   "Jump_to_message": "Ir para mensagem",
@@ -487,7 +491,7 @@
   "no-active-video-conf-provider-header": "Video conferência não ativada",
   "no-videoconf-provider-app-body": "Aplicativos de video conferência podem ser instalados no Marketplace do Rocket.Chat por um administrador do workspace.",
   "no-videoconf-provider-app-header": "Video conferência não disponível",
-  "Not_RC_Server": "Essa não é uma workspace Rocket.Chat.\n{{contact}}",
+  "Not_RC_Server": "Entre em contato com o administrador do seu workspace ou procure na sua caixa de entrada de e-mail um convite para um workspace Rocket.Chat.",
   "Nothing": "Nada",
   "Nothing_to_save": "Nada para salvar!",
   "Notification_delay": "Atraso de notificação",
@@ -504,7 +508,6 @@
   "Omnichannel_queue": "Fila Omnichannel",
   "On_hold_Livechats": "Conversas em espera",
   "Onboarding_agree_terms": "Ao continuar, você aceita nossos ",
-  "Onboarding_join_open_description": "Entre na nossa workspace pública para conversar com o time da Rocket.Chat e nossa comunidade.",
   "Onboarding_less_options": "Menos opções",
   "Onboarding_more_options": "Mais opções",
   "Onboarding_subtitle": "Além da colaboração em time",
@@ -816,7 +819,8 @@
   "Without_Servers": "Sem workspaces",
   "Workspace_consumption": "Consumo do workspace",
   "Workspace_consumption_description": "Existe uma quantidade definida de notificações push por mês",
-  "Workspace_URL_Example": "Ex. sua-empresa.rocket.chat",
+  "Workspace_URL": "URL do workspace",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "Workspaces",
   "Would_like_to_place_on_hold": "Gostaria de colocar essa conversa em espera?",
   "Would_you_like_to_return_the_inquiry": "Deseja retornar a consulta?",
@@ -834,6 +838,7 @@
   "You_are_leaving_the_team": "Você está deixando o time '{{team}}'",
   "You_can_search_using_RegExp_eg": "Você pode usar expressões regulares, por exemplo `/^text$/i`",
   "You_colon": "Você: ",
+  "You_dont_have_account": "Você não tem uma conta?",
   "You_dont_have_permission_to_perform_this_action": "Você não tem permissão para realizar esta ação. Verifique com um administrador do espaço de trabalho.",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Você precisa acessar pelo menos uma workspace Rocket.Chat para compartilhar.",
   "You_need_to_change_your_password": "Você precisa alterar sua senha",
diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json
index 4c61335d44..6b379b22ce 100644
--- a/app/i18n/locales/pt-PT.json
+++ b/app/i18n/locales/pt-PT.json
@@ -8,6 +8,9 @@
   "Add_users": "Adicionar utilizadores",
   "Admin_Panel": "Painel de Administração",
   "Agent": "Agente",
+  "AirGapped_workspace_read_only_description": "Os administradores podem restaurar a funcionalidade completa ligando-o à internet ou fazendo um upgrade para um plano premium.",
+  "AirGapped_workspace_read_only_share_extension_title": "O compartilhamento está desativado porque o espaço de trabalho está em modo apenas leitura.",
+  "AirGapped_workspace_read_only_title": "Espaço de trabalho em modo apenas leitura.",
   "Alert": "Alerta",
   "alert": "alerta",
   "alerts": "alertas",
@@ -16,11 +19,12 @@
   "All_users_in_the_channel_can_write_new_messages": "Todos os utilizadores no canal podem escrever novas mensagens",
   "All_users_in_the_team_can_write_new_messages": "Todos os usuários da equipa podem escrever novas mensagens",
   "Allow_Reactions": "Permitir Reacções",
+  "Already_have_an_account": "Já tem uma conta?",
   "and": "e",
   "and_N_more": "e mais {{count}}",
   "Announcement": "Anúncio",
   "announcement": "anúncio",
-  "Apply_Your_Certificate": "Aplique o seu Certificado",
+  "Apply_Certificate": "Aplicar certificado",
   "ARCHIVE": "ARQUIVAR",
   "archive": "arquivar",
   "are_typing": "estão a escrever",
@@ -102,7 +106,7 @@
   "Discussion_name": "Nome da discussão",
   "Discussions": "Discussões",
   "Displays_action_text": "Exibe texto da acção",
-  "Do_you_have_a_certificate": "Você tem um certificado?",
+  "Do_you_have_a_certificate": "Tem um certificado para este espaço de trabalho?",
   "Do_you_have_an_account": "Você tem uma conta?",
   "Do_you_really_want_to_key_this_room_question_mark": "Você quer mesmo {{key}} esta sala?",
   "Dont_Have_An_Account": "Não tem uma conta?",
@@ -157,6 +161,7 @@
   "Forward_Chat": "Reencaminhar Chat",
   "Forward_to_department": "Reencaminhar para o departamento",
   "Forward_to_user": "Reencaminhar para o utilizador",
+  "Full_name": "Nome completo",
   "Full_table": "Clique para ver a tabela completa",
   "Generate_New_Link": "Gerar Novo Link",
   "Get_help": "Obter ajuda",
@@ -174,6 +179,7 @@
   "Insert_Join_Code": "Insira o código de entrada",
   "Invalid_or_expired_invite_token": "Token de convite invalido ou expirado",
   "Invalid_server_version": "O servidor ao qual esta tentando ligar-se, utiliza uma versão que não é suporta pela aplicação: {{currentVersion}}.\n\nA versão mínima requerida é {{minVersion}}",
+  "Invalid_workspace_URL": "URL de espaço de trabalho inválida",
   "Invisible": "Invisível",
   "Invite_Link": "Link de convite",
   "Invite_user_to_join_channel": "Convidar um utilizador para juntar-se a este canal",
@@ -184,7 +190,6 @@
   "is_typing": "está a escrever",
   "Join": "Entrar",
   "Join_Code": "Código de entrada",
-  "Join_our_open_workspace": "Junte-se ao nosso espaço de trabalho aberto",
   "Join_the_given_channel": "Entrar no canal apresentado",
   "Just_invited_people_can_access_this_channel": "Apenas utilizadores convidados podem aceder a este canal",
   "Just_invited_people_can_access_this_team": "Apenas pessoas convidadas podem aceder a esta equipa",
@@ -253,7 +258,7 @@
   "No_Read_Receipts": "Sem recibos de leitura",
   "No_results_found": "Nenhum resultado encontrado",
   "No_starred_messages": "Nenhuma mensagem marcada com estrela",
-  "Not_RC_Server": "Isto não é um servidor Rocket.Chat.\n{{contact}}",
+  "Not_RC_Server": "Contacte o administrador do seu espaço de trabalho ou procure na sua caixa de entrada um convite para o espaço de trabalho Rocket.Chat.",
   "Nothing": "Nada",
   "Nothing_to_save": "Nada para guardar!",
   "Notification_Preferences": "Preferências de Notificação",
@@ -263,7 +268,6 @@
   "Omnichannel": "Omnichannel",
   "Omnichannel_enable_alert": "Você não está disponível no Omnichannel. Você gostaria de estar disponível?",
   "Onboarding_agree_terms": "Ao continuar, você concorda com Rocket.Chat",
-  "Onboarding_join_open_description": "Junte-se ao nosso espaço de trabalho aberto para conversar com a equipa e comunidade Rocket.Chat.",
   "Onboarding_less_options": "Menos opções",
   "Onboarding_more_options": "Mais opções",
   "Onboarding_subtitle": "Além da Colaboração da Equipe",
@@ -368,6 +372,8 @@
   "Username": "Nome de utilizador",
   "Username_or_email": "Nome de utilizador ou e-mail",
   "Whats_the_password_for_your_certificate": "Qual é a senha para o seu certificado?",
+  "Workspace_URL": "URL do espaço de trabalho",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Yes_action_it": "Sim, {{action}}!",
   "Yesterday": "Ontem",
   "You": "Você",
@@ -375,6 +381,7 @@
   "You_are_in_preview_mode": "Você está no modo de pré-visualização",
   "You_can_search_using_RegExp_eg": "Você pode pesquisar usando RegEx. por exemplo, `/^text$/i`",
   "You_colon": "Você: ",
+  "You_dont_have_account": "Não tem uma conta?",
   "you_were_mentioned": "você foi mencionado",
   "You_will_not_be_able_to_recover_this_message": "Você será incapaz de recuperar esta mensagem!"
 }
\ No newline at end of file
diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json
index 94f2015dcb..545e4f4b90 100644
--- a/app/i18n/locales/ru.json
+++ b/app/i18n/locales/ru.json
@@ -18,6 +18,9 @@
   "Admin_Panel": "Панель админа",
   "After_seconds_set_by_admin": "Через {{seconds}} секунд (установлено администратором сервера)",
   "Agent": "Агент",
+  "AirGapped_workspace_read_only_description": "Администраторы могут восстановить полную функциональность, подключив его к интернету или обновив до премиум-плана.",
+  "AirGapped_workspace_read_only_share_extension_title": "Обмен отключен, так как рабочая область находится в режиме только для чтения.",
+  "AirGapped_workspace_read_only_title": "Рабочее пространство в режиме только для чтения.",
   "Alert": "Оповещение",
   "alert": "оповещение",
   "alerts": "оповещения",
@@ -26,12 +29,13 @@
   "All_users_in_the_channel_can_write_new_messages": "Все пользователи канала могут писать новые сообщения",
   "All_users_in_the_team_can_write_new_messages": "Все пользователи в Команде могут писать новые сообщения",
   "Allow_Reactions": "Разрешить реакции",
+  "Already_have_an_account": "Уже есть аккаунт?",
   "Also_send_thread_message_to_channel_behavior": "Также отправить в чат",
   "and": "и",
   "and_N_more": "и еще {{count}}",
   "Announcement": "Объявление",
   "announcement": "объявление",
-  "Apply_Your_Certificate": "Применить ваш сертификат",
+  "Apply_Certificate": "Применить сертификат",
   "ARCHIVE": "АРХИВ",
   "archive": "архив",
   "are_typing": "печатают",
@@ -164,7 +168,7 @@
   "Discussions": "Обсуждения",
   "Display": "Внешний вид",
   "Displays_action_text": "Показать текст действия",
-  "Do_you_have_a_certificate": "У вас есть сертификат?",
+  "Do_you_have_a_certificate": "У вас есть сертификат для этого рабочего пространства?",
   "Do_you_have_an_account": "У вас есть аккаунт?",
   "Do_you_really_want_to_key_this_room_question_mark": "Вы действительно хотите {{key}} этот канал?",
   "Dont_activate": "Не активировать сейчас",
@@ -205,7 +209,6 @@
   "End_to_end_encrypted_room": "Чат со сквозным шифрованием",
   "Enter_E2EE_Password": "Введите E2EE Пароль",
   "Enter_E2EE_Password_description": "Чтобы получить доступ к вашим зашифрованным каналам и прямым сообщениям, введите свой пароль шифрования. Он не хранится на сервере, поэтому вам нужно будет использовать его на каждом устройстве.",
-  "Enter_workspace_URL": "Введите URL вашего рабочего пространства",
   "Error_Download_file": "Ошибка при скачивании файла",
   "Error_uploading": "Ошибка загрузки",
   "error-action-not-allowed": "{{action}} не допускается",
@@ -242,6 +245,7 @@
   "Forward_Chat": "Перенаправить Чат",
   "Forward_to_department": "Перенаправить в отдел",
   "Forward_to_user": "Перенаправить пользователю",
+  "Full_name": "Полное имя",
   "Full_table": "Нажмите, чтобы увидеть полную таблицу",
   "Generate_New_Link": "Сгенерировать Новую Ссылку",
   "Get_help": "Получить помощь",
@@ -262,6 +266,7 @@
   "Insert_Join_Code": "Вставить код присоединения",
   "Invalid_or_expired_invite_token": "Токен приглашения не действителен или с истекшим сроком действия",
   "Invalid_server_version": "Сервер, к которому вы пытаетесь подключиться, использует версию, которая больше не поддерживается приложением: {{currentVersion}}.\n\nНам нужна версия {{minVersion}}",
+  "Invalid_workspace_URL": "Недействительный URL рабочего пространства",
   "Invisible": "Невидимый",
   "Invite_Link": "Ссылка Приглашения",
   "Invite_user_to_join_channel": "Пригласить пользователя в канал",
@@ -272,7 +277,6 @@
   "is_typing": "печатает",
   "Join": "Присоединиться",
   "Join_Code": "Код присоединения",
-  "Join_our_open_workspace": "Присоединиться к нашему открытому серверу",
   "Join_the_given_channel": "Присоединиться к этому каналу",
   "Joined": "участвовал",
   "Just_invited_people_can_access_this_channel": "Только приглашенные люди могут получить доступ к этому каналу",
@@ -398,7 +402,7 @@
   "No_threads": "Тредов нет",
   "No_threads_following": "Нет тредов, за которыми вы следите",
   "No_threads_unread": "Непрочитанных тредов нет",
-  "Not_RC_Server": "Это не сервер Rocket.Chat.\n{{contact}}",
+  "Not_RC_Server": "Свяжитесь с администратором вашего рабочего пространства или найдите в своей электронной почте приглашение в рабочее пространство Rocket.Chat.",
   "Nothing": "Ничего",
   "Nothing_to_save": "Нечего сохранять!",
   "Notification_Preferences": "Настройки уведомлений",
@@ -412,7 +416,6 @@
   "Omnichannel_queue": "Очередь Omnichannel",
   "On_hold_Livechats": "Omnichannel чаты на удержании",
   "Onboarding_agree_terms": "Продолжая вы соглашаетесь с правилами Rocket.Chat",
-  "Onboarding_join_open_description": "Присоединяйтесь к нашему открытому серверу, чтобы пообщаться с командой и сообществом Rocket.Chat.",
   "Onboarding_less_options": "Меньше опций",
   "Onboarding_more_options": "Больше опций",
   "Onboarding_subtitle": "За пределами Командного Взаимодействия",
@@ -662,7 +665,8 @@
   "What_are_you_doing_right_now": "Что вы делаете сейчас?",
   "Whats_the_password_for_your_certificate": "Какой пароль для вашего сертификата?",
   "Without_Servers": "Без серверов",
-  "Workspace_URL_Example": "Например, your-company.rocket.chat",
+  "Workspace_URL": "URL рабочего пространства",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "Серверы",
   "Would_like_to_place_on_hold": "Вы хотите поставить этот чат на удержание?",
   "Would_you_like_to_return_the_inquiry": "Вы хотите отозвать запрос?",
@@ -680,6 +684,7 @@
   "You_are_leaving_the_team": "Вы покидаете Команду '{{team}}'",
   "You_can_search_using_RegExp_eg": "Вы можете выполнить поиск с помощью регулярных выражений, например `/^text$/i`",
   "You_colon": "Вы: ",
+  "You_dont_have_account": "У вас нет аккаунта?",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Вам нужно получить доступ как минимум к одному серверу Rocket.Chat, чтобы поделиться чем-то.",
   "You_need_to_verifiy_your_email_address_to_get_notications": "Вам необходимо проверить ваш email адрес, чтобы получать уведомления",
   "you_were_mentioned": "вы были упомянуты",
diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json
index 94b6959bb4..1765eb3f44 100644
--- a/app/i18n/locales/sl-SI.json
+++ b/app/i18n/locales/sl-SI.json
@@ -17,6 +17,9 @@
   "Admin_Panel": "Administracijska plošča",
   "After_seconds_set_by_admin": "Po {{seconds}} sekundah (nastavil admin)",
   "Agent": "Agent",
+  "AirGapped_workspace_read_only_description": "Skupni skrbniki lahko obnovijo popolno funkcionalnost z povezovanjem z internetom ali nadgradnjo na premium načrt.",
+  "AirGapped_workspace_read_only_share_extension_title": "Deljenje je onemogočeno, ker je delovno okolje v načinu samo za branje.",
+  "AirGapped_workspace_read_only_title": "Delovno okolje v načinu samo za branje.",
   "Alert": "Opozorilo",
   "alert": "Opozorilo",
   "alerts": "opozorila",
@@ -25,11 +28,12 @@
   "All_users_in_the_channel_can_write_new_messages": "Vsi uporabniki v kanalu lahko napišejo nova sporočila",
   "All_users_in_the_team_can_write_new_messages": "Vsi uporabniki v kanalu lahko napišejo nova sporočila",
   "Allow_Reactions": "Dovolite reakcijo",
+  "Already_have_an_account": "Imate že račun?",
   "and": "in",
   "and_N_more": "in še {{count}}",
   "Announcement": "Obvestilo",
   "announcement": "obvestilo",
-  "Apply_Your_Certificate": "Uporabite svoje potrdilo",
+  "Apply_Certificate": "Uporabi certifikat",
   "ARCHIVE": "ARHIV",
   "archive": "arhiv",
   "are_typing": "pišejo",
@@ -149,7 +153,7 @@
   "Discussions": "Razprave",
   "Display": "Prikaz",
   "Displays_action_text": "Prikaže ukazno besedilo",
-  "Do_you_have_a_certificate": "Imate potrdilo?",
+  "Do_you_have_a_certificate": "Ali imate certifikat za ta delovni prostor?",
   "Do_you_have_an_account": "Imate račun?",
   "Do_you_really_want_to_key_this_room_question_mark": "Ali res želite {{key}} to sobo?",
   "Dont_activate": "Ne aktivirajte zdaj",
@@ -190,7 +194,6 @@
   "End_to_end_encrypted_room": "Obojestransko (E2E) šifrirane sobe",
   "Enter_E2EE_Password": "Vnesite geslo E2EE",
   "Enter_E2EE_Password_description": "Za dostop do vaših šifriranih kanalov in neposrednih sporočil vnesite svoje šifrirno geslo. To ni shranjeno na strežniku, zato ga boste morali uporabljati na vsaki napravi.",
-  "Enter_workspace_URL": "Vnesite URL delovnega prostora",
   "Error_Download_file": "Napaka med prenosom datoteke",
   "Error_uploading": "Napaka prenašanja",
   "error-action-not-allowed": "{{action}} ni dovoljena",
@@ -227,6 +230,7 @@
   "Forward_Chat": "Napredni klepet",
   "Forward_to_department": "Posreduj na oddelek",
   "Forward_to_user": "Posreduj uporabniku",
+  "Full_name": "Polno ime",
   "Full_table": "Kliknite za ogled celotne tabele",
   "Generate_New_Link": "Ustvari novo povezavo",
   "Get_help": "Pridobite pomoč",
@@ -246,6 +250,7 @@
   "Insert_Join_Code": "Vstavite kodo za pridružitev",
   "Invalid_or_expired_invite_token": "Neveljaven ali iztekel žeton povabila",
   "Invalid_server_version": "Strežnik, ki ga poskušate povezati, uporablja različico, ki je aplikacija ne podpira več: {{currentVersion}}.\n\nZahtevamo različico {{minVersion}}",
+  "Invalid_workspace_URL": "Neveljaven URL delovnega prostora",
   "Invisible": "Neviden",
   "Invite_Link": "Povezava povabila",
   "Invite_user_to_join_channel": "Povabi uporabnika, da se pridruži kanalu",
@@ -256,7 +261,6 @@
   "is_typing": "piše",
   "Join": "Pridružite se",
   "Join_Code": "Pridružite se kodi",
-  "Join_our_open_workspace": "Pridružite se našemu odprtemu delovnemu prostoru",
   "Join_the_given_channel": "Pridružite se določenemu kanalu",
   "Just_invited_people_can_access_this_channel": "Do tega kanala lahko dostopajo samo povabljeni",
   "Just_invited_people_can_access_this_team": "Samo povabljeni ljudje lahko dostopajo do te ekipe",
@@ -379,7 +383,7 @@
   "No_threads": "Ni niti",
   "No_threads_following": "Ne spremljate nobenih niti",
   "No_threads_unread": "Ni neprebranih niti",
-  "Not_RC_Server": "To ni Rocket.Chat Server.\n{{contact}}",
+  "Not_RC_Server": "Stopite v stik s skrbnikom delovnega prostora ali v mapi prejetih sporočil poiščite povabilo v delovni prostor Rocket.Chat.",
   "Nothing": "Nič",
   "Nothing_to_save": "Nič za shraniti!",
   "Notification_Preferences": "Nastavitve obvestila",
@@ -393,7 +397,6 @@
   "Omnichannel_queue": "Čakalna vrsta omnichannel",
   "On_hold_Livechats": "Odrpt klepet na čakanju",
   "Onboarding_agree_terms": "Z nadaljevanjem se strinjate z Rocket.Chat",
-  "Onboarding_join_open_description": "Pridružite se našemu odprtemu delovnemu prostoru, da klepetate z ekipo in skupnostjo Rocket.Chat.",
   "Onboarding_less_options": "Manj možnosti",
   "Onboarding_more_options": "Več možnosti",
   "Onboarding_subtitle": "Izven ekipnega sodelovanja",
@@ -628,7 +631,8 @@
   "What_are_you_doing_right_now": "Kaj počneš v tem trenutku?",
   "Whats_the_password_for_your_certificate": "Kakšno je geslo za vaše potrdilo?",
   "Without_Servers": "Brez strežnikov",
-  "Workspace_URL_Example": "Npr. your-company.rocket.chat",
+  "Workspace_URL": "URL delovnega prostora",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "Delovni prostori",
   "Would_like_to_place_on_hold": "Bi radi ta klepet postavili na \"pridržan\"?",
   "Would_you_like_to_return_the_inquiry": "Želite zavrniti povpraševanje?",
@@ -646,6 +650,7 @@
   "You_are_leaving_the_team": "Zapuščate ekipo '{{team}}'",
   "You_can_search_using_RegExp_eg": "Lahko iščete s pomočjo RegExp. npr. `/^text$/i`",
   "You_colon": "Vi:",
+  "You_dont_have_account": "Nimate računa?",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Če želite nekaj deliti, morate dostopati do vsaj enega strežnika Rocket.Chat.",
   "You_need_to_verifiy_your_email_address_to_get_notications": "Če želite prejemati obvestila, potrdite svoj e-poštni naslov",
   "you_were_mentioned": "Bili ste omenjeni",
diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json
index 38acee28f1..56ddfcf985 100644
--- a/app/i18n/locales/sv.json
+++ b/app/i18n/locales/sv.json
@@ -20,6 +20,9 @@
   "Admin_Panel": "Administratörspanel",
   "After_seconds_set_by_admin": "Efter {{seconds}} sekunder (anges av administratören)",
   "Agent": "Agent",
+  "AirGapped_workspace_read_only_description": "Administratörer kan återställa full funktionalitet genom att ansluta den till internet eller uppgradera till en premiumplan.",
+  "AirGapped_workspace_read_only_share_extension_title": "Delning är inaktiverat eftersom arbetsytan är i skrivskyddat läge.",
+  "AirGapped_workspace_read_only_title": "Arbetsytan är i skrivskyddat läge.",
   "Alert": "Varning",
   "alert": "varning",
   "alerts": "varningar",
@@ -28,12 +31,13 @@
   "All_users_in_the_channel_can_write_new_messages": "Alla användare i kanalen kan skriva nya meddelanden",
   "All_users_in_the_team_can_write_new_messages": "Alla användare i teamet kan skriva nya meddelanden",
   "Allow_Reactions": "Tillåt reaktioner",
+  "Already_have_an_account": "Har du redan ett konto?",
   "Also_send_thread_message_to_channel_behavior": "Skicka även trådmeddelande till kanalen",
   "and": "och",
   "and_N_more": "och ytterligare {{count}}",
   "Announcement": "Meddelande",
   "announcement": "meddelande",
-  "Apply_Your_Certificate": "Tillämpa certifikatet",
+  "Apply_Certificate": "Tillämpa certifikat",
   "ARCHIVE": "ARKIV",
   "archive": "arkiv",
   "are_typing": "skriver",
@@ -172,7 +176,7 @@
   "Discussions": "Diskussioner",
   "Display": "Visa",
   "Displays_action_text": "Visar åtgärdstext",
-  "Do_you_have_a_certificate": "Har du ett certifikat?",
+  "Do_you_have_a_certificate": "Har du ett certifikat för denna arbetsyta?",
   "Do_you_have_an_account": "Har du ett konto?",
   "Do_you_really_want_to_key_this_room_question_mark": "Vill du verkligen {{key}} rummet?",
   "Dont_activate": "Aktivera inte nu",
@@ -214,7 +218,6 @@
   "End_to_end_encrypted_room": "End-to-end-krypterat rum",
   "Enter_E2EE_Password": "Ange E2EE-lösenord",
   "Enter_E2EE_Password_description": "För att komma åt dina krypterade kanaler och direkta meddelanden, ange ditt krypteringslösenord. Detta lagras inte på servern, så du måste använda det på varje enhet.",
-  "Enter_workspace_URL": "Ange arbetsytans URL",
   "Error_Download_file": "Fel vid nedladdning av fil",
   "Error_uploading": "Fel vid uppladdning",
   "error-action-not-allowed": "{{action}} tillåts inte",
@@ -251,6 +254,7 @@
   "Forward_Chat": "Vidarebefordra chatt",
   "Forward_to_department": "Vidarebefordra till avdelning",
   "Forward_to_user": "Vidarebefordra till användare",
+  "Full_name": "Fullständigt namn",
   "Full_table": "Klicka för att visa hela tabellen",
   "Generate_New_Link": "Generera ny länk",
   "Get_help": "Få hjälp",
@@ -271,6 +275,7 @@
   "Insert_Join_Code": "Ange anslutningskoden",
   "Invalid_or_expired_invite_token": "Ogiltig eller utgången inbjudningstoken",
   "Invalid_server_version": "Den server du försöker ansluta till använder en version som appen inte har stöd för längre: {{currentVersion}}.\n\nDu måste ha version {{minVersion}}",
+  "Invalid_workspace_URL": "Ogiltig arbetsytas URL",
   "Invisible": "Dold",
   "Invite_Link": "Inbjudningslänk",
   "Invite_user_to_join_channel": "Bjud in en användare till att ansluta till denna kanal.",
@@ -281,7 +286,6 @@
   "is_typing": "skriver",
   "Join": "Gå med",
   "Join_Code": "Anslutningskod",
-  "Join_our_open_workspace": "Anslut till vår öppna arbetsyta",
   "Join_the_given_channel": "Gå med i den givna kanalen",
   "Joined": "Anslöt",
   "Just_invited_people_can_access_this_channel": "Endast inbjudna har åtkomst till den här kanalen",
@@ -407,7 +411,7 @@
   "No_threads": "Det finns inga trådar",
   "No_threads_following": "Du följer inte några trådar",
   "No_threads_unread": "Det finns inga olästa trådar",
-  "Not_RC_Server": "Det här är inte en Rocket.Chat-server.\n{{contact}}",
+  "Not_RC_Server": "Kontakta din arbetsytas administratör eller sök i din e-postinkorg efter en Rocket.Chat-arbetsyteinbjudan.",
   "Nothing": "Ingenting",
   "Nothing_to_save": "Ingenting att spara.",
   "Notification_Preferences": "Inställningar för meddelanden",
@@ -421,7 +425,6 @@
   "Omnichannel_queue": "Omnichannel-kö",
   "On_hold_Livechats": "Parkerade Omnichannel-chattar",
   "Onboarding_agree_terms": "Genom att fortsätta anses du ha godkänt Rocket.Chat",
-  "Onboarding_join_open_description": "Anslut till vår öppna arbetsyta där du kan chatta med Rocket.Chats team och community.",
   "Onboarding_less_options": "Färre alternativ",
   "Onboarding_more_options": "Fler alternativ",
   "Onboarding_subtitle": "Mer än teamsamarbete",
@@ -692,7 +695,8 @@
   "What_are_you_doing_right_now": "Vad gör du just nu?",
   "Whats_the_password_for_your_certificate": "Ange lösenordet för certifikatet.",
   "Without_Servers": "Utan servrar",
-  "Workspace_URL_Example": "Till exempel ditt-foretag.rocket.chat",
+  "Workspace_URL": "Arbetsytans URL",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "Arbetsytor",
   "Would_like_to_place_on_hold": "Vill du parkera chatten?",
   "Would_you_like_to_return_the_inquiry": "Vill du skicka tillbaka förfrågan?",
@@ -710,6 +714,7 @@
   "You_are_leaving_the_team": "Du lämnar teamet {{team}}",
   "You_can_search_using_RegExp_eg": "Du kan använda reguljära uttryck, till exempel /^text$/i",
   "You_colon": "Du:",
+  "You_dont_have_account": "Har du inget konto?",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Du behöver åtkomst till åtminstone en Rocket.Chat-server för att kunna dela.",
   "You_need_to_verifiy_your_email_address_to_get_notications": "Du måste bekräfta din e-postadress för att få meddelanden",
   "you_were_mentioned": "du nämndes",
diff --git a/app/i18n/locales/ta-IN.json b/app/i18n/locales/ta-IN.json
index 9c115a4790..9b1a29040f 100644
--- a/app/i18n/locales/ta-IN.json
+++ b/app/i18n/locales/ta-IN.json
@@ -27,6 +27,9 @@
   "admin-video-conf-provider-not-configured-header": "காந்ஃபரன்ஸ் கால் கொள்ளை இயக்கப்படவில்லை",
   "After_seconds_set_by_admin": "{{seconds}} வினாடிகளில் (நிர்வாகி அமைத்தார்)",
   "Agent": "ஏஜென்ட்",
+  "AirGapped_workspace_read_only_description": "அடுத்தவர்களை இணையத்துடன் இணைத்து அல்லது பிரீமியம் திட்டத்திற்கு மேம்படுத்துவதன் மூலம் முழு செயல்திறனை மீட்டெடுக்கலாம்.",
+  "AirGapped_workspace_read_only_share_extension_title": "பகிர்வு முடக்கப்பட்டுள்ளது, ஏனெனில் வேலைப்பாடு படிக்க மட்டுமே சுருக்கமாக உள்ளது.",
+  "AirGapped_workspace_read_only_title": "தற்காலிகமாகவே படிக்கக்கூடிய சூழலில் உள்ள வேலைப்பாடு.",
   "Alert": "எச்சரிக்கை",
   "alert": "எச்சரிக்கை",
   "alerts": "எச்சரிக்கைகள்",
@@ -35,12 +38,13 @@
   "All_users_in_the_channel_can_write_new_messages": "சேனலில் உள்ள அனைத்து பயனாளர்களும் புதிய செய்திகளையும் எழுதலாம்",
   "All_users_in_the_team_can_write_new_messages": "குழுவில் உள்ள அனைத்து பயனாளர்களும் புதிய செய்திகளையும் எழுதலாம்",
   "Allow_Reactions": "பின்னால் பதில் செய்துள்ளலை அனுமதி கொண்டுள்ளது",
+  "Already_have_an_account": "ஊருக்குள் உங்கள் கணக்கு இருக்கிறதா?",
   "Also_send_thread_message_to_channel_behavior": "உறுதிப்படுத்த செய்தி சேனலுக்கும் அனுப்புவது",
   "and": "மற்றும்",
   "and_N_more": "மற்றும் {{count}} க்கும் மேல்",
   "Announcement": "அறிவிப்பு",
   "announcement": "அறிவிப்பு",
-  "Apply_Your_Certificate": "உங்கள் சான்றிதழை பயன்படுத்தவும்",
+  "Apply_Certificate": "சான்றிதழைப் பயன்படுத்துங்கள்",
   "ARCHIVE": "சேமி",
   "archive": "சேமி",
   "are_typing": "எழுதுதல் நடந்துள்ளது",
@@ -192,7 +196,7 @@
   "Discussion_name": "உரையாடல் பெயர்",
   "Discussions": "உரையாடல்கள்",
   "Display": "காட்சி",
-  "Do_you_have_a_certificate": "உங்களுக்கு ஒரு சான்றிதழ் உள்ளதுஇல்லையா?",
+  "Do_you_have_a_certificate": "இந்த வேலைத்தளத்திற்கு சான்றிதழ் உண்டா?",
   "Do_you_have_an_account": "உங்களுக்கு ஒரு கணக்கு உள்ளதுஇல்லையா?",
   "Do_you_really_want_to_key_this_room_question_mark": "நீங்கள் உறுதியாகவே {{key}} இந்த அறையை விரும்புகின்றீர்களா?",
   "Dont_activate": "இப்போது செயல்படுத்த விரும்பாதே",
@@ -235,7 +239,6 @@
   "End_to_end_encrypted_room": "குறிபாக என்று என்கிரிப்டுக்கப்பட்ட அறை",
   "Enter_E2EE_Password": "E2EE கடவுச்சொல் உள்ளிடவும்",
   "Enter_E2EE_Password_description": "உங்கள் என்கிரிப்ட் செய்யப்பட்ட சேனல்கள் மற்றும் நேரடி செய்திகளை அணுக, உங்கள் என்கிரிப்ஷன் கடவுச்சொல்லை உள்ளிடவும். இது சர்வரில் சேமிக்கப்படாது, எனவே நீங்கள் ஒவ்வொரு சாதனத்திலும் இதை பயன்படுத்த வேண்டும்.",
-  "Enter_workspace_URL": "பணியிடல் இடைக்கு உள்ளூர் URL ஐ உள்ளிடவும்",
   "Error_Download_file": "கோப்பு பதிவிறக்கம் செய்யும் போது பிழை",
   "Error_uploading": "பதிவேற்றுதல் பிழை",
   "error-action-not-allowed": "{{action}} அனுமதி இல்லை",
@@ -274,6 +277,7 @@
   "Forward_message": "சென்றுகொள் செய்தி",
   "Forward_to_department": "பிரிவுக்கு முன்னேற்று",
   "Forward_to_user": "பயனருக்கு முன்னேற்று",
+  "Full_name": "முழு பெயர்",
   "Full_table": "முழு அட்டவணையைக் காண கிளிக் செய்க",
   "Generate_New_Link": "புதிய இணைப்பை உருவாக்கு",
   "Get_help": "உதவி பெறுங்கள்",
@@ -297,6 +301,7 @@
   "Insert_Join_Code": "சேர்ந்த குறியீடை உள்ளிடவும்",
   "Invalid_or_expired_invite_token": "தவறான அல்லது காலாவதி அழைப்பு டோக்கன்",
   "Invalid_server_version": "நீங்கள் இணைக்க முயற்சிக்கின்றீர்கள் பயன்பாட்டை ஆதரிக்காத பதிப்புக்கு உள்ள வெளிப்புற படைப்புக்கு உபயோகிக்கிற பேனல்: {{currentVersion}}.\n\nஎங்களுக்கு பதிப்பு தேவைப்படுகின்றது {{minVersion}}",
+  "Invalid_workspace_URL": "தவறான வேலைத்தள URL",
   "Invisible": "தெரியாதது",
   "Invite_Link": "அழைப்பு இணைப்பு",
   "Invite_users": "பயனர்களை அழை",
@@ -308,7 +313,6 @@
   "Jitsi_may_require_authentication": "ஜிட்சி அங்கத்திற்கு அங்கீகாரம் தேவைப்படக்கூடும்",
   "Join": "சேர",
   "Join_Code": "சேர்ந்த குறியீடு",
-  "Join_our_open_workspace": "எங்கள் திறந்த அமைப்பில் சேருங்கள்",
   "Joined": "சேர்ந்தன",
   "Just_invited_people_can_access_this_channel": "எந்தவொரு அழைப்பவரும் இந்த சேனலுக்கு அணுகலாம்",
   "Just_invited_people_can_access_this_team": "எந்தவொரு அழைப்பவரும் இந்த அணுகும் குழுக்கு அணுகலாம்",
@@ -441,7 +445,7 @@
   "no-active-video-conf-provider-header": "காந்ஃபரன்ஸ் கால் கொள்ளை இயக்கப்படவில்லை",
   "no-videoconf-provider-app-body": "காந்ஃபரன்ஸ் கால் கொள்ளை பயன்பாடுகள் காரிகள் ஆட்சேர்க்கின்ற களைக் கொண்டு இருக்கலாம்.",
   "no-videoconf-provider-app-header": "காந்ஃபரன்ஸ் கால் கொள்ளை கிடைக்கவில்லை",
-  "Not_RC_Server": "இது ஒரு Rocket.Chat பணி பரிந்துரை இடம் அல்ல.\n{{contact}}",
+  "Not_RC_Server": "உங்கள் வேலைத்தள நிர்வாகியை தொடர்பு கொள்ளுங்கள் அல்லது உங்கள் மின்னஞ்சல் உள்ளபெட்டியில் Rocket.Chat வேலைத்தள அழைப்பைத் தேடுங்கள்.",
   "Nothing": "எதுவும் இல்லை",
   "Nothing_to_save": "சேமிக்க எதுவும் இல்லை!",
   "Notification_Preferences": "அறிவிப்பு விருப்பங்கள்",
@@ -456,7 +460,6 @@
   "Omnichannel_queue": "ஆன்மிக்கேனல் கேடு",
   "On_hold_Livechats": "ஆன்மிக்கேனல் உரையாடல்கள் அழிந்துகொண்டுள்ளன",
   "Onboarding_agree_terms": "தொடருவதற்கு, நீங்கள் ராக்கெட்.சேட் உடன் ஒப்புத்தல் அளிக்கின்றீர்கள்",
-  "Onboarding_join_open_description": "எங்கள் திறந்த அமைப்பில் சேரவும் ராக்கெட்.சேட் குழுமம் மற்றும் சமுதாயத்துடன் உரையாட",
   "Onboarding_less_options": "குறைந்த விருப்பங்கள்",
   "Onboarding_more_options": "மேலும் விருப்பங்கள்",
   "Onboarding_subtitle": "குழு இணையத்திற்கு மேல்",
@@ -732,7 +735,8 @@
   "Wi_Fi": "Wi-Fi",
   "Wi_Fi_and_mobile_data": "Wi-Fi மற்றும் கைபேசி தரவு",
   "Without_Servers": "பணிகளில் இல்லை",
-  "Workspace_URL_Example": "எக்ஸாம். உங்கள்-கம்பெனி. ராக்கெட்.சேட்",
+  "Workspace_URL": "வேலைத்தள URL",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "பணிகள்",
   "Would_like_to_place_on_hold": "இந்த உரையாடலை அழிக்க விரும்புகிறீர்களா?",
   "Would_you_like_to_return_the_inquiry": "கேட்கையை பின்கொள்ள விரும்புகிறீர்களா?",
@@ -750,6 +754,7 @@
   "You_are_leaving_the_team": "நீங்கள் குழுவினை விடுகின்றீர்கள் '{{team}}'",
   "You_can_search_using_RegExp_eg": "RegExp ஐப் பயன்படுத்தவும். உதாரணமாக `/^text$/i`",
   "You_colon": "நீங்கள்: ",
+  "You_dont_have_account": "உங்களிடம் கணக்கு இல்லை என்றா?",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "ஏதேனும் பகிர்ந்து கொள்ள உங்களுக்கு குறைந்தது ஒரு Rocket.Chat பணியோடு கொண்டுள்ளது.",
   "You_need_to_verifiy_your_email_address_to_get_notications": "அறிவித்திருக்கும் உங்களுக்கு மின்னஞ்சல் முகவரியை சரிபார்க்க நீங்கள் உறுதிபடுத்த வேண்டும்",
   "you_were_mentioned": "உங்களுக்கு குறிக்கப்பட்டார்",
diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json
index 853d2d21e7..d0f065d623 100644
--- a/app/i18n/locales/te-IN.json
+++ b/app/i18n/locales/te-IN.json
@@ -27,6 +27,9 @@
   "admin-video-conf-provider-not-configured-header": "కాన్ఫరెన్స్ కాల్ అనేకంగా లేదు",
   "After_seconds_set_by_admin": "అడ్మిన్ ద్వారా సెట్ చేయబడిన {{seconds}} సెకన్లలో",
   "Agent": "ఏజెంట్",
+  "AirGapped_workspace_read_only_description": "నిర్వహకులు దీన్ని ఇంటర్నెట్‌తో కలుపుకోవడం లేదా ప్రీమియం ప్రణాళికకు మెరుగుపరచడం ద్వారా పూర్తి ఫంక్షనాలిటీని పునఃస్థాపించవచ్చు.",
+  "AirGapped_workspace_read_only_share_extension_title": "జోడించడం నిలిపివేయబడింది, ఎందుకంటే పనికోసం చదివే స్ధితిలో ఉంది.",
+  "AirGapped_workspace_read_only_title": "అయోమయ స్థితిలో ఉన్న పనికోసం.",
   "Alert": "హెచ్చరిక",
   "alert": "హెచ్చరిక",
   "alerts": "హెచ్చరికలు",
@@ -35,12 +38,13 @@
   "All_users_in_the_channel_can_write_new_messages": "చానల్లో ఉన్న అన్ని వాడుకలు కొత్త సందేశాలను రాయగలరు",
   "All_users_in_the_team_can_write_new_messages": "జట్టులో ఉన్న అన్ని వాడుకలు కొత్త సందేశాలను రాయగలరు",
   "Allow_Reactions": "ప్రతిక్రియలను అనుమతించండి",
+  "Already_have_an_account": "మీకు ఇప్పటికే ఖాతా ఉందా?",
   "Also_send_thread_message_to_channel_behavior": "చానల్‌కు థ్రెడ్ సందేశాన్ని కూడా పంపండి",
   "and": "మరియు",
   "and_N_more": "మరింత {{count}}",
   "Announcement": "ప్రకటన",
   "announcement": "ప్రకటన",
-  "Apply_Your_Certificate": "మీ సర్టిఫికేట్‌ను వర్తించండి",
+  "Apply_Certificate": "సర్టిఫికేట్‌ని వర్తింపజేయండి",
   "ARCHIVE": "ఆర్కైవ్",
   "archive": "ఆర్కైవ్",
   "are_typing": "రాయడం",
@@ -192,7 +196,7 @@
   "Discussion_name": "చర్చ పేరు",
   "Discussions": "చర్చలు",
   "Display": "ప్రదర్శించు",
-  "Do_you_have_a_certificate": "మీకు సర్టిఫికేట్ ఉందా?",
+  "Do_you_have_a_certificate": "ఈ వర్క్‌స్పేస్‌కు సర్టిఫికేట్ ఉందా?",
   "Do_you_have_an_account": "మీకు ఖాతా ఉందా?",
   "Do_you_really_want_to_key_this_room_question_mark": "మీరు ఖచ్చితంగా {{key}} ఈ కొరకుని తెచ్చాలా?",
   "Dont_activate": "ఇప్పుడే సక్రియపరచడం లేదు",
@@ -235,7 +239,6 @@
   "End_to_end_encrypted_room": "ఎండ్ టు ఎండ్ ఎన్క్రిప్టెడ్ రూం",
   "Enter_E2EE_Password": "E2EE పాస్‌వర్డ్ నమోదు చేయండి",
   "Enter_E2EE_Password_description": "మీ ఎన్క్రిప్టెడ్ ఛానెల్స్ మరియు డైరెక్ట్ మెసేజెస్‌ను యాక్సెస్ చేయడానికి, మీ ఎన్క్రిప్షన్ పాస్‌వర్డ్‌ను నమోదు చేయండి. ఇది సర్వర్‌లో నిల్వ చేయబడదు, కాబట్టి మీరు ప్రతి పరికరంపై దీనిని ఉపయోగించాలి.",
-  "Enter_workspace_URL": "పనిముటు URL నమోదు చేయండి",
   "Error_Download_file": "ఫైల్ డౌన్‌లోడ్ చేస్తున్నప్పుడు తప్పిబాటు",
   "Error_uploading": "అప్‌లోడ్ లోపం",
   "error-action-not-allowed": "{{action}} అనుమతించబడినది కాదు",
@@ -274,6 +277,7 @@
   "Forward_message": "సందేశాన్ని ముందుకు పంపు",
   "Forward_to_department": "శాఖకు అగ్రగామించండి",
   "Forward_to_user": "వాడికి అగ్రగామించండి",
+  "Full_name": "పూర్తి పేరు",
   "Full_table": "పూర్తి పటం చూడండి కొరకు క్లిక్ చేయండి",
   "Generate_New_Link": "కొత్త లింక్‌ను రూపొందించండి",
   "Get_help": "సహాయం పొందండి",
@@ -297,6 +301,7 @@
   "Insert_Join_Code": "చేరండి కోడ్ చేరించండి",
   "Invalid_or_expired_invite_token": "అమాయక లేదా అవధిచుక్తాయిన అమర్పు టోకెన్",
   "Invalid_server_version": "మీరు కనెక్ట్ చేయడానికి ప్రయాసిస్తున్న వర్క్‌స్పేస్ యొక్క ఒక అవసరం లేదు: {{currentVersion}}.\n\nమేము వినియోగించే అప్లికేషన్ యొక్క ఆవశ్యకానికి అయితే మేము అవసరం ఉన్న సంస్కరణం: {{minVersion}}",
+  "Invalid_workspace_URL": "చెల్లని వర్క్‌స్పేస్ URL",
   "Invisible": "కనిపించదు",
   "Invite_Link": "ఆమంత్రణ లింక్",
   "Invite_users": "వాడికి ఆమంత్రణం పంపండి",
@@ -308,7 +313,6 @@
   "Jitsi_may_require_authentication": "Jitsi పరిశోధన అవసరం ఉండవచ్చు",
   "Join": "చేరండి",
   "Join_Code": "చేరండి కోడ్",
-  "Join_our_open_workspace": "మా తెరాసిని చేరండి",
   "Joined": "చేరారు",
   "Just_invited_people_can_access_this_channel": "కేవలం ఆమంత్రణపెట్టబడిన వారు ఈ ఛానల్‌కు ప్రవేశించవచ్చు",
   "Just_invited_people_can_access_this_team": "కేవలం ఆమంత్రణపెట్టబడిన వారు ఈ టీమ్‌కు ప్రవేశించవచ్చు",
@@ -441,7 +445,7 @@
   "no-active-video-conf-provider-header": "కాన్ఫరెన్స్ కాల్ అనేకంగా లేదు",
   "no-videoconf-provider-app-body": "వార్క్‌స్పేస్ అడ్మిన్ ద్వారా రాకెట్.చాట్ మార్కెట్‌లో కాన్ఫరెన్స్ కాల్ యాప్స్ ఇన్స్టాల్ చేయవచ్చు.",
   "no-videoconf-provider-app-header": "కాన్ఫరెన్స్ కాల్ అంగడి లేదు",
-  "Not_RC_Server": "ఇది రాకెట్.చాట్ వర్క్‌స్పేస్ కాదు.\n{{contact}}",
+  "Not_RC_Server": "మీ వర్క్‌స్పేస్ అడ్మిన్‌ను సంప్రదించండి లేదా Rocket.Chat వర్క్‌స్పేస్ ఆహ్వానానికి మీ ఇమెయిల్ ఇన్‌బాక్స్‌ని శోధించండి.",
   "Nothing": "ఏదో కాదు",
   "Nothing_to_save": "ఉంది ఏమి సేవ్ చేయాలేదు!",
   "Notification_Preferences": "నోటిఫికేషన్ అభిరుచులు",
@@ -456,7 +460,6 @@
   "Omnichannel_queue": "ఆమ్నిచానల్ క్యూ",
   "On_hold_Livechats": "ఆఫ్‌లోడ్ లోని లైవ్చాట్‌లు",
   "Onboarding_agree_terms": "కొనసాగండి, మీరు రాకెట్.చాట్ అంగీకరిస్తున్నారు",
-  "Onboarding_join_open_description": "రాకెట్.చాట్ ఛానల్ మరియు సముదాయంతో చాట్ చేయడానికి మా ఆకృతిని చేరండి.",
   "Onboarding_less_options": "తక్కువ ఎంపికలు",
   "Onboarding_more_options": "మరికొన్ని ఎంపికలు",
   "Onboarding_subtitle": "దల సహయాకాంక్ష",
@@ -732,7 +735,8 @@
   "Wi_Fi": "Wi-Fi",
   "Wi_Fi_and_mobile_data": "Wi-Fi మరియు మొబైల్ డేటా",
   "Without_Servers": "పనితనం లేదా",
-  "Workspace_URL_Example": "ఉదా. మీ-కంపెనీ.rocket.chat",
+  "Workspace_URL": "వర్క్‌స్పేస్ URL",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "పనితనాలు",
   "Would_like_to_place_on_hold": "ఈ చాట్‌ను ఆఫ్‌లోడ్ చేయాలా?",
   "Would_you_like_to_return_the_inquiry": "మీరు ప్రశ్నను వీక్షించాలా?",
@@ -750,6 +754,7 @@
   "You_are_leaving_the_team": "మీరు టీమ్ '{{team}}' ను విడిచిపోతున్నారు",
   "You_can_search_using_RegExp_eg": "మీరు RegExp ఉపయోగించవచ్చు. ఉదా. `/^text$/i`",
   "You_colon": "మీరు: ",
+  "You_dont_have_account": "మీ వద్ద ఖాతా లేదు?",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "ఏదిగానా ఏక Rocket.Chat వర్క్‌స్పేస్‌కి ప్రవేశించాలి కాబట్టి ఏదైనా షేర్ చేయడానికి.",
   "You_need_to_verifiy_your_email_address_to_get_notications": "నోటిఫికేషన్‌లు పొందడానికి మీ ఇమెయిల్ చిరునామాని ధ్యానలోకి పెంచాలి",
   "you_were_mentioned": "మీరు పేర్కొనబడింది",
diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json
index e7c446590a..2bafd73327 100644
--- a/app/i18n/locales/tr.json
+++ b/app/i18n/locales/tr.json
@@ -10,6 +10,9 @@
   "Admin_Panel": "Yönetim Paneli",
   "After_seconds_set_by_admin": "{{seconds}} saniye sonra (yönetici tarafından belirlenir)",
   "Agent": "Temsilci",
+  "AirGapped_workspace_read_only_description": "Yöneticiler, bunu internete bağlayarak veya premium bir plana yükselterek tam işlevselliği geri kazanabilirler.",
+  "AirGapped_workspace_read_only_share_extension_title": "Paylaşım, çalışma alanı yalnızca okunur modda olduğu için devre dışı bırakıldı.",
+  "AirGapped_workspace_read_only_title": "Çalışma alanı yalnızca okunur modda.",
   "Alert": "Uyarı",
   "alert": "uyarı",
   "alerts": "uyarılar",
@@ -17,11 +20,12 @@
   "All_Messages": "Tüm İletiler",
   "All_users_in_the_channel_can_write_new_messages": "Kanaldaki tüm kullanıcılar yeni ileti yazabilir!",
   "Allow_Reactions": "Tüm Tepkiler",
+  "Already_have_an_account": "Zaten bir hesabınız var mı?",
   "and": "ve",
   "and_N_more": "ve {{count}} daha",
   "Announcement": "Duyuru",
   "announcement": "duyuru",
-  "Apply_Your_Certificate": "Sertifikanızı Onaylayın",
+  "Apply_Certificate": "Sertifika uygula",
   "ARCHIVE": "ARŞİVLE",
   "archive": "arşivle",
   "are_typing": "yazıyor",
@@ -107,7 +111,7 @@
   "Discussion_name": "Tartışma adı",
   "Discussions": "Tartışmalar",
   "Displays_action_text": "Görüntüler aksiyon metni",
-  "Do_you_have_a_certificate": "Sertifikanız var mı?",
+  "Do_you_have_a_certificate": "Bu çalışma alanı için bir sertifikanız var mı?",
   "Do_you_have_an_account": "Hesabın var mı?",
   "Do_you_really_want_to_key_this_room_question_mark": "Bu odayı gerçekten {{key}} istiyor musun?",
   "Dont_activate": "Şimdi etkinleştirme",
@@ -145,7 +149,6 @@
   "End_to_end_encrypted_room": "Uçtan uca şifreli oda",
   "Enter_E2EE_Password": "E2EE Şifresini Girin",
   "Enter_E2EE_Password_description": "Şifreli kanallarınıza ve doğrudan mesajlarınıza erişmek için şifreleme şifrenizi girin. Bu, sunucuda saklanmaz, bu nedenle her cihazda kullanmanız gerekir.",
-  "Enter_workspace_URL": "Çalışma alanı URL'nizi girin",
   "Error_uploading": "Yükleme hatası",
   "error-action-not-allowed": "{{action}}'a izin verilmiyor!",
   "error-avatar-invalid-url": "Geçersiz avatar URL'si: {{url}}",
@@ -176,6 +179,7 @@
   "Forward_Chat": "Sohbete İlet",
   "Forward_to_department": "Bölüme İlet",
   "Forward_to_user": "Kullanıcıya İlet",
+  "Full_name": "Tam ad",
   "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",
@@ -194,6 +198,7 @@
   "Insert_Join_Code": "Katılım Kodu Girin",
   "Invalid_or_expired_invite_token": "Geçersiz veya süresi dolmuş davet belirteci (token)",
   "Invalid_server_version": "Bağlanmaya çalıştığınız sunucu artık uygulama tarafından desteklenmeyen bir sürüm kullanıyor: {{currentVersion}}.\n\n{{minVersion}} sürümüne ihtiyacımız var",
+  "Invalid_workspace_URL": "Geçersiz çalışma alanı URL'si",
   "Invisible": "Görünmez",
   "Invite_Link": "Davet Bağlantısı",
   "Invite_user_to_join_channel": "Bu kanala katılması için bir kullanıcı davet",
@@ -204,7 +209,6 @@
   "is_typing": "yazıyor",
   "Join": "Katıl",
   "Join_Code": "Katılım Kodu",
-  "Join_our_open_workspace": "Açık çalışma alanımıza katılın",
   "Join_the_given_channel": "Verilen kanala katıl",
   "Just_invited_people_can_access_this_channel": "Yalnızca davet edilen kişiler bu kanala erişebilir",
   "Language": "Dil",
@@ -294,7 +298,7 @@
   "No_threads": "Konu yok",
   "No_threads_following": "Herhangi bir konuyu takip etmiyorsunuz",
   "No_threads_unread": "Okunmamış konu yok",
-  "Not_RC_Server": "Bu bir Rocket.Chat sunucusu değil.\n{{contact}}",
+  "Not_RC_Server": "Çalışma alanı yöneticinizle iletişime geçin veya e-posta gelen kutunuzda bir Rocket.Chat çalışma alanı daveti arayın.",
   "Nothing": "Hiçbir Şey",
   "Nothing_to_save": "Kaydedilecek bir şey yok!",
   "Notification_Preferences": "Bildirim Tercihleri",
@@ -304,7 +308,6 @@
   "Omnichannel": "Çoklu Kanal",
   "Omnichannel_enable_alert": "Çoklu Kanal'da mevcut değilsiniz. Erişilebilir olmak ister misiniz?",
   "Onboarding_agree_terms": "Devam ederek Rocket.Chat'i kabul etmiş olursunuz",
-  "Onboarding_join_open_description": "Rocket.Chat ekibi ve topluluğu ile sohbet etmek için açık çalışma alanımıza katılın.",
   "Onboarding_less_options": "Daha az seçenek",
   "Onboarding_more_options": "Daha çok seçenek",
   "Onboarding_subtitle": "Ekip İşbirliğinin Ötesinde",
@@ -503,7 +506,8 @@
   "What_are_you_doing_right_now": "Şu an ne yapıyorsun?",
   "Whats_the_password_for_your_certificate": "Sertifikanızın şifresi nedir?",
   "Without_Servers": "Sunucusuz",
-  "Workspace_URL_Example": "Örn. sirketiniz.rocket.chat",
+  "Workspace_URL": "Çalışma Alanı URL'si",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "Çalışma alanları",
   "Would_you_like_to_return_the_inquiry": "Başvuruyu geri çevirmek ister misiniz?",
   "Write_External_Permission": "Galeri İzni",
@@ -517,6 +521,7 @@
   "You_are_in_preview_mode": "İzleme modundasınız",
   "You_can_search_using_RegExp_eg": "Düzenli ifadeleri (Regular Expressions) kullanabilirsiniz. Örneğin: `/^text$/i`",
   "You_colon": "Siz: ",
+  "You_dont_have_account": "Hesabınız yok mu?",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "Bir şeyler paylaşmak için Rocket.Chat sunucusuna erişmeniz gerekir.",
   "You_need_to_verifiy_your_email_address_to_get_notications": "Bildirim almak için e-posta adresinizi doğrulamanız gerekiyor",
   "you_were_mentioned": "senden bahsedildi",
diff --git a/app/i18n/locales/zh-CN.json b/app/i18n/locales/zh-CN.json
index b79a5d164c..23902c7f78 100644
--- a/app/i18n/locales/zh-CN.json
+++ b/app/i18n/locales/zh-CN.json
@@ -10,6 +10,9 @@
   "Admin_Panel": "仪表板",
   "After_seconds_set_by_admin": "{{seconds}} 秒 (管理员设定)",
   "Agent": "代理",
+  "AirGapped_workspace_read_only_description": "管理员可以通过将其连接到互联网或升级到高级计划来恢复完整功能。",
+  "AirGapped_workspace_read_only_share_extension_title": "共享已禁用，因为工作区处于只读模式。",
+  "AirGapped_workspace_read_only_title": "工作区为只读模式。",
   "Alert": "警报",
   "alert": "警报",
   "alerts": "警报",
@@ -17,11 +20,12 @@
   "All_Messages": "全部信息",
   "All_users_in_the_channel_can_write_new_messages": "频道中的所有用户都可以发送新信息",
   "Allow_Reactions": "允许表情贴",
+  "Already_have_an_account": "已经有账户了吗",
   "and": "和",
   "and_N_more": "另外{{count}}个",
   "Announcement": "公告",
   "announcement": "公告",
-  "Apply_Your_Certificate": "使用自己的凭证",
+  "Apply_Certificate": "应用证书",
   "ARCHIVE": "封存",
   "archive": "封存",
   "are_typing": "正在输入",
@@ -103,7 +107,7 @@
   "Discussion_Desc": "帮助保持事态更新！ 通过创建讨论，一个和所选频道双向关联的子频道将会被创建。",
   "Discussion_name": "讨论区名称",
   "Discussions": "讨论区",
-  "Do_you_have_a_certificate": "是否拥有凭证？",
+  "Do_you_have_a_certificate": "您有此工作区的证书吗？",
   "Do_you_have_an_account": "是否拥有帐号?",
   "Do_you_really_want_to_key_this_room_question_mark": "您真的想要{{key}}这个聊天室吗?",
   "Dont_activate": "現在不要激活",
@@ -171,6 +175,7 @@
   "Forward_Chat": "转发聊天",
   "Forward_to_department": "转发到部门",
   "Forward_to_user": "转发给用戶",
+  "Full_name": "全名",
   "Full_table": "点击以查看完整表格",
   "Generate_New_Link": "产生新的链接",
   "Get_help": "获取帮助",
@@ -185,13 +190,13 @@
   "In_App_and_Desktop_Alert_info": "打开 app 时，會在屏幕上方显示横幅；显示桌面通知",
   "Invalid_or_expired_invite_token": "无效或到期的邀请 token",
   "Invalid_server_version": "此 App 版本已不支援您正在连线之服务器版本。当前版本: {{currentVersion}}.\\n\\n最低版本要求: {{minVersion}}",
+  "Invalid_workspace_URL": "无效的工作区 URL",
   "Invisible": "隐身",
   "Invite_Link": "邀请链接",
   "Invite_users": "邀请用戶",
   "IP": "IP",
   "is_typing": "正在输入",
   "Join": "加入",
-  "Join_our_open_workspace": "加入开放工作区",
   "Just_invited_people_can_access_this_channel": "仅有被邀请人能进入这个频道",
   "Language": "语言",
   "last_message": "最后一条信息",
@@ -276,7 +281,7 @@
   "No_threads": "当前没有讨论串",
   "No_threads_following": "当前没有正在追踪的讨论",
   "No_threads_unread": "当前没有未读的讨论",
-  "Not_RC_Server": "这不是一个 Rocket.Chat server.\\n{{contact}}",
+  "Not_RC_Server": "联系您的工作区管理员，或在您的电子邮件收件箱中查找 Rocket.Chat 工作区邀请。",
   "Nothing": "无",
   "Nothing_to_save": "什么都没有保存!",
   "Notification_Preferences": "通知偏好设置",
@@ -286,7 +291,6 @@
   "Omnichannel": "Omnichannel",
   "Omnichannel_enable_alert": "您尚未启用 Omnichannel，是否想要启用？",
   "Onboarding_agree_terms": "继续，即表示您同意 Rocket.Chat",
-  "Onboarding_join_open_description": "加入我们的开放工作区以与 Rocket.Chat 团队及社群交谈",
   "Onboarding_less_options": "较少选项",
   "Onboarding_more_options": "较多选项",
   "Onboarding_subtitle": "超越团队合作",
@@ -463,6 +467,8 @@
   "What_are_you_doing_right_now": "现在在做些什么？",
   "Whats_the_password_for_your_certificate": "您的凭证密码是?",
   "Without_Servers": "未连接至服务器",
+  "Workspace_URL": "工作区 URL",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "工作区",
   "Would_you_like_to_return_the_inquiry": "你想回覆询问吗？",
   "Write_External_Permission": "图片库权限",
@@ -475,6 +481,7 @@
   "You_are_in_preview_mode": "您处于预览模式",
   "You_can_search_using_RegExp_eg": "您可用 RegExp 进行搜索。 例如`/^text$/i`",
   "You_colon": "你:",
+  "You_dont_have_account": "没有账户？",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "您需要访问至少一台Rocket.Chat服务器才能共享某些内容。",
   "You_need_to_verifiy_your_email_address_to_get_notications": "您需要先验证您的邮箱以启用通知",
   "you_were_mentioned": "你被提到了",
diff --git a/app/i18n/locales/zh-TW.json b/app/i18n/locales/zh-TW.json
index 821d1c669d..21d7425db9 100644
--- a/app/i18n/locales/zh-TW.json
+++ b/app/i18n/locales/zh-TW.json
@@ -10,6 +10,9 @@
   "Admin_Panel": "管理者面板",
   "After_seconds_set_by_admin": "{{seconds}} 秒 (管理員設定)",
   "Agent": "代理",
+  "AirGapped_workspace_read_only_description": "管理員可以通過將其連接到互聯網或升級到高級計劃來恢復完整功能。",
+  "AirGapped_workspace_read_only_share_extension_title": "共享被禁用，因為工作區域處於唯讀模式。",
+  "AirGapped_workspace_read_only_title": "工作區域為唯讀模式。",
   "Alert": "警報",
   "alert": "警報",
   "alerts": "警報",
@@ -17,11 +20,12 @@
   "All_Messages": "全部訊息",
   "All_users_in_the_channel_can_write_new_messages": "頻道中的所有使用者都可以發送新訊息",
   "Allow_Reactions": "允許表情貼",
+  "Already_have_an_account": "已經有帳戶了嗎?",
   "and": "和",
   "and_N_more": "另外{{count}}個",
   "Announcement": "公告",
   "announcement": "公告",
-  "Apply_Your_Certificate": "使用自己的憑證",
+  "Apply_Certificate": "應用證書",
   "ARCHIVE": "封存",
   "archive": "封存",
   "are_typing": "正在輸入",
@@ -109,7 +113,7 @@
   "Discussion_name": "討論區名稱",
   "Discussions": "討論區",
   "Displays_action_text": "顯示文字行動",
-  "Do_you_have_a_certificate": "是否擁有憑證？",
+  "Do_you_have_a_certificate": "您有此工作區的證書嗎？",
   "Do_you_have_an_account": "是否擁有帳號?",
   "Do_you_really_want_to_key_this_room_question_mark": "您真的想要{{key}}這個聊天室嗎?",
   "Dont_activate": "現在不要啟用",
@@ -179,6 +183,7 @@
   "Forward_Chat": "轉發聊天",
   "Forward_to_department": "轉發到部門",
   "Forward_to_user": "轉發給使用者",
+  "Full_name": "全名",
   "Full_table": "點擊以查看完整表格",
   "Generate_New_Link": "產生新的連結",
   "Get_help": "獲取幫助",
@@ -195,6 +200,7 @@
   "In_App_and_Desktop_Alert_info": "若 app 開啟時，會在螢幕上方顯示橫幅；顯示桌面通知",
   "Invalid_or_expired_invite_token": "無效或到期的邀請 token",
   "Invalid_server_version": "此 App 版本已不支援您正在連線之伺服器版本。當前版本: {{currentVersion}}.\\n\\n最低版本要求: {{minVersion}}",
+  "Invalid_workspace_URL": "無效的工作區 URL",
   "Invisible": "隱身",
   "Invite_Link": "邀請連結",
   "Invite_user_to_join_channel": "邀請使用者加入此頻道",
@@ -204,7 +210,6 @@
   "IP": "IP",
   "is_typing": "正在輸入",
   "Join": "加入",
-  "Join_our_open_workspace": "加入開放工作區",
   "Join_the_given_channel": "加入現有頻道",
   "Just_invited_people_can_access_this_channel": "僅有受邀者能存取此頻道",
   "Language": "語言",
@@ -293,7 +298,7 @@
   "No_threads": "當前沒有討論串",
   "No_threads_following": "當前沒有正在追蹤的討論",
   "No_threads_unread": "當前沒有未讀的討論",
-  "Not_RC_Server": "這不是一個 Rocket.Chat server.\\n{{contact}}",
+  "Not_RC_Server": "聯繫您的工作區管理員，或在您的電子郵件收件箱中搜尋 Rocket.Chat 工作區邀請。",
   "Nothing": "無",
   "Nothing_to_save": "沒有東西可儲存！",
   "Notification_Preferences": "通知偏好設定",
@@ -303,7 +308,6 @@
   "Omnichannel": "Omnichannel",
   "Omnichannel_enable_alert": "您尚未啟用 Omnichannel，是否想要啟用？",
   "Onboarding_agree_terms": "繼續，即表示您同意 Rocket.Chat",
-  "Onboarding_join_open_description": "加入我們的開放工作區以與 Rocket.Chat 團隊及社群交談",
   "Onboarding_less_options": "較少選項",
   "Onboarding_more_options": "較多選項",
   "Onboarding_subtitle": "超越團隊合作",
@@ -492,6 +496,8 @@
   "What_are_you_doing_right_now": "現在在做些什麼？",
   "Whats_the_password_for_your_certificate": "您的憑證密碼是?",
   "Without_Servers": "未連接至伺服器",
+  "Workspace_URL": "工作區 URL",
+  "Workspace_URL_Example": "open.rocket.chat",
   "Workspaces": "工作區",
   "Would_you_like_to_return_the_inquiry": "你想回覆詢問嗎？",
   "Write_External_Permission": "圖片庫權限",
@@ -504,6 +510,7 @@
   "You_are_in_preview_mode": "您處於預覽模式",
   "You_can_search_using_RegExp_eg": "您可用 RegExp 進行搜尋。例如`/^text$/i`",
   "You_colon": "你:",
+  "You_dont_have_account": "沒有帳戶？",
   "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "您需要至少連接一個 Rocket.Chat 伺服器才能共享某些内容。",
   "You_need_to_verifiy_your_email_address_to_get_notications": "您需要先驗證您的電子郵件以啟用通知",
   "you_were_mentioned": "你被提到了",
diff --git a/app/index.tsx b/app/index.tsx
index 84670f7213..89b0d6d5e9 100644
--- a/app/index.tsx
+++ b/app/index.tsx
@@ -68,7 +68,7 @@ const parseDeepLinking = (url: string) => {
 				const parsedQuery = parseQuery(query);
 				return {
 					...parsedQuery,
-					type: matchedPattern
+					type: matchedPattern === 'shareextension' ? matchedPattern : parsedQuery?.type
 				};
 			}
 		}
diff --git a/app/lib/constants/colors.ts b/app/lib/constants/colors.ts
index 9e7753c20a..f2af702b7d 100644
--- a/app/lib/constants/colors.ts
+++ b/app/lib/constants/colors.ts
@@ -23,7 +23,7 @@ const light = {
 	strokeError: '#EC0D2A',
 
 	fontWhite: '#FFFFFF',
-	fontDisabled: '#FFFFFF',
+	fontDisabled: '#CBCED1',
 	fontAnnotation: '#9EA2A8',
 	fontHint: '#6C727A',
 	fontSecondaryInfo: '#6C727A',
diff --git a/app/lib/constants/defaultSettings.ts b/app/lib/constants/defaultSettings.ts
index 290d447ff7..82f321a073 100644
--- a/app/lib/constants/defaultSettings.ts
+++ b/app/lib/constants/defaultSettings.ts
@@ -264,5 +264,8 @@ export const defaultSettings = {
 	UTF8_User_Names_Validation: {
 		type: 'valueAsString'
 	},
+	Cloud_Workspace_AirGapped_Restrictions_Remaining_Days: {
+		type: 'valueAsNumber'
+	},
 	...deprecatedSettings
 } as const;
diff --git a/app/lib/encryption/encryption.ts b/app/lib/encryption/encryption.ts
index 4b7dee5c61..aaaa25a7df 100644
--- a/app/lib/encryption/encryption.ts
+++ b/app/lib/encryption/encryption.ts
@@ -261,15 +261,15 @@ class Encryption {
 	};
 
 	evaluateSuggestedKey = async (rid: string, E2ESuggestedKey: string) => {
-		try {
-			if (this.privateKey) {
+		if (this.privateKey) {
+			try {
 				const roomE2E = await this.getRoomInstance(rid);
 				await roomE2E.importRoomKey(E2ESuggestedKey, this.privateKey);
 				delete this.roomInstances[rid];
 				await Services.e2eAcceptSuggestedGroupKey(rid);
+			} catch (e) {
+				await Services.e2eRejectSuggestedGroupKey(rid);
 			}
-		} catch (e) {
-			await Services.e2eRejectSuggestedGroupKey(rid);
 		}
 	};
 
@@ -350,7 +350,10 @@ class Encryption {
 			const subsEncrypted = await subCollection.query(Q.where('e2e_key_id', Q.notEq(null)), Q.where('encrypted', true)).fetch();
 			await Promise.all(
 				subsEncrypted.map(async (sub: TSubscriptionModel) => {
-					const { rid, lastMessage } = sub;
+					const { rid, lastMessage, E2ESuggestedKey } = sub;
+					if (E2ESuggestedKey) {
+						await this.evaluateSuggestedKey(rid, E2ESuggestedKey);
+					}
 					const newSub = await this.decryptSubscription({ rid, lastMessage });
 					try {
 						return sub.prepareUpdate(
diff --git a/app/lib/encryption/room.ts b/app/lib/encryption/room.ts
index 247d6f9f87..edd08b25cd 100644
--- a/app/lib/encryption/room.ts
+++ b/app/lib/encryption/room.ts
@@ -8,7 +8,7 @@ import { sha256 } from 'js-sha256';
 import getSingleMessage from '../methods/getSingleMessage';
 import { IAttachment, IMessage, IUpload, TSendFileMessageFileInfo, IUser, IServerAttachment } from '../../definitions';
 import Deferred from './helpers/deferred';
-import { debounce } from '../methods/helpers';
+import { compareServerVersion, debounce } from '../methods/helpers';
 import database from '../database';
 import log from '../methods/helpers/log';
 import {
@@ -35,6 +35,7 @@ import { mapMessageFromDB } from './helpers/mapMessageFromDB';
 import { createQuoteAttachment } from './helpers/createQuoteAttachment';
 import { getMessageById } from '../database/services/Message';
 import { TEncryptFileResult, TGetContent } from './definitions';
+import { store } from '../store/auxStore';
 
 export default class EncryptionRoom {
 	ready: boolean;
@@ -82,7 +83,21 @@ export default class EncryptionRoom {
 			// Find the subscription
 			const subscription = await subCollection.find(this.roomId);
 
-			const { E2EKey, e2eKeyId } = subscription;
+			// Similar to Encryption.evaluateSuggestedKey
+			const { E2EKey, e2eKeyId, E2ESuggestedKey } = subscription;
+			if (E2EKey && E2ESuggestedKey && Encryption.privateKey) {
+				try {
+					const { keyID, roomKey, sessionKeyExportedString } = await this.importRoomKey(E2ESuggestedKey, Encryption.privateKey);
+					this.keyID = keyID;
+					this.roomKey = roomKey;
+					this.sessionKeyExportedString = sessionKeyExportedString;
+					await Services.e2eAcceptSuggestedGroupKey(this.roomId);
+					this.readyPromise.resolve();
+					return;
+				} catch (e) {
+					await Services.e2eRejectSuggestedGroupKey(this.roomId);
+				}
+			}
 
 			// If this room has a E2EKey, we import it
 			if (E2EKey && Encryption.privateKey) {
@@ -123,7 +138,13 @@ export default class EncryptionRoom {
 			const decryptedKey = await SimpleCrypto.RSA.decrypt(roomE2EKey, privateKey);
 			const sessionKeyExportedString = toString(decryptedKey);
 
-			const keyID = Base64.encode(sessionKeyExportedString as string).slice(0, 12);
+			let keyID = '';
+			const { version } = store.getState().server;
+			if (compareServerVersion(version, 'greaterThanOrEqualTo', '7.0.0')) {
+				keyID = (await SimpleCrypto.SHA.sha256(sessionKeyExportedString as string)).slice(0, 12);
+			} else {
+				keyID = Base64.encode(sessionKeyExportedString as string).slice(0, 12);
+			}
 
 			// Extract K from Web Crypto Secret Key
 			// K is a base64URL encoded array of bytes
@@ -161,7 +182,13 @@ export default class EncryptionRoom {
 		};
 
 		this.sessionKeyExportedString = EJSON.stringify(sessionKeyExported);
-		this.keyID = Base64.encode(this.sessionKeyExportedString).slice(0, 12);
+
+		const { version } = store.getState().server;
+		if (compareServerVersion(version, 'greaterThanOrEqualTo', '7.0.0')) {
+			this.keyID = (await SimpleCrypto.SHA.sha256(this.sessionKeyExportedString as string)).slice(0, 12);
+		} else {
+			this.keyID = Base64.encode(this.sessionKeyExportedString as string).slice(0, 12);
+		}
 
 		await Services.e2eSetRoomKeyID(this.roomId, this.keyID);
 
diff --git a/app/lib/hooks/navigation.ts b/app/lib/hooks/navigation.ts
index 988bec90fe..ea774bfbf0 100644
--- a/app/lib/hooks/navigation.ts
+++ b/app/lib/hooks/navigation.ts
@@ -1,5 +1,5 @@
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
 import { TNavigation } from '../../stacks/stackType';
 import {
@@ -33,7 +33,7 @@ type TRoutes =
 	| TNavigation;
 
 export function useAppNavigation<ParamList extends TRoutes, RouteName extends keyof ParamList = keyof ParamList>() {
-	const navigation = useNavigation<StackNavigationProp<ParamList, RouteName>>();
+	const navigation = useNavigation<NativeStackNavigationProp<ParamList, RouteName>>();
 	return navigation;
 }
 
diff --git a/app/lib/hooks/useWorkspaceDomain.ts b/app/lib/hooks/useWorkspaceDomain.ts
new file mode 100644
index 0000000000..e972bafbb9
--- /dev/null
+++ b/app/lib/hooks/useWorkspaceDomain.ts
@@ -0,0 +1,11 @@
+import parse from 'url-parse';
+
+import { useAppSelector } from "./useAppSelector"
+
+export const useWorkspaceDomain = (): string => {
+	const { Site_Url } = useAppSelector(state => ({
+		Site_Url: state.settings.Site_Url as string
+	}));
+
+	return new parse(Site_Url).hostname;
+};
\ No newline at end of file
diff --git a/app/lib/methods/getServerInfo.ts b/app/lib/methods/getServerInfo.ts
index 7b790c7f6d..6b7cc0f7d8 100644
--- a/app/lib/methods/getServerInfo.ts
+++ b/app/lib/methods/getServerInfo.ts
@@ -52,7 +52,7 @@ export async function getServerInfo(server: string): Promise<TServerInfoResult>
 			if (!serverInfo?.success) {
 				return {
 					success: false,
-					message: I18n.t('Not_RC_Server', { contact: I18n.t('Contact_your_server_admin') })
+					message: I18n.t('Not_RC_Server')
 				};
 			}
 
@@ -109,14 +109,14 @@ export async function getServerInfo(server: string): Promise<TServerInfoResult>
 			}
 			return {
 				success: false,
-				message: e.message
+				message: I18n.t('Not_RC_Server')
 			};
 		}
 	}
 
 	return {
 		success: false,
-		message: I18n.t('Not_RC_Server', { contact: I18n.t('Contact_your_server_admin') })
+		message: I18n.t('Not_RC_Server')
 	};
 }
 
diff --git a/app/lib/methods/helpers/formatAttachmentUrl.ts b/app/lib/methods/helpers/formatAttachmentUrl.ts
index b40a2b87ce..0156a14593 100644
--- a/app/lib/methods/helpers/formatAttachmentUrl.ts
+++ b/app/lib/methods/helpers/formatAttachmentUrl.ts
@@ -1,6 +1,5 @@
 import { URL } from 'react-native-url-polyfill';
 
-import { LOCAL_DOCUMENT_DIRECTORY } from '../handleMediaDownload';
 import { isImageBase64 } from '../isImageBase64';
 import { store } from '../../store/auxStore';
 
@@ -12,10 +11,7 @@ function setParamInUrl({ url, token, userId }: { url: string; token: string; use
 }
 
 export const formatAttachmentUrl = (attachmentUrl: string | undefined, userId: string, token: string, server: string): string => {
-	if (
-		(attachmentUrl && isImageBase64(attachmentUrl)) ||
-		(LOCAL_DOCUMENT_DIRECTORY && attachmentUrl?.startsWith(LOCAL_DOCUMENT_DIRECTORY))
-	) {
+	if ((attachmentUrl && isImageBase64(attachmentUrl)) || attachmentUrl?.startsWith('file://')) {
 		return attachmentUrl;
 	}
 	if (attachmentUrl && attachmentUrl.startsWith('http')) {
diff --git a/app/lib/methods/helpers/goRoom.ts b/app/lib/methods/helpers/goRoom.ts
index a2550db418..537ce6946b 100644
--- a/app/lib/methods/helpers/goRoom.ts
+++ b/app/lib/methods/helpers/goRoom.ts
@@ -1,5 +1,6 @@
 import { CommonActions } from '@react-navigation/native';
 
+import { getSubscriptionByRoomId } from '../../database/services/Subscription';
 import Navigation from '../../navigation/appNavigation';
 import { IOmnichannelRoom, SubscriptionType, IVisitor, TSubscriptionModel, ISubscription } from '../../../definitions';
 import { getRoomTitle, getUidDirectMessage } from './helpers';
@@ -117,7 +118,20 @@ export const goRoom = async ({
 		}
 	}
 
-	return navigate({ item, isMasterDetail, popToRoot, ...props });
+	/**
+	 * Fetches subscription from database to use goRoom with a more complete room object.
+	 * We might want to review this logic in the future, since react-navigation complains about non-serializable data
+	 * https://reactnavigation.org/docs/troubleshooting/#i-get-the-warning-non-serializable-values-were-found-in-the-navigation-state
+	 */
+	let _item = item;
+	if (item.rid) {
+		const sub = await getSubscriptionByRoomId(item.rid);
+		if (sub) {
+			_item = sub;
+		}
+	}
+
+	return navigate({ item: _item, isMasterDetail, popToRoot, ...props });
 };
 
 export const navigateToRoom = navigate;
diff --git a/app/lib/methods/helpers/log/events.ts b/app/lib/methods/helpers/log/events.ts
index 2b7884334c..3bda8de590 100644
--- a/app/lib/methods/helpers/log/events.ts
+++ b/app/lib/methods/helpers/log/events.ts
@@ -1,7 +1,6 @@
 export default {
 	// NEW SERVER VIEW
 	NS_CONNECT_TO_WORKSPACE: 'ns_connect_to_workspace',
-	NS_JOIN_OPEN_WORKSPACE: 'ns_join_open_workspace',
 
 	// LOGIN VIEW
 	LOGIN_DEFAULT_LOGIN: 'login_default_login',
diff --git a/app/lib/methods/helpers/mergeSubscriptionsRooms.ts b/app/lib/methods/helpers/mergeSubscriptionsRooms.ts
index 9f9feb64a1..4bd1cefb15 100644
--- a/app/lib/methods/helpers/mergeSubscriptionsRooms.ts
+++ b/app/lib/methods/helpers/mergeSubscriptionsRooms.ts
@@ -108,6 +108,10 @@ export const merge = (
 	mergedSubscription.blocked = !!mergedSubscription.blocked;
 	mergedSubscription.hideMentionStatus = !!mergedSubscription.hideMentionStatus;
 	mergedSubscription.sanitizedFname = slugifyLikeString(mergedSubscription.fname || mergedSubscription.name);
+
+	if (!mergedSubscription.E2ESuggestedKey) {
+		mergedSubscription.E2ESuggestedKey = null;
+	}
 	return mergedSubscription;
 };
 
diff --git a/app/lib/methods/helpers/navigation/animations.ts b/app/lib/methods/helpers/navigation/animations.ts
deleted file mode 100644
index a9f1840881..0000000000
--- a/app/lib/methods/helpers/navigation/animations.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { Animated, Easing } from 'react-native';
-import { HeaderStyleInterpolators, TransitionPreset, TransitionPresets } from '@react-navigation/stack';
-// eslint-disable-next-line import/no-unresolved
-import { StackCardStyleInterpolator, TransitionSpec } from '@react-navigation/stack/lib/typescript/src/types';
-
-import { isAndroid } from '../deviceInfo';
-import conditional from './conditional';
-
-const { multiply } = Animated;
-
-const forFadeFromCenter: StackCardStyleInterpolator = ({ current, closing }) => {
-	const opacity = conditional(
-		closing,
-		current.progress,
-		current.progress.interpolate({
-			inputRange: [0, 0.5, 0.9, 1],
-			outputRange: [0, 0.25, 0.7, 1]
-		})
-	);
-
-	return {
-		cardStyle: {
-			opacity
-		}
-	};
-};
-
-const FadeIn: TransitionSpec = {
-	animation: 'timing',
-	config: {
-		duration: 250,
-		easing: Easing.out(Easing.poly(5))
-	}
-};
-
-const FadeOut: TransitionSpec = {
-	animation: 'timing',
-	config: {
-		duration: 150,
-		easing: Easing.in(Easing.poly(5))
-	}
-};
-
-export const FadeFromCenterModal = {
-	gestureDirection: 'vertical',
-	transitionSpec: {
-		open: FadeIn,
-		close: FadeOut
-	},
-	cardStyleInterpolator: forFadeFromCenter
-};
-
-const forStackAndroid: StackCardStyleInterpolator = ({ current, inverted, layouts: { screen } }) => {
-	const translateX = multiply(
-		current.progress.interpolate({
-			inputRange: [0, 1],
-			outputRange: [screen.width, 0]
-		}),
-		inverted
-	);
-
-	const opacity = current.progress.interpolate({
-		inputRange: [0, 1],
-		outputRange: [0, 1]
-	});
-
-	return {
-		cardStyle: {
-			opacity,
-			transform: [{ translateX }]
-		}
-	};
-};
-
-const StackAndroid: TransitionPreset = {
-	gestureDirection: 'horizontal',
-	transitionSpec: {
-		open: FadeIn,
-		close: FadeOut
-	},
-	cardStyleInterpolator: forStackAndroid,
-	headerStyleInterpolator: HeaderStyleInterpolators.forFade
-};
-
-export const StackAnimation = isAndroid ? StackAndroid : TransitionPresets.SlideFromRightIOS;
-export const ModalAnimation = TransitionPresets.ModalTransition;
diff --git a/app/lib/methods/helpers/navigation/conditional.ts b/app/lib/methods/helpers/navigation/conditional.ts
deleted file mode 100644
index 19936c865d..0000000000
--- a/app/lib/methods/helpers/navigation/conditional.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Taken from https://github.com/react-navigation/react-navigation/blob/master/packages/stack/src/utils/conditional.tsx
-import { Animated } from 'react-native';
-
-const { add, multiply } = Animated;
-
-/**
- * Use an Animated Node based on a condition. Similar to Reanimated's `cond`.
- *
- * @param condition Animated Node representing the condition, must be 0 or 1, 1 means `true`, 0 means `false`
- * @param main Animated Node to use if the condition is `true`
- * @param fallback Animated Node to use if the condition is `false`
- */
-export default function conditional(
-	condition: Animated.AnimatedInterpolation<number>,
-	main: Animated.Animated,
-	fallback: Animated.Animated
-): Animated.AnimatedAddition<number> {
-	// To implement this behavior, we multiply the main node with the condition.
-	// So if condition is 0, result will be 0, and if condition is 1, result will be main node.
-	// Then we multiple reverse of the condition (0 if condition is 1) with the fallback.
-	// So if condition is 0, result will be fallback node, and if condition is 1, result will be 0,
-	// This way, one of them will always be 0, and other one will be the value we need.
-	// In the end we add them both together, 0 + value we need = value we need
-	return add(
-		multiply(condition, main),
-		multiply(
-			condition.interpolate({
-				inputRange: [0, 1],
-				outputRange: [1, 0]
-			}),
-			fallback
-		)
-	);
-}
diff --git a/app/lib/methods/helpers/navigation/index.ts b/app/lib/methods/helpers/navigation/index.ts
index a7a8d43617..56d36cf4b1 100644
--- a/app/lib/methods/helpers/navigation/index.ts
+++ b/app/lib/methods/helpers/navigation/index.ts
@@ -1,38 +1,20 @@
-import { StyleSheet } from 'react-native';
 import { DarkTheme, DefaultTheme } from '@react-navigation/native';
-import { StackNavigationOptions } from '@react-navigation/stack';
+import { NativeStackNavigationOptions } from '@react-navigation/native-stack';
 
 import { themes } from '../../../constants';
 import { TSupportedThemes } from '../../../../theme';
 import sharedStyles from '../../../../views/Styles';
 
-export * from './animations';
-
-export const defaultHeader: StackNavigationOptions = {
-	headerBackTitleVisible: false,
-	headerBackTestID: 'header-back',
-	cardOverlayEnabled: true,
-	cardStyle: { backgroundColor: 'transparent' },
-	headerTitleAlign: 'left'
-};
-
-export const cardStyle = {
-	backgroundColor: 'rgba(0,0,0,0)'
+export const defaultHeader: NativeStackNavigationOptions = {
+	headerBackTitleVisible: false
 };
 
-export const borderBottom: any = (theme: TSupportedThemes) => ({
-	borderBottomWidth: StyleSheet.hairlineWidth,
-	borderBottomColor: themes[theme].strokeDark,
-	elevation: 0
-});
-
 export const drawerStyle = {
 	width: 320
 };
 
-export const themedHeader = (theme: TSupportedThemes) => ({
+export const themedHeader = (theme: TSupportedThemes): NativeStackNavigationOptions => ({
 	headerStyle: {
-		...borderBottom(theme),
 		backgroundColor: themes[theme].surfaceNeutral
 	},
 	headerTintColor: themes[theme].fontDefault,
diff --git a/app/lib/services/restApi.ts b/app/lib/services/restApi.ts
index e201628ac6..48e13005e1 100644
--- a/app/lib/services/restApi.ts
+++ b/app/lib/services/restApi.ts
@@ -412,9 +412,15 @@ export const closeLivechat = (rid: string, comment?: string, tags?: string[]) =>
 	return sdk.methodCallWrapper('livechat:closeRoom', rid, comment, { clientAction: true, ...params });
 };
 
-export const editLivechat = (userData: TParams, roomData: TParams): Promise<{ error?: string }> =>
-	// RC 0.55.0
-	sdk.methodCallWrapper('livechat:saveInfo', userData, roomData);
+export const editLivechat = (userData: TParams, roomData: TParams): Promise<{ error?: string }> => {
+	const serverVersion = reduxStore.getState().server.version;
+	if (compareServerVersion(serverVersion, 'lowerThan', '5.3.0')) {
+		// RC 0.55.0
+		return sdk.methodCallWrapper('livechat:saveInfo', userData, roomData);
+	}
+	// RC 5.3.0
+	return sdk.post('livechat/room.saveInfo', { guestData: userData, roomData }) as any;
+};
 
 export const returnLivechat = (rid: string): Promise<boolean> =>
 	// RC 0.72.0
diff --git a/app/sagas/init.js b/app/sagas/init.js
index 37e072fcec..8d829aecab 100644
--- a/app/sagas/init.js
+++ b/app/sagas/init.js
@@ -2,7 +2,7 @@ import { call, put, select, takeLatest } from 'redux-saga/effects';
 import RNBootSplash from 'react-native-bootsplash';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 
-import { BIOMETRY_ENABLED_KEY, CURRENT_SERVER, TOKEN_KEY } from '../lib/constants';
+import { CURRENT_SERVER, TOKEN_KEY } from '../lib/constants';
 import UserPreferences from '../lib/methods/userPreferences';
 import { selectServerRequest } from '../actions/server';
 import { setAllPreferences } from '../actions/sortPreferences';
@@ -20,7 +20,6 @@ export const initLocalSettings = function* initLocalSettings() {
 	yield put(setAllPreferences(sortPreferences));
 };
 
-const BIOMETRY_MIGRATION_KEY = 'kBiometryMigration';
 
 const restore = function* restore() {
 	console.log('RESTORE');
@@ -28,18 +27,6 @@ const restore = function* restore() {
 		const server = UserPreferences.getString(CURRENT_SERVER);
 		let userId = UserPreferences.getString(`${TOKEN_KEY}-${server}`);
 
-		// Migration biometry setting from WatermelonDB to MMKV
-		// TODO: remove it after a few versions
-		const hasMigratedBiometry = UserPreferences.getBool(BIOMETRY_MIGRATION_KEY);
-		if (!hasMigratedBiometry) {
-			const serversDB = database.servers;
-			const serversCollection = serversDB.get('servers');
-			const servers = yield serversCollection.query().fetch();
-			const isBiometryEnabled = servers.some(server => !!server.biometry);
-			UserPreferences.setBool(BIOMETRY_ENABLED_KEY, isBiometryEnabled);
-			UserPreferences.setBool(BIOMETRY_MIGRATION_KEY, true);
-		}
-
 		if (!server) {
 			yield put(appStart({ root: RootEnum.ROOT_OUTSIDE }));
 		} else if (!userId) {
diff --git a/app/sagas/selectServer.ts b/app/sagas/selectServer.ts
index 883dd8b68e..84daa85196 100644
--- a/app/sagas/selectServer.ts
+++ b/app/sagas/selectServer.ts
@@ -102,13 +102,13 @@ const getServerInfoSaga = function* getServerInfoSaga({ server, raiseError = tru
 		const serverInfoResult = yield* call(getServerInfo, server);
 		if (raiseError) {
 			if (!serverInfoResult.success) {
-				Alert.alert(I18n.t('Oops'), serverInfoResult.message);
+				Alert.alert(I18n.t('Invalid_workspace_URL'), serverInfoResult.message);
 				yield put(serverFailure());
 				return;
 			}
 			const websocketInfo = yield* call(Services.getWebsocketInfo, { server });
 			if (!websocketInfo.success) {
-				Alert.alert(I18n.t('Oops'), websocketInfo.message);
+				Alert.alert(I18n.t('Invalid_workspace_URL'), websocketInfo.message);
 				yield put(serverFailure());
 				return;
 			}
diff --git a/app/stacks/InsideStack.tsx b/app/stacks/InsideStack.tsx
index 751188099c..adbd46a588 100644
--- a/app/stacks/InsideStack.tsx
+++ b/app/stacks/InsideStack.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import { I18nManager } from 'react-native';
-import { createStackNavigator, StackNavigationOptions } from '@react-navigation/stack';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import { createDrawerNavigator } from '@react-navigation/drawer';
 
 import { ThemeContext } from '../theme';
-import { ModalAnimation, StackAnimation, defaultHeader, themedHeader } from '../lib/methods/helpers/navigation';
+import { defaultHeader, themedHeader } from '../lib/methods/helpers/navigation';
 import Sidebar from '../views/SidebarView';
 // Chats Stack
 import RoomView from '../views/RoomView';
@@ -32,7 +32,6 @@ import MarkdownTableView from '../views/MarkdownTableView';
 import ReadReceiptsView from '../views/ReadReceiptView';
 import CannedResponsesListView from '../views/CannedResponsesListView';
 import CannedResponseDetail from '../views/CannedResponseDetail';
-import { themes } from '../lib/constants';
 // Profile Stack
 import ProfileView from '../views/ProfileView';
 import UserPreferencesView from '../views/UserPreferencesView';
@@ -90,12 +89,11 @@ import { isIOS } from '../lib/methods/helpers';
 import { TNavigation } from './stackType';
 
 // ChatsStackNavigator
-const ChatsStack = createStackNavigator<ChatsStackParamList & TNavigation>();
+const ChatsStack = createNativeStackNavigator<ChatsStackParamList & TNavigation>();
 const ChatsStackNavigator = () => {
 	const { theme } = React.useContext(ThemeContext);
 	return (
-		<ChatsStack.Navigator
-			screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...StackAnimation } as StackNavigationOptions}>
+		<ChatsStack.Navigator screenOptions={{ ...defaultHeader, ...themedHeader(theme) }}>
 			<ChatsStack.Screen name='RoomsListView' component={RoomsListView} />
 			<ChatsStack.Screen name='RoomView' component={RoomView} />
 			<ChatsStack.Screen name='RoomActionsView' component={RoomActionsView} options={RoomActionsView.navigationOptions} />
@@ -147,19 +145,21 @@ const ChatsStackNavigator = () => {
 			<ChatsStack.Screen
 				name='JitsiMeetView'
 				component={JitsiMeetView}
-				options={{ headerShown: false, animationEnabled: isIOS }}
+				options={{
+					headerShown: false,
+					animation: isIOS ? 'default' : 'none'
+				}}
 			/>
 		</ChatsStack.Navigator>
 	);
 };
 
 // ProfileStackNavigator
-const ProfileStack = createStackNavigator<ProfileStackParamList & TNavigation>();
+const ProfileStack = createNativeStackNavigator<ProfileStackParamList & TNavigation>();
 const ProfileStackNavigator = () => {
 	const { theme } = React.useContext(ThemeContext);
 	return (
-		<ProfileStack.Navigator
-			screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...StackAnimation } as StackNavigationOptions}>
+		<ProfileStack.Navigator screenOptions={{ ...defaultHeader, ...themedHeader(theme) }}>
 			<ProfileStack.Screen name='ProfileView' component={ProfileView} options={ProfileView.navigationOptions} />
 			<ProfileStack.Screen name='UserPreferencesView' component={UserPreferencesView} />
 			<ProfileStack.Screen name='ChangeAvatarView' component={ChangeAvatarView} />
@@ -171,13 +171,12 @@ const ProfileStackNavigator = () => {
 };
 
 // SettingsStackNavigator
-const SettingsStack = createStackNavigator<SettingsStackParamList>();
+const SettingsStack = createNativeStackNavigator<SettingsStackParamList>();
 const SettingsStackNavigator = () => {
 	const { theme } = React.useContext(ThemeContext);
 
 	return (
-		<SettingsStack.Navigator
-			screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...StackAnimation } as StackNavigationOptions}>
+		<SettingsStack.Navigator screenOptions={{ ...defaultHeader, ...themedHeader(theme) }}>
 			<SettingsStack.Screen name='SettingsView' component={SettingsView} />
 			<SettingsStack.Screen name='SecurityPrivacyView' component={SecurityPrivacyView} />
 			<SettingsStack.Screen name='PushTroubleshootView' component={PushTroubleshootView} />
@@ -198,26 +197,24 @@ const SettingsStackNavigator = () => {
 };
 
 // AdminPanelStackNavigator
-const AdminPanelStack = createStackNavigator<AdminPanelStackParamList>();
+const AdminPanelStack = createNativeStackNavigator<AdminPanelStackParamList>();
 const AdminPanelStackNavigator = () => {
 	const { theme } = React.useContext(ThemeContext);
 
 	return (
-		<AdminPanelStack.Navigator
-			screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...StackAnimation } as StackNavigationOptions}>
+		<AdminPanelStack.Navigator screenOptions={{ ...defaultHeader, ...themedHeader(theme) }}>
 			<AdminPanelStack.Screen name='AdminPanelView' component={AdminPanelView} />
 		</AdminPanelStack.Navigator>
 	);
 };
 
 // DisplayPreferenceNavigator
-const DisplayPrefStack = createStackNavigator<DisplayPrefStackParamList>();
+const DisplayPrefStack = createNativeStackNavigator<DisplayPrefStackParamList>();
 const DisplayPrefStackNavigator = () => {
 	const { theme } = React.useContext(ThemeContext);
 
 	return (
-		<DisplayPrefStack.Navigator
-			screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...StackAnimation } as StackNavigationOptions}>
+		<DisplayPrefStack.Navigator screenOptions={{ ...defaultHeader, ...themedHeader(theme) }}>
 			<DisplayPrefStack.Screen name='DisplayPrefsView' component={DisplayPrefsView} />
 		</DisplayPrefStack.Navigator>
 	);
@@ -226,7 +223,7 @@ const DisplayPrefStackNavigator = () => {
 // DrawerNavigator
 const Drawer = createDrawerNavigator<DrawerParamList>();
 const DrawerNavigator = () => {
-	const { theme } = React.useContext(ThemeContext);
+	const { colors } = React.useContext(ThemeContext);
 
 	return (
 		<Drawer.Navigator
@@ -237,7 +234,8 @@ const DrawerNavigator = () => {
 				headerShown: false,
 				drawerPosition: I18nManager.isRTL ? 'right' : 'left',
 				drawerType: 'slide',
-				overlayColor: `rgba(0,0,0,${themes[theme].backdropOpacity})`
+				overlayColor: `rgba(0,0,0,${colors.backdropOpacity})`,
+				freezeOnBlur: true
 			}}>
 			<Drawer.Screen name='ChatsStackNavigator' component={ChatsStackNavigator} />
 			<Drawer.Screen name='ProfileStackNavigator' component={ProfileStackNavigator} />
@@ -249,13 +247,12 @@ const DrawerNavigator = () => {
 };
 
 // NewMessageStackNavigator
-const NewMessageStack = createStackNavigator<NewMessageStackParamList>();
+const NewMessageStack = createNativeStackNavigator<NewMessageStackParamList>();
 const NewMessageStackNavigator = () => {
 	const { theme } = React.useContext(ThemeContext);
 
 	return (
-		<NewMessageStack.Navigator
-			screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...StackAnimation } as StackNavigationOptions}>
+		<NewMessageStack.Navigator screenOptions={{ ...defaultHeader, ...themedHeader(theme) }}>
 			<NewMessageStack.Screen name='NewMessageView' component={NewMessageView} />
 			<NewMessageStack.Screen name='SelectedUsersViewCreateChannel' component={SelectedUsersView} />
 			<NewMessageStack.Screen name='CreateChannelView' component={CreateChannelView} />
@@ -267,13 +264,12 @@ const NewMessageStackNavigator = () => {
 };
 
 // E2ESaveYourPasswordStackNavigator
-const E2ESaveYourPasswordStack = createStackNavigator<E2ESaveYourPasswordStackParamList>();
+const E2ESaveYourPasswordStack = createNativeStackNavigator<E2ESaveYourPasswordStackParamList>();
 const E2ESaveYourPasswordStackNavigator = () => {
 	const { theme } = React.useContext(ThemeContext);
 
 	return (
-		<E2ESaveYourPasswordStack.Navigator
-			screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...StackAnimation } as StackNavigationOptions}>
+		<E2ESaveYourPasswordStack.Navigator screenOptions={{ ...defaultHeader, ...themedHeader(theme) }}>
 			<E2ESaveYourPasswordStack.Screen name='E2ESaveYourPasswordView' component={E2ESaveYourPasswordView} />
 			<E2ESaveYourPasswordStack.Screen name='E2EHowItWorksView' component={E2EHowItWorksView} />
 		</E2ESaveYourPasswordStack.Navigator>
@@ -281,26 +277,24 @@ const E2ESaveYourPasswordStackNavigator = () => {
 };
 
 // E2EEnterYourPasswordStackNavigator
-const E2EEnterYourPasswordStack = createStackNavigator<E2EEnterYourPasswordStackParamList>();
+const E2EEnterYourPasswordStack = createNativeStackNavigator<E2EEnterYourPasswordStackParamList>();
 const E2EEnterYourPasswordStackNavigator = () => {
 	const { theme } = React.useContext(ThemeContext);
 
 	return (
-		<E2EEnterYourPasswordStack.Navigator
-			screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...StackAnimation } as StackNavigationOptions}>
+		<E2EEnterYourPasswordStack.Navigator screenOptions={{ ...defaultHeader, ...themedHeader(theme) }}>
 			<E2EEnterYourPasswordStack.Screen name='E2EEnterYourPasswordView' component={E2EEnterYourPasswordView} />
 		</E2EEnterYourPasswordStack.Navigator>
 	);
 };
 
 // InsideStackNavigator
-const InsideStack = createStackNavigator<InsideStackParamList & TNavigation>();
+const InsideStack = createNativeStackNavigator<InsideStackParamList & TNavigation>();
 const InsideStackNavigator = () => {
 	const { theme } = React.useContext(ThemeContext);
 
 	return (
-		<InsideStack.Navigator
-			screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...ModalAnimation, presentation: 'transparentModal' }}>
+		<InsideStack.Navigator screenOptions={{ ...defaultHeader, ...themedHeader(theme), presentation: 'containedModal' }}>
 			<InsideStack.Screen name='DrawerNavigator' component={DrawerNavigator} options={{ headerShown: false }} />
 			<InsideStack.Screen name='NewMessageStackNavigator' component={NewMessageStackNavigator} options={{ headerShown: false }} />
 			<InsideStack.Screen
diff --git a/app/stacks/MasterDetailStack/ModalContainer.tsx b/app/stacks/MasterDetailStack/ModalContainer.tsx
index 333663dbab..03c6cea790 100644
--- a/app/stacks/MasterDetailStack/ModalContainer.tsx
+++ b/app/stacks/MasterDetailStack/ModalContainer.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { StyleSheet, TouchableWithoutFeedback, useWindowDimensions, View } from 'react-native';
-import { StackNavigationProp } from '@react-navigation/stack';
 import { NavigationContainerProps } from '@react-navigation/core';
 import { useKeyboard } from '@react-native-community/hooks';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
 import sharedStyles from '../../views/Styles';
 import { themes } from '../../lib/constants';
@@ -12,7 +12,7 @@ import { isAndroid } from '../../lib/methods/helpers';
 const MODAL_MARGIN = 32;
 
 interface IModalContainer extends NavigationContainerProps {
-	navigation: StackNavigationProp<any>;
+	navigation: NativeStackNavigationProp<any>;
 	children: React.ReactNode;
 	theme: TSupportedThemes;
 }
diff --git a/app/stacks/MasterDetailStack/index.tsx b/app/stacks/MasterDetailStack/index.tsx
index 78ead1b65e..48cbe0c345 100644
--- a/app/stacks/MasterDetailStack/index.tsx
+++ b/app/stacks/MasterDetailStack/index.tsx
@@ -1,15 +1,9 @@
 import React from 'react';
-import { createStackNavigator, StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
+import { createNativeStackNavigator, NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { createDrawerNavigator } from '@react-navigation/drawer';
 
 import { ThemeContext } from '../../theme';
-import {
-	FadeFromCenterModal,
-	StackAnimation,
-	defaultHeader,
-	themedHeader,
-	drawerStyle
-} from '../../lib/methods/helpers/navigation';
+import { defaultHeader, themedHeader, drawerStyle } from '../../lib/methods/helpers/navigation';
 // Chats Stack
 import RoomView from '../../views/RoomView';
 import RoomsListView from '../../views/RoomsListView';
@@ -81,14 +75,13 @@ import { TNavigation } from '../stackType';
 import { SupportedVersionsWarning } from '../../containers/SupportedVersions';
 
 // ChatsStackNavigator
-const ChatsStack = createStackNavigator<MasterDetailChatsStackParamList>();
+const ChatsStack = createNativeStackNavigator<MasterDetailChatsStackParamList>();
 const ChatsStackNavigator = React.memo(() => {
 	const { theme } = React.useContext(ThemeContext);
 
 	return (
-		<ChatsStack.Navigator
-			screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...StackAnimation } as StackNavigationOptions}>
-			<ChatsStack.Screen name='RoomView' component={RoomView} options={{ headerShown: false }} />
+		<ChatsStack.Navigator screenOptions={{ ...defaultHeader, ...themedHeader(theme) }}>
+			<ChatsStack.Screen name='RoomView' component={RoomView} options={{ title: '' }} />
 		</ChatsStack.Navigator>
 	);
 });
@@ -104,17 +97,20 @@ const DrawerNavigator = React.memo(() => (
 ));
 
 export interface INavigation {
-	navigation: StackNavigationProp<ModalStackParamList>;
+	navigation: NativeStackNavigationProp<ModalStackParamList>;
 }
 
-const ModalStack = createStackNavigator<ModalStackParamList & TNavigation>();
+const ModalStack = createNativeStackNavigator<ModalStackParamList & TNavigation>();
 const ModalStackNavigator = React.memo(({ navigation }: INavigation) => {
 	const { theme } = React.useContext(ThemeContext);
 	return (
 		<ModalContainer navigation={navigation} theme={theme}>
-			<ModalStack.Navigator
-				screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...StackAnimation } as StackNavigationOptions}>
-				<ModalStack.Screen name='RoomActionsView' component={RoomActionsView} options={RoomActionsView.navigationOptions} />
+			<ModalStack.Navigator screenOptions={{ ...defaultHeader, ...themedHeader(theme) }}>
+				<ModalStack.Screen
+					name='RoomActionsView'
+					component={RoomActionsView}
+					options={props => RoomActionsView.navigationOptions!({ ...props, isMasterDetail: true })}
+				/>
 				{/* @ts-ignore */}
 				<ModalStack.Screen name='RoomInfoView' component={RoomInfoView} />
 				<ModalStack.Screen name='ReportUserView' component={ReportUserView} />
@@ -205,19 +201,16 @@ const ModalStackNavigator = React.memo(({ navigation }: INavigation) => {
 });
 
 // InsideStackNavigator
-const InsideStack = createStackNavigator<MasterDetailInsideStackParamList & TNavigation>();
+const InsideStack = createNativeStackNavigator<MasterDetailInsideStackParamList & TNavigation>();
 const InsideStackNavigator = React.memo(() => {
 	const { theme } = React.useContext(ThemeContext);
 	return (
 		<InsideStack.Navigator
-			screenOptions={
-				{
-					...defaultHeader,
-					...themedHeader(theme),
-					...FadeFromCenterModal,
-					presentation: 'transparentModal'
-				} as StackNavigationOptions
-			}>
+			screenOptions={{
+				...defaultHeader,
+				...themedHeader(theme),
+				presentation: 'containedTransparentModal'
+			}}>
 			<InsideStack.Screen name='DrawerNavigator' component={DrawerNavigator} options={{ headerShown: false }} />
 			<InsideStack.Screen name='ModalStackNavigator' component={ModalStackNavigator} options={{ headerShown: false }} />
 			<InsideStack.Screen name='AttachmentView' component={AttachmentView} />
@@ -226,7 +219,10 @@ const InsideStackNavigator = React.memo(() => {
 			<InsideStack.Screen
 				name='JitsiMeetView'
 				component={JitsiMeetView}
-				options={{ headerShown: false, animationEnabled: isIOS }}
+				options={{
+					headerShown: false,
+					animation: isIOS ? 'default' : 'none'
+				}}
 			/>
 			{/* @ts-ignore */}
 			<InsideStack.Screen name='ShareView' component={ShareView} />
diff --git a/app/stacks/OutsideStack.tsx b/app/stacks/OutsideStack.tsx
index 4065704445..9202faa998 100644
--- a/app/stacks/OutsideStack.tsx
+++ b/app/stacks/OutsideStack.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
-import { createStackNavigator, StackNavigationOptions } from '@react-navigation/stack';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import { connect } from 'react-redux';
 
 import { ThemeContext } from '../theme';
-import { ModalAnimation, StackAnimation, defaultHeader, themedHeader } from '../lib/methods/helpers/navigation';
+import { defaultHeader, themedHeader } from '../lib/methods/helpers/navigation';
 // Outside Stack
 import NewServerView from '../views/NewServerView';
 import WorkspaceView from '../views/WorkspaceView';
@@ -16,17 +16,17 @@ import AuthenticationWebView from '../views/AuthenticationWebView';
 import { OutsideModalParamList, OutsideParamList } from './types';
 
 // Outside
-const Outside = createStackNavigator<OutsideParamList>();
+const Outside = createNativeStackNavigator<OutsideParamList>();
 const _OutsideStack = () => {
 	const { theme } = React.useContext(ThemeContext);
 
 	return (
-		<Outside.Navigator screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...StackAnimation } as StackNavigationOptions}>
+		<Outside.Navigator screenOptions={{ ...defaultHeader, ...themedHeader(theme) }}>
 			{/* @ts-ignore */}
 			<Outside.Screen name='NewServerView' component={NewServerView} options={NewServerView.navigationOptions} />
 			<Outside.Screen name='WorkspaceView' component={WorkspaceView} />
-			{/* @ts-ignore */}
-			<Outside.Screen name='LoginView' component={LoginView} options={LoginView.navigationOptions} />
+
+			<Outside.Screen name='LoginView' component={LoginView} />
 			<Outside.Screen name='ForgotPasswordView' component={ForgotPasswordView} />
 			{/* @ts-ignore */}
 			<Outside.Screen name='SendEmailConfirmationView' component={SendEmailConfirmationView} />
@@ -45,13 +45,13 @@ const mapStateToProps = (state: any) => ({
 const OutsideStack = connect(mapStateToProps)(_OutsideStack);
 
 // OutsideStackModal
-const OutsideModal = createStackNavigator<OutsideModalParamList>();
+const OutsideModal = createNativeStackNavigator<OutsideModalParamList>();
 const OutsideStackModal = () => {
 	const { theme } = React.useContext(ThemeContext);
 
 	return (
 		<OutsideModal.Navigator
-			screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...ModalAnimation, presentation: 'transparentModal' }}>
+			screenOptions={{ ...defaultHeader, ...themedHeader(theme), presentation: 'containedTransparentModal' }}>
 			<OutsideModal.Screen name='OutsideStack' component={OutsideStack} options={{ headerShown: false }} />
 			<OutsideModal.Screen name='AuthenticationWebView' component={AuthenticationWebView} />
 		</OutsideModal.Navigator>
diff --git a/app/stacks/ShareExtensionStack.tsx b/app/stacks/ShareExtensionStack.tsx
index 07d4aa31c7..477115109e 100644
--- a/app/stacks/ShareExtensionStack.tsx
+++ b/app/stacks/ShareExtensionStack.tsx
@@ -1,19 +1,18 @@
 import React from 'react';
-import { createStackNavigator, StackNavigationOptions } from '@react-navigation/stack';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
 
 import { ThemeContext } from '../theme';
-import { StackAnimation, defaultHeader, themedHeader } from '../lib/methods/helpers/navigation';
+import { defaultHeader, themedHeader } from '../lib/methods/helpers/navigation';
 import SelectServerView from '../views/SelectServerView';
 import ShareListView from '../views/ShareListView';
 import ShareView from '../views/ShareView';
 
-const ShareExtension = createStackNavigator<any>();
+const ShareExtension = createNativeStackNavigator<any>();
 const ShareExtensionStack = () => {
 	const { theme } = React.useContext(ThemeContext);
 
 	return (
-		<ShareExtension.Navigator
-			screenOptions={{ ...defaultHeader, ...themedHeader(theme), ...StackAnimation } as StackNavigationOptions}>
+		<ShareExtension.Navigator screenOptions={{ ...defaultHeader, ...themedHeader(theme) }}>
 			{/* @ts-ignore */}
 			<ShareExtension.Screen name='ShareListView' component={ShareListView} />
 			{/* @ts-ignore */}
diff --git a/app/static/images/logo_with_name.png b/app/static/images/logo_with_name.png
new file mode 100644
index 0000000000..c799cd926d
Binary files /dev/null and b/app/static/images/logo_with_name.png differ
diff --git a/app/views/AddChannelTeamView.tsx b/app/views/AddChannelTeamView.tsx
index e2da06e982..c21c50778d 100644
--- a/app/views/AddChannelTeamView.tsx
+++ b/app/views/AddChannelTeamView.tsx
@@ -1,12 +1,11 @@
-import React, { useEffect } from 'react';
-import { StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
+import React, { useLayoutEffect } from 'react';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/native';
 import { useSelector } from 'react-redux';
 import { CompositeNavigationProp } from '@react-navigation/core';
 
 import * as List from '../containers/List';
 import StatusBar from '../containers/StatusBar';
-import * as HeaderButton from '../containers/HeaderButton';
 import SafeAreaView from '../containers/SafeAreaView';
 import I18n from '../i18n';
 import { ChatsStackParamList, DrawerParamList, NewMessageStackParamList } from '../stacks/types';
@@ -15,28 +14,10 @@ import { IApplicationState } from '../definitions';
 type TRoute = RouteProp<ChatsStackParamList, 'AddChannelTeamView'>;
 
 type TNavigation = CompositeNavigationProp<
-	StackNavigationProp<ChatsStackParamList, 'AddChannelTeamView'>,
-	CompositeNavigationProp<StackNavigationProp<NewMessageStackParamList>, StackNavigationProp<DrawerParamList>>
+	NativeStackNavigationProp<ChatsStackParamList, 'AddChannelTeamView'>,
+	CompositeNavigationProp<NativeStackNavigationProp<NewMessageStackParamList>, NativeStackNavigationProp<DrawerParamList>>
 >;
 
-const setHeader = ({
-	navigation,
-	isMasterDetail
-}: {
-	navigation: StackNavigationProp<ChatsStackParamList, 'AddChannelTeamView'>;
-	isMasterDetail: boolean;
-}) => {
-	const options: StackNavigationOptions = {
-		headerTitle: I18n.t('Add_Channel_to_Team')
-	};
-
-	if (isMasterDetail) {
-		options.headerLeft = () => <HeaderButton.CloseModal navigation={navigation} />;
-	}
-
-	navigation.setOptions(options);
-};
-
 const AddChannelTeamView = () => {
 	const navigation = useNavigation<TNavigation>();
 	const isMasterDetail = useSelector((state: IApplicationState) => state.app.isMasterDetail);
@@ -44,9 +25,9 @@ const AddChannelTeamView = () => {
 		params: { teamId }
 	} = useRoute<TRoute>();
 
-	useEffect(() => {
-		setHeader({ navigation, isMasterDetail });
-	}, [isMasterDetail, navigation]);
+	useLayoutEffect(() => {
+		navigation.setOptions({ title: I18n.t('Add_Channel_to_Team') });
+	}, [navigation]);
 
 	return (
 		<SafeAreaView testID='add-channel-team-view'>
diff --git a/app/views/AddExistingChannelView/index.tsx b/app/views/AddExistingChannelView/index.tsx
index 7b8d7be32b..09367a9b08 100644
--- a/app/views/AddExistingChannelView/index.tsx
+++ b/app/views/AddExistingChannelView/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useLayoutEffect, useState } from 'react';
-import { StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationOptions, NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/native';
 import { FlatList } from 'react-native';
 import { Q } from '@nozbe/watermelondb';
@@ -22,7 +22,7 @@ import { getRoomTitle, hasPermission, useDebounce } from '../../lib/methods/help
 import { Services } from '../../lib/services';
 import { useAppSelector } from '../../lib/hooks';
 
-type TNavigation = StackNavigationProp<ChatsStackParamList, 'AddExistingChannelView'>;
+type TNavigation = NativeStackNavigationProp<ChatsStackParamList, 'AddExistingChannelView'>;
 type TRoute = RouteProp<ChatsStackParamList, 'AddExistingChannelView'>;
 
 const QUERY_SIZE = 50;
@@ -52,7 +52,7 @@ const AddExistingChannelView = () => {
 	}, []);
 
 	const setHeader = () => {
-		const options: StackNavigationOptions = {
+		const options: NativeStackNavigationOptions = {
 			headerTitle: I18n.t('Add_Existing_Channel')
 		};
 
diff --git a/app/views/AdminPanelView/index.tsx b/app/views/AdminPanelView/index.tsx
index e1a146ab41..bd27c3f6b4 100644
--- a/app/views/AdminPanelView/index.tsx
+++ b/app/views/AdminPanelView/index.tsx
@@ -2,7 +2,7 @@ import React, { useEffect } from 'react';
 import { useNavigation } from '@react-navigation/native';
 import { WebView } from 'react-native-webview';
 import { useSelector } from 'react-redux';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
 import I18n from '../../i18n';
 import StatusBar from '../../containers/StatusBar';
@@ -13,7 +13,7 @@ import { AdminPanelStackParamList } from '../../stacks/types';
 import { IApplicationState } from '../../definitions';
 
 const AdminPanelView = () => {
-	const navigation = useNavigation<StackNavigationProp<AdminPanelStackParamList, 'AdminPanelView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<AdminPanelStackParamList, 'AdminPanelView'>>();
 	const baseUrl = useSelector((state: IApplicationState) => state.server.server);
 	const token = useSelector((state: IApplicationState) => getUserSelector(state).token);
 	const isMasterDetail = useSelector((state: IApplicationState) => state.app.isMasterDetail);
diff --git a/app/views/AttachmentView.tsx b/app/views/AttachmentView.tsx
index 85379093a9..5cc37bebea 100644
--- a/app/views/AttachmentView.tsx
+++ b/app/views/AttachmentView.tsx
@@ -1,6 +1,5 @@
 import { CameraRoll } from '@react-native-camera-roll/camera-roll';
-import { HeaderBackground, useHeaderHeight } from '@react-navigation/elements';
-import { StackNavigationOptions } from '@react-navigation/stack';
+import { useHeaderHeight } from '@react-navigation/elements';
 import { ResizeMode, Video } from 'expo-av';
 import React from 'react';
 import { PermissionsAndroid, useWindowDimensions, View } from 'react-native';
@@ -121,24 +120,15 @@ const AttachmentView = (): React.ReactElement => {
 		} catch {
 			// Do nothing
 		}
-		const options: StackNavigationOptions = {
+		const options = {
 			title: title || '',
-			headerTitleAlign: 'center',
-			headerTitleStyle: { color: colors.fontDefault },
-			headerTintColor: colors.surfaceTint,
-			headerTitleContainerStyle: { flex: 1, maxWidth: undefined },
-			headerLeftContainerStyle: { flexGrow: undefined, flexBasis: undefined },
-			headerRightContainerStyle: { flexGrow: undefined, flexBasis: undefined },
 			headerLeft: () => (
 				<HeaderButton.CloseModal testID='close-attachment-view' navigation={navigation} color={colors.fontDefault} />
 			),
 			headerRight: () =>
 				Allow_Save_Media_to_Gallery && !isImageBase64(attachment.image_url) ? (
 					<HeaderButton.Download testID='save-image' onPress={handleSave} color={colors.fontDefault} />
-				) : null,
-			headerBackground: () => (
-				<HeaderBackground style={{ backgroundColor: colors.surfaceNeutral, shadowOpacity: 0, elevation: 0 }} />
-			)
+				) : null
 		};
 		navigation.setOptions(options);
 	};
diff --git a/app/views/AuthenticationWebView.tsx b/app/views/AuthenticationWebView.tsx
index 4874f13a1d..12499a3bcc 100644
--- a/app/views/AuthenticationWebView.tsx
+++ b/app/views/AuthenticationWebView.tsx
@@ -1,6 +1,6 @@
 import { RouteProp } from '@react-navigation/core';
 import { useNavigation, useRoute } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import React, { useLayoutEffect, useState } from 'react';
 import { WebView, WebViewNavigation } from 'react-native-webview';
 import { WebViewMessage } from 'react-native-webview/lib/WebViewTypes';
@@ -44,7 +44,7 @@ const AuthenticationWebView = () => {
 	const [logging, setLogging] = useState(false);
 	const [loading, setLoading] = useState(false);
 
-	const navigation = useNavigation<StackNavigationProp<OutsideModalParamList, 'AuthenticationWebView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<OutsideModalParamList, 'AuthenticationWebView'>>();
 	const {
 		params: { authType, url, ssoToken }
 	} = useRoute<RouteProp<OutsideModalParamList, 'AuthenticationWebView'>>();
diff --git a/app/views/CannedResponseDetail.tsx b/app/views/CannedResponseDetail.tsx
index 66f0ab7b76..35a4990656 100644
--- a/app/views/CannedResponseDetail.tsx
+++ b/app/views/CannedResponseDetail.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect } from 'react';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { RouteProp } from '@react-navigation/native';
 import { StyleSheet, Text, View, ScrollView } from 'react-native';
 
@@ -87,7 +87,7 @@ const Item = ({ label, content, theme, testID }: IItem) =>
 	) : null;
 
 interface ICannedResponseDetailProps {
-	navigation: StackNavigationProp<ChatsStackParamList, 'CannedResponseDetail'>;
+	navigation: NativeStackNavigationProp<ChatsStackParamList, 'CannedResponseDetail'>;
 	route: RouteProp<ChatsStackParamList, 'CannedResponseDetail'>;
 }
 
diff --git a/app/views/CannedResponsesListView/index.tsx b/app/views/CannedResponsesListView/index.tsx
index ebf3886c5a..23294e752b 100644
--- a/app/views/CannedResponsesListView/index.tsx
+++ b/app/views/CannedResponsesListView/index.tsx
@@ -1,8 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { FlatList } from 'react-native';
 import { RouteProp } from '@react-navigation/native';
-import { StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
-import { HeaderBackButton } from '@react-navigation/elements';
+import { NativeStackNavigationOptions, NativeStackNavigationProp } from '@react-navigation/native-stack';
 
 import database from '../../lib/database';
 import I18n from '../../i18n';
@@ -47,7 +46,7 @@ const fixedScopes = [
 ] as ILivechatDepartment[];
 
 interface ICannedResponsesListViewProps {
-	navigation: StackNavigationProp<ChatsStackParamList, 'CannedResponsesListView'>;
+	navigation: NativeStackNavigationProp<ChatsStackParamList, 'CannedResponsesListView'>;
 	route: RouteProp<ChatsStackParamList, 'CannedResponsesListView'>;
 }
 
@@ -209,12 +208,9 @@ const CannedResponsesListView = ({ navigation, route }: ICannedResponsesListView
 		await getListCannedResponse({ text: searchText, department: scope, depId: departmentId, debounced: false });
 	};
 
-	const getHeader = (): StackNavigationOptions => {
+	const getHeader = () => {
 		if (isSearching) {
 			return {
-				headerTitleAlign: 'left',
-				headerTitleContainerStyle: { flex: 1, marginHorizontal: 0, marginRight: 15, maxWidth: undefined },
-				headerRightContainerStyle: { flexGrow: 0 },
 				headerLeft: () => (
 					<HeaderButton.Container left>
 						<HeaderButton.Item
@@ -231,19 +227,9 @@ const CannedResponsesListView = ({ navigation, route }: ICannedResponsesListView
 			};
 		}
 
-		const options: StackNavigationOptions = {
-			headerTitleAlign: undefined,
+		const options: NativeStackNavigationOptions = {
+			headerLeft: () => null,
 			headerTitle: I18n.t('Canned_Responses'),
-			headerTitleContainerStyle: { maxWidth: undefined },
-			headerRightContainerStyle: { flexGrow: 1 },
-			headerLeft: () => (
-				<HeaderBackButton
-					labelVisible={false}
-					onPress={() => navigation.pop()}
-					tintColor={themes[theme].fontSecondaryInfo}
-					testID='header-back'
-				/>
-			),
 			headerRight: () => (
 				<HeaderButton.Container>
 					<HeaderButton.Item iconName='filter' onPress={showFilters} />
@@ -252,10 +238,6 @@ const CannedResponsesListView = ({ navigation, route }: ICannedResponsesListView
 			)
 		};
 
-		if (isMasterDetail) {
-			options.headerLeft = () => <HeaderButton.CloseModal navigation={navigation} />;
-		}
-
 		return options;
 	};
 
diff --git a/app/views/ChangeAvatarView/index.tsx b/app/views/ChangeAvatarView/index.tsx
index fdfe013cf0..64ff03100f 100644
--- a/app/views/ChangeAvatarView/index.tsx
+++ b/app/views/ChangeAvatarView/index.tsx
@@ -1,8 +1,9 @@
 import React, { useEffect, useLayoutEffect, useReducer, useRef, useState } from 'react';
 import { ScrollView, View } from 'react-native';
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { shallowEqual } from 'react-redux';
+import { HeaderBackButton } from '@react-navigation/elements';
 
 import KeyboardView from '../../containers/KeyboardView';
 import sharedStyles from '../Styles';
@@ -74,12 +75,20 @@ const ChangeAvatarView = () => {
 		shallowEqual
 	);
 	const isDirty = useRef<boolean>(false);
-	const navigation = useNavigation<StackNavigationProp<ChatsStackParamList, 'ChangeAvatarView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<ChatsStackParamList, 'ChangeAvatarView'>>();
 	const { context, titleHeader, room, t } = useRoute<RouteProp<ChatsStackParamList, 'ChangeAvatarView'>>().params;
 
 	useLayoutEffect(() => {
 		navigation.setOptions({
-			title: titleHeader || I18n.t('Avatar')
+			title: titleHeader || I18n.t('Avatar'),
+			headerLeft: () => (
+				<HeaderBackButton
+					labelVisible={false}
+					onPress={() => navigation.goBack()}
+					tintColor={colors.fontDefault}
+					testID='header-back'
+				/>
+			)
 		});
 	}, [titleHeader, navigation]);
 
@@ -165,8 +174,7 @@ const ChangeAvatarView = () => {
 				<ScrollView
 					contentContainerStyle={sharedStyles.containerScrollView}
 					testID='change-avatar-view-list'
-					{...scrollPersistTaps}
-				>
+					{...scrollPersistTaps}>
 					<View style={styles.avatarContainer} testID='change-avatar-view-avatar'>
 						{deletingRoomAvatar ? (
 							<AvatarPresentational
diff --git a/app/views/CreateChannelView/index.tsx b/app/views/CreateChannelView/index.tsx
index 653a437108..2e8b9d7cb2 100644
--- a/app/views/CreateChannelView/index.tsx
+++ b/app/views/CreateChannelView/index.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useLayoutEffect } from 'react';
 import { shallowEqual, useDispatch } from 'react-redux';
 import { FlatList, ScrollView, StyleSheet, Text, View } from 'react-native';
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { useForm } from 'react-hook-form';
 
 import { useAppSelector, usePermissions } from '../../lib/hooks';
@@ -93,7 +93,7 @@ const CreateChannelView = () => {
 		}
 	});
 
-	const navigation = useNavigation<StackNavigationProp<ChatsStackParamList, 'CreateChannelView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<ChatsStackParamList, 'CreateChannelView'>>();
 	const { params } = useRoute<RouteProp<ChatsStackParamList, 'CreateChannelView'>>();
 	const isTeam = params?.isTeam || false;
 	const teamId = params?.teamId;
diff --git a/app/views/CreateDiscussionView/index.tsx b/app/views/CreateDiscussionView/index.tsx
index 541920a8db..7dac898001 100644
--- a/app/views/CreateDiscussionView/index.tsx
+++ b/app/views/CreateDiscussionView/index.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import { ScrollView, Text } from 'react-native';
-import { StackNavigationOptions } from '@react-navigation/stack';
 
 import { sendLoadingEvent } from '../../containers/Loading';
 import KeyboardView from '../../containers/KeyboardView';
@@ -84,9 +83,9 @@ class CreateChannelView extends React.Component<ICreateChannelViewProps, ICreate
 							<HeaderButton.Item title={I18n.t('Create')} onPress={this.submit} testID='create-discussion-submit' />
 						</HeaderButton.Container>
 				  )
-				: null,
+				: () => null,
 			headerLeft: showCloseModal ? () => <HeaderButton.CloseModal navigation={navigation} /> : undefined
-		} as StackNavigationOptions);
+		});
 	};
 
 	submit = () => {
diff --git a/app/views/DirectoryView/index.tsx b/app/views/DirectoryView/index.tsx
index 7c872a363b..33a7071d73 100644
--- a/app/views/DirectoryView/index.tsx
+++ b/app/views/DirectoryView/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { FlatList, ListRenderItem } from 'react-native';
 import { connect } from 'react-redux';
-import { StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationOptions, NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { CompositeNavigationProp } from '@react-navigation/native';
 
 import { hideActionSheetRef, showActionSheetRef } from '../../containers/ActionSheet';
@@ -30,8 +30,8 @@ import { getSubscriptionByRoomId } from '../../lib/database/services/Subscriptio
 
 interface IDirectoryViewProps {
 	navigation: CompositeNavigationProp<
-		StackNavigationProp<ChatsStackParamList, 'DirectoryView'>,
-		StackNavigationProp<MasterDetailInsideStackParamList>
+		NativeStackNavigationProp<ChatsStackParamList, 'DirectoryView'>,
+		NativeStackNavigationProp<MasterDetailInsideStackParamList>
 	>;
 	baseUrl: string;
 	isFederationEnabled: boolean;
@@ -70,7 +70,7 @@ class DirectoryView extends React.Component<IDirectoryViewProps, IDirectoryViewS
 
 	setHeader = () => {
 		const { navigation, isMasterDetail } = this.props;
-		const options: StackNavigationOptions = {
+		const options: NativeStackNavigationOptions = {
 			title: I18n.t('Directory'),
 			headerRight: () => (
 				<HeaderButton.Container>
diff --git a/app/views/DiscussionsView/index.tsx b/app/views/DiscussionsView/index.tsx
index 31d81be6eb..b740f269c2 100644
--- a/app/views/DiscussionsView/index.tsx
+++ b/app/views/DiscussionsView/index.tsx
@@ -1,7 +1,6 @@
 import React, { useEffect, useLayoutEffect, useRef, useState } from 'react';
 import { FlatList, StyleSheet } from 'react-native';
-import { StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
-import { HeaderBackButton } from '@react-navigation/elements';
+import { NativeStackNavigationOptions, NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { RouteProp } from '@react-navigation/core';
 
 import { IMessageFromServer, TThreadModel } from '../../definitions';
@@ -30,7 +29,7 @@ const styles = StyleSheet.create({
 });
 
 interface IDiscussionsViewProps {
-	navigation: StackNavigationProp<ChatsStackParamList, 'DiscussionsView'>;
+	navigation: NativeStackNavigationProp<ChatsStackParamList, 'DiscussionsView'>;
 	route: RouteProp<ChatsStackParamList, 'DiscussionsView'>;
 	item: TThreadModel;
 }
@@ -102,12 +101,9 @@ const DiscussionsView = ({ navigation, route }: IDiscussionsViewProps): React.Re
 	};
 
 	const setHeader = () => {
-		let options: Partial<StackNavigationOptions>;
+		let options: Partial<NativeStackNavigationOptions>;
 		if (isSearching) {
 			options = {
-				headerTitleAlign: 'left',
-				headerTitleContainerStyle: { flex: 1, marginHorizontal: 0, marginRight: 15, maxWidth: undefined },
-				headerRightContainerStyle: { flexGrow: 0 },
 				headerLeft: () => (
 					<HeaderButton.Container left>
 						<HeaderButton.Item iconName='close' onPress={onCancelSearchPress} />
@@ -122,18 +118,8 @@ const DiscussionsView = ({ navigation, route }: IDiscussionsViewProps): React.Re
 		}
 
 		options = {
-			headerTitleAlign: 'center',
+			headerLeft: () => null,
 			headerTitle: I18n.t('Discussions'),
-			headerTitleContainerStyle: {},
-			headerRightContainerStyle: { flexGrow: 1 },
-			headerLeft: () => (
-				<HeaderBackButton
-					labelVisible={false}
-					onPress={() => navigation.pop()}
-					tintColor={colors.fontSecondaryInfo}
-					testID='header-back'
-				/>
-			),
 			headerRight: () => (
 				<HeaderButton.Container>
 					<HeaderButton.Item iconName='search' onPress={onSearchPress} />
diff --git a/app/views/DisplayPrefsView.tsx b/app/views/DisplayPrefsView.tsx
index 8e7f8ec697..11472dab13 100644
--- a/app/views/DisplayPrefsView.tsx
+++ b/app/views/DisplayPrefsView.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect } from 'react';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { useNavigation } from '@react-navigation/native';
 import { Switch } from 'react-native';
 import { RadioButton } from 'react-native-ui-lib';
@@ -21,7 +21,7 @@ import { saveSortPreference } from '../lib/methods';
 import { useAppSelector } from '../lib/hooks';
 
 const DisplayPrefsView = (): React.ReactElement => {
-	const navigation = useNavigation<StackNavigationProp<SettingsStackParamList, 'DisplayPrefsView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<SettingsStackParamList, 'DisplayPrefsView'>>();
 	const { colors } = useTheme();
 
 	const { sortBy, groupByType, showFavorites, showUnread, showAvatar, displayMode } = useAppSelector(
diff --git a/app/views/E2EEncryptionSecurityView/index.tsx b/app/views/E2EEncryptionSecurityView/index.tsx
index 5c1f03c4b7..a29d9e8d4a 100644
--- a/app/views/E2EEncryptionSecurityView/index.tsx
+++ b/app/views/E2EEncryptionSecurityView/index.tsx
@@ -1,6 +1,6 @@
 import React, { useLayoutEffect } from 'react';
 import { StyleSheet, Text, View } from 'react-native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { useDispatch } from 'react-redux';
 import { useNavigation } from '@react-navigation/native';
 
@@ -35,7 +35,7 @@ const styles = StyleSheet.create({
 });
 
 const E2EEncryptionSecurityView = () => {
-	const navigation = useNavigation<StackNavigationProp<SettingsStackParamList, 'E2EEncryptionSecurityView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<SettingsStackParamList, 'E2EEncryptionSecurityView'>>();
 	const { colors } = useTheme();
 	const dispatch = useDispatch();
 
diff --git a/app/views/E2ESaveYourPasswordView.tsx b/app/views/E2ESaveYourPasswordView.tsx
index 81fb5e32c6..331a484154 100644
--- a/app/views/E2ESaveYourPasswordView.tsx
+++ b/app/views/E2ESaveYourPasswordView.tsx
@@ -3,7 +3,7 @@ import React, { useEffect, useLayoutEffect, useState } from 'react';
 import { ScrollView, StyleSheet, Text, View } from 'react-native';
 import { useDispatch } from 'react-redux';
 import { StackActions, useNavigation } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
 import { encryptionSetBanner } from '../actions/encryption';
 import Button from '../containers/Button';
@@ -60,7 +60,7 @@ const styles = StyleSheet.create({
 
 const E2ESaveYourPasswordView = () => {
 	const server = useAppSelector(state => state.server.server);
-	const navigation = useNavigation<StackNavigationProp<E2ESaveYourPasswordStackParamList, 'E2ESaveYourPasswordView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<E2ESaveYourPasswordStackParamList, 'E2ESaveYourPasswordView'>>();
 	const dispatch = useDispatch();
 	const [password, setPassword] = useState('');
 	const { colors } = useTheme();
diff --git a/app/views/ForgotPasswordView.tsx b/app/views/ForgotPasswordView.tsx
index 8acc69b849..ead70e23ba 100644
--- a/app/views/ForgotPasswordView.tsx
+++ b/app/views/ForgotPasswordView.tsx
@@ -1,7 +1,7 @@
 import React, { useLayoutEffect, useState } from 'react';
 import { Text } from 'react-native';
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { useForm } from 'react-hook-form';
 import * as yup from 'yup';
 import { yupResolver } from '@hookform/resolvers/yup';
@@ -34,7 +34,7 @@ const ForgotPasswordView = (): React.ReactElement => {
 
 	const [isFetching, setIsFetching] = useState(false);
 
-	const navigation = useNavigation<StackNavigationProp<OutsideParamList, 'ForgotPasswordView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<OutsideParamList, 'ForgotPasswordView'>>();
 	const { params } = useRoute<RouteProp<OutsideParamList, 'ForgotPasswordView'>>();
 	const { colors } = useTheme();
 
@@ -67,20 +67,21 @@ const ForgotPasswordView = (): React.ReactElement => {
 	return (
 		<FormContainer testID='forgot-password-view'>
 			<FormContainerInner>
-				<Text style={[sharedStyles.loginTitle, sharedStyles.textBold, { color: colors.fontTitlesLabels }]}>
-					{I18n.t('Forgot_password')}
+				<Text style={[sharedStyles.loginTitle, sharedStyles.textBold, { color: colors.fontTitlesLabels, fontSize: 24 }]}>
+					{I18n.t('Reset_password')}
+				</Text>
+				<Text style={[sharedStyles.textMedium, { color: colors.fontTitlesLabels, lineHeight: 22, fontSize: 16 }]}>
+					{I18n.t('email')}
 				</Text>
 				<ControlledFormTextInput
 					name='email'
 					control={control}
 					autoFocus
-					placeholder={I18n.t('Email')}
 					keyboardType='email-address'
 					returnKeyType='send'
-					iconLeft='mail'
 					onSubmitEditing={handleSubmit(resetPassword)}
 					testID='forgot-password-view-email'
-					containerStyle={sharedStyles.inputLastChild}
+					containerStyle={{ marginBottom: 20 }}
 				/>
 				<Button
 					title={I18n.t('Reset_password')}
diff --git a/app/views/ForwardMessageView/index.tsx b/app/views/ForwardMessageView/index.tsx
index 8b3d721dfc..63f3212a46 100644
--- a/app/views/ForwardMessageView/index.tsx
+++ b/app/views/ForwardMessageView/index.tsx
@@ -1,6 +1,5 @@
 import React, { useLayoutEffect, useState } from 'react';
 import { Alert, ScrollView, View } from 'react-native';
-import { StackNavigationOptions } from '@react-navigation/stack';
 import { RouteProp, StackActions, useNavigation, useRoute } from '@react-navigation/native';
 
 import { getPermalinkMessage } from '../../lib/methods';
@@ -54,7 +53,7 @@ const ForwardMessageView = () => {
 				</HeaderButton.Container>
 			),
 			headerLeft: () => <HeaderButton.CloseModal />
-		} as StackNavigationOptions);
+		});
 	}, [rooms.length, navigation, sending]);
 
 	const handlePostMessage = async () => {
diff --git a/app/views/GetHelpView.tsx b/app/views/GetHelpView.tsx
index 82fa1eb2c7..2a6ae0ecf3 100644
--- a/app/views/GetHelpView.tsx
+++ b/app/views/GetHelpView.tsx
@@ -1,6 +1,6 @@
 import { useLayoutEffect } from 'react';
 import { useNavigation } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
 import SafeAreaView from '../containers/SafeAreaView';
 import * as List from '../containers/List';
@@ -16,7 +16,7 @@ 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 navigation = useNavigation<NativeStackNavigationProp<SettingsStackParamList, 'GetHelpView'>>();
 	const { theme } = useTheme();
 
 	useLayoutEffect(() => {
diff --git a/app/views/InviteUsersEditView/index.tsx b/app/views/InviteUsersEditView/index.tsx
index 5fc2f3b993..f39dd626c4 100644
--- a/app/views/InviteUsersEditView/index.tsx
+++ b/app/views/InviteUsersEditView/index.tsx
@@ -1,4 +1,4 @@
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import React, { useLayoutEffect } from 'react';
 import { View } from 'react-native';
 import { useDispatch } from 'react-redux';
@@ -16,7 +16,7 @@ import styles from './styles';
 import Picker from './Picker';
 
 const InviteUsersEditView = () => {
-	const navigation = useNavigation<StackNavigationProp<ChatsStackParamList, 'InviteUsersEditView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<ChatsStackParamList, 'InviteUsersEditView'>>();
 	const { rid } = useRoute<RouteProp<ChatsStackParamList, 'InviteUsersEditView'>>().params;
 	const dispatch = useDispatch();
 
diff --git a/app/views/LanguageView/index.tsx b/app/views/LanguageView/index.tsx
index 26d1a0352d..ab54987cef 100644
--- a/app/views/LanguageView/index.tsx
+++ b/app/views/LanguageView/index.tsx
@@ -3,7 +3,7 @@ import { FlatList } from 'react-native';
 import RNRestart from 'react-native-restart';
 import { useDispatch } from 'react-redux';
 import { useNavigation } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
 import { useAppSelector } from '../../lib/hooks';
 import { appStart } from '../../actions/app';
@@ -29,7 +29,7 @@ const LanguageView = () => {
 	const language = languageDefault || 'en';
 
 	const dispatch = useDispatch();
-	const navigation = useNavigation<StackNavigationProp<SettingsStackParamList, 'LanguageView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<SettingsStackParamList, 'LanguageView'>>();
 
 	useLayoutEffect(() => {
 		navigation.setOptions({
diff --git a/app/views/LivechatEditView.tsx b/app/views/LivechatEditView.tsx
index c731618c41..89d0de8034 100644
--- a/app/views/LivechatEditView.tsx
+++ b/app/views/LivechatEditView.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { RouteProp } from '@react-navigation/native';
 import { ScrollView, StyleSheet, Text } from 'react-native';
 import { connect } from 'react-redux';
@@ -45,7 +45,7 @@ const styles = StyleSheet.create({
 
 interface ILivechatEditViewProps {
 	user: IUser;
-	navigation: StackNavigationProp<ChatsStackParamList, 'LivechatEditView'>;
+	navigation: NativeStackNavigationProp<ChatsStackParamList, 'LivechatEditView'>;
 	route: RouteProp<ChatsStackParamList, 'LivechatEditView'>;
 	theme: TSupportedThemes;
 	editOmnichannelContact: string[] | undefined;
diff --git a/app/views/LoginView/UserForm.tsx b/app/views/LoginView/UserForm.tsx
index 5f114569e4..579ede84b8 100644
--- a/app/views/LoginView/UserForm.tsx
+++ b/app/views/LoginView/UserForm.tsx
@@ -2,13 +2,14 @@ import React, { useEffect } from 'react';
 import { Keyboard, Text, View, Alert } from 'react-native';
 import { useDispatch } from 'react-redux';
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import * as yup from 'yup';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useForm } from 'react-hook-form';
 
 import { loginRequest } from '../../actions/login';
 import Button from '../../containers/Button';
+import { useWorkspaceDomain } from '../../lib/hooks/useWorkspaceDomain';
 import { ControlledFormTextInput } from '../../containers/TextInput';
 import I18n from '../../i18n';
 import { OutsideParamList } from '../../stacks/types';
@@ -32,7 +33,8 @@ const schema = yup.object().shape({
 const UserForm = () => {
 	const { colors } = useTheme();
 	const dispatch = useDispatch();
-	const navigation = useNavigation<StackNavigationProp<OutsideParamList, 'LoginView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<OutsideParamList, 'LoginView'>>();
+	const workspaceDomain = useWorkspaceDomain();
 
 	const {
 		params: { username }
@@ -53,7 +55,6 @@ const UserForm = () => {
 		Accounts_RegistrationForm_LinkReplacementText,
 		isFetching,
 		Accounts_RegistrationForm,
-		Site_Name,
 		inviteLinkToken,
 		error,
 		failure
@@ -64,7 +65,6 @@ const UserForm = () => {
 		Accounts_EmailOrUsernamePlaceholder: state.settings.Accounts_EmailOrUsernamePlaceholder as string,
 		Accounts_PasswordPlaceholder: state.settings.Accounts_PasswordPlaceholder as string,
 		Accounts_PasswordReset: state.settings.Accounts_PasswordReset as boolean,
-		Site_Name: state.settings.Site_Name as string,
 		inviteLinkToken: state.inviteLinks.token,
 		failure: state.login.failure,
 		error: state.login.error && state.login.error.data
@@ -85,11 +85,11 @@ const UserForm = () => {
 		Accounts_RegistrationForm === 'Public' || (Accounts_RegistrationForm === 'Secret URL' && inviteLinkToken?.length);
 
 	const register = () => {
-		navigation.navigate('RegisterView', { title: Site_Name });
+		navigation.navigate('RegisterView', { title: workspaceDomain });
 	};
 
 	const forgotPassword = () => {
-		navigation.navigate('ForgotPasswordView', { title: Site_Name });
+		navigation.navigate('ForgotPasswordView', { title: workspaceDomain });
 	};
 
 	const submit = ({ password, user }: ISubmit) => {
@@ -103,67 +103,65 @@ const UserForm = () => {
 	return (
 		<>
 			<Text style={[styles.title, sharedStyles.textBold, { color: colors.fontTitlesLabels }]}>{I18n.t('Login')}</Text>
-			<ControlledFormTextInput
-				name='user'
-				control={control}
-				label={I18n.t('Username_or_email')}
-				containerStyle={styles.inputContainer}
-				placeholder={Accounts_EmailOrUsernamePlaceholder || I18n.t('Username_or_email')}
-				keyboardType='email-address'
-				returnKeyType='next'
-				onSubmitEditing={() => setFocus('password')}
-				testID='login-view-email'
-				textContentType='username'
-				autoComplete='username'
-			/>
-			<ControlledFormTextInput
-				name='password'
-				control={control}
-				label={I18n.t('Password')}
-				containerStyle={styles.inputContainer}
-				placeholder={Accounts_PasswordPlaceholder || I18n.t('Password')}
-				returnKeyType='send'
-				secureTextEntry
-				onSubmitEditing={handleSubmit(submit)}
-				testID='login-view-password'
-				textContentType='password'
-				autoComplete='password'
-			/>
-			<Button
-				title={I18n.t('Login')}
-				onPress={handleSubmit(submit)}
-				testID='login-view-submit'
-				loading={isFetching}
-				disabled={!isValid}
-				style={styles.loginButton}
-			/>
-			{Accounts_PasswordReset ? (
+			<View style={styles.credentialsContainer}>
+				<ControlledFormTextInput
+					name='user'
+					control={control}
+					label={I18n.t('Username_or_email')}
+					placeholder={Accounts_EmailOrUsernamePlaceholder}
+					keyboardType='email-address'
+					returnKeyType='next'
+					onSubmitEditing={() => setFocus('password')}
+					testID='login-view-email'
+					textContentType='username'
+					autoComplete='username'
+				/>
+				<ControlledFormTextInput
+					name='password'
+					control={control}
+					label={I18n.t('Password')}
+					placeholder={Accounts_PasswordPlaceholder}
+					returnKeyType='send'
+					secureTextEntry
+					onSubmitEditing={handleSubmit(submit)}
+					testID='login-view-password'
+					textContentType='password'
+					autoComplete='password'
+				/>
 				<Button
-					title={I18n.t('Forgot_password')}
-					type='secondary'
-					onPress={forgotPassword}
-					testID='login-view-forgot-password'
-					color={colors.fontInfo}
-					fontSize={14}
-					backgroundColor='transparent'
+					title={I18n.t('Login')}
+					onPress={handleSubmit(submit)}
+					testID='login-view-submit'
+					loading={isFetching}
+					disabled={!isValid}
 				/>
-			) : null}
-			{showRegistrationButton ? (
-				<View style={styles.bottomContainer}>
-					<Text style={[styles.bottomContainerText, { color: colors.fontSecondaryInfo }]}>{I18n.t('Dont_Have_An_Account')}</Text>
-					<Text
-						style={[styles.bottomContainerTextBold, { color: colors.fontHint }]}
-						onPress={register}
-						testID='login-view-register'>
-						{I18n.t('Create_account')}
+			</View>
+			<View style={styles.bottomContainer}>
+				{Accounts_PasswordReset && (
+					<View style={styles.bottomContainerGroup}>
+						<Text style={[styles.bottomContainerText, { color: colors.fontSecondaryInfo }]}>{I18n.t('Forgot_password')}</Text>
+						<Button
+							title={I18n.t('Reset_password')}
+							type='secondary'
+							onPress={forgotPassword}
+							testID='login-view-forgot-password'
+						/>
+					</View>
+				)}
+				{showRegistrationButton ? (
+					<View style={styles.bottomContainerGroup}>
+						<Text style={[styles.bottomContainerText, { color: colors.fontSecondaryInfo }]}>
+							{I18n.t('You_dont_have_account')}
+						</Text>
+						<Button title={I18n.t('Create_account')} onPress={register} type='secondary' testID='login-view-register' />
+					</View>
+				) : (
+					<Text style={[styles.registerDisabled, { color: colors.fontSecondaryInfo }]}>
+						{Accounts_RegistrationForm_LinkReplacementText}
 					</Text>
-				</View>
-			) : (
-				<Text style={[styles.registerDisabled, { color: colors.fontSecondaryInfo }]}>
-					{Accounts_RegistrationForm_LinkReplacementText}
-				</Text>
-			)}
-			<UGCRules styleContainer={styles.ugcContainer} />
+				)}
+				<UGCRules />
+			</View>
 		</>
 	);
 };
diff --git a/app/views/LoginView/index.tsx b/app/views/LoginView/index.tsx
index aaa808906a..c5fd9ce357 100644
--- a/app/views/LoginView/index.tsx
+++ b/app/views/LoginView/index.tsx
@@ -1,6 +1,6 @@
 import React, { useLayoutEffect } from 'react';
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
 import { useAppSelector } from '../../lib/hooks';
 import FormContainer, { FormContainerInner } from '../../containers/FormContainer';
@@ -10,7 +10,7 @@ import { OutsideParamList } from '../../stacks/types';
 import UserForm from './UserForm';
 
 const LoginView = () => {
-	const navigation = useNavigation<StackNavigationProp<OutsideParamList, 'LoginView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<OutsideParamList, 'LoginView'>>();
 
 	const {
 		params: { title }
diff --git a/app/views/LoginView/styles.ts b/app/views/LoginView/styles.ts
index 40050d4b1e..8a818678a2 100644
--- a/app/views/LoginView/styles.ts
+++ b/app/views/LoginView/styles.ts
@@ -10,27 +10,26 @@ export default StyleSheet.create({
 	},
 	title: {
 		...sharedStyles.textBold,
-		fontSize: 22
+		fontSize: 22,
+		marginBottom: 24
 	},
 	inputContainer: {
 		marginVertical: 16
 	},
+	credentialsContainer: {
+		gap: 20
+	},
 	bottomContainer: {
 		flexDirection: 'column',
-		alignItems: 'center'
-	},
-	bottomContainerText: {
-		...sharedStyles.textRegular,
-		fontSize: 13
-	},
-	bottomContainerTextBold: {
-		...sharedStyles.textSemibold,
-		fontSize: 13
+		gap: 32,
+		marginTop: 32
 	},
-	loginButton: {
-		marginTop: 16
+	bottomContainerGroup: {
+		gap: 12
 	},
-	ugcContainer: {
-		marginTop: 32
+	bottomContainerText: {
+		...sharedStyles.textMedium,
+		alignSelf: 'center',
+		fontSize: 14
 	}
 });
diff --git a/app/views/MediaAutoDownloadView/index.tsx b/app/views/MediaAutoDownloadView/index.tsx
index e9b3910386..7f2273f20c 100644
--- a/app/views/MediaAutoDownloadView/index.tsx
+++ b/app/views/MediaAutoDownloadView/index.tsx
@@ -1,6 +1,6 @@
 import React, { useLayoutEffect } from 'react';
 import { useNavigation } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
 import * as List from '../../containers/List';
 import SafeAreaView from '../../containers/SafeAreaView';
@@ -23,7 +23,7 @@ const MediaAutoDownload = () => {
 	);
 	const [videoPreference, setVideoPreference] = useUserPreferences<MediaDownloadOption>(VIDEO_PREFERENCE_DOWNLOAD, 'wifi');
 	const [audioPreference, setAudioPreference] = useUserPreferences<MediaDownloadOption>(AUDIO_PREFERENCE_DOWNLOAD, 'wifi');
-	const navigation = useNavigation<StackNavigationProp<SettingsStackParamList, 'MediaAutoDownloadView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<SettingsStackParamList, 'MediaAutoDownloadView'>>();
 
 	useLayoutEffect(() => {
 		navigation.setOptions({
diff --git a/app/views/MessagesView/index.tsx b/app/views/MessagesView/index.tsx
index 49a1417913..6a94605f03 100644
--- a/app/views/MessagesView/index.tsx
+++ b/app/views/MessagesView/index.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { FlatList, Text, View } from 'react-native';
 import { connect } from 'react-redux';
 import { dequal } from 'dequal';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { CompositeNavigationProp, RouteProp } from '@react-navigation/core';
 
 import { MasterDetailInsideStackParamList } from '../../stacks/MasterDetailStack/types';
@@ -45,8 +45,8 @@ interface IMessagesViewProps {
 	};
 	baseUrl: string;
 	navigation: CompositeNavigationProp<
-		StackNavigationProp<ChatsStackParamList, 'MessagesView'>,
-		StackNavigationProp<MasterDetailInsideStackParamList & TNavigation>
+		NativeStackNavigationProp<ChatsStackParamList, 'MessagesView'>,
+		NativeStackNavigationProp<MasterDetailInsideStackParamList & TNavigation>
 	>;
 	route: RouteProp<ChatsStackParamList, 'MessagesView'>;
 	customEmojis: { [key: string]: ICustomEmoji };
diff --git a/app/views/ModalBlockView.tsx b/app/views/ModalBlockView.tsx
index 385a03651b..b8991f910b 100644
--- a/app/views/ModalBlockView.tsx
+++ b/app/views/ModalBlockView.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { StyleSheet, View } from 'react-native';
-import { StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { RouteProp } from '@react-navigation/native';
 import { connect } from 'react-redux';
 import { KeyboardAwareScrollView } from '@codler/react-native-keyboard-aware-scroll-view';
@@ -52,7 +52,7 @@ interface IModalBlockViewState {
 }
 
 interface IModalBlockViewProps {
-	navigation: StackNavigationProp<MasterDetailInsideStackParamList, 'ModalBlockView'>;
+	navigation: NativeStackNavigationProp<MasterDetailInsideStackParamList, 'ModalBlockView'>;
 	route: RouteProp<MasterDetailInsideStackParamList, 'ModalBlockView'>;
 	theme: TSupportedThemes;
 	language: string;
@@ -96,7 +96,7 @@ class ModalBlockView extends React.Component<IModalBlockViewProps, IModalBlockVi
 
 	private values: IValues;
 
-	static navigationOptions = ({ route }: Pick<IModalBlockViewProps, 'route'>): StackNavigationOptions => {
+	static navigationOptions = ({ route }: Pick<IModalBlockViewProps, 'route'>) => {
 		const data = route.params?.data;
 		const { view } = data;
 		const { title } = view;
@@ -257,8 +257,7 @@ class ModalBlockView extends React.Component<IModalBlockViewProps, IModalBlockVi
 		return (
 			<KeyboardAwareScrollView
 				style={[styles.container, { backgroundColor: themes[theme].surfaceHover }]}
-				keyboardShouldPersistTaps='always'
-			>
+				keyboardShouldPersistTaps='always'>
 				<View style={styles.content}>
 					{React.createElement(
 						modalBlockWithContext({
diff --git a/app/views/NewMessageView/HeaderNewMessage.tsx b/app/views/NewMessageView/HeaderNewMessage.tsx
index d95cbe6014..7a9cbb9ec8 100644
--- a/app/views/NewMessageView/HeaderNewMessage.tsx
+++ b/app/views/NewMessageView/HeaderNewMessage.tsx
@@ -1,4 +1,4 @@
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import React, { useCallback } from 'react';
 import { StyleSheet, View } from 'react-native';
 import { useDispatch } from 'react-redux';
@@ -26,7 +26,7 @@ const styles = StyleSheet.create({
 });
 
 const HeaderNewMessage = ({ maxUsers, onChangeText }: { maxUsers: number; onChangeText: (text: string) => void }) => {
-	const navigation = useNavigation<StackNavigationProp<NewMessageStackParamList, 'NewMessageView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<NewMessageStackParamList, 'NewMessageView'>>();
 	const dispatch = useDispatch();
 	const { theme } = useTheme();
 
diff --git a/app/views/NewMessageView/index.tsx b/app/views/NewMessageView/index.tsx
index f44760fb6a..b3dbea69a7 100644
--- a/app/views/NewMessageView/index.tsx
+++ b/app/views/NewMessageView/index.tsx
@@ -1,5 +1,5 @@
 import { Q } from '@nozbe/watermelondb';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import React, { useCallback, useEffect, useLayoutEffect, useState } from 'react';
 import { FlatList } from 'react-native';
 import { shallowEqual } from 'react-redux';
@@ -31,7 +31,7 @@ const NewMessageView = () => {
 
 	const { colors } = useTheme();
 
-	const navigation = useNavigation<StackNavigationProp<NewMessageStackParamList, 'NewMessageView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<NewMessageStackParamList, 'NewMessageView'>>();
 
 	const { isMasterDetail, maxUsers, useRealName } = useAppSelector(
 		state => ({
diff --git a/app/views/NewServerView/ServerInput/index.tsx b/app/views/NewServerView/ServerInput/index.tsx
index 101447b02e..cd5e9acf57 100644
--- a/app/views/NewServerView/ServerInput/index.tsx
+++ b/app/views/NewServerView/ServerInput/index.tsx
@@ -51,7 +51,7 @@ const ServerInput = ({
 	return (
 		<View style={styles.container}>
 			<FormTextInput
-				label={I18n.t('Enter_workspace_URL')}
+				label={I18n.t('Workspace_URL')}
 				placeholder={I18n.t('Workspace_URL_Example')}
 				containerStyle={styles.inputContainer}
 				value={text}
diff --git a/app/views/NewServerView/index.tsx b/app/views/NewServerView/index.tsx
index 32a00a6c63..b3f74dfd26 100644
--- a/app/views/NewServerView/index.tsx
+++ b/app/views/NewServerView/index.tsx
@@ -1,8 +1,7 @@
 import { Q } from '@nozbe/watermelondb';
 import { Base64 } from 'js-base64';
 import React from 'react';
-import { BackHandler, Image, Keyboard, StyleSheet, Text, View } from 'react-native';
-import { TouchableOpacity } from 'react-native-gesture-handler';
+import { BackHandler, Image, Keyboard, StyleSheet, Text } from 'react-native';
 import { connect } from 'react-redux';
 import parse from 'url-parse';
 
@@ -12,7 +11,6 @@ import { CERTIFICATE_KEY, themes } from '../../lib/constants';
 import Button from '../../containers/Button';
 import FormContainer, { FormContainerInner } from '../../containers/FormContainer';
 import * as HeaderButton from '../../containers/HeaderButton';
-import OrSeparator from '../../containers/OrSeparator';
 import { IApplicationState, IBaseScreen, TServerHistoryModel } from '../../definitions';
 import I18n from '../../i18n';
 import database from '../../lib/database';
@@ -20,7 +18,7 @@ import { sanitizeLikeString } from '../../lib/database/utils';
 import UserPreferences from '../../lib/methods/userPreferences';
 import { OutsideParamList } from '../../stacks/types';
 import { withTheme } from '../../theme';
-import { isAndroid, isIOS, isTablet } from '../../lib/methods/helpers';
+import { isTablet } from '../../lib/methods/helpers';
 import EventEmitter from '../../lib/methods/helpers/events';
 import { BASIC_AUTH_KEY, setBasicAuth } from '../../lib/methods/helpers/fetch';
 import { showConfirmationAlert } from '../../lib/methods/helpers/info';
@@ -35,31 +33,12 @@ const styles = StyleSheet.create({
 		alignSelf: 'center',
 		resizeMode: 'contain'
 	},
-	title: {
-		...sharedStyles.textBold,
-		letterSpacing: 0,
-		alignSelf: 'center'
-	},
-	subtitle: {
-		...sharedStyles.textRegular,
-		alignSelf: 'center'
-	},
-	certificatePicker: {
-		alignItems: 'center',
-		justifyContent: 'flex-end'
-	},
-	chooseCertificateTitle: {
-		...sharedStyles.textRegular
-	},
-	chooseCertificate: {
-		...sharedStyles.textSemibold
-	},
-	description: {
+	buttonPrompt: {
 		...sharedStyles.textRegular,
 		textAlign: 'center'
 	},
 	connectButton: {
-		marginBottom: 0
+		marginTop: 20
 	}
 });
 
@@ -70,7 +49,6 @@ interface INewServerViewProps extends IBaseScreen<OutsideParamList, 'NewServerVi
 
 interface INewServerViewState {
 	text: string;
-	connectingOpen: boolean;
 	certificate: string | null;
 	serversHistory: TServerHistoryModel[];
 }
@@ -87,7 +65,6 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
 
 		this.state = {
 			text: '',
-			connectingOpen: false,
 			certificate: null,
 			serversHistory: []
 		};
@@ -118,7 +95,7 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
 		const { previousServer, navigation, connecting } = this.props;
 		if (previousServer) {
 			return navigation.setOptions({
-				headerTitle: I18n.t('Workspaces'),
+				headerTitle: I18n.t('Add_server'),
 				headerLeft: () =>
 					!connecting ? (
 						<HeaderButton.CloseModal navigation={navigation} onPress={this.close} testID='new-server-view-close' />
@@ -190,8 +167,6 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
 		const { text, certificate } = this.state;
 		const { dispatch } = this.props;
 
-		this.setState({ connectingOpen: false });
-
 		if (text) {
 			Keyboard.dismiss();
 			const server = this.completeUrl(text);
@@ -212,13 +187,6 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
 		}
 	};
 
-	connectOpen = () => {
-		logEvent(events.NS_JOIN_OPEN_WORKSPACE);
-		this.setState({ connectingOpen: true });
-		const { dispatch } = this.props;
-		dispatch(serverRequest('https://open.rocket.chat'));
-	};
-
 	basicAuth = (server: string, text: string) => {
 		try {
 			const parsedUrl = parse(text, true);
@@ -289,34 +257,31 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
 
 	renderCertificatePicker = () => {
 		const { certificate } = this.state;
-		const { theme, previousServer } = this.props;
+		const { theme, connecting } = this.props;
 		return (
-			<View
-				style={[
-					styles.certificatePicker,
-					{
-						marginTop: isAndroid ? 20 : 0,
-						marginBottom: previousServer && !isTablet ? 10 : 30
-					}
-				]}>
-				<Text style={[styles.chooseCertificateTitle, { color: themes[theme].fontSecondaryInfo, fontSize: 13 }]}>
+			<>
+				<Text style={[styles.buttonPrompt, { color: themes[theme].fontSecondaryInfo }]}>
 					{certificate ? I18n.t('Your_certificate') : I18n.t('Do_you_have_a_certificate')}
 				</Text>
-				<TouchableOpacity
+				<Button
 					onPress={certificate ? this.handleRemove : this.chooseCertificate}
-					testID='new-server-choose-certificate'>
-					<Text style={[styles.chooseCertificate, { color: themes[theme].fontInfo, fontSize: 13 }]}>
-						{certificate ?? I18n.t('Apply_Your_Certificate')}
-					</Text>
-				</TouchableOpacity>
-			</View>
+					testID='new-server-choose-certificate'
+					title={certificate ?? I18n.t('Apply_Certificate')}
+					type='secondary'
+					disabled={connecting}
+					style={{ marginTop: 12, marginBottom: 24 }}
+					fontSize={12}
+					styleText={{ ...sharedStyles.textBold, textAlign: 'center' }}
+					small
+				/>
+			</>
 		);
 	};
 
 	render() {
 		const { connecting, theme, previousServer } = this.props;
-		const { text, connectingOpen, serversHistory } = this.state;
-		const marginTop = previousServer ? 0 : 35;
+		const { text, serversHistory } = this.state;
+		const marginTop = previousServer ? 32 : 84;
 
 		return (
 			<FormContainer testID='new-server-view' keyboardShouldPersistTaps='never'>
@@ -325,37 +290,16 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
 						style={[
 							styles.onboardingImage,
 							{
-								marginBottom: 10,
+								marginBottom: 32,
 								marginTop: isTablet ? 0 : marginTop,
-								width: 100,
-								height: 100
+								width: 250,
+								height: 50
 							}
 						]}
-						source={require('../../static/images/logo.png')}
+						source={require('../../static/images/logo_with_name.png')}
 						fadeDuration={0}
 					/>
-					<Text
-						style={[
-							styles.title,
-							{
-								color: themes[theme].fontTitlesLabels,
-								fontSize: 22,
-								marginBottom: 8
-							}
-						]}>
-						Rocket.Chat
-					</Text>
-					<Text
-						style={[
-							styles.subtitle,
-							{
-								color: themes[theme].fontHint,
-								fontSize: 16,
-								marginBottom: 30
-							}
-						]}>
-						{I18n.t('Onboarding_subtitle')}
-					</Text>
+					<Text style={{ fontSize: 24, marginBottom: 24, color: themes[theme].fontTitlesLabels, ...sharedStyles.textBold }}>{I18n.t('Add_server')}</Text>
 					<ServerInput
 						text={text}
 						theme={theme}
@@ -370,34 +314,10 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
 						type='primary'
 						onPress={this.submit}
 						disabled={!text || connecting}
-						loading={!connectingOpen && connecting}
-						style={[styles.connectButton, { marginTop: 16 }]}
+						loading={connecting}
+						style={styles.connectButton}
 						testID='new-server-view-button'
 					/>
-					{isIOS ? (
-						<>
-							<OrSeparator theme={theme} />
-							<Text
-								style={[
-									styles.description,
-									{
-										color: themes[theme].fontSecondaryInfo,
-										fontSize: 14,
-										marginBottom: 16
-									}
-								]}>
-								{I18n.t('Onboarding_join_open_description')}
-							</Text>
-							<Button
-								title={I18n.t('Join_our_open_workspace')}
-								type='secondary'
-								onPress={this.connectOpen}
-								disabled={connecting}
-								loading={connectingOpen && connecting}
-								testID='new-server-view-open'
-							/>
-						</>
-					) : null}
 				</FormContainerInner>
 				{this.renderCertificatePicker()}
 			</FormContainer>
diff --git a/app/views/NotificationPreferencesView/index.tsx b/app/views/NotificationPreferencesView/index.tsx
index ed09a4883d..2323507374 100644
--- a/app/views/NotificationPreferencesView/index.tsx
+++ b/app/views/NotificationPreferencesView/index.tsx
@@ -1,7 +1,7 @@
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/core';
 import React, { useEffect, useState } from 'react';
 import { Text } from 'react-native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
 import { TActionSheetOptionsItem, useActionSheet } from '../../containers/ActionSheet';
 import { CustomIcon } from '../../containers/CustomIcon';
@@ -90,7 +90,7 @@ const RenderSwitch = ({ preference, room, onChangeValue }: IBaseParams) => {
 const NotificationPreferencesView = (): React.ReactElement => {
 	const route = useRoute<RouteProp<ChatsStackParamList, 'NotificationPrefView'>>();
 	const { rid, room } = route.params;
-	const navigation = useNavigation<StackNavigationProp<ChatsStackParamList, 'NotificationPrefView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<ChatsStackParamList, 'NotificationPrefView'>>();
 	const { serverVersion, isMasterDetail } = useAppSelector(state => ({
 		serverVersion: state.server.version,
 		isMasterDetail: state.app.isMasterDetail
diff --git a/app/views/ProfileView/index.tsx b/app/views/ProfileView/index.tsx
index 939f2f12d9..95b915afbe 100644
--- a/app/views/ProfileView/index.tsx
+++ b/app/views/ProfileView/index.tsx
@@ -1,4 +1,4 @@
-import { StackNavigationOptions } from '@react-navigation/stack';
+import { NativeStackNavigationOptions } from '@react-navigation/native-stack';
 import { sha256 } from 'js-sha256';
 import React from 'react';
 import { Keyboard, ScrollView, TextInput, View } from 'react-native';
@@ -83,7 +83,7 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 
 	setHeader = () => {
 		const { navigation, isMasterDetail } = this.props;
-		const options: StackNavigationOptions = {
+		const options: NativeStackNavigationOptions = {
 			title: I18n.t('Profile')
 		};
 		if (!isMasterDetail) {
diff --git a/app/views/PushTroubleshootView/index.tsx b/app/views/PushTroubleshootView/index.tsx
index a62cf2d6b3..2a5370c73b 100644
--- a/app/views/PushTroubleshootView/index.tsx
+++ b/app/views/PushTroubleshootView/index.tsx
@@ -1,5 +1,5 @@
 import { useFocusEffect } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import React, { useCallback, useEffect } from 'react';
 import { useDispatch } from 'react-redux';
 
@@ -15,7 +15,7 @@ import NotificationDelay from './components/NotificationDelay';
 import PushGatewayConnection from './components/PushGatewayConnection';
 
 interface IPushTroubleshootViewProps {
-	navigation: StackNavigationProp<SettingsStackParamList, 'PushTroubleshootView'>;
+	navigation: NativeStackNavigationProp<SettingsStackParamList, 'PushTroubleshootView'>;
 }
 
 const PushTroubleshootView = ({ navigation }: IPushTroubleshootViewProps): JSX.Element => {
diff --git a/app/views/ReadReceiptView/index.tsx b/app/views/ReadReceiptView/index.tsx
index db1e6b53c2..5691373f10 100644
--- a/app/views/ReadReceiptView/index.tsx
+++ b/app/views/ReadReceiptView/index.tsx
@@ -3,7 +3,7 @@ import { FlatList, Text, View, RefreshControl } from 'react-native';
 import { dequal } from 'dequal';
 import moment from 'moment';
 import { connect } from 'react-redux';
-import { StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationOptions, NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { RouteProp } from '@react-navigation/core';
 
 import * as List from '../../containers/List';
@@ -25,7 +25,7 @@ interface IReadReceiptViewState {
 }
 
 interface INavigationOption {
-	navigation: StackNavigationProp<ChatsStackParamList, 'ReadReceiptsView'>;
+	navigation: NativeStackNavigationProp<ChatsStackParamList, 'ReadReceiptsView'>;
 	route: RouteProp<ChatsStackParamList, 'ReadReceiptsView'>;
 	isMasterDetail: boolean;
 }
@@ -39,7 +39,7 @@ class ReadReceiptView extends React.Component<IReadReceiptViewProps, IReadReceip
 	private messageId: string;
 
 	static navigationOptions = ({ navigation, isMasterDetail }: INavigationOption) => {
-		const options: StackNavigationOptions = {
+		const options: NativeStackNavigationOptions = {
 			title: I18n.t('Read_Receipt')
 		};
 		if (isMasterDetail) {
@@ -131,8 +131,7 @@ class ReadReceiptView extends React.Component<IReadReceiptViewProps, IReadReceip
 							{
 								color: themes[theme].fontSecondaryInfo
 							}
-						]}
-					>{`@${item.user.username}`}</Text>
+						]}>{`@${item.user.username}`}</Text>
 				</View>
 			</View>
 		);
diff --git a/app/views/RegisterView.tsx b/app/views/RegisterView.tsx
index d42d2acf0a..06ad245409 100644
--- a/app/views/RegisterView.tsx
+++ b/app/views/RegisterView.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { Keyboard, StyleSheet, Text, View, TextInput as RNTextInput } from 'react-native';
 import RNPickerSelect from 'react-native-picker-select';
 import { connect } from 'react-redux';
+import parse from 'url-parse';
 
 import { loginRequest } from '../actions/login';
 import { themes } from '../lib/constants';
@@ -30,27 +31,25 @@ const styles = StyleSheet.create({
 		marginVertical: 16
 	},
 	bottomContainer: {
-		flexDirection: 'column',
-		alignItems: 'center',
-		marginBottom: 32,
-		marginHorizontal: 30
+		marginBottom: 32
 	},
 	bottomContainerText: {
-		...sharedStyles.textRegular,
-		fontSize: 13
-	},
-	bottomContainerTextBold: {
-		...sharedStyles.textSemibold,
-		fontSize: 13
+		...sharedStyles.textMedium,
+		fontSize: 14,
+		lineHeight: 22,
+		alignSelf: 'center'
 	},
 	registerButton: {
 		marginTop: 16,
 		marginBottom: 32
+	},
+	loginButton: {
+		marginTop: 12
 	}
 });
 
 interface IProps extends IBaseScreen<OutsideParamList, 'RegisterView'> {
-	Site_Name: string;
+	Site_Url: string;
 	Gitlab_URL: string;
 	CAS_enabled: boolean;
 	CAS_login_url: string;
@@ -99,8 +98,8 @@ class RegisterView extends React.Component<IProps, any> {
 	}
 
 	login = () => {
-		const { navigation, Site_Name } = this.props;
-		navigation.navigate('LoginView', { title: Site_Name });
+		const { navigation, Site_Url } = this.props;
+		navigation.navigate('LoginView', { title: new parse(Site_Url).hostname });
 	};
 
 	valid = () => {
@@ -236,7 +235,7 @@ class RegisterView extends React.Component<IProps, any> {
 					<FormTextInput
 						label={I18n.t('Name')}
 						containerStyle={styles.inputContainer}
-						placeholder={I18n.t('Name')}
+						placeholder={I18n.t('Full_name')}
 						returnKeyType='next'
 						onChangeText={(name: string) => this.setState({ name })}
 						onSubmitEditing={() => {
@@ -252,7 +251,6 @@ class RegisterView extends React.Component<IProps, any> {
 						inputRef={e => {
 							this.usernameInput = e;
 						}}
-						placeholder={I18n.t('Username')}
 						returnKeyType='next'
 						onChangeText={(username: string) => this.setState({ username })}
 						onSubmitEditing={() => {
@@ -268,7 +266,6 @@ class RegisterView extends React.Component<IProps, any> {
 						inputRef={e => {
 							this.emailInput = e;
 						}}
-						placeholder={I18n.t('Email')}
 						returnKeyType='next'
 						onChangeText={(email: string) => this.setState({ email })}
 						onSubmitEditing={() => {
@@ -285,7 +282,6 @@ class RegisterView extends React.Component<IProps, any> {
 						inputRef={e => {
 							this.passwordInput = e;
 						}}
-						placeholder={I18n.t('Password')}
 						returnKeyType='send'
 						secureTextEntry
 						onChangeText={(value: string) => this.setState({ password: value })}
@@ -307,18 +303,16 @@ class RegisterView extends React.Component<IProps, any> {
 						style={styles.registerButton}
 					/>
 
-					<UGCRules />
-
 					{showLoginButton ? (
 						<View style={styles.bottomContainer}>
 							<Text style={[styles.bottomContainerText, { color: themes[theme].fontSecondaryInfo }]}>
-								{I18n.t('Do_you_have_an_account')}
-							</Text>
-							<Text style={[styles.bottomContainerTextBold, { color: themes[theme].fontHint }]} onPress={this.login}>
-								{I18n.t('Login')}
+								{I18n.t('Already_have_an_account')}
 							</Text>
+							<Button title={I18n.t('Login')} type='secondary' onPress={this.login} style={styles.loginButton} />
 						</View>
 					) : null}
+
+					<UGCRules />
 				</FormContainerInner>
 			</FormContainer>
 		);
@@ -326,7 +320,7 @@ class RegisterView extends React.Component<IProps, any> {
 }
 
 const mapStateToProps = (state: IApplicationState) => ({
-	Site_Name: state.settings.Site_Name as string,
+	Site_Url: state.settings.Site_Url as string,
 	Gitlab_URL: state.settings.API_Gitlab_URL as string,
 	CAS_enabled: state.settings.CAS_enabled as boolean,
 	CAS_login_url: state.settings.CAS_login_url as string,
diff --git a/app/views/ReportUserView/index.tsx b/app/views/ReportUserView/index.tsx
index 3a187c2b3e..40214872a4 100644
--- a/app/views/ReportUserView/index.tsx
+++ b/app/views/ReportUserView/index.tsx
@@ -1,7 +1,7 @@
 import React, { useLayoutEffect, useState } from 'react';
 import { ScrollView, StatusBar } from 'react-native';
 import { CompositeNavigationProp, RouteProp, useNavigation, useRoute } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { useForm } from 'react-hook-form';
 import * as yup from 'yup';
 import { yupResolver } from '@hookform/resolvers/yup';
@@ -23,8 +23,8 @@ import { Services } from '../../lib/services';
 import KeyboardView from '../../containers/KeyboardView';
 
 type TReportUserViewNavigationProp = CompositeNavigationProp<
-	StackNavigationProp<ChatsStackParamList, 'ReportUserView'>,
-	StackNavigationProp<MasterDetailInsideStackParamList>
+	NativeStackNavigationProp<ChatsStackParamList, 'ReportUserView'>,
+	NativeStackNavigationProp<MasterDetailInsideStackParamList>
 >;
 
 type TReportUserViewRouteProp = RouteProp<ChatsStackParamList, 'ReportUserView'>;
@@ -80,8 +80,7 @@ const ReportUserView = () => {
 		<KeyboardView
 			style={{ backgroundColor: colors.surfaceHover }}
 			contentContainerStyle={styles.container}
-			keyboardVerticalOffset={128}
-		>
+			keyboardVerticalOffset={128}>
 			<SafeAreaView style={[styles.containerView, { backgroundColor: colors.strokeExtraDark }]} testID='report-user-view'>
 				<ScrollView contentContainerStyle={[styles.scroll, { backgroundColor: colors.surfaceHover }]}>
 					<StatusBar />
diff --git a/app/views/RoomActionsView/index.tsx b/app/views/RoomActionsView/index.tsx
index a0403b769c..80806de3fc 100644
--- a/app/views/RoomActionsView/index.tsx
+++ b/app/views/RoomActionsView/index.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable complexity */
 import { Q } from '@nozbe/watermelondb';
-import { StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationOptions, NativeStackNavigationProp } from '@react-navigation/native-stack';
 import isEmpty from 'lodash/isEmpty';
 import React from 'react';
 import { Share, Text, View } from 'react-native';
@@ -9,7 +9,6 @@ import { Observable, Subscription } from 'rxjs';
 import { CompositeNavigationProp } from '@react-navigation/native';
 
 import { leaveRoom } from '../../actions/room';
-import { setLoading } from '../../actions/selectedUsers';
 import Avatar from '../../containers/Avatar';
 import * as HeaderButton from '../../containers/HeaderButton';
 import * as List from '../../containers/List';
@@ -81,8 +80,8 @@ interface IRoomActionsViewProps extends IActionSheetProvider, IBaseScreen<StackT
 	livechatAllowManualOnHold?: boolean;
 	livechatRequestComment?: boolean;
 	navigation: CompositeNavigationProp<
-		StackNavigationProp<ChatsStackParamList, 'RoomActionsView'>,
-		StackNavigationProp<MasterDetailInsideStackParamList & TNavigation>
+		NativeStackNavigationProp<ChatsStackParamList, 'RoomActionsView'>,
+		NativeStackNavigationProp<MasterDetailInsideStackParamList & TNavigation>
 	>;
 	videoConf_Enable_DMs: boolean;
 	videoConf_Enable_Channels: boolean;
@@ -123,8 +122,8 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 	static navigationOptions = ({
 		navigation,
 		isMasterDetail
-	}: Pick<IRoomActionsViewProps, 'navigation' | 'isMasterDetail'>): StackNavigationOptions => {
-		const options: StackNavigationOptions = {
+	}: Pick<IRoomActionsViewProps, 'navigation' | 'isMasterDetail'>): NativeStackNavigationOptions => {
+		const options: NativeStackNavigationOptions = {
 			title: I18n.t('Actions')
 		};
 		if (isMasterDetail) {
@@ -453,21 +452,6 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 		}
 	};
 
-	addUser = async () => {
-		const { room } = this.state;
-		const { dispatch, navigation } = this.props;
-		const { rid } = room;
-		try {
-			dispatch(setLoading(true));
-			await Services.addUsersToRoom(rid);
-			navigation.pop();
-		} catch (e) {
-			log(e);
-		} finally {
-			dispatch(setLoading(false));
-		}
-	};
-
 	toggleBlockUser = async () => {
 		logEvent(events.RA_TOGGLE_BLOCK_USER);
 		const { room } = this.state;
diff --git a/app/views/RoomInfoView/index.tsx b/app/views/RoomInfoView/index.tsx
index 1dbf530ba8..c0969ee930 100644
--- a/app/views/RoomInfoView/index.tsx
+++ b/app/views/RoomInfoView/index.tsx
@@ -1,8 +1,8 @@
 import { CompositeNavigationProp, RouteProp, useNavigation, useRoute } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { uniq } from 'lodash';
 import isEmpty from 'lodash/isEmpty';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useLayoutEffect, useRef, useState } from 'react';
 import { ScrollView, View } from 'react-native';
 import { Subscription } from 'rxjs';
 import UAParser from 'ua-parser-js';
@@ -30,8 +30,8 @@ import styles from './styles';
 import { emitErrorCreateDirectMessage } from '../../lib/methods/helpers/emitErrorCreateDirectMessage';
 
 type TRoomInfoViewNavigationProp = CompositeNavigationProp<
-	StackNavigationProp<ChatsStackParamList, 'RoomInfoView'>,
-	StackNavigationProp<MasterDetailInsideStackParamList>
+	NativeStackNavigationProp<ChatsStackParamList, 'RoomInfoView'>,
+	NativeStackNavigationProp<MasterDetailInsideStackParamList>
 >;
 
 type TRoomInfoViewRouteProp = RouteProp<ChatsStackParamList, 'RoomInfoView'>;
@@ -77,6 +77,11 @@ const RoomInfoView = (): React.ReactElement => {
 
 	const { colors } = useTheme();
 
+	// Prevents from flashing RoomInfoView on the header title before fetching actual room data
+	useLayoutEffect(() => {
+		setHeader(false);
+	});
+
 	useEffect(() => {
 		const listener = addListener('focus', () => (isLivechat ? loadVisitor() : null));
 		return () => listener();
diff --git a/app/views/RoomMembersView/components/ActionsSection.tsx b/app/views/RoomMembersView/components/ActionsSection.tsx
index 174e51c7ce..e743dbf320 100644
--- a/app/views/RoomMembersView/components/ActionsSection.tsx
+++ b/app/views/RoomMembersView/components/ActionsSection.tsx
@@ -1,5 +1,5 @@
 import { CompositeNavigationProp, useNavigation } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import React from 'react';
 import { View } from 'react-native';
 import { useDispatch } from 'react-redux';
@@ -15,8 +15,8 @@ import { MasterDetailInsideStackParamList } from '../../../stacks/MasterDetailSt
 import { ChatsStackParamList } from '../../../stacks/types';
 
 type TNavigation = CompositeNavigationProp<
-	StackNavigationProp<ChatsStackParamList, 'RoomActionsView'>,
-	StackNavigationProp<MasterDetailInsideStackParamList>
+	NativeStackNavigationProp<ChatsStackParamList, 'RoomActionsView'>,
+	NativeStackNavigationProp<MasterDetailInsideStackParamList>
 >;
 
 interface IActionsSection {
diff --git a/app/views/RoomMembersView/helpers.ts b/app/views/RoomMembersView/helpers.ts
index 9038bae7db..8fd374383c 100644
--- a/app/views/RoomMembersView/helpers.ts
+++ b/app/views/RoomMembersView/helpers.ts
@@ -1,4 +1,5 @@
 import { Q } from '@nozbe/watermelondb';
+import { Alert } from 'react-native';
 
 import { LISTENER } from '../../containers/Toast';
 import { IGetRoomRoles, IUser, SubscriptionType, TSubscriptionModel, TUserModel } from '../../definitions';
@@ -208,7 +209,14 @@ export const handleRemoveUserFromRoom = async (
 		const message = I18n.t('User_has_been_removed_from_s', { s: getRoomTitle(room) });
 		EventEmitter.emit(LISTENER, { message });
 		callback();
-	} catch (e) {
+	} catch (e: any) {
+		if (e.data && e.data.errorType === 'error-you-are-last-owner') {
+			Alert.alert(I18n.t('Oops'), I18n.t(e.data.errorType));
+		} else if (e?.data?.error === 'last-owner-can-not-be-removed') {
+			Alert.alert(I18n.t('Oops'), I18n.t(e.data.error));
+		} else {
+			Alert.alert(I18n.t('Oops'), I18n.t('There_was_an_error_while_action', { action: I18n.t('leaving_room') }));
+		}
 		log(e);
 	}
 };
diff --git a/app/views/RoomMembersView/index.tsx b/app/views/RoomMembersView/index.tsx
index 17429bc49f..4bfcf68739 100644
--- a/app/views/RoomMembersView/index.tsx
+++ b/app/views/RoomMembersView/index.tsx
@@ -4,6 +4,7 @@ import { FlatList, Text, View } from 'react-native';
 import { shallowEqual } from 'react-redux';
 
 import { TActionSheetOptionsItem, useActionSheet } from '../../containers/ActionSheet';
+import { sendLoadingEvent } from '../../containers/Loading';
 import ActivityIndicator from '../../containers/ActivityIndicator';
 import { CustomIcon, TIconsName } from '../../containers/CustomIcon';
 import * as HeaderButton from '../../containers/HeaderButton';
@@ -74,16 +75,21 @@ const RoomMembersView = (): React.ReactElement => {
 	const { params } = useRoute<RouteProp<ModalStackParamList, 'RoomMembersView'>>();
 	const navigation = useNavigation<NavigationProp<ModalStackParamList, 'RoomMembersView'>>();
 
-	const { isMasterDetail, serverVersion, useRealName, user } = useAppSelector(
+	const { isMasterDetail, serverVersion, useRealName, user, loading } = useAppSelector(
 		state => ({
 			isMasterDetail: state.app.isMasterDetail,
 			useRealName: state.settings.UI_Use_Real_Name,
 			user: getUserSelector(state),
-			serverVersion: state.server.version
+			serverVersion: state.server.version,
+			loading: state.selectedUsers.loading
 		}),
 		shallowEqual
 	);
 
+	useEffect(() => {
+		sendLoadingEvent({ visible: loading });
+	}, [loading]);
+
 	const [state, updateState] = useReducer(
 		(state: IRoomMembersViewState, newState: Partial<IRoomMembersViewState>) => ({ ...state, ...newState }),
 		{
diff --git a/app/views/RoomView/LeftButtons.tsx b/app/views/RoomView/LeftButtons.tsx
index 6bf0830758..91503b0beb 100644
--- a/app/views/RoomView/LeftButtons.tsx
+++ b/app/views/RoomView/LeftButtons.tsx
@@ -10,15 +10,15 @@ import { TSupportedThemes } from '../../theme';
 
 const styles = StyleSheet.create({
 	container: {
+		marginLeft: -15,
 		...Platform.select({
 			ios: {
-				minWidth: 60
+				minWidth: 34
 			}
 		})
 	},
 	avatar: {
-		borderRadius: 10,
-		marginHorizontal: 15
+		borderRadius: 10
 	}
 });
 
diff --git a/app/views/RoomView/LoadMore/index.tsx b/app/views/RoomView/LoadMore/index.tsx
index e1c049c2be..3060df36ec 100644
--- a/app/views/RoomView/LoadMore/index.tsx
+++ b/app/views/RoomView/LoadMore/index.tsx
@@ -6,6 +6,7 @@ import { MessageTypeLoad } from '../../../lib/constants';
 import { MessageType, RoomType } from '../../../definitions';
 import { useTheme } from '../../../theme';
 import Touch from '../../../containers/Touch';
+import MessageSeparator from '../../../containers/MessageSeparator';
 import sharedStyles from '../../Styles';
 import I18n from '../../../i18n';
 import { roomHistoryRequest } from '../../../actions/room';
@@ -30,7 +31,8 @@ const LoadMore = React.memo(
 		loaderId,
 		type,
 		runOnRender,
-		separator
+		dateSeparator,
+		showUnreadSeparator
 	}: {
 		rid: string;
 		t: RoomType;
@@ -38,6 +40,8 @@ const LoadMore = React.memo(
 		type: MessageType;
 		runOnRender: boolean;
 		separator?: ReactElement | null;
+		dateSeparator?: Date | string | null;
+		showUnreadSeparator?: boolean;
 	}): React.ReactElement => {
 		const { colors } = useTheme();
 		const dispatch = useDispatch();
@@ -61,7 +65,7 @@ const LoadMore = React.memo(
 
 		return (
 			<>
-				{separator || null}
+				<MessageSeparator ts={dateSeparator} unread={showUnreadSeparator} />
 				<Touch onPress={handleLoad} style={styles.button} enabled={!loading}>
 					{loading ? (
 						<ActivityIndicator color={colors.fontSecondaryInfo} />
diff --git a/app/views/RoomView/RightButtons.tsx b/app/views/RoomView/RightButtons.tsx
index 3f10ecce42..8d4fb067bd 100644
--- a/app/views/RoomView/RightButtons.tsx
+++ b/app/views/RoomView/RightButtons.tsx
@@ -1,4 +1,4 @@
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { dequal } from 'dequal';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -35,7 +35,7 @@ interface IRightButtonsProps extends Pick<ISubscription, 't'> {
 	status?: string;
 	dispatch: Dispatch;
 	encrypted?: boolean;
-	navigation: StackNavigationProp<ChatsStackParamList & TNavigation, 'RoomView'>;
+	navigation: NativeStackNavigationProp<ChatsStackParamList & TNavigation, 'RoomView'>;
 	omnichannelPermissions: {
 		canForwardGuest: boolean;
 		canReturnQueue: boolean;
@@ -51,6 +51,7 @@ interface IRightButtonsProps extends Pick<ISubscription, 't'> {
 	notificationsDisabled?: boolean;
 	hasE2EEWarning: boolean;
 	toggleRoomE2EEncryptionPermission?: string[];
+	onLayout: Function;
 }
 
 interface IRigthButtonsState {
@@ -400,6 +401,11 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 		return status === 'queued';
 	};
 
+	onLayout = (l: any) => {
+		const { onLayout } = this.props;
+		onLayout(l);
+	};
+
 	render() {
 		const { isFollowingThread, tunread, tunreadUser, tunreadGroup, canToggleEncryption } = this.state;
 		const { t, tmid, threadsEnabled, rid, colors, issuesWithNotifications, notificationsDisabled, hasE2EEWarning } = this.props;
@@ -411,7 +417,7 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 		if (t === 'l') {
 			if (!this.isOmnichannelPreview()) {
 				return (
-					<HeaderButton.Container>
+					<HeaderButton.Container onLayout={this.onLayout}>
 						<HeaderButton.Item iconName='kebab' onPress={this.showMoreActions} testID='room-view-header-omnichannel-kebab' />
 					</HeaderButton.Container>
 				);
@@ -420,7 +426,7 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 		}
 		if (tmid) {
 			return (
-				<HeaderButton.Container>
+				<HeaderButton.Container onLayout={this.onLayout}>
 					<HeaderButton.Item
 						iconName={isFollowingThread ? 'notification' : 'notification-disabled'}
 						onPress={this.toggleFollowThread}
@@ -430,7 +436,7 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 			);
 		}
 		return (
-			<HeaderButton.Container>
+			<HeaderButton.Container onLayout={this.onLayout}>
 				{hasE2EEWarning ? (
 					<HeaderButton.Item iconName='encrypted' onPress={() => toggleRoomE2EE(rid)} disabled={!canToggleEncryption} />
 				) : null}
diff --git a/app/views/RoomView/components/EncryptedRoom.tsx b/app/views/RoomView/components/EncryptedRoom.tsx
index 967cdcde48..2bc14c1a97 100644
--- a/app/views/RoomView/components/EncryptedRoom.tsx
+++ b/app/views/RoomView/components/EncryptedRoom.tsx
@@ -1,6 +1,6 @@
 import React, { ReactElement } from 'react';
 import { Linking, StyleSheet, Text, View } from 'react-native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
 import { ChatsStackParamList } from '../../../stacks/types';
 import { useTheme } from '../../../theme';
@@ -19,7 +19,7 @@ export const EncryptedRoom = ({
 	navigation
 }: {
 	roomName: string;
-	navigation: StackNavigationProp<ChatsStackParamList & TNavigation, 'RoomView'>;
+	navigation: NativeStackNavigationProp<ChatsStackParamList & TNavigation, 'RoomView'>;
 }): ReactElement => {
 	const { colors } = useTheme();
 	const styles = useStyle();
diff --git a/app/views/RoomView/constants.ts b/app/views/RoomView/constants.ts
index 85088e52ba..3bd114b1b5 100644
--- a/app/views/RoomView/constants.ts
+++ b/app/views/RoomView/constants.ts
@@ -11,7 +11,8 @@ export const stateAttrsUpdate = [
 	'member',
 	'canForwardGuest',
 	'canReturnQueue',
-	'canViewCannedResponse'
+	'canViewCannedResponse',
+	'rightButtonsWidth'
 ] as TStateAttrsUpdate[];
 
 export const roomAttrsUpdate = [
diff --git a/app/views/RoomView/definitions.ts b/app/views/RoomView/definitions.ts
index ca1b3073f1..f37199757d 100644
--- a/app/views/RoomView/definitions.ts
+++ b/app/views/RoomView/definitions.ts
@@ -24,6 +24,7 @@ export interface IRoomViewProps extends IActionSheetProvider, IBaseScreen<ChatsS
 	livechatAllowManualOnHold?: boolean;
 	inAppFeedback?: { [key: string]: string };
 	encryptionEnabled: boolean;
+	airGappedRestrictionRemainingDays: number | undefined;
 }
 
 export type TStateAttrsUpdate = keyof IRoomViewState;
diff --git a/app/views/RoomView/index.tsx b/app/views/RoomView/index.tsx
index 9a54a7b046..c13aafb776 100644
--- a/app/views/RoomView/index.tsx
+++ b/app/views/RoomView/index.tsx
@@ -41,7 +41,6 @@ import { ContainerTypes } from '../../containers/UIKit/interfaces';
 import RoomServices from './services';
 import LoadMore from './LoadMore';
 import Banner from './Banner';
-import Separator from './Separator';
 import RightButtons from './RightButtons';
 import LeftButtons from './LeftButtons';
 import styles from './styles';
@@ -178,7 +177,8 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 			canForwardGuest: false,
 			canReturnQueue: false,
 			canPlaceLivechatOnHold: false,
-			isOnHold: false
+			isOnHold: false,
+			rightButtonsWidth: 0
 		};
 
 		this.setHeader();
@@ -246,13 +246,16 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 	shouldComponentUpdate(nextProps: IRoomViewProps, nextState: IRoomViewState) {
 		const { state } = this;
 		const { roomUpdate, member, isOnHold } = state;
-		const { theme, insets, route, encryptionEnabled } = this.props;
+		const { theme, insets, route, encryptionEnabled, airGappedRestrictionRemainingDays } = this.props;
 		if (theme !== nextProps.theme) {
 			return true;
 		}
 		if (encryptionEnabled !== nextProps.encryptionEnabled) {
 			return true;
 		}
+		if (airGappedRestrictionRemainingDays !== nextProps.airGappedRestrictionRemainingDays) {
+			return true;
+		}
 		if (member.statusText !== nextState.member.statusText) {
 			return true;
 		}
@@ -276,7 +279,7 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 	}
 
 	componentDidUpdate(prevProps: IRoomViewProps, prevState: IRoomViewState) {
-		const { roomUpdate, joined } = this.state;
+		const { roomUpdate, joined, rightButtonsWidth } = this.state;
 		const { insets, route } = this.props;
 
 		if (route?.params?.jumpToMessageId && route?.params?.jumpToMessageId !== prevProps.route?.params?.jumpToMessageId) {
@@ -299,7 +302,11 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 			}
 		}
 		if (roomAttrsUpdate.some(key => !dequal(prevState.roomUpdate[key], roomUpdate[key]))) this.setHeader();
-		if (insets.left !== prevProps.insets.left || insets.right !== prevProps.insets.right) {
+		if (
+			insets.left !== prevProps.insets.left ||
+			insets.right !== prevProps.insets.right ||
+			rightButtonsWidth !== prevState.rightButtonsWidth
+		) {
 			this.setHeader();
 		}
 		this.setReadOnly();
@@ -416,7 +423,8 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 	}
 
 	setHeader = () => {
-		const { room, unreadsCount, roomUserId, joined, canForwardGuest, canReturnQueue, canPlaceLivechatOnHold } = this.state;
+		const { room, unreadsCount, roomUserId, joined, canForwardGuest, canReturnQueue, canPlaceLivechatOnHold, rightButtonsWidth } =
+			this.state;
 		const { navigation, isMasterDetail, theme, baseUrl, user, route, encryptionEnabled } = this.props;
 		const { rid, tmid } = this;
 		if (!room.rid) {
@@ -458,6 +466,10 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 			visitor = room.visitor;
 		}
 
+		const onLayout = ({ nativeEvent }: { nativeEvent: any }) => {
+			this.setState({ rightButtonsWidth: nativeEvent.layout.width });
+		};
+
 		const t = room?.t;
 		const teamMain = 'teamMain' in room ? room?.teamMain : false;
 		const omnichannelPermissions = { canForwardGuest, canReturnQueue, canPlaceLivechatOnHold };
@@ -466,30 +478,22 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 			'encrypted' in room && hasE2EEWarning({ encryptionEnabled, E2EKey: room.E2EKey, roomEncrypted: room.encrypted })
 		);
 		navigation.setOptions({
-			headerShown: true,
-			headerTitleAlign: 'left',
-			headerTitleContainerStyle: {
-				flex: 1,
-				marginLeft: 0,
-				marginRight: 4,
-				maxWidth: undefined
-			},
-			headerRightContainerStyle: { flexGrow: undefined, flexBasis: undefined },
-			headerLeft: () => (
-				<LeftButtons
-					rid={rid}
-					tmid={tmid}
-					unreadsCount={unreadsCount}
-					baseUrl={baseUrl}
-					userId={userId}
-					token={token}
-					title={avatar}
-					theme={theme}
-					t={t}
-					goRoomActionsView={this.goRoomActionsView}
-					isMasterDetail={isMasterDetail}
-				/>
-			),
+			headerLeft: () =>
+				isIOS && (unreadsCount || isMasterDetail) ? (
+					<LeftButtons
+						rid={rid}
+						tmid={tmid}
+						unreadsCount={unreadsCount}
+						baseUrl={baseUrl}
+						userId={userId}
+						token={token}
+						title={avatar}
+						theme={theme}
+						t={t}
+						goRoomActionsView={this.goRoomActionsView}
+						isMasterDetail={isMasterDetail}
+					/>
+				) : undefined,
 			headerTitle: () => (
 				<RoomHeader
 					prid={prid}
@@ -506,6 +510,7 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 					testID={`room-view-title-${title}`}
 					sourceType={sourceType}
 					disabled={e2eeWarning}
+					rightButtonsWidth={rightButtonsWidth}
 				/>
 			),
 			headerRight: () => (
@@ -523,6 +528,7 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 					showActionSheet={this.showActionSheet}
 					departmentId={departmentId}
 					notificationsDisabled={iSubRoom?.disableNotifications}
+					onLayout={onLayout}
 					hasE2EEWarning={e2eeWarning}
 				/>
 			)
@@ -1298,8 +1304,6 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 			}
 		}
 
-		const separator = showUnreadSeparator || dateSeparator ? <Separator ts={dateSeparator} unread={showUnreadSeparator} /> : null;
-
 		let content = null;
 		if (item.t && MESSAGE_TYPE_ANY_LOAD.includes(item.t as MessageTypeLoad)) {
 			const runOnRender = () => {
@@ -1316,7 +1320,8 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 					loaderId={item.id}
 					type={item.t}
 					runOnRender={runOnRender()}
-					separator={separator}
+					dateSeparator={dateSeparator}
+					showUnreadSeparator={showUnreadSeparator}
 				/>
 			);
 		} else {
@@ -1365,7 +1370,8 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 					theme={theme}
 					closeEmojiAndAction={this.handleCloseEmoji}
 					isBeingEdited={isBeingEdited}
-					separator={separator}
+					dateSeparator={dateSeparator}
+					showUnreadSeparator={showUnreadSeparator}
 				/>
 			);
 		}
@@ -1375,7 +1381,7 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 
 	renderFooter = () => {
 		const { joined, room, readOnly, loading } = this.state;
-		const { theme } = this.props;
+		const { theme, airGappedRestrictionRemainingDays } = this.props;
 
 		if (!this.rid) {
 			return null;
@@ -1410,6 +1416,18 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 				</View>
 			);
 		}
+		if (airGappedRestrictionRemainingDays !== undefined && airGappedRestrictionRemainingDays === 0) {
+			return (
+				<View style={styles.readOnly}>
+					<Text style={[styles.previewMode, { color: themes[theme].fontDefault }]}>
+						{I18n.t('AirGapped_workspace_read_only_title')}
+					</Text>
+					<Text style={[styles.readOnlyDescription, { color: themes[theme].fontDefault }]}>
+						{I18n.t('AirGapped_workspace_read_only_description')}
+					</Text>
+				</View>
+			);
+		}
 		if (readOnly) {
 			return (
 				<View style={styles.readOnly}>
@@ -1531,6 +1549,7 @@ const mapStateToProps = (state: IApplicationState) => ({
 	transferLivechatGuestPermission: state.permissions['transfer-livechat-guest'],
 	viewCannedResponsesPermission: state.permissions['view-canned-responses'],
 	livechatAllowManualOnHold: state.settings.Livechat_allow_manual_on_hold as boolean,
+	airGappedRestrictionRemainingDays: state.settings.Cloud_Workspace_AirGapped_Restrictions_Remaining_Days,
 	inAppFeedback: state.inAppFeedback,
 	encryptionEnabled: state.encryption.enabled
 });
diff --git a/app/views/RoomView/styles.ts b/app/views/RoomView/styles.ts
index be9ebae866..c0267ccaff 100644
--- a/app/views/RoomView/styles.ts
+++ b/app/views/RoomView/styles.ts
@@ -12,7 +12,8 @@ export default StyleSheet.create({
 	readOnly: {
 		justifyContent: 'flex-end',
 		alignItems: 'center',
-		marginVertical: 15
+		margin: 16,
+		marginBottom: 32
 	},
 	reactionSearchContainer: {
 		marginHorizontal: 12,
@@ -66,7 +67,14 @@ export default StyleSheet.create({
 	},
 	previewMode: {
 		fontSize: 16,
-		...sharedStyles.textMedium
+		lineHeight: 24,
+		...sharedStyles.textSemibold
+	},
+	readOnlyDescription: {
+		fontSize: 16,
+		lineHeight: 24,
+		...sharedStyles.textRegular,
+		textAlign: 'center'
 	},
 	searchbarContainer: {
 		height: 56,
diff --git a/app/views/RoomsListView/Header/Header.tsx b/app/views/RoomsListView/Header/Header.tsx
index d09be58c57..b8d67af38f 100644
--- a/app/views/RoomsListView/Header/Header.tsx
+++ b/app/views/RoomsListView/Header/Header.tsx
@@ -1,15 +1,23 @@
 import React from 'react';
-import { StyleSheet, Text, TextInputProps, TouchableOpacity, TouchableOpacityProps, View } from 'react-native';
+import {
+	StyleSheet,
+	Text,
+	TextInputProps,
+	TouchableOpacity,
+	TouchableOpacityProps,
+	View,
+	useWindowDimensions
+} from 'react-native';
 
 import I18n from '../../../i18n';
 import sharedStyles from '../../Styles';
 import { useTheme } from '../../../theme';
 import SearchHeader from '../../../containers/SearchHeader';
 import { useAppSelector } from '../../../lib/hooks';
+import { isTablet } from '../../../lib/methods/helpers';
 
 const styles = StyleSheet.create({
 	container: {
-		flex: 1,
 		justifyContent: 'center'
 	},
 	button: {
@@ -34,6 +42,7 @@ interface IRoomHeader {
 	serverName: string;
 	server: string;
 	showSearchHeader: boolean;
+	width?: number;
 	onSearchChangeText: TextInputProps['onChangeText'];
 	onPress: TouchableOpacityProps['onPress'];
 }
@@ -46,11 +55,13 @@ const Header = React.memo(
 		serverName = 'Rocket.Chat',
 		server,
 		showSearchHeader,
+		width,
 		onSearchChangeText,
 		onPress
 	}: IRoomHeader) => {
 		const { status: supportedVersionsStatus } = useAppSelector(state => state.supportedVersions);
 		const { colors } = useTheme();
+		const { width: windowWidth } = useWindowDimensions();
 
 		if (showSearchHeader) {
 			return <SearchHeader onSearchChangeText={onSearchChangeText} testID='rooms-list-view-search-input' />;
@@ -69,7 +80,11 @@ const Header = React.memo(
 		}
 		// improve copy
 		return (
-			<View style={styles.container} accessibilityLabel={`${serverName} ${subtitle}`} accessibilityRole='header' accessible>
+			<View
+				style={[styles.container, { width: width || (isTablet ? undefined : windowWidth) }]}
+				accessibilityLabel={`${serverName} ${subtitle}`}
+				accessibilityRole='header'
+				accessible>
 				<TouchableOpacity onPress={onPress} testID='rooms-list-header-servers-list-button'>
 					<View style={styles.button}>
 						<Text style={[styles.title, { color: colors.fontTitlesLabels }]} numberOfLines={1}>
diff --git a/app/views/RoomsListView/Header/index.tsx b/app/views/RoomsListView/Header/index.tsx
index bc27d35c1e..dcb4eb45ec 100644
--- a/app/views/RoomsListView/Header/index.tsx
+++ b/app/views/RoomsListView/Header/index.tsx
@@ -16,6 +16,7 @@ interface IRoomsListHeaderViewProps {
 	isFetching: boolean;
 	server: string;
 	dispatch: Dispatch;
+	width?: number;
 }
 
 class RoomsListHeaderView extends PureComponent<IRoomsListHeaderViewProps, any> {
@@ -29,7 +30,7 @@ class RoomsListHeaderView extends PureComponent<IRoomsListHeaderViewProps, any>
 	};
 
 	render() {
-		const { serverName, showSearchHeader, connecting, connected, isFetching, server } = this.props;
+		const { serverName, showSearchHeader, connecting, connected, isFetching, server, width } = this.props;
 
 		return (
 			<Header
@@ -41,6 +42,7 @@ class RoomsListHeaderView extends PureComponent<IRoomsListHeaderViewProps, any>
 				isFetching={isFetching}
 				onPress={this.onPress}
 				onSearchChangeText={this.onSearchChangeText}
+				width={width}
 			/>
 		);
 	}
diff --git a/app/views/RoomsListView/index.tsx b/app/views/RoomsListView/index.tsx
index c8cc39e6b8..bb5c5f54f3 100644
--- a/app/views/RoomsListView/index.tsx
+++ b/app/views/RoomsListView/index.tsx
@@ -5,7 +5,7 @@ import { dequal } from 'dequal';
 import { Q } from '@nozbe/watermelondb';
 import { withSafeAreaInsets } from 'react-native-safe-area-context';
 import { Subscription } from 'rxjs';
-import { StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { Header } from '@react-navigation/elements';
 import { CompositeNavigationProp, RouteProp } from '@react-navigation/native';
 import { Dispatch } from 'redux';
@@ -49,8 +49,8 @@ import { SupportedVersionsExpired } from '../../containers/SupportedVersions';
 import { ChangePasswordRequired } from '../../containers/ChangePasswordRequired';
 
 type TNavigation = CompositeNavigationProp<
-	StackNavigationProp<ChatsStackParamList, 'RoomsListView'>,
-	CompositeNavigationProp<StackNavigationProp<ChatsStackParamList>, StackNavigationProp<DrawerParamList>>
+	NativeStackNavigationProp<ChatsStackParamList, 'RoomsListView'>,
+	CompositeNavigationProp<NativeStackNavigationProp<ChatsStackParamList>, NativeStackNavigationProp<DrawerParamList>>
 >;
 
 interface IRoomsListViewProps {
@@ -103,6 +103,7 @@ interface IRoomsListViewState {
 	chats?: IRoomItem[];
 	item?: ISubscription;
 	canCreateRoom?: boolean;
+	headerTitleWidth?: number;
 }
 
 interface IRoomItem extends ISubscription {
@@ -190,7 +191,8 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
 			omnichannelsUpdate: [],
 			chats: [],
 			item: {} as ISubscription,
-			canCreateRoom: false
+			canCreateRoom: false,
+			headerTitleWidth: 0
 		};
 		this.setHeader();
 		this.getSubscriptions();
@@ -290,11 +292,14 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
 			return false;
 		}
 
-		const { loading, search } = this.state;
+		const { loading, search, headerTitleWidth } = this.state;
 		const { width, insets, subscribedRoom } = this.props;
 		if (nextState.loading !== loading) {
 			return true;
 		}
+		if (nextState.headerTitleWidth !== headerTitleWidth) {
+			return true;
+		}
 		if (nextProps.width !== width) {
 			return true;
 		}
@@ -318,7 +323,7 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
 		return false;
 	}
 
-	componentDidUpdate(prevProps: IRoomsListViewProps) {
+	componentDidUpdate(prevProps: IRoomsListViewProps, prevState: IRoomsListViewState) {
 		const {
 			sortBy,
 			groupByType,
@@ -338,7 +343,7 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
 			issuesWithNotifications,
 			supportedVersionsStatus
 		} = this.props;
-		const { item } = this.state;
+		const { item, headerTitleWidth } = this.state;
 
 		if (
 			!(
@@ -359,6 +364,7 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
 		if (
 			insets.left !== prevProps.insets.left ||
 			insets.right !== prevProps.insets.right ||
+			headerTitleWidth !== prevState.headerTitleWidth ||
 			notificationPresenceCap !== prevProps.notificationPresenceCap ||
 			issuesWithNotifications !== prevProps.issuesWithNotifications ||
 			supportedVersionsStatus !== prevProps.supportedVersionsStatus
@@ -415,15 +421,20 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
 		this.setState({ canCreateRoom }, () => this.setHeader());
 	};
 
-	getHeader = (): StackNavigationOptions => {
-		const { searching, canCreateRoom } = this.state;
-		const { navigation, isMasterDetail, notificationPresenceCap, issuesWithNotifications, supportedVersionsStatus, theme, user } =
-			this.props;
+	getHeader = (): any => {
+		const { searching, canCreateRoom, headerTitleWidth } = this.state;
+		const {
+			navigation,
+			isMasterDetail,
+			notificationPresenceCap,
+			issuesWithNotifications,
+			supportedVersionsStatus,
+			theme,
+			user,
+			width
+		} = this.props;
 		if (searching) {
 			return {
-				headerTitleAlign: 'left',
-				headerTitleContainerStyle: { flex: 1, marginHorizontal: 0, marginRight: 15, maxWidth: undefined },
-				headerRightContainerStyle: { flexGrow: 0 },
 				headerLeft: () => (
 					<HeaderButton.Container left>
 						<HeaderButton.Item iconName='close' onPress={this.cancelSearch} />
@@ -447,9 +458,6 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
 		const disabled = supportedVersionsStatus === 'expired' || user.requirePasswordChange;
 
 		return {
-			headerTitleAlign: 'left',
-			headerTitleContainerStyle: { flex: 1, marginHorizontal: 4, maxWidth: undefined },
-			headerRightContainerStyle: { flexGrow: undefined, flexBasis: undefined },
 			headerLeft: () => (
 				<HeaderButton.Drawer
 					navigation={navigation}
@@ -464,9 +472,16 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
 					disabled={disabled}
 				/>
 			),
-			headerTitle: () => <RoomsListHeaderView />,
+			headerTitle: () => <RoomsListHeaderView width={headerTitleWidth} />,
 			headerRight: () => (
-				<HeaderButton.Container>
+				<HeaderButton.Container
+					onLayout={
+						isTablet
+							? undefined
+							: ({ nativeEvent }: { nativeEvent: any }) => {
+									this.setState({ headerTitleWidth: width - nativeEvent.layout.width - (isIOS ? 60 : 50) });
+							  }
+					}>
 					{issuesWithNotifications ? (
 						<HeaderButton.Item
 							iconName='notification-disabled'
@@ -890,7 +905,13 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
 			return null;
 		}
 
-		const options = this.getHeader();
+		let options = this.getHeader();
+		options = {
+			...options,
+			headerTitleAlign: 'left',
+			headerTitleContainerStyle: { flex: 1, marginHorizontal: 4, maxWidth: undefined },
+			headerRightContainerStyle: { flexGrow: undefined, flexBasis: undefined }
+		};
 		return <Header title='' {...themedHeader(theme)} {...options} />;
 	};
 
diff --git a/app/views/ScreenLockConfigView.tsx b/app/views/ScreenLockConfigView.tsx
index 4c07d1b52b..38a9be3bd1 100644
--- a/app/views/ScreenLockConfigView.tsx
+++ b/app/views/ScreenLockConfigView.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import { connect } from 'react-redux';
-import { StackNavigationOptions } from '@react-navigation/stack';
 import { Subscription } from 'rxjs';
 
 import I18n from '../i18n';
@@ -43,7 +42,7 @@ class ScreenLockConfigView extends React.Component<IScreenLockConfigViewProps, I
 
 	private observable?: Subscription;
 
-	static navigationOptions = (): StackNavigationOptions => ({
+	static navigationOptions = () => ({
 		title: I18n.t('Screen_lock')
 	});
 
diff --git a/app/views/SearchMessagesView/index.tsx b/app/views/SearchMessagesView/index.tsx
index 918cdc9af9..cf2185b2c7 100644
--- a/app/views/SearchMessagesView/index.tsx
+++ b/app/views/SearchMessagesView/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationOptions, NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { CompositeNavigationProp, RouteProp } from '@react-navigation/core';
 import { FlatList, Text, View } from 'react-native';
 import { Q } from '@nozbe/watermelondb';
@@ -60,8 +60,8 @@ export interface IRoomInfoParam {
 
 interface INavigationOption {
 	navigation: CompositeNavigationProp<
-		StackNavigationProp<ChatsStackParamList, 'SearchMessagesView'>,
-		StackNavigationProp<InsideStackParamList & TNavigation>
+		NativeStackNavigationProp<ChatsStackParamList, 'SearchMessagesView'>,
+		NativeStackNavigationProp<InsideStackParamList & TNavigation>
 	>;
 	route: RouteProp<ChatsStackParamList, 'SearchMessagesView'>;
 }
@@ -88,7 +88,7 @@ class SearchMessagesView extends React.Component<ISearchMessagesViewProps, ISear
 	private room?: IRoomInfoResult;
 
 	static navigationOptions = ({ navigation, route }: INavigationOption) => {
-		const options: StackNavigationOptions = {
+		const options: NativeStackNavigationOptions = {
 			title: I18n.t('Search')
 		};
 		const showCloseModal = route.params?.showCloseModal;
diff --git a/app/views/SecurityPrivacyView.tsx b/app/views/SecurityPrivacyView.tsx
index 9480a3ec31..ddec8772ad 100644
--- a/app/views/SecurityPrivacyView.tsx
+++ b/app/views/SecurityPrivacyView.tsx
@@ -1,5 +1,5 @@
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import React, { useEffect, useState } from 'react';
 
 import * as List from '../containers/List';
@@ -22,7 +22,7 @@ import {
 import Switch from '../containers/Switch';
 
 interface ISecurityPrivacyViewProps {
-	navigation: StackNavigationProp<SettingsStackParamList, 'SecurityPrivacyView'>;
+	navigation: NativeStackNavigationProp<SettingsStackParamList, 'SecurityPrivacyView'>;
 }
 
 const SecurityPrivacyView = ({ navigation }: ISecurityPrivacyViewProps): JSX.Element => {
diff --git a/app/views/SelectListView.tsx b/app/views/SelectListView.tsx
index da0a3202e5..e6a8a78867 100644
--- a/app/views/SelectListView.tsx
+++ b/app/views/SelectListView.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationOptions, NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { FlatList, StyleSheet, Text, View } from 'react-native';
 import { connect } from 'react-redux';
 import { RadioButton } from 'react-native-ui-lib';
@@ -37,7 +37,7 @@ interface ISelectListViewState {
 }
 
 interface ISelectListViewProps {
-	navigation: StackNavigationProp<ChatsStackParamList, 'SelectListView'>;
+	navigation: NativeStackNavigationProp<ChatsStackParamList, 'SelectListView'>;
 	route: RouteProp<ChatsStackParamList, 'SelectListView'>;
 	theme: TSupportedThemes;
 	isMasterDetail: boolean;
@@ -81,7 +81,7 @@ class SelectListView extends React.Component<ISelectListViewProps, ISelectListVi
 		const { navigation, isMasterDetail } = this.props;
 		const { selected } = this.state;
 
-		const options: StackNavigationOptions = {
+		const options: NativeStackNavigationOptions = {
 			headerTitle: I18n.t(this.title)
 		};
 
diff --git a/app/views/SelectServerView.tsx b/app/views/SelectServerView.tsx
index d3beecf215..62f9a90d72 100644
--- a/app/views/SelectServerView.tsx
+++ b/app/views/SelectServerView.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useLayoutEffect } from 'react';
 import { FlatList } from 'react-native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { Q } from '@nozbe/watermelondb';
 import { useNavigation } from '@react-navigation/native';
 import { useDispatch } from 'react-redux';
@@ -24,7 +24,7 @@ const SelectServerView = () => {
 	const dispatch = useDispatch();
 
 	const server = useAppSelector(state => state.server.server);
-	const navigation = useNavigation<StackNavigationProp<ShareInsideStackParamList, 'SelectServerView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<ShareInsideStackParamList, 'SelectServerView'>>();
 
 	useLayoutEffect(() => {
 		navigation.setOptions({
diff --git a/app/views/SelectedUsersView/index.tsx b/app/views/SelectedUsersView/index.tsx
index 68d55cd068..f8b6406784 100644
--- a/app/views/SelectedUsersView/index.tsx
+++ b/app/views/SelectedUsersView/index.tsx
@@ -5,7 +5,7 @@ import { FlatList } from 'react-native';
 import { shallowEqual, useDispatch } from 'react-redux';
 import { Subscription } from 'rxjs';
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
 import { addUser, removeUser, reset } from '../../actions/selectedUsers';
 import * as HeaderButton from '../../containers/HeaderButton';
@@ -28,7 +28,7 @@ import { useAppSelector } from '../../lib/hooks';
 import Header from './Header';
 
 type TRoute = RouteProp<ChatsStackParamList, 'SelectedUsersView'>;
-type TNavigation = StackNavigationProp<ChatsStackParamList, 'SelectedUsersView'>;
+type TNavigation = NativeStackNavigationProp<ChatsStackParamList, 'SelectedUsersView'>;
 
 const SelectedUsersView = () => {
 	const [chats, setChats] = useState<ISelectedUser[]>([]);
diff --git a/app/views/SetUsernameView.tsx b/app/views/SetUsernameView.tsx
index 11b6f761bd..c765c54aa2 100644
--- a/app/views/SetUsernameView.tsx
+++ b/app/views/SetUsernameView.tsx
@@ -1,5 +1,5 @@
 import { useNavigation } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import React, { useEffect, useLayoutEffect, useState } from 'react';
 import { ScrollView, StyleSheet, Text } from 'react-native';
 import { useDispatch } from 'react-redux';
@@ -51,7 +51,7 @@ const SetUsernameView = () => {
 	const dispatch = useDispatch();
 	const { server, token } = useAppSelector(state => ({ server: state.server.server, token: getUserSelector(state).token }));
 
-	const navigation = useNavigation<StackNavigationProp<SetUsernameStackParamList, 'SetUsernameView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<SetUsernameStackParamList, 'SetUsernameView'>>();
 
 	useLayoutEffect(() => {
 		navigation.setOptions({ title: server });
diff --git a/app/views/SettingsView/index.tsx b/app/views/SettingsView/index.tsx
index 5c7a15783f..41d9f58d9b 100644
--- a/app/views/SettingsView/index.tsx
+++ b/app/views/SettingsView/index.tsx
@@ -5,7 +5,7 @@ import React, { useLayoutEffect } from 'react';
 import { Linking, Share } from 'react-native';
 import FastImage from 'react-native-fast-image';
 import { useDispatch } from 'react-redux';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
 import { appStart } from '../../actions/app';
 import { logout } from '../../actions/login';
@@ -39,7 +39,7 @@ type TLogScreenName = 'SE_GO_LANGUAGE' | 'SE_GO_DEFAULTBROWSER' | 'SE_GO_THEME'
 
 const SettingsView = (): React.ReactElement => {
 	const { colors, theme } = useTheme();
-	const navigation = useNavigation<StackNavigationProp<SettingsStackParamList, 'SettingsView'>>();
+	const navigation = useNavigation<NativeStackNavigationProp<SettingsStackParamList, 'SettingsView'>>();
 	const dispatch = useDispatch();
 	const isMasterDetail = useAppSelector(state => state.app.isMasterDetail);
 	const userId = useAppSelector(state => getUserSelector(state).id);
diff --git a/app/views/ShareListView/index.tsx b/app/views/ShareListView/index.tsx
index 976548af17..b6efba0662 100644
--- a/app/views/ShareListView/index.tsx
+++ b/app/views/ShareListView/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Dispatch } from 'redux';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { BackHandler, FlatList, Keyboard, Text, View } from 'react-native';
 import * as FileSystem from 'expo-file-system';
 import { connect } from 'react-redux';
@@ -49,7 +49,7 @@ interface IState {
 }
 
 interface INavigationOption {
-	navigation: StackNavigationProp<ShareInsideStackParamList, 'ShareListView'>;
+	navigation: NativeStackNavigationProp<ShareInsideStackParamList, 'ShareListView'>;
 }
 
 interface IShareListViewProps extends INavigationOption {
@@ -59,6 +59,7 @@ interface IShareListViewProps extends INavigationOption {
 	token: string;
 	userId: string;
 	theme: TSupportedThemes;
+	airGappedRestrictionRemainingDays: number | undefined;
 	shareExtensionParams: Record<string, any>;
 	dispatch: Dispatch;
 }
@@ -189,9 +190,6 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
 
 		if (searching) {
 			navigation.setOptions({
-				headerTitleAlign: 'left',
-				headerTitleContainerStyle: { flex: 1, marginHorizontal: 0, marginRight: 15, maxWidth: undefined },
-				headerRightContainerStyle: { flexGrow: 0 },
 				headerLeft: () => (
 					<HeaderButton.Container left>
 						<HeaderButton.Item iconName='close' onPress={this.cancelSearch} />
@@ -204,16 +202,18 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
 		}
 
 		navigation.setOptions({
-			headerTitleAlign: undefined,
-			headerTitleContainerStyle: undefined,
-			headerRightContainerStyle: undefined,
-			headerLeft: () => <HeaderButton.CancelModal onPress={this.closeShareExtension} testID='share-extension-close' />,
-			headerTitle: I18n.t('Send_to'),
-			headerRight: () => (
-				<HeaderButton.Container>
-					<HeaderButton.Item iconName='search' onPress={this.initSearch} />
+			headerLeft: () => (
+				<HeaderButton.Container left>
+					<HeaderButton.Item iconName='close' onPress={this.closeShareExtension} testID='share-extension-close' />
 				</HeaderButton.Container>
-			)
+			),
+			headerTitle: I18n.t('Send_to'),
+			headerRight: () =>
+				this.airGappedReadOnly ? null : (
+					<HeaderButton.Container>
+						<HeaderButton.Item iconName='search' onPress={this.initSearch} />
+					</HeaderButton.Container>
+				)
 		});
 	};
 
@@ -285,6 +285,17 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
 				// Do nothing
 			}
 
+			if (this.airGappedReadOnly) {
+				this.internalSetState({
+					chats: [],
+					serversCount,
+					loading: false,
+					serverInfo
+				});
+				this.forceUpdate();
+				return;
+			}
+
 			this.internalSetState({
 				chats: chats ?? [],
 				serversCount,
@@ -347,6 +358,11 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
 		dispatch(appStart({ root: RootEnum.ROOT_INSIDE }));
 	};
 
+	get airGappedReadOnly() {
+		const { airGappedRestrictionRemainingDays } = this.props;
+		return airGappedRestrictionRemainingDays !== undefined && airGappedRestrictionRemainingDays === 0;
+	}
+
 	renderSectionHeader = (header: string) => {
 		const { searching } = this.state;
 		const { theme } = this.props;
@@ -395,8 +411,11 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
 	};
 
 	renderSelectServer = () => {
-		const { serverInfo } = this.state;
+		const { serverInfo, serversCount } = this.state;
 		const { navigation } = this.props;
+		if (serversCount === 1) {
+			return null;
+		}
 		return (
 			<>
 				{this.renderSectionHeader('Select_Server')}
@@ -407,25 +426,25 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
 	};
 
 	renderEmptyComponent = () => {
+		const { searching, searchText } = this.state;
 		const { theme } = this.props;
-		return (
-			<View style={[styles.container, styles.emptyContainer, { backgroundColor: themes[theme].surfaceHover }]}>
-				<Text style={[styles.title, { color: themes[theme].fontTitlesLabels }]}>{I18n.t('No_results_found')}</Text>
-			</View>
-		);
+		if (searching && searchText) {
+			return (
+				<View style={[styles.container, styles.emptyContainer, { backgroundColor: themes[theme].surfaceHover }]}>
+					<Text style={[styles.title, { color: themes[theme].fontTitlesLabels }]}>{I18n.t('No_results_found')}</Text>
+				</View>
+			);
+		}
+		return null;
 	};
 
 	renderHeader = () => {
-		const { searching, serversCount } = this.state;
+		const { searching } = this.state;
 
 		if (searching) {
 			return null;
 		}
 
-		if (serversCount === 1) {
-			return this.renderSectionHeader('Chats');
-		}
-
 		return (
 			<>
 				{this.renderSelectServer()}
@@ -435,13 +454,42 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
 	};
 
 	render = () => {
-		const { chats, loading, searchResults, searching, searchText } = this.state;
+		const { chats, loading, searchResults, searching, serversCount } = this.state;
 		const { theme } = this.props;
 
 		if (loading) {
 			return <ActivityIndicator />;
 		}
 
+		if (this.airGappedReadOnly) {
+			return (
+				<SafeAreaView testID='share-list-view'>
+					{this.renderSelectServer()}
+					{serversCount > 1 ? (
+						<>
+							<View style={styles.readOnlyServerSeparator} />
+							<List.Separator />
+						</>
+					) : null}
+					<View
+						style={[
+							styles.readOnlyContainer,
+							{
+								backgroundColor: themes[theme].surfaceRoom,
+								...(serversCount > 1 ? { justifyContent: 'center' } : { paddingTop: 250 })
+							}
+						]}>
+						<Text style={[styles.readOnlyTitle, { color: themes[theme].fontDefault }]}>
+							{I18n.t('AirGapped_workspace_read_only_share_extension_title')}
+						</Text>
+						<Text style={[styles.readOnlyDescription, { color: themes[theme].fontDefault }]}>
+							{I18n.t('AirGapped_workspace_read_only_description')}
+						</Text>
+					</View>
+				</SafeAreaView>
+			);
+		}
+
 		return (
 			<SafeAreaView testID='share-list-view'>
 				<FlatList
@@ -453,7 +501,7 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
 					ItemSeparatorComponent={List.Separator}
 					ListHeaderComponent={this.renderHeader}
 					ListFooterComponent={!searching || searchResults.length > 0 ? <List.Separator /> : null}
-					ListEmptyComponent={searching && searchText ? this.renderEmptyComponent : null}
+					ListEmptyComponent={this.renderEmptyComponent}
 					removeClippedSubviews
 					keyboardShouldPersistTaps='always'
 				/>
@@ -462,13 +510,17 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
 	};
 }
 
-const mapStateToProps = ({ login, server, share }: IApplicationState) => ({
+const mapStateToProps = ({ login, server, share, settings }: IApplicationState) => ({
 	userId: login?.user?.id as string,
 	token: login?.user?.token as string,
 	isAuthenticated: login?.isAuthenticated,
 	server: server?.server,
 	connecting: server?.connecting,
-	shareExtensionParams: share?.params
+	shareExtensionParams: share?.params,
+	airGappedRestrictionRemainingDays:
+		typeof settings.Cloud_Workspace_AirGapped_Restrictions_Remaining_Days === 'number'
+			? settings.Cloud_Workspace_AirGapped_Restrictions_Remaining_Days
+			: undefined
 });
 
 export default connect(mapStateToProps)(withTheme(ShareListView));
diff --git a/app/views/ShareListView/styles.ts b/app/views/ShareListView/styles.ts
index 5a3241da94..6b60a2a64f 100644
--- a/app/views/ShareListView/styles.ts
+++ b/app/views/ShareListView/styles.ts
@@ -66,5 +66,25 @@ export default StyleSheet.create({
 		marginHorizontal: 30,
 		...sharedStyles.textRegular,
 		...sharedStyles.textAlignCenter
+	},
+	readOnlyServerSeparator: {
+		height: 16
+	},
+	readOnlyContainer: {
+		flex: 1,
+		alignItems: 'center',
+		padding: 16
+	},
+	readOnlyTitle: {
+		fontSize: 16,
+		lineHeight: 24,
+		...sharedStyles.textSemibold,
+		textAlign: 'center'
+	},
+	readOnlyDescription: {
+		fontSize: 16,
+		lineHeight: 24,
+		...sharedStyles.textRegular,
+		textAlign: 'center'
 	}
 });
diff --git a/app/views/ShareView/index.tsx b/app/views/ShareView/index.tsx
index 50e12ddd7f..31ff1475b2 100644
--- a/app/views/ShareView/index.tsx
+++ b/app/views/ShareView/index.tsx
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationOptions, NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { RouteProp } from '@react-navigation/native';
 import { Keyboard, Text, View } from 'react-native';
 import { connect } from 'react-redux';
@@ -52,7 +52,7 @@ interface IShareViewState {
 }
 
 interface IShareViewProps {
-	navigation: StackNavigationProp<InsideStackParamList, 'ShareView'>;
+	navigation: NativeStackNavigationProp<InsideStackParamList, 'ShareView'>;
 	route: RouteProp<InsideStackParamList, 'ShareView'>;
 	theme: TSupportedThemes;
 	user: {
@@ -130,10 +130,8 @@ class ShareView extends Component<IShareViewProps, IShareViewState> {
 		const { room, thread, readOnly, attachments } = this.state;
 		const { navigation, theme } = this.props;
 
-		const options: StackNavigationOptions = {
-			headerTitle: () => <Header room={room} thread={thread} />,
-			headerTitleAlign: 'left',
-			headerTintColor: themes[theme].backdropColor
+		const options: NativeStackNavigationOptions = {
+			headerTitle: () => <Header room={room} thread={thread} />
 		};
 
 		// if is share extension show default back button
@@ -151,8 +149,6 @@ class ShareView extends Component<IShareViewProps, IShareViewState> {
 			);
 		}
 
-		options.headerBackground = () => <View style={[styles.container, { backgroundColor: themes[theme].surfaceNeutral }]} />;
-
 		navigation.setOptions(options);
 	};
 
@@ -418,7 +414,7 @@ class ShareView extends Component<IShareViewProps, IShareViewState> {
 		const { theme } = this.props;
 		if (readOnly || isBlocked(room)) {
 			return (
-				<View style={[styles.container, styles.centered, { backgroundColor: themes[theme].surfaceHover }]}>
+				<View style={[styles.container, styles.centered, { backgroundColor: themes[theme].surfaceHover }]} testID='share-view'>
 					<Text style={[styles.title, { color: themes[theme].fontTitlesLabels }]}>
 						{isBlocked(room) ? I18n.t('This_room_is_blocked') : I18n.t('This_room_is_read_only')}
 					</Text>
@@ -426,7 +422,7 @@ class ShareView extends Component<IShareViewProps, IShareViewState> {
 			);
 		}
 		return (
-			<SafeAreaView style={{ backgroundColor: themes[theme].surfaceHover, flex: 1 }} testID='share-view'>
+			<SafeAreaView style={{ backgroundColor: themes[theme].surfaceHover }} testID='share-view'>
 				{this.renderContent()}
 			</SafeAreaView>
 		);
diff --git a/app/views/Styles.ts b/app/views/Styles.ts
index d66706db09..6e9ea83739 100644
--- a/app/views/Styles.ts
+++ b/app/views/Styles.ts
@@ -80,7 +80,8 @@ export default StyleSheet.create({
 				fontWeight: '400'
 			},
 			android: {
-				fontFamily: 'Inter-Regular'
+				fontFamily: 'Inter-Regular',
+				letterSpacing: 0.01
 			}
 		})
 	},
diff --git a/app/views/TeamChannelsView.tsx b/app/views/TeamChannelsView.tsx
index 9b53294443..ef9c81b1ec 100644
--- a/app/views/TeamChannelsView.tsx
+++ b/app/views/TeamChannelsView.tsx
@@ -1,6 +1,5 @@
 import { Q } from '@nozbe/watermelondb';
-import { StackNavigationOptions } from '@react-navigation/stack';
-import { HeaderBackButton } from '@react-navigation/elements';
+import { NativeStackNavigationOptions } from '@react-navigation/native-stack';
 import React from 'react';
 import { Alert, FlatList, Keyboard } from 'react-native';
 import { connect } from 'react-redux';
@@ -187,7 +186,7 @@ class TeamChannelsView extends React.Component<ITeamChannelsViewProps, ITeamChan
 
 	setHeader = () => {
 		const { isSearching, showCreate } = this.state;
-		const { navigation, isMasterDetail, theme } = this.props;
+		const { navigation } = this.props;
 
 		const { team } = this;
 		if (!team) {
@@ -195,10 +194,7 @@ class TeamChannelsView extends React.Component<ITeamChannelsViewProps, ITeamChan
 		}
 
 		if (isSearching) {
-			const options: StackNavigationOptions = {
-				headerTitleAlign: 'left',
-				headerTitleContainerStyle: { flex: 1, marginHorizontal: 0, marginRight: 15, maxWidth: undefined },
-				headerRightContainerStyle: { flexGrow: 0 },
+			const options: NativeStackNavigationOptions = {
 				headerLeft: () => (
 					<HeaderButton.Container left>
 						<HeaderButton.Item iconName='close' onPress={this.onCancelSearchPress} />
@@ -212,19 +208,8 @@ class TeamChannelsView extends React.Component<ITeamChannelsViewProps, ITeamChan
 			return navigation.setOptions(options);
 		}
 
-		const options: StackNavigationOptions = {
-			headerTitleAlign: 'left',
-			headerTitleContainerStyle: { flex: 1, marginLeft: 0, marginRight: 4, maxWidth: undefined },
-			headerLeftContainerStyle: { minWidth: 60 },
-			headerRightContainerStyle: { flexGrow: undefined, flexBasis: undefined },
-			headerLeft: () => (
-				<HeaderBackButton
-					labelVisible={false}
-					onPress={() => navigation.pop()}
-					tintColor={themes[theme].fontSecondaryInfo}
-					testID='header-back'
-				/>
-			),
+		const options: NativeStackNavigationOptions = {
+			headerLeft: () => null,
 			headerTitle: () => (
 				<RoomHeader title={getRoomTitle(team)} subtitle={team.topic} type={team.t} onPress={this.goRoomActionsView} teamMain />
 			),
@@ -242,10 +227,6 @@ class TeamChannelsView extends React.Component<ITeamChannelsViewProps, ITeamChan
 			)
 		};
 
-		if (isMasterDetail) {
-			options.headerLeft = () => <HeaderButton.CloseModal navigation={navigation} />;
-		}
-
 		navigation.setOptions(options);
 	};
 
diff --git a/app/views/ThreadMessagesView/index.tsx b/app/views/ThreadMessagesView/index.tsx
index 1ef8af54c5..cf32da0a52 100644
--- a/app/views/ThreadMessagesView/index.tsx
+++ b/app/views/ThreadMessagesView/index.tsx
@@ -3,8 +3,7 @@ import { FlatList } from 'react-native';
 import { connect } from 'react-redux';
 import { Q } from '@nozbe/watermelondb';
 import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord';
-import { StackNavigationOptions } from '@react-navigation/stack';
-import { HeaderBackButton } from '@react-navigation/elements';
+import { NativeStackNavigationOptions } from '@react-navigation/native-stack';
 import { Observable, Subscription } from 'rxjs';
 
 import { showActionSheetRef } from '../../containers/ActionSheet';
@@ -106,15 +105,12 @@ class ThreadMessagesView extends React.Component<IThreadMessagesViewProps, IThre
 		}
 	}
 
-	getHeader = (): StackNavigationOptions => {
+	getHeader = (): NativeStackNavigationOptions => {
 		const { isSearching } = this.state;
-		const { navigation, isMasterDetail, theme } = this.props;
+		const { navigation, isMasterDetail } = this.props;
 
 		if (isSearching) {
 			return {
-				headerTitleAlign: 'left',
-				headerTitleContainerStyle: { flex: 1, marginHorizontal: 0, marginRight: 15, maxWidth: undefined },
-				headerRightContainerStyle: { flexGrow: 0 },
 				headerLeft: () => (
 					<HeaderButton.Container left>
 						<HeaderButton.Item iconName='close' onPress={this.onCancelSearchPress} />
@@ -127,19 +123,9 @@ class ThreadMessagesView extends React.Component<IThreadMessagesViewProps, IThre
 			};
 		}
 
-		const options: StackNavigationOptions = {
-			headerTitleAlign: 'center',
+		const options: NativeStackNavigationOptions = {
+			headerLeft: () => null,
 			headerTitle: I18n.t('Threads'),
-			headerTitleContainerStyle: {},
-			headerRightContainerStyle: { flexGrow: 1 },
-			headerLeft: () => (
-				<HeaderBackButton
-					labelVisible={false}
-					onPress={() => navigation.pop()}
-					tintColor={themes[theme].fontSecondaryInfo}
-					testID='header-back'
-				/>
-			),
 			headerRight: () => (
 				<HeaderButton.Container>
 					<HeaderButton.Item iconName='filter' onPress={this.showFilters} />
diff --git a/app/views/UserNotificationPreferencesView/index.tsx b/app/views/UserNotificationPreferencesView/index.tsx
index 8b4758692d..dd4cf65df7 100644
--- a/app/views/UserNotificationPreferencesView/index.tsx
+++ b/app/views/UserNotificationPreferencesView/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useLayoutEffect, useState } from 'react';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { CompositeNavigationProp, useNavigation } from '@react-navigation/native';
 
 import StatusBar from '../../containers/StatusBar';
@@ -20,8 +20,8 @@ import { NOTIFICATION_IN_APP_VIBRATION } from '../../lib/constants';
 import Switch from '../../containers/Switch';
 
 type TNavigation = CompositeNavigationProp<
-	StackNavigationProp<ProfileStackParamList, 'UserNotificationPrefView'>,
-	StackNavigationProp<MasterDetailInsideStackParamList>
+	NativeStackNavigationProp<ProfileStackParamList, 'UserNotificationPrefView'>,
+	NativeStackNavigationProp<MasterDetailInsideStackParamList>
 >;
 
 const UserNotificationPreferencesView = () => {
diff --git a/app/views/UserPreferencesView/index.tsx b/app/views/UserPreferencesView/index.tsx
index 9c557a6805..9d58f34d4f 100644
--- a/app/views/UserPreferencesView/index.tsx
+++ b/app/views/UserPreferencesView/index.tsx
@@ -1,4 +1,4 @@
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import React, { useEffect } from 'react';
 import { useDispatch } from 'react-redux';
 
@@ -17,7 +17,7 @@ import ListPicker from './ListPicker';
 import Switch from '../../containers/Switch';
 
 interface IUserPreferencesViewProps {
-	navigation: StackNavigationProp<ProfileStackParamList, 'UserPreferencesView'>;
+	navigation: NativeStackNavigationProp<ProfileStackParamList, 'UserPreferencesView'>;
 }
 
 const UserPreferencesView = ({ navigation }: IUserPreferencesViewProps): JSX.Element => {
diff --git a/app/views/WorkspaceView/index.tsx b/app/views/WorkspaceView/index.tsx
index 02cae0740e..e61906ecee 100644
--- a/app/views/WorkspaceView/index.tsx
+++ b/app/views/WorkspaceView/index.tsx
@@ -1,12 +1,13 @@
 import React, { useLayoutEffect } from 'react';
 import { Text, View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
-import { StackNavigationProp } from '@react-navigation/stack';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { CompositeNavigationProp } from '@react-navigation/core';
 
 import { OutsideModalParamList, OutsideParamList } from '../../stacks/types';
 import I18n from '../../i18n';
 import Button from '../../containers/Button';
+import { useWorkspaceDomain } from '../../lib/hooks/useWorkspaceDomain';
 import { useTheme } from '../../theme';
 import FormContainer, { FormContainerInner } from '../../containers/FormContainer';
 import { IAssetsFavicon512 } from '../../definitions/IAssetsFavicon512';
@@ -17,8 +18,8 @@ import { useAppSelector } from '../../lib/hooks';
 import RegisterDisabledComponent from './RegisterDisabledComponent';
 
 type TNavigation = CompositeNavigationProp<
-	StackNavigationProp<OutsideParamList, 'WorkspaceView'>,
-	StackNavigationProp<OutsideModalParamList>
+	NativeStackNavigationProp<OutsideParamList, 'WorkspaceView'>,
+	NativeStackNavigationProp<OutsideModalParamList>
 >;
 
 const useWorkspaceViewSelector = () =>
@@ -38,6 +39,8 @@ const WorkspaceView = () => {
 
 	const { colors } = useTheme();
 
+	const workspaceDomain = useWorkspaceDomain();
+
 	const {
 		Accounts_iframe_enabled,
 		Assets_favicon_512,
@@ -51,9 +54,9 @@ const WorkspaceView = () => {
 
 	useLayoutEffect(() => {
 		navigation.setOptions({
-			title: I18n.t('Your_workspace')
+			title: workspaceDomain
 		});
-	}, [navigation]);
+	}, [navigation, workspaceDomain]);
 
 	const showRegistrationButton = !!(
 		!Accounts_iframe_enabled &&
@@ -65,11 +68,11 @@ const WorkspaceView = () => {
 			navigation.navigate('AuthenticationWebView', { url: server, authType: 'iframe' });
 			return;
 		}
-		navigation.navigate('LoginView', { title: Site_Name });
+		navigation.navigate('LoginView', { title: workspaceDomain });
 	};
 
 	const register = () => {
-		navigation.navigate('RegisterView', { title: Site_Name });
+		navigation.navigate('RegisterView', { title: workspaceDomain });
 	};
 
 	return (
diff --git a/e2e/helpers/app.ts b/e2e/helpers/app.ts
index a7605a0d67..6df4f9718d 100644
--- a/e2e/helpers/app.ts
+++ b/e2e/helpers/app.ts
@@ -68,7 +68,7 @@ async function login(username: string, password: string) {
 
 async function logout() {
 	const deviceType = device.getPlatform();
-	const { scrollViewType, textMatcher } = platformTypes[deviceType];
+	const { textMatcher } = platformTypes[deviceType];
 	await element(by.id('rooms-list-view-sidebar')).tap();
 	await waitFor(element(by.id('sidebar-view')))
 		.toBeVisible()
@@ -77,10 +77,10 @@ async function logout() {
 		.toBeVisible()
 		.withTimeout(2000);
 	await element(by.id('sidebar-settings')).tap();
-	await waitFor(element(by.id('settings-view')))
+	await element(by.id('settings-view')).swipe('up');
+	await waitFor(element(by.id('settings-logout')))
 		.toBeVisible()
 		.withTimeout(2000);
-	await element(by.type(scrollViewType)).atIndex(1).scrollTo('bottom');
 	await element(by.id('settings-logout')).tap();
 	const logoutAlertMessage = 'You will be logged out of this application.';
 	await waitFor(element(by[textMatcher](logoutAlertMessage)).atIndex(0))
@@ -112,12 +112,19 @@ async function mockMessage(message: string, isThread = false) {
 }
 
 async function tapBack() {
-	try {
-		await element(by.id('header-back')).atIndex(0).tap();
-	} catch (error) {
-		await device.pressBack();
+	if (device.getPlatform() === 'ios') {
+		try {
+			await element(by.type('UIAccessibilityBackButtonElement')).tap();
+		} catch (error) {
+			await element(by.id('header-back')).atIndex(0).tap();
+		}
+	} else {
+		try {
+			await element(by.label('Navigate up')).tap();
+		} catch (error) {
+			await element(by.id('header-back')).atIndex(0).tap();
+		}
 	}
-	await sleep(300); // Wait for animation to finish
 }
 
 async function searchRoom(
diff --git a/e2e/tests/assorted/02-broadcast.spec.ts b/e2e/tests/assorted/02-broadcast.spec.ts
index 20b17661cd..0dc290806e 100644
--- a/e2e/tests/assorted/02-broadcast.spec.ts
+++ b/e2e/tests/assorted/02-broadcast.spec.ts
@@ -78,17 +78,8 @@ describe('Broadcast room', () => {
 			.toBeVisible()
 			.withTimeout(2000);
 		await tapBack();
-		await waitFor(element(by.id('room-view')))
-			.toBeVisible()
-			.withTimeout(2000);
-	});
-
-	it('should send message', async () => {
-		await waitFor(element(by.id('room-view')))
-			.toBeVisible()
-			.withTimeout(5000);
+		await checkRoomTitle(room);
 		message = await mockMessage('message');
-		await tapBack();
 	});
 
 	it('should login as user without write message authorization and enter room', async () => {
@@ -126,11 +117,8 @@ describe('Broadcast room', () => {
 			.withTimeout(60000);
 	});
 
-	it('should have reply button', async () => {
-		await expect(element(by.id('message-broadcast-reply'))).toBeVisible();
-	});
-
 	it('should tap on reply button and navigate to direct room', async () => {
+		await expect(element(by.id('message-broadcast-reply'))).toBeVisible();
 		await element(by.id('message-broadcast-reply')).tap();
 		await waitFor(element(by.id(`room-view-title-${user.username}`)))
 			.toBeVisible()
diff --git a/e2e/tests/assorted/11-deeplinking.spec.ts b/e2e/tests/assorted/11-deeplinking.spec.ts
index 21b3249d60..4f626f2c55 100644
--- a/e2e/tests/assorted/11-deeplinking.spec.ts
+++ b/e2e/tests/assorted/11-deeplinking.spec.ts
@@ -44,8 +44,6 @@ describe('Deep linking', () => {
 
 	const deleteUsersAfterAll: IDeleteCreateUser[] = [];
 
-	const randomUserAlternateServer = data.randomUser();
-
 	beforeAll(async () => {
 		const user = await createRandomUser();
 		({ _id: rid, name: room } = await createRandomRoom(user, 'p'));
@@ -101,16 +99,17 @@ describe('Deep linking', () => {
 		it('should authenticate while logged in another server', async () => {
 			await device.launchApp({ permissions: { notifications: 'YES' }, delete: true });
 			await navigateToRegister(data.alternateServer);
-			await element(by.id('register-view-name')).replaceText(randomUserAlternateServer.name);
+			const randomUser = data.randomUser();
+			await element(by.id('register-view-name')).replaceText(randomUser.name);
 			await element(by.id('register-view-name')).tapReturnKey();
-			await element(by.id('register-view-username')).replaceText(randomUserAlternateServer.username);
+			await element(by.id('register-view-username')).replaceText(randomUser.username);
 			await element(by.id('register-view-username')).tapReturnKey();
-			await element(by.id('register-view-email')).replaceText(randomUserAlternateServer.email);
+			await element(by.id('register-view-email')).replaceText(randomUser.email);
 			await element(by.id('register-view-email')).tapReturnKey();
-			await element(by.id('register-view-password')).replaceText(randomUserAlternateServer.password);
+			await element(by.id('register-view-password')).replaceText(randomUser.password);
 			await element(by.id('register-view-password')).tapReturnKey();
 			await expectValidRegisterOrRetry(device.getPlatform());
-			deleteUsersAfterAll.push({ server: data.alternateServer, username: randomUserAlternateServer.username });
+			deleteUsersAfterAll.push({ server: data.alternateServer, username: randomUser.username });
 
 			await authAndNavigate();
 		});
diff --git a/e2e/tests/assorted/12-i18n.spec.ts b/e2e/tests/assorted/12-i18n.spec.ts
index 4ff6c20506..accfd1a983 100644
--- a/e2e/tests/assorted/12-i18n.spec.ts
+++ b/e2e/tests/assorted/12-i18n.spec.ts
@@ -43,7 +43,6 @@ describe('i18n', () => {
 			await waitFor(element(by.id('new-server-view')))
 				.toBeVisible()
 				.withTimeout(20000);
-			await expect(element(by.id('new-server-view-open'))).toBeVisible();
 		});
 
 		it("OS set to unavailable language and fallback to 'en'", async () => {
@@ -60,7 +59,6 @@ describe('i18n', () => {
 			await waitFor(element(by.id('new-server-view')))
 				.toBeVisible()
 				.withTimeout(20000);
-			await expect(element(by.id('new-server-view-open'))).toBeVisible();
 		});
 
 		/**
diff --git a/e2e/tests/onboarding/01-onboarding.spec.ts b/e2e/tests/onboarding/01-onboarding.spec.ts
index 6190a8c277..3d02a6917b 100644
--- a/e2e/tests/onboarding/01-onboarding.spec.ts
+++ b/e2e/tests/onboarding/01-onboarding.spec.ts
@@ -18,29 +18,18 @@ describe('Onboarding', () => {
 		it('should have onboarding screen', async () => {
 			await expect(element(by.id('new-server-view'))).toBeVisible();
 		});
-
-		// it('should have "Join our open workspace"', async () => {
-		// 	await expect(element(by.id('new-server-view-open'))).toBeVisible();
-		// });
 	});
 
 	describe('Usage', () => {
 		it('should enter an invalid server and get error', async () => {
 			await element(by.id('new-server-view-input')).replaceText('invalidtest');
 			await element(by.id('new-server-view-input')).tapReturnKey();
-			await waitFor(element(by[textMatcher]('Oops!')))
+			await waitFor(element(by[textMatcher]('Invalid workspace URL')))
 				.toExist()
 				.withTimeout(10000);
 			await element(by[textMatcher]('OK').and(by.type(alertButtonType))).tap();
 		});
 
-		// it('should tap on "Join our open workspace" and navigate', async () => {
-		// 	await element(by.id('new-server-view-open')).tap();
-		// 	await waitFor(element(by.id('workspace-view')))
-		// 		.toBeVisible()
-		// 		.withTimeout(60000);
-		// });
-
 		it('should enter a valid server without login services and navigate to login', async () => {
 			await device.launchApp({ newInstance: true });
 			await waitFor(element(by.id('new-server-view')))
diff --git a/e2e/tests/room/02-room.spec.ts b/e2e/tests/room/02-room.spec.ts
index cd18c3ba9d..7a38a3c960 100644
--- a/e2e/tests/room/02-room.spec.ts
+++ b/e2e/tests/room/02-room.spec.ts
@@ -284,7 +284,10 @@ describe('Room screen', () => {
 				.toExist()
 				.withTimeout(2000);
 			await expect(element(by.id('action-sheet-handle'))).toBeVisible();
-			await element(by.id('action-sheet-handle')).swipe('up', 'fast', 0.5);
+			await sleep(300);
+			await waitFor(element(by[textMatcher]('Edit')))
+				.toBeVisible()
+				.withTimeout(3000);
 			await element(by[textMatcher]('Edit')).atIndex(0).tap();
 			await element(by.id('message-composer-input')).typeText('ed');
 			await element(by.id('message-composer-send')).tap();
@@ -312,6 +315,7 @@ describe('Room screen', () => {
 			await waitFor(element(by[textMatcher](quotedMessage)).atIndex(0))
 				.toBeVisible()
 				.withTimeout(3000);
+			await element(by[textMatcher](quotedMessage)).atIndex(0).tap();
 			await waitFor(element(by.id(`reply-${user.name}-${quoteMessage}`).withDescendant(by[textMatcher](quoteMessage))))
 				.toBeVisible()
 				.withTimeout(3000);
@@ -321,6 +325,9 @@ describe('Room screen', () => {
 			const expectedLastMessage = `You: ${quotedMessage}`;
 			await sleep(300);
 			await tapBack();
+			await waitFor(element(by.id('rooms-list-view')))
+				.toBeVisible()
+				.withTimeout(5000);
 			await waitFor(element(by.id(`markdown-preview-${expectedLastMessage}`)))
 				.toBeVisible()
 				.withTimeout(5000);
diff --git a/e2e/tests/room/09-jumptomessage.spec.ts b/e2e/tests/room/09-jumptomessage.spec.ts
index 320bfacc3b..b2dd91139a 100644
--- a/e2e/tests/room/09-jumptomessage.spec.ts
+++ b/e2e/tests/room/09-jumptomessage.spec.ts
@@ -188,6 +188,7 @@ describe('Room', () => {
 			.withTimeout(5000);
 		await element(by.id('room-view-messages')).atIndex(0).swipe('up', 'slow', 0.3);
 		// 104
+		await sleep(300);
 		await waitFor(element(by[textMatcher]('Load newer')))
 			.toExist()
 			.withTimeout(5000);
@@ -196,6 +197,7 @@ describe('Room', () => {
 			.toExist()
 			.withTimeout(5000);
 		// 154
+		await sleep(300);
 		await waitFor(element(by[textMatcher]('Load newer')))
 			.toExist()
 			.withTimeout(5000);
@@ -204,6 +206,7 @@ describe('Room', () => {
 			.toExist()
 			.withTimeout(5000);
 		// 202
+		await sleep(300);
 		await waitFor(element(by[textMatcher]('Load newer')))
 			.toExist()
 			.withTimeout(5000);
@@ -211,14 +214,28 @@ describe('Room', () => {
 		await waitFor(element(by[textMatcher]('202')))
 			.toExist()
 			.withTimeout(5000);
+
 		// 253
-		await waitFor(element(by[textMatcher]('Load newer')))
-			.toExist()
-			.withTimeout(5000);
-		await element(by[textMatcher]('Load newer')).atIndex(0).tap();
-		await waitFor(element(by[textMatcher]('253')))
-			.toExist()
-			.withTimeout(5000);
+		/**
+		 * Sometimes CI loads messages differently than local.
+		 * It loads up until 204 instead of 253.
+		 */
+		await sleep(300);
+		try {
+			await waitFor(element(by[textMatcher]('Load newer')))
+				.toExist()
+				.withTimeout(5000);
+			await element(by[textMatcher]('Load newer')).atIndex(0).tap();
+			await waitFor(element(by[textMatcher]('253')))
+				.toExist()
+				.withTimeout(5000);
+		} catch (error) {
+			await waitFor(element(by[textMatcher]('204')))
+				.toExist()
+				.withTimeout(5000);
+		}
+
+		await sleep(300);
 		await waitFor(element(by[textMatcher]('Load newer')))
 			.toNotExist()
 			.withTimeout(5000);
diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj
index 3175697e1c..7370c59ca2 100644
--- a/ios/RocketChatRN.xcodeproj/project.pbxproj
+++ b/ios/RocketChatRN.xcodeproj/project.pbxproj
@@ -10,7 +10,6 @@
 		0C6E2DE448364EA896869ADF /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B37C79D9BD0742CE936B6982 /* libc++.tbd */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		1CB7F92ED7271D8036EC468B /* libPods-defaults-NotificationService.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E003632105F52756CECF3F27 /* libPods-defaults-NotificationService.a */; };
 		1E01C81C2511208400FEF824 /* URL+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E01C81B2511208400FEF824 /* URL+Extensions.swift */; };
 		1E01C8212511301400FEF824 /* PushResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E01C8202511301400FEF824 /* PushResponse.swift */; };
 		1E01C8252511303100FEF824 /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E01C8242511303100FEF824 /* Notification.swift */; };
@@ -275,7 +274,6 @@
 		1EFEB5982493B6640072EDC0 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EFEB5972493B6640072EDC0 /* NotificationService.swift */; };
 		1EFEB59C2493B6640072EDC0 /* NotificationService.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 1EFEB5952493B6640072EDC0 /* NotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		24A2AEF2383D44B586D31C01 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 06BB44DD4855498082A744AD /* libz.tbd */; };
-		3C0254EFC51041769C617FD0 /* libPods-defaults-RocketChatRN.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C18B492666C91D9C614389B /* libPods-defaults-RocketChatRN.a */; };
 		4C4C8603EF082F0A33A95522 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45D5C142B655F8EFD006792C /* ExpoModulesProvider.swift */; };
 		65AD38372BFBDF4A00271B39 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 65AD38362BFBDF4A00271B39 /* PrivacyInfo.xcprivacy */; };
 		65AD38392BFBDF4A00271B39 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 65AD38362BFBDF4A00271B39 /* PrivacyInfo.xcprivacy */; };
@@ -353,9 +351,11 @@
 		7AE10C0628A59530003593CB /* Inter.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7AE10C0528A59530003593CB /* Inter.ttf */; };
 		7AE10C0828A59530003593CB /* Inter.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7AE10C0528A59530003593CB /* Inter.ttf */; };
 		85160EB6C143E0493FE5F014 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 194D9A8897F4A486C2C6F89A /* ExpoModulesProvider.swift */; };
+		892FF3366E238E823D4CA98E /* libPods-defaults-NotificationService.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 69313923BC265219F5AA0F91 /* libPods-defaults-NotificationService.a */; };
 		BC404914E86821389EEB543D /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 391C4F7AA7023CD41EEBD106 /* ExpoModulesProvider.swift */; };
+		DBEC1C2EEA49CE58FC49459C /* libPods-defaults-RocketChatRN.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DC2CC64CE5D2A2783D74136 /* libPods-defaults-RocketChatRN.a */; };
 		DD2BA30A89E64F189C2C24AC /* libWatermelonDB.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BA7E862283664608B3894E34 /* libWatermelonDB.a */; };
-		F6550BDD5DA4BC3202C3BB83 /* libPods-defaults-Rocket.Chat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ACCD7F2370210EF891154204 /* libPods-defaults-Rocket.Chat.a */; };
+		E9D6F82BDFEFD27188D7891D /* libPods-defaults-Rocket.Chat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C23DBD55D58FB3F83AACFDB9 /* libPods-defaults-Rocket.Chat.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -454,15 +454,15 @@
 
 /* Begin PBXFileReference section */
 		008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
-		058D482D3C89B4BD0F916C5D /* Pods-defaults-Rocket.Chat.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-Rocket.Chat.debug.xcconfig"; path = "Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat.debug.xcconfig"; sourceTree = "<group>"; };
 		06BB44DD4855498082A744AD /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+		0AEAF0543E5B9616162C8362 /* Pods-defaults-Rocket.Chat.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-Rocket.Chat.release.xcconfig"; path = "Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat.release.xcconfig"; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* Rocket.Chat Experimental.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Rocket.Chat Experimental.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = RocketChatRN/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = RocketChatRN/Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RocketChatRN/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = RocketChatRN/main.m; sourceTree = "<group>"; };
 		194D9A8897F4A486C2C6F89A /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-defaults-NotificationService/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
-		1C18B492666C91D9C614389B /* libPods-defaults-RocketChatRN.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-defaults-RocketChatRN.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		1C0FFCE99E2473945DBC888B /* Pods-defaults-NotificationService.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-NotificationService.debug.xcconfig"; path = "Target Support Files/Pods-defaults-NotificationService/Pods-defaults-NotificationService.debug.xcconfig"; sourceTree = "<group>"; };
 		1E01C81B2511208400FEF824 /* URL+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+Extensions.swift"; sourceTree = "<group>"; };
 		1E01C8202511301400FEF824 /* PushResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushResponse.swift; sourceTree = "<group>"; };
 		1E01C8242511303100FEF824 /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = "<group>"; };
@@ -605,15 +605,16 @@
 		1EFEB5972493B6640072EDC0 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
 		1EFEB5992493B6640072EDC0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		1EFEB5A12493B67D0072EDC0 /* NotificationService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NotificationService.entitlements; sourceTree = "<group>"; };
-		35B66FA5D882F765FAB4D4C7 /* Pods-defaults-NotificationService.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-NotificationService.debug.xcconfig"; path = "Target Support Files/Pods-defaults-NotificationService/Pods-defaults-NotificationService.debug.xcconfig"; sourceTree = "<group>"; };
 		391C4F7AA7023CD41EEBD106 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-defaults-Rocket.Chat/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
+		3CDB00F98CBC54FF46A9FCF0 /* Pods-defaults-Rocket.Chat.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-Rocket.Chat.debug.xcconfig"; path = "Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat.debug.xcconfig"; sourceTree = "<group>"; };
 		45D5C142B655F8EFD006792C /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-defaults-RocketChatRN/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
-		4F05E66F3B21456A616E1E38 /* Pods-defaults-Rocket.Chat.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-Rocket.Chat.release.xcconfig"; path = "Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat.release.xcconfig"; sourceTree = "<group>"; };
-		52BA982CAD25DBD6EF974757 /* Pods-defaults-NotificationService.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-NotificationService.release.xcconfig"; path = "Target Support Files/Pods-defaults-NotificationService/Pods-defaults-NotificationService.release.xcconfig"; sourceTree = "<group>"; };
+		5C0B495947CE6B8AC39A2B20 /* Pods-defaults-RocketChatRN.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-RocketChatRN.debug.xcconfig"; path = "Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN.debug.xcconfig"; sourceTree = "<group>"; };
+		5DC2CC64CE5D2A2783D74136 /* libPods-defaults-RocketChatRN.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-defaults-RocketChatRN.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		60B2A6A31FC4588700BD58E5 /* RocketChatRN.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = RocketChatRN.entitlements; path = RocketChatRN/RocketChatRN.entitlements; sourceTree = "<group>"; };
-		6408101445FB6EBB4CCF579A /* Pods-defaults-RocketChatRN.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-RocketChatRN.release.xcconfig"; path = "Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN.release.xcconfig"; sourceTree = "<group>"; };
 		65AD38362BFBDF4A00271B39 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		65B9A7192AFC24190088956F /* ringtone.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = ringtone.mp3; sourceTree = "<group>"; };
+		69313923BC265219F5AA0F91 /* libPods-defaults-NotificationService.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-defaults-NotificationService.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		6C3267AF369919974DD51522 /* Pods-defaults-RocketChatRN.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-RocketChatRN.release.xcconfig"; path = "Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN.release.xcconfig"; sourceTree = "<group>"; };
 		7A006F13229C83B600803143 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		7A0129D22C6E8B5900F84A97 /* ShareRocketChatRN.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareRocketChatRN.swift; sourceTree = "<group>"; };
 		7A0D62D1242AB187006D5C06 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -629,11 +630,10 @@
 		7AACF8AB2C94B28B0082844E /* DecryptedContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DecryptedContent.swift; sourceTree = "<group>"; };
 		7ACD4853222860DE00442C55 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		7AE10C0528A59530003593CB /* Inter.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Inter.ttf; sourceTree = "<group>"; };
-		9910CE8BFE336000D8A03BAE /* Pods-defaults-RocketChatRN.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-RocketChatRN.debug.xcconfig"; path = "Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN.debug.xcconfig"; sourceTree = "<group>"; };
-		ACCD7F2370210EF891154204 /* libPods-defaults-Rocket.Chat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-defaults-Rocket.Chat.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		7DCBC60D1813EE90B70756E9 /* Pods-defaults-NotificationService.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-defaults-NotificationService.release.xcconfig"; path = "Target Support Files/Pods-defaults-NotificationService/Pods-defaults-NotificationService.release.xcconfig"; sourceTree = "<group>"; };
 		B37C79D9BD0742CE936B6982 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		BA7E862283664608B3894E34 /* libWatermelonDB.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libWatermelonDB.a; sourceTree = "<group>"; };
-		E003632105F52756CECF3F27 /* libPods-defaults-NotificationService.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-defaults-NotificationService.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		C23DBD55D58FB3F83AACFDB9 /* libPods-defaults-Rocket.Chat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-defaults-Rocket.Chat.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -654,7 +654,7 @@
 				7ACD4897222860DE00442C55 /* JavaScriptCore.framework in Frameworks */,
 				24A2AEF2383D44B586D31C01 /* libz.tbd in Frameworks */,
 				DD2BA30A89E64F189C2C24AC /* libWatermelonDB.a in Frameworks */,
-				3C0254EFC51041769C617FD0 /* libPods-defaults-RocketChatRN.a in Frameworks */,
+				DBEC1C2EEA49CE58FC49459C /* libPods-defaults-RocketChatRN.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -676,7 +676,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1CB7F92ED7271D8036EC468B /* libPods-defaults-NotificationService.a in Frameworks */,
+				892FF3366E238E823D4CA98E /* libPods-defaults-NotificationService.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -697,7 +697,7 @@
 				7AAB3E3D257E6A6E00707CF6 /* JavaScriptCore.framework in Frameworks */,
 				7AAB3E3E257E6A6E00707CF6 /* libz.tbd in Frameworks */,
 				7AAB3E3F257E6A6E00707CF6 /* libWatermelonDB.a in Frameworks */,
-				F6550BDD5DA4BC3202C3BB83 /* libPods-defaults-Rocket.Chat.a in Frameworks */,
+				E9D6F82BDFEFD27188D7891D /* libPods-defaults-Rocket.Chat.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1121,12 +1121,12 @@
 		7AC2B09613AA7C3FEBAC9F57 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				35B66FA5D882F765FAB4D4C7 /* Pods-defaults-NotificationService.debug.xcconfig */,
-				52BA982CAD25DBD6EF974757 /* Pods-defaults-NotificationService.release.xcconfig */,
-				058D482D3C89B4BD0F916C5D /* Pods-defaults-Rocket.Chat.debug.xcconfig */,
-				4F05E66F3B21456A616E1E38 /* Pods-defaults-Rocket.Chat.release.xcconfig */,
-				9910CE8BFE336000D8A03BAE /* Pods-defaults-RocketChatRN.debug.xcconfig */,
-				6408101445FB6EBB4CCF579A /* Pods-defaults-RocketChatRN.release.xcconfig */,
+				1C0FFCE99E2473945DBC888B /* Pods-defaults-NotificationService.debug.xcconfig */,
+				7DCBC60D1813EE90B70756E9 /* Pods-defaults-NotificationService.release.xcconfig */,
+				3CDB00F98CBC54FF46A9FCF0 /* Pods-defaults-Rocket.Chat.debug.xcconfig */,
+				0AEAF0543E5B9616162C8362 /* Pods-defaults-Rocket.Chat.release.xcconfig */,
+				5C0B495947CE6B8AC39A2B20 /* Pods-defaults-RocketChatRN.debug.xcconfig */,
+				6C3267AF369919974DD51522 /* Pods-defaults-RocketChatRN.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -1222,9 +1222,9 @@
 				7ACD4853222860DE00442C55 /* JavaScriptCore.framework */,
 				B37C79D9BD0742CE936B6982 /* libc++.tbd */,
 				06BB44DD4855498082A744AD /* libz.tbd */,
-				E003632105F52756CECF3F27 /* libPods-defaults-NotificationService.a */,
-				ACCD7F2370210EF891154204 /* libPods-defaults-Rocket.Chat.a */,
-				1C18B492666C91D9C614389B /* libPods-defaults-RocketChatRN.a */,
+				69313923BC265219F5AA0F91 /* libPods-defaults-NotificationService.a */,
+				C23DBD55D58FB3F83AACFDB9 /* libPods-defaults-Rocket.Chat.a */,
+				5DC2CC64CE5D2A2783D74136 /* libPods-defaults-RocketChatRN.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -1244,7 +1244,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "RocketChatRN" */;
 			buildPhases = (
-				A9487E32105806B5509BC289 /* [CP] Check Pods Manifest.lock */,
+				7730298F9B157D2F197EF19E /* [CP] Check Pods Manifest.lock */,
 				7AA5C63E23E30D110005C4A7 /* Start Packager */,
 				589729E8381BA997CD19EF19 /* [Expo] Configure project */,
 				13B07F871A680F5B00A75B9A /* Sources */,
@@ -1257,8 +1257,8 @@
 				7AAE9EB32891A0D20024F559 /* Upload source maps to Bugsnag */,
 				407D3EDE3DABEE15D27BD87D /* ShellScript */,
 				9C104B12BEE385F7555E641F /* [Expo] Configure project */,
-				C078C1C0472205F947D5907C /* [CP] Embed Pods Frameworks */,
-				81D2FBC30BF37C47CE31119E /* [CP] Copy Pods Resources */,
+				4A38FD9DFF48FCF3ABA54C3A /* [CP] Embed Pods Frameworks */,
+				2D3137420B17B8705D0F8452 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -1326,12 +1326,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 1EFEB5A02493B6640072EDC0 /* Build configuration list for PBXNativeTarget "NotificationService" */;
 			buildPhases = (
-				0603E4F301598BDB6A69CF24 /* [CP] Check Pods Manifest.lock */,
+				141C4AA3AE3C8BE3A165C9AA /* [CP] Check Pods Manifest.lock */,
 				86A998705576AFA7CE938617 /* [Expo] Configure project */,
 				1EFEB5912493B6640072EDC0 /* Sources */,
 				1EFEB5922493B6640072EDC0 /* Frameworks */,
 				1EFEB5932493B6640072EDC0 /* Resources */,
-				A4888316F85171C1EDA0C149 /* [CP] Copy Pods Resources */,
+				1929E6B57AF5E6DF47A2FDD3 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -1346,7 +1346,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 7AAB3E4F257E6A6E00707CF6 /* Build configuration list for PBXNativeTarget "Rocket.Chat" */;
 			buildPhases = (
-				E5FD8052E89A0A9CC4126552 /* [CP] Check Pods Manifest.lock */,
+				7B9AFE18F3558B9AE6E189BE /* [CP] Check Pods Manifest.lock */,
 				7AAB3E13257E6A6E00707CF6 /* Start Packager */,
 				6723DBD924B66933E14E7EF7 /* [Expo] Configure project */,
 				7AAB3E14257E6A6E00707CF6 /* Sources */,
@@ -1357,8 +1357,8 @@
 				7AAB3E4B257E6A6E00707CF6 /* ShellScript */,
 				1ED1ECE32B8699DD00F6620C /* Embed Watch Content */,
 				7A10288726B1D15200E47EF8 /* Upload source maps to Bugsnag */,
-				8B65B85DB5951B4A89B59678 /* [CP] Embed Pods Frameworks */,
-				722F635E00A1E62689B1005E /* [CP] Copy Pods Resources */,
+				444A25155156529E8C9D0A10 /* [CP] Embed Pods Frameworks */,
+				C6A09625AB6E9326D4923932 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -1548,7 +1548,7 @@
 			shellPath = /bin/sh;
 			shellScript = ". ~/.nvm/nvm.sh\nexport EXTRA_PACKAGER_ARGS=\"--sourcemap-output $TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
 		};
-		0603E4F301598BDB6A69CF24 /* [CP] Check Pods Manifest.lock */ = {
+		141C4AA3AE3C8BE3A165C9AA /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -1570,63 +1570,84 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		1E1EA8082326CCE300E22452 /* ShellScript */ = {
+		1929E6B57AF5E6DF47A2FDD3 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-defaults-NotificationService/Pods-defaults-NotificationService-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore/FirebaseCore_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension/FirebaseCoreExtension_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal/FirebaseCoreInternal_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCrashlytics/FirebaseCrashlytics_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations/FirebaseInstallations_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/PromisesSwift/Promises_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNDeviceInfo/RNDeviceInfoPrivacyInfo.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/nanopb/nanopb_Privacy.bundle",
 			);
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "echo \"Target architectures: $ARCHS\"\n\nAPP_PATH=\"${TARGET_BUILD_DIR}/${WRAPPER_NAME}\"\n\nfind \"$APP_PATH\" -name '*.framework' -type d | while read -r FRAMEWORK\ndo\nFRAMEWORK_EXECUTABLE_NAME=$(defaults read \"$FRAMEWORK/Info.plist\" CFBundleExecutable)\nFRAMEWORK_EXECUTABLE_PATH=\"$FRAMEWORK/$FRAMEWORK_EXECUTABLE_NAME\"\necho \"Executable is $FRAMEWORK_EXECUTABLE_PATH\"\necho $(lipo -info \"$FRAMEWORK_EXECUTABLE_PATH\")\n\nFRAMEWORK_TMP_PATH=\"$FRAMEWORK_EXECUTABLE_PATH-tmp\"\n\n# remove simulator's archs if location is not simulator's directory\ncase \"${TARGET_BUILD_DIR}\" in\n*\"iphonesimulator\")\necho \"No need to remove archs\"\n;;\n*)\nif $(lipo \"$FRAMEWORK_EXECUTABLE_PATH\" -verify_arch \"i386\") ; then\nlipo -output \"$FRAMEWORK_TMP_PATH\" -remove \"i386\" \"$FRAMEWORK_EXECUTABLE_PATH\"\necho \"i386 architecture removed\"\nrm \"$FRAMEWORK_EXECUTABLE_PATH\"\nmv \"$FRAMEWORK_TMP_PATH\" \"$FRAMEWORK_EXECUTABLE_PATH\"\nfi\nif $(lipo \"$FRAMEWORK_EXECUTABLE_PATH\" -verify_arch \"x86_64\") ; then\nlipo -output \"$FRAMEWORK_TMP_PATH\" -remove \"x86_64\" \"$FRAMEWORK_EXECUTABLE_PATH\"\necho \"x86_64 architecture removed\"\nrm \"$FRAMEWORK_EXECUTABLE_PATH\"\nmv \"$FRAMEWORK_TMP_PATH\" \"$FRAMEWORK_EXECUTABLE_PATH\"\nfi\n;;\nesac\n\necho \"Completed for executable $FRAMEWORK_EXECUTABLE_PATH\"\necho $\n\ndone\n";
-		};
-		407D3EDE3DABEE15D27BD87D /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
-			);
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-defaults-NotificationService-checkManifestLockResult.txt",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCore_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreExtension_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreInternal_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCrashlytics_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseInstallations_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleUtilities_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Promises_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNDeviceInfoPrivacyInfo.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Feather.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Brands.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Regular.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Solid.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Fontisto.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/nanopb_Privacy.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-NotificationService/Pods-defaults-NotificationService-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		589729E8381BA997CD19EF19 /* [Expo] Configure project */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "[Expo] Configure project";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-defaults-RocketChatRN/expo-configure-project.sh\"\n";
-		};
-		6723DBD924B66933E14E7EF7 /* [Expo] Configure project */ = {
+		1E1EA8082326CCE300E22452 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -1634,22 +1655,21 @@
 			);
 			inputPaths = (
 			);
-			name = "[Expo] Configure project";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-defaults-Rocket.Chat/expo-configure-project.sh\"\n";
+			shellScript = "echo \"Target architectures: $ARCHS\"\n\nAPP_PATH=\"${TARGET_BUILD_DIR}/${WRAPPER_NAME}\"\n\nfind \"$APP_PATH\" -name '*.framework' -type d | while read -r FRAMEWORK\ndo\nFRAMEWORK_EXECUTABLE_NAME=$(defaults read \"$FRAMEWORK/Info.plist\" CFBundleExecutable)\nFRAMEWORK_EXECUTABLE_PATH=\"$FRAMEWORK/$FRAMEWORK_EXECUTABLE_NAME\"\necho \"Executable is $FRAMEWORK_EXECUTABLE_PATH\"\necho $(lipo -info \"$FRAMEWORK_EXECUTABLE_PATH\")\n\nFRAMEWORK_TMP_PATH=\"$FRAMEWORK_EXECUTABLE_PATH-tmp\"\n\n# remove simulator's archs if location is not simulator's directory\ncase \"${TARGET_BUILD_DIR}\" in\n*\"iphonesimulator\")\necho \"No need to remove archs\"\n;;\n*)\nif $(lipo \"$FRAMEWORK_EXECUTABLE_PATH\" -verify_arch \"i386\") ; then\nlipo -output \"$FRAMEWORK_TMP_PATH\" -remove \"i386\" \"$FRAMEWORK_EXECUTABLE_PATH\"\necho \"i386 architecture removed\"\nrm \"$FRAMEWORK_EXECUTABLE_PATH\"\nmv \"$FRAMEWORK_TMP_PATH\" \"$FRAMEWORK_EXECUTABLE_PATH\"\nfi\nif $(lipo \"$FRAMEWORK_EXECUTABLE_PATH\" -verify_arch \"x86_64\") ; then\nlipo -output \"$FRAMEWORK_TMP_PATH\" -remove \"x86_64\" \"$FRAMEWORK_EXECUTABLE_PATH\"\necho \"x86_64 architecture removed\"\nrm \"$FRAMEWORK_EXECUTABLE_PATH\"\nmv \"$FRAMEWORK_TMP_PATH\" \"$FRAMEWORK_EXECUTABLE_PATH\"\nfi\n;;\nesac\n\necho \"Completed for executable $FRAMEWORK_EXECUTABLE_PATH\"\necho $\n\ndone\n";
 		};
-		722F635E00A1E62689B1005E /* [CP] Copy Pods Resources */ = {
+		2D3137420B17B8705D0F8452 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat-resources.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore/FirebaseCore_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension/FirebaseCoreExtension_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal/FirebaseCoreInternal_Privacy.bundle",
@@ -1716,7 +1736,125 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		407D3EDE3DABEE15D27BD87D /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-defaults-NotificationService-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		444A25155156529E8C9D0A10 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		4A38FD9DFF48FCF3ABA54C3A /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		589729E8381BA997CD19EF19 /* [Expo] Configure project */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "[Expo] Configure project";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-defaults-RocketChatRN/expo-configure-project.sh\"\n";
+		};
+		6723DBD924B66933E14E7EF7 /* [Expo] Configure project */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "[Expo] Configure project";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-defaults-Rocket.Chat/expo-configure-project.sh\"\n";
+		};
+		7730298F9B157D2F197EF19E /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-defaults-RocketChatRN-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		7A10288726B1D15200E47EF8 /* Upload source maps to Bugsnag */ = {
@@ -1824,80 +1962,26 @@
 			shellPath = /bin/sh;
 			shellScript = "SOURCE_MAP=\"$TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\" ../node_modules/@bugsnag/react-native/bugsnag-react-native-xcode.sh\n";
 		};
-		81D2FBC30BF37C47CE31119E /* [CP] Copy Pods Resources */ = {
+		7B9AFE18F3558B9AE6E189BE /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore/FirebaseCore_Privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension/FirebaseCoreExtension_Privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal/FirebaseCoreInternal_Privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCrashlytics/FirebaseCrashlytics_Privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations/FirebaseInstallations_Privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities_Privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/PromisesSwift/Promises_Privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNDeviceInfo/RNDeviceInfoPrivacyInfo.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/nanopb/nanopb_Privacy.bundle",
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
 			);
-			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCore_Privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreExtension_Privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreInternal_Privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCrashlytics_Privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseInstallations_Privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleUtilities_Privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Promises_Privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNDeviceInfoPrivacyInfo.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Feather.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Brands.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Regular.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Solid.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Fontisto.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/nanopb_Privacy.bundle",
+				"$(DERIVED_FILE_DIR)/Pods-defaults-Rocket.Chat-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		86A998705576AFA7CE938617 /* [Expo] Configure project */ = {
@@ -1919,26 +2003,6 @@
 			shellPath = /bin/sh;
 			shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-defaults-NotificationService/expo-configure-project.sh\"\n";
 		};
-		8B65B85DB5951B4A89B59678 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		9C104B12BEE385F7555E641F /* [Expo] Configure project */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -1958,13 +2022,13 @@
 			shellPath = /bin/sh;
 			shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-defaults-NotificationService/expo-configure-project.sh\"\n";
 		};
-		A4888316F85171C1EDA0C149 /* [CP] Copy Pods Resources */ = {
+		C6A09625AB6E9326D4923932 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-defaults-NotificationService/Pods-defaults-NotificationService-resources.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore/FirebaseCore_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension/FirebaseCoreExtension_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal/FirebaseCoreInternal_Privacy.bundle",
@@ -2031,71 +2095,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-NotificationService/Pods-defaults-NotificationService-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		A9487E32105806B5509BC289 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-defaults-RocketChatRN-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		C078C1C0472205F947D5907C /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-RocketChatRN/Pods-defaults-RocketChatRN-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		E5FD8052E89A0A9CC4126552 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-defaults-Rocket.Chat-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-defaults-Rocket.Chat/Pods-defaults-Rocket.Chat-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -2476,7 +2476,7 @@
 /* Begin XCBuildConfiguration section */
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9910CE8BFE336000D8A03BAE /* Pods-defaults-RocketChatRN.debug.xcconfig */;
+			baseConfigurationReference = 5C0B495947CE6B8AC39A2B20 /* Pods-defaults-RocketChatRN.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				APPLICATION_EXTENSION_API_ONLY = NO;
@@ -2537,7 +2537,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 6408101445FB6EBB4CCF579A /* Pods-defaults-RocketChatRN.release.xcconfig */;
+			baseConfigurationReference = 6C3267AF369919974DD51522 /* Pods-defaults-RocketChatRN.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				APPLICATION_EXTENSION_API_ONLY = NO;
@@ -2958,7 +2958,7 @@
 		};
 		1EFEB59D2493B6640072EDC0 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 35B66FA5D882F765FAB4D4C7 /* Pods-defaults-NotificationService.debug.xcconfig */;
+			baseConfigurationReference = 1C0FFCE99E2473945DBC888B /* Pods-defaults-NotificationService.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(EMBEDDED_CONTENT_CONTAINS_SWIFT)";
 				CLANG_ANALYZER_NONNULL = YES;
@@ -2983,7 +2983,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.53.0;
+				MARKETING_VERSION = 4.54.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -3000,7 +3000,7 @@
 		};
 		1EFEB59E2493B6640072EDC0 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 52BA982CAD25DBD6EF974757 /* Pods-defaults-NotificationService.release.xcconfig */;
+			baseConfigurationReference = 7DCBC60D1813EE90B70756E9 /* Pods-defaults-NotificationService.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(EMBEDDED_CONTENT_CONTAINS_SWIFT)";
 				CLANG_ANALYZER_NONNULL = YES;
@@ -3027,7 +3027,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.53.0;
+				MARKETING_VERSION = 4.54.0;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService;
@@ -3043,7 +3043,7 @@
 		};
 		7AAB3E50257E6A6E00707CF6 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 058D482D3C89B4BD0F916C5D /* Pods-defaults-Rocket.Chat.debug.xcconfig */;
+			baseConfigurationReference = 3CDB00F98CBC54FF46A9FCF0 /* Pods-defaults-Rocket.Chat.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				APPLICATION_EXTENSION_API_ONLY = NO;
@@ -3103,7 +3103,7 @@
 		};
 		7AAB3E51257E6A6E00707CF6 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4F05E66F3B21456A616E1E38 /* Pods-defaults-Rocket.Chat.release.xcconfig */;
+			baseConfigurationReference = 0AEAF0543E5B9616162C8362 /* Pods-defaults-Rocket.Chat.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				APPLICATION_EXTENSION_API_ONLY = NO;
diff --git a/ios/RocketChatRN/Info.plist b/ios/RocketChatRN/Info.plist
index efb1b9702c..b3498b4c54 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.53.0</string>
+	<string>4.54.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist
index d373b4f75b..22ea62b83d 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.53.0</string>
+	<string>4.54.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>KeychainGroup</key>
diff --git a/package.json b/package.json
index f0f0c76d0c..4b23c8ab38 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket-chat-reactnative",
-	"version": "4.53.0",
+	"version": "4.54.0",
 	"private": true,
 	"scripts": {
 		"start": "react-native start",
@@ -51,7 +51,7 @@
 		"@react-navigation/drawer": "6.6.2",
 		"@react-navigation/elements": "1.3.17",
 		"@react-navigation/native": "6.1.6",
-		"@react-navigation/stack": "6.3.16",
+		"@react-navigation/native-stack": "^6.9.26",
 		"@rocket.chat/message-parser": "0.31.26",
 		"@rocket.chat/sdk": "RocketChat/Rocket.Chat.js.SDK#mobile",
 		"@rocket.chat/ui-kit": "0.31.19",
diff --git a/yarn.lock b/yarn.lock
index 731d89e2cd..c18900cf33 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3754,6 +3754,19 @@
   resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-1.3.29.tgz#1dcbd95c319a8990d66e2aef8e108198d7a93cb2"
   integrity sha512-sMkqqQHlxdBxrBVw6E2a3LJjb9Hrb1ola8+zRgJn4Ox8iKtjqtWEdg349DPWU77VpIekcMLsqQvEtZox3XkXgA==
 
+"@react-navigation/elements@^1.3.30":
+  version "1.3.30"
+  resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-1.3.30.tgz#a81371f599af1070b12014f05d6c09b1a611fd9a"
+  integrity sha512-plhc8UvCZs0UkV+sI+3bisIyn78wz9O/BiWZXpounu72k/R/Sj5PuZYFJ1fi6psvriUveMCGh4LeZckAZu2qiQ==
+
+"@react-navigation/native-stack@^6.9.26":
+  version "6.9.26"
+  resolved "https://registry.yarnpkg.com/@react-navigation/native-stack/-/native-stack-6.9.26.tgz#90facf7783c9927f094bc9f01c613af75b6c241e"
+  integrity sha512-++dueQ+FDj2XkZ902DVrK79ub1vp19nSdAZWxKRgd6+Bc0Niiesua6rMCqymYOVaYh+dagwkA9r00bpt/U5WLw==
+  dependencies:
+    "@react-navigation/elements" "^1.3.30"
+    warn-once "^0.1.0"
+
 "@react-navigation/native@6.1.6":
   version "6.1.6"
   resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-6.1.6.tgz#84ff5cf85b91f660470fa9407c06c8ee393d5792"
@@ -3771,15 +3784,6 @@
   dependencies:
     nanoid "^3.1.23"
 
-"@react-navigation/stack@6.3.16":
-  version "6.3.16"
-  resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-6.3.16.tgz#cf94e3c8c1587455515743e91d328beef722e0ab"
-  integrity sha512-KTOn9cNuZ6p154Htbl2DiR95Wl+c7niLPRiGs7gjOkyVDGiaGQF9ODNQTYBDE1OxZGHe/EyYc6T2CbmiItLWDg==
-  dependencies:
-    "@react-navigation/elements" "^1.3.17"
-    color "^4.2.3"
-    warn-once "^0.1.0"
-
 "@redux-saga/core@^1.1.3":
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.3.0.tgz#2ce08b73d407fc6ea9e7f7d83d2e97d981a3a8b8"