chore: Merge 4.46.0 into master (#5511)

2024-01-25 09:56:56 -03:00 · 2024-01-25 09:56:56 -03:00 · 6965551cc5
parent 233b858070 dc13ed3b5e
commit 6965551cc5
39 changed files with 296 additions and 211 deletions
--- a/tests/containers/message/snapshots/Message.stories.storyshot
+++ b/tests/containers/message/snapshots/Message.stories.storyshot
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -147,7 +147,7 @@ android {
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
        versionCode VERSIONCODE as Integer
-        versionName "4.45.0"
+        versionName "4.46.0"
        vectorDrawables.useSupportLibrary = true
        if (!isFoss) {
            manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
@ -381,6 +381,12 @@ dependencies {
    implementation 'androidx.appcompat:appcompat:1.1.0'
    implementation 'com.facebook.soloader:soloader:0.10.4'
    implementation 'com.facebook.fresco:animated-gif:2.5.0'
+    // react-native-screens was pointing to a newer version of this lib that is currently not supported in our app
+    implementation ('com.google.android.material:material:1.6.0') {
+        version {
+            strictly '1.6.0'
+        }
+    }
 }

 if (isNewArchitectureEnabled()) {
--- a/app/containers/AudioPlayer/PlayButton.tsx
+++ b/app/containers/AudioPlayer/PlayButton.tsx
@ -20,7 +20,7 @@ const Icon = ({ audioState, disabled }: { audioState: TAudioState; disabled: boo
 	const { colors } = useTheme();

 	if (audioState === 'loading') {
-		return <RCActivityIndicator />;
+		return <RCActivityIndicator size={24} color={colors.buttonFontPrimary} />;
 	}

 	let customIconName: TCustomIconName = 'arrow-down';
--- a/app/containers/AudioPlayer/PlaybackSpeed.tsx
+++ b/app/containers/AudioPlayer/PlaybackSpeed.tsx
@ -4,11 +4,10 @@ import { Text } from 'react-native';
 import styles from './styles';
 import { useTheme } from '../../theme';
 import { AUDIO_PLAYBACK_SPEED, AVAILABLE_SPEEDS } from './constants';
-import { TAudioState } from './types';
 import { useUserPreferences } from '../../lib/methods';
 import NativeButton from '../NativeButton';

-const PlaybackSpeed = ({ audioState }: { audioState: TAudioState }) => {
+const PlaybackSpeed = () => {
 	const [playbackSpeed, setPlaybackSpeed] = useUserPreferences<number>(AUDIO_PLAYBACK_SPEED, AVAILABLE_SPEEDS[1]);
 	const { colors } = useTheme();

@ -20,7 +19,6 @@ const PlaybackSpeed = ({ audioState }: { audioState: TAudioState }) => {

 	return (
 		<NativeButton
-			disabled={audioState !== 'playing'}
 			onPress={onPress}
 			style={[styles.containerPlaybackSpeed, { backgroundColor: colors.buttonBackgroundSecondaryDefault }]}
 		>
--- a/app/containers/AudioPlayer/index.tsx
+++ b/app/containers/AudioPlayer/index.tsx
@ -10,7 +10,8 @@ import styles from './styles';
 import Seek from './Seek';
 import PlaybackSpeed from './PlaybackSpeed';
 import PlayButton from './PlayButton';
-import audioPlayer from '../../lib/methods/audioPlayer';
+import EventEmitter from '../../lib/methods/helpers/events';
+import audioPlayer, { AUDIO_FOCUSED } from '../../lib/methods/audioPlayer';
 import { AUDIO_PLAYBACK_SPEED, AVAILABLE_SPEEDS } from './constants';
 import { TDownloadState } from '../../lib/methods/handleMediaDownload';
 import { TAudioState } from './types';
@ -39,6 +40,7 @@ const AudioPlayer = ({

 	const [playbackSpeed] = useUserPreferences<number>(AUDIO_PLAYBACK_SPEED, AVAILABLE_SPEEDS[1]);
 	const [paused, setPaused] = useState(true);
+	const [focused, setFocused] = useState(false);
 	const duration = useSharedValue(0);
 	const currentTime = useSharedValue(0);
 	const { colors } = useTheme();
@ -139,6 +141,15 @@ const AudioPlayer = ({
 		};
 	}, [navigation]);

+	useEffect(() => {
+		const listener = EventEmitter.addEventListener(AUDIO_FOCUSED, ({ audioFocused }: { audioFocused: string }) => {
+			setFocused(audioFocused === audioUri.current);
+		});
+		return () => {
+			EventEmitter.removeListener(AUDIO_FOCUSED, listener);
+		};
+	}, []);
+
 	let audioState: TAudioState = 'to-download';
 	if (isLoading) {
 		audioState = 'loading';
@ -154,7 +165,7 @@ const AudioPlayer = ({
 		<View style={[styles.audioContainer, { backgroundColor: colors.surfaceTint, borderColor: colors.strokeExtraLight }]}>
 			<PlayButton disabled={disabled} audioState={audioState} onPress={onPress} />
 			<Seek currentTime={currentTime} duration={duration} loaded={!disabled && isDownloaded} onChangeTime={setPosition} />
-			{audioState === 'playing' ? <PlaybackSpeed audioState={audioState} /> : null}
+			{audioState === 'playing' || focused ? <PlaybackSpeed /> : null}
 		</View>
 	);
 };
--- a/app/containers/MessageBox/index.tsx
+++ b/app/containers/MessageBox/index.tsx
@ -73,8 +73,7 @@ const imagePickerConfig = {
 const libraryPickerConfig: Options = {
 	multiple: true,
 	compressVideoPreset: 'Passthrough',
-	mediaType: 'any',
-	forceJpg: true
+	mediaType: 'any'
 };

 const videoPickerConfig: Options = {
--- a/app/containers/markdown/index.tsx
+++ b/app/containers/markdown/index.tsx
@ -16,7 +16,7 @@ import MarkdownTableRow from './TableRow';
 import MarkdownTableCell from './TableCell';
 import mergeTextNodes from './mergeTextNodes';
 import styles from './styles';
-import { isValidURL } from '../../lib/methods/helpers/url';
+import { isValidUrl } from '../../lib/methods/helpers/isValidUrl';
 import NewMarkdown from './new';
 import { formatText } from './formatText';
 import { IUserMention, IUserChannel, TOnLinkPress } from './interfaces';
@ -246,7 +246,7 @@ class Markdown extends PureComponent<IMarkdownProps, any> {
 	};

 	renderImage = ({ src }: { src: string }) => {
-		if (!isValidURL(src)) {
+		if (!isValidUrl(src)) {
 			return null;
 		}

--- a/app/containers/message/Components/OverlayComponent/index.tsx
+++ b/app/containers/message/Components/OverlayComponent/index.tsx
@ -1,32 +1,25 @@
 import React from 'react';
 import { StyleProp, View, ViewStyle } from 'react-native';
-import { BlurView } from '@react-native-community/blur';

 import styles from '../../styles';
 import { useTheme } from '../../../../theme';
 import RCActivityIndicator from '../../../ActivityIndicator';
 import { CustomIcon, TIconsName } from '../../../CustomIcon';

-const BlurComponent = ({
+const OverlayComponent = ({
 	loading = false,
 	style = {},
-	iconName,
-	showOverlay = false
+	iconName
 }: {
 	loading: boolean;
 	style: StyleProp<ViewStyle>;
 	iconName: TIconsName;
-	showOverlay?: boolean;
 }) => {
 	const { colors } = useTheme();

 	return (
 		<>
-			{!showOverlay ? (
-				<BlurView style={[style, styles.blurView]} blurType={'dark'} blurAmount={2} />
-			) : (
-				<View style={[style, styles.blurView, { backgroundColor: colors.overlayColor }]} />
-			)}
+			<View style={[style, styles.blurView, { backgroundColor: colors.overlayColor }]} />
 			<View style={[style, styles.blurIndicator]}>
 				{loading ? <RCActivityIndicator size={54} /> : <CustomIcon color={colors.buttonText} name={iconName} size={54} />}
 			</View>
@ -34,4 +27,4 @@ const BlurComponent = ({
 	);
 };

-export default BlurComponent;
+export default OverlayComponent;
--- a/app/containers/message/Image.tsx
+++ b/app/containers/message/Image.tsx
@ -15,7 +15,7 @@ import {
 import { formatAttachmentUrl } from '../../lib/methods/helpers/formatAttachmentUrl';
 import { useTheme } from '../../theme';
 import Markdown from '../markdown';
-import BlurComponent from './Components/BlurComponent';
+import BlurComponent from './Components/OverlayComponent';
 import MessageContext from './Context';
 import Touchable from './Touchable';
 import styles from './styles';
@ -44,7 +44,7 @@ const Button = React.memo(({ children, onPress, disabled }: IMessageButton) => {
 		<Touchable
 			disabled={disabled}
 			onPress={onPress}
-			style={[styles.imageContainer, styles.mustWrapBlur]}
+			style={styles.imageContainer}
 			background={Touchable.Ripple(colors.bannerBackground)}
 		>
 			{children}
--- a/app/containers/message/Video.tsx
+++ b/app/containers/message/Video.tsx
@ -21,11 +21,10 @@ import { useTheme } from '../../theme';
 import sharedStyles from '../../views/Styles';
 import { LISTENER } from '../Toast';
 import Markdown from '../markdown';
-import BlurComponent from './Components/BlurComponent';
+import BlurComponent from './Components/OverlayComponent';
 import MessageContext from './Context';
 import Touchable from './Touchable';
 import { fileDownload } from './helpers/fileDownload';
-import messageStyles from './styles';
 import { DEFAULT_MESSAGE_HEIGHT } from './utils';

 const SUPPORTED_TYPES = ['video/quicktime', 'video/mp4', ...(isIOS ? [] : ['video/3gp', 'video/mkv'])];
@ -78,12 +77,7 @@ const CancelIndicator = () => {
 const Thumbnail = ({ loading, thumbnailUrl, cached }: { loading: boolean; thumbnailUrl?: string; cached: boolean }) => (
 	<>
 		{thumbnailUrl ? <FastImage style={styles.thumbnailImage} source={{ uri: thumbnailUrl }} /> : null}
-		<BlurComponent
-			iconName={cached ? 'play-filled' : 'arrow-down-circle'}
-			loading={loading}
-			style={styles.button}
-			showOverlay={cached}
-		/>
+		<BlurComponent iconName={cached ? 'play-filled' : 'arrow-down-circle'} loading={loading} style={styles.button} />
 		{loading ? <CancelIndicator /> : null}
 	</>
 );
@ -230,7 +224,7 @@ const Video = ({ file, showAttachment, getCustomEmoji, style, isReply, msg }: IM
 			<Markdown msg={msg} username={user.username} getCustomEmoji={getCustomEmoji} style={[isReply && style]} theme={theme} />
 			<Touchable
 				onPress={onPress}
-				style={[styles.button, messageStyles.mustWrapBlur, { backgroundColor: themes[theme].videoBackground }]}
+				style={[styles.button, { backgroundColor: themes[theme].videoBackground }]}
 				background={Touchable.Ripple(themes[theme].bannerBackground)}
 			>
 				<Thumbnail loading={loading} cached={cached} />
--- a/app/containers/message/styles.ts
+++ b/app/containers/message/styles.ts
@ -1,7 +1,7 @@
 import { StyleSheet } from 'react-native';

 import sharedStyles from '../../views/Styles';
-import { isAndroid, isTablet } from '../../lib/methods/helpers';
+import { isTablet } from '../../lib/methods/helpers';

 export default StyleSheet.create({
 	root: {
@ -184,9 +184,5 @@ export default StyleSheet.create({
 		position: 'absolute',
 		justifyContent: 'center',
 		alignItems: 'center'
-	},
-	mustWrapBlur: {
-		// https://github.com/Kureev/react-native-blur/issues/520#issuecomment-1378339192 Fix BlurView
-		overflow: isAndroid ? 'hidden' : 'visible'
 	}
 });
--- a/app/lib/constants/colors.ts
+++ b/app/lib/constants/colors.ts
@ -103,7 +103,7 @@ export const colors = {
 		n900: '#1F2329',
 		statusBackgroundWarning: '#FFECAD',
 		statusFontOnWarning: '#B88D00',
-		overlayColor: '#1F2329B2',
+		overlayColor: '#1F2329CC',
 		buttonBackgroundPrimaryDefault: '#156FF5',
 		buttonBackgroundSecondaryDefault: '#E4E7EA',
 		buttonFontPrimary: '#FFFFFF',
@ -191,7 +191,7 @@ export const colors = {
 		n900: '#FFFFFF',
 		statusBackgroundWarning: '#FFECAD',
 		statusFontOnWarning: '#B88D00',
-		overlayColor: '#1F2329B2',
+		overlayColor: '#1F2329CC',
 		buttonBackgroundPrimaryDefault: '#3976D1',
 		buttonBackgroundSecondaryDefault: '#2F343D',
 		buttonFontPrimary: '#FFFFFF',
@ -279,7 +279,7 @@ export const colors = {
 		n900: '#FFFFFF',
 		statusBackgroundWarning: '#FFECAD',
 		statusFontOnWarning: '#B88D00',
-		overlayColor: '#1F2329B2',
+		overlayColor: '#1F2329CC',
 		buttonBackgroundPrimaryDefault: '#3976D1',
 		buttonBackgroundSecondaryDefault: '#2F343D',
 		buttonFontPrimary: '#FFFFFF',
--- a/app/lib/hooks/useVideoConf/StartACallActionSheet.tsx
+++ b/app/lib/hooks/useVideoConf/StartACallActionSheet.tsx
@ -1,8 +1,8 @@
 import { Camera, CameraType } from 'expo-camera';
 import React, { useState } from 'react';
 import { StyleSheet, View } from 'react-native';
-import { useDispatch } from 'react-redux';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import { useDispatch } from 'react-redux';

 import { useAppSelector } from '..';
 import { cancelCall, initVideoCall } from '../../../actions/videoConf';
@ -10,12 +10,19 @@ import AvatarContainer from '../../../containers/Avatar';
 import Button from '../../../containers/Button';
 import { CallHeader } from '../../../containers/CallHeader';
 import Ringer, { ERingerSounds } from '../../../containers/Ringer';
+import { SubscriptionType } from '../../../definitions';
 import i18n from '../../../i18n';
 import { getUserSelector } from '../../../selectors/login';
 import { useTheme } from '../../../theme';
 import useUserData from '../useUserData';

-export default function StartACallActionSheet({ rid }: { rid: string }): React.ReactElement {
+export default function StartACallActionSheet({
+	rid,
+	roomType
+}: {
+	rid: string;
+	roomType?: SubscriptionType;
+}): React.ReactElement {
 	const { colors } = useTheme();
 	const [mic, setMic] = useState(true);
 	const [cam, setCam] = useState(false);
@ -42,7 +49,7 @@ export default function StartACallActionSheet({ rid }: { rid: string }): React.R
 			style={[style.actionSheetContainer, { paddingBottom: bottom }]}
 			onLayout={e => setContainerWidth(e.nativeEvent.layout.width / 2)}
 		>
-			{calling ? <Ringer ringer={ERingerSounds.DIALTONE} /> : null}
+			{calling && roomType === SubscriptionType.DIRECT ? <Ringer ringer={ERingerSounds.DIALTONE} /> : null}
 			<CallHeader
 				title={calling && user.direct ? i18n.t('Calling') : i18n.t('Start_a_call')}
 				cam={cam}
--- a/app/lib/hooks/useVideoConf/index.tsx
+++ b/app/lib/hooks/useVideoConf/index.tsx
@ -31,7 +31,7 @@ export const useVideoConf = (
 	const user = useAppSelector(state => getUserSelector(state));
 	const serverVersion = useAppSelector(state => state.server.version);

-	const { callEnabled, disabledTooltip } = useVideoConfCall(rid);
+	const { callEnabled, disabledTooltip, roomType } = useVideoConfCall(rid);

 	const [permission, requestPermission] = Camera.useCameraPermissions();
 	const { showActionSheet } = useActionSheet();
@ -59,7 +59,7 @@ export const useVideoConf = (
 			const canInit = await canInitAnCall();
 			if (canInit) {
 				showActionSheet({
-					children: <StartACallActionSheet rid={rid} />,
+					children: <StartACallActionSheet rid={rid} roomType={roomType} />,
 					snaps: [480]
 				});

--- a/app/lib/hooks/useVideoConf/useVideoConfCall.ts
+++ b/app/lib/hooks/useVideoConf/useVideoConfCall.ts
@ -3,15 +3,18 @@ import { useEffect, useState } from 'react';
 import { SubscriptionType } from '../../../definitions';
 import { getUserSelector } from '../../../selectors/login';
 import { getSubscriptionByRoomId } from '../../database/services/Subscription';
+import { isRoomFederated } from '../../methods';
 import { compareServerVersion, isReadOnly } from '../../methods/helpers';
 import { useAppSelector } from '../useAppSelector';
 import { usePermissions } from '../usePermissions';
 import { useSetting } from '../useSetting';
-import { isRoomFederated } from '../../methods';

-export const useVideoConfCall = (rid: string): { callEnabled: boolean; disabledTooltip?: boolean } => {
+export const useVideoConfCall = (
+	rid: string
+): { callEnabled: boolean; disabledTooltip?: boolean; roomType?: SubscriptionType } => {
 	const [callEnabled, setCallEnabled] = useState(false);
 	const [disabledTooltip, setDisabledTooltip] = useState(false);
+	const [roomType, setRoomType] = useState<SubscriptionType>();

 	// OLD SETTINGS
 	const jitsiEnabled = useSetting('Jitsi_Enabled');
@ -34,6 +37,7 @@ export const useVideoConfCall = (rid: string): { callEnabled: boolean; disabledT
 	const init = async () => {
 		const room = await getSubscriptionByRoomId(rid);
 		if (room) {
+			setRoomType(room.t);
 			if (isServer5OrNewer) {
 				const isReadyOnly = await isReadOnly(room, user.username);
 				const ownUser = room.uids && room.uids.length === 1;
@ -64,5 +68,5 @@ export const useVideoConfCall = (rid: string): { callEnabled: boolean; disabledT
 		init();
 	}, []);

-	return { callEnabled, disabledTooltip };
+	return { callEnabled, disabledTooltip, roomType };
 };
--- a/app/lib/methods/audioPlayer.ts
+++ b/app/lib/methods/audioPlayer.ts
@ -1,5 +1,9 @@
 import { AVPlaybackStatus, Audio, InterruptionModeAndroid, InterruptionModeIOS } from 'expo-av';

+import EventEmitter from './helpers/events';
+
+export const AUDIO_FOCUSED = 'AUDIO_FOCUSED';
+
 const AUDIO_MODE = {
 	allowsRecordingIOS: false,
 	playsInSilentModeIOS: true,
@ -42,6 +46,7 @@ class AudioPlayer {
 				try {
 					await this.audioQueue[audioKey]?.stopAsync();
 					this.audioPlaying = '';
+					EventEmitter.emit(AUDIO_FOCUSED, { audioFocused: '' });
 				} catch {
 					// do nothing
 				}
@ -62,6 +67,7 @@ class AudioPlayer {
 		await Audio.setAudioModeAsync(AUDIO_MODE);
 		await this.audioQueue[audioKey]?.playAsync();
 		this.audioPlaying = audioKey;
+		EventEmitter.emit(AUDIO_FOCUSED, { audioFocused: audioKey });
 	}

 	async pauseAudio(audioKey: string) {
--- a/app/lib/methods/helpers/events.ts
+++ b/app/lib/methods/helpers/events.ts
@ -12,7 +12,8 @@ type TEventEmitterEmmitArgs =
 	| { visible: boolean; onCancel?: null | Function }
 	| { cancel: () => void }
 	| { submit: (param: string) => void }
-	| IEmitUserInteraction;
+	| IEmitUserInteraction
+	| { audioFocused: string };

 class EventEmitter {
 	private events: { [key: string]: any };
--- a/app/lib/methods/helpers/index.ts
+++ b/app/lib/methods/helpers/index.ts
@ -11,7 +11,7 @@ export * from './isReadOnly';
 export * from './media';
 export * from './room';
 export * from './server';
-export * from './url';
+export * from './isSsl';
 export * from './isValidEmail';
 export * from './random';
 export * from './image';
--- a/app/lib/methods/helpers/isSsl.ts
+++ b/app/lib/methods/helpers/isSsl.ts
@ -0,0 +1,2 @@
+// Use checkUseSsl: false only if server url starts with http://
+export const isSsl = (url: string): boolean => !/http:\/\//.test(url);
--- a/app/lib/methods/helpers/url.ts
+++ b/app/lib/methods/helpers/url.ts
@ -1,15 +0,0 @@
-export const isValidURL = (url: string): boolean => {
-	const pattern = new RegExp(
-		'^(https?:\\/\\/)?' + // protocol
-			'((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name
-			'((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address
-			'(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path
-			'(\\?[;&a-z\\d%_.~+=-]*)?' + // query string
-			'(\\#[-a-z\\d_]*)?$',
-		'i'
-	); // fragment locator
-	return !!pattern.test(url);
-};
-
-// Use checkUseSsl: false only if server url starts with http://
-export const isSsl = (url: string): boolean => !/http:\/\//.test(url);
--- a/app/lib/methods/subscriptions/rooms.ts
+++ b/app/lib/methods/subscriptions/rooms.ts
@ -296,6 +296,9 @@ export default function subscribeRooms() {
 		const [, ev] = ddpMessage.fields.eventName.split('/');
 		if (/userData/.test(ev)) {
 			const [{ diff, unset }] = ddpMessage.fields.args;
+			if (diff.emails?.length > 0) {
+				store.dispatch(setUser({ emails: diff.emails }));
+			}
 			if (diff?.statusLivechat) {
 				store.dispatch(setUser({ statusLivechat: diff.statusLivechat }));
 			}
--- a/app/lib/notifications/push.ts
+++ b/app/lib/notifications/push.ts
@ -35,15 +35,13 @@ export const pushNotificationConfigure = (onNotification: (notification: INotifi
 			buttonTitle: I18n.t('Reply'),
 			placeholder: I18n.t('Type_message')
 		});
-		const notificationCategory = new NotificationCategory('MESSAGE', [notificationAction]);
-
-		Notifications.setCategories([notificationCategory]);
-
 		const acceptAction = new NotificationAction('ACCEPT_ACTION', 'foreground', I18n.t('accept'), true);
 		const rejectAction = new NotificationAction('DECLINE_ACTION', 'foreground', I18n.t('decline'), true);
+
+		const notificationCategory = new NotificationCategory('MESSAGE', [notificationAction]);
 		const videoConfCategory = new NotificationCategory('VIDEOCONF', [acceptAction, rejectAction]);

-		Notifications.setCategories([videoConfCategory]);
+		Notifications.setCategories([videoConfCategory, notificationCategory]);
 	} else if (Platform.OS === 'android' && Platform.constants.Version >= 33) {
 		// @ts-ignore
 		PermissionsAndroid.request('android.permission.POST_NOTIFICATIONS').then(permissionStatus => {
--- a/app/lib/notifications/videoConf/backgroundNotificationHandler.ts
+++ b/app/lib/notifications/videoConf/backgroundNotificationHandler.ts
@ -1,4 +1,4 @@
-import notifee, { AndroidCategory, AndroidImportance, AndroidVisibility, Event } from '@notifee/react-native';
+import notifee, { AndroidCategory, AndroidFlags, AndroidImportance, AndroidVisibility, Event } from '@notifee/react-native';
 import messaging from '@react-native-firebase/messaging';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import ejson from 'ejson';
@ -96,7 +96,8 @@ const displayVideoConferenceNotification = async (notification: NotificationData
 			pressAction: {
 				id: 'default',
 				launchActivity: 'default'
-			}
+			},
+			flags: [AndroidFlags.FLAG_NO_CLEAR]
 		}
 	});
 };
--- a/app/lib/services/connect.ts
+++ b/app/lib/services/connect.ts
@ -138,25 +138,31 @@ function connect({ server, logoutOnError = false }: { server: string; logoutOnEr
 					const { _id, value } = ddpMessage.fields.args[1];
 					const db = database.active;
 					const settingsCollection = db.get('settings');
-					try {
-						const settingsRecord = await settingsCollection.find(_id);
-						// @ts-ignore
-						const { type } = defaultSettings[_id];
-						if (type) {
-							await db.write(async () => {
-								await settingsRecord.update(u => {
-									// @ts-ignore
-									u[type] = value;
-								});
-							});
-						}
-						store.dispatch(updateSettings(_id, value));

-						if (_id === 'Presence_broadcast_disabled') {
-							setPresenceCap(value);
+					// Check if the _id exists in defaultSettings
+					if (defaultSettings.hasOwnProperty(_id)) {
+						try {
+							const settingsRecord = await settingsCollection.find(_id);
+							// @ts-ignore
+							const { type } = defaultSettings[_id];
+							if (type) {
+								await db.write(async () => {
+									await settingsRecord.update(u => {
+										// @ts-ignore
+										u[type] = value;
+									});
+								});
+							}
+							store.dispatch(updateSettings(_id, value));
+
+							if (_id === 'Presence_broadcast_disabled') {
+								setPresenceCap(value);
+							}
+						} catch (e) {
+							log(e);
 						}
-					} catch (e) {
-						log(e);
+					} else {
+						console.warn(`Setting with _id '${_id}' is not present in defaultSettings.`);
 					}
 				}
 			})
--- a/app/lib/services/sdk.ts
+++ b/app/lib/services/sdk.ts
@ -3,7 +3,7 @@ import EJSON from 'ejson';
 import isEmpty from 'lodash/isEmpty';

 import { twoFactor } from './twoFactor';
-import { isSsl } from '../methods/helpers/url';
+import { isSsl } from '../methods/helpers/isSsl';
 import { store as reduxStore } from '../store/auxStore';
 import { Serialized, MatchPathPattern, OperationParams, PathFor, ResultFor } from '../../definitions/rest/helpers';
 import { compareServerVersion, random } from '../methods/helpers';
--- a/app/views/ChangeAvatarView/index.tsx
+++ b/app/views/ChangeAvatarView/index.tsx
@ -146,8 +146,10 @@ const ChangeAvatarView = () => {
 				type: AvatarStateActions.CHANGE_AVATAR,
 				payload: { url: response.path, data: `data:image/jpeg;base64,${response.data}`, service: 'upload' }
 			});
-		} catch (error) {
-			log(error);
+		} catch (error: any) {
+			if(error?.code !== "E_PICKER_CANCELLED") {
+				log(error);
+			}
 		}
 	};

--- a/app/views/DiscussionsView/index.tsx
+++ b/app/views/DiscussionsView/index.tsx
@ -124,6 +124,7 @@ const DiscussionsView = ({ navigation, route }: IDiscussionsViewProps): React.Re
 		options = {
 			headerTitleAlign: 'center',
 			headerTitle: I18n.t('Discussions'),
+			headerTitleContainerStyle: {},
 			headerRightContainerStyle: { flexGrow: 1 },
 			headerLeft: () => (
 				<HeaderBackButton
--- a/app/views/JitsiMeetView/index.tsx
+++ b/app/views/JitsiMeetView/index.tsx
@ -1,14 +1,17 @@
+import CookieManager from '@react-native-cookies/cookies';
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/native';
 import { activateKeepAwake, deactivateKeepAwake } from 'expo-keep-awake';
 import React, { useCallback, useEffect, useState } from 'react';
-import { BackHandler, Linking, SafeAreaView } from 'react-native';
+import { ActivityIndicator, BackHandler, Linking, SafeAreaView, StyleSheet, View } from 'react-native';
 import WebView from 'react-native-webview';

 import { userAgent } from '../../lib/constants';
+import { useAppSelector } from '../../lib/hooks';
 import { isIOS } from '../../lib/methods/helpers';
 import { getRoomIdFromJitsiCallUrl } from '../../lib/methods/helpers/getRoomIdFromJitsiCall';
 import { events, logEvent } from '../../lib/methods/helpers/log';
 import { endVideoConfTimer, initVideoConfTimer } from '../../lib/methods/videoConfTimer';
+import { getUserSelector } from '../../selectors/login';
 import { ChatsStackParamList } from '../../stacks/types';
 import JitsiAuthModal from './JitsiAuthModal';

@ -17,8 +20,31 @@ const JitsiMeetView = (): React.ReactElement => {
 		params: { rid, url, videoConf }
 	} = useRoute<RouteProp<ChatsStackParamList, 'JitsiMeetView'>>();
 	const { goBack } = useNavigation();
+	const user = useAppSelector(state => getUserSelector(state));
+	const serverUrl = useAppSelector(state => state.server.server);

 	const [authModal, setAuthModal] = useState(false);
+	const [cookiesSet, setCookiesSet] = useState(false);
+
+	const setCookies = async () => {
+		const date = new Date();
+		date.setDate(date.getDate() + 1);
+		const expires = date.toISOString();
+		const domain = serverUrl.replace(/^https?:\/\//, '');
+		const ck = { domain, version: '1', expires };
+
+		await CookieManager.set(serverUrl, {
+			name: 'rc_uid',
+			value: user.id,
+			...ck
+		});
+		await CookieManager.set(serverUrl, {
+			name: 'rc_token',
+			value: user.token,
+			...ck
+		});
+		setCookiesSet(true);
+	};

 	const handleJitsiApp = useCallback(async () => {
 		const callUrl = url.replace(/^https?:\/\//, '');
@ -71,25 +97,49 @@ const JitsiMeetView = (): React.ReactElement => {
 		};
 	}, [handleJitsiApp, onConferenceJoined, videoConf]);

+	useEffect(() => {
+		setCookies();
+	}, []);
+
 	const callUrl = `${url}${url.includes('#config') ? '&' : '#'}config.disableDeepLinking=true`;

 	return (
-		<SafeAreaView style={{ flex: 1 }}>
+		<SafeAreaView style={styles.container}>
 			{authModal && <JitsiAuthModal setAuthModal={setAuthModal} callUrl={callUrl} />}
-			<WebView
-				source={{ uri: callUrl.replace(/"/g, "'") }}
-				onNavigationStateChange={onNavigationStateChange}
-				onShouldStartLoadWithRequest={onNavigationStateChange}
-				style={{ flex: 1, backgroundColor: 'rgb(62,62,62)' }}
-				userAgent={userAgent}
-				javaScriptEnabled
-				domStorageEnabled
-				allowsInlineMediaPlayback
-				mediaCapturePermissionGrantType={'grant'}
-				mediaPlaybackRequiresUserAction={isIOS}
-			/>
+			{cookiesSet ? (
+				<WebView
+					source={{
+						uri: callUrl.replace(/"/g, "'"),
+						headers: {
+							Cookie: `rc_uid=${user.id}; rc_token=${user.token}`
+						}
+					}}
+					onNavigationStateChange={onNavigationStateChange}
+					onShouldStartLoadWithRequest={onNavigationStateChange}
+					style={styles.webviewContainer}
+					userAgent={userAgent}
+					javaScriptEnabled
+					domStorageEnabled
+					allowsInlineMediaPlayback
+					mediaCapturePermissionGrantType={'grant'}
+					mediaPlaybackRequiresUserAction={isIOS}
+					sharedCookiesEnabled
+				/>
+			) : (
+				<View style={[styles.webviewContainer, styles.loading]}>
+					<ActivityIndicator />
+				</View>
+			)}
 		</SafeAreaView>
 	);
 };

+const styles = StyleSheet.create({
+	container: {
+		flex: 1
+	},
+	webviewContainer: { flex: 1, backgroundColor: 'rgb(62,62,62)' },
+	loading: { alignItems: 'center', justifyContent: 'center' }
+});
+
 export default JitsiMeetView;
--- a/app/views/RoomInfoView/index.tsx
+++ b/app/views/RoomInfoView/index.tsx
@ -43,7 +43,7 @@ const RoomInfoView = (): React.ReactElement => {
 	} = useRoute<TRoomInfoViewRouteProp>();
 	const { addListener, setOptions, navigate, goBack } = useNavigation<TRoomInfoViewNavigationProp>();

-	const [room, setRoom] = useState(roomParam);
+	const [room, setRoom] = useState(roomParam || ({ rid, t } as ISubscription));
 	const [roomFromRid, setRoomFromRid] = useState<ISubscription | undefined>();
 	const [roomUser, setRoomUser] = useState(member || {});
 	const [showEdit, setShowEdit] = useState(false);
@ -225,7 +225,7 @@ const RoomInfoView = (): React.ReactElement => {
 		const params = {
 			rid: r?.rid,
 			name: getRoomTitle(r),
-			t: r?.t,
+			t: roomType,
 			roomUserId: getUidDirectMessage(r)
 		};

--- a/app/views/ThreadMessagesView/index.tsx
+++ b/app/views/ThreadMessagesView/index.tsx
@ -131,6 +131,7 @@ class ThreadMessagesView extends React.Component<IThreadMessagesViewProps, IThre
 		const options: StackNavigationOptions = {
 			headerTitleAlign: 'center',
 			headerTitle: I18n.t('Threads'),
+			headerTitleContainerStyle: {},
 			headerRightContainerStyle: { flexGrow: 1 },
 			headerLeft: () => (
 				<HeaderBackButton
@ -424,7 +425,7 @@ class ThreadMessagesView extends React.Component<IThreadMessagesViewProps, IThre
 	onFilterSelected = (filter: Filter) => {
 		const { messages, subscription } = this.state;
 		const displayingThreads = this.getFilteredThreads(messages, subscription, filter);
-		this.setState({ currentFilter: filter, displayingThreads });
+		this.setState({ currentFilter: filter, displayingThreads, showFilterDropdown: false });
 	};

 	toggleFollowThread = async (isFollowingThread: boolean, tmid: string) => {
--- a/ios/Gemfile.lock
+++ b/ios/Gemfile.lock
@ -1,7 +1,7 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (3.0.5)
+    CFPropertyList (3.0.6)
      rexml
    activesupport (6.1.6)
      concurrent-ruby (~> 1.0, >= 1.0.2)
@ -9,28 +9,28 @@ GEM
      minitest (>= 5.1)
      tzinfo (~> 2.0)
      zeitwerk (~> 2.3)
-    addressable (2.8.1)
+    addressable (2.8.6)
      public_suffix (>= 2.0.2, < 6.0)
    algoliasearch (1.27.5)
      httpclient (~> 2.8, >= 2.8.3)
      json (>= 1.5.1)
    artifactory (3.0.15)
    atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.696.0)
-    aws-sdk-core (3.169.0)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.881.0)
+    aws-sdk-core (3.190.3)
+      aws-eventstream (~> 1, >= 1.3.0)
      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.62.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-kms (1.76.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.118.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-s3 (1.142.0)
+      aws-sdk-core (~> 3, >= 3.189.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
    claide (1.1.0)
@ -77,16 +77,15 @@ GEM
      highline (~> 2.0.0)
    concurrent-ruby (1.1.10)
    declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.6.5)
      rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
    dotenv (2.8.1)
    emoji_regex (3.2.3)
    escape (0.0.4)
    ethon (0.15.0)
      ffi (>= 1.15.0)
-    excon (0.97.1)
+    excon (0.109.0)
    faraday (1.10.3)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
@ -115,8 +114,8 @@ GEM
    faraday-retry (1.0.3)
    faraday_middleware (1.2.0)
      faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.211.0)
+    fastimage (2.3.0)
+    fastlane (2.219.0)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
@ -135,20 +134,22 @@ GEM
      gh_inspector (>= 1.1.2, < 2.0.0)
      google-apis-androidpublisher_v3 (~> 0.3)
      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
      google-cloud-storage (~> 1.31)
      highline (~> 2.0)
+      http-cookie (~> 1.0.5)
      json (< 3.0.0)
      jwt (>= 2.1.0, < 3)
      mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
      naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      optparse (>= 0.1.1)
      plist (>= 3.1.0, < 4.0.0)
      rubyzip (>= 2.0.0, < 3.0.0)
      security (= 0.1.3)
      simctl (~> 1.6.3)
      terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
      tty-screen (>= 0.6.3, < 1.0.0)
      tty-spinner (>= 0.8.0, < 1.0.0)
      word_wrap (~> 1.0.0)
@ -164,9 +165,9 @@ GEM
    gh_inspector (1.1.3)
    git (1.11.0)
      rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.32.0)
-      google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-core (0.9.5)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (>= 0.16.2, < 2.a)
      httpclient (>= 2.8.1, < 3.a)
@ -174,31 +175,29 @@ GEM
      representable (~> 3.0)
      retriable (>= 2.0, < 4.a)
      rexml
-      webrick
-    google-apis-iamcredentials_v1 (0.16.0)
-      google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-playcustomapp_v1 (0.12.0)
-      google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.6.1)
+      google-cloud-env (>= 1.0, < 3.a)
      google-cloud-errors (~> 1.0)
    google-cloud-env (1.6.0)
      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.0)
-    google-cloud-storage (1.44.0)
+    google-cloud-errors (1.3.1)
+    google-cloud-storage (1.47.0)
      addressable (~> 2.8)
      digest-crc (~> 0.4)
      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.31.0)
      google-cloud-core (~> 1.6)
      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    googleauth (1.3.0)
+    googleauth (1.8.1)
      faraday (>= 0.17.3, < 3.a)
      jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
      signet (>= 0.16, < 2.a)
@ -209,50 +208,49 @@ GEM
    i18n (1.10.0)
      concurrent-ruby (~> 1.0)
    jmespath (1.6.2)
-    json (2.6.3)
-    jwt (2.6.0)
-    memoist (0.16.2)
+    json (2.7.1)
+    jwt (2.7.1)
    mini_magick (4.12.0)
-    mini_mime (1.1.2)
+    mini_mime (1.1.5)
    minitest (5.16.1)
    molinillo (0.8.0)
    multi_json (1.15.0)
-    multipart-post (2.0.0)
+    multipart-post (2.3.0)
    nanaimo (0.3.0)
    nap (1.1.0)
    naturally (2.2.1)
    netrc (0.11.0)
-    optparse (0.1.1)
+    optparse (0.4.0)
    os (1.1.4)
-    plist (3.6.0)
+    plist (3.7.1)
    public_suffix (4.0.7)
-    rake (13.0.6)
+    rake (13.1.0)
    rchardet (1.8.0)
    representable (3.2.0)
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
    retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.2.6)
    rouge (2.0.7)
    ruby-macho (2.5.1)
    ruby2_keywords (0.0.5)
    rubyzip (2.3.2)
    security (0.1.3)
-    signet (0.17.0)
+    signet (0.18.0)
      addressable (~> 2.8)
      faraday (>= 0.17.5, < 3.a)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
-    simctl (1.6.8)
+    simctl (1.6.10)
      CFPropertyList
      naturally
    terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
    trailblazer-option (0.1.2)
    tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
    tty-spinner (0.9.3)
      tty-cursor (~> 0.7)
    typhoeus (1.4.0)
@ -260,13 +258,9 @@ GEM
    tzinfo (2.0.4)
      concurrent-ruby (~> 1.0)
    uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
-    webrick (1.7.0)
+    unicode-display_width (2.5.0)
    word_wrap (1.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.23.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -358,8 +358,6 @@ PODS:
    - glog
  - react-native-background-timer (2.4.1):
    - React-Core
-  - react-native-blur (4.3.2):
-    - React-Core
  - react-native-cameraroll (5.6.1):
    - React-Core
  - react-native-cookies (6.2.1):
@ -565,7 +563,7 @@ PODS:
    - Yoga
  - RNRootView (1.0.3):
    - React
-  - RNScreens (3.13.1):
+  - RNScreens (3.29.0):
    - React-Core
    - React-RCTImage
  - RNSVG (13.8.0):
@ -623,7 +621,6 @@ DEPENDENCIES:
  - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
  - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
  - react-native-background-timer (from `../node_modules/react-native-background-timer`)
-  - "react-native-blur (from `../node_modules/@react-native-community/blur`)"
  - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
  - "react-native-cookies (from `../node_modules/@react-native-cookies/cookies`)"
  - react-native-document-picker (from `../node_modules/react-native-document-picker`)
@ -770,8 +767,6 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native/ReactCommon/logger"
  react-native-background-timer:
    :path: "../node_modules/react-native-background-timer"
-  react-native-blur:
-    :path: "../node_modules/@react-native-community/blur"
  react-native-cameraroll:
    :path: "../node_modules/@react-native-camera-roll/camera-roll"
  react-native-cookies:
@ -932,7 +927,6 @@ SPEC CHECKSUMS:
  React-jsinspector: cab4d37ebde480f84c79ac89568abbf76b916c3e
  React-logger: b75b80500ea80457b2cf169427d66de986cdcb29
  react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
-  react-native-blur: cfdad7b3c01d725ab62a8a729f42ea463998afa2
  react-native-cameraroll: 2f08db1ecc9b73dbc01f89335d6d5179fac2894c
  react-native-cookies: f54fcded06bb0cda05c11d86788020b43528a26c
  react-native-document-picker: f5ec1a712ca2a975c233117f044817bb8393cad4
@ -980,7 +974,7 @@ SPEC CHECKSUMS:
  RNMathView: 4c8a3c081fa671ab3136c51fa0bdca7ffb708bd5
  RNReanimated: 64573e25e078ae6bec03b891586d50b9ec284393
  RNRootView: 895a4813dedeaca82db2fa868ca1c333d790e494
-  RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19
+  RNScreens: fa9b582d85ae5d62c91c66003b5278458fed7aaa
  RNSVG: c1e76b81c76cdcd34b4e1188852892dc280eb902
  RNVectorIcons: 7923e585eaeb139b9f4531d25a125a1500162a0b
  SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
--- a/ios/RocketChatRN.xcodeproj/project.pbxproj
+++ b/ios/RocketChatRN.xcodeproj/project.pbxproj
@ -1720,7 +1720,7 @@
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/rn-extensions-share/ios/**",
 					"$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase/**",
-					$PODS_CONFIGURATION_BUILD_DIR/Firebase,
+					"$PODS_CONFIGURATION_BUILD_DIR/Firebase",
 				);
 				INFOPLIST_FILE = ShareRocketChatRN/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
@ -1766,7 +1766,7 @@
 				INFOPLIST_FILE = NotificationService/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 4.45.0;
+				MARKETING_VERSION = 4.46.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@ -1805,7 +1805,7 @@
 				INFOPLIST_FILE = NotificationService/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 4.45.0;
+				MARKETING_VERSION = 4.46.0;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService;
--- a/ios/RocketChatRN/Info.plist
+++ b/ios/RocketChatRN/Info.plist
@ -26,7 +26,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.45.0</string>
+	<string>4.46.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
--- 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.45.0</string>
+	<string>4.46.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>KeychainGroup</key>
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "rocket-chat-reactnative",
-	"version": "4.45.0",
+	"version": "4.46.0",
 	"private": true,
 	"scripts": {
 		"start": "react-native start",
@ -37,7 +37,6 @@
 		"@react-native-camera-roll/camera-roll": "5.6.1",
 		"@react-native-clipboard/clipboard": "^1.8.5",
 		"@react-native-community/art": "^1.2.0",
-		"@react-native-community/blur": "^4.1.0",
 		"@react-native-community/datetimepicker": "3.5.2",
 		"@react-native-community/hooks": "2.6.0",
 		"@react-native-community/netinfo": "6.0.0",
@ -77,7 +76,7 @@
 		"js-base64": "3.6.1",
 		"js-sha256": "^0.9.0",
 		"jsrsasign": "^10.8.6",
-		"lint-staged": "^11.1.0",
+		"lint-staged": "11.1.0",
 		"lodash": "4.17.21",
 		"moment": "2.29.4",
 		"pretty-bytes": "5.6.0",
@ -97,7 +96,7 @@
 		"react-native-fast-image": "RocketChat/react-native-fast-image.git#bump-version",
 		"react-native-file-viewer": "^2.1.4",
 		"react-native-gesture-handler": "2.4.2",
-		"react-native-image-crop-picker": "RocketChat/react-native-image-crop-picker",
+		"react-native-image-crop-picker": "RocketChat/react-native-image-crop-picker#54e1e1c7e7d4b731c74ce9dd1bf9eb5148065092",
 		"react-native-image-progress": "^1.1.1",
 		"react-native-katex": "^0.5.1",
 		"react-native-linear-gradient": "^2.6.2",
@ -118,7 +117,7 @@
 		"react-native-reanimated": "2.8.0",
 		"react-native-restart": "0.0.22",
 		"react-native-safe-area-context": "3.2.0",
-		"react-native-screens": "3.13.1",
+		"react-native-screens": "3.29.0",
 		"react-native-scrollable-tab-view": "ptomasroos/react-native-scrollable-tab-view",
 		"react-native-simple-crypto": "RocketChat/react-native-simple-crypto#0.5.2",
 		"react-native-skeleton-placeholder": "^5.2.3",
--- a/patches/react-native-notifications+4.3.3.patch
+++ b/patches/react-native-notifications+4.3.3.patch
@ -116,6 +116,19 @@ index f9c858b..94ea188 100644
 
 public abstract class NotificationManagerCompatFacade {
     public static NotificationManagerCompat from(@NonNull Context context) {
+diff --git a/node_modules/react-native-notifications/lib/dist/Notifications.d.ts b/node_modules/react-native-notifications/lib/dist/Notifications.d.ts
+index 6e49fd4..5fe9515 100644
+--- a/node_modules/react-native-notifications/lib/dist/Notifications.d.ts
+++ b/node_modules/react-native-notifications/lib/dist/Notifications.d.ts
+@@ -32,7 +32,7 @@ export declare class NotificationsRoot {
+     /**
+      * setCategories
+      */
+-    setCategories(categories: [NotificationCategory?]): void;
+    setCategories(categories: NotificationCategory[]): void;
+     /**
+      * cancelLocalNotification
+     */
 diff --git a/node_modules/react-native-notifications/lib/ios/RCTConvert+RNNotifications.h b/node_modules/react-native-notifications/lib/ios/RCTConvert+RNNotifications.h
 index 8b2c269..8667351 100644
 --- a/node_modules/react-native-notifications/lib/ios/RCTConvert+RNNotifications.h
@ -140,6 +153,31 @@ index 4bc5292..71df0bc 100644
 
 @interface RNNotificationCenter : NSObject
 
+diff --git a/node_modules/react-native-notifications/lib/ios/RNNotificationCenter.m b/node_modules/react-native-notifications/lib/ios/RNNotificationCenter.m
+index afd5c73..ec4dd85 100644
+--- a/node_modules/react-native-notifications/lib/ios/RNNotificationCenter.m
+++ b/node_modules/react-native-notifications/lib/ios/RNNotificationCenter.m
+@@ -48,14 +48,15 @@ - (void)requestPermissions:(NSDictionary *)options {
+ }
+ 
+ - (void)setCategories:(NSArray *)json {
+-    NSMutableSet<UNNotificationCategory *>* categories = nil;
+    NSMutableSet<UNNotificationCategory *>* categories = [NSMutableSet new];
+     
+-    if ([json count] > 0) {
+-        categories = [NSMutableSet new];
+-        for (NSDictionary* categoryJson in json) {
+-            [categories addObject:[RCTConvert UNMutableUserNotificationCategory:categoryJson]];
+    for (NSDictionary* categoryJson in json) {
+        UNNotificationCategory *category = [RCTConvert UNMutableUserNotificationCategory:categoryJson];
+        if (category) {
+            [categories addObject:category];
+         }
+     }
+
+     [[UNUserNotificationCenter currentNotificationCenter] setNotificationCategories:categories];
+ }
+ 
 diff --git a/node_modules/react-native-notifications/lib/ios/RNNotificationCenterListener.h b/node_modules/react-native-notifications/lib/ios/RNNotificationCenterListener.h
 index 77a67dd..eaf0043 100644
 --- a/node_modules/react-native-notifications/lib/ios/RNNotificationCenterListener.h
--- a/push.apns
+++ b/push.apns
@ -4,7 +4,8 @@
 		"alert": {
 			"title": "Hey!",
 			"body": "You have a new push"
-		}
+		},
+		"category": "MESSAGE"
 	},
 	"ejson": "{ \"host\": \"https://open.rocket.chat/\", \"rid\": \"GENERAL\", \"type\": \"c\", \"name\": \"general\" }"
 }
--- a/yarn.lock
+++ b/yarn.lock
@ -3368,9 +3368,9 @@
    regenerator-runtime "^0.13.4"

 "@babel/runtime@^7.21.0":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.6.tgz#c05e610dc228855dc92ef1b53d07389ed8ab521d"
-  integrity sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ==
+  version "7.23.8"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.8.tgz#8ee6fe1ac47add7122902f257b8ddf55c898f650"
+  integrity sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==
  dependencies:
    regenerator-runtime "^0.14.0"

@ -5258,11 +5258,6 @@
    invariant "^2.2.4"
    prop-types "^15.7.2"

-"@react-native-community/blur@^4.1.0":
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/@react-native-community/blur/-/blur-4.3.2.tgz#185a2c7dd03ba168cc95069bc4742e9505fd6c6c"
-  integrity sha512-0ID+pyZKdC4RdgC7HePxUQ6JmsbNrgz03u+6SgqYpmBoK/rE+7JffqIw7IEsfoKitLEcRNLGekIBsfwCqiEkew==
-
 "@react-native-community/cli-debugger-ui@^7.0.3":
  version "7.0.3"
  resolved "https://registry.yarnpkg.com/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-7.0.3.tgz#3eeeacc5a43513cbcae56e5e965d77726361bcb4"
@ -8648,7 +8643,7 @@ bunyan@^1.8.12:
 bytebuffer@^5.0.1:
  version "5.0.1"
  resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd"
-  integrity sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=
+  integrity sha512-IuzSdmADppkZ6DlpycMkm8l9zeEq16fWtLvunEwFiYciR/BHo4E8/xs5piFquG+Za8OWmMqHF8zuRviz2LHvRQ==
  dependencies:
    long "~3"

@ -14551,9 +14546,9 @@ jsonify@^0.0.1:
  integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==

 jsrsasign@^10.8.6:
-  version "10.8.6"
-  resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-10.8.6.tgz#ebf7f3c812c6517af84f0d8a10115e0dbfabe145"
-  integrity sha512-bQmbVtsfbgaKBTWCKiDCPlUPbdlRIK/FzSwT3BzIgZl/cU6TqXu6pZJsCI/dJVrZ9Gir5GC4woqw9shH/v7MBw==
+  version "10.9.0"
+  resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-10.9.0.tgz#cc3f316e7e4c112a976193f9d2c93deb5a0745ee"
+  integrity sha512-QWLUikj1SBJGuyGK8tjKSx3K7Y69KYJnrs/pQ1KZ6wvZIkHkWjZ1PJDpuvc1/28c1uP0KW9qn1eI1LzHQqDOwQ==

 "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.2.1:
  version "3.3.0"
@ -14657,7 +14652,7 @@ lines-and-columns@^1.1.6:
  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=

-lint-staged@^11.1.0:
+lint-staged@11.1.0:
  version "11.1.0"
  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.1.0.tgz#a21d67ffe4516e907635adeaf6d6450d8cffb4e4"
  integrity sha512-pzwEf+NKbTauAlk7gPPwTfulRXESEPZCSFXYfg20F220UOObebxu5uL5mkr9csQLNOM2Ydfrt3DJXakzAL7aaQ==
@ -17744,9 +17739,9 @@ react-native-gradle-plugin@^0.0.6:
  resolved "https://registry.yarnpkg.com/react-native-gradle-plugin/-/react-native-gradle-plugin-0.0.6.tgz#b61a9234ad2f61430937911003cddd7e15c72b45"
  integrity sha512-eIlgtsmDp1jLC24dRn43hB3kEcZVqx6DUQbR0N1ABXGnMEafm9I3V3dUUeD1vh+Dy5WqijSoEwLNUPLgu5zDMg==

-react-native-image-crop-picker@RocketChat/react-native-image-crop-picker:
+react-native-image-crop-picker@RocketChat/react-native-image-crop-picker#54e1e1c7e7d4b731c74ce9dd1bf9eb5148065092:
  version "0.36.3"
-  resolved "https://codeload.github.com/RocketChat/react-native-image-crop-picker/tar.gz/35f5c90576cadcdd4c0eb5cef83a9f1b7b7e26e3"
+  resolved "https://codeload.github.com/RocketChat/react-native-image-crop-picker/tar.gz/54e1e1c7e7d4b731c74ce9dd1bf9eb5148065092"

 react-native-image-progress@^1.1.1:
  version "1.1.1"
@ -17899,10 +17894,10 @@ react-native-safe-area-context@3.2.0:
  resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-3.2.0.tgz#06113c6b208f982d68ab5c3cebd199ca93db6941"
  integrity sha512-k2Nty4PwSnrg9HwrYeeE+EYqViYJoOFwEy9LxL5RIRfoqxAq/uQXNGwpUg2/u4gnKpBbEPa9eRh15KKMe/VHkA==

-react-native-screens@3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.13.1.tgz#b3b1c5788dca25a71668909f66d87fb35c5c5241"
-  integrity sha512-xcrnuUs0qUrGpc2gOTDY4VgHHADQwp80mwR1prU/Q0JqbZN5W3koLhuOsT6FkSRKjR5t40l+4LcjhHdpqRB2HA==
+react-native-screens@3.29.0:
+  version "3.29.0"
+  resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.29.0.tgz#1dee0326defbc1d4ef4e68287abb32a8e6b76b29"
+  integrity sha512-yB1GoAMamFAcYf4ku94uBPn0/ani9QG7NdI98beJ5cet2YFESYYzuEIuU+kt+CNRcO8qqKeugxlfgAa3HyTqlg==
  dependencies:
    react-freeze "^1.0.0"
    warn-once "^0.1.0"