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/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) 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/android/app/build.gradle b/android/app/build.gradle index 287dcf442..8c05656f4 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] @@ -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/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/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} diff --git a/app/containers/InAppNotification/IncomingCallNotification/index.tsx b/app/containers/InAppNotification/IncomingCallNotification/index.tsx index e93bd96f7..df2552abf 100644 --- a/app/containers/InAppNotification/IncomingCallNotification/index.tsx +++ b/app/containers/InAppNotification/IncomingCallNotification/index.tsx @@ -36,6 +36,7 @@ const IncomingCallHeader = React.memo( ({ uid, callId, avatar, roomName }: { callId: string; avatar: string; uid: string; roomName: string }) => { const [mic, setMic] = useState(true); const [cam, setCam] = useState(false); + const [audio, setAudio] = useState(true); const dispatch = useDispatch(); const isMasterDetail = useAppSelector(state => state.app.isMasterDetail); const styles = useStyle(); @@ -64,12 +65,20 @@ const IncomingCallHeader = React.memo( direct={true} /> - + { + setAudio(!audio); + hideNotification(); + }} + style={styles.closeButton} + > { + setAudio(!audio); hideNotification(); dispatch(cancelCall({ callId })); }} @@ -80,6 +89,7 @@ const IncomingCallHeader = React.memo( { + setAudio(!audio); hideNotification(); dispatch(acceptCall({ callId })); }} @@ -88,7 +98,7 @@ const IncomingCallHeader = React.memo( {i18n.t('accept')} - + {audio ? : null} ); } diff --git a/app/containers/Ringer/index.tsx b/app/containers/Ringer/index.tsx index a5c83a5f7..1a56eb065 100644 --- a/app/containers/Ringer/index.tsx +++ b/app/containers/Ringer/index.tsx @@ -1,6 +1,5 @@ import { Audio } from 'expo-av'; import React, { useEffect, useRef } from 'react'; -import { View } from 'react-native'; export enum ERingerSounds { DIALTONE = 'dialtone', @@ -8,34 +7,28 @@ export enum ERingerSounds { } const Ringer = React.memo(({ ringer }: { ringer: ERingerSounds }) => { - const sound = useRef(null); + const sound = useRef(new Audio.Sound()); + useEffect(() => { - (async () => { - let expo = null; - switch (ringer) { - case ERingerSounds.DIALTONE: - expo = await Audio.Sound.createAsync(require(`./dialtone.mp3`)); - break; - case ERingerSounds.RINGTONE: - expo = await Audio.Sound.createAsync(require(`./ringtone.mp3`)); - break; - default: - expo = await Audio.Sound.createAsync(require(`./dialtone.mp3`)); - break; + const loadAndPlay = async () => { + try { + const soundFile = ringer === ERingerSounds.DIALTONE ? require(`./dialtone.mp3`) : require(`./ringtone.mp3`); + await sound.current.loadAsync(soundFile); + await sound.current.playAsync(); + await sound.current.setIsLoopingAsync(true); + } catch (error) { + console.error('Error loading sound:', error); } - sound.current = expo.sound; - await sound.current.playAsync(); - await sound.current.setIsLoopingAsync(true); - })(); + }; + + loadAndPlay(); + + return () => { + sound.current?.unloadAsync(); + }; }, []); - useEffect(() => () => stopSound(), []); - - const stopSound = () => { - sound?.current?.unloadAsync(); - }; - - return ; + return null; }); export default Ringer; 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); 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/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', diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json index 5911d58a8..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": "إلغاء التعديل", @@ -344,7 +343,7 @@ "Share": "مشاركة", "Share_Link": "مشاركة رابط", "Share_this_app": "مشاركة هذا البرنامج", - "Show_more": "إظهار أكثر..", + "Show_more": "إظهار أكثر", "Sign_Up": "تسجيل جديد", "Sound": "الصوت", "Star": "تمييز", @@ -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 d1415cf82..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", @@ -378,7 +377,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", @@ -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 eadedcc63..d4bbb0745 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", @@ -378,7 +377,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", @@ -406,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", @@ -761,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 514e8cbd3..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", @@ -378,7 +377,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", @@ -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 863d87709..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", @@ -353,7 +352,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", @@ -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 69190bdc7..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", @@ -358,7 +357,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", @@ -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 86bdd065d..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": "編集をキャンセル", @@ -310,7 +309,6 @@ "Share": "シェア", "Share_Link": "リンクをシェアする", "Share_this_app": "このアプリをシェアする", - "Show_more": "Show more..", "Sign_Up": "登録", "Sound": "音", "Star": "お気に入り", @@ -335,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 6fc3919fa..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", @@ -353,7 +352,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", @@ -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 ab4bd61f4..fe524abd7 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", @@ -378,7 +377,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", @@ -406,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", @@ -760,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 de7818fe9..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": "Отменить правку", @@ -364,7 +363,7 @@ "Share": "Поделиться", "Share_Link": "Ссылка, чтобы Поделиться", "Share_this_app": "Рассказать о приложении", - "Show_more": "Показать больше..", + "Show_more": "Показать больше", "Sign_Up": "Регистрация", "Sound": "Звук", "Star": "Отметить", @@ -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 471f53204..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", @@ -361,7 +360,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", @@ -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 67dcdf38a..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", @@ -378,7 +377,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", @@ -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 a80ca0fc2..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", @@ -341,7 +340,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", @@ -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/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 }; }; 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]; } diff --git a/app/lib/methods/helpers/openLink.ts b/app/lib/methods/helpers/openLink.ts index 45e3df5d6..e4ade0a30 100644 --- a/app/lib/methods/helpers/openLink.ts +++ b/app/lib/methods/helpers/openLink.ts @@ -6,6 +6,7 @@ import { themes } from '../../constants'; import { TSupportedThemes } from '../../../theme'; import UserPreferences from '../userPreferences'; import ensureSecureProtocol from './ensureSecureProtocol'; +import log from './log'; export const DEFAULT_BROWSER_KEY = 'DEFAULT_BROWSER_KEY'; @@ -38,6 +39,16 @@ const appSchemeURL = (url: string, browser: string): string => { }; const openLink = async (url: string, theme: TSupportedThemes = 'light'): Promise => { + const telRegExp = new RegExp(/^(tel:)/); + if (telRegExp.test(url)) { + try { + await Linking.openURL(url); + return; + } catch (e) { + log(e); + } + } + url = ensureSecureProtocol(url); try { const browser = UserPreferences.getString(DEFAULT_BROWSER_KEY); 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/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 { 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 ( + + + + + + +