From 3e9ab8877c03b263b92bc6ade985ac2008fdbff6 Mon Sep 17 00:00:00 2001 From: Devaansh Bhandari <107868772+brf153@users.noreply.github.com> Date: Mon, 18 Dec 2023 23:52:46 +0530 Subject: [PATCH 01/19] fix: Add markdown to Directory descriptions (#5399) Signed-off-by: brf153 <153hsb@gmail.com> --- app/containers/DirectoryItem/index.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/containers/DirectoryItem/index.tsx b/app/containers/DirectoryItem/index.tsx index 5edf32637..f4f555478 100644 --- a/app/containers/DirectoryItem/index.tsx +++ b/app/containers/DirectoryItem/index.tsx @@ -7,6 +7,7 @@ import RoomTypeIcon from '../RoomTypeIcon'; import styles, { ROW_HEIGHT } from './styles'; import { themes } from '../../lib/constants'; import { TSupportedThemes, useTheme } from '../../theme'; +import { MarkdownPreview } from '../markdown'; export { ROW_HEIGHT }; @@ -60,9 +61,11 @@ const DirectoryItem = ({ {description ? ( - - {description} - + ) : null} From c7fc819f66d09c9bde342a12d0e85c6d1a1e9cd5 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Mon, 18 Dec 2023 16:22:49 -0300 Subject: [PATCH 02/19] chore: Bump version to 4.45.0 (#5411) --- android/app/build.gradle | 2 +- ios/RocketChatRN.xcodeproj/project.pbxproj | 4 ++-- ios/RocketChatRN/Info.plist | 2 +- ios/ShareRocketChatRN/Info.plist | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 287dcf442..8f7e6a60a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -147,7 +147,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode VERSIONCODE as Integer - versionName "4.44.0" + versionName "4.45.0" vectorDrawables.useSupportLibrary = true if (!isFoss) { manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String] diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj index 2d4cdb596..b0c664c1e 100644 --- a/ios/RocketChatRN.xcodeproj/project.pbxproj +++ b/ios/RocketChatRN.xcodeproj/project.pbxproj @@ -1766,7 +1766,7 @@ INFOPLIST_FILE = NotificationService/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 4.44.0; + MARKETING_VERSION = 4.45.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; @@ -1805,7 +1805,7 @@ INFOPLIST_FILE = NotificationService/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 4.44.0; + MARKETING_VERSION = 4.45.0; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService; diff --git a/ios/RocketChatRN/Info.plist b/ios/RocketChatRN/Info.plist index fed3b4c00..bc380c71b 100644 --- a/ios/RocketChatRN/Info.plist +++ b/ios/RocketChatRN/Info.plist @@ -26,7 +26,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.44.0 + 4.45.0 CFBundleSignature ???? CFBundleURLTypes diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist index a00108568..a48b4c8ad 100644 --- a/ios/ShareRocketChatRN/Info.plist +++ b/ios/ShareRocketChatRN/Info.plist @@ -26,7 +26,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 4.44.0 + 4.45.0 CFBundleVersion 1 KeychainGroup diff --git a/package.json b/package.json index dc8718061..3696e6d70 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket-chat-reactnative", - "version": "4.44.0", + "version": "4.45.0", "private": true, "scripts": { "start": "react-native start", From 64d1134ea6ae488e0798ad8bf11d136d7f8aeeb8 Mon Sep 17 00:00:00 2001 From: Reinaldo Neto <47038980+reinaldonetof@users.noreply.github.com> Date: Fri, 22 Dec 2023 12:36:23 -0300 Subject: [PATCH 03/19] fix: navigate to myself from mention (#5400) Co-authored-by: Gabriel Casals <83978645+casalsgh@users.noreply.github.com> --- app/containers/markdown/AtMention.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/containers/markdown/AtMention.tsx b/app/containers/markdown/AtMention.tsx index ec428a321..694f5d403 100644 --- a/app/containers/markdown/AtMention.tsx +++ b/app/containers/markdown/AtMention.tsx @@ -34,8 +34,9 @@ const AtMention = React.memo(({ mention, mentions, username, navToRoomInfo, styl ); } + const itsMe = mention === username; let mentionStyle = {}; - if (mention === username) { + if (itsMe) { mentionStyle = { color: themes[theme].mentionMeColor }; @@ -51,7 +52,8 @@ const AtMention = React.memo(({ mention, mentions, username, navToRoomInfo, styl logEvent(events.ROOM_MENTION_GO_USER_INFO); const navParam = { t: 'd', - rid: user && user._id + rid: user && user._id, + itsMe }; if (navToRoomInfo) { navToRoomInfo(navParam); From e4add50eb9f998a81b1460ddca7d29c68cd792fc Mon Sep 17 00:00:00 2001 From: Amit giri <77196415+Amitlpu-840@users.noreply.github.com> Date: Fri, 22 Dec 2023 21:10:01 +0530 Subject: [PATCH 04/19] chore: Removed header icons and update blog link(#5422) --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index abfbf9be3..ec2c4eff0 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,5 @@ # Rocket.Chat Mobile -[![Project Dependencies](https://david-dm.org/RocketChat/Rocket.Chat.ReactNative.svg)](https://david-dm.org/RocketChat/Rocket.Chat.ReactNative) -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/bb15e2392a71473ea59d3f634f35c54e)](https://www.codacy.com/app/RocketChat/Rocket.Chat.ReactNative?utm_source=github.com&utm_medium=referral&utm_content=RocketChat/Rocket.Chat.ReactNative&utm_campaign=badger) -[![codecov](https://codecov.io/gh/RocketChat/Rocket.Chat.ReactNative/branch/master/graph/badge.svg)](https://codecov.io/gh/RocketChat/Rocket.Chat.ReactNative) -[![CodeFactor](https://www.codefactor.io/repository/github/rocketchat/rocket.chat.reactnative/badge)](https://www.codefactor.io/repository/github/rocketchat/rocket.chat.reactnative) - - **Supported server versions:** 0.70.0+ - **Supported iOS versions**: 12+ - **Supported Android versions**: 6.0+ @@ -35,7 +30,7 @@ Do you want to make the app run on your own server only? [Follow our whitelabel ## Engage with us ### Share your story -We’d love to hear about [your experience](https://survey.zohopublic.com/zs/e4BUFG) and potentially feature it on our [blog](https://rocket.chat/case-studies/?utm_source=github&utm_medium=readme&utm_campaign=community). +We’d love to hear about [your experience](https://survey.zohopublic.com/zs/e4BUFG) and potentially feature it on our [blog](https://www.rocket.chat/blog?utm_source=github&utm_medium=readme&utm_campaign=community). ### Subscribe for Updates Once a month our marketing team releases an email update with news about product releases, company related topics, events and use cases. [Sign up!](https://rocket.chat/newsletter/?utm_source=github&utm_medium=readme&utm_campaign=community) From ed2edf2008e82500bc33b3c22d4bfc07f42cda5c Mon Sep 17 00:00:00 2001 From: Devaansh Bhandari <107868772+brf153@users.noreply.github.com> Date: Fri, 22 Dec 2023 21:11:50 +0530 Subject: [PATCH 05/19] feat(i18n): Add Hungarian language (#5417) Signed-off-by: brf153 <153hsb@gmail.com> Co-authored-by: Diego Mello --- app/i18n/index.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/i18n/index.ts b/app/i18n/index.ts index aa2fdb8ba..c9a2d4bf3 100644 --- a/app/i18n/index.ts +++ b/app/i18n/index.ts @@ -60,6 +60,12 @@ export const LANGUAGES: ILanguage[] = [ file: () => require('./locales/hi-IN.json') }, + { + label: 'Hungarian', + value: 'hu', + file: () => require('./locales/hu.json') + }, + { label: 'Italiano', value: 'it', From e4d45921456a72da15f3acbfd748d8af3c052d00 Mon Sep 17 00:00:00 2001 From: Reinaldo Neto <47038980+reinaldonetof@users.noreply.github.com> Date: Tue, 26 Dec 2023 10:36:59 -0300 Subject: [PATCH 06/19] feat: add "show more" to user info status (#5383) * improve: handle long status text with a collapsible text element * remove the points from show_more value * refactor the path * add storyshot * remove comments * minor tweak at pt-br * add the e2e test * remove fontInfo * refactor layout * fix e2e test * fix the text for both platforms * add comment * update detox to 20.11 to accept regex and fix the test for show more --- .storybook/storybook.requires.js | 1 + .../CollapsibleText.stories.storyshot | 3 + .../CollapsibleText.stories.tsx | 21 +++++ app/containers/CollapsibleText/index.tsx | 86 +++++++++++++++++++ app/i18n/locales/ar.json | 2 +- app/i18n/locales/de.json | 2 +- app/i18n/locales/en.json | 3 +- app/i18n/locales/fi.json | 2 +- app/i18n/locales/fr.json | 2 +- app/i18n/locales/it.json | 2 +- app/i18n/locales/ja.json | 1 - app/i18n/locales/nl.json | 2 +- app/i18n/locales/pt-BR.json | 3 +- app/i18n/locales/ru.json | 2 +- app/i18n/locales/sl-SI.json | 2 +- app/i18n/locales/sv.json | 2 +- app/i18n/locales/tr.json | 2 +- .../components/RoomInfoViewTitle.tsx | 12 ++- app/views/RoomInfoView/styles.ts | 13 ++- e2e/tests/room/08-roominfo.spec.ts | 28 ++++++ package.json | 2 +- yarn.lock | 79 ++++++++--------- 22 files changed, 211 insertions(+), 61 deletions(-) create mode 100644 __tests__/containers/CollapsibleText/__snapshots__/CollapsibleText.stories.storyshot create mode 100644 app/containers/CollapsibleText/CollapsibleText.stories.tsx create mode 100644 app/containers/CollapsibleText/index.tsx diff --git a/.storybook/storybook.requires.js b/.storybook/storybook.requires.js index 4536cd114..40df7c501 100644 --- a/.storybook/storybook.requires.js +++ b/.storybook/storybook.requires.js @@ -29,6 +29,7 @@ const getStories = () => { require("../app/containers/markdown/Markdown.stories.tsx"), require("../app/containers/markdown/new/NewMarkdown.stories.tsx"), require("../app/containers/message/Components/CollapsibleQuote/CollapsibleQuote.stories.tsx"), + require("../app/containers/CollapsibleText/CollapsibleText.stories.tsx"), require("../app/containers/message/Message.stories.tsx"), require("../app/containers/ReactionsList/ReactionsList.stories.tsx"), require("../app/containers/RoomHeader/RoomHeader.stories.tsx"), diff --git a/__tests__/containers/CollapsibleText/__snapshots__/CollapsibleText.stories.storyshot b/__tests__/containers/CollapsibleText/__snapshots__/CollapsibleText.stories.storyshot new file mode 100644 index 000000000..5cbe94633 --- /dev/null +++ b/__tests__/containers/CollapsibleText/__snapshots__/CollapsibleText.stories.storyshot @@ -0,0 +1,3 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Storyshots Collapsible Text Item 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"padding\\":20}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"accessibilityLabel\\":\\"Lorem ipsum dolor sit amet\\",\\"style\\":[{\\"fontSize\\":16,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\",\\"textAlignVertical\\":\\"center\\"},{\\"color\\":\\"#2f343d\\",\\"height\\":0}],\\"testID\\":\\"collapsible-text-Lorem ipsum dolor sit amet\\"},\\"children\\":[\\"Lorem ipsum dolor sit amet\\"]},{\\"type\\":\\"Text\\",\\"props\\":{\\"accessibilityLabel\\":\\"linesToTruncate: 1 - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam vel vestibulum neque. Proin dignissim neque in urna nec.\\",\\"style\\":[{\\"fontSize\\":16,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\",\\"textAlignVertical\\":\\"center\\"},{\\"color\\":\\"#2f343d\\",\\"height\\":0}],\\"testID\\":\\"collapsible-text-linesToTruncate: 1 - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam vel vestibulum neque. Proin dignissim neque in urna nec.\\"},\\"children\\":[\\"linesToTruncate: 1 - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam vel vestibulum neque. Proin dignissim neque in urna nec.\\"]},{\\"type\\":\\"Text\\",\\"props\\":{\\"accessibilityLabel\\":\\"linesToTruncate: 2 - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam vel vestibulum neque. Proin dignissim neque in urna nec.\\",\\"style\\":[{\\"fontSize\\":16,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\",\\"textAlignVertical\\":\\"center\\"},{\\"color\\":\\"#2f343d\\",\\"height\\":0}],\\"testID\\":\\"collapsible-text-linesToTruncate: 2 - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam vel vestibulum neque. Proin dignissim neque in urna nec.\\"},\\"children\\":[\\"linesToTruncate: 2 - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam vel vestibulum neque. Proin dignissim neque in urna nec.\\"]}]}"`; diff --git a/app/containers/CollapsibleText/CollapsibleText.stories.tsx b/app/containers/CollapsibleText/CollapsibleText.stories.tsx new file mode 100644 index 000000000..04d17ef96 --- /dev/null +++ b/app/containers/CollapsibleText/CollapsibleText.stories.tsx @@ -0,0 +1,21 @@ +import React from 'react'; +import { View } from 'react-native'; + +import CollapsibleText from '.'; + +const smallText = 'Lorem ipsum dolor sit amet'; + +const text120 = + 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam vel vestibulum neque. Proin dignissim neque in urna nec.'; + +export default { + title: 'Collapsible Text' +}; + +export const Item = () => ( + + + + + +); diff --git a/app/containers/CollapsibleText/index.tsx b/app/containers/CollapsibleText/index.tsx new file mode 100644 index 000000000..514740b16 --- /dev/null +++ b/app/containers/CollapsibleText/index.tsx @@ -0,0 +1,86 @@ +import React, { useState } from 'react'; +import { TextStyle, Text, StyleSheet } from 'react-native'; + +import sharedStyles from '../../views/Styles'; +import { useTheme } from '../../theme'; +import { previewFormatText } from '../markdown/previewFormatText'; +import I18n from '../../i18n'; + +interface ICollapsibleText { + msg?: string; + style?: TextStyle[]; + linesToTruncate?: number; +} + +const styles = StyleSheet.create({ + text: { + fontSize: 16, + ...sharedStyles.textRegular, + textAlignVertical: 'center' + }, + textInfo: { + fontSize: 14, + ...sharedStyles.textRegular + } +}); + +const CollapsibleText = ({ msg, style = [], linesToTruncate = 1 }: ICollapsibleText) => { + const [truncatedText, setTruncatedText] = useState(''); + const [showTruncated, setShowTruncated] = useState(true); + + const { colors } = useTheme(); + + if (!msg) { + return null; + } + + const m = previewFormatText(msg); + + if (truncatedText && showTruncated) { + return ( + + + {`${truncatedText}... `} + + setShowTruncated(false)} style={[styles.textInfo, { color: colors.actionTintColor }]}> + {I18n.t('Show_more')} + + + ); + } + + return ( + { + const { lines } = event.nativeEvent; + if (lines.length > linesToTruncate) { + const text = lines + .splice(0, linesToTruncate) + .map(line => line.text) + .join(''); + const truncatedTextLengthWithShowMore = text.length - (4 + I18n.t('Show_more').length); + const clippedText = text.slice(0, truncatedTextLengthWithShowMore); + setTruncatedText(clippedText); + } else { + setShowTruncated(false); + } + }} + > + {m} + {truncatedText ? ( + setShowTruncated(true)} + style={[styles.textInfo, { color: colors.actionTintColor }]} + > + {` ${I18n.t('Show_less')}`} + + ) : null} + + ); +}; + +export default CollapsibleText; diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json index 5911d58a8..cb5df1b35 100644 --- a/app/i18n/locales/ar.json +++ b/app/i18n/locales/ar.json @@ -344,7 +344,7 @@ "Share": "مشاركة", "Share_Link": "مشاركة رابط", "Share_this_app": "مشاركة هذا البرنامج", - "Show_more": "إظهار أكثر..", + "Show_more": "إظهار أكثر", "Sign_Up": "تسجيل جديد", "Sound": "الصوت", "Star": "تمييز", diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json index d1415cf82..cac081cef 100644 --- a/app/i18n/locales/de.json +++ b/app/i18n/locales/de.json @@ -378,7 +378,7 @@ "Share": "Teilen", "Share_Link": "Link teilen", "Share_this_app": "App teilen", - "Show_more": "Mehr anzeigen …", + "Show_more": "Mehr anzeigen", "Sign_Up": "Anmelden", "Sound": "Ton", "Star": "Favoriten", diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json index 5753cb3a0..73f311964 100644 --- a/app/i18n/locales/en.json +++ b/app/i18n/locales/en.json @@ -378,7 +378,8 @@ "Share": "Share", "Share_Link": "Share link", "Share_this_app": "Share this app", - "Show_more": "Show more..", + "Show_more": "Show more", + "Show_less": "Show less", "Sign_Up": "Sign up", "Sound": "Sound", "Star": "Star", diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json index 514e8cbd3..9daaa4169 100644 --- a/app/i18n/locales/fi.json +++ b/app/i18n/locales/fi.json @@ -378,7 +378,7 @@ "Share": "Jaa", "Share_Link": "Jaa linkki", "Share_this_app": "Jaa tämä sovellus", - "Show_more": "Näytä lisää...", + "Show_more": "Näytä lisää", "Sign_Up": "Rekisteröidy", "Sound": "Ääni", "Star": "Tähti", diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json index 863d87709..dd229bb2d 100644 --- a/app/i18n/locales/fr.json +++ b/app/i18n/locales/fr.json @@ -353,7 +353,7 @@ "Share": "Partager", "Share_Link": "Partager le lien", "Share_this_app": "Partager cette application", - "Show_more": "Afficher plus..", + "Show_more": "Afficher plus", "Sign_Up": "S'inscrire", "Sound": "Son", "Star": "Mettre en favoris", diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json index 69190bdc7..62873f639 100644 --- a/app/i18n/locales/it.json +++ b/app/i18n/locales/it.json @@ -358,7 +358,7 @@ "Share": "Condividi", "Share_Link": "Condividi link", "Share_this_app": "Condividi questa app", - "Show_more": "Mostra altri..", + "Show_more": "Mostra altri", "Sign_Up": "Registrati", "Sound": "Suono", "Star": "Aggiungi ai preferiti", diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json index 86bdd065d..e8cef1f39 100644 --- a/app/i18n/locales/ja.json +++ b/app/i18n/locales/ja.json @@ -310,7 +310,6 @@ "Share": "シェア", "Share_Link": "リンクをシェアする", "Share_this_app": "このアプリをシェアする", - "Show_more": "Show more..", "Sign_Up": "登録", "Sound": "音", "Star": "お気に入り", diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json index 6fc3919fa..8e4e37391 100644 --- a/app/i18n/locales/nl.json +++ b/app/i18n/locales/nl.json @@ -353,7 +353,7 @@ "Share": "Delen", "Share_Link": "Deel link", "Share_this_app": "Deel deze app", - "Show_more": "Meer tonen..", + "Show_more": "Meer tonen", "Sign_Up": "Registreren", "Sound": "Geluid", "Star": "Ster", diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json index 7a73a3bf2..ea9a1d4e1 100644 --- a/app/i18n/locales/pt-BR.json +++ b/app/i18n/locales/pt-BR.json @@ -378,7 +378,8 @@ "Share": "Compartilhar", "Share_Link": "Compartilhar convite", "Share_this_app": "Compartilhar esse app", - "Show_more": "Mostrar mais..", + "Show_more": "Mostrar mais", + "Show_less": "Mostrar menos", "Sign_Up": "Registrar", "Sound": "Som da notificação", "Star": "Favorito", diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json index de7818fe9..85c9b0ee3 100644 --- a/app/i18n/locales/ru.json +++ b/app/i18n/locales/ru.json @@ -364,7 +364,7 @@ "Share": "Поделиться", "Share_Link": "Ссылка, чтобы Поделиться", "Share_this_app": "Рассказать о приложении", - "Show_more": "Показать больше..", + "Show_more": "Показать больше", "Sign_Up": "Регистрация", "Sound": "Звук", "Star": "Отметить", diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json index 471f53204..345ebe343 100644 --- a/app/i18n/locales/sl-SI.json +++ b/app/i18n/locales/sl-SI.json @@ -361,7 +361,7 @@ "Share": "Deliti", "Share_Link": "Deliti povezavo", "Share_this_app": "Delite to aplikacijo", - "Show_more": "Prikaži več…", + "Show_more": "Prikaži več", "Sign_Up": "Prijavite se", "Sound": "Zvok", "Star": "zvezda", diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json index 67dcdf38a..3949e02da 100644 --- a/app/i18n/locales/sv.json +++ b/app/i18n/locales/sv.json @@ -378,7 +378,7 @@ "Share": "Dela", "Share_Link": "Dela länk", "Share_this_app": "Dela den här appen", - "Show_more": "Visa mer.", + "Show_more": "Visa mer", "Sign_Up": "Registrera dig", "Sound": "Ljud", "Star": "Stjärna", diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json index a80ca0fc2..c789deea2 100644 --- a/app/i18n/locales/tr.json +++ b/app/i18n/locales/tr.json @@ -341,7 +341,7 @@ "Share": "Paylaş", "Share_Link": "Bağlantı paylaş", "Share_this_app": "Bu uygulamayı paylaş", - "Show_more": "Daha fazla göster..", + "Show_more": "Daha fazla göster", "Sign_Up": "Kaydol", "Sound": "Ses", "Star": "Yıldızla", diff --git a/app/views/RoomInfoView/components/RoomInfoViewTitle.tsx b/app/views/RoomInfoView/components/RoomInfoViewTitle.tsx index d2ef0875f..70f0892c1 100644 --- a/app/views/RoomInfoView/components/RoomInfoViewTitle.tsx +++ b/app/views/RoomInfoView/components/RoomInfoViewTitle.tsx @@ -4,9 +4,9 @@ import { Text, View } from 'react-native'; import { ISubscription, SubscriptionType } from '../../../definitions'; import styles from '../styles'; import { useTheme } from '../../../theme'; -import { MarkdownPreview } from '../../../containers/markdown'; import RoomTypeIcon from '../../../containers/RoomTypeIcon'; import { getRoomTitle } from '../../../lib/methods/helpers'; +import CollapsibleText from '../../../containers/CollapsibleText'; interface IRoomInfoViewTitle { room?: ISubscription; @@ -20,7 +20,7 @@ const RoomInfoViewTitle = ({ room, name, username, statusText, type }: IRoomInfo const { colors } = useTheme(); if (type === SubscriptionType.DIRECT) { return ( - <> + {name} @@ -32,10 +32,14 @@ const RoomInfoViewTitle = ({ room, name, username, statusText, type }: IRoomInfo )} {!!statusText && ( - + )} - + ); } return ( diff --git a/app/views/RoomInfoView/styles.ts b/app/views/RoomInfoView/styles.ts index 22773af5f..133a162e5 100644 --- a/app/views/RoomInfoView/styles.ts +++ b/app/views/RoomInfoView/styles.ts @@ -28,18 +28,18 @@ export default StyleSheet.create({ marginHorizontal: 10 }, roomTitleContainer: { - paddingTop: 32, + paddingTop: 16, marginHorizontal: 16, alignItems: 'center', flexDirection: 'row' }, roomTitle: { - fontSize: 20, + fontSize: 16, ...sharedStyles.textAlignCenter, ...sharedStyles.textMedium }, roomUsername: { - fontSize: 18, + fontSize: 14, ...sharedStyles.textAlignCenter, ...sharedStyles.textRegular }, @@ -75,7 +75,7 @@ export default StyleSheet.create({ }, roomButtonsContainer: { flexDirection: 'row', - paddingTop: 30 + paddingTop: 16 }, roomButton: { alignItems: 'center', @@ -84,5 +84,10 @@ export default StyleSheet.create({ }, roomButtonText: { marginTop: 5 + }, + roomInfoViewTitleContainer: { + paddingTop: 16, + paddingHorizontal: 20, + alignItems: 'center' } }); diff --git a/e2e/tests/room/08-roominfo.spec.ts b/e2e/tests/room/08-roominfo.spec.ts index f48dcec46..c9902f3f0 100644 --- a/e2e/tests/room/08-roominfo.spec.ts +++ b/e2e/tests/room/08-roominfo.spec.ts @@ -268,5 +268,33 @@ describe('Room info screen', () => { .withTimeout(10000); }); }); + + describe('Navigate to user status-test', () => { + it('Back to rooms list view', async () => { + await tapBack(); + await sleep(300); + await tapBack(); + await sleep(300); + await tapBack(); + await sleep(300); + }); + it('should see the status text with show more label', async () => { + const statusTextExpected = + 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam laoreet odio lectus, nec varius nisi semper ut porta ante'; + await navigateToRoomInfo('status-test'); + await waitFor(element(by.id(`collapsible-text-truncated-${statusTextExpected}`))) + .toBeVisible() + .withTimeout(10000); + await sleep(400); + const textWithShowMoreRegExp = /Lorem[\s\S]+... Show more/i + await waitFor(element(by[textMatcher](textWithShowMoreRegExp))) + .toExist() + .withTimeout(10000); + await element(by.id(`collapsible-text-truncated-${statusTextExpected}`)).tap({ x: 320, y: 24 }); + await waitFor(element(by.id(`collapsible-text-${statusTextExpected}`))) + .toBeVisible() + .withTimeout(10000); + }); + }); }); }); diff --git a/package.json b/package.json index 3696e6d70..636fedefd 100644 --- a/package.json +++ b/package.json @@ -192,7 +192,7 @@ "babel-loader": "8.3.0", "babel-plugin-transform-remove-console": "^6.9.4", "codecov": "^3.8.3", - "detox": "^20.1.2", + "detox": "20.11.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "2.26.0", diff --git a/yarn.lock b/yarn.lock index 8c2c3c5b3..8c10d1816 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3368,9 +3368,9 @@ regenerator-runtime "^0.13.4" "@babel/runtime@^7.21.0": - version "7.22.11" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.11.tgz#7a9ba3bbe406ad6f9e8dd4da2ece453eb23a77a4" - integrity sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA== + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.6.tgz#c05e610dc228855dc92ef1b53d07389ed8ab521d" + integrity sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ== dependencies: regenerator-runtime "^0.14.0" @@ -10143,19 +10143,20 @@ detect-port@^1.3.0: address "^1.0.1" debug "^2.6.0" -detox@^20.1.2: - version "20.1.2" - resolved "https://registry.yarnpkg.com/detox/-/detox-20.1.2.tgz#a66c709080b53a80f3b6ba1671f5c0dbf5ae6dc7" - integrity sha512-SGxLyuzE8TjIc4Lg49YKD0buj3JLaX+KtprSeFvn7ZTdWd4fH6o5Szd4KM21uBSpnYEEgXTgiCypPQst6dt5mQ== +detox@20.11.0: + version "20.11.0" + resolved "https://registry.yarnpkg.com/detox/-/detox-20.11.0.tgz#f240e01db12334e0706b7f3477e59b8a5e4358c8" + integrity sha512-01LpETlZwfo2V7Awo+5ccUbee7E1lvH3ldLlmXxsx3mQ0pEA65f9CaO+FWhtUGYh7vQRMOQ9SnzYdej/ydQ7iQ== dependencies: ajv "^8.6.3" bunyan "^1.8.12" bunyan-debug-stream "^3.1.0" caf "^15.0.1" - chalk "^2.4.2" + chalk "^4.0.0" child-process-promise "^2.2.0" - find-up "^4.1.0" - fs-extra "^4.0.2" + execa "^5.1.1" + find-up "^5.0.0" + fs-extra "^11.0.0" funpermaproxy "^1.1.0" glob "^8.0.3" ini "^1.3.4" @@ -10163,7 +10164,7 @@ detox@^20.1.2: lodash "^4.17.11" multi-sort-stream "^1.0.3" multipipe "^4.0.0" - node-ipc "^9.2.1" + node-ipc "9.2.1" proper-lockfile "^3.0.2" resolve-from "^5.0.0" sanitize-filename "^1.6.1" @@ -10178,8 +10179,8 @@ detox@^20.1.2: trace-event-lib "^1.3.1" which "^1.3.1" ws "^7.0.0" - yargs "^16.0.3" - yargs-parser "^20.2.9" + yargs "^17.0.0" + yargs-parser "^21.0.0" yargs-unparser "^2.0.0" diff-sequences@^25.2.6: @@ -11120,7 +11121,7 @@ execa@^2.0.3: signal-exit "^3.0.2" strip-final-newline "^2.0.0" -execa@^5.0.0: +execa@^5.0.0, execa@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== @@ -11925,14 +11926,14 @@ fs-extra@^10.1.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-extra@^4.0.2: - version "4.0.3" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" - integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg== +fs-extra@^11.0.0: + version "11.2.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b" + integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw== dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" fs-extra@^8.1.0, fs-extra@~8.1.0: version "8.1.0" @@ -15926,7 +15927,7 @@ node-int64@^0.4.0: resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= -node-ipc@^9.2.1: +node-ipc@9.2.1: version "9.2.1" resolved "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.2.1.tgz#b32f66115f9d6ce841dc4ec2009d6a733f98bb6b" integrity sha512-mJzaM6O3xHf9VT8BULvJSbdVbmHUKRNOH7zDDkCrA1/T+CVjq2WVIDfLt0azZRXpgArJtl3rtmEozrbXPZ9GaQ== @@ -18363,9 +18364,9 @@ regenerator-runtime@^0.13.7: integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== regenerator-runtime@^0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45" - integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA== + version "0.14.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" + integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== regenerator-transform@^0.14.2: version "0.14.4" @@ -21636,7 +21637,7 @@ yargs@^15.1.0, yargs@^15.3.1: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^16.0.3, yargs@^16.1.1, yargs@^16.2.0: +yargs@^16.1.1, yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== @@ -21649,6 +21650,19 @@ yargs@^16.0.3, yargs@^16.1.1, yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" +yargs@^17.0.0, yargs@^17.5.1: + version "17.7.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + yargs@^17.3.1: version "17.5.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e" @@ -21662,19 +21676,6 @@ yargs@^17.3.1: y18n "^5.0.5" yargs-parser "^21.0.0" -yargs@^17.5.1: - version "17.7.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" - integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" - yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From b5c15d6835bf1a5f9d2d226cb49e3a8dca9b30c9 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Tue, 26 Dec 2023 10:58:19 -0300 Subject: [PATCH 07/19] fix: supported version expiration only working for exceptions (#5431) --- app/lib/methods/checkSupportedVersions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/methods/checkSupportedVersions.ts b/app/lib/methods/checkSupportedVersions.ts index 86c504afc..2fc7acb16 100644 --- a/app/lib/methods/checkSupportedVersions.ts +++ b/app/lib/methods/checkSupportedVersions.ts @@ -77,6 +77,6 @@ export const checkSupportedVersions = function ({ status, message, i18n: message ? sv?.i18n : undefined, - expiration: exception?.expiration + expiration }; }; From a194e47d2d5d068b6fe2a59de131aecfa263fa16 Mon Sep 17 00:00:00 2001 From: Reinaldo Neto <47038980+reinaldonetof@users.noreply.github.com> Date: Tue, 26 Dec 2023 11:43:57 -0300 Subject: [PATCH 08/19] regression: load user on room info (#5425) * fix: navigate to myself from mention * fix: load user on room info * minor tweak --------- Co-authored-by: Diego Mello --- app/views/RoomInfoView/index.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/RoomInfoView/index.tsx b/app/views/RoomInfoView/index.tsx index 3ded11523..f53e79df4 100644 --- a/app/views/RoomInfoView/index.tsx +++ b/app/views/RoomInfoView/index.tsx @@ -167,9 +167,10 @@ const RoomInfoView = (): React.ReactElement => { } catch { // do nothing } + } else { + const r = handleRoles(roomUser); + if (r) setRoomUser({ ...roomUser, roles: r }); } - const r = handleRoles(roomUser); - if (r) setRoomUser({ ...roomUser, roles: r }); }; const loadRoom = async () => { From 734eb278a35c5057d7b9f38a46f42bace7739dec Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Tue, 26 Dec 2023 13:29:32 -0300 Subject: [PATCH 09/19] chore: Set version to 4.44.1 (#5432) --- android/app/build.gradle | 2 +- ios/RocketChatRN.xcodeproj/project.pbxproj | 4 ++-- ios/RocketChatRN/Info.plist | 2 +- ios/ShareRocketChatRN/Info.plist | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 8f7e6a60a..f4bf0b526 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -147,7 +147,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode VERSIONCODE as Integer - versionName "4.45.0" + versionName "4.44.1" vectorDrawables.useSupportLibrary = true if (!isFoss) { manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String] diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj index b0c664c1e..90ff561fe 100644 --- a/ios/RocketChatRN.xcodeproj/project.pbxproj +++ b/ios/RocketChatRN.xcodeproj/project.pbxproj @@ -1766,7 +1766,7 @@ INFOPLIST_FILE = NotificationService/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 4.45.0; + MARKETING_VERSION = 4.44.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; @@ -1805,7 +1805,7 @@ INFOPLIST_FILE = NotificationService/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 4.45.0; + MARKETING_VERSION = 4.44.1; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService; diff --git a/ios/RocketChatRN/Info.plist b/ios/RocketChatRN/Info.plist index bc380c71b..287dd40f5 100644 --- a/ios/RocketChatRN/Info.plist +++ b/ios/RocketChatRN/Info.plist @@ -26,7 +26,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.45.0 + 4.44.1 CFBundleSignature ???? CFBundleURLTypes diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist index a48b4c8ad..d249ea7e7 100644 --- a/ios/ShareRocketChatRN/Info.plist +++ b/ios/ShareRocketChatRN/Info.plist @@ -26,7 +26,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 4.45.0 + 4.44.1 CFBundleVersion 1 KeychainGroup diff --git a/package.json b/package.json index 636fedefd..9a854fdae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket-chat-reactnative", - "version": "4.45.0", + "version": "4.44.1", "private": true, "scripts": { "start": "react-native start", From 7819dfbc1ce784239fbae99fad2fe37b7b8d8c6f Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Tue, 26 Dec 2023 18:06:29 -0300 Subject: [PATCH 10/19] Bump version to 4.44.2 --- android/app/build.gradle | 2 +- ios/RocketChatRN.xcodeproj/project.pbxproj | 4 ++-- ios/RocketChatRN/Info.plist | 2 +- ios/ShareRocketChatRN/Info.plist | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index f4bf0b526..68388a0e1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -147,7 +147,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode VERSIONCODE as Integer - versionName "4.44.1" + versionName "4.44.2" vectorDrawables.useSupportLibrary = true if (!isFoss) { manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String] diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj index 90ff561fe..814a8d5c2 100644 --- a/ios/RocketChatRN.xcodeproj/project.pbxproj +++ b/ios/RocketChatRN.xcodeproj/project.pbxproj @@ -1766,7 +1766,7 @@ INFOPLIST_FILE = NotificationService/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 4.44.1; + MARKETING_VERSION = 4.44.2; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; @@ -1805,7 +1805,7 @@ INFOPLIST_FILE = NotificationService/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 4.44.1; + MARKETING_VERSION = 4.44.2; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService; diff --git a/ios/RocketChatRN/Info.plist b/ios/RocketChatRN/Info.plist index 287dd40f5..ef53afbb6 100644 --- a/ios/RocketChatRN/Info.plist +++ b/ios/RocketChatRN/Info.plist @@ -26,7 +26,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.44.1 + 4.44.2 CFBundleSignature ???? CFBundleURLTypes diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist index d249ea7e7..c9a459a77 100644 --- a/ios/ShareRocketChatRN/Info.plist +++ b/ios/ShareRocketChatRN/Info.plist @@ -26,7 +26,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 4.44.1 + 4.44.2 CFBundleVersion 1 KeychainGroup diff --git a/package.json b/package.json index 9a854fdae..980d55a4c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket-chat-reactnative", - "version": "4.44.1", + "version": "4.44.2", "private": true, "scripts": { "start": "react-native start", From a7d81dd2f545bb600f72c8da9830fc2514476bfa Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Wed, 27 Dec 2023 09:20:18 -0300 Subject: [PATCH 11/19] chore: Bump version to 4.45.0 (#5440) --- android/app/build.gradle | 2 +- ios/RocketChatRN.xcodeproj/project.pbxproj | 4 ++-- ios/RocketChatRN/Info.plist | 2 +- ios/ShareRocketChatRN/Info.plist | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 68388a0e1..8f7e6a60a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -147,7 +147,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode VERSIONCODE as Integer - versionName "4.44.2" + versionName "4.45.0" vectorDrawables.useSupportLibrary = true if (!isFoss) { manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String] diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj index 814a8d5c2..b0c664c1e 100644 --- a/ios/RocketChatRN.xcodeproj/project.pbxproj +++ b/ios/RocketChatRN.xcodeproj/project.pbxproj @@ -1766,7 +1766,7 @@ INFOPLIST_FILE = NotificationService/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 4.44.2; + MARKETING_VERSION = 4.45.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; @@ -1805,7 +1805,7 @@ INFOPLIST_FILE = NotificationService/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 4.44.2; + MARKETING_VERSION = 4.45.0; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService; diff --git a/ios/RocketChatRN/Info.plist b/ios/RocketChatRN/Info.plist index ef53afbb6..bc380c71b 100644 --- a/ios/RocketChatRN/Info.plist +++ b/ios/RocketChatRN/Info.plist @@ -26,7 +26,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.44.2 + 4.45.0 CFBundleSignature ???? CFBundleURLTypes diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist index c9a459a77..a48b4c8ad 100644 --- a/ios/ShareRocketChatRN/Info.plist +++ b/ios/ShareRocketChatRN/Info.plist @@ -26,7 +26,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 4.44.2 + 4.45.0 CFBundleVersion 1 KeychainGroup diff --git a/package.json b/package.json index 980d55a4c..636fedefd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket-chat-reactnative", - "version": "4.44.2", + "version": "4.45.0", "private": true, "scripts": { "start": "react-native start", From 86a9f4f8902d09954befc3e8baace901078eaf56 Mon Sep 17 00:00:00 2001 From: Sanjay Sargam Date: Tue, 2 Jan 2024 19:03:55 +0530 Subject: [PATCH 12/19] feat: close dropdown after changing type (#5450) --- app/views/DirectoryView/index.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/DirectoryView/index.tsx b/app/views/DirectoryView/index.tsx index 4305fea4c..b8f17d234 100644 --- a/app/views/DirectoryView/index.tsx +++ b/app/views/DirectoryView/index.tsx @@ -139,6 +139,7 @@ class DirectoryView extends React.Component { From 2dc52b26b6a9b0084a31c4a8904292bf65f708fb Mon Sep 17 00:00:00 2001 From: Reinaldo Neto <47038980+reinaldonetof@users.noreply.github.com> Date: Wed, 3 Jan 2024 17:48:58 -0300 Subject: [PATCH 13/19] fix: download gif files (#5445) * fix: download gif files * add test for gif extension * fix the gif animations at android devices * remove the space Co-authored-by: atulsingh98 --- android/app/build.gradle | 1 + app/lib/methods/handleMediaDownload.test.ts | 11 +++++++++++ app/lib/methods/handleMediaDownload.ts | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index 8f7e6a60a..8c05656f4 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -380,6 +380,7 @@ dependencies { androidTestImplementation('com.wix:detox:+') implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.facebook.soloader:soloader:0.10.4' + implementation 'com.facebook.fresco:animated-gif:2.5.0' } if (isNewArchitectureEnabled()) { diff --git a/app/lib/methods/handleMediaDownload.test.ts b/app/lib/methods/handleMediaDownload.test.ts index 0606e7630..877b02763 100644 --- a/app/lib/methods/handleMediaDownload.test.ts +++ b/app/lib/methods/handleMediaDownload.test.ts @@ -55,4 +55,15 @@ describe('Test the getFilename', () => { const filename = getFilename({ type: 'image', mimeType: image_type, title, url: image_url }); expect(filename).toBe('help-image-url.png'); }); + + it('returns the filename with the gif extension from a gif sent by tenor/giphy', () => { + const { image_type, image_url, title } = { + title: undefined, + image_url: 'https://media4.giphy.com/media/bGtO3RlAPHkeQ/giphy.gif', + image_type: undefined + }; + + const filename = getFilename({ type: 'image', mimeType: image_type, title, url: image_url }); + expect(filename).toBe('giphy.gif'); + }); }); diff --git a/app/lib/methods/handleMediaDownload.ts b/app/lib/methods/handleMediaDownload.ts index 75e8bbc54..1861951f1 100644 --- a/app/lib/methods/handleMediaDownload.ts +++ b/app/lib/methods/handleMediaDownload.ts @@ -68,6 +68,10 @@ export const getFilename = ({ }; const getExtension = (type: MediaTypes, mimeType?: string, url?: string) => { + // support url with gif extension and mimetype undefined, ex.: using the app tenor and giphy. + if (url?.split('.').pop() === 'gif') { + return 'gif'; + } if (!mimeType) { return defaultType[type]; } From 4ca9042da0c58b19eecf0be7b273004746c87bf2 Mon Sep 17 00:00:00 2001 From: Reinaldo Neto <47038980+reinaldonetof@users.noreply.github.com> Date: Wed, 3 Jan 2024 18:14:31 -0300 Subject: [PATCH 14/19] feat: report user (#5371) * feat: report user * navigation from room info view to report user view * minor tweak rid type * showing the avatar and change the backghround color * finished the ui and action to report a user * minor tweak * update storyshot * add e2e test * not show the report and block to my self and fix the text alignment * minor tweak of container safeareaview * remove label style and keep the default * update test * e2e test for 6.5 servers * remove of block_user and unbblock_user * remove danger from block and ignore * remove of rid from params, change UserAvatarAndName to UserInfo * fix e2e test * fix the dinamic height with controlled text input * indent basebutton * fix button styles --------- Co-authored-by: Diego Mello --- app/definitions/rest/v1/index.ts | 4 +- app/definitions/rest/v1/moderation.ts | 5 + app/i18n/locales/ar.json | 2 - app/i18n/locales/bn-IN.json | 2 - app/i18n/locales/de.json | 2 - app/i18n/locales/en.json | 7 +- app/i18n/locales/es.json | 2 - app/i18n/locales/fi.json | 2 - app/i18n/locales/fr.json | 2 - app/i18n/locales/hi-IN.json | 2 - app/i18n/locales/hu.json | 2 - app/i18n/locales/it.json | 2 - app/i18n/locales/ja.json | 2 - app/i18n/locales/nl.json | 2 - app/i18n/locales/pt-BR.json | 7 +- app/i18n/locales/pt-PT.json | 2 - app/i18n/locales/ru.json | 2 - app/i18n/locales/sl-SI.json | 2 - app/i18n/locales/sv.json | 2 - app/i18n/locales/ta-IN.json | 2 - app/i18n/locales/te-IN.json | 2 - app/i18n/locales/tr.json | 2 - app/i18n/locales/zh-CN.json | 2 - app/i18n/locales/zh-TW.json | 2 - app/lib/services/restApi.ts | 4 + app/stacks/InsideStack.tsx | 2 + app/stacks/MasterDetailStack/index.tsx | 2 + app/stacks/MasterDetailStack/types.ts | 5 + app/stacks/types.ts | 5 + app/views/ReportUserView/UserInfo.tsx | 21 ++++ app/views/ReportUserView/index.tsx | 113 ++++++++++++++++++ app/views/ReportUserView/styles.ts | 37 ++++++ app/views/RoomActionsView/index.tsx | 63 +++++++--- .../components/RoomInfoButtons.tsx | 26 +++- app/views/RoomInfoView/index.tsx | 17 ++- app/views/RoomInfoView/styles.ts | 7 +- e2e/tests/room/10-ignoreuser.spec.ts | 61 +++++++++- 37 files changed, 352 insertions(+), 74 deletions(-) create mode 100644 app/definitions/rest/v1/moderation.ts create mode 100644 app/views/ReportUserView/UserInfo.tsx create mode 100644 app/views/ReportUserView/index.tsx create mode 100644 app/views/ReportUserView/styles.ts diff --git a/app/definitions/rest/v1/index.ts b/app/definitions/rest/v1/index.ts index 385da8927..9fbf3ffc9 100644 --- a/app/definitions/rest/v1/index.ts +++ b/app/definitions/rest/v1/index.ts @@ -20,6 +20,7 @@ import { CommandsEndpoints } from './commands'; import { PushTokenEndpoints } from './pushToken'; import { DirectoryEndpoint } from './directory'; import { AutoTranslateEndpoints } from './autotranslate'; +import { ModerationEndpoints } from './moderation'; export type Endpoints = ChannelsEndpoints & ChatEndpoints & @@ -42,4 +43,5 @@ export type Endpoints = ChannelsEndpoints & CommandsEndpoints & PushTokenEndpoints & DirectoryEndpoint & - AutoTranslateEndpoints; + AutoTranslateEndpoints & + ModerationEndpoints; diff --git a/app/definitions/rest/v1/moderation.ts b/app/definitions/rest/v1/moderation.ts new file mode 100644 index 000000000..b0fe15d62 --- /dev/null +++ b/app/definitions/rest/v1/moderation.ts @@ -0,0 +1,5 @@ +export type ModerationEndpoints = { + 'moderation.reportUser': { + POST: (params: { userId: string; description: string }) => void; + }; +}; diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json index cb5df1b35..e7c9f4938 100644 --- a/app/i18n/locales/ar.json +++ b/app/i18n/locales/ar.json @@ -44,7 +44,6 @@ "Avatar_Url": "عنوان ويب الصورة الرمزية", "Away": "غير متواجد", "Black": "أسود", - "Block_user": "حظر المستخدم", "Browser": "المتصفح", "Busy": "مشغول", "Cancel_editing": "إلغاء التعديل", @@ -372,7 +371,6 @@ "Two_Factor_Authentication": "المصادقة الثنائية", "unarchive": "إلغاء الأرشفة", "UNARCHIVE": "إلغاء الأرشفة", - "Unblock_user": "إلغاء حظر عن مستخدم", "Unfollowed_thread": "موضوع غير متابع", "Unmute": "إلغاء كتم", "unmuted": "إلغاء كتم", diff --git a/app/i18n/locales/bn-IN.json b/app/i18n/locales/bn-IN.json index 4e0f5b751..848e6b19c 100644 --- a/app/i18n/locales/bn-IN.json +++ b/app/i18n/locales/bn-IN.json @@ -51,7 +51,6 @@ "Avatar_Url": "অবতার URL", "Away": "দূরে", "Black": "কালো", - "Block_user": "ব্যবহারকারী ব্লক করুন", "Browser": "ব্রাউজার", "Busy": "ব্যস্ত", "Cancel_editing": "সম্পাদনা বাতিল করুন", @@ -405,7 +404,6 @@ "Two_Factor_Authentication": "দুটি ধারণামূলক প্রমাণীকরণ", "unarchive": "আনআরকাইভ", "UNARCHIVE": "আনআরকাইভ", - "Unblock_user": "ব্যবহারকারী আনব্লক করুন", "Unfollowed_thread": "থ্রেড অনফলোয়েড", "Unmute": "আনমিউট", "unmuted": "আনমিউটেড", diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json index cac081cef..1cdc1d1c6 100644 --- a/app/i18n/locales/de.json +++ b/app/i18n/locales/de.json @@ -51,7 +51,6 @@ "Avatar_Url": "Avatar-URL", "Away": "Abwesend", "Black": "Schwarz", - "Block_user": "Benutzer blockieren", "Browser": "Browser", "Busy": "Beschäftigt", "Cancel_editing": "Bearbeitung abbrechen", @@ -406,7 +405,6 @@ "Two_Factor_Authentication": "Zwei-Faktor-Authentifizierung", "unarchive": "wiederherstellen", "UNARCHIVE": "WIEDERHERSTELLEN", - "Unblock_user": "Benutzer entsperren", "Unfollowed_thread": "Thread nicht mehr folgen", "Unmute": "Stummschaltung aufheben", "unmuted": "Stummschaltung aufgehoben", diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json index 73f311964..23db513e0 100644 --- a/app/i18n/locales/en.json +++ b/app/i18n/locales/en.json @@ -51,7 +51,6 @@ "Avatar_Url": "Avatar URL", "Away": "Away", "Black": "Black", - "Block_user": "Block user", "Browser": "Browser", "Busy": "Busy", "Cancel_editing": "Cancel editing", @@ -407,7 +406,6 @@ "Two_Factor_Authentication": "Two-factor authentication", "unarchive": "unarchive", "UNARCHIVE": "UNARCHIVE", - "Unblock_user": "Unblock user", "Unfollowed_thread": "Unfollowed thread", "Unmute": "Unmute", "unmuted": "unmuted", @@ -762,6 +760,11 @@ "Enable_writing_in_room": "Enable writing in room", "Disable_writing_in_room": "Disable writing in room", "Pinned_a_message": "Pinned a message:", + "Unblock": "Unblock", + "Block": "Block", + "Report_user": "Report user", + "Report_sent_successfully": "Report sent successfully", + "Why_do_you_want_to_report": "Why do you want to report?", "You_dont_have_permission_to_perform_this_action": "You don’t have permission to perform this action. Check with a workspace administrator.", "Jump_to_message": "Jump to message", "Missed_call": "Missed call" diff --git a/app/i18n/locales/es.json b/app/i18n/locales/es.json index 3edf67cf3..ad479fe47 100644 --- a/app/i18n/locales/es.json +++ b/app/i18n/locales/es.json @@ -38,7 +38,6 @@ "Avatar_Url": "URL del Avatar", "Away": "Ausente", "Black": "Negro", - "Block_user": "Bloquear usuario", "Busy": "Ocupado", "Cancel_editing": "Cancelar edición", "Cancel_recording": "Cancelar grabación", @@ -239,7 +238,6 @@ "Two_Factor_Authentication": "Autenticación de doble factor", "unarchive": "desarchivar", "UNARCHIVE": "DESARCHIVAR", - "Unblock_user": "Desbloquear usuario", "Unfollowed_thread": "Dejar de seguir el hilo", "Unmute": "Desmutear", "unmuted": "Desmuteado", diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json index 9daaa4169..878d9b1be 100644 --- a/app/i18n/locales/fi.json +++ b/app/i18n/locales/fi.json @@ -51,7 +51,6 @@ "Avatar_Url": "Avatarin URL-osoite", "Away": "Poissa", "Black": "Musta", - "Block_user": "Estä käyttäjä", "Browser": "Selain", "Busy": "Varattu", "Cancel_editing": "Peruuta muokkaus", @@ -406,7 +405,6 @@ "Two_Factor_Authentication": "Kaksivaiheinen tunnistautuminen", "unarchive": "palauta arkistosta", "UNARCHIVE": "PALAUTA ARKISTOSTA", - "Unblock_user": "Poista käyttäjän esto", "Unfollowed_thread": "Lopetettiin ketjun seuraaminen", "Unmute": "Mykistys poistettu", "unmuted": "poisti mykistyksen", diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json index dd229bb2d..2f7476092 100644 --- a/app/i18n/locales/fr.json +++ b/app/i18n/locales/fr.json @@ -45,7 +45,6 @@ "Avatar_Url": "URL de l'avatar", "Away": "Absent", "Black": "Noir", - "Block_user": "Bloquer l'utilisateur", "Browser": "Navigateur", "Busy": "Occupé", "Cancel_editing": "Annuler la modification", @@ -381,7 +380,6 @@ "Two_Factor_Authentication": "Authentification à deux facteurs", "unarchive": "désarchiver", "UNARCHIVE": "DÉSARCHIVER", - "Unblock_user": "Débloquer l'utilisateur", "Unfollowed_thread": "Ne plus suivre ce fil", "Unmute": "Rendre la parole", "unmuted": "rendu la parole", diff --git a/app/i18n/locales/hi-IN.json b/app/i18n/locales/hi-IN.json index e7f394d22..f0ce8bac4 100644 --- a/app/i18n/locales/hi-IN.json +++ b/app/i18n/locales/hi-IN.json @@ -51,7 +51,6 @@ "Avatar_Url": "अवतार URL", "Away": "दूर", "Black": "काला", - "Block_user": "उपयोगकर्ता को ब्लॉक करें", "Browser": "ब्राउज़र", "Busy": "व्यस्त", "Cancel_editing": "संपादन रद्द करें", @@ -405,7 +404,6 @@ "Two_Factor_Authentication": "दो-क्रमिक प्रमाणीकरण", "unarchive": "अनारकाइव", "UNARCHIVE": "अनारकाइव करें", - "Unblock_user": "उपयोगकर्ता को अनब्लॉक करें", "Unfollowed_thread": "थ्रेड का अनुसरण नहीं किया गया", "Unmute": "आवाज़ हटाएं", "unmuted": "आवाज़ हटाई गई", diff --git a/app/i18n/locales/hu.json b/app/i18n/locales/hu.json index a138d5962..64a639050 100644 --- a/app/i18n/locales/hu.json +++ b/app/i18n/locales/hu.json @@ -51,7 +51,6 @@ "Avatar_Url": "Avatar URL", "Away": "Távol", "Black": "Fekete", - "Block_user": "Felhasználó tiltása", "Browser": "Böngésző", "Busy": "Elfoglalt", "Cancel_editing": "Szerkesztés megszakítás", @@ -406,7 +405,6 @@ "Two_Factor_Authentication": "Kétfaktoros hitelesítés", "unarchive": "Archiválás megszüntetés", "UNARCHIVE": "ARCHIVÁLÁS MEGSZÜNTETÉS", - "Unblock_user": "Felhasználó tiltás feloldása", "Unfollowed_thread": "Nem követett szál", "Unmute": "Némítás megszüntetése", "unmuted": "Némítás megszüntetve", diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json index 62873f639..e5bb866c7 100644 --- a/app/i18n/locales/it.json +++ b/app/i18n/locales/it.json @@ -51,7 +51,6 @@ "Avatar_Url": "URL avatar", "Away": "Assente", "Black": "Nero", - "Block_user": "Blocca utente", "Browser": "Browser", "Busy": "Occupato", "Cancel_editing": "Annulla modifica", @@ -386,7 +385,6 @@ "Two_Factor_Authentication": "Autenticazione a due fattori", "unarchive": "rimuovi dall'archivio", "UNARCHIVE": "RIMUOVI DALL'ARCHIVIO", - "Unblock_user": "Sblocca utente", "Unfollowed_thread": "Non segui più il thread", "Unmute": "Attiva notifiche", "unmuted": "notifiche attivate", diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json index e8cef1f39..5d85aabc4 100644 --- a/app/i18n/locales/ja.json +++ b/app/i18n/locales/ja.json @@ -45,7 +45,6 @@ "Avatar_Url": "アバターURL", "Away": "退出中", "Black": "ブラック", - "Block_user": "ブロックしたユーザー", "Browser": "ブラウザ", "Busy": "取り込み中", "Cancel_editing": "編集をキャンセル", @@ -334,7 +333,6 @@ "Two_Factor_Authentication": "２段階認証", "unarchive": "アーカイブ解除", "UNARCHIVE": "アーカイブ解除", - "Unblock_user": "ブロックを解除", "Unfollowed_thread": "スレッド更新時に通知しない", "Unmute": "ミュート解除", "unmuted": "ミュート解除しました", diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json index 8e4e37391..1ca17a219 100644 --- a/app/i18n/locales/nl.json +++ b/app/i18n/locales/nl.json @@ -45,7 +45,6 @@ "Avatar_Url": "Avatar-URL", "Away": "Afwezig", "Black": "Zwart", - "Block_user": "Blokkeer gebruiker", "Browser": "Browser", "Busy": "Bezig", "Cancel_editing": "Bewerken annuleren", @@ -381,7 +380,6 @@ "Two_Factor_Authentication": "Twee-factor authenticatie", "unarchive": "dearchiveren", "UNARCHIVE": "DEARCHIVEREN", - "Unblock_user": "Deblokkeer gebruiker", "Unfollowed_thread": "Draad ontvolgd", "Unmute": "Dempen opheffen", "unmuted": "ongedempt", diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json index ea9a1d4e1..4a54fc597 100644 --- a/app/i18n/locales/pt-BR.json +++ b/app/i18n/locales/pt-BR.json @@ -51,7 +51,6 @@ "Avatar_Url": "Avatar URL", "Away": "Ausente", "Black": "Preto", - "Block_user": "Bloquear usuário", "Browser": "Navegador", "Busy": "Ocupado", "Cancel_editing": "Cancelar edição", @@ -407,7 +406,6 @@ "Two_Factor_Authentication": "Autenticação de dois fatores", "unarchive": "desarquivar", "UNARCHIVE": "DESARQUIVAR", - "Unblock_user": "Desbloquear usuário", "Unfollowed_thread": "Parou de seguir tópico", "Unmute": "Permitir que o usuário fale", "unmuted": "permitiu que o usuário fale", @@ -761,6 +759,11 @@ "The_user_will_be_able_to_type_in_roomName": "O usuário poderá digitar em {{roomName}}", "Enable_writing_in_room": "Permitir escrita na sala", "Disable_writing_in_room": "Desabilitar escrita na sala", + "Unblock": "Desbloquear", + "Block": "Bloquear", + "Report_user": "Reportar usuário", + "Report_sent_successfully": "Reporte enviado com sucesso", + "Why_do_you_want_to_report": "Por que você deseja reportar?", "Pinned_a_message": "Fixou uma mensagem:", "You_dont_have_permission_to_perform_this_action": "Você não tem permissão para realizar esta ação. Verifique com um administrador do espaço de trabalho.", "Jump_to_message": "Ir para mensagem", diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json index a1a004d0c..98d14d4fb 100644 --- a/app/i18n/locales/pt-PT.json +++ b/app/i18n/locales/pt-PT.json @@ -44,7 +44,6 @@ "Avatar_Url": "URL do Avatar", "Away": "Ausente", "Black": "Preto", - "Block_user": "Bloquear utilizador", "Browser": "Navegador", "Busy": "Ocupado", "Cancel_editing": "Cancelar edição", @@ -323,7 +322,6 @@ "Two_Factor_Authentication": "Autenticação 2FA", "unarchive": "desarquivar", "UNARCHIVE": "DESARQUIVAR", - "Unblock_user": "Desbloquear utilizador", "Unmute": "Retirar silêncio", "unmuted": "silêncio removido", "Unpin": "Desafixar", diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json index 85c9b0ee3..bcdbc1728 100644 --- a/app/i18n/locales/ru.json +++ b/app/i18n/locales/ru.json @@ -51,7 +51,6 @@ "Avatar_Url": "URL аватара", "Away": "Отошел", "Black": "Черный", - "Block_user": "Блокировать пользователя", "Browser": "Браузер", "Busy": "Занят", "Cancel_editing": "Отменить правку", @@ -392,7 +391,6 @@ "Two_Factor_Authentication": "Двухфакторная аутентификация", "unarchive": "разархивировать", "UNARCHIVE": "РАЗАРХИВИРОВАТЬ", - "Unblock_user": "Разблокировать пользователя", "Unfollowed_thread": "Не следить", "Unmute": "Отменить заглушивание", "unmuted": "Заглушивание отменено", diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json index 345ebe343..37033fb0f 100644 --- a/app/i18n/locales/sl-SI.json +++ b/app/i18n/locales/sl-SI.json @@ -51,7 +51,6 @@ "Avatar_Url": "Avatar URL", "Away": "Odsoten", "Black": "Črn", - "Block_user": "Blokiraj uporabnika", "Browser": "Brskalnik", "Busy": "Zaseden", "Cancel_editing": "Prekliči urejanje", @@ -389,7 +388,6 @@ "Two_Factor_Authentication": "Dvofaktorska overjanje", "unarchive": "Odpakirati", "UNARCHIVE": "ODPAKIRATI", - "Unblock_user": "Odblokirati uporabnika", "Unfollowed_thread": "Nit, ki ji nihče ne sledi", "Unmute": "Preklicati utišanje", "unmuted": "preklicati utišanje", diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json index 3949e02da..13f50884d 100644 --- a/app/i18n/locales/sv.json +++ b/app/i18n/locales/sv.json @@ -51,7 +51,6 @@ "Avatar_Url": "URL till avatar", "Away": "Borta", "Black": "Svart", - "Block_user": "Blockera användare", "Browser": "Webbläsare", "Busy": "Upptagen", "Cancel_editing": "Avbryt redigering", @@ -406,7 +405,6 @@ "Two_Factor_Authentication": "Tvåfaktorsautentisering", "unarchive": "avarkivera", "UNARCHIVE": "AVARKIVERA", - "Unblock_user": "Avblockera användare", "Unfollowed_thread": "Sluta följa tråd", "Unmute": "Slå på ljudet", "unmuted": "slog på ljudet", diff --git a/app/i18n/locales/ta-IN.json b/app/i18n/locales/ta-IN.json index 29c83c600..fdb3d563b 100644 --- a/app/i18n/locales/ta-IN.json +++ b/app/i18n/locales/ta-IN.json @@ -51,7 +51,6 @@ "Avatar_Url": "அவதார் URL", "Away": "விலகியிருக்கிறேன்", "Black": "கருப்பு", - "Block_user": "பயனாளரை தடுக்கவும்", "Browser": "உலாவி", "Busy": "தொலைநேரம்", "Cancel_editing": "திருத்தலை ரத்து செய்க", @@ -405,7 +404,6 @@ "Two_Factor_Authentication": "இரண்டு பரிமாறு அங்கீகாரம்", "unarchive": "அசைவு செய்", "UNARCHIVE": "அசைவு செய்", - "Unblock_user": "பயனரை விடுவிக்கு", "Unfollowed_thread": "பின்னாளிக்குப் பின்னாளிக்கப்பட்டுள்ளது", "Unmute": "மூடாது", "unmuted": "மூடப்படவில்லை", diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json index f0f61a193..82006d235 100644 --- a/app/i18n/locales/te-IN.json +++ b/app/i18n/locales/te-IN.json @@ -51,7 +51,6 @@ "Avatar_Url": "అవతార్ URL", "Away": "దూరంగా", "Black": "నలుపు", - "Block_user": "వాడిని నిలిపించండి", "Browser": "బ్రౌజర్", "Busy": "వ్యస్తంగా", "Cancel_editing": "సవరించడానికి రద్దు చేయి", @@ -405,7 +404,6 @@ "Two_Factor_Authentication": "రెండు అంశ ప్రామాణీకరణ", "unarchive": "అనార్కైవ్", "UNARCHIVE": "అనార్కైవ్", - "Unblock_user": "వాడుకరిని నిషేధించకోండి", "Unfollowed_thread": "అన్‌ఫాలో థ్రెడ్", "Unmute": "ఆధ్వర్యపరచించండి", "unmuted": "ఆధ్వర్యపరచించబడింది", diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json index c789deea2..91ef9fadb 100644 --- a/app/i18n/locales/tr.json +++ b/app/i18n/locales/tr.json @@ -43,7 +43,6 @@ "Avatar_Url": "Profil fotoğrafı URL'si", "Away": "Uzakta", "Black": "Koyu", - "Block_user": "Kullanıcıyı engelle", "Browser": "Tarayıcı", "Busy": "Meşgul", "Cancel_editing": "Düzenlemeyi iptal et", @@ -369,7 +368,6 @@ "Two_Factor_Authentication": "İki faktörlü Kimlik Doğrulama", "unarchive": "arşivden çıkar", "UNARCHIVE": "ARŞİVDEN ÇIKAR", - "Unblock_user": "Kullanıcının engelini kaldır", "Unfollowed_thread": "Takip edilmeyen başlık", "Unmute": "Sesi Aç", "unmuted": "Sesi Açıldı", diff --git a/app/i18n/locales/zh-CN.json b/app/i18n/locales/zh-CN.json index 30a133fe7..e3c0b852e 100644 --- a/app/i18n/locales/zh-CN.json +++ b/app/i18n/locales/zh-CN.json @@ -43,7 +43,6 @@ "Avatar_Url": "头像地址", "Away": "离开", "Black": "黑色", - "Block_user": "屏蔽此用户", "Browser": "浏览器", "Busy": "忙碌", "Cancel_editing": "取消编辑", @@ -365,7 +364,6 @@ "Two_Factor_Authentication": "双重认证", "unarchive": "取消封存", "UNARCHIVE": "取消封存", - "Unblock_user": "解除屏蔽", "Unfollowed_thread": "取消追踪讨论", "Unmute": "取消静音", "unmuted": "静音状态", diff --git a/app/i18n/locales/zh-TW.json b/app/i18n/locales/zh-TW.json index b42d838f0..bc265143d 100644 --- a/app/i18n/locales/zh-TW.json +++ b/app/i18n/locales/zh-TW.json @@ -44,7 +44,6 @@ "Avatar_Url": "大頭貼地址", "Away": "離開", "Black": "黑色", - "Block_user": "封鎖此用戶", "Browser": "瀏覽器", "Busy": "忙碌", "Cancel_editing": "取消編輯", @@ -371,7 +370,6 @@ "Two_Factor_Authentication": "雙重認證", "unarchive": "取消封存", "UNARCHIVE": "取消封存", - "Unblock_user": "解除封鎖", "Unfollowed_thread": "取消追蹤討論", "Unmute": "取消靜音", "unmuted": "靜音狀態", diff --git a/app/lib/services/restApi.ts b/app/lib/services/restApi.ts index 1a324ba00..424566357 100644 --- a/app/lib/services/restApi.ts +++ b/app/lib/services/restApi.ts @@ -296,6 +296,10 @@ export const togglePinMessage = (messageId: string, pinned?: boolean) => { return sdk.post('chat.pinMessage', { messageId }); }; +export const reportUser = (userId: string, description: string) => + // RC 6.4.0 + sdk.post('moderation.reportUser', { userId, description }); + export const reportMessage = (messageId: string) => // RC 0.64.0 sdk.post('chat.reportMessage', { messageId, description: 'Message reported by user' }); diff --git a/app/stacks/InsideStack.tsx b/app/stacks/InsideStack.tsx index 56374a36e..bcf1e071d 100644 --- a/app/stacks/InsideStack.tsx +++ b/app/stacks/InsideStack.tsx @@ -11,6 +11,7 @@ import RoomView from '../views/RoomView'; import RoomsListView from '../views/RoomsListView'; import RoomActionsView from '../views/RoomActionsView'; import RoomInfoView from '../views/RoomInfoView'; +import ReportUserView from '../views/ReportUserView'; import RoomInfoEditView from '../views/RoomInfoEditView'; import RoomMembersView from '../views/RoomMembersView'; import SearchMessagesView from '../views/SearchMessagesView'; @@ -99,6 +100,7 @@ const ChatsStackNavigator = () => { + {/* @ts-ignore */} diff --git a/app/stacks/MasterDetailStack/index.tsx b/app/stacks/MasterDetailStack/index.tsx index 1ba89c82a..ffdd2f15b 100644 --- a/app/stacks/MasterDetailStack/index.tsx +++ b/app/stacks/MasterDetailStack/index.tsx @@ -15,6 +15,7 @@ import RoomView from '../../views/RoomView'; import RoomsListView from '../../views/RoomsListView'; import RoomActionsView from '../../views/RoomActionsView'; import RoomInfoView from '../../views/RoomInfoView'; +import ReportUserView from '../../views/ReportUserView'; import RoomInfoEditView from '../../views/RoomInfoEditView'; import ChangeAvatarView from '../../views/ChangeAvatarView'; import RoomMembersView from '../../views/RoomMembersView'; @@ -118,6 +119,7 @@ const ModalStackNavigator = React.memo(({ navigation }: INavigation) => { {/* @ts-ignore */} + {/* @ts-ignore */} diff --git a/app/stacks/MasterDetailStack/types.ts b/app/stacks/MasterDetailStack/types.ts index f12c006a3..816e4b250 100644 --- a/app/stacks/MasterDetailStack/types.ts +++ b/app/stacks/MasterDetailStack/types.ts @@ -199,6 +199,11 @@ export type ModalStackParamList = { SupportedVersionsWarning: { showCloseButton?: boolean; }; + ReportUserView: { + username: string; + userId: string; + name: string; + }; }; export type MasterDetailInsideStackParamList = { diff --git a/app/stacks/types.ts b/app/stacks/types.ts index 145bfc1c8..e3509a320 100644 --- a/app/stacks/types.ts +++ b/app/stacks/types.ts @@ -172,6 +172,11 @@ export type ChatsStackParamList = { room?: ISubscription; t?: SubscriptionType; }; + ReportUserView: { + username: string; + userId: string; + name: string; + }; }; export type ProfileStackParamList = { diff --git a/app/views/ReportUserView/UserInfo.tsx b/app/views/ReportUserView/UserInfo.tsx new file mode 100644 index 000000000..c303b87b3 --- /dev/null +++ b/app/views/ReportUserView/UserInfo.tsx @@ -0,0 +1,21 @@ +import React from 'react'; +import { Text, View } from 'react-native'; + +import Avatar from '../../containers/Avatar'; +import styles from './styles'; +import { useTheme } from '../../theme'; + +const UserInfo = ({ username, name }: { username: string; name: string }) => { + const { colors } = useTheme(); + + return ( + + + + {name || username} + + + ); +}; + +export default UserInfo; diff --git a/app/views/ReportUserView/index.tsx b/app/views/ReportUserView/index.tsx new file mode 100644 index 000000000..4febc2abf --- /dev/null +++ b/app/views/ReportUserView/index.tsx @@ -0,0 +1,113 @@ +import React, { useLayoutEffect, useState } from 'react'; +import { ScrollView, StatusBar } from 'react-native'; +import { CompositeNavigationProp, RouteProp, useNavigation, useRoute } from '@react-navigation/native'; +import { StackNavigationProp } from '@react-navigation/stack'; +import { useForm } from 'react-hook-form'; +import * as yup from 'yup'; +import { yupResolver } from '@hookform/resolvers/yup'; + +import log from '../../lib/methods/helpers/log'; +import SafeAreaView from '../../containers/SafeAreaView'; +import { useTheme } from '../../theme'; +import { ChatsStackParamList } from '../../stacks/types'; +import { MasterDetailInsideStackParamList } from '../../stacks/MasterDetailStack/types'; +import I18n from '../../i18n'; +import UserInfo from './UserInfo'; +import styles from './styles'; +import { ControlledFormTextInput } from '../../containers/TextInput'; +import Button from '../../containers/Button'; +import { useAppSelector } from '../../lib/hooks'; +import EventEmitter from '../../lib/methods/helpers/events'; +import { LISTENER } from '../../containers/Toast'; +import { Services } from '../../lib/services'; +import KeyboardView from '../../containers/KeyboardView'; + +type TReportUserViewNavigationProp = CompositeNavigationProp< + StackNavigationProp, + StackNavigationProp +>; + +type TReportUserViewRouteProp = RouteProp; + +interface ISubmit { + description: string; +} + +const schema = yup.object().shape({ + description: yup.string().trim().required() +}); + +const ReportUserView = () => { + const [loading, setLoading] = useState(false); + const { colors } = useTheme(); + const navigation = useNavigation(); + const { isMasterDetail } = useAppSelector(state => ({ isMasterDetail: state.app.isMasterDetail })); + + const { + params: { username, userId, name } + } = useRoute(); + + const { + control, + handleSubmit, + formState: { isValid } + } = useForm({ mode: 'onChange', resolver: yupResolver(schema), defaultValues: { description: '' } }); + + useLayoutEffect(() => { + navigation?.setOptions({ + title: I18n.t('Report_user') + }); + }, [navigation]); + + const submit = async ({ description }: ISubmit) => { + try { + setLoading(true); + await Services.reportUser(userId, description); + EventEmitter.emit(LISTENER, { message: I18n.t('Report_sent_successfully') }); + setLoading(false); + if (isMasterDetail) { + navigation.navigate('DrawerNavigator'); + return; + } + navigation.navigate('RoomView'); + } catch (e) { + log(e); + setLoading(false); + } + }; + + return ( + + + + + + +