chore: Merge 4.49.0 into master (#5684)

Author: diegolmello

__tests__/containers/message/__snapshots__/Message.stories.storyshot

@@ -147,7 +147,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "4.48.0"
+        versionName "4.49.0"
         vectorDrawables.useSupportLibrary = true
         if (!isFoss) {
             manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]

android/app/build.gradle

@@ -32,8 +32,6 @@
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
-import com.RNFetchBlob.RNFetchBlob;
-
 import com.reactnativecommunity.webview.RNCWebViewManager;
 
 import com.dylanvann.fastimage.FastImageOkHttpUrlLoader;
@@ -104,8 +102,6 @@ public void setCertificate(String data, Promise promise) {
         WebSocketModule.setCustomClientBuilder(new CustomClient());
         // Image networking react-native layer
         ReactOkHttpNetworkFetcher.setOkHttpClient(getOkHttpClient());
-        // RNFetchBlob networking layer
-        RNFetchBlob.applyCustomOkHttpClient(getOkHttpClient());
         // RNCWebView onReceivedClientCertRequest
         RNCWebViewManager.setCertificateAlias(data);
         // FastImage Glide network layer

android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningModule.java

@@ -136,7 +136,7 @@ export const useChooseMedia = ({
 			// FIXME: use useNavigation
 			Navigation.navigate('ShareView', {
 				room,
-				thread,
+				thread: thread || tmid,
 				attachments,
 				action,
 				finishShareView,

app/containers/MessageComposer/hooks/useChooseMedia.ts

@@ -13,8 +13,9 @@ const styles = StyleSheet.create({
 	},
 	text: {
 		fontSize: 14,
-		...sharedStyles.textRegular,
-		...sharedStyles.textAlignCenter
+		// jest error: TypeError: Cannot read property 'textRegular' of undefined
+		...sharedStyles?.textRegular,
+		...sharedStyles?.textAlignCenter
 	}
 });
 

app/containers/Toast.tsx

@@ -0,0 +1,11 @@
+import React from 'react';
+
+import { CustomIcon } from '../../../CustomIcon';
+import styles from '../../styles';
+
+const Pinned = ({ pinned, testID }: { pinned?: boolean; testID?: string }): React.ReactElement | null => {
+	if (pinned) return <CustomIcon testID={testID} name='pin' size={16} style={styles.rightIcons} />;
+	return null;
+};
+
+export default Pinned;

app/containers/message/Components/RightIcons/Pinned.tsx

@@ -1,12 +1,13 @@
 import React from 'react';
 import { StyleSheet, View } from 'react-native';
 
-import Encrypted from './Encrypted';
+import { MessageType } from '../../../../definitions';
 import Edited from './Edited';
+import Encrypted from './Encrypted';
 import MessageError from './MessageError';
+import Pinned from './Pinned';
 import ReadReceipt from './ReadReceipt';
 import Translated from './Translated';
-import { MessageType } from '../../../../definitions';
 
 const styles = StyleSheet.create({
 	actionIcons: {
@@ -22,10 +23,21 @@ interface IRightIcons {
 	unread?: boolean;
 	hasError: boolean;
 	isTranslated: boolean;
+	pinned?: boolean;
 }
 
-const RightIcons = ({ type, msg, isEdited, hasError, isReadReceiptEnabled, unread, isTranslated }: IRightIcons) => (
+const RightIcons = ({
+	type,
+	msg,
+	isEdited,
+	hasError,
+	isReadReceiptEnabled,
+	unread,
+	isTranslated,
+	pinned
+}: IRightIcons): React.ReactElement => (
 	<View style={styles.actionIcons}>
+		<Pinned pinned={pinned} testID={`${msg}-pinned`} />
 		<Encrypted type={type} />
 		<Edited testID={`${msg}-edited`} isEdited={isEdited} />
 		<MessageError hasError={hasError} />

app/containers/message/Components/RightIcons/index.tsx

@@ -127,6 +127,13 @@ export const Edited = () => (
 	</>
 );
 
+export const Pinned = () => (
+	<>
+		<Message msg='Message header' pinned />
+		<Message msg='Message without header' pinned isHeader={false} />
+	</>
+);
+
 export const Translated = () => (
 	<>
 		<Message msg='Message header' isTranslated />

app/containers/message/Message.stories.tsx

@@ -117,6 +117,7 @@ const Message = React.memo((props: IMessage) => {
 						hasError={props.hasError}
 						isReadReceiptEnabled={props.isReadReceiptEnabled}
 						unread={props.unread}
+						pinned={props.pinned}
 						isTranslated={props.isTranslated}
 					/>
 				) : null}

app/containers/message/Message.tsx

@@ -1,21 +1,21 @@
+import { dequal } from 'dequal';
+import moment from 'moment';
 import React, { useContext, useState } from 'react';
 import { StyleSheet, Text, View } from 'react-native';
-import moment from 'moment';
-import { dequal } from 'dequal';
 import FastImage from 'react-native-fast-image';
 
-import Touchable from './Touchable';
-import Markdown from '../markdown';
+import { IAttachment, TGetCustomEmoji } from '../../definitions';
+import { themes } from '../../lib/constants';
+import { fileDownloadAndPreview } from '../../lib/methods/helpers';
+import { formatAttachmentUrl } from '../../lib/methods/helpers/formatAttachmentUrl';
 import openLink from '../../lib/methods/helpers/openLink';
+import { TSupportedThemes, useTheme } from '../../theme';
 import sharedStyles from '../../views/Styles';
-import { themes } from '../../lib/constants';
-import MessageContext from './Context';
-import { fileDownloadAndPreview } from './helpers/fileDownload';
-import { IAttachment, TGetCustomEmoji } from '../../definitions';
 import RCActivityIndicator from '../ActivityIndicator';
+import Markdown from '../markdown';
 import Attachments from './Attachments';
-import { TSupportedThemes, useTheme } from '../../theme';
-import { formatAttachmentUrl } from '../../lib/methods/helpers/formatAttachmentUrl';
+import MessageContext from './Context';
+import Touchable from './Touchable';
 import messageStyles from './styles';
 
 const styles = StyleSheet.create({