Merge branch 'develop' into pinned

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

@@ -0,0 +1,22 @@
+import React, { memo } from 'react';
+import { View } from 'react-native';
+
+import { CustomIcon } from '../../../CustomIcon';
+import { useTheme } from '../../../../theme';
+import styles from '../../styles';
+
+const Translated = memo(({ isTranslated }: { isTranslated: boolean }) => {
+	const { colors } = useTheme();
+
+	if (!isTranslated) {
+		return null;
+	}
+
+	return (
+		<View style={styles.rightIcons}>
+			<CustomIcon name='language' size={16} color={colors.auxiliaryText} />
+		</View>
+	);
+});
+
+export default Translated;

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

@@ -7,6 +7,7 @@ import Encrypted from './Encrypted';
 import MessageError from './MessageError';
 import Pinned from './Pinned';
 import ReadReceipt from './ReadReceipt';
+import Translated from './Translated';
 
 const styles = StyleSheet.create({
 	actionIcons: {
@@ -21,15 +22,26 @@ interface IRightIcons {
 	isReadReceiptEnabled?: boolean;
 	unread?: boolean;
 	hasError: boolean;
+	isTranslated: boolean;
 	pinned?: boolean;
 }
 
-const RightIcons = ({ type, msg, isEdited, hasError, isReadReceiptEnabled, unread, pinned }: IRightIcons): React.ReactElement => (
+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} />
+		<Translated isTranslated={isTranslated} />
 		<ReadReceipt isReadReceiptEnabled={isReadReceiptEnabled} unread={unread} />
 	</View>
 );

app/containers/message/Message.stories.tsx

@@ -127,6 +127,13 @@ export const Edited = () => (
 	</>
 );
 
+export const Translated = () => (
+	<>
+		<Message msg='Message header' isTranslated />
+		<Message msg='Message without header' isTranslated isHeader={false} />
+	</>
+);
+
 export const Encrypted = () => (
 	<>
 		<Message msg='Message' type='e2e' />
@@ -939,6 +946,7 @@ export const LongNameUser = () => (
 	<>
 		<Message msg={'this is a normal message'} author={longNameAuthor} />
 		<Message msg={'Edited message'} author={longNameAuthor} isEdited />
+		<Message msg={'Translated message'} author={longNameAuthor} isTranslated />
 		<Message msg={'Encrypted message'} author={longNameAuthor} type={E2E_MESSAGE_TYPE} />
 		<Message msg={'Error message'} author={longNameAuthor} hasError />
 		<Message msg={'Message with read receipt'} author={longNameAuthor} isReadReceiptEnabled read />
@@ -947,6 +955,7 @@ export const LongNameUser = () => (
 			msg={'Show all icons '}
 			author={longNameAuthor}
 			isEdited
+			isTranslated
 			type={E2E_MESSAGE_TYPE}
 			hasError
 			isReadReceiptEnabled
@@ -958,6 +967,7 @@ export const LongNameUser = () => (
 			author={longNameAuthor}
 			isHeader={false}
 			isEdited
+			isTranslated
 			type={E2E_MESSAGE_TYPE}
 			hasError
 			isReadReceiptEnabled
@@ -969,6 +979,7 @@ export const LongNameUser = () => (
 			author={longNameAuthor}
 			isHeader={false}
 			isEdited
+			isTranslated
 			type={E2E_MESSAGE_TYPE}
 			hasError
 			isReadReceiptEnabled

app/containers/message/Message.tsx

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

app/containers/message/User.tsx

@@ -61,10 +61,24 @@ interface IMessageUser {
 	isReadReceiptEnabled?: boolean;
 	unread?: boolean;
 	pinned?: boolean;
+	isTranslated: boolean;
 }
 
 const User = React.memo(
-	({ isHeader, useRealName, author, alias, ts, timeFormat, hasError, navToRoomInfo, type, isEdited, ...props }: IMessageUser) => {
+	({
+		isHeader,
+		useRealName,
+		author,
+		alias,
+		ts,
+		timeFormat,
+		hasError,
+		navToRoomInfo,
+		type,
+		isEdited,
+		isTranslated,
+		...props
+	}: IMessageUser) => {
 		const { user } = useContext(MessageContext);
 		const { colors } = useTheme();
 
@@ -112,6 +126,7 @@ const User = React.memo(
 						isReadReceiptEnabled={props.isReadReceiptEnabled}
 						unread={props.unread}
 						pinned={props.pinned}
+						isTranslated={isTranslated}
 					/>
 				</View>
 			);