diff --git a/__tests__/__snapshots__/Storyshots.test.js.snap b/__tests__/__snapshots__/Storyshots.test.js.snap index 8b5073224..3b283ab56 100644 --- a/__tests__/__snapshots__/Storyshots.test.js.snap +++ b/__tests__/__snapshots__/Storyshots.test.js.snap @@ -15665,7 +15665,10 @@ exports[`Storyshots Markdown Code 1`] = ` "borderWidth": 1, "color": "#2f343d", "fontFamily": "Courier New", + "fontSize": 16, "fontWeight": "400", + "paddingLeft": 2, + "paddingTop": 2, "textAlign": "left", }, ] @@ -15728,7 +15731,10 @@ exports[`Storyshots Markdown Code 1`] = ` "borderWidth": 1, "color": "#2f343d", "fontFamily": "Courier New", + "fontSize": 16, "fontWeight": "400", + "paddingLeft": 2, + "paddingTop": 2, "textAlign": "left", }, ] @@ -15773,7 +15779,10 @@ exports[`Storyshots Markdown Code 1`] = ` "borderWidth": 1, "color": "#2f343d", "fontFamily": "Courier New", + "fontSize": 16, "fontWeight": "400", + "paddingLeft": 2, + "paddingTop": 2, "textAlign": "left", }, ] @@ -15819,6 +15828,7 @@ exports[`Storyshots Markdown Code 1`] = ` "borderWidth": 1, "color": "#2f343d", "fontFamily": "Courier New", + "fontSize": 16, "fontWeight": "400", "padding": 4, "textAlign": "left", @@ -16881,7 +16891,10 @@ exports[`Storyshots Markdown Links 1`] = ` "borderWidth": 1, "color": "#2f343d", "fontFamily": "Courier New", + "fontSize": 16, "fontWeight": "400", + "paddingLeft": 2, + "paddingTop": 2, "textAlign": "left", }, ] @@ -16993,7 +17006,10 @@ exports[`Storyshots Markdown Links 1`] = ` "borderWidth": 1, "color": "#2f343d", "fontFamily": "Courier New", + "fontSize": 16, "fontWeight": "400", + "paddingLeft": 2, + "paddingTop": 2, "textAlign": "left", }, ] @@ -50287,6 +50303,1370 @@ exports[`Storyshots Message Without header 1`] = ` `; +exports[`Storyshots NewMarkdown Block quote 1`] = ` + + + + + + + Rocket.Chat to the moon + + + + + +`; + +exports[`Storyshots NewMarkdown Code 1`] = ` + + + + + inline code + + + + + + Multi line + + + Code + + + +`; + +exports[`Storyshots NewMarkdown Emoji 1`] = ` + + + + 💚 + + + 😂 + + + 😁 + + + + + 🚀 + + + 🤦 + + + + + + + + + +`; + +exports[`Storyshots NewMarkdown Hashtag 1`] = ` + + + + #text_channel + + + and + + + #not_a_channel + + + +`; + +exports[`Storyshots NewMarkdown Headers 1`] = ` + + + # Header 1 + + + ## Header 2 + + + ### Header 3 + + + #### Header 4 + + + ##### Header 5 + + + ###### Header 6 + + +`; + +exports[`Storyshots NewMarkdown Links 1`] = ` + + + + https://rocket.chat + + + + + Markdown link + + + +`; + +exports[`Storyshots NewMarkdown Lists 1`] = ` + + + + + - + + + Open Source + + + + + - + + + Rocket.Chat + + + + + + + 1 + . + + + Open Source + + + + + 2 + . + + + Rocket.Chat + + + + +`; + +exports[`Storyshots NewMarkdown Mentions 1`] = ` + + + + rocket.cat + + + + + name + + + + + + rocket.cat + + + + + + here + + + + + + all + + + +`; + +exports[`Storyshots NewMarkdown Text 1`] = ` + + + + This is Rocket.Chat + + + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + + + + + a + + + b + + + c + + + + + + d + + + + + + + + + e + + + + + a b c + + + + + + This is bold + + + + and + + + + this is italic + + + + +`; + exports[`Storyshots Room Item Alerts 1`] = ` ; + inputStyle?: TextStyle; + inputRef?: React.Ref; + testID?: string; + iconLeft?: string; + iconRight?: string; + left?: JSX.Element; + onIconRightPress?(): void; theme: string; } @@ -148,17 +146,10 @@ export default class RCTextInput extends React.PureComponent {label ? ( - - {label} - + {label} ) : null} diff --git a/app/containers/markdown/AtMention.tsx b/app/containers/markdown/AtMention.tsx index ab6354994..689313257 100644 --- a/app/containers/markdown/AtMention.tsx +++ b/app/containers/markdown/AtMention.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { Text } from 'react-native'; +import { useTheme } from '../../theme'; import { themes } from '../../constants/colors'; import styles from './styles'; import { events, logEvent } from '../../utils/log'; @@ -9,20 +10,20 @@ interface IAtMention { mention: string; username: string; navToRoomInfo: Function; - style: any; + style?: any; useRealName: boolean; - theme: string; mentions: any; } -const AtMention = React.memo(({ mention, mentions, username, navToRoomInfo, style = [], useRealName, theme }: IAtMention) => { +const AtMention = React.memo(({ mention, mentions, username, navToRoomInfo, style = [], useRealName }: IAtMention) => { + const { theme } = useTheme(); if (mention === 'all' || mention === 'here') { return ( @@ -34,11 +35,11 @@ const AtMention = React.memo(({ mention, mentions, username, navToRoomInfo, styl let mentionStyle = {}; if (mention === username) { mentionStyle = { - color: themes[theme].mentionMeColor + color: themes[theme!].mentionMeColor }; } else { mentionStyle = { - color: themes[theme].mentionOtherColor + color: themes[theme!].mentionOtherColor }; } @@ -61,7 +62,7 @@ const AtMention = React.memo(({ mention, mentions, username, navToRoomInfo, styl ); } - return {`@${mention}`}; + return {`@${mention}`}; }); export default AtMention; diff --git a/app/containers/markdown/Hashtag.tsx b/app/containers/markdown/Hashtag.tsx index 872b8782a..b20794de5 100644 --- a/app/containers/markdown/Hashtag.tsx +++ b/app/containers/markdown/Hashtag.tsx @@ -1,23 +1,26 @@ import React from 'react'; -import { Text } from 'react-native'; +import { Text, TextStyle } from 'react-native'; import { themes } from '../../constants/colors'; +import { useTheme } from '../../theme'; import styles from './styles'; interface IHashtag { hashtag: string; navToRoomInfo: Function; - style: []; - theme: string; + style?: TextStyle[]; channels: { + [index: number]: string | number; name: string; _id: number; }[]; } -const Hashtag = React.memo(({ hashtag, channels, navToRoomInfo, style = [], theme }: IHashtag) => { +const Hashtag = React.memo(({ hashtag, channels, navToRoomInfo, style = [] }: IHashtag) => { + const { theme } = useTheme(); + const handlePress = () => { - const index = channels.findIndex(channel => channel.name === hashtag); + const index = channels?.findIndex(channel => channel.name === hashtag); const navParam = { t: 'c', rid: channels[index]._id @@ -31,7 +34,7 @@ const Hashtag = React.memo(({ hashtag, channels, navToRoomInfo, style = [], them style={[ styles.mention, { - color: themes[theme].mentionOtherColor + color: themes[theme!].mentionOtherColor }, ...style ]} @@ -40,7 +43,7 @@ const Hashtag = React.memo(({ hashtag, channels, navToRoomInfo, style = [], them ); } - return {`#${hashtag}`}; + return {`#${hashtag}`}; }); export default Hashtag; diff --git a/app/containers/markdown/index.tsx b/app/containers/markdown/index.tsx index d3ce8453e..d84dc7dc8 100644 --- a/app/containers/markdown/index.tsx +++ b/app/containers/markdown/index.tsx @@ -3,6 +3,7 @@ import { Image, Text } from 'react-native'; import { Node, Parser } from 'commonmark'; import Renderer from 'commonmark-react-renderer'; import removeMarkdown from 'remove-markdown'; +import { MarkdownAST } from '@rocket.chat/message-parser'; import shortnameToUnicode from '../../utils/shortnameToUnicode'; import I18n from '../../i18n'; @@ -20,9 +21,20 @@ import MarkdownTableCell from './TableCell'; import mergeTextNodes from './mergeTextNodes'; import styles from './styles'; import { isValidURL } from '../../utils/url'; +import NewMarkdown from './new'; + +interface IUser { + _id: string; + username: string; + name: string; +} + +type UserMention = Pick; interface IMarkdownProps { msg: string; + md: MarkdownAST; + mentions: UserMention[]; getCustomEmoji: Function; baseUrl: string; username: string; @@ -35,7 +47,7 @@ interface IMarkdownProps { name: string; _id: number; }[]; - mentions: object[]; + enableMessageParser: boolean; navToRoomInfo: Function; preview: boolean; theme: string; @@ -97,7 +109,9 @@ class Markdown extends PureComponent { constructor(props: IMarkdownProps) { super(props); - this.renderer = this.createRenderer(); + if (!this.isNewMarkdown) { + this.renderer = this.createRenderer(); + } } createRenderer = () => @@ -139,6 +153,11 @@ class Markdown extends PureComponent { renderParagraphsInLists: true }); + get isNewMarkdown(): boolean { + const { md, enableMessageParser } = this.props; + return enableMessageParser && !!md; + } + editedMessage = (ast: any) => { const { isEdited } = this.props; if (isEdited) { @@ -227,12 +246,12 @@ class Markdown extends PureComponent { }; renderHashtag = ({ hashtag }: { hashtag: string }) => { - const { channels, navToRoomInfo, style, theme } = this.props; - return ; + const { channels, navToRoomInfo, style } = this.props; + return ; }; renderAtMention = ({ mentionName }: { mentionName: string }) => { - const { username, mentions, navToRoomInfo, useRealName, style, theme } = this.props; + const { username, mentions, navToRoomInfo, useRealName, style } = this.props; return ( { useRealName={useRealName} username={username} navToRoomInfo={navToRoomInfo} - theme={theme} style={style} /> ); @@ -329,12 +347,44 @@ class Markdown extends PureComponent { }; render() { - const { msg, numberOfLines, preview = false, theme, style = [], testID } = this.props; + const { + msg, + md, + numberOfLines, + preview = false, + theme, + style = [], + testID, + mentions, + channels, + navToRoomInfo, + useRealName, + username, + getCustomEmoji, + baseUrl, + onLinkPress + } = this.props; if (!msg) { return null; } + if (this.isNewMarkdown) { + return ( + + ); + } + let m = formatText(msg); // Ex: '[ ](https://open.rocket.chat/group/test?msg=abcdef) Test' diff --git a/app/containers/markdown/new/BigEmoji.tsx b/app/containers/markdown/new/BigEmoji.tsx new file mode 100644 index 000000000..c8f6a3beb --- /dev/null +++ b/app/containers/markdown/new/BigEmoji.tsx @@ -0,0 +1,25 @@ +import React from 'react'; +import { StyleSheet, View } from 'react-native'; +import { BigEmoji as BigEmojiProps } from '@rocket.chat/message-parser'; + +import Emoji from './Emoji'; + +interface IBigEmojiProps { + value: BigEmojiProps['value']; +} + +const styles = StyleSheet.create({ + container: { + flexDirection: 'row' + } +}); + +const BigEmoji = ({ value }: IBigEmojiProps): JSX.Element => ( + + {value.map(block => ( + + ))} + +); + +export default BigEmoji; diff --git a/app/containers/markdown/new/Bold.tsx b/app/containers/markdown/new/Bold.tsx new file mode 100644 index 000000000..9cb1f4fdb --- /dev/null +++ b/app/containers/markdown/new/Bold.tsx @@ -0,0 +1,40 @@ +import React from 'react'; +import { StyleSheet, Text } from 'react-native'; +import { Bold as BoldProps } from '@rocket.chat/message-parser'; + +import sharedStyles from '../../../views/Styles'; +import Strike from './Strike'; +import Italic from './Italic'; +import Plain from './Plain'; +import Link from './Link'; + +interface IBoldProps { + value: BoldProps['value']; +} + +const styles = StyleSheet.create({ + text: { + ...sharedStyles.textBold + } +}); + +const Bold = ({ value }: IBoldProps): JSX.Element => ( + + {value.map(block => { + switch (block.type) { + case 'LINK': + return ; + case 'PLAIN_TEXT': + return ; + case 'STRIKE': + return ; + case 'ITALIC': + return ; + default: + return null; + } + })} + +); + +export default Bold; diff --git a/app/containers/markdown/new/Code.tsx b/app/containers/markdown/new/Code.tsx new file mode 100644 index 000000000..d2a164367 --- /dev/null +++ b/app/containers/markdown/new/Code.tsx @@ -0,0 +1,39 @@ +import React from 'react'; +import { Text } from 'react-native'; +import { Code as CodeProps } from '@rocket.chat/message-parser'; + +import styles from '../styles'; +import { themes } from '../../../constants/colors'; +import { useTheme } from '../../../theme'; +import CodeLine from './CodeLine'; + +interface ICodeProps { + value: CodeProps['value']; +} + +const Code = ({ value }: ICodeProps): JSX.Element => { + const { theme } = useTheme(); + + return ( + + {value.map(block => { + switch (block.type) { + case 'CODE_LINE': + return ; + default: + return null; + } + })} + + ); +}; + +export default Code; diff --git a/app/containers/markdown/new/CodeLine.tsx b/app/containers/markdown/new/CodeLine.tsx new file mode 100644 index 000000000..c05066f9c --- /dev/null +++ b/app/containers/markdown/new/CodeLine.tsx @@ -0,0 +1,17 @@ +import React from 'react'; +import { Text } from 'react-native'; +import { CodeLine as CodeLineProps } from '@rocket.chat/message-parser'; + +interface ICodeLineProps { + value: CodeLineProps['value']; +} + +const CodeLine = ({ value }: ICodeLineProps): JSX.Element | null => { + if (value.type !== 'PLAIN_TEXT') { + return null; + } + + return {value.value}; +}; + +export default CodeLine; diff --git a/app/containers/markdown/new/Emoji.tsx b/app/containers/markdown/new/Emoji.tsx new file mode 100644 index 000000000..0800b8874 --- /dev/null +++ b/app/containers/markdown/new/Emoji.tsx @@ -0,0 +1,29 @@ +import React, { useContext } from 'react'; +import { Text } from 'react-native'; +import { Emoji as EmojiProps } from '@rocket.chat/message-parser'; + +import shortnameToUnicode from '../../../utils/shortnameToUnicode'; +import { themes } from '../../../constants/colors'; +import { useTheme } from '../../../theme'; +import styles from '../styles'; +import CustomEmoji from '../../EmojiPicker/CustomEmoji'; +import MarkdownContext from './MarkdownContext'; + +interface IEmojiProps { + value: EmojiProps['value']; + isBigEmoji?: boolean; +} + +const Emoji = ({ value, isBigEmoji }: IEmojiProps): JSX.Element => { + const { theme } = useTheme(); + const { baseUrl, getCustomEmoji } = useContext(MarkdownContext); + const emojiUnicode = shortnameToUnicode(`:${value.value}:`); + const emoji = getCustomEmoji?.(value.value); + + if (emoji) { + return ; + } + return {emojiUnicode}; +}; + +export default Emoji; diff --git a/app/containers/markdown/new/Heading.tsx b/app/containers/markdown/new/Heading.tsx new file mode 100644 index 000000000..2e810d376 --- /dev/null +++ b/app/containers/markdown/new/Heading.tsx @@ -0,0 +1,32 @@ +import React from 'react'; +import { Text } from 'react-native'; +import { Heading as HeadingProps } from '@rocket.chat/message-parser'; + +import { themes } from '../../../constants/colors'; +import styles from '../styles'; +import { useTheme } from '../../../theme'; + +interface IHeadingProps { + value: HeadingProps['value']; + level: HeadingProps['level']; +} + +const Heading = ({ value, level }: IHeadingProps): JSX.Element => { + const { theme } = useTheme(); + const textStyle = styles[`heading${level}`]; + + return ( + + {value.map(block => { + switch (block.type) { + case 'PLAIN_TEXT': + return block.value; + default: + return null; + } + })} + + ); +}; + +export default Heading; diff --git a/app/containers/markdown/new/Image.tsx b/app/containers/markdown/new/Image.tsx new file mode 100644 index 000000000..fb9f95d28 --- /dev/null +++ b/app/containers/markdown/new/Image.tsx @@ -0,0 +1,41 @@ +import React from 'react'; +import { Image as ImageProps } from '@rocket.chat/message-parser'; +import { createImageProgress } from 'react-native-image-progress'; +import * as Progress from 'react-native-progress'; +import FastImage from '@rocket.chat/react-native-fast-image'; + +import { useTheme } from '../../../theme'; +import { themes } from '../../../constants/colors'; +import styles from '../../message/styles'; + +interface IImageProps { + value: ImageProps['value']; +} + +type TMessageImage = { + img: string; + theme: string; +}; + +const ImageProgress = createImageProgress(FastImage); + +const MessageImage = ({ img, theme }: TMessageImage) => ( + +); + +const Image = ({ value }: IImageProps): JSX.Element => { + const { theme } = useTheme(); + const { src } = value; + + return ; +}; + +export default Image; diff --git a/app/containers/markdown/new/Inline.tsx b/app/containers/markdown/new/Inline.tsx new file mode 100644 index 000000000..08c4b1e5f --- /dev/null +++ b/app/containers/markdown/new/Inline.tsx @@ -0,0 +1,62 @@ +import React, { useContext } from 'react'; +import { Paragraph as ParagraphProps } from '@rocket.chat/message-parser'; + +import Hashtag from '../Hashtag'; +import AtMention from '../AtMention'; +import Link from './Link'; +import Plain from './Plain'; +import Bold from './Bold'; +import Strike from './Strike'; +import Italic from './Italic'; +import Emoji from './Emoji'; +import InlineCode from './InlineCode'; +import Image from './Image'; +import MarkdownContext from './MarkdownContext'; + +interface IParagraphProps { + value: ParagraphProps['value']; +} + +const Inline = ({ value }: IParagraphProps): JSX.Element => { + const { useRealName, username, navToRoomInfo, mentions, channels } = useContext(MarkdownContext); + return ( + <> + {value.map(block => { + switch (block.type) { + case 'IMAGE': + return ; + case 'PLAIN_TEXT': + return ; + case 'BOLD': + return ; + case 'STRIKE': + return ; + case 'ITALIC': + return ; + case 'LINK': + return ; + case 'MENTION_USER': + return ( + + ); + case 'EMOJI': + return ; + case 'MENTION_CHANNEL': + return ; + case 'INLINE_CODE': + return ; + default: + return null; + } + })} + + ); +}; + +export default Inline; diff --git a/app/containers/markdown/new/InlineCode.tsx b/app/containers/markdown/new/InlineCode.tsx new file mode 100644 index 000000000..cf90f2cb3 --- /dev/null +++ b/app/containers/markdown/new/InlineCode.tsx @@ -0,0 +1,38 @@ +import React from 'react'; +import { Text } from 'react-native'; +import { InlineCode as InlineCodeProps } from '@rocket.chat/message-parser'; + +import styles from '../styles'; +import { themes } from '../../../constants/colors'; +import { useTheme } from '../../../theme'; + +interface IInlineCodeProps { + value: InlineCodeProps['value']; +} + +const InlineCode = ({ value }: IInlineCodeProps): JSX.Element => { + const { theme } = useTheme(); + + return ( + + {(block => { + switch (block.type) { + case 'PLAIN_TEXT': + return {block.value}; + default: + return null; + } + })(value)} + + ); +}; + +export default InlineCode; diff --git a/app/containers/markdown/new/Italic.tsx b/app/containers/markdown/new/Italic.tsx new file mode 100644 index 000000000..fc1432e5a --- /dev/null +++ b/app/containers/markdown/new/Italic.tsx @@ -0,0 +1,39 @@ +import React from 'react'; +import { StyleSheet, Text } from 'react-native'; +import { Italic as ItalicProps } from '@rocket.chat/message-parser'; + +import Strike from './Strike'; +import Bold from './Bold'; +import Plain from './Plain'; +import Link from './Link'; + +interface IItalicProps { + value: ItalicProps['value']; +} + +const styles = StyleSheet.create({ + text: { + fontStyle: 'italic' + } +}); + +const Italic = ({ value }: IItalicProps): JSX.Element => ( + + {value.map(block => { + switch (block.type) { + case 'LINK': + return ; + case 'PLAIN_TEXT': + return ; + case 'STRIKE': + return ; + case 'BOLD': + return ; + default: + return null; + } + })} + +); + +export default Italic; diff --git a/app/containers/markdown/new/Link.tsx b/app/containers/markdown/new/Link.tsx new file mode 100644 index 000000000..e29c4f2c0 --- /dev/null +++ b/app/containers/markdown/new/Link.tsx @@ -0,0 +1,60 @@ +import React, { useContext } from 'react'; +import { Text, Clipboard } from 'react-native'; +import { Link as LinkProps } from '@rocket.chat/message-parser'; + +import styles from '../styles'; +import I18n from '../../../i18n'; +import { LISTENER } from '../../Toast'; +import { useTheme } from '../../../theme'; +import openLink from '../../../utils/openLink'; +import EventEmitter from '../../../utils/events'; +import { themes } from '../../../constants/colors'; +import Strike from './Strike'; +import Italic from './Italic'; +import Bold from './Bold'; +import MarkdownContext from './MarkdownContext'; + +interface ILinkProps { + value: LinkProps['value']; +} + +const Link = ({ value }: ILinkProps): JSX.Element => { + const { theme } = useTheme(); + const { onLinkPress } = useContext(MarkdownContext); + const { src, label } = value; + const handlePress = () => { + if (!src.value) { + return; + } + if (onLinkPress) { + return onLinkPress(src.value); + } + openLink(src.value, theme); + }; + + const onLongPress = () => { + Clipboard.setString(src.value); + EventEmitter.emit(LISTENER, { message: I18n.t('Copied_to_clipboard') }); + }; + + return ( + + {(block => { + switch (block.type) { + case 'PLAIN_TEXT': + return block.value; + case 'STRIKE': + return ; + case 'ITALIC': + return ; + case 'BOLD': + return ; + default: + return null; + } + })(label)} + + ); +}; + +export default Link; diff --git a/app/containers/markdown/new/MarkdownContext.ts b/app/containers/markdown/new/MarkdownContext.ts new file mode 100644 index 000000000..b22f15614 --- /dev/null +++ b/app/containers/markdown/new/MarkdownContext.ts @@ -0,0 +1,29 @@ +import React from 'react'; + +import { UserMention } from '../../message/interfaces'; + +interface IMarkdownContext { + mentions: UserMention[]; + channels: { + name: string; + _id: number; + }[]; + useRealName: boolean; + username: string; + baseUrl: string; + navToRoomInfo: Function; + getCustomEmoji?: Function; + onLinkPress?: Function; +} + +const defaultState = { + mentions: [], + channels: [], + useRealName: false, + username: '', + baseUrl: '', + navToRoomInfo: () => {} +}; + +const MarkdownContext = React.createContext(defaultState); +export default MarkdownContext; diff --git a/app/containers/markdown/new/OrderedList.tsx b/app/containers/markdown/new/OrderedList.tsx new file mode 100644 index 000000000..c5ae25125 --- /dev/null +++ b/app/containers/markdown/new/OrderedList.tsx @@ -0,0 +1,28 @@ +import React from 'react'; +import { View, Text } from 'react-native'; +import { OrderedList as OrderedListProps } from '@rocket.chat/message-parser'; + +import Inline from './Inline'; +import styles from '../styles'; +import { themes } from '../../../constants/colors'; +import { useTheme } from '../../../theme'; + +interface IOrderedListProps { + value: OrderedListProps['value']; +} + +const OrderedList = ({ value }: IOrderedListProps): JSX.Element => { + const { theme } = useTheme(); + return ( + + {value.map((item, index) => ( + + {index + 1}. + + + ))} + + ); +}; + +export default OrderedList; diff --git a/app/containers/markdown/new/Paragraph.tsx b/app/containers/markdown/new/Paragraph.tsx new file mode 100644 index 000000000..2f7649bb9 --- /dev/null +++ b/app/containers/markdown/new/Paragraph.tsx @@ -0,0 +1,23 @@ +import React from 'react'; +import { Text } from 'react-native'; +import { Paragraph as ParagraphProps } from '@rocket.chat/message-parser'; + +import Inline from './Inline'; +import styles from '../styles'; +import { useTheme } from '../../../theme'; +import { themes } from '../../../constants/colors'; + +interface IParagraphProps { + value: ParagraphProps['value']; +} + +const Paragraph = ({ value }: IParagraphProps): JSX.Element => { + const { theme } = useTheme(); + return ( + + + + ); +}; + +export default Paragraph; diff --git a/app/containers/markdown/new/Plain.tsx b/app/containers/markdown/new/Plain.tsx new file mode 100644 index 000000000..9eca2e0c7 --- /dev/null +++ b/app/containers/markdown/new/Plain.tsx @@ -0,0 +1,22 @@ +import React from 'react'; +import { Text } from 'react-native'; +import { Plain as PlainProps } from '@rocket.chat/message-parser'; + +import styles from '../styles'; +import { useTheme } from '../../../theme'; +import { themes } from '../../../constants/colors'; + +interface IPlainProps { + value: PlainProps['value']; +} + +const Plain = ({ value }: IPlainProps): JSX.Element => { + const { theme } = useTheme(); + return ( + + {value} + + ); +}; + +export default Plain; diff --git a/app/containers/markdown/new/Quote.tsx b/app/containers/markdown/new/Quote.tsx new file mode 100644 index 000000000..27d6a01d1 --- /dev/null +++ b/app/containers/markdown/new/Quote.tsx @@ -0,0 +1,28 @@ +import React from 'react'; +import { View } from 'react-native'; +import { Quote as QuoteProps } from '@rocket.chat/message-parser'; + +import { themes } from '../../../constants/colors'; +import { useTheme } from '../../../theme'; +import styles from '../styles'; +import Paragraph from './Paragraph'; + +interface IQuoteProps { + value: QuoteProps['value']; +} + +const Quote = ({ value }: IQuoteProps): JSX.Element => { + const { theme } = useTheme(); + return ( + + + + {value.map(item => ( + + ))} + + + ); +}; + +export default Quote; diff --git a/app/containers/markdown/new/Strike.tsx b/app/containers/markdown/new/Strike.tsx new file mode 100644 index 000000000..4d1cf5ea8 --- /dev/null +++ b/app/containers/markdown/new/Strike.tsx @@ -0,0 +1,39 @@ +import React from 'react'; +import { StyleSheet, Text } from 'react-native'; +import { Strike as StrikeProps } from '@rocket.chat/message-parser'; + +import Bold from './Bold'; +import Italic from './Italic'; +import Plain from './Plain'; +import Link from './Link'; + +interface IStrikeProps { + value: StrikeProps['value']; +} + +const styles = StyleSheet.create({ + text: { + textDecorationLine: 'line-through' + } +}); + +const Strike = ({ value }: IStrikeProps): JSX.Element => ( + + {value.map(block => { + switch (block.type) { + case 'LINK': + return ; + case 'PLAIN_TEXT': + return ; + case 'BOLD': + return ; + case 'ITALIC': + return ; + default: + return null; + } + })} + +); + +export default Strike; diff --git a/app/containers/markdown/new/TaskList.tsx b/app/containers/markdown/new/TaskList.tsx new file mode 100644 index 000000000..8f46af965 --- /dev/null +++ b/app/containers/markdown/new/TaskList.tsx @@ -0,0 +1,28 @@ +import React from 'react'; +import { Text, View } from 'react-native'; +import { Tasks as TasksProps } from '@rocket.chat/message-parser'; + +import Inline from './Inline'; +import styles from '../styles'; +import { themes } from '../../../constants/colors'; +import { useTheme } from '../../../theme'; + +interface ITasksProps { + value: TasksProps['value']; +} + +const TaskList = ({ value = [] }: ITasksProps): JSX.Element => { + const { theme } = useTheme(); + return ( + + {value.map(item => ( + + {item.status ? '- [x] ' : '- [ ] '} + + + ))} + + ); +}; + +export default TaskList; diff --git a/app/containers/markdown/new/UnorderedList.tsx b/app/containers/markdown/new/UnorderedList.tsx new file mode 100644 index 000000000..51c9b2188 --- /dev/null +++ b/app/containers/markdown/new/UnorderedList.tsx @@ -0,0 +1,28 @@ +import React from 'react'; +import { UnorderedList as UnorderedListProps } from '@rocket.chat/message-parser'; +import { View, Text } from 'react-native'; + +import Inline from './Inline'; +import styles from '../styles'; +import { themes } from '../../../constants/colors'; +import { useTheme } from '../../../theme'; + +interface IUnorderedListProps { + value: UnorderedListProps['value']; +} + +const UnorderedList = ({ value }: IUnorderedListProps): JSX.Element => { + const { theme } = useTheme(); + return ( + + {value.map(item => ( + + - + + + ))} + + ); +}; + +export default UnorderedList; diff --git a/app/containers/markdown/new/index.tsx b/app/containers/markdown/new/index.tsx new file mode 100644 index 000000000..a56b66f54 --- /dev/null +++ b/app/containers/markdown/new/index.tsx @@ -0,0 +1,77 @@ +import React from 'react'; +import { MarkdownAST } from '@rocket.chat/message-parser'; + +import Quote from './Quote'; +import Paragraph from './Paragraph'; +import Heading from './Heading'; +import Code from './Code'; +import BigEmoji from './BigEmoji'; +import OrderedList from './OrderedList'; +import UnorderedList from './UnorderedList'; +import { UserMention } from '../../message/interfaces'; +import TaskList from './TaskList'; +import MarkdownContext from './MarkdownContext'; + +interface IBodyProps { + tokens: MarkdownAST; + mentions: UserMention[]; + channels: { + name: string; + _id: number; + }[]; + getCustomEmoji?: Function; + onLinkPress?: Function; + navToRoomInfo: Function; + useRealName: boolean; + username: string; + baseUrl: string; +} + +const Body = ({ + tokens, + mentions, + channels, + useRealName, + username, + navToRoomInfo, + getCustomEmoji, + baseUrl, + onLinkPress +}: IBodyProps): JSX.Element => ( + + {tokens.map(block => { + switch (block.type) { + case 'BIG_EMOJI': + return ; + case 'UNORDERED_LIST': + return ; + case 'ORDERED_LIST': + return ; + case 'TASKS': + return ; + case 'QUOTE': + return ; + case 'PARAGRAPH': + return ; + case 'CODE': + return ; + case 'HEADING': + return ; + default: + return null; + } + })} + +); + +export default Body; diff --git a/app/containers/markdown/styles.ts b/app/containers/markdown/styles.ts index d7eef0502..7a9cdebb5 100644 --- a/app/containers/markdown/styles.ts +++ b/app/containers/markdown/styles.ts @@ -30,6 +30,10 @@ export default StyleSheet.create({ del: { textDecorationLine: 'line-through' }, + plainText: { + fontSize: 16, + flexShrink: 1 + }, text: { fontSize: 16, ...sharedStyles.textRegular @@ -70,12 +74,16 @@ export default StyleSheet.create({ resizeMode: 'contain' }, codeInline: { + fontSize: 16, ...sharedStyles.textRegular, ...codeFontFamily, borderWidth: 1, - borderRadius: 4 + borderRadius: 4, + paddingLeft: 2, + paddingTop: 2 }, codeBlock: { + fontSize: 16, ...sharedStyles.textRegular, ...codeFontFamily, borderWidth: 1, diff --git a/app/containers/message/Content.tsx b/app/containers/message/Content.tsx index ee3b8c931..b9aaf9620 100644 --- a/app/containers/message/Content.tsx +++ b/app/containers/message/Content.tsx @@ -51,8 +51,10 @@ const Content = React.memo( // @ts-ignore { unread, blocks, autoTranslate: autoTranslateMessage, - replies + replies, + md } = item; let message = msg; @@ -391,6 +392,7 @@ class MessageContainer extends React.Component { ; + export interface IMessageContent { isTemp: boolean; isInfo: boolean; tmid: string; isThreadRoom: boolean; msg: string; + md: MarkdownAST; theme: string; isEdited: boolean; isEncrypted: boolean; @@ -62,7 +73,7 @@ export interface IMessageContent { name: string; _id: number; }[]; - mentions: object[]; + mentions: UserMention[]; navToRoomInfo: Function; useRealName: boolean; isIgnored: boolean; diff --git a/app/containers/message/styles.ts b/app/containers/message/styles.ts index 3d4334f7c..49aa273eb 100644 --- a/app/containers/message/styles.ts +++ b/app/containers/message/styles.ts @@ -106,7 +106,6 @@ export default StyleSheet.create({ }, image: { width: '100%', - // maxWidth: 400, minHeight: isTablet ? 300 : 200, borderRadius: 4, borderWidth: 1, diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json index 0c8c517aa..0d75c4e39 100644 --- a/app/i18n/locales/en.json +++ b/app/i18n/locales/en.json @@ -1,793 +1,787 @@ { - "1_person_reacted": "1 person reacted", - "1_user": "1 user", - "error-action-not-allowed": "{{action}} is not allowed", - "error-application-not-found": "Application not found", - "error-archived-duplicate-name": "There's an archived channel with name {{room_name}}", - "error-avatar-invalid-url": "Invalid avatar URL: {{url}}", - "error-avatar-url-handling": "Error while handling avatar setting from a URL ({{url}}) for {{username}}", - "error-cant-invite-for-direct-room": "Can't invite user to direct rooms", - "error-could-not-change-email": "Could not change email", - "error-could-not-change-name": "Could not change name", - "error-could-not-change-username": "Could not change username", - "error-could-not-change-status": "Could not change status", - "error-delete-protected-role": "Cannot delete a protected role", - "error-department-not-found": "Department not found", - "error-direct-message-file-upload-not-allowed": "File sharing not allowed in direct messages", - "error-duplicate-channel-name": "A channel with name {{room_name}} exists", - "error-email-domain-blacklisted": "The email domain is blacklisted", - "error-email-send-failed": "Error trying to send email: {{message}}", - "error-save-image": "Error while saving image", - "error-save-video": "Error while saving video", - "error-field-unavailable": "{{field}} is already in use :(", - "error-file-too-large": "File is too large", - "error-importer-not-defined": "The importer was not defined correctly, it is missing the Import class.", - "error-input-is-not-a-valid-field": "{{input}} is not a valid {{field}}", - "error-invalid-actionlink": "Invalid action link", - "error-invalid-arguments": "Invalid arguments", - "error-invalid-asset": "Invalid asset", - "error-invalid-channel": "Invalid channel.", - "error-invalid-channel-start-with-chars": "Invalid channel. Start with @ or #", - "error-invalid-custom-field": "Invalid custom field", - "error-invalid-custom-field-name": "Invalid custom field name. Use only letters, numbers, hyphens and underscores.", - "error-invalid-date": "Invalid date provided.", - "error-invalid-description": "Invalid description", - "error-invalid-domain": "Invalid domain", - "error-invalid-email": "Invalid email {{email}}", - "error-invalid-email-address": "Invalid email address", - "error-invalid-file-height": "Invalid file height", - "error-invalid-file-type": "Invalid file type", - "error-invalid-file-width": "Invalid file width", - "error-invalid-from-address": "You informed an invalid FROM address.", - "error-invalid-integration": "Invalid integration", - "error-invalid-message": "Invalid message", - "error-invalid-method": "Invalid method", - "error-invalid-name": "Invalid name", - "error-invalid-password": "Invalid password", - "error-invalid-redirectUri": "Invalid redirectUri", - "error-invalid-role": "Invalid role", - "error-invalid-room": "Invalid room", - "error-invalid-room-name": "{{room_name}} is not a valid room name", - "error-invalid-room-type": "{{type}} is not a valid room type.", - "error-invalid-settings": "Invalid settings provided", - "error-invalid-subscription": "Invalid subscription", - "error-invalid-token": "Invalid token", - "error-invalid-triggerWords": "Invalid triggerWords", - "error-invalid-urls": "Invalid URLs", - "error-invalid-user": "Invalid user", - "error-invalid-username": "Invalid username", - "error-invalid-webhook-response": "The webhook URL responded with a status other than 200", - "error-message-deleting-blocked": "Message deleting is blocked", - "error-message-editing-blocked": "Message editing is blocked", - "error-message-size-exceeded": "Message size exceeds Message_MaxAllowedSize", - "error-missing-unsubscribe-link": "You must provide the [unsubscribe] link.", - "error-no-owner-channel": "You don't own the channel", - "error-no-tokens-for-this-user": "There are no tokens for this user", - "error-not-allowed": "Not allowed", - "error-not-authorized": "Not authorized", - "error-push-disabled": "Push is disabled", - "error-remove-last-owner": "This is the last owner. Please set a new owner before removing this one.", - "error-role-in-use": "Cannot delete role because it's in use", - "error-role-name-required": "Role name is required", - "error-the-field-is-required": "The field {{field}} is required.", - "error-too-many-requests": "Error, too many requests. Please slow down. You must wait {{seconds}} seconds before trying again.", - "error-user-is-not-activated": "User is not activated", - "error-user-has-no-roles": "User has no roles", - "error-user-limit-exceeded": "The number of users you are trying to invite to #channel_name exceeds the limit set by the administrator", - "error-user-not-in-room": "User is not in this room", - "error-user-registration-custom-field": "error-user-registration-custom-field", - "error-user-registration-disabled": "User registration is disabled", - "error-user-registration-secret": "User registration is only allowed via Secret URL", - "error-you-are-last-owner": "You are the last owner. Please set new owner before leaving the room.", - "error-status-not-allowed": "Invisible status is disabled", - "Actions": "Actions", - "activity": "activity", - "Activity": "Activity", - "Add_Reaction": "Add Reaction", - "Add_Server": "Add Server", - "Add_users": "Add users", - "Admin_Panel": "Admin Panel", - "Agent": "Agent", - "Alert": "Alert", - "alert": "alert", - "alerts": "alerts", - "All_users_in_the_channel_can_write_new_messages": "All users in the channel can write new messages", - "All_users_in_the_team_can_write_new_messages": "All users in the team can write new messages", - "A_meaningful_name_for_the_discussion_room": "A meaningful name for the discussion room", - "All": "All", - "All_Messages": "All Messages", - "Allow_Reactions": "Allow Reactions", - "Alphabetical": "Alphabetical", - "and_more": "and more", - "and": "and", - "announcement": "announcement", - "Announcement": "Announcement", - "Apply_Your_Certificate": "Apply Your Certificate", - "ARCHIVE": "ARCHIVE", - "archive": "archive", - "are_typing": "are typing", - "Are_you_sure_question_mark": "Are you sure?", - "Are_you_sure_you_want_to_leave_the_room": "Are you sure you want to leave the room {{room}}?", - "Audio": "Audio", - "Authenticating": "Authenticating", - "Automatic": "Automatic", - "Auto_Translate": "Auto-Translate", - "Avatar_changed_successfully": "Avatar changed successfully!", - "Avatar_Url": "Avatar URL", - "Away": "Away", - "Back": "Back", - "Black": "Black", - "Block_user": "Block user", - "Browser": "Browser", - "Broadcast_channel_Description": "Only authorized users can write new messages, but the other users will be able to reply", - "Broadcast_Channel": "Broadcast Channel", - "Busy": "Busy", - "By_proceeding_you_are_agreeing": "By proceeding you are agreeing to our", - "Cancel_editing": "Cancel editing", - "Cancel_recording": "Cancel recording", - "Cancel": "Cancel", - "changing_avatar": "changing avatar", - "creating_channel": "creating channel", - "creating_invite": "creating invite", - "Channel_Name": "Channel Name", - "Channels": "Channels", - "Chats": "Chats", - "Call_already_ended": "Call already ended!", - "Clear_cookies_alert": "Do you want to clear all cookies?", - "Clear_cookies_desc": "This action will clear all login cookies, allowing you to login into other accounts.", - "Clear_cookies_yes": "Yes, clear cookies", - "Clear_cookies_no": "No, keep cookies", - "Click_to_join": "Click to Join!", - "Close": "Close", - "Close_emoji_selector": "Close emoji selector", - "Closing_chat": "Closing chat", - "Change_language_loading": "Changing language.", - "Chat_closed_by_agent": "Chat closed by agent", - "Choose": "Choose", - "Choose_from_library": "Choose from library", - "Choose_file": "Choose file", - "Choose_where_you_want_links_be_opened": "Choose where you want links be opened", - "Code": "Code", - "Code_or_password_invalid": "Code or password invalid", - "Collaborative": "Collaborative", - "Confirm": "Confirm", - "Connect": "Connect", - "Connected": "Connected", - "connecting_server": "connecting to server", - "Connecting": "Connecting...", - "Contact_us": "Contact us", - "Contact_your_server_admin": "Contact your server admin.", - "Continue_with": "Continue with", - "Copied_to_clipboard": "Copied to clipboard!", - "Copy": "Copy", - "Conversation": "Conversation", - "Permalink": "Permalink", - "Certificate_password": "Certificate Password", - "Clear_cache": "Clear local server cache", - "Clear_cache_loading": "Clearing cache.", - "Whats_the_password_for_your_certificate": "What's the password for your certificate?", - "Create_account": "Create an account", - "Create_Channel": "Create Channel", - "Create_Direct_Messages": "Create Direct Messages", - "Create_Discussion": "Create Discussion", - "Created_snippet": "created a snippet", - "Create_a_new_workspace": "Create a new workspace", - "Create": "Create", - "Custom_Status": "Custom Status", - "Dark": "Dark", - "Dark_level": "Dark Level", - "Default": "Default", - "Default_browser": "Default browser", - "Delete_Room_Warning": "Deleting a room will delete all messages posted within the room. This cannot be undone.", - "Department": "Department", - "delete": "delete", - "Delete": "Delete", - "DELETE": "DELETE", - "move": "move", - "deleting_room": "deleting room", - "description": "description", - "Description": "Description", - "Desktop_Options": "Desktop Options", - "Desktop_Notifications": "Desktop Notifications", - "Desktop_Alert_info": "These notifications are delivered in desktop", - "Directory": "Directory", - "Direct_Messages": "Direct Messages", - "Disable_notifications": "Disable notifications", - "Discussions": "Discussions", - "Discussion_Desc": "Help keeping an overview about what's going on! By creating a discussion, a sub-channel of the one you selected is created and both are linked.", - "Discussion_name": "Discussion name", - "Done": "Done", - "Dont_Have_An_Account": "Don't you have an account?", - "Do_you_have_an_account": "Do you have an account?", - "Do_you_have_a_certificate": "Do you have a certificate?", - "Do_you_really_want_to_key_this_room_question_mark": "Do you really want to {{key}} this room?", - "E2E_Encryption": "E2E Encryption", - "E2E_How_It_Works_info1": "You can now create encrypted private groups and direct messages. You may also change existing private groups or DMs to encrypted.", - "E2E_How_It_Works_info2": "This is *end to end encryption* so the key to encode/decode your messages and they will not be saved on the server. For that reason *you need to store this password somewhere safe* which you can access later if you may need.", - "E2E_How_It_Works_info3": "If you proceed, it will be auto generated an E2E password.", - "E2E_How_It_Works_info4": "You can also setup a new password for your encryption key any time from any browser you have entered the existing E2E password.", - "edit": "edit", - "edited": "edited", - "Edit": "Edit", - "Edit_Status": "Edit Status", - "Edit_Invite": "Edit Invite", - "End_to_end_encrypted_room": "End to end encrypted room", - "end_to_end_encryption": "end to end encryption", - "Email_Notification_Mode_All": "Every Mention/DM", - "Email_Notification_Mode_Disabled": "Disabled", - "Email_or_password_field_is_empty": "Email or password field is empty", - "Email": "E-mail", - "email": "e-mail", - "Empty_title": "Empty title", - "Enable_Auto_Translate": "Enable Auto-Translate", - "Enable_notifications": "Enable notifications", - "Encrypted": "Encrypted", - "Encrypted_message": "Encrypted message", - "Enter_Your_E2E_Password": "Enter Your E2E Password", - "Enter_Your_Encryption_Password_desc1": "This will allow you to access your encrypted private groups and direct messages.", - "Enter_Your_Encryption_Password_desc2": "You need to enter the password to encode/decode messages every place you use the chat.", - "Encryption_error_title": "Your encryption password seems wrong", - "Encryption_error_desc": "It wasn't possible to decode your encryption key to be imported.", - "Everyone_can_access_this_channel": "Everyone can access this channel", - "Everyone_can_access_this_team": "Everyone can access this team", - "Error_uploading": "Error uploading", - "Expiration_Days": "Expiration (Days)", - "Favorite": "Favorite", - "Favorites": "Favorites", - "Files": "Files", - "File_description": "File description", - "File_name": "File name", - "Finish_recording": "Finish recording", - "Following_thread": "Following thread", - "For_your_security_you_must_enter_your_current_password_to_continue": "For your security, you must enter your current password to continue", - "Forgot_password_If_this_email_is_registered": "If this email is registered, we'll send instructions on how to reset your password. If you do not receive an email shortly, please come back and try again.", - "Forgot_password": "Forgot your password?", - "Forgot_Password": "Forgot Password", - "Forward": "Forward", - "Forward_Chat": "Forward Chat", - "Forward_to_department": "Forward to department", - "Forward_to_user": "Forward to user", - "Full_table": "Click to see full table", - "Generate_New_Link": "Generate New Link", - "Group_by_favorites": "Group favorites", - "Group_by_type": "Group by type", - "Hide": "Hide", - "Has_joined_the_channel": "has joined the channel", - "Has_joined_the_conversation": "has joined the conversation", - "Has_left_the_channel": "has left the channel", - "Hide_System_Messages": "Hide System Messages", - "Hide_type_messages": "Hide \"{{type}}\" messages", - "How_It_Works": "How It Works", - "Message_HideType_uj": "User Join", - "Message_HideType_ul": "User Leave", - "Message_HideType_ru": "User Removed", - "Message_HideType_au": "User Added", - "Message_HideType_mute_unmute": "User Muted / Unmuted", - "Message_HideType_r": "Room Name Changed", - "Message_HideType_ut": "User Joined Conversation", - "Message_HideType_wm": "Welcome", - "Message_HideType_rm": "Message Removed", - "Message_HideType_subscription_role_added": "Was Set Role", - "Message_HideType_subscription_role_removed": "Role No Longer Defined", - "Message_HideType_room_archived": "Room Archived", - "Message_HideType_room_unarchived": "Room Unarchived", - "I_Saved_My_E2E_Password": "I Saved My E2E Password", - "IP": "IP", - "In_app": "In-app", - "In_App_And_Desktop": "In-app and Desktop", - "In_App_and_Desktop_Alert_info": "Displays a banner at the top of the screen when app is open, and displays a notification on desktop", - "Invisible": "Invisible", - "Invite": "Invite", - "is_a_valid_RocketChat_instance": "is a valid Rocket.Chat instance", - "is_not_a_valid_RocketChat_instance": "is not a valid Rocket.Chat instance", - "is_typing": "is typing", - "Invalid_or_expired_invite_token": "Invalid or expired invite token", - "Invalid_server_version": "The server you're trying to connect is using a version that's not supported by the app anymore: {{currentVersion}}.\n\nWe require version {{minVersion}}", - "Invite_Link": "Invite Link", - "Invite_users": "Invite users", - "Join": "Join", - "Join_Code": "Join Code", - "Insert_Join_Code": "Insert Join Code", - "Join_our_open_workspace": "Join our open workspace", - "Join_your_workspace": "Join your workspace", - "Just_invited_people_can_access_this_channel": "Just invited people can access this channel", - "Just_invited_people_can_access_this_team": "Just invited people can access this team", - "Language": "Language", - "last_message": "last message", - "Leave_channel": "Leave channel", - "leaving_room": "leaving room", - "Leave": "Leave", - "leave": "leave", - "Legal": "Legal", - "Light": "Light", - "License": "License", - "Livechat": "Livechat", - "Livechat_edit": "Livechat edit", - "Login": "Login", - "Login_error": "Your credentials were rejected! Please try again.", - "Login_with": "Login with", - "Logging_out": "Logging out.", - "Logout": "Logout", - "Max_number_of_uses": "Max number of uses", - "Max_number_of_users_allowed_is_number": "Max number of users allowed is {{maxUsers}}", - "members": "members", - "Members": "Members", - "Mentioned_Messages": "Mentioned Messages", - "mentioned": "mentioned", - "Mentions": "Mentions", - "Message_accessibility": "Message from {{user}} at {{time}}: {{message}}", - "Message_actions": "Message actions", - "Message_pinned": "Message pinned", - "Message_removed": "Message removed", - "Message_starred": "Message starred", - "Message_unstarred": "Message unstarred", - "message": "message", - "messages": "messages", - "Message": "Message", - "Messages": "Messages", - "Message_Reported": "Message reported", - "Microphone_Permission_Message": "Rocket.Chat needs access to your microphone so you can send audio message.", - "Microphone_Permission": "Microphone Permission", - "Mute": "Mute", - "muted": "muted", - "My_servers": "My servers", - "N_people_reacted": "{{n}} people reacted", - "N_users": "{{n}} users", - "N_channels": "{{n}} channels", - "name": "name", - "Name": "Name", - "Navigation_history": "Navigation history", - "Never": "Never", - "New_Message": "New Message", - "New_Password": "New Password", - "New_Server": "New Server", - "Next": "Next", - "No_files": "No files", - "No_limit": "No limit", - "No_mentioned_messages": "No mentioned messages", - "No_pinned_messages": "No pinned messages", - "No_results_found": "No results found", - "No_starred_messages": "No starred messages", - "No_thread_messages": "No thread messages", - "No_label_provided": "No {{label}} provided.", - "No_Message": "No Message", - "No_messages_yet": "No messages yet", - "No_Reactions": "No Reactions", - "No_Read_Receipts": "No Read Receipts", - "Not_logged": "Not logged", - "Not_RC_Server": "This is not a Rocket.Chat server.\n{{contact}}", - "Nothing": "Nothing", - "Nothing_to_save": "Nothing to save!", - "Notify_active_in_this_room": "Notify active users in this room", - "Notify_all_in_this_room": "Notify all in this room", - "Notifications": "Notifications", - "Notification_Duration": "Notification Duration", - "Notification_Preferences": "Notification Preferences", - "No_available_agents_to_transfer": "No available agents to transfer", - "Offline": "Offline", - "Oops": "Oops!", - "Omnichannel": "Omnichannel", - "Open_Livechats": "Chats in Progress", - "Omnichannel_enable_alert": "You're not available on Omnichannel. Would you like to be available?", - "Onboarding_description": "A workspace is your team or organization’s space to collaborate. Ask the workspace admin for address to join or create one for your team.", - "Onboarding_join_workspace": "Join a workspace", - "Onboarding_subtitle": "Beyond Team Collaboration", - "Onboarding_title": "Welcome to Rocket.Chat", - "Onboarding_join_open_description": "Join our open workspace to chat with the Rocket.Chat team and community.", - "Onboarding_agree_terms": "By continuing, you agree to Rocket.Chat", - "Onboarding_less_options": "Less options", - "Onboarding_more_options": "More options", - "Online": "Online", - "Only_authorized_users_can_write_new_messages": "Only authorized users can write new messages", - "Open_emoji_selector": "Open emoji selector", - "Open_Source_Communication": "Open Source Communication", - "Open_your_authentication_app_and_enter_the_code": "Open your authentication app and enter the code.", - "OR": "OR", - "OS": "OS", - "Overwrites_the_server_configuration_and_use_room_config": "Overwrites the server configuration and use room config", - "Password": "Password", - "Parent_channel_or_group": "Parent channel or group", - "Permalink_copied_to_clipboard": "Permalink copied to clipboard!", - "Phone": "Phone", - "Pin": "Pin", - "Pinned_Messages": "Pinned Messages", - "pinned": "pinned", - "Pinned": "Pinned", - "Please_add_a_comment": "Please add a comment", - "Please_enter_your_password": "Please enter your password", - "Please_wait": "Please wait.", - "Preferences": "Preferences", - "Preferences_saved": "Preferences saved!", - "Privacy_Policy": " Privacy Policy", - "Private_Channel": "Private Channel", - "Private": "Private", - "Processing": "Processing...", - "Profile_saved_successfully": "Profile saved successfully!", - "Profile": "Profile", - "Public_Channel": "Public Channel", - "Public": "Public", - "Push_Notifications": "Push Notifications", - "Push_Notifications_Alert_Info": "These notifications are delivered to you when the app is not open", - "Quote": "Quote", - "Reactions_are_disabled": "Reactions are disabled", - "Reactions_are_enabled": "Reactions are enabled", - "Reactions": "Reactions", - "Read": "Read", - "Read_External_Permission_Message": "Rocket.Chat needs to access photos, media, and files on your device", - "Read_External_Permission": "Read Media Permission", - "Read_Only_Channel": "Read Only Channel", - "Read_Only": "Read Only", - "Read_Receipt": "Read Receipt", - "Receive_Group_Mentions": "Receive Group Mentions", - "Receive_Group_Mentions_Info": "Receive @all and @here mentions", - "Register": "Register", - "Repeat_Password": "Repeat Password", - "Replied_on": "Replied on:", - "replies": "replies", - "reply": "reply", - "Reply": "Reply", - "Report": "Report", - "Receive_Notification": "Receive Notification", - "Receive_notifications_from": "Receive notifications from {{name}}", - "Resend": "Resend", - "Reset_password": "Reset password", - "resetting_password": "resetting password", - "RESET": "RESET", - "Return": "Return", - "Review_app_title": "Are you enjoying this app?", - "Review_app_desc": "Give us 5 stars on {{store}}", - "Review_app_yes": "Sure!", - "Review_app_no": "No", - "Review_app_later": "Maybe later", - "Review_app_unable_store": "Unable to open {{store}}", - "Review_this_app": "Review this app", - "Remove": "Remove", - "remove": "remove", - "Roles": "Roles", - "Room_actions": "Room actions", - "Room_changed_announcement": "Room announcement changed to: {{announcement}} by {{userBy}}", - "Room_changed_avatar": "Room avatar changed by {{userBy}}", - "Room_changed_description": "Room description changed to: {{description}} by {{userBy}}", - "Room_changed_privacy": "Room type changed to: {{type}} by {{userBy}}", - "Room_changed_topic": "Room topic changed to: {{topic}} by {{userBy}}", - "Room_Files": "Room Files", - "Room_Info_Edit": "Room Info Edit", - "Room_Info": "Room Info", - "Room_Members": "Room Members", - "Room_name_changed": "Room name changed to: {{name}} by {{userBy}}", - "SAVE": "SAVE", - "Save_Changes": "Save Changes", - "Save": "Save", - "Saved": "Saved", - "saving_preferences": "saving preferences", - "saving_profile": "saving profile", - "saving_settings": "saving settings", - "saved_to_gallery": "Saved to gallery", - "Save_Your_E2E_Password": "Save Your E2E Password", - "Save_Your_Encryption_Password": "Save Your Encryption Password", - "Save_Your_Encryption_Password_warning": "This password is not stored anywhere so save it carefully somewhere else.", - "Save_Your_Encryption_Password_info": "Notice that you lose your password, there is no way to recover it and you will lose access to your messages.", - "Search_Messages": "Search Messages", - "Search": "Search", - "Search_by": "Search by", - "Search_global_users": "Search for global users", - "Search_global_users_description": "If you turn-on, you can search for any user from others companies or servers.", - "Seconds": "{{second}} seconds", - "Security_and_privacy": "Security and privacy", - "Select_Avatar": "Select Avatar", - "Select_Server": "Select Server", - "Select_Users": "Select Users", - "Select_a_Channel": "Select a Channel", - "Select_a_Department": "Select a Department", - "Select_an_option": "Select an option", - "Select_a_User": "Select a User", - "Send": "Send", - "Send_audio_message": "Send audio message", - "Send_crash_report": "Send crash report", - "Send_message": "Send message", - "Send_me_the_code_again": "Send me the code again", - "Send_to": "Send to...", - "Sending_to": "Sending to", - "Sent_an_attachment": "Sent an attachment", - "Server": "Server", - "Servers": "Servers", - "Server_version": "Server version: {{version}}", - "Set_username_subtitle": "The username is used to allow others to mention you in messages", - "Set_custom_status": "Set custom status", - "Set_status": "Set status", - "Status_saved_successfully": "Status saved successfully!", - "Settings": "Settings", - "Settings_succesfully_changed": "Settings succesfully changed!", - "Share": "Share", - "Share_Link": "Share Link", - "Share_this_app": "Share this app", - "Show_more": "Show more..", - "Show_Unread_Counter": "Show Unread Counter", - "Show_Unread_Counter_Info": "Unread counter is displayed as a badge on the right of the channel, in the list", - "Sign_in_your_server": "Sign in your server", - "Sign_Up": "Sign Up", - "Some_field_is_invalid_or_empty": "Some field is invalid or empty", - "Sorting_by": "Sorting by {{key}}", - "Sound": "Sound", - "Star_room": "Star room", - "Star": "Star", - "Starred_Messages": "Starred Messages", - "starred": "starred", - "Starred": "Starred", - "Start_of_conversation": "Start of conversation", - "Start_a_Discussion": "Start a Discussion", - "Started_discussion": "Started a discussion:", - "Started_call": "Call started by {{userBy}}", - "Submit": "Submit", - "Table": "Table", - "Tags": "Tags", - "Take_a_photo": "Take a photo", - "Take_a_video": "Take a video", - "Take_it": "Take it!", - "tap_to_change_status": "tap to change status", - "Tap_to_view_servers_list": "Tap to view servers list", - "Terms_of_Service": " Terms of Service ", - "Theme": "Theme", - "The_user_wont_be_able_to_type_in_roomName": "The user won't be able to type in {{roomName}}", - "The_user_will_be_able_to_type_in_roomName": "The user will be able to type in {{roomName}}", - "There_was_an_error_while_action": "There was an error while {{action}}!", - "This_room_is_blocked": "This room is blocked", - "This_room_is_read_only": "This room is read only", - "Thread": "Thread", - "Threads": "Threads", - "Timezone": "Timezone", - "To": "To", - "topic": "topic", - "Topic": "Topic", - "Translate": "Translate", - "Try_again": "Try again", - "Two_Factor_Authentication": "Two-factor Authentication", - "Type_the_channel_name_here": "Type the channel name here", - "unarchive": "unarchive", - "UNARCHIVE": "UNARCHIVE", - "Unblock_user": "Unblock user", - "Unfavorite": "Unfavorite", - "Unfollowed_thread": "Unfollowed thread", - "Unmute": "Unmute", - "unmuted": "unmuted", - "Unpin": "Unpin", - "unread_messages": "unread", - "Unread": "Unread", - "Unread_on_top": "Unread on top", - "Unstar": "Unstar", - "Updating": "Updating...", - "Uploading": "Uploading", - "Upload_file_question_mark": "Upload file?", - "User": "User", - "Users": "Users", - "User_added_by": "User {{userAdded}} added by {{userBy}}", - "User_Info": "User Info", - "User_has_been_key": "User has been {{key}}", - "User_is_no_longer_role_by_": "{{user}} is no longer {{role}} by {{userBy}}", - "User_muted_by": "User {{userMuted}} muted by {{userBy}}", - "User_removed_by": "User {{userRemoved}} removed by {{userBy}}", - "User_sent_an_attachment": "{{user}} sent an attachment", - "User_unmuted_by": "User {{userUnmuted}} unmuted by {{userBy}}", - "User_was_set_role_by_": "{{user}} was set {{role}} by {{userBy}}", - "Username_is_empty": "Username is empty", - "Username": "Username", - "Username_or_email": "Username or email", - "Uses_server_configuration": "Uses server configuration", - "Validating": "Validating", - "Registration_Succeeded": "Registration Succeeded!", - "Verify": "Verify", - "Verify_email_title": "Registration Succeeded!", - "Verify_email_desc": "We have sent you an email to confirm your registration. If you do not receive an email shortly, please come back and try again.", - "Verify_your_email_for_the_code_we_sent": "Verify your email for the code we sent", - "Video_call": "Video call", - "View_Original": "View Original", - "Voice_call": "Voice call", - "Waiting_for_network": "Waiting for network...", - "Websocket_disabled": "Websocket is disabled for this server.\n{{contact}}", - "Welcome": "Welcome", - "What_are_you_doing_right_now": "What are you doing right now?", - "Whats_your_2fa": "What's your 2FA code?", - "Without_Servers": "Without Servers", - "Workspaces": "Workspaces", - "Would_you_like_to_return_the_inquiry": "Would you like to return the inquiry?", - "Write_External_Permission_Message": "Rocket.Chat needs access to your gallery so you can save images.", - "Write_External_Permission": "Gallery Permission", - "Yes": "Yes", - "Yes_action_it": "Yes, {{action}} it!", - "Yesterday": "Yesterday", - "You_are_in_preview_mode": "You are in preview mode", - "You_are_offline": "You are offline", - "You_can_search_using_RegExp_eg": "You can use RegExp. e.g. `/^text$/i`", - "You_colon": "You: ", - "you_were_mentioned": "you were mentioned", - "You_were_removed_from_channel": "You were removed from {{channel}}", - "you": "you", - "You": "You", - "Logged_out_by_server": "You've been logged out by the server. Please log in again.", - "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "You need to access at least one Rocket.Chat server to share something.", - "You_need_to_verifiy_your_email_address_to_get_notications": "You need to verify your email address to get notifications", - "Your_certificate": "Your Certificate", - "Your_invite_link_will_expire_after__usesLeft__uses": "Your invite link will expire after {{usesLeft}} uses.", - "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_expire_on__date__": "Your invite link will expire on {{date}}.", - "Your_invite_link_will_never_expire": "Your invite link will never expire.", - "Your_workspace": "Your workspace", - "Your_password_is": "Your password is", - "Version_no": "Version: {{version}}", - "You_will_not_be_able_to_recover_this_message": "You will not be able to recover this message!", - "You_will_unset_a_certificate_for_this_server": "You will unset a certificate for this server", - "Change_Language": "Change Language", - "Crash_report_disclaimer": "We never track the content of your chats. The crash report and analytics events only contains relevant information for us in order to identify and fix issues.", - "Type_message": "Type message", - "Room_search": "Rooms search", - "Room_selection": "Room selection 1...9", - "Next_room": "Next room", - "Previous_room": "Previous room", - "New_room": "New room", - "Upload_room": "Upload to room", - "Search_messages": "Search messages", - "Scroll_messages": "Scroll messages", - "Reply_latest": "Reply to latest", - "Reply_in_Thread": "Reply in Thread", - "Server_selection": "Server selection", - "Server_selection_numbers": "Server selection 1...9", - "Add_server": "Add server", - "New_line": "New line", - "You_will_be_logged_out_of_this_application": "You will be logged out of this application.", - "Clear": "Clear", - "This_will_clear_all_your_offline_data": "This will clear all your offline data.", - "This_will_remove_all_data_from_this_server": "This will remove all data from this server.", - "Mark_unread": "Mark Unread", - "Wait_activation_warning": "Before you can login, your account must be manually activated by an administrator.", - "Screen_lock": "Screen lock", - "Local_authentication_biometry_title": "Authenticate", - "Local_authentication_biometry_fallback": "Use passcode", - "Local_authentication_unlock_option": "Unlock with Passcode", - "Local_authentication_change_passcode": "Change Passcode", - "Local_authentication_info": "Note: if you forget the Passcode, you'll need to delete and reinstall the app.", - "Local_authentication_facial_recognition": "facial recognition", - "Local_authentication_fingerprint": "fingerprint", - "Local_authentication_unlock_with_label": "Unlock with {{label}}", - "Local_authentication_auto_lock_60": "After 1 minute", - "Local_authentication_auto_lock_300": "After 5 minutes", - "Local_authentication_auto_lock_900": "After 15 minutes", - "Local_authentication_auto_lock_1800": "After 30 minutes", - "Local_authentication_auto_lock_3600": "After 1 hour", - "Passcode_enter_title": "Enter your passcode", - "Passcode_choose_title": "Choose your new passcode", - "Passcode_choose_confirm_title": "Confirm your new passcode", - "Passcode_choose_error": "Passcodes don't match. Try again.", - "Passcode_choose_force_set": "Passcode required by admin", - "Passcode_app_locked_title": "App locked", - "Passcode_app_locked_subtitle": "Try again in {{timeLeft}} seconds", - "After_seconds_set_by_admin": "After {{seconds}} seconds (set by admin)", - "Dont_activate": "Don't activate now", - "Queued_chats": "Queued chats", - "Queue_is_empty": "Queue is empty", - "Logout_from_other_logged_in_locations": "Logout from other logged in locations", - "You_will_be_logged_out_from_other_locations": "You'll be logged out from other locations.", - "Logged_out_of_other_clients_successfully": "Logged out of other clients successfully", - "Logout_failed": "Logout failed!", - "Log_analytics_events": "Log analytics events", - "E2E_encryption_change_password_title": "Change Encryption Password", - "E2E_encryption_change_password_description": "You can now create encrypted private groups and direct messages. You may also change existing private groups or DMs to encrypted. \nThis is end to end encryption so the key to encode/decode your messages will not be saved on the server. For that reason you need to store your password somewhere safe. You will be required to enter it on other devices you wish to use e2e encryption on.", - "E2E_encryption_change_password_error": "Error while changing E2E key password!", - "E2E_encryption_change_password_success": "E2E key password changed successfully!", - "E2E_encryption_change_password_message": "Make sure you've saved it carefully somewhere else.", - "E2E_encryption_change_password_confirmation": "Yes, change it", - "E2E_encryption_reset_title": "Reset E2E Key", - "E2E_encryption_reset_description": "This option will remove your current E2E key and log you out. \nWhen you login again, Rocket.Chat will generate you a new key and restore your access to any encrypted room that has one or more members online. \nDue to the nature of the E2E encryption, Rocket.Chat will not be able to restore access to any encrypted room that has no member online.", - "E2E_encryption_reset_button": "Reset E2E Key", - "E2E_encryption_reset_error": "Error while resetting E2E key!", - "E2E_encryption_reset_message": "You're going to be logged out.", - "E2E_encryption_reset_confirmation": "Yes, reset it", - "Following": "Following", - "Threads_displaying_all": "Displaying All", - "Threads_displaying_following": "Displaying Following", - "Threads_displaying_unread": "Displaying Unread", - "No_threads": "There are no threads", - "No_threads_following": "You are not following any threads", - "No_threads_unread": "There are no unread threads", - "No_discussions": "There are no discussions", - "Messagebox_Send_to_channel": "Send to channel", - "Leader": "Leader", - "Moderator": "Moderator", - "Owner": "Owner", - "Remove_from_room": "Remove from room", - "Ignore": "Ignore", - "Unignore": "Unignore", - "User_has_been_ignored": "User has been ignored", - "User_has_been_unignored": "User is no longer ignored", - "User_has_been_removed_from_s": "User has been removed from {{s}}", - "User__username__is_now_a_leader_of__room_name_": "User {{username}} is now a leader of {{room_name}}", - "User__username__is_now_a_moderator_of__room_name_": "User {{username}} is now a moderator of {{room_name}}", - "User__username__is_now_a_owner_of__room_name_": "User {{username}} is now a owner of {{room_name}}", - "User__username__removed_from__room_name__leaders": "User {{username}} removed from {{room_name}} leaders", - "User__username__removed_from__room_name__moderators": "User {{username}} removed from {{room_name}} moderators", - "User__username__removed_from__room_name__owners": "User {{username}} removed from {{room_name}} owners", - "The_user_will_be_removed_from_s": "The user will be removed from {{s}}", - "Yes_remove_user": "Yes, remove user!", - "Direct_message": "Direct message", - "Message_Ignored": "Message ignored. Tap to display it.", - "Enter_workspace_URL": "Enter workspace URL", - "Workspace_URL_Example": "Ex. your-company.rocket.chat", - "This_room_encryption_has_been_enabled_by__username_": "This room's encryption has been enabled by {{username}}", - "This_room_encryption_has_been_disabled_by__username_": "This room's encryption has been disabled by {{username}}", - "Teams": "Teams", - "No_team_channels_found": "No channels found", - "Team_not_found": "Team not found", - "Create_Team": "Create Team", - "Team_Name": "Team Name", - "Private_Team": "Private Team", - "Read_Only_Team": "Read Only Team", - "Broadcast_Team": "Broadcast Team", - "creating_team": "creating team", - "team-name-already-exists": "A team with that name already exists", - "Add_Channel_to_Team": "Add Channel to Team", - "Left_The_Team_Successfully": "Left the team successfully", - "Create_New": "Create New", - "Add_Existing": "Add Existing", - "Add_Existing_Channel": "Add Existing Channel", - "Remove_from_Team": "Remove from Team", - "Auto-join": "Auto-join", - "Remove_Team_Room_Warning": "Woud you like to remove this channel from the team? The channel will be moved back to the workspace", - "Confirmation": "Confirmation", - "invalid-room": "Invalid room", - "You_are_leaving_the_team": "You are leaving the team '{{team}}'", - "Leave_Team": "Leave Team", - "Select_Team": "Select Team", - "Select_Team_Channels": "Select the Team's channels you would like to leave.", - "Cannot_leave": "Cannot leave", - "Cannot_remove": "Cannot remove", - "Cannot_delete": "Cannot delete", - "Last_owner_team_room": "You are the last owner of this channel. Once you leave the team, the channel will be kept inside the team but you will be managing it from outside.", - "last-owner-can-not-be-removed": "Last owner cannot be removed", - "Remove_User_Teams": "Select channels you want the user to be removed from.", - "Delete_Team": "Delete Team", - "Select_channels_to_delete": "This can't be undone. Once you delete a team, all chat content and configuration will be deleted. \n\nSelect the channels you would like to delete. The ones you decide to keep will be available on your workspace. Notice that public channels will still be public and visible to everyone.", - "You_are_deleting_the_team": "You are deleting this team.", - "Removing_user_from_this_team": "You are removing {{user}} from this team", - "Remove_User_Team_Channels": "Select the channels you want the user to be removed from.", - "Remove_Member": "Remove Member", - "leaving_team": "leaving team", - "removing_team": "removing from team", - "moving_channel_to_team": "moving channel to team", - "deleting_team": "deleting team", - "member-does-not-exist": "Member does not exist", - "Convert": "Convert", - "Convert_to_Team": "Convert to Team", - "Convert_to_Team_Warning": "You are converting this Channel to a Team. All Members will be kept.", - "Move_to_Team": "Move to Team", - "Move_Channel_Paragraph": "Moving a channel inside a team means that this channel will be added in the team’s context, however, all channel’s members, which are not members of the respective team, will still have access to this channel, but will not be added as team’s members. \n\nAll channel’s management will still be made by the owners of this channel.\n\nTeam’s members and even team’s owners, if not a member of this channel, can not have access to the channel’s content. \n\nPlease notice that the Team’s owner will be able remove members from the Channel.", - "Move_to_Team_Warning": "After reading the previous intructions about this behavior, do you still want to move this channel to the selected team?", - "Load_More": "Load More", - "Load_Newer": "Load Newer", - "Load_Older": "Load Older", - "room-name-already-exists": "Room name already exists", - "error-team-creation": "Error team creation", - "unauthorized": "Unauthorized", - "Left_The_Room_Successfully": "Left the room successfully", - "Deleted_The_Team_Successfully": "Team deleted successfully", - "Deleted_The_Room_Successfully": "Room deleted successfully", - "Convert_to_Channel": "Convert to Channel", - "Converting_Team_To_Channel": "Converting Team to Channel", - "Select_Team_Channels_To_Delete": "Select the Team’s Channels you would like to delete, the ones you do not select will be moved to the Workspace. \n\nNotice that public Channels will be public and visible to everyone.", - "You_are_converting_the_team": "You are converting this Team to a Channel", - "Display": "Display", - "Avatars": "Avatars", - "Sort_by": "Sort by", - "Group_by": "Group by", - "Types": "Types", - "Expanded": "Expanded", - "Condensed": "Condensed", - "creating_discussion": "creating discussion", - "Canned_Responses": "Canned Responses", - "No_match_found": "No match found.", - "Check_canned_responses": "Check on canned responses.", - "Searching": "Searching", - "Use": "Use", - "Shortcut": "Shortcut", - "Content": "Content", - "Sharing": "Sharing", - "No_canned_responses": "No canned responses" + "1_person_reacted": "1 person reacted", + "1_user": "1 user", + "error-action-not-allowed": "{{action}} is not allowed", + "error-application-not-found": "Application not found", + "error-archived-duplicate-name": "There's an archived channel with name {{room_name}}", + "error-avatar-invalid-url": "Invalid avatar URL: {{url}}", + "error-avatar-url-handling": "Error while handling avatar setting from a URL ({{url}}) for {{username}}", + "error-cant-invite-for-direct-room": "Can't invite user to direct rooms", + "error-could-not-change-email": "Could not change email", + "error-could-not-change-name": "Could not change name", + "error-could-not-change-username": "Could not change username", + "error-could-not-change-status": "Could not change status", + "error-delete-protected-role": "Cannot delete a protected role", + "error-department-not-found": "Department not found", + "error-direct-message-file-upload-not-allowed": "File sharing not allowed in direct messages", + "error-duplicate-channel-name": "A channel with name {{room_name}} exists", + "error-email-domain-blacklisted": "The email domain is blacklisted", + "error-email-send-failed": "Error trying to send email: {{message}}", + "error-save-image": "Error while saving image", + "error-save-video": "Error while saving video", + "error-field-unavailable": "{{field}} is already in use :(", + "error-file-too-large": "File is too large", + "error-importer-not-defined": "The importer was not defined correctly, it is missing the Import class.", + "error-input-is-not-a-valid-field": "{{input}} is not a valid {{field}}", + "error-invalid-actionlink": "Invalid action link", + "error-invalid-arguments": "Invalid arguments", + "error-invalid-asset": "Invalid asset", + "error-invalid-channel": "Invalid channel.", + "error-invalid-channel-start-with-chars": "Invalid channel. Start with @ or #", + "error-invalid-custom-field": "Invalid custom field", + "error-invalid-custom-field-name": "Invalid custom field name. Use only letters, numbers, hyphens and underscores.", + "error-invalid-date": "Invalid date provided.", + "error-invalid-description": "Invalid description", + "error-invalid-domain": "Invalid domain", + "error-invalid-email": "Invalid email {{email}}", + "error-invalid-email-address": "Invalid email address", + "error-invalid-file-height": "Invalid file height", + "error-invalid-file-type": "Invalid file type", + "error-invalid-file-width": "Invalid file width", + "error-invalid-from-address": "You informed an invalid FROM address.", + "error-invalid-integration": "Invalid integration", + "error-invalid-message": "Invalid message", + "error-invalid-method": "Invalid method", + "error-invalid-name": "Invalid name", + "error-invalid-password": "Invalid password", + "error-invalid-redirectUri": "Invalid redirectUri", + "error-invalid-role": "Invalid role", + "error-invalid-room": "Invalid room", + "error-invalid-room-name": "{{room_name}} is not a valid room name", + "error-invalid-room-type": "{{type}} is not a valid room type.", + "error-invalid-settings": "Invalid settings provided", + "error-invalid-subscription": "Invalid subscription", + "error-invalid-token": "Invalid token", + "error-invalid-triggerWords": "Invalid triggerWords", + "error-invalid-urls": "Invalid URLs", + "error-invalid-user": "Invalid user", + "error-invalid-username": "Invalid username", + "error-invalid-webhook-response": "The webhook URL responded with a status other than 200", + "error-message-deleting-blocked": "Message deleting is blocked", + "error-message-editing-blocked": "Message editing is blocked", + "error-message-size-exceeded": "Message size exceeds Message_MaxAllowedSize", + "error-missing-unsubscribe-link": "You must provide the [unsubscribe] link.", + "error-no-owner-channel": "You don't own the channel", + "error-no-tokens-for-this-user": "There are no tokens for this user", + "error-not-allowed": "Not allowed", + "error-not-authorized": "Not authorized", + "error-push-disabled": "Push is disabled", + "error-remove-last-owner": "This is the last owner. Please set a new owner before removing this one.", + "error-role-in-use": "Cannot delete role because it's in use", + "error-role-name-required": "Role name is required", + "error-the-field-is-required": "The field {{field}} is required.", + "error-too-many-requests": "Error, too many requests. Please slow down. You must wait {{seconds}} seconds before trying again.", + "error-user-is-not-activated": "User is not activated", + "error-user-has-no-roles": "User has no roles", + "error-user-limit-exceeded": "The number of users you are trying to invite to #channel_name exceeds the limit set by the administrator", + "error-user-not-in-room": "User is not in this room", + "error-user-registration-custom-field": "error-user-registration-custom-field", + "error-user-registration-disabled": "User registration is disabled", + "error-user-registration-secret": "User registration is only allowed via Secret URL", + "error-you-are-last-owner": "You are the last owner. Please set new owner before leaving the room.", + "error-status-not-allowed": "Invisible status is disabled", + "Actions": "Actions", + "Activity": "Activity", + "Add_Reaction": "Add Reaction", + "Add_Server": "Add Server", + "Add_users": "Add users", + "Admin_Panel": "Admin Panel", + "Agent": "Agent", + "Alert": "Alert", + "alert": "alert", + "alerts": "alerts", + "All_users_in_the_channel_can_write_new_messages": "All users in the channel can write new messages", + "All_users_in_the_team_can_write_new_messages": "All users in the team can write new messages", + "A_meaningful_name_for_the_discussion_room": "A meaningful name for the discussion room", + "All": "All", + "All_Messages": "All Messages", + "Allow_Reactions": "Allow Reactions", + "Alphabetical": "Alphabetical", + "and_more": "and more", + "and": "and", + "announcement": "announcement", + "Announcement": "Announcement", + "Apply_Your_Certificate": "Apply Your Certificate", + "ARCHIVE": "ARCHIVE", + "archive": "archive", + "are_typing": "are typing", + "Are_you_sure_question_mark": "Are you sure?", + "Are_you_sure_you_want_to_leave_the_room": "Are you sure you want to leave the room {{room}}?", + "Audio": "Audio", + "Authenticating": "Authenticating", + "Automatic": "Automatic", + "Auto_Translate": "Auto-Translate", + "Avatar_changed_successfully": "Avatar changed successfully!", + "Avatar_Url": "Avatar URL", + "Away": "Away", + "Back": "Back", + "Black": "Black", + "Block_user": "Block user", + "Browser": "Browser", + "Broadcast_channel_Description": "Only authorized users can write new messages, but the other users will be able to reply", + "Broadcast_Channel": "Broadcast Channel", + "Busy": "Busy", + "By_proceeding_you_are_agreeing": "By proceeding you are agreeing to our", + "Cancel_editing": "Cancel editing", + "Cancel_recording": "Cancel recording", + "Cancel": "Cancel", + "changing_avatar": "changing avatar", + "creating_channel": "creating channel", + "creating_invite": "creating invite", + "Channel_Name": "Channel Name", + "Channels": "Channels", + "Chats": "Chats", + "Call_already_ended": "Call already ended!", + "Clear_cookies_alert": "Do you want to clear all cookies?", + "Clear_cookies_desc": "This action will clear all login cookies, allowing you to login into other accounts.", + "Clear_cookies_yes": "Yes, clear cookies", + "Clear_cookies_no": "No, keep cookies", + "Click_to_join": "Click to Join!", + "Close": "Close", + "Close_emoji_selector": "Close emoji selector", + "Closing_chat": "Closing chat", + "Change_language_loading": "Changing language.", + "Chat_closed_by_agent": "Chat closed by agent", + "Choose": "Choose", + "Choose_from_library": "Choose from library", + "Choose_file": "Choose file", + "Choose_where_you_want_links_be_opened": "Choose where you want links be opened", + "Code": "Code", + "Code_or_password_invalid": "Code or password invalid", + "Collaborative": "Collaborative", + "Confirm": "Confirm", + "Connect": "Connect", + "Connected": "Connected", + "connecting_server": "connecting to server", + "Connecting": "Connecting...", + "Contact_us": "Contact us", + "Contact_your_server_admin": "Contact your server admin.", + "Continue_with": "Continue with", + "Copied_to_clipboard": "Copied to clipboard!", + "Copy": "Copy", + "Conversation": "Conversation", + "Permalink": "Permalink", + "Certificate_password": "Certificate Password", + "Clear_cache": "Clear local server cache", + "Clear_cache_loading": "Clearing cache.", + "Whats_the_password_for_your_certificate": "What's the password for your certificate?", + "Create_account": "Create an account", + "Create_Channel": "Create Channel", + "Create_Direct_Messages": "Create Direct Messages", + "Create_Discussion": "Create Discussion", + "Created_snippet": "created a snippet", + "Create_a_new_workspace": "Create a new workspace", + "Create": "Create", + "Custom_Status": "Custom Status", + "Dark": "Dark", + "Dark_level": "Dark Level", + "Default": "Default", + "Default_browser": "Default browser", + "Delete_Room_Warning": "Deleting a room will delete all messages posted within the room. This cannot be undone.", + "Department": "Department", + "delete": "delete", + "Delete": "Delete", + "DELETE": "DELETE", + "move": "move", + "deleting_room": "deleting room", + "description": "description", + "Description": "Description", + "Desktop_Options": "Desktop Options", + "Desktop_Notifications": "Desktop Notifications", + "Desktop_Alert_info": "These notifications are delivered in desktop", + "Directory": "Directory", + "Direct_Messages": "Direct Messages", + "Disable_notifications": "Disable notifications", + "Discussions": "Discussions", + "Discussion_Desc": "Help keeping an overview about what's going on! By creating a discussion, a sub-channel of the one you selected is created and both are linked.", + "Discussion_name": "Discussion name", + "Done": "Done", + "Dont_Have_An_Account": "Don't you have an account?", + "Do_you_have_an_account": "Do you have an account?", + "Do_you_have_a_certificate": "Do you have a certificate?", + "Do_you_really_want_to_key_this_room_question_mark": "Do you really want to {{key}} this room?", + "E2E_Encryption": "E2E Encryption", + "E2E_How_It_Works_info1": "You can now create encrypted private groups and direct messages. You may also change existing private groups or DMs to encrypted.", + "E2E_How_It_Works_info2": "This is *end to end encryption* so the key to encode/decode your messages and they will not be saved on the server. For that reason *you need to store this password somewhere safe* which you can access later if you may need.", + "E2E_How_It_Works_info3": "If you proceed, it will be auto generated an E2E password.", + "E2E_How_It_Works_info4": "You can also setup a new password for your encryption key any time from any browser you have entered the existing E2E password.", + "edit": "edit", + "edited": "edited", + "Edit": "Edit", + "Edit_Status": "Edit Status", + "Edit_Invite": "Edit Invite", + "End_to_end_encrypted_room": "End to end encrypted room", + "end_to_end_encryption": "end to end encryption", + "Email_Notification_Mode_All": "Every Mention/DM", + "Email_Notification_Mode_Disabled": "Disabled", + "Email_or_password_field_is_empty": "Email or password field is empty", + "Email": "E-mail", + "email": "e-mail", + "Empty_title": "Empty title", + "Enable_Auto_Translate": "Enable Auto-Translate", + "Enable_notifications": "Enable notifications", + "Encrypted": "Encrypted", + "Encrypted_message": "Encrypted message", + "Enter_Your_E2E_Password": "Enter Your E2E Password", + "Enter_Your_Encryption_Password_desc1": "This will allow you to access your encrypted private groups and direct messages.", + "Enter_Your_Encryption_Password_desc2": "You need to enter the password to encode/decode messages every place you use the chat.", + "Encryption_error_title": "Your encryption password seems wrong", + "Encryption_error_desc": "It wasn't possible to decode your encryption key to be imported.", + "Everyone_can_access_this_channel": "Everyone can access this channel", + "Everyone_can_access_this_team": "Everyone can access this team", + "Error_uploading": "Error uploading", + "Expiration_Days": "Expiration (Days)", + "Favorites": "Favorites", + "Files": "Files", + "File_description": "File description", + "File_name": "File name", + "Finish_recording": "Finish recording", + "Following_thread": "Following thread", + "For_your_security_you_must_enter_your_current_password_to_continue": "For your security, you must enter your current password to continue", + "Forgot_password_If_this_email_is_registered": "If this email is registered, we'll send instructions on how to reset your password. If you do not receive an email shortly, please come back and try again.", + "Forgot_password": "Forgot your password?", + "Forgot_Password": "Forgot Password", + "Forward": "Forward", + "Forward_Chat": "Forward Chat", + "Forward_to_department": "Forward to department", + "Forward_to_user": "Forward to user", + "Full_table": "Click to see full table", + "Generate_New_Link": "Generate New Link", + "Has_joined_the_channel": "has joined the channel", + "Has_joined_the_conversation": "has joined the conversation", + "Has_left_the_channel": "has left the channel", + "Hide_System_Messages": "Hide System Messages", + "Hide_type_messages": "Hide \"{{type}}\" messages", + "How_It_Works": "How It Works", + "Message_HideType_uj": "User Join", + "Message_HideType_ul": "User Leave", + "Message_HideType_ru": "User Removed", + "Message_HideType_au": "User Added", + "Message_HideType_mute_unmute": "User Muted / Unmuted", + "Message_HideType_r": "Room Name Changed", + "Message_HideType_ut": "User Joined Conversation", + "Message_HideType_wm": "Welcome", + "Message_HideType_rm": "Message Removed", + "Message_HideType_subscription_role_added": "Was Set Role", + "Message_HideType_subscription_role_removed": "Role No Longer Defined", + "Message_HideType_room_archived": "Room Archived", + "Message_HideType_room_unarchived": "Room Unarchived", + "I_Saved_My_E2E_Password": "I Saved My E2E Password", + "IP": "IP", + "In_app": "In-app", + "In_App_And_Desktop": "In-app and Desktop", + "In_App_and_Desktop_Alert_info": "Displays a banner at the top of the screen when app is open, and displays a notification on desktop", + "Invisible": "Invisible", + "Invite": "Invite", + "is_a_valid_RocketChat_instance": "is a valid Rocket.Chat instance", + "is_not_a_valid_RocketChat_instance": "is not a valid Rocket.Chat instance", + "is_typing": "is typing", + "Invalid_or_expired_invite_token": "Invalid or expired invite token", + "Invalid_server_version": "The server you're trying to connect is using a version that's not supported by the app anymore: {{currentVersion}}.\n\nWe require version {{minVersion}}", + "Invite_Link": "Invite Link", + "Invite_users": "Invite users", + "Join": "Join", + "Join_Code": "Join Code", + "Insert_Join_Code": "Insert Join Code", + "Join_our_open_workspace": "Join our open workspace", + "Join_your_workspace": "Join your workspace", + "Just_invited_people_can_access_this_channel": "Just invited people can access this channel", + "Just_invited_people_can_access_this_team": "Just invited people can access this team", + "Language": "Language", + "last_message": "last message", + "Leave_channel": "Leave channel", + "leaving_room": "leaving room", + "Leave": "Leave", + "leave": "leave", + "Legal": "Legal", + "Light": "Light", + "License": "License", + "Livechat": "Livechat", + "Livechat_edit": "Livechat edit", + "Login": "Login", + "Login_error": "Your credentials were rejected! Please try again.", + "Login_with": "Login with", + "Logging_out": "Logging out.", + "Logout": "Logout", + "Max_number_of_uses": "Max number of uses", + "Max_number_of_users_allowed_is_number": "Max number of users allowed is {{maxUsers}}", + "members": "members", + "Members": "Members", + "Mentioned_Messages": "Mentioned Messages", + "mentioned": "mentioned", + "Mentions": "Mentions", + "Message_accessibility": "Message from {{user}} at {{time}}: {{message}}", + "Message_actions": "Message actions", + "Message_pinned": "Message pinned", + "Message_removed": "Message removed", + "Message_starred": "Message starred", + "Message_unstarred": "Message unstarred", + "message": "message", + "messages": "messages", + "Message": "Message", + "Messages": "Messages", + "Message_Reported": "Message reported", + "Microphone_Permission_Message": "Rocket.Chat needs access to your microphone so you can send audio message.", + "Microphone_Permission": "Microphone Permission", + "Mute": "Mute", + "muted": "muted", + "My_servers": "My servers", + "N_people_reacted": "{{n}} people reacted", + "N_users": "{{n}} users", + "N_channels": "{{n}} channels", + "Name": "Name", + "Navigation_history": "Navigation history", + "Never": "Never", + "New_Message": "New Message", + "New_Password": "New Password", + "New_Server": "New Server", + "Next": "Next", + "No_files": "No files", + "No_limit": "No limit", + "No_mentioned_messages": "No mentioned messages", + "No_pinned_messages": "No pinned messages", + "No_results_found": "No results found", + "No_starred_messages": "No starred messages", + "No_thread_messages": "No thread messages", + "No_label_provided": "No {{label}} provided.", + "No_Message": "No Message", + "No_messages_yet": "No messages yet", + "No_Reactions": "No Reactions", + "No_Read_Receipts": "No Read Receipts", + "Not_logged": "Not logged", + "Not_RC_Server": "This is not a Rocket.Chat server.\n{{contact}}", + "Nothing": "Nothing", + "Nothing_to_save": "Nothing to save!", + "Notify_active_in_this_room": "Notify active users in this room", + "Notify_all_in_this_room": "Notify all in this room", + "Notifications": "Notifications", + "Notification_Duration": "Notification Duration", + "Notification_Preferences": "Notification Preferences", + "No_available_agents_to_transfer": "No available agents to transfer", + "Offline": "Offline", + "Oops": "Oops!", + "Omnichannel": "Omnichannel", + "Open_Livechats": "Chats in Progress", + "Omnichannel_enable_alert": "You're not available on Omnichannel. Would you like to be available?", + "Onboarding_description": "A workspace is your team or organization’s space to collaborate. Ask the workspace admin for address to join or create one for your team.", + "Onboarding_join_workspace": "Join a workspace", + "Onboarding_subtitle": "Beyond Team Collaboration", + "Onboarding_title": "Welcome to Rocket.Chat", + "Onboarding_join_open_description": "Join our open workspace to chat with the Rocket.Chat team and community.", + "Onboarding_agree_terms": "By continuing, you agree to Rocket.Chat", + "Onboarding_less_options": "Less options", + "Onboarding_more_options": "More options", + "Online": "Online", + "Only_authorized_users_can_write_new_messages": "Only authorized users can write new messages", + "Open_emoji_selector": "Open emoji selector", + "Open_Source_Communication": "Open Source Communication", + "Open_your_authentication_app_and_enter_the_code": "Open your authentication app and enter the code.", + "OR": "OR", + "OS": "OS", + "Overwrites_the_server_configuration_and_use_room_config": "Overwrites the server configuration and use room config", + "Password": "Password", + "Parent_channel_or_group": "Parent channel or group", + "Permalink_copied_to_clipboard": "Permalink copied to clipboard!", + "Phone": "Phone", + "Pin": "Pin", + "Pinned_Messages": "Pinned Messages", + "pinned": "pinned", + "Pinned": "Pinned", + "Please_add_a_comment": "Please add a comment", + "Please_enter_your_password": "Please enter your password", + "Please_wait": "Please wait.", + "Preferences": "Preferences", + "Preferences_saved": "Preferences saved!", + "Privacy_Policy": " Privacy Policy", + "Private_Channel": "Private Channel", + "Private": "Private", + "Processing": "Processing...", + "Profile_saved_successfully": "Profile saved successfully!", + "Profile": "Profile", + "Public_Channel": "Public Channel", + "Public": "Public", + "Push_Notifications": "Push Notifications", + "Push_Notifications_Alert_Info": "These notifications are delivered to you when the app is not open", + "Quote": "Quote", + "Reactions_are_disabled": "Reactions are disabled", + "Reactions_are_enabled": "Reactions are enabled", + "Reactions": "Reactions", + "Read_External_Permission_Message": "Rocket.Chat needs to access photos, media, and files on your device", + "Read_External_Permission": "Read Media Permission", + "Read_Only_Channel": "Read Only Channel", + "Read_Only": "Read Only", + "Read_Receipt": "Read Receipt", + "Receive_Group_Mentions": "Receive Group Mentions", + "Receive_Group_Mentions_Info": "Receive @all and @here mentions", + "Register": "Register", + "Repeat_Password": "Repeat Password", + "Replied_on": "Replied on:", + "replies": "replies", + "reply": "reply", + "Reply": "Reply", + "Report": "Report", + "Receive_Notification": "Receive Notification", + "Receive_notifications_from": "Receive notifications from {{name}}", + "Resend": "Resend", + "Reset_password": "Reset password", + "resetting_password": "resetting password", + "RESET": "RESET", + "Return": "Return", + "Review_app_title": "Are you enjoying this app?", + "Review_app_desc": "Give us 5 stars on {{store}}", + "Review_app_yes": "Sure!", + "Review_app_no": "No", + "Review_app_later": "Maybe later", + "Review_app_unable_store": "Unable to open {{store}}", + "Review_this_app": "Review this app", + "Remove": "Remove", + "remove": "remove", + "Roles": "Roles", + "Room_actions": "Room actions", + "Room_changed_announcement": "Room announcement changed to: {{announcement}} by {{userBy}}", + "Room_changed_avatar": "Room avatar changed by {{userBy}}", + "Room_changed_description": "Room description changed to: {{description}} by {{userBy}}", + "Room_changed_privacy": "Room type changed to: {{type}} by {{userBy}}", + "Room_changed_topic": "Room topic changed to: {{topic}} by {{userBy}}", + "Room_Files": "Room Files", + "Room_Info_Edit": "Room Info Edit", + "Room_Info": "Room Info", + "Room_Members": "Room Members", + "Room_name_changed": "Room name changed to: {{name}} by {{userBy}}", + "SAVE": "SAVE", + "Save_Changes": "Save Changes", + "Save": "Save", + "Saved": "Saved", + "saving_preferences": "saving preferences", + "saving_profile": "saving profile", + "saving_settings": "saving settings", + "saved_to_gallery": "Saved to gallery", + "Save_Your_E2E_Password": "Save Your E2E Password", + "Save_Your_Encryption_Password": "Save Your Encryption Password", + "Save_Your_Encryption_Password_warning": "This password is not stored anywhere so save it carefully somewhere else.", + "Save_Your_Encryption_Password_info": "Notice that you lose your password, there is no way to recover it and you will lose access to your messages.", + "Search_Messages": "Search Messages", + "Search": "Search", + "Search_by": "Search by", + "Search_global_users": "Search for global users", + "Search_global_users_description": "If you turn-on, you can search for any user from others companies or servers.", + "Seconds": "{{second}} seconds", + "Security_and_privacy": "Security and privacy", + "Select_Avatar": "Select Avatar", + "Select_Server": "Select Server", + "Select_Users": "Select Users", + "Select_a_Channel": "Select a Channel", + "Select_a_Department": "Select a Department", + "Select_an_option": "Select an option", + "Select_a_User": "Select a User", + "Send": "Send", + "Send_audio_message": "Send audio message", + "Send_crash_report": "Send crash report", + "Send_message": "Send message", + "Send_me_the_code_again": "Send me the code again", + "Send_to": "Send to...", + "Sending_to": "Sending to", + "Sent_an_attachment": "Sent an attachment", + "Server": "Server", + "Servers": "Servers", + "Server_version": "Server version: {{version}}", + "Set_username_subtitle": "The username is used to allow others to mention you in messages", + "Set_custom_status": "Set custom status", + "Set_status": "Set status", + "Status_saved_successfully": "Status saved successfully!", + "Settings": "Settings", + "Settings_succesfully_changed": "Settings succesfully changed!", + "Share": "Share", + "Share_Link": "Share Link", + "Share_this_app": "Share this app", + "Show_more": "Show more..", + "Show_Unread_Counter": "Show Unread Counter", + "Show_Unread_Counter_Info": "Unread counter is displayed as a badge on the right of the channel, in the list", + "Sign_in_your_server": "Sign in your server", + "Sign_Up": "Sign Up", + "Some_field_is_invalid_or_empty": "Some field is invalid or empty", + "Sound": "Sound", + "Star_room": "Star room", + "Star": "Star", + "Starred_Messages": "Starred Messages", + "starred": "starred", + "Starred": "Starred", + "Start_of_conversation": "Start of conversation", + "Start_a_Discussion": "Start a Discussion", + "Started_discussion": "Started a discussion:", + "Started_call": "Call started by {{userBy}}", + "Submit": "Submit", + "Table": "Table", + "Tags": "Tags", + "Take_a_photo": "Take a photo", + "Take_a_video": "Take a video", + "Take_it": "Take it!", + "tap_to_change_status": "tap to change status", + "Tap_to_view_servers_list": "Tap to view servers list", + "Terms_of_Service": " Terms of Service ", + "Theme": "Theme", + "The_user_wont_be_able_to_type_in_roomName": "The user won't be able to type in {{roomName}}", + "The_user_will_be_able_to_type_in_roomName": "The user will be able to type in {{roomName}}", + "There_was_an_error_while_action": "There was an error while {{action}}!", + "This_room_is_blocked": "This room is blocked", + "This_room_is_read_only": "This room is read only", + "Thread": "Thread", + "Threads": "Threads", + "Timezone": "Timezone", + "To": "To", + "topic": "topic", + "Topic": "Topic", + "Translate": "Translate", + "Try_again": "Try again", + "Two_Factor_Authentication": "Two-factor Authentication", + "Type_the_channel_name_here": "Type the channel name here", + "unarchive": "unarchive", + "UNARCHIVE": "UNARCHIVE", + "Unblock_user": "Unblock user", + "Unfollowed_thread": "Unfollowed thread", + "Unmute": "Unmute", + "unmuted": "unmuted", + "Unpin": "Unpin", + "unread_messages": "unread", + "Unread": "Unread", + "Unread_on_top": "Unread on top", + "Unstar": "Unstar", + "Updating": "Updating...", + "Uploading": "Uploading", + "Upload_file_question_mark": "Upload file?", + "User": "User", + "Users": "Users", + "User_added_by": "User {{userAdded}} added by {{userBy}}", + "User_Info": "User Info", + "User_has_been_key": "User has been {{key}}", + "User_is_no_longer_role_by_": "{{user}} is no longer {{role}} by {{userBy}}", + "User_muted_by": "User {{userMuted}} muted by {{userBy}}", + "User_removed_by": "User {{userRemoved}} removed by {{userBy}}", + "User_sent_an_attachment": "{{user}} sent an attachment", + "User_unmuted_by": "User {{userUnmuted}} unmuted by {{userBy}}", + "User_was_set_role_by_": "{{user}} was set {{role}} by {{userBy}}", + "Username_is_empty": "Username is empty", + "Username": "Username", + "Username_or_email": "Username or email", + "Uses_server_configuration": "Uses server configuration", + "Validating": "Validating", + "Registration_Succeeded": "Registration Succeeded!", + "Verify": "Verify", + "Verify_email_title": "Registration Succeeded!", + "Verify_email_desc": "We have sent you an email to confirm your registration. If you do not receive an email shortly, please come back and try again.", + "Verify_your_email_for_the_code_we_sent": "Verify your email for the code we sent", + "Video_call": "Video call", + "View_Original": "View Original", + "Voice_call": "Voice call", + "Waiting_for_network": "Waiting for network...", + "Websocket_disabled": "Websocket is disabled for this server.\n{{contact}}", + "Welcome": "Welcome", + "What_are_you_doing_right_now": "What are you doing right now?", + "Whats_your_2fa": "What's your 2FA code?", + "Without_Servers": "Without Servers", + "Workspaces": "Workspaces", + "Would_you_like_to_return_the_inquiry": "Would you like to return the inquiry?", + "Write_External_Permission_Message": "Rocket.Chat needs access to your gallery so you can save images.", + "Write_External_Permission": "Gallery Permission", + "Yes": "Yes", + "Yes_action_it": "Yes, {{action}} it!", + "Yesterday": "Yesterday", + "You_are_in_preview_mode": "You are in preview mode", + "You_are_offline": "You are offline", + "You_can_search_using_RegExp_eg": "You can use RegExp. e.g. `/^text$/i`", + "You_colon": "You: ", + "you_were_mentioned": "you were mentioned", + "You_were_removed_from_channel": "You were removed from {{channel}}", + "you": "you", + "You": "You", + "Logged_out_by_server": "You've been logged out by the server. Please log in again.", + "You_need_to_access_at_least_one_RocketChat_server_to_share_something": "You need to access at least one Rocket.Chat server to share something.", + "You_need_to_verifiy_your_email_address_to_get_notications": "You need to verify your email address to get notifications", + "Your_certificate": "Your Certificate", + "Your_invite_link_will_expire_after__usesLeft__uses": "Your invite link will expire after {{usesLeft}} uses.", + "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_expire_on__date__": "Your invite link will expire on {{date}}.", + "Your_invite_link_will_never_expire": "Your invite link will never expire.", + "Your_workspace": "Your workspace", + "Your_password_is": "Your password is", + "Version_no": "Version: {{version}}", + "You_will_not_be_able_to_recover_this_message": "You will not be able to recover this message!", + "You_will_unset_a_certificate_for_this_server": "You will unset a certificate for this server", + "Change_Language": "Change Language", + "Crash_report_disclaimer": "We never track the content of your chats. The crash report and analytics events only contains relevant information for us in order to identify and fix issues.", + "Type_message": "Type message", + "Room_search": "Rooms search", + "Room_selection": "Room selection 1...9", + "Next_room": "Next room", + "Previous_room": "Previous room", + "New_room": "New room", + "Upload_room": "Upload to room", + "Search_messages": "Search messages", + "Scroll_messages": "Scroll messages", + "Reply_latest": "Reply to latest", + "Reply_in_Thread": "Reply in Thread", + "Server_selection": "Server selection", + "Server_selection_numbers": "Server selection 1...9", + "Add_server": "Add server", + "New_line": "New line", + "You_will_be_logged_out_of_this_application": "You will be logged out of this application.", + "Clear": "Clear", + "This_will_clear_all_your_offline_data": "This will clear all your offline data.", + "This_will_remove_all_data_from_this_server": "This will remove all data from this server.", + "Mark_unread": "Mark Unread", + "Wait_activation_warning": "Before you can login, your account must be manually activated by an administrator.", + "Screen_lock": "Screen lock", + "Local_authentication_biometry_title": "Authenticate", + "Local_authentication_biometry_fallback": "Use passcode", + "Local_authentication_unlock_option": "Unlock with Passcode", + "Local_authentication_change_passcode": "Change Passcode", + "Local_authentication_info": "Note: if you forget the Passcode, you'll need to delete and reinstall the app.", + "Local_authentication_facial_recognition": "facial recognition", + "Local_authentication_fingerprint": "fingerprint", + "Local_authentication_unlock_with_label": "Unlock with {{label}}", + "Local_authentication_auto_lock_60": "After 1 minute", + "Local_authentication_auto_lock_300": "After 5 minutes", + "Local_authentication_auto_lock_900": "After 15 minutes", + "Local_authentication_auto_lock_1800": "After 30 minutes", + "Local_authentication_auto_lock_3600": "After 1 hour", + "Passcode_enter_title": "Enter your passcode", + "Passcode_choose_title": "Choose your new passcode", + "Passcode_choose_confirm_title": "Confirm your new passcode", + "Passcode_choose_error": "Passcodes don't match. Try again.", + "Passcode_choose_force_set": "Passcode required by admin", + "Passcode_app_locked_title": "App locked", + "Passcode_app_locked_subtitle": "Try again in {{timeLeft}} seconds", + "After_seconds_set_by_admin": "After {{seconds}} seconds (set by admin)", + "Dont_activate": "Don't activate now", + "Queued_chats": "Queued chats", + "Queue_is_empty": "Queue is empty", + "Logout_from_other_logged_in_locations": "Logout from other logged in locations", + "You_will_be_logged_out_from_other_locations": "You'll be logged out from other locations.", + "Logged_out_of_other_clients_successfully": "Logged out of other clients successfully", + "Logout_failed": "Logout failed!", + "Log_analytics_events": "Log analytics events", + "E2E_encryption_change_password_title": "Change Encryption Password", + "E2E_encryption_change_password_description": "You can now create encrypted private groups and direct messages. You may also change existing private groups or DMs to encrypted. \nThis is end to end encryption so the key to encode/decode your messages will not be saved on the server. For that reason you need to store your password somewhere safe. You will be required to enter it on other devices you wish to use e2e encryption on.", + "E2E_encryption_change_password_error": "Error while changing E2E key password!", + "E2E_encryption_change_password_success": "E2E key password changed successfully!", + "E2E_encryption_change_password_message": "Make sure you've saved it carefully somewhere else.", + "E2E_encryption_change_password_confirmation": "Yes, change it", + "E2E_encryption_reset_title": "Reset E2E Key", + "E2E_encryption_reset_description": "This option will remove your current E2E key and log you out. \nWhen you login again, Rocket.Chat will generate you a new key and restore your access to any encrypted room that has one or more members online. \nDue to the nature of the E2E encryption, Rocket.Chat will not be able to restore access to any encrypted room that has no member online.", + "E2E_encryption_reset_button": "Reset E2E Key", + "E2E_encryption_reset_error": "Error while resetting E2E key!", + "E2E_encryption_reset_message": "You're going to be logged out.", + "E2E_encryption_reset_confirmation": "Yes, reset it", + "Following": "Following", + "Threads_displaying_all": "Displaying All", + "Threads_displaying_following": "Displaying Following", + "Threads_displaying_unread": "Displaying Unread", + "No_threads": "There are no threads", + "No_threads_following": "You are not following any threads", + "No_threads_unread": "There are no unread threads", + "Messagebox_Send_to_channel": "Send to channel", + "Leader": "Leader", + "Moderator": "Moderator", + "Owner": "Owner", + "Remove_from_room": "Remove from room", + "Ignore": "Ignore", + "Unignore": "Unignore", + "User_has_been_ignored": "User has been ignored", + "User_has_been_unignored": "User is no longer ignored", + "User_has_been_removed_from_s": "User has been removed from {{s}}", + "User__username__is_now_a_leader_of__room_name_": "User {{username}} is now a leader of {{room_name}}", + "User__username__is_now_a_moderator_of__room_name_": "User {{username}} is now a moderator of {{room_name}}", + "User__username__is_now_a_owner_of__room_name_": "User {{username}} is now a owner of {{room_name}}", + "User__username__removed_from__room_name__leaders": "User {{username}} removed from {{room_name}} leaders", + "User__username__removed_from__room_name__moderators": "User {{username}} removed from {{room_name}} moderators", + "User__username__removed_from__room_name__owners": "User {{username}} removed from {{room_name}} owners", + "The_user_will_be_removed_from_s": "The user will be removed from {{s}}", + "Yes_remove_user": "Yes, remove user!", + "Direct_message": "Direct message", + "Message_Ignored": "Message ignored. Tap to display it.", + "Enter_workspace_URL": "Enter workspace URL", + "Workspace_URL_Example": "Ex. your-company.rocket.chat", + "This_room_encryption_has_been_enabled_by__username_": "This room's encryption has been enabled by {{username}}", + "This_room_encryption_has_been_disabled_by__username_": "This room's encryption has been disabled by {{username}}", + "Teams": "Teams", + "No_team_channels_found": "No channels found", + "Team_not_found": "Team not found", + "Create_Team": "Create Team", + "Team_Name": "Team Name", + "Private_Team": "Private Team", + "Read_Only_Team": "Read Only Team", + "Broadcast_Team": "Broadcast Team", + "creating_team": "creating team", + "team-name-already-exists": "A team with that name already exists", + "Add_Channel_to_Team": "Add Channel to Team", + "Left_The_Team_Successfully": "Left the team successfully", + "Create_New": "Create New", + "Add_Existing": "Add Existing", + "Add_Existing_Channel": "Add Existing Channel", + "Remove_from_Team": "Remove from Team", + "Auto-join": "Auto-join", + "Remove_Team_Room_Warning": "Woud you like to remove this channel from the team? The channel will be moved back to the workspace", + "Confirmation": "Confirmation", + "invalid-room": "Invalid room", + "You_are_leaving_the_team": "You are leaving the team '{{team}}'", + "Leave_Team": "Leave Team", + "Select_Team": "Select Team", + "Select_Team_Channels": "Select the Team's channels you would like to leave.", + "Cannot_leave": "Cannot leave", + "Cannot_remove": "Cannot remove", + "Cannot_delete": "Cannot delete", + "Last_owner_team_room": "You are the last owner of this channel. Once you leave the team, the channel will be kept inside the team but you will be managing it from outside.", + "last-owner-can-not-be-removed": "Last owner cannot be removed", + "Remove_User_Teams": "Select channels you want the user to be removed from.", + "Delete_Team": "Delete Team", + "Select_channels_to_delete": "This can't be undone. Once you delete a team, all chat content and configuration will be deleted. \n\nSelect the channels you would like to delete. The ones you decide to keep will be available on your workspace. Notice that public channels will still be public and visible to everyone.", + "You_are_deleting_the_team": "You are deleting this team.", + "Removing_user_from_this_team": "You are removing {{user}} from this team", + "Remove_User_Team_Channels": "Select the channels you want the user to be removed from.", + "Remove_Member": "Remove Member", + "leaving_team": "leaving team", + "removing_team": "removing from team", + "moving_channel_to_team": "moving channel to team", + "deleting_team": "deleting team", + "member-does-not-exist": "Member does not exist", + "Convert": "Convert", + "Convert_to_Team": "Convert to Team", + "Convert_to_Team_Warning": "You are converting this Channel to a Team. All Members will be kept.", + "Move_to_Team": "Move to Team", + "Move_Channel_Paragraph": "Moving a channel inside a team means that this channel will be added in the team’s context, however, all channel’s members, which are not members of the respective team, will still have access to this channel, but will not be added as team’s members. \n\nAll channel’s management will still be made by the owners of this channel.\n\nTeam’s members and even team’s owners, if not a member of this channel, can not have access to the channel’s content. \n\nPlease notice that the Team’s owner will be able remove members from the Channel.", + "Move_to_Team_Warning": "After reading the previous intructions about this behavior, do you still want to move this channel to the selected team?", + "Load_More": "Load More", + "Load_Newer": "Load Newer", + "Load_Older": "Load Older", + "room-name-already-exists": "Room name already exists", + "error-team-creation": "Error team creation", + "unauthorized": "Unauthorized", + "Left_The_Room_Successfully": "Left the room successfully", + "Deleted_The_Team_Successfully": "Team deleted successfully", + "Deleted_The_Room_Successfully": "Room deleted successfully", + "Convert_to_Channel": "Convert to Channel", + "Converting_Team_To_Channel": "Converting Team to Channel", + "Select_Team_Channels_To_Delete": "Select the Team’s Channels you would like to delete, the ones you do not select will be moved to the Workspace. \n\nNotice that public Channels will be public and visible to everyone.", + "You_are_converting_the_team": "You are converting this Team to a Channel", + "Display": "Display", + "Avatars": "Avatars", + "Sort_by": "Sort by", + "Group_by": "Group by", + "Types": "Types", + "Expanded": "Expanded", + "Condensed": "Condensed", + "creating_discussion": "creating discussion", + "Canned_Responses": "Canned Responses", + "No_match_found": "No match found.", + "No_discussions": "No discussions", + "Check_canned_responses": "Check on canned responses.", + "Searching": "Searching", + "Use": "Use", + "Shortcut": "Shortcut", + "Content": "Content", + "Sharing": "Sharing", + "No_canned_responses": "No canned responses", + "Send_email_confirmation": "Send email confirmation", + "sending_email_confirmation": "sending email confirmation", + "Enable_Message_Parser": "Enable Message Parser" } diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json index 3bfaf7b54..f33e7586a 100644 --- a/app/i18n/locales/pt-BR.json +++ b/app/i18n/locales/pt-BR.json @@ -679,5 +679,7 @@ "Use": "Use", "Shortcut": "Atalho", "Content": "Conteúdo", - "No_canned_responses": "Não há respostas predefinidas" + "No_canned_responses": "Não há respostas predefinidas", + "Send_email_confirmation": "Enviar email de confirmação", + "sending_email_confirmation": "enviando email de confirmação" } diff --git a/app/lib/database/model/Message.js b/app/lib/database/model/Message.js index a03902a26..20134733b 100644 --- a/app/lib/database/model/Message.js +++ b/app/lib/database/model/Message.js @@ -81,4 +81,6 @@ export default class Message extends Model { @field('e2e') e2e; @field('tshow') tshow; + + @json('md', sanitizer) md; } diff --git a/app/lib/database/model/migrations.js b/app/lib/database/model/migrations.js index fe32ec4f3..15c1331fe 100644 --- a/app/lib/database/model/migrations.js +++ b/app/lib/database/model/migrations.js @@ -190,6 +190,15 @@ export default schemaMigrations({ ] }) ] + }, + { + toVersion: 14, + steps: [ + addColumns({ + table: 'messages', + columns: [{ name: 'md', type: 'string', isOptional: true }] + }) + ] } ] }); diff --git a/app/lib/database/model/servers/User.js b/app/lib/database/model/servers/User.js index 6d78c27fa..30bd5f57d 100644 --- a/app/lib/database/model/servers/User.js +++ b/app/lib/database/model/servers/User.js @@ -25,4 +25,6 @@ export default class User extends Model { @field('show_message_in_main_thread') showMessageInMainThread; @field('is_from_webview') isFromWebView; + + @field('enable_message_parser_early_adoption') enableMessageParserEarlyAdoption; } diff --git a/app/lib/database/model/servers/migrations.js b/app/lib/database/model/servers/migrations.js index 51ec2b73b..d1f24f125 100644 --- a/app/lib/database/model/servers/migrations.js +++ b/app/lib/database/model/servers/migrations.js @@ -94,6 +94,15 @@ export default schemaMigrations({ columns: [{ name: 'is_from_webview', type: 'boolean', isOptional: true }] }) ] + }, + { + toVersion: 12, + steps: [ + addColumns({ + table: 'users', + columns: [{ name: 'enable_message_parser_early_adoption', type: 'boolean', isOptional: true }] + }) + ] } ] }); diff --git a/app/lib/database/schema/app.js b/app/lib/database/schema/app.js index 33bde61de..043ddb8e9 100644 --- a/app/lib/database/schema/app.js +++ b/app/lib/database/schema/app.js @@ -1,7 +1,7 @@ import { appSchema, tableSchema } from '@nozbe/watermelondb'; export default appSchema({ - version: 13, + version: 14, tables: [ tableSchema({ name: 'subscriptions', @@ -115,7 +115,8 @@ export default appSchema({ { name: 'tmsg', type: 'string', isOptional: true }, { name: 'blocks', type: 'string', isOptional: true }, { name: 'e2e', type: 'string', isOptional: true }, - { name: 'tshow', type: 'boolean', isOptional: true } + { name: 'tshow', type: 'boolean', isOptional: true }, + { name: 'md', type: 'string', isOptional: true } ] }), tableSchema({ diff --git a/app/lib/database/schema/servers.js b/app/lib/database/schema/servers.js index 1105cf165..1d849b874 100644 --- a/app/lib/database/schema/servers.js +++ b/app/lib/database/schema/servers.js @@ -1,7 +1,7 @@ import { appSchema, tableSchema } from '@nozbe/watermelondb'; export default appSchema({ - version: 11, + version: 12, tables: [ tableSchema({ name: 'users', @@ -16,7 +16,8 @@ export default appSchema({ { name: 'login_email_password', type: 'boolean', isOptional: true }, { name: 'show_message_in_main_thread', type: 'boolean', isOptional: true }, { name: 'avatar_etag', type: 'string', isOptional: true }, - { name: 'is_from_webview', type: 'boolean', isOptional: true } + { name: 'is_from_webview', type: 'boolean', isOptional: true }, + { name: 'enable_message_parser_early_adoption', type: 'boolean', isOptional: true } ] }), tableSchema({ diff --git a/app/lib/rocketchat.js b/app/lib/rocketchat.js index e0c16ac6c..33f87e868 100644 --- a/app/lib/rocketchat.js +++ b/app/lib/rocketchat.js @@ -5,6 +5,7 @@ import { Q } from '@nozbe/watermelondb'; import AsyncStorage from '@react-native-community/async-storage'; import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord'; import RNFetchBlob from 'rn-fetch-blob'; +import isEmpty from 'lodash/isEmpty'; import defaultSettings from '../constants/settings'; import log from '../utils/log'; @@ -530,6 +531,10 @@ const RocketChat = { return this.post('users.forgotPassword', { email }, false); }, + sendConfirmationEmail(email) { + return this.methodCallWrapper('sendConfirmationEmail', email); + }, + loginTOTP(params, loginEmailPassword, isFromWebView = false) { return new Promise(async (resolve, reject) => { try { @@ -622,7 +627,8 @@ const RocketChat = { roles: result.me.roles, avatarETag: result.me.avatarETag, isFromWebView, - showMessageInMainThread: result.me.settings?.preferences?.showMessageInMainThread ?? true + showMessageInMainThread: result.me.settings?.preferences?.showMessageInMainThread ?? true, + enableMessageParserEarlyAdoption: result.me.settings?.preferences?.enableMessageParserEarlyAdoption ?? true }; return user; }, @@ -1069,8 +1075,12 @@ const RocketChat = { }, methodCallWrapper(method, ...params) { const { API_Use_REST_For_DDP_Calls } = reduxStore.getState().settings; + const { user } = reduxStore.getState().login; if (API_Use_REST_For_DDP_Calls) { - return this.post(`method.call/${method}`, { message: EJSON.stringify({ method, params }) }); + const url = isEmpty(user) ? 'method.callAnon' : 'method.call'; + return this.post(`${url}/${method}`, { + message: EJSON.stringify({ method, params }) + }); } const parsedParams = params.map(param => { if (param instanceof Date) { diff --git a/app/presentation/TextInput.tsx b/app/presentation/TextInput.tsx index b3f18676c..028b811b5 100644 --- a/app/presentation/TextInput.tsx +++ b/app/presentation/TextInput.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { I18nManager, StyleSheet, TextInput, TextInputProps } from 'react-native'; +import { I18nManager, StyleProp, StyleSheet, TextInput, TextInputProps, TextStyle } from 'react-native'; import { themes } from '../constants/colors'; @@ -10,7 +10,7 @@ const styles = StyleSheet.create({ }); interface IThemedTextInput extends TextInputProps { - style: object; + style: StyleProp; theme: string; } diff --git a/app/sagas/login.js b/app/sagas/login.js index c3f987054..1d8f688f2 100644 --- a/app/sagas/login.js +++ b/app/sagas/login.js @@ -20,7 +20,6 @@ import { encryptionInit, encryptionStop } from '../actions/encryption'; import UserPreferences from '../lib/userPreferences'; import { inquiryRequest, inquiryReset } from '../ee/omnichannel/actions/inquiry'; import { isOmnichannelStatusAvailable } from '../ee/omnichannel/lib'; -import Navigation from '../lib/Navigation'; const getServer = state => state.server.server; const loginWithPasswordCall = args => RocketChat.loginWithPassword(args); @@ -191,8 +190,6 @@ const handleLogout = function* handleLogout({ forcedByServer }) { yield put(appStart({ root: ROOT_OUTSIDE })); showErrorAlert(I18n.t('Logged_out_by_server'), I18n.t('Oops')); yield delay(300); - Navigation.navigate('NewServerView'); - yield delay(300); EventEmitter.emit('NewServer', { server }); } else { const serversDB = database.servers; diff --git a/app/stacks/OutsideStack.js b/app/stacks/OutsideStack.js index f23e65c3d..392850c3e 100644 --- a/app/stacks/OutsideStack.js +++ b/app/stacks/OutsideStack.js @@ -10,6 +10,7 @@ import NewServerView from '../views/NewServerView'; import WorkspaceView from '../views/WorkspaceView'; import LoginView from '../views/LoginView'; import ForgotPasswordView from '../views/ForgotPasswordView'; +import SendEmailConfirmationView from '../views/SendEmailConfirmationView'; import RegisterView from '../views/RegisterView'; import LegalView from '../views/LegalView'; import AuthenticationWebView from '../views/AuthenticationWebView'; @@ -25,6 +26,11 @@ const _OutsideStack = () => { + diff --git a/app/theme.tsx b/app/theme.tsx index 37765b8fb..a304d17df 100644 --- a/app/theme.tsx +++ b/app/theme.tsx @@ -3,14 +3,14 @@ import hoistNonReactStatics from 'hoist-non-react-statics'; interface IThemeContextProps { theme: string; - themePreferences: { + themePreferences?: { currentTheme: 'automatic' | 'light'; darkLevel: string; }; - setTheme: (newTheme?: {}) => void; + setTheme?: (newTheme?: {}) => void; } -export const ThemeContext = React.createContext>({ theme: 'light' }); +export const ThemeContext = React.createContext({ theme: 'light' }); export function withTheme(Component: React.ComponentType): (props: any) => JSX.Element { const ThemedComponent = (props: any) => ( diff --git a/app/utils/log/events.js b/app/utils/log/events.js index 4d2564b0c..505a42e4c 100644 --- a/app/utils/log/events.js +++ b/app/utils/log/events.js @@ -11,6 +11,9 @@ export default { FP_FORGOT_PASSWORD: 'fp_forgot_password', FP_FORGOT_PASSWORD_F: 'fp_forgot_password_f', + // SEND EMAIL CONFIRMATION VIEW + SEC_SEND_EMAIL_CONFIRMATION: 'sec_send_email_confirmation', + // REGISTER VIEW REGISTER_DEFAULT_SIGN_UP: 'register_default_sign_up', REGISTER_DEFAULT_SIGN_UP_F: 'register_default_sign_up_f', diff --git a/app/utils/scaling.js b/app/utils/scaling.js deleted file mode 100644 index 7cf33f1fc..000000000 --- a/app/utils/scaling.js +++ /dev/null @@ -1,11 +0,0 @@ -import { isTablet } from './deviceInfo'; - -const guidelineBaseWidth = isTablet ? 600 : 375; -const guidelineBaseHeight = isTablet ? 800 : 667; - -// TODO: we need to refactor this -const scale = (size, width) => (width / guidelineBaseWidth) * size; -const verticalScale = (size, height) => (height / guidelineBaseHeight) * size; -const moderateScale = (size, factor = 0.5, width) => size + (scale(size, width) - size) * factor; - -export { scale, verticalScale, moderateScale }; diff --git a/app/utils/scaling.ts b/app/utils/scaling.ts new file mode 100644 index 000000000..45d248d37 --- /dev/null +++ b/app/utils/scaling.ts @@ -0,0 +1,16 @@ +import { isTablet } from './deviceInfo'; + +const guidelineBaseWidth = isTablet ? 600 : 375; +const guidelineBaseHeight = isTablet ? 800 : 667; + +function scale({ size, width }: { size: number; width: number }): number { + return (width / guidelineBaseWidth) * size; +} +function verticalScale({ size, height }: { size: number; height: number }): number { + return (height / guidelineBaseHeight) * size; +} +function moderateScale({ size, factor = 0.5, width }: { size: number; factor?: number; width: number }): number { + return size + (scale({ size, width }) - size) * factor; +} + +export { scale, verticalScale, moderateScale }; diff --git a/app/views/AuthenticationWebView.js b/app/views/AuthenticationWebView.tsx similarity index 79% rename from app/views/AuthenticationWebView.js rename to app/views/AuthenticationWebView.tsx index bba518d75..870af9560 100644 --- a/app/views/AuthenticationWebView.js +++ b/app/views/AuthenticationWebView.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { WebView } from 'react-native-webview'; +import { WebView, WebViewNavigation } from 'react-native-webview'; import { connect } from 'react-redux'; import parse from 'url-parse'; +import { StackNavigationProp } from '@react-navigation/stack'; +import { WebViewMessage } from 'react-native-webview/lib/WebViewTypes'; import RocketChat from '../lib/rocketchat'; import { isIOS } from '../utils/deviceInfo'; @@ -40,17 +41,44 @@ window.addEventListener('popstate', function() { }); `; -class AuthenticationWebView extends React.PureComponent { - static propTypes = { - navigation: PropTypes.object, - route: PropTypes.object, - server: PropTypes.string, - Accounts_Iframe_api_url: PropTypes.bool, - Accounts_Iframe_api_method: PropTypes.bool, - theme: PropTypes.string +interface IRoute { + params: { + authType: string; + url: string; + ssoToken?: string; + }; +} + +interface INavigationOption { + navigation: StackNavigationProp; + route: IRoute; +} + +interface IAuthenticationWebView extends INavigationOption { + server: string; + Accounts_Iframe_api_url: string; + Accounts_Iframe_api_method: string; + theme: string; +} + +interface IState { + logging: boolean; + loading: boolean; +} + +class AuthenticationWebView extends React.PureComponent { + private oauthRedirectRegex: RegExp; + private iframeRedirectRegex: RegExp; + + static navigationOptions = ({ route, navigation }: INavigationOption) => { + const { authType } = route.params; + return { + headerLeft: () => , + title: ['saml', 'cas', 'iframe'].includes(authType) ? 'SSO' : 'OAuth' + }; }; - constructor(props) { + constructor(props: IAuthenticationWebView) { super(props); this.state = { logging: false, @@ -71,7 +99,7 @@ class AuthenticationWebView extends React.PureComponent { navigation.pop(); }; - login = params => { + login = (params: any) => { const { logging } = this.state; if (logging) { return; @@ -89,7 +117,7 @@ class AuthenticationWebView extends React.PureComponent { }; // Force 3s delay so the server has time to evaluate the token - debouncedLogin = debounce(params => this.login(params), 3000); + debouncedLogin = debounce((params: any) => this.login(params), 3000); tryLogin = debounce( async () => { @@ -104,7 +132,7 @@ class AuthenticationWebView extends React.PureComponent { true ); - onNavigationStateChange = webViewState => { + onNavigationStateChange = (webViewState: WebViewNavigation | WebViewMessage) => { const url = decodeURIComponent(webViewState.url); const { route } = this.props; const { authType } = route.params; @@ -180,18 +208,10 @@ class AuthenticationWebView extends React.PureComponent { } } -const mapStateToProps = state => ({ +const mapStateToProps = (state: any) => ({ server: state.server.server, Accounts_Iframe_api_url: state.settings.Accounts_Iframe_api_url, Accounts_Iframe_api_method: state.settings.Accounts_Iframe_api_method }); -AuthenticationWebView.navigationOptions = ({ route, navigation }) => { - const { authType } = route.params; - return { - headerLeft: () => , - title: ['saml', 'cas', 'iframe'].includes(authType) ? 'SSO' : 'OAuth' - }; -}; - export default connect(mapStateToProps)(withTheme(AuthenticationWebView)); diff --git a/app/views/InviteUsersView/index.js b/app/views/InviteUsersView/index.tsx similarity index 80% rename from app/views/InviteUsersView/index.js rename to app/views/InviteUsersView/index.tsx index 2fe18f39a..cfcd3fa11 100644 --- a/app/views/InviteUsersView/index.js +++ b/app/views/InviteUsersView/index.tsx @@ -1,8 +1,10 @@ import React from 'react'; -import PropTypes from 'prop-types'; import { ScrollView, Share, View } from 'react-native'; import moment from 'moment'; import { connect } from 'react-redux'; +import { StackNavigationProp, StackNavigationOptions } from '@react-navigation/stack'; +import { RouteProp } from '@react-navigation/core'; +import { Dispatch } from 'redux'; import { inviteLinksClear as inviteLinksClearAction, @@ -20,22 +22,28 @@ import SafeAreaView from '../../containers/SafeAreaView'; import { events, logEvent } from '../../utils/log'; import styles from './styles'; -class InviteUsersView extends React.Component { - static navigationOptions = () => ({ - title: I18n.t('Invite_users') - }); +interface IInviteUsersView { + navigation: StackNavigationProp; + route: RouteProp; + theme: string; + timeDateFormat: string; + invite: { + url: string; + expires: number; + maxUses: number; + uses: number; + }; + createInviteLink(rid: string): void; + clearInviteLink(): void; +} +class InviteUsersView extends React.Component { + private rid: string; - static propTypes = { - navigation: PropTypes.object, - route: PropTypes.object, - theme: PropTypes.string, - timeDateFormat: PropTypes.string, - invite: PropTypes.object, - createInviteLink: PropTypes.func, - clearInviteLink: PropTypes.func + static navigationOptions: StackNavigationOptions = { + title: I18n.t('Invite_users') }; - constructor(props) { + constructor(props: IInviteUsersView) { super(props); this.rid = props.route.params?.rid; } @@ -97,6 +105,7 @@ class InviteUsersView extends React.Component { renderExpiration = () => { const { theme } = this.props; const expirationMessage = this.linkExpirationText(); + // @ts-ignore return ; }; @@ -104,10 +113,10 @@ class InviteUsersView extends React.Component { const { theme, invite } = this.props; return ( + {/* @ts-ignore*/} @@ -123,15 +132,15 @@ class InviteUsersView extends React.Component { } } -const mapStateToProps = state => ({ +const mapStateToProps = (state: any) => ({ timeDateFormat: state.settings.Message_TimeAndDateFormat, days: state.inviteLinks.days, maxUses: state.inviteLinks.maxUses, invite: state.inviteLinks.invite }); -const mapDispatchToProps = dispatch => ({ - createInviteLink: rid => dispatch(inviteLinksCreateAction(rid)), +const mapDispatchToProps = (dispatch: Dispatch) => ({ + createInviteLink: (rid: string) => dispatch(inviteLinksCreateAction(rid)), clearInviteLink: () => dispatch(inviteLinksClearAction()) }); diff --git a/app/views/InviteUsersView/styles.js b/app/views/InviteUsersView/styles.ts similarity index 100% rename from app/views/InviteUsersView/styles.js rename to app/views/InviteUsersView/styles.ts diff --git a/app/views/LoginView.js b/app/views/LoginView.tsx similarity index 79% rename from app/views/LoginView.js rename to app/views/LoginView.tsx index c240ab8f4..4643687e2 100644 --- a/app/views/LoginView.js +++ b/app/views/LoginView.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import PropTypes from 'prop-types'; import { Alert, Keyboard, StyleSheet, Text, View } from 'react-native'; import { connect } from 'react-redux'; import { dequal } from 'dequal'; +import { StackNavigationProp } from '@react-navigation/stack'; +import { RouteProp } from '@react-navigation/core'; import Button from '../containers/Button'; import I18n from '../i18n'; @@ -46,31 +47,35 @@ const styles = StyleSheet.create({ } }); -class LoginView extends React.Component { - static navigationOptions = ({ route, navigation }) => ({ - title: route.params?.title ?? 'Rocket.Chat', +interface IProps { + navigation: StackNavigationProp; + route: RouteProp; + Site_Name: string; + Accounts_RegistrationForm: string; + Accounts_RegistrationForm_LinkReplacementText: string; + Accounts_EmailOrUsernamePlaceholder: string; + Accounts_PasswordPlaceholder: string; + Accounts_PasswordReset: boolean; + Accounts_ShowFormLogin: boolean; + isFetching: boolean; + error: { + error: string; + }; + failure: boolean; + theme: string; + loginRequest: Function; + inviteLinkToken: string; +} + +class LoginView extends React.Component { + private passwordInput: any; + + static navigationOptions = ({ route, navigation }: Partial) => ({ + title: route?.params?.title ?? 'Rocket.Chat', headerRight: () => }); - static propTypes = { - navigation: PropTypes.object, - route: PropTypes.object, - Site_Name: PropTypes.string, - Accounts_RegistrationForm: PropTypes.string, - Accounts_RegistrationForm_LinkReplacementText: PropTypes.string, - Accounts_EmailOrUsernamePlaceholder: PropTypes.string, - Accounts_PasswordPlaceholder: PropTypes.string, - Accounts_PasswordReset: PropTypes.bool, - Accounts_ShowFormLogin: PropTypes.bool, - isFetching: PropTypes.bool, - error: PropTypes.object, - failure: PropTypes.bool, - theme: PropTypes.string, - loginRequest: PropTypes.func, - inviteLinkToken: PropTypes.string - }; - - constructor(props) { + constructor(props: IProps) { super(props); this.state = { user: props.route.params?.username ?? '', @@ -78,10 +83,14 @@ class LoginView extends React.Component { }; } - UNSAFE_componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps: IProps) { const { error } = this.props; if (nextProps.failure && !dequal(error, nextProps.error)) { - Alert.alert(I18n.t('Oops'), I18n.t('Login_error')); + if (nextProps.error?.error === 'error-invalid-email') { + this.resendEmailConfirmation(); + } else { + Alert.alert(I18n.t('Oops'), I18n.t('Login_error')); + } } } @@ -105,6 +114,12 @@ class LoginView extends React.Component { navigation.navigate('ForgotPasswordView', { title: Site_Name }); }; + resendEmailConfirmation = () => { + const { user } = this.state; + const { navigation } = this.props; + navigation.navigate('SendEmailConfirmationView', { user }); + }; + valid = () => { const { user, password } = this.state; return user.trim() && password.trim(); @@ -146,7 +161,7 @@ class LoginView extends React.Component { placeholder={Accounts_EmailOrUsernamePlaceholder || I18n.t('Username_or_email')} keyboardType='email-address' returnKeyType='next' - onChangeText={value => this.setState({ user: value })} + onChangeText={(value: string) => this.setState({ user: value })} onSubmitEditing={() => { this.passwordInput.focus(); }} @@ -166,7 +181,7 @@ class LoginView extends React.Component { returnKeyType='send' secureTextEntry onSubmitEditing={this.submit} - onChangeText={value => this.setState({ password: value })} + onChangeText={(value: string) => this.setState({ password: value })} testID='login-view-password' textContentType='password' autoCompleteType='password' @@ -227,7 +242,7 @@ class LoginView extends React.Component { } } -const mapStateToProps = state => ({ +const mapStateToProps = (state: any) => ({ server: state.server.server, Site_Name: state.settings.Site_Name, Accounts_ShowFormLogin: state.settings.Accounts_ShowFormLogin, @@ -242,8 +257,8 @@ const mapStateToProps = state => ({ inviteLinkToken: state.inviteLinks.token }); -const mapDispatchToProps = dispatch => ({ - loginRequest: params => dispatch(loginRequestAction(params)) +const mapDispatchToProps = (dispatch: any) => ({ + loginRequest: (params: any) => dispatch(loginRequestAction(params)) }); export default connect(mapStateToProps, mapDispatchToProps)(withTheme(LoginView)); diff --git a/app/views/NewServerView/ServerInput/Item.js b/app/views/NewServerView/ServerInput/Item.tsx similarity index 79% rename from app/views/NewServerView/ServerInput/Item.js rename to app/views/NewServerView/ServerInput/Item.tsx index 59ae77f07..9fb44719e 100644 --- a/app/views/NewServerView/ServerInput/Item.js +++ b/app/views/NewServerView/ServerInput/Item.tsx @@ -1,12 +1,12 @@ import React from 'react'; import { StyleSheet, Text, View } from 'react-native'; -import PropTypes from 'prop-types'; import { BorderlessButton } from 'react-native-gesture-handler'; import { themes } from '../../../constants/colors'; import { CustomIcon } from '../../../lib/Icons'; import sharedStyles from '../../Styles'; import Touch from '../../../utils/touch'; +import { IServer } from '../index'; const styles = StyleSheet.create({ container: { @@ -27,13 +27,20 @@ const styles = StyleSheet.create({ } }); -const Item = ({ item, theme, onPress, onDelete }) => ( +interface IItem { + item: IServer; + theme: string; + onPress(url: string): void; + onDelete(item: IServer): void; +} + +const Item = ({ item, theme, onPress, onDelete }: IItem): JSX.Element => ( onPress(item.url)} theme={theme} testID={`server-history-${item.url}`}> {item.url} - + {item.username} @@ -43,11 +50,4 @@ const Item = ({ item, theme, onPress, onDelete }) => ( ); -Item.propTypes = { - item: PropTypes.object, - theme: PropTypes.string, - onPress: PropTypes.func, - onDelete: PropTypes.func -}; - export default Item; diff --git a/app/views/NewServerView/ServerInput/index.js b/app/views/NewServerView/ServerInput/index.tsx similarity index 81% rename from app/views/NewServerView/ServerInput/index.js rename to app/views/NewServerView/ServerInput/index.tsx index ef80c4685..c3399b730 100644 --- a/app/views/NewServerView/ServerInput/index.js +++ b/app/views/NewServerView/ServerInput/index.tsx @@ -1,12 +1,12 @@ import React, { useState } from 'react'; import { FlatList, StyleSheet, View } from 'react-native'; -import PropTypes from 'prop-types'; import TextInput from '../../../containers/TextInput'; import * as List from '../../../containers/List'; import { themes } from '../../../constants/colors'; import I18n from '../../../i18n'; import Item from './Item'; +import { IServer } from '../index'; const styles = StyleSheet.create({ container: { @@ -28,7 +28,25 @@ const styles = StyleSheet.create({ } }); -const ServerInput = ({ text, theme, serversHistory, onChangeText, onSubmit, onDelete, onPressServerHistory }) => { +interface IServerInput { + text: string; + theme: string; + serversHistory: any[]; + onChangeText(text: string): void; + onSubmit(): void; + onDelete(item: IServer): void; + onPressServerHistory(serverHistory: IServer): void; +} + +const ServerInput = ({ + text, + theme, + serversHistory, + onChangeText, + onSubmit, + onDelete, + onPressServerHistory +}: IServerInput): JSX.Element => { const [focused, setFocused] = useState(false); return ( @@ -68,14 +86,4 @@ const ServerInput = ({ text, theme, serversHistory, onChangeText, onSubmit, onDe ); }; -ServerInput.propTypes = { - text: PropTypes.string, - theme: PropTypes.string, - serversHistory: PropTypes.array, - onChangeText: PropTypes.func, - onSubmit: PropTypes.func, - onDelete: PropTypes.func, - onPressServerHistory: PropTypes.func -}; - export default ServerInput; diff --git a/app/views/NewServerView/index.js b/app/views/NewServerView/index.tsx similarity index 75% rename from app/views/NewServerView/index.js rename to app/views/NewServerView/index.tsx index 8eaba349e..815ec1347 100644 --- a/app/views/NewServerView/index.js +++ b/app/views/NewServerView/index.tsx @@ -1,5 +1,4 @@ import React from 'react'; -import PropTypes from 'prop-types'; import { Text, Keyboard, StyleSheet, View, BackHandler, Image } from 'react-native'; import { connect } from 'react-redux'; import { Base64 } from 'js-base64'; @@ -7,6 +6,9 @@ import parse from 'url-parse'; import { Q } from '@nozbe/watermelondb'; import { TouchableOpacity } from 'react-native-gesture-handler'; import Orientation from 'react-native-orientation-locker'; +import { StackNavigationProp } from '@react-navigation/stack'; +import { Dispatch } from 'redux'; +import Model from '@nozbe/watermelondb/Model'; import UserPreferences from '../../lib/userPreferences'; import EventEmitter from '../../utils/events'; @@ -19,7 +21,6 @@ import FormContainer, { FormContainerInner } from '../../containers/FormContaine import I18n from '../../i18n'; import { themes } from '../../constants/colors'; import { events, logEvent } from '../../utils/log'; -import { animateNextTransition } from '../../utils/layoutAnimation'; import { withTheme } from '../../theme'; import { BASIC_AUTH_KEY, setBasicAuth } from '../../utils/fetch'; import * as HeaderButton from '../../containers/HeaderButton'; @@ -66,19 +67,32 @@ const styles = StyleSheet.create({ } }); -class NewServerView extends React.Component { - static propTypes = { - navigation: PropTypes.object, - theme: PropTypes.string, - connecting: PropTypes.bool.isRequired, - connectServer: PropTypes.func.isRequired, - selectServer: PropTypes.func.isRequired, - previousServer: PropTypes.string, - inviteLinksClear: PropTypes.func, - serverFinishAdd: PropTypes.func - }; +export interface IServer extends Model { + url: string; + username: string; +} +interface INewServerView { + navigation: StackNavigationProp; + theme: string; + connecting: boolean; + connectServer(server: string, username?: string, fromServerHistory?: boolean): void; + selectServer(server: string): void; + previousServer: string; + inviteLinksClear(): void; + serverFinishAdd(): void; + width: number; + height: number; +} - constructor(props) { +interface IState { + text: string; + connectingOpen: boolean; + certificate: any; + serversHistory: IServer[]; +} + +class NewServerView extends React.Component { + constructor(props: INewServerView) { super(props); if (!isTablet) { Orientation.lockToPortrait(); @@ -131,21 +145,21 @@ class NewServerView extends React.Component { return false; }; - onChangeText = text => { + onChangeText = (text: string) => { this.setState({ text }); this.queryServerHistory(text); }; - queryServerHistory = async text => { + queryServerHistory = async (text?: string) => { const db = database.servers; try { const serversHistoryCollection = db.get('servers_history'); let whereClause = [Q.where('username', Q.notEq(null)), Q.experimentalSortBy('updated_at', Q.desc), Q.experimentalTake(3)]; - const likeString = sanitizeLikeString(text); if (text) { + const likeString = sanitizeLikeString(text); whereClause = [...whereClause, Q.where('url', Q.like(`%${likeString}%`))]; } - const serversHistory = await serversHistoryCollection.query(...whereClause).fetch(); + const serversHistory = (await serversHistoryCollection.query(...whereClause).fetch()) as IServer[]; this.setState({ serversHistory }); } catch { // Do nothing @@ -158,7 +172,7 @@ class NewServerView extends React.Component { selectServer(previousServer); }; - handleNewServerEvent = event => { + handleNewServerEvent = (event: { server: string }) => { let { server } = event; if (!server) { return; @@ -169,13 +183,11 @@ class NewServerView extends React.Component { connectServer(server); }; - onPressServerHistory = serverHistory => { - this.setState({ text: serverHistory?.url }, () => - this.submit({ fromServerHistory: true, username: serverHistory?.username }) - ); + onPressServerHistory = (serverHistory: IServer) => { + this.setState({ text: serverHistory.url }, () => this.submit(true, serverHistory?.username)); }; - submit = async ({ fromServerHistory = false, username }) => { + submit = async (fromServerHistory?: boolean, username?: string) => { logEvent(events.NS_CONNECT_TO_WORKSPACE); const { text, certificate } = this.state; const { connectServer } = this.props; @@ -207,7 +219,7 @@ class NewServerView extends React.Component { connectServer('https://open.rocket.chat'); }; - basicAuth = async (server, text) => { + basicAuth = async (server: string, text: string) => { try { const parsedUrl = parse(text, true); if (parsedUrl.auth.length) { @@ -222,14 +234,14 @@ class NewServerView extends React.Component { chooseCertificate = async () => { try { - const certificate = await SSLPinning.pickCertificate(); + const certificate = await SSLPinning?.pickCertificate(); this.setState({ certificate }); } catch { // Do nothing } }; - completeUrl = url => { + completeUrl = (url: string) => { const parsedUrl = parse(url, true); if (parsedUrl.auth.length) { url = parsedUrl.origin; @@ -252,14 +264,11 @@ class NewServerView extends React.Component { return url.replace(/\/+$/, '').replace(/\\/g, '/'); }; - uriToPath = uri => uri.replace('file://', ''); - - saveCertificate = certificate => { - animateNextTransition(); - this.setState({ certificate }); - }; + uriToPath = (uri: string) => uri.replace('file://', ''); handleRemove = () => { + // TODO: Remove ts-ignore when migrate the showConfirmationAlert + // @ts-ignore showConfirmationAlert({ message: I18n.t('You_will_unset_a_certificate_for_this_server'), confirmationText: I18n.t('Remove'), @@ -267,14 +276,15 @@ class NewServerView extends React.Component { }); }; - deleteServerHistory = async item => { - const { serversHistory } = this.state; + deleteServerHistory = async (item: IServer) => { const db = database.servers; try { - await db.action(async () => { + await db.write(async () => { await item.destroyPermanently(); }); - this.setState({ serversHistory: serversHistory.filter(server => server.id !== item.id) }); + this.setState((prevstate: IState) => ({ + serversHistory: prevstate.serversHistory.filter((server: IServer) => server.id !== item.id) + })); } catch { // Nothing } @@ -288,20 +298,21 @@ class NewServerView extends React.Component { style={[ styles.certificatePicker, { - marginBottom: verticalScale(previousServer && !isTablet ? 10 : 30, height) + marginBottom: verticalScale({ size: previousServer && !isTablet ? 10 : 30, height }) } ]}> {certificate ? I18n.t('Your_certificate') : I18n.t('Do_you_have_a_certificate')} - + {certificate ?? I18n.t('Apply_Your_Certificate')} @@ -321,10 +332,10 @@ class NewServerView extends React.Component { style={[ styles.onboardingImage, { - marginBottom: verticalScale(10, height), - marginTop: isTablet ? 0 : verticalScale(marginTop, height), - width: verticalScale(100, height), - height: verticalScale(100, height) + marginBottom: verticalScale({ size: 10, height }), + marginTop: isTablet ? 0 : verticalScale({ size: marginTop, height }), + width: verticalScale({ size: 100, height }), + height: verticalScale({ size: 100, height }) } ]} source={require('../../static/images/logo.png')} @@ -335,8 +346,8 @@ class NewServerView extends React.Component { styles.title, { color: themes[theme].titleText, - fontSize: moderateScale(22, null, width), - marginBottom: verticalScale(8, height) + fontSize: moderateScale({ size: 22, width }), + marginBottom: verticalScale({ size: 8, height }) } ]}> Rocket.Chat @@ -346,8 +357,8 @@ class NewServerView extends React.Component { styles.subtitle, { color: themes[theme].controlText, - fontSize: moderateScale(16, null, width), - marginBottom: verticalScale(30, height) + fontSize: moderateScale({ size: 16, width }), + marginBottom: verticalScale({ size: 30, height }) } ]}> {I18n.t('Onboarding_subtitle')} @@ -367,7 +378,7 @@ class NewServerView extends React.Component { onPress={this.submit} disabled={!text || connecting} loading={!connectingOpen && connecting} - style={[styles.connectButton, { marginTop: verticalScale(16, height) }]} + style={[styles.connectButton, { marginTop: verticalScale({ size: 16, height }) }]} theme={theme} testID='new-server-view-button' /> @@ -377,8 +388,8 @@ class NewServerView extends React.Component { styles.description, { color: themes[theme].auxiliaryText, - fontSize: moderateScale(14, null, width), - marginBottom: verticalScale(16, height) + fontSize: moderateScale({ size: 14, width }), + marginBottom: verticalScale({ size: 16, height }) } ]}> {I18n.t('Onboarding_join_open_description')} @@ -400,14 +411,15 @@ class NewServerView extends React.Component { } } -const mapStateToProps = state => ({ +const mapStateToProps = (state: any) => ({ connecting: state.server.connecting, previousServer: state.server.previousServer }); -const mapDispatchToProps = dispatch => ({ - connectServer: (...params) => dispatch(serverRequest(...params)), - selectServer: server => dispatch(selectServerRequest(server)), +const mapDispatchToProps = (dispatch: Dispatch) => ({ + connectServer: (server: string, username: string & null, fromServerHistory?: boolean) => + dispatch(serverRequest(server, username, fromServerHistory)), + selectServer: (server: string) => dispatch(selectServerRequest(server)), inviteLinksClear: () => dispatch(inviteLinksClearAction()), serverFinishAdd: () => dispatch(serverFinishAddAction()) }); diff --git a/app/views/ReadReceiptView/index.js b/app/views/ReadReceiptView/index.js index d407b3420..f611cbc15 100644 --- a/app/views/ReadReceiptView/index.js +++ b/app/views/ReadReceiptView/index.js @@ -1,13 +1,12 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { FlatList, Text, View } from 'react-native'; +import { FlatList, Text, View, RefreshControl } from 'react-native'; import { dequal } from 'dequal'; import moment from 'moment'; import { connect } from 'react-redux'; import * as List from '../../containers/List'; import Avatar from '../../containers/Avatar'; -import ActivityIndicator from '../../containers/ActivityIndicator'; import * as HeaderButton from '../../containers/HeaderButton'; import I18n from '../../i18n'; import RocketChat from '../../lib/rocketchat'; @@ -85,12 +84,16 @@ class ReadReceiptView extends React.Component { }; renderEmpty = () => { + const { loading } = this.state; const { theme } = this.props; + if (loading) { + return null; + } return ( - {I18n.t('No_Read_Receipts')} + {I18n.t('No_Read_Receipts')} ); }; @@ -107,9 +110,15 @@ class ReadReceiptView extends React.Component { {item?.user?.name} - {time} + {time} - {`@${item.user.username}`} + {`@${item.user.username}`} ); @@ -119,30 +128,25 @@ class ReadReceiptView extends React.Component { const { receipts, loading } = this.state; const { theme } = this.props; - if (!loading && receipts.length === 0) { - return this.renderEmpty(); - } - return ( - {loading ? ( - - ) : ( - item._id} - /> - )} + } + keyExtractor={item => item._id} + /> ); } diff --git a/app/views/ReadReceiptView/styles.js b/app/views/ReadReceiptView/styles.js index dbf31e6a0..e6af153ed 100644 --- a/app/views/ReadReceiptView/styles.js +++ b/app/views/ReadReceiptView/styles.js @@ -8,9 +8,14 @@ export default StyleSheet.create({ alignItems: 'center', justifyContent: 'center' }, + emptyText: { + fontSize: 16, + ...sharedStyles.textRegular + }, item: { flex: 1, flexDirection: 'row', + alignItems: 'center', justifyContent: 'space-between' }, separator: { @@ -20,6 +25,14 @@ export default StyleSheet.create({ ...sharedStyles.textRegular, fontSize: 17 }, + username: { + ...sharedStyles.textMedium, + fontSize: 14 + }, + time: { + ...sharedStyles.textRegular, + fontSize: 12 + }, infoContainer: { flex: 1, marginLeft: 10 diff --git a/app/views/RegisterView.js b/app/views/RegisterView.tsx similarity index 82% rename from app/views/RegisterView.js rename to app/views/RegisterView.tsx index 5086bc9ee..045712163 100644 --- a/app/views/RegisterView.js +++ b/app/views/RegisterView.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import PropTypes from 'prop-types'; import { Keyboard, StyleSheet, Text, View } from 'react-native'; +import { StackNavigationProp } from '@react-navigation/stack'; +import { RouteProp } from '@react-navigation/core'; import { connect } from 'react-redux'; import RNPickerSelect from 'react-native-picker-select'; @@ -49,27 +50,37 @@ const styles = StyleSheet.create({ } }); -class RegisterView extends React.Component { - static navigationOptions = ({ route, navigation }) => ({ - title: route.params?.title ?? 'Rocket.Chat', +interface IProps { + navigation: StackNavigationProp; + route: RouteProp; + server: string; + Site_Name: string; + Gitlab_URL: string; + CAS_enabled: boolean; + CAS_login_url: string; + Accounts_CustomFields: string; + Accounts_EmailVerification: boolean; + Accounts_ManuallyApproveNewUsers: boolean; + showLoginButton: boolean; + loginRequest: Function; + theme: string; +} + +class RegisterView extends React.Component { + private parsedCustomFields: any; + private usernameInput: any; + private passwordInput: any; + private emailInput: any; + private avatarUrl: any; + + static navigationOptions = ({ route, navigation }: Partial) => ({ + title: route?.params?.title ?? 'Rocket.Chat', headerRight: () => }); - static propTypes = { - navigation: PropTypes.object, - server: PropTypes.string, - Accounts_CustomFields: PropTypes.string, - Accounts_EmailVerification: PropTypes.bool, - Accounts_ManuallyApproveNewUsers: PropTypes.bool, - theme: PropTypes.string, - Site_Name: PropTypes.string, - loginRequest: PropTypes.func, - showLoginButton: PropTypes.bool - }; - - constructor(props) { + constructor(props: IProps) { super(props); - const customFields = {}; + const customFields: any = {}; this.parsedCustomFields = {}; if (props.Accounts_CustomFields) { try { @@ -78,7 +89,7 @@ class RegisterView extends React.Component { log(e); } } - Object.keys(this.parsedCustomFields).forEach(key => { + Object.keys(this.parsedCustomFields).forEach((key: string) => { if (this.parsedCustomFields[key].defaultValue) { customFields[key] = this.parsedCustomFields[key].defaultValue; } @@ -101,7 +112,7 @@ class RegisterView extends React.Component { valid = () => { const { name, email, password, username, customFields } = this.state; let requiredCheck = true; - Object.keys(this.parsedCustomFields).forEach(key => { + Object.keys(this.parsedCustomFields).forEach((key: string) => { if (this.parsedCustomFields[key].required) { requiredCheck = requiredCheck && customFields[key] && Boolean(customFields[key].trim()); } @@ -138,7 +149,7 @@ class RegisterView extends React.Component { } else { await loginRequest({ user: email, password }); } - } catch (e) { + } catch (e: any) { if (e.data?.errorType === 'username-invalid') { return loginRequest({ user: email, password }); } @@ -150,7 +161,7 @@ class RegisterView extends React.Component { this.setState({ saving: false }); }; - openContract = route => { + openContract = (route: string) => { const { server, theme } = this.props; if (!server) { return; @@ -167,19 +178,20 @@ class RegisterView extends React.Component { try { return Object.keys(this.parsedCustomFields).map((key, index, array) => { if (this.parsedCustomFields[key].type === 'select') { - const options = this.parsedCustomFields[key].options.map(option => ({ label: option, value: option })); + const options = this.parsedCustomFields[key].options.map((option: string) => ({ label: option, value: option })); return ( { - const newValue = {}; + const newValue: { [key: string]: string | number } = {}; newValue[key] = value; this.setState({ customFields: { ...customFields, ...newValue } }); }} value={customFields[key]}> { + inputRef={(e: any) => { + // @ts-ignore this[key] = e; }} placeholder={key} @@ -193,20 +205,22 @@ class RegisterView extends React.Component { return ( { + inputRef={(e: any) => { + // @ts-ignore this[key] = e; }} key={key} label={key} placeholder={key} value={customFields[key]} - onChangeText={value => { - const newValue = {}; + onChangeText={(value: string) => { + const newValue: { [key: string]: string | number } = {}; newValue[key] = value; this.setState({ customFields: { ...customFields, ...newValue } }); }} onSubmitEditing={() => { if (array.length - 1 > index) { + // @ts-ignore return this[array[index + 1]].focus(); } this.avatarUrl.focus(); @@ -234,7 +248,7 @@ class RegisterView extends React.Component { containerStyle={styles.inputContainer} placeholder={I18n.t('Name')} returnKeyType='next' - onChangeText={name => this.setState({ name })} + onChangeText={(name: string) => this.setState({ name })} onSubmitEditing={() => { this.usernameInput.focus(); }} @@ -249,7 +263,7 @@ class RegisterView extends React.Component { }} placeholder={I18n.t('Username')} returnKeyType='next' - onChangeText={username => this.setState({ username })} + onChangeText={(username: string) => this.setState({ username })} onSubmitEditing={() => { this.emailInput.focus(); }} @@ -265,7 +279,7 @@ class RegisterView extends React.Component { placeholder={I18n.t('Email')} returnKeyType='next' keyboardType='email-address' - onChangeText={email => this.setState({ email })} + onChangeText={(email: string) => this.setState({ email })} onSubmitEditing={() => { this.passwordInput.focus(); }} @@ -281,7 +295,7 @@ class RegisterView extends React.Component { placeholder={I18n.t('Password')} returnKeyType='send' secureTextEntry - onChangeText={value => this.setState({ password: value })} + onChangeText={(value: string) => this.setState({ password: value })} onSubmitEditing={this.submit} testID='register-view-password' theme={theme} @@ -334,7 +348,7 @@ class RegisterView extends React.Component { } } -const mapStateToProps = state => ({ +const mapStateToProps = (state: any) => ({ server: state.server.server, Site_Name: state.settings.Site_Name, Gitlab_URL: state.settings.API_Gitlab_URL, @@ -346,8 +360,8 @@ const mapStateToProps = state => ({ showLoginButton: getShowLoginButton(state) }); -const mapDispatchToProps = dispatch => ({ - loginRequest: params => dispatch(loginRequestAction(params)) +const mapDispatchToProps = (dispatch: any) => ({ + loginRequest: (params: any) => dispatch(loginRequestAction(params)) }); export default connect(mapStateToProps, mapDispatchToProps)(withTheme(RegisterView)); diff --git a/app/views/RoomView/List/index.js b/app/views/RoomView/List/index.js index c32490ba6..0db6c8b69 100644 --- a/app/views/RoomView/List/index.js +++ b/app/views/RoomView/List/index.js @@ -14,6 +14,7 @@ import { animateNextTransition } from '../../../utils/layoutAnimation'; import ActivityIndicator from '../../../containers/ActivityIndicator'; import { themes } from '../../../constants/colors'; import debounce from '../../../utils/debounce'; +import { compareServerVersion, methods } from '../../../lib/utils'; import List from './List'; import NavBottomFAB from './NavBottomFAB'; @@ -43,7 +44,8 @@ class ListContainer extends React.Component { tunread: PropTypes.array, ignored: PropTypes.array, navigation: PropTypes.object, - showMessageInMainThread: PropTypes.bool + showMessageInMainThread: PropTypes.bool, + serverVersion: PropTypes.string }; constructor(props) { @@ -131,7 +133,7 @@ class ListContainer extends React.Component { query = async () => { this.count += QUERY_SIZE; - const { rid, tmid, showMessageInMainThread } = this.props; + const { rid, tmid, showMessageInMainThread, serverVersion } = this.props; const db = database.active; // handle servers with version < 3.0.0 @@ -172,7 +174,14 @@ class ListContainer extends React.Component { if (tmid && this.thread) { messages = [...messages, this.thread]; } - messages = messages.filter(m => !m.t || !hideSystemMessages?.includes(m.t)); + + /** + * Since 3.16.0 server version, the backend don't response with messages if + * hide system message is enabled + */ + if (compareServerVersion(serverVersion, '3.16.0', methods.lowerThan) || hideSystemMessages.length) { + messages = messages.filter(m => !m.t || !hideSystemMessages?.includes(m.t)); + } if (this.mounted) { this.setState({ messages }, () => this.update()); diff --git a/app/views/RoomView/index.js b/app/views/RoomView/index.js index 713be5615..4a58770f9 100644 --- a/app/views/RoomView/index.js +++ b/app/views/RoomView/index.js @@ -120,6 +120,7 @@ class RoomView extends React.Component { Message_Read_Receipt_Enabled: PropTypes.bool, Hide_System_Messages: PropTypes.array, baseUrl: PropTypes.string, + serverVersion: PropTypes.string, customEmojis: PropTypes.object, isMasterDetail: PropTypes.bool, theme: PropTypes.string, @@ -1154,7 +1155,7 @@ class RoomView extends React.Component { render() { console.count(`${this.constructor.name}.render calls`); const { room, reactionsModalVisible, selectedMessage, loading, reacting, showingBlockingLoader } = this.state; - const { user, baseUrl, theme, navigation, Hide_System_Messages, width, height } = this.props; + const { user, baseUrl, theme, navigation, Hide_System_Messages, width, height, serverVersion } = this.props; const { rid, t, sysMes, bannerClosed, announcement } = room; return ( @@ -1182,6 +1183,7 @@ class RoomView extends React.Component { navigation={navigation} hideSystemMessages={Array.isArray(sysMes) ? sysMes : Hide_System_Messages} showMessageInMainThread={user.showMessageInMainThread} + serverVersion={serverVersion} /> {this.renderFooter()} {this.renderActions()} @@ -1220,6 +1222,7 @@ const mapStateToProps = state => ({ Message_TimeFormat: state.settings.Message_TimeFormat, customEmojis: state.customEmojis, baseUrl: state.server.server, + serverVersion: state.server.version, Message_Read_Receipt_Enabled: state.settings.Message_Read_Receipt_Enabled, Hide_System_Messages: state.settings.Hide_System_Messages }); diff --git a/app/views/RoomsListView/index.js b/app/views/RoomsListView/index.js index 41da6dd80..518e10c48 100644 --- a/app/views/RoomsListView/index.js +++ b/app/views/RoomsListView/index.js @@ -613,6 +613,8 @@ class RoomsListView extends React.Component { isRead = item => RocketChat.isRead(item); + isSwipeEnabled = item => !(item?.search || item?.joinCodeRequired || item?.outside); + getUserPresence = uid => RocketChat.getUserPresence(uid); getUidDirectMessage = room => RocketChat.getUidDirectMessage(room); @@ -928,6 +930,7 @@ class RoomsListView extends React.Component { displayMode } = this.props; const id = this.getUidDirectMessage(item); + const swipeEnabled = this.isSwipeEnabled(item); return ( diff --git a/app/views/SendEmailConfirmationView.tsx b/app/views/SendEmailConfirmationView.tsx new file mode 100644 index 000000000..892673acc --- /dev/null +++ b/app/views/SendEmailConfirmationView.tsx @@ -0,0 +1,94 @@ +import React, { useEffect, useState } from 'react'; +import { StackNavigationProp } from '@react-navigation/stack'; + +import TextInput from '../containers/TextInput'; +import Button from '../containers/Button'; +import { showErrorAlert } from '../utils/info'; +import isValidEmail from '../utils/isValidEmail'; +import I18n from '../i18n'; +import RocketChat from '../lib/rocketchat'; +import { useTheme } from '../theme'; +import FormContainer, { FormContainerInner } from '../containers/FormContainer'; +import log, { events, logEvent } from '../utils/log'; +import sharedStyles from './Styles'; + +interface ISendEmailConfirmationView { + navigation: StackNavigationProp; + route: { + params: { + user?: string; + }; + }; +} + +const SendEmailConfirmationView = ({ navigation, route }: ISendEmailConfirmationView): JSX.Element => { + const [email, setEmail] = useState(''); + const [invalidEmail, setInvalidEmail] = useState(true); + const [isFetching, setIsFetching] = useState(false); + + const { theme } = useTheme(); + + const validate = (val: string) => { + const isInvalidEmail = !isValidEmail(val); + setEmail(val); + setInvalidEmail(isInvalidEmail); + }; + + const resendConfirmationEmail = async () => { + logEvent(events.SEC_SEND_EMAIL_CONFIRMATION); + if (invalidEmail || !email) { + return; + } + try { + setIsFetching(true); + const result = await RocketChat.sendConfirmationEmail(email); + if (result.success) { + navigation.pop(); + showErrorAlert(I18n.t('Verify_email_desc')); + } + } catch (e: any) { + log(e); + const msg = e?.data?.error || I18n.t('There_was_an_error_while_action', { action: I18n.t('sending_email_confirmation') }); + showErrorAlert(msg, I18n.t('Alert')); + } + setIsFetching(false); + }; + + useEffect(() => { + navigation.setOptions({ + title: 'Rocket.Chat' + }); + if (route.params?.user) { + validate(route.params.user); + } + }, []); + + return ( + + + validate(email)} + onSubmitEditing={resendConfirmationEmail} + testID='send-email-confirmation-view-email' + containerStyle={sharedStyles.inputLastChild} + theme={theme} + value={email} + /> +