From 3013649d8966ef61e4cc653755a187febd6c6005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ot=C3=A1vio=20Stasiak?=
 <91474186+OtavioStasiak@users.noreply.github.com>
Date: Wed, 8 Jan 2025 17:19:30 -0300
Subject: [PATCH] chore(a11y): RoomInfoEditView (#6023)

---------

Co-authored-by: OtavioStasiak <OtavioStasiak@users.noreply.github.com>
---
 app/containers/Avatar/AvatarWithEdit.tsx      |   3 +-
 app/containers/TextInput/FormTextInput.tsx    |   8 +-
 app/i18n/locales/ar.json                      |   2 +
 app/i18n/locales/bn-IN.json                   |   2 +
 app/i18n/locales/cs.json                      |   8 +-
 app/i18n/locales/de.json                      |   8 +-
 app/i18n/locales/en.json                      |   8 +-
 app/i18n/locales/es.json                      |   8 +-
 app/i18n/locales/fi.json                      |   8 +-
 app/i18n/locales/fr.json                      |   8 +-
 app/i18n/locales/hi-IN.json                   |   2 +
 app/i18n/locales/hu.json                      |   6 +-
 app/i18n/locales/it.json                      |   8 +-
 app/i18n/locales/ja.json                      |   2 +
 app/i18n/locales/nl.json                      |   8 +-
 app/i18n/locales/pt-BR.json                   |   8 +-
 app/i18n/locales/pt-PT.json                   |  10 +-
 app/i18n/locales/ru.json                      |   8 +-
 app/i18n/locales/sl-SI.json                   |   8 +-
 app/i18n/locales/sv.json                      |   8 +-
 app/i18n/locales/ta-IN.json                   |   2 +
 app/i18n/locales/te-IN.json                   |   2 +
 app/i18n/locales/tr.json                      |   8 +-
 app/i18n/locales/zh-CN.json                   |   2 +
 app/i18n/locales/zh-TW.json                   |   2 +
 .../RoomInfoEditView/SwitchContainer.tsx      |  73 ++--
 app/views/RoomInfoEditView/index.tsx          | 337 ++++++++----------
 app/views/RoomInfoEditView/styles.ts          |  24 +-
 app/views/RoomInfoView/index.tsx              |   5 +-
 e2e/tests/room/08-roominfo.spec.ts            |  23 +-
 e2e/tests/team/01-createteam.spec.ts          |   2 +-
 31 files changed, 307 insertions(+), 304 deletions(-)

diff --git a/app/containers/Avatar/AvatarWithEdit.tsx b/app/containers/Avatar/AvatarWithEdit.tsx
index 892f439c1d..a3bcca44c8 100644
--- a/app/containers/Avatar/AvatarWithEdit.tsx
+++ b/app/containers/Avatar/AvatarWithEdit.tsx
@@ -13,7 +13,7 @@ import sharedStyles from '../../views/Styles';
 
 const styles = StyleSheet.create({
 	editAvatarButton: {
-		marginTop: 8,
+		marginTop: 16,
 		paddingVertical: 8,
 		paddingHorizontal: 12,
 		marginBottom: 0,
@@ -67,6 +67,7 @@ const AvatarWithEdit = ({
 			/>
 			{handleEdit && serverVersion && compareServerVersion(serverVersion, 'greaterThanOrEqualTo', '3.6.0') ? (
 				<Button
+					accessibilityLabel={I18n.t('Edit_Room_Photo')}
 					title={I18n.t('Edit')}
 					type='secondary'
 					onPress={handleEdit}
diff --git a/app/containers/TextInput/FormTextInput.tsx b/app/containers/TextInput/FormTextInput.tsx
index 251d40a9c1..f13d6723b5 100644
--- a/app/containers/TextInput/FormTextInput.tsx
+++ b/app/containers/TextInput/FormTextInput.tsx
@@ -1,6 +1,6 @@
-import { BottomSheetTextInput } from '@discord/bottom-sheet';
 import React, { useState } from 'react';
 import { StyleProp, StyleSheet, Text, TextInput as RNTextInput, TextInputProps, TextStyle, View, ViewStyle } from 'react-native';
+import { BottomSheetTextInput } from '@discord/bottom-sheet';
 import Touchable from 'react-native-platform-touchable';
 
 import i18n from '../../i18n';
@@ -9,6 +9,7 @@ import sharedStyles from '../../views/Styles';
 import ActivityIndicator from '../ActivityIndicator';
 import { CustomIcon, TIconsName } from '../CustomIcon';
 import { TextInput } from './TextInput';
+import { isIOS } from '../../lib/methods/helpers';
 
 const styles = StyleSheet.create({
 	error: {
@@ -98,10 +99,12 @@ export const FormTextInput = ({
 	const showClearInput = onClearInput && value && value.length > 0;
 	const Input = bottomSheet ? BottomSheetTextInput : TextInput;
 
+	const accessibilityLabelRequired = required ? `, ${i18n.t('Required')}` : '';
+	const accessibilityInputValue = (!secureTextEntry && value && isIOS) || showPassword ? `, ${value}` : '';
 	return (
 		<View
 			accessible
-			accessibilityLabel={accessibilityLabel ?? `${label} - ${required ? i18n.t('Required') : ''}`}
+			accessibilityLabel={`${label}${accessibilityLabelRequired}${accessibilityInputValue}`}
 			style={[styles.inputContainer, containerStyle]}>
 			{label ? (
 				<Text style={[styles.label, { color: colors.fontTitlesLabels }, error?.error && { color: colors.fontDanger }]}>
@@ -169,6 +172,7 @@ export const FormTextInput = ({
 
 				{secureTextEntry ? (
 					<Touchable
+						style={[styles.iconContainer, styles.iconRight]}
 						accessible
 						accessibilityLabel={showPassword ? i18n.t('Hide_Password') : i18n.t('Show_Password')}
 						onPress={() => setShowPassword(!showPassword)}>
diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json
index d6525cc17f..3fd6638fca 100644
--- a/app/i18n/locales/ar.json
+++ b/app/i18n/locales/ar.json
@@ -124,6 +124,7 @@
   "E2E_How_It_Works_info4": "بإمكانك أيضاً إنشاء كلمة مرور جديدة لمفتاح التشفير في أي وقت عند دخولك بكلمة المرور الحالية لمفتاح التشفير",
   "Edit": "تعديل",
   "Edit_Invite": "تعديل الدعوة",
+  "Edit_Room_Photo": "تحرير صورة غرفة",
   "Edit_Status": "تعديل الحالة",
   "Email": "البريد الإلكتروني",
   "Email_Notification_Mode_All": "لكل إشارة أو رسالة مباشرة",
@@ -371,6 +372,7 @@
   "Roles": "أدوار",
   "Room_Info": "معلومات الغرفة",
   "Room_Info_Edit": "تعديل معلومات الغرفة",
+  "Room_Password": "كلمة مرور الغرفة",
   "SAVE": "حفظ",
   "Save": "حفظ",
   "Save_Changes": "حفظ التغيرات",
diff --git a/app/i18n/locales/bn-IN.json b/app/i18n/locales/bn-IN.json
index 0f97910576..87306bdbfb 100644
--- a/app/i18n/locales/bn-IN.json
+++ b/app/i18n/locales/bn-IN.json
@@ -222,6 +222,7 @@
   "E2E_How_It_Works_info4": "আপনি যে কোনও ব্রাউজার থেকে একটি নতুন পাসওয়ার্ড সেটআপ করতে পারেন আপনার এনক্রিপশন কীর জন্য সময়ের মধ্যে যে কোনও ব্রাউজারে যাতে আপনি বর্তমানের E2E পাসওয়ার্ড দিয়ে এনটার করেছেন।",
   "Edit": "সম্পাদনা করুন",
   "Edit_Invite": "ইনভাইট সম্পাদনা করুন",
+  "Edit_Room_Photo": "ঘরের ছবি সম্পাদনা করুন",
   "Edit_Status": "স্থিতি সম্পাদনা করুন",
   "Email": "ইমেইল",
   "Email_Notification_Mode_All": "প্রতি উল্লেখ / ডিএম",
@@ -566,6 +567,7 @@
   "Room_Info_Edit": "রুম তথ্য সম্পাদনা",
   "Room_name_changed_to": "রুম নাম পরিবর্তন করেছে: {{name}}",
   "Room_not_found": "রুম পাওয়া যায়নি",
+  "Room_Password": "ঘরের পাসওয়ার্ড",
   "room_removed_read_only_permission": "রিড ওনলি অনুমতি সরানো হয়েছে",
   "room_set_read_only_permission": "রুমটি শুধুমাত্র পড়া হিসেবে সেট করা হয়েছে",
   "room_unarchived": "আনআর্কাইভ করা রুম",
diff --git a/app/i18n/locales/cs.json b/app/i18n/locales/cs.json
index bb6e2f9030..f9ac86866b 100644
--- a/app/i18n/locales/cs.json
+++ b/app/i18n/locales/cs.json
@@ -48,7 +48,7 @@
   "announcement": "oznámení",
   "App_users_are_not_allowed_to_log_in_directly": "Uživatelé aplikace se nemohou přihlásit přímo.",
   "Apply_Certificate": "Použít certifikát",
-  "ARCHIVE": "ARCHIV",
+  "ARCHIVE": "Archiv",
   "archive": "archiv",
   "are_typing": "píšou",
   "Are_you_sure_question_mark": "Jsi si jistá?",
@@ -240,6 +240,7 @@
   "E2E_How_It_Works_info4": "Nové heslo pro svůj šifrovací klíč můžete také nastavit kdykoli z libovolného prohlížeče, kde jste zadali stávající heslo E2E.",
   "Edit": "Upravit",
   "Edit_Invite": "Upravit pozvánku",
+  "Edit_Room_Photo": "Upravit fotografii místnosti",
   "Edit_Status": "Upravit stav",
   "Email": "E-mailem",
   "Email_Notification_Mode_All": "Každá zmínka/DM",
@@ -592,7 +593,7 @@
   "Required": "Požadováno",
   "Resend": "Přeposlat",
   "Resend_email": "Přeposlat email",
-  "RESET": "RESETOVAT",
+  "RESET": "Resetovat",
   "Reset_password": "Obnovit heslo",
   "resetting_password": "resetování hesla",
   "Resume": "Životopis",
@@ -616,6 +617,7 @@
   "Room_Info_Edit": "Úprava informací o místnosti",
   "Room_name_changed_to": "změnil název místnosti na: {{name}}",
   "Room_not_found": "Pokoj nenalezen",
+  "Room_Password": "Heslo místnosti",
   "room_removed_read_only_permission": "odstraněno oprávnění pouze pro čtení",
   "room_set_read_only_permission": "nastavit místnost pouze pro čtení",
   "room_unarchived": "nearchivovaná místnost",
@@ -749,7 +751,7 @@
   "Two_Factor_Success_message": "Byl odeslán dvoufaktorový autentizační kód! Zkontrolujte svůj e-mail.",
   "Type_message": "Zadejte zprávu",
   "Types": "Typy",
-  "UNARCHIVE": "UNARCHIVOVAT",
+  "UNARCHIVE": "Unarchivovat",
   "unarchive": "zrušit archivaci",
   "unauthorized": "Neoprávněný",
   "Unblock": "Odblokovat",
diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json
index ffc71c04f8..88c5c6dc1d 100644
--- a/app/i18n/locales/de.json
+++ b/app/i18n/locales/de.json
@@ -45,7 +45,7 @@
   "Announcement": "Ankündigung",
   "announcement": "Ankündigung",
   "Apply_Certificate": "Zertifikat anwenden",
-  "ARCHIVE": "ARCHIV",
+  "ARCHIVE": "Archiv",
   "archive": "Archiv",
   "are_typing": "tippen",
   "Are_you_sure_question_mark": "Sind Sie sicher?",
@@ -217,6 +217,7 @@
   "E2E_How_It_Works_info4": "Sie können außerdem jederzeit, in jedem Browser, in dem Sie das bestehende Passwort eingegeben haben, ein neues Passwort setzen.",
   "Edit": "Bearbeiten",
   "Edit_Invite": "Einladung bearbeiten",
+  "Edit_Room_Photo": "Zimmerfoto bearbeiten",
   "Edit_Status": "Status ändern",
   "Email": "E-mail",
   "Email_Notification_Mode_All": "Jede Erwähnung/Direktnachricht",
@@ -530,7 +531,7 @@
   "Report": "Melden",
   "Required": "Erforderlich",
   "Resend": "Erneut senden",
-  "RESET": "ZURÜCKSETZEN",
+  "RESET": "Zurücksetzen",
   "Reset_password": "Passwort zurücksetzen",
   "resetting_password": "Passwort zurücksetzen",
   "Resume": "Fortsetzen",
@@ -553,6 +554,7 @@
   "Room_Info": "Room-Info",
   "Room_Info_Edit": "Room-Info bearbeiten",
   "Room_name_changed_to": "hat den Namen des Raumes geändert zu: {{name}}",
+  "Room_Password": "Raumkennwort",
   "room_removed_read_only_permission": "hat die Nur-Lese-Berechtigung entfernt",
   "room_set_read_only_permission": "hat den Raum auf \"Nur Lesen\" gesetzt",
   "room_unarchived": "hat den Raum nicht mehr archiviert",
@@ -675,7 +677,7 @@
   "Two_Factor_Success_message": "Zwei-Faktor-Authentifizierungscode gesendet! Bitte überprüfen Sie Ihre E-Mail.",
   "Type_message": "Nachricht schreiben",
   "Types": "Typen",
-  "UNARCHIVE": "WIEDERHERSTELLEN",
+  "UNARCHIVE": "Wiederherstellen",
   "unarchive": "wiederherstellen",
   "unauthorized": "Nicht erlaubt",
   "Unfollowed_thread": "Thread nicht mehr folgen",
diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json
index aad0aca107..45128915cf 100644
--- a/app/i18n/locales/en.json
+++ b/app/i18n/locales/en.json
@@ -48,7 +48,7 @@
   "announcement": "announcement",
   "App_users_are_not_allowed_to_log_in_directly": "App users are not allowed to log in directly.",
   "Apply_Certificate": "Apply certificate",
-  "ARCHIVE": "ARCHIVE",
+  "ARCHIVE": "Archive",
   "archive": "archive",
   "are_typing": "are typing",
   "Are_you_sure_question_mark": "Are you sure?",
@@ -249,6 +249,7 @@
   "e2ee_enabled": "End-to-end encryption is enabled",
   "Edit": "Edit",
   "Edit_Invite": "Edit invite",
+  "Edit_Room_Photo": "Edit room photo",
   "Edit_Status": "Edit status",
   "Email": "E-mail",
   "email": "Email",
@@ -616,7 +617,7 @@
   "Required": "Required",
   "Resend": "Resend",
   "Resend_email": "Resend email",
-  "RESET": "RESET",
+  "RESET": "Reset",
   "Reset": "Reset",
   "Reset_encryption_keys": "Reset encryption keys",
   "Reset_encryption_keys_info__room_type__": "Resetting E2EE keys is only recommend if no {{room_type}} member has a valid key to regain access to the previously encrypted content.",
@@ -645,6 +646,7 @@
   "Room_Info_Edit": "Room info edit",
   "Room_name_changed_to": "changed room name to: {{name}}",
   "Room_not_found": "Room not found",
+  "Room_Password": "Room Password",
   "room_removed_read_only_permission": "removed read only permission",
   "room_set_read_only_permission": "set room to read only",
   "room_unarchived": "unarchived room",
@@ -777,7 +779,7 @@
   "Two_Factor_Success_message": "Two-factor authentication code sent! Please check your email.",
   "Type_message": "Type message",
   "Types": "Types",
-  "UNARCHIVE": "UNARCHIVE",
+  "UNARCHIVE": "Unarchive",
   "unarchive": "unarchive",
   "unauthorized": "Unauthorized",
   "Unblock": "Unblock",
diff --git a/app/i18n/locales/es.json b/app/i18n/locales/es.json
index b449e8414b..77741a2b0f 100644
--- a/app/i18n/locales/es.json
+++ b/app/i18n/locales/es.json
@@ -22,7 +22,7 @@
   "Announcement": "Anuncio",
   "announcement": "anuncio",
   "Apply_Certificate": "Aplicar certificado",
-  "ARCHIVE": "FICHERO",
+  "ARCHIVE": "Fichero",
   "archive": "fichero",
   "are_typing": "están escribiendo",
   "Are_you_sure_question_mark": "¿Estás seguro?",
@@ -90,6 +90,7 @@
   "Do_you_really_want_to_key_this_room_question_mark": "¿Deseas {{key}} de esta sala?",
   "Dont_Have_An_Account": "¿Todavía no tienes una cuenta?",
   "Edit": "Editar",
+  "Edit_Room_Photo": "Foto de la sala de edición",
   "Email": "E-mail",
   "Enable_Auto_Translate": "Permitir Auto-Translate",
   "Error_uploading": "Error en la subida",
@@ -217,13 +218,14 @@
   "Report": "Informe",
   "Required": "Requerido",
   "Resend": "Reenviar",
-  "RESET": "RESET",
+  "RESET": "Reset",
   "Reset_password": "Resetear contraseña",
   "resetting_password": "reseteando contraseña",
   "Rocket_Chat_Documentation": "Documentación de Rocket.Chat",
   "Roles": "Roles",
   "Room_Info": "Información de la sala",
   "Room_Info_Edit": "Editar información de la sala",
+  "Room_Password": "Contraseña de habitación",
   "SAVE": "GUARDAR",
   "Save": "Guardar",
   "Save_Changes": "Guardar cambios",
@@ -285,7 +287,7 @@
   "Two_Factor_Authentication": "Autenticación de doble factor",
   "Two_Factor_Success_message": "¡Código de autenticación de dos factores enviado! Por favor, revisa tu correo electrónico.",
   "Type_message": "Escribir mensaje",
-  "UNARCHIVE": "DESARCHIVAR",
+  "UNARCHIVE": "Desarchivar",
   "unarchive": "desarchivar",
   "Unfollowed_thread": "Dejar de seguir el hilo",
   "Unmute": "Desmutear",
diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json
index 24307d6dc1..c4f668ddee 100644
--- a/app/i18n/locales/fi.json
+++ b/app/i18n/locales/fi.json
@@ -38,7 +38,7 @@
   "Announcement": "Ilmoitus",
   "announcement": "ilmoitus",
   "Apply_Certificate": "Käytä sertifikaattia",
-  "ARCHIVE": "ARKISTO",
+  "ARCHIVE": "Arkisto",
   "archive": "arkisto",
   "are_typing": "kirjoittavat",
   "Are_you_sure_question_mark": "Oletko varma?",
@@ -202,6 +202,7 @@
   "E2E_How_It_Works_info4": "Voit myös määrittää uuden salasanan salausavaimellesi milloin tahansa missä tahansa selaimessa, jossa olet antanut nykyisen täyden salauksen salasanan.",
   "Edit": "Muokkaa",
   "Edit_Invite": "Muokkaa kutsua",
+  "Edit_Room_Photo": "Muokkaa huonekuvaa",
   "Edit_Status": "Muokkaa tilaa",
   "Email": "Sähköposti",
   "Email_Notification_Mode_All": "Jokainen maininta/SV",
@@ -505,7 +506,7 @@
   "Report": "Ilmoita",
   "Required": "Vaadittu",
   "Resend": "Lähetä uudelleen",
-  "RESET": "NOLLAA",
+  "RESET": "Nollaa",
   "Reset_password": "Nollaa salasana",
   "resetting_password": "nollaa salasanaa",
   "Resume": "Jatka",
@@ -528,6 +529,7 @@
   "Room_Info": "Huoneen tiedot",
   "Room_Info_Edit": "Huoneen tietojen muokkaus",
   "Room_name_changed_to": "vaihtoi huoneen nimeksi: {{name}}",
+  "Room_Password": "Huoneen salasana",
   "room_removed_read_only_permission": "poisti vain luku -oikeuden",
   "room_set_read_only_permission": "asetti huoneen vain luku -tilaan",
   "room_unarchived": "palautti huoneen arkistosta",
@@ -650,7 +652,7 @@
   "Two_Factor_Success_message": "Kaksivaiheinen todennuskoodi lähetetty! Tarkista sähköpostisi.",
   "Type_message": "Kirjoita viesti",
   "Types": "Tyypit",
-  "UNARCHIVE": "PALAUTA ARKISTOSTA",
+  "UNARCHIVE": "Palauta arkistosta",
   "unarchive": "palauta arkistosta",
   "unauthorized": "Valtuuttamaton",
   "Unfollowed_thread": "Lopetettiin ketjun seuraaminen",
diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json
index 799d6d5d21..10ac41aad0 100644
--- a/app/i18n/locales/fr.json
+++ b/app/i18n/locales/fr.json
@@ -30,7 +30,7 @@
   "Announcement": "Annonce",
   "announcement": "annonce",
   "Apply_Certificate": "Appliquer le certificat",
-  "ARCHIVE": "ARCHIVER",
+  "ARCHIVE": "Archiver",
   "archive": "archiver",
   "are_typing": "sont en train d'écrire",
   "Are_you_sure_question_mark": "Êtes-vous sûr ?",
@@ -170,6 +170,7 @@
   "E2E_How_It_Works_info4": "Vous pouvez également configurer un nouveau mot de passe pour votre clé de cryptage à tout moment à partir de n'importe quel navigateur dans lequel vous avez entré le mot de passe E2E existant.",
   "Edit": "Modifier",
   "Edit_Invite": "Modifier l'invitation",
+  "Edit_Room_Photo": "Modifier la salle Photo",
   "Edit_Status": "Modifier le statut",
   "Email": "E-mail",
   "Email_Notification_Mode_All": "Chaque mention/MD",
@@ -461,7 +462,7 @@
   "Report": "Signaler",
   "Required": "Requis",
   "Resend": "Renvoyer",
-  "RESET": "RÉINITIALISER",
+  "RESET": "Réinitialiser",
   "Reset_password": "Réinitialiser le mot de passe",
   "resetting_password": "réinitialisation du mot de passe",
   "Resume": "Reprendre",
@@ -476,6 +477,7 @@
   "Roles": "Rôles",
   "Room_Info": "Info sur le salon",
   "Room_Info_Edit": "Modifier les informations du salon",
+  "Room_Password": "Mot de passe de la salle",
   "room-name-already-exists": "Le nom du salon existe déjà",
   "SAVE": "SAUVEGARDER",
   "Save": "Sauvegarder",
@@ -581,7 +583,7 @@
   "Two_Factor_Success_message": "Code d'authentification à deux facteurs envoyé ! Veuillez vérifier votre e-mail.",
   "Type_message": "Tapez le message",
   "Types": "Types",
-  "UNARCHIVE": "DÉSARCHIVER",
+  "UNARCHIVE": "Désarchiver",
   "unarchive": "désarchiver",
   "unauthorized": "Non autorisé",
   "Unfollowed_thread": "Ne plus suivre ce fil",
diff --git a/app/i18n/locales/hi-IN.json b/app/i18n/locales/hi-IN.json
index f94e4407c6..ba76f50b4d 100644
--- a/app/i18n/locales/hi-IN.json
+++ b/app/i18n/locales/hi-IN.json
@@ -222,6 +222,7 @@
   "E2E_How_It_Works_info4": "आप अपने इंड-टू-इंड पासवर्ड से पुनः ब्राउज़र में किसी भी स्थान से कभी भी एक नए पासवर्ड को सेटअप कर सकते हैं।",
   "Edit": "संपादित करें",
   "Edit_Invite": "आमंत्रण संपादित करें",
+  "Edit_Room_Photo": "कमरे की तस्वीर संपादित करें",
   "Edit_Status": "स्थिति संपादित करें",
   "Email": "ईमेल",
   "Email_Notification_Mode_All": "हर मेंशन/डीएम",
@@ -566,6 +567,7 @@
   "Room_Info_Edit": "कमरे की जानकारी संपादित करें",
   "Room_name_changed_to": "कमरे का नाम बदल गया है: {{name}}",
   "Room_not_found": "कमरा नहीं मिला",
+  "Room_Password": "कमरे का पासवर्ड",
   "room_removed_read_only_permission": "पठन केवल अनुमति हटा दी गई है",
   "room_set_read_only_permission": "कमरे को केवल पठन के लिए सेट किया गया है",
   "room_unarchived": "संग्रहित कमरा को फिर से सक्रिय किया गया",
diff --git a/app/i18n/locales/hu.json b/app/i18n/locales/hu.json
index 60a5d25c52..7f64cbbbd5 100644
--- a/app/i18n/locales/hu.json
+++ b/app/i18n/locales/hu.json
@@ -45,7 +45,7 @@
   "Announcement": "Bejelentés",
   "announcement": "bejelentés",
   "Apply_Certificate": "Tanúsítvány alkalmazása",
-  "ARCHIVE": "ARCHÍVUM",
+  "ARCHIVE": "Archívum",
   "archive": "archívum",
   "are_typing": "éppen ír",
   "Are_you_sure_question_mark": "Biztos vagy benne?",
@@ -222,6 +222,7 @@
   "E2E_How_It_Works_info4": "A titkosítási kulcshoz bármikor beállíthat egy új jelszót is, bármelyik böngészőből, ahová a meglévő E2E jelszót beírta.",
   "Edit": "Szerkesztés",
   "Edit_Invite": "Meghívás szerkesztése",
+  "Edit_Room_Photo": "Szobás fotó szerkesztése",
   "Edit_Status": "Állapot szerkesztése",
   "Email": "E-mail",
   "Email_Notification_Mode_All": "Minden említés/DM ",
@@ -567,6 +568,7 @@
   "Room_Info_Edit": "Szoba információ szerkesztés",
   "Room_name_changed_to": "szoba neve megváltoztatva erre: {{name}}",
   "Room_not_found": "Szoba nem található",
+  "Room_Password": "Szoba jelszó",
   "room_removed_read_only_permission": "csak olvasható jogosultság eltávolítva",
   "room_set_read_only_permission": "szoba beállítva csak olvashatóra",
   "room_unarchived": "archiválásból megszüntetett szoba",
@@ -684,7 +686,7 @@
   "Two_Factor_Success_message": "Kétfaktoros hitelesítési kód elküldve! Kérjük, ellenőrizze az emailjét.",
   "Type_message": "Üzenet típusa",
   "Types": "Típusok",
-  "UNARCHIVE": "ARCHIVÁLÁS MEGSZÜNTETÉS",
+  "UNARCHIVE": "Archiválás megszüntetés",
   "unarchive": "Archiválás megszüntetés",
   "unauthorized": "Jogosulatlan",
   "Unfollowed_thread": "Nem követett szál",
diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json
index 572928796a..f30c3cef1f 100644
--- a/app/i18n/locales/it.json
+++ b/app/i18n/locales/it.json
@@ -31,7 +31,7 @@
   "Announcement": "Annuncio",
   "announcement": "annuncio",
   "Apply_Certificate": "Applica certificato",
-  "ARCHIVE": "ARCHIVIO",
+  "ARCHIVE": "Archivio",
   "archive": "archivio",
   "are_typing": "stanno scrivendo",
   "Are_you_sure_question_mark": "Sei sicuro?",
@@ -148,6 +148,7 @@
   "E2E_How_It_Works_info4": "Puoi impostare una nuova password per la chiave di cifratura in qualsiasi momento da uno dei browser dove hai inserito la password E2E esistente.",
   "Edit": "Modifica",
   "Edit_Invite": "Modifica invito",
+  "Edit_Room_Photo": "Modifica foto della stanza",
   "Edit_Status": "Modifica Stato",
   "Email": "E-mail",
   "Email_Notification_Mode_All": "Ogni Menzione/Messaggio Privato",
@@ -392,7 +393,7 @@
   "Report": "Segnala",
   "Required": "Richiesto",
   "Resend": "Invia di nuovo",
-  "RESET": "RIPRISTINA",
+  "RESET": "Ripristina",
   "Reset_password": "Ripristina password",
   "resetting_password": "ripristinando password",
   "Review_app_desc": "Dacci 5 stesse su {{store}}",
@@ -406,6 +407,7 @@
   "Roles": "Ruoli",
   "Room_Info": "Informazioni stanza",
   "Room_Info_Edit": "Modifica informazioni stanza",
+  "Room_Password": "Password della stanza",
   "SAVE": "SALVA",
   "Save": "Salva",
   "Save_Changes": "Salva cambiamenti",
@@ -492,7 +494,7 @@
   "Two_Factor_Authentication": "Autenticazione a due fattori",
   "Two_Factor_Success_message": "Codice di autenticazione a due fattori inviato! Si prega di controllare la tua email.",
   "Type_message": "Scrivi messaggio",
-  "UNARCHIVE": "RIMUOVI DALL'ARCHIVIO",
+  "UNARCHIVE": "Rimuovi dall'archivio",
   "unarchive": "rimuovi dall'archivio",
   "Unfollowed_thread": "Non segui più il thread",
   "Unignore": "Non ignorare",
diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json
index e4680af1d7..b572ae8dbd 100644
--- a/app/i18n/locales/ja.json
+++ b/app/i18n/locales/ja.json
@@ -123,6 +123,7 @@
   "E2E_How_It_Works_info4": "既存のE2Eパスワードを入力した任意のブラウザから、暗号化キーの新しいパスワードをいつでも設定することもできます。",
   "Edit": "編集",
   "Edit_Invite": "編集に招待",
+  "Edit_Room_Photo": "部屋の写真を編集します",
   "Edit_Status": "ステータスを編集する",
   "Email": "メールアドレス",
   "Email_Notification_Mode_All": "すべてのメンション/DM",
@@ -321,6 +322,7 @@
   "Roles": "ロール",
   "Room_Info": "ルーム情報",
   "Room_Info_Edit": "ルーム情報を編集",
+  "Room_Password": "部屋のパスワード",
   "SAVE": "保存",
   "Save": "保存",
   "Save_Changes": "変更を保存",
diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json
index 18d559efa9..95cac457f3 100644
--- a/app/i18n/locales/nl.json
+++ b/app/i18n/locales/nl.json
@@ -30,7 +30,7 @@
   "Announcement": "Aankondiging",
   "announcement": "aankondiging",
   "Apply_Certificate": "Certificaat toepassen",
-  "ARCHIVE": "ARCHIVEER",
+  "ARCHIVE": "Archiveer",
   "archive": "archiveer",
   "are_typing": "zijn aan het typen",
   "Are_you_sure_question_mark": "Weet je het zeker?",
@@ -170,6 +170,7 @@
   "E2E_How_It_Works_info4": "Je kan ook op elk moment een nieuw wachtwoord voor uw coderingssleutel instellen vanuit elke browser waarin u het bestaande E2E-wachtwoord hebt ingevoerd.",
   "Edit": "Bewerk",
   "Edit_Invite": "Bewerk uitnodiging",
+  "Edit_Room_Photo": "Roomfoto bewerken",
   "Edit_Status": "Status bewerken",
   "Email": "E-mail",
   "Email_Notification_Mode_All": "Elke vermelding/DM",
@@ -461,7 +462,7 @@
   "Report": "Rapporteren",
   "Required": "Vereist",
   "Resend": "Opnieuw verzenden",
-  "RESET": "RESET",
+  "RESET": "Reset",
   "Reset_password": "Wachtwoord resetten",
   "resetting_password": "wachtwoord aan het resetten",
   "Resume": "Hervatten",
@@ -476,6 +477,7 @@
   "Roles": "Rollen",
   "Room_Info": "Kamer info",
   "Room_Info_Edit": "Kamer info bewerken",
+  "Room_Password": "Kamerwachtwoord",
   "room-name-already-exists": "Kamernaam bestaat al",
   "SAVE": "OPSLAAN",
   "Save": "Opslaan",
@@ -581,7 +583,7 @@
   "Two_Factor_Success_message": "Twee-factor authenticatiecode verzonden! Controleer uw e-mail.",
   "Type_message": "Typ bericht",
   "Types": "Soorten",
-  "UNARCHIVE": "DEARCHIVEREN",
+  "UNARCHIVE": "Dearchiveren",
   "unarchive": "dearchiveren",
   "unauthorized": "Onbevoegd",
   "Unfollowed_thread": "Draad ontvolgd",
diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json
index da82b87a02..aea3182d54 100644
--- a/app/i18n/locales/pt-BR.json
+++ b/app/i18n/locales/pt-BR.json
@@ -47,7 +47,7 @@
   "announcement": "anúncio",
   "App_users_are_not_allowed_to_log_in_directly": "Usuários do aplicativo não estão autorizados a fazer login diretamente.",
   "Apply_Certificate": "Aplicar certificado",
-  "ARCHIVE": "ARQUIVAR",
+  "ARCHIVE": "Arquivar",
   "archive": "arquivar",
   "are_typing": "estão digitando",
   "Are_you_sure_question_mark": "Você tem certeza?",
@@ -244,6 +244,7 @@
   "E2E_How_It_Works_info4": "Você também pode configurar uma nova senha para sua chave de criptografia a qualquer momento em qualquer navegador em que tenha inserido a senha E2E existente.",
   "Edit": "Editar",
   "Edit_Invite": "Editar convite",
+  "Edit_Room_Photo": "Editar foto da sala",
   "Edit_Status": "Editar status",
   "Email": "E-mail",
   "Email_Notification_Mode_All": "Toda menção / mensagem direta",
@@ -599,7 +600,7 @@
   "Required": "Obrigatório",
   "Resend": "Reenviar",
   "Resend_email": "Reenviar e-mail",
-  "RESET": "RESETAR",
+  "RESET": "Resetar",
   "Reset_password": "Resetar senha",
   "resetting_password": "redefinindo senha",
   "Resume": "Continuar",
@@ -623,6 +624,7 @@
   "Room_Info_Edit": "Editar",
   "Room_name_changed_to": "alterou o nome da sala para: {{name}}",
   "Room_not_found": "Sala não encontrada",
+  "Room_Password": "Senha da sala",
   "room_removed_read_only_permission": "removeu permissão de escrita da sala",
   "room_set_read_only_permission": "adicionou permissão de escrita à sala",
   "room_unarchived": "desarquivou a sala",
@@ -756,7 +758,7 @@
   "Two_Factor_Success_message": "Código de autenticação de dois fatores enviado! Por favor, verifique seu e-mail.",
   "Type_message": "Digitar mensagem",
   "Types": "Tipos",
-  "UNARCHIVE": "DESARQUIVAR",
+  "UNARCHIVE": "Desarquivar",
   "unarchive": "desarquivar",
   "unauthorized": "Não autorizado",
   "Unblock": "Desbloquear",
diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json
index 5bc591d399..3b2c695dc2 100644
--- a/app/i18n/locales/pt-PT.json
+++ b/app/i18n/locales/pt-PT.json
@@ -25,7 +25,7 @@
   "Announcement": "Anúncio",
   "announcement": "anúncio",
   "Apply_Certificate": "Aplicar certificado",
-  "ARCHIVE": "ARQUIVAR",
+  "ARCHIVE": "Arquivar",
   "archive": "arquivar",
   "are_typing": "estão a escrever",
   "Are_you_sure_question_mark": "Tem a certeza?",
@@ -119,6 +119,7 @@
   "E2E_How_It_Works_info4": "Você também pode configurar uma nova senha para sua chave de criptografia a qualquer momento a partir de qualquer navegador que você tenha inserido a senha existente do E2E.",
   "Edit": "Editar",
   "Edit_Invite": "Editar Convite",
+  "Edit_Room_Photo": "Editar foto da sala",
   "Edit_Status": "Editar Status",
   "Email": "E-mail",
   "Email_Notification_Mode_All": "Cada Menção/DM",
@@ -317,13 +318,14 @@
   "Reply": "Responder",
   "Required": "Obrigatório",
   "Resend": "Reenviar",
-  "RESET": "REPOR",
+  "RESET": "Repor",
   "Reset_password": "Repor palavra-passe",
   "resetting_password": "a repor palavra-passe",
   "Rocket_Chat_Documentation": "Documentação do Rocket.Chat",
   "Roles": "Funções",
   "Room_Info": "Informação da Sala",
   "Room_Info_Edit": "Editar Informação da Sala",
+  "Room_Password": "Senha da sala",
   "SAVE": "GUARDAR",
   "Save": "Guardar",
   "Save_Changes": "Guardar Alterações",
@@ -341,7 +343,7 @@
   "Settings": "Definições",
   "Settings_succesfully_changed": "Definições guardadas com sucesso!",
   "Share": "Partilhar",
-  "Show_Password": "Mostrar Palavra-passe",
+  "Show_Password": "Mostrar palavra-passe",
   "Show_the_keyboard_shortcut_list": "Exibe a lista de atalhos do teclado",
   "Sign_Up": "Inscreva-se",
   "Slash_Gimme_Description": "Mostra  (つ ◕_◕) つ  antes de sua mensagem",
@@ -364,7 +366,7 @@
   "Try_again": "Tente novamente",
   "Two_Factor_Authentication": "Autenticação 2FA",
   "Two_Factor_Success_message": "Código de autenticação de dois fatores enviado! Por favor, verifique o seu email.",
-  "UNARCHIVE": "DESARQUIVAR",
+  "UNARCHIVE": "Desarquivar",
   "unarchive": "desarquivar",
   "Unmute": "Retirar silêncio",
   "Unmute_someone_in_room": "Remover silenciar de alguém na sala",
diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json
index d4ba305560..a46dbb50cd 100644
--- a/app/i18n/locales/ru.json
+++ b/app/i18n/locales/ru.json
@@ -36,7 +36,7 @@
   "Announcement": "Объявление",
   "announcement": "объявление",
   "Apply_Certificate": "Применить сертификат",
-  "ARCHIVE": "АРХИВ",
+  "ARCHIVE": "Архив",
   "archive": "архив",
   "are_typing": "печатают",
   "Are_you_sure_question_mark": "Вы уверены?",
@@ -194,6 +194,7 @@
   "E2E_How_It_Works_info4": "Так же Вы можете задать новый пароль для вашего ключа шифрования в любое время при помощи браузера там же, где Вы ввели существующий Е2Е пароль.",
   "Edit": "Правка",
   "Edit_Invite": "Редактировать Приглашение",
+  "Edit_Room_Photo": "Редактировать фото комнаты",
   "Edit_Status": "Изменить статус",
   "Email": "E-mail",
   "Email_Notification_Mode_All": "Каждое Упоминание/Личное сообщение",
@@ -492,7 +493,7 @@
   "Report": "Жалоба",
   "Required": "Обязательно",
   "Resend": "Отправить повторно",
-  "RESET": "СБРОС",
+  "RESET": "Сброс",
   "Reset_password": "Сброс пароля",
   "resetting_password": "сброс пароля",
   "Resume": "Возобновить",
@@ -508,6 +509,7 @@
   "Roles": "Роли",
   "Room_Info": "Информация о канале",
   "Room_Info_Edit": "Изменить информацию о чате",
+  "Room_Password": "Пароль комнаты",
   "room-name-already-exists": "Имя чата уже существует",
   "SAVE": "СОХРАНИТЬ",
   "Save": "Сохранить",
@@ -627,7 +629,7 @@
   "Two_Factor_Success_message": "Код двухфакторной аутентификации отправлен! Пожалуйста, проверьте вашу электронную почту.",
   "Type_message": "Написать сообщение",
   "Types": "Типы",
-  "UNARCHIVE": "РАЗАРХИВИРОВАТЬ",
+  "UNARCHIVE": "Разархивировать",
   "unarchive": "разархивировать",
   "unauthorized": "Неавторизованный",
   "Unfollowed_thread": "Не следить",
diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json
index a00bc52b34..50b1a4b8e6 100644
--- a/app/i18n/locales/sl-SI.json
+++ b/app/i18n/locales/sl-SI.json
@@ -34,7 +34,7 @@
   "Announcement": "Obvestilo",
   "announcement": "obvestilo",
   "Apply_Certificate": "Uporabi certifikat",
-  "ARCHIVE": "ARHIV",
+  "ARCHIVE": "Arhiv",
   "archive": "arhiv",
   "are_typing": "pišejo",
   "Are_you_sure_question_mark": "Ste prepričani?",
@@ -180,6 +180,7 @@
   "E2E_How_It_Works_info4": "Novo geslo za šifrirni ključ lahko nastavite tudi kadar koli iz katerega koli brskalnika, ki ste ga vnesli obstoječe geslo E2E.",
   "Edit": "Uredi",
   "Edit_Invite": "Uredi povabilo",
+  "Edit_Room_Photo": "Uredi fotografijo sobe",
   "Edit_Status": "Uredi stanje",
   "Email": "E-poštni naslov",
   "Email_Notification_Mode_All": "Vsaka omemba/neposredno sporočilo",
@@ -473,7 +474,7 @@
   "Report": "Poročilo",
   "Required": "Obvezno",
   "Resend": "Ponovno poslati",
-  "RESET": "PONASTAVITI",
+  "RESET": "Ponastaviti",
   "Reset_password": "Ponastavitev gesla",
   "resetting_password": "Ponastavitev gesla",
   "Resume": "Nadaljuj",
@@ -489,6 +490,7 @@
   "Roles": "Vloge",
   "Room_Info": "Informacije o sobi",
   "Room_Info_Edit": "Uredi informacije o sobi",
+  "Room_Password": "Sobno geslo",
   "room-name-already-exists": "Ime sobe že obstaja",
   "SAVE": "Shrani",
   "Save": "Shrani",
@@ -596,7 +598,7 @@
   "Two_Factor_Success_message": "Dvofaktorska avtentikacijska koda poslana! Prosimo, preverite svoj e-poštni naslov.",
   "Type_message": "Tip sporočila",
   "Types": "Vrste",
-  "UNARCHIVE": "ODPAKIRATI",
+  "UNARCHIVE": "Odpakirati",
   "unarchive": "Odpakirati",
   "unauthorized": "Nepooblaščen",
   "Unfollowed_thread": "Nit, ki ji nihče ne sledi",
diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json
index 391361b625..5ea1b7f652 100644
--- a/app/i18n/locales/sv.json
+++ b/app/i18n/locales/sv.json
@@ -38,7 +38,7 @@
   "Announcement": "Meddelande",
   "announcement": "meddelande",
   "Apply_Certificate": "Tillämpa certifikat",
-  "ARCHIVE": "ARKIV",
+  "ARCHIVE": "Arkiv",
   "archive": "arkiv",
   "are_typing": "skriver",
   "Are_you_sure_question_mark": "Är du säker?",
@@ -202,6 +202,7 @@
   "E2E_How_It_Works_info4": "Du kan när som helst ställa in ett nytt lösenord för krypteringsnyckeln i en webbläsare där du har angett det befintliga E2E-lösenordet.",
   "Edit": "Redigera",
   "Edit_Invite": "Redigera inbjudan",
+  "Edit_Room_Photo": "Redigera rumsfoto",
   "Edit_Status": "Redigera status",
   "Email": "E-post",
   "Email_Notification_Mode_All": "Varje omnämnande/direktmeddelande",
@@ -504,7 +505,7 @@
   "Report": "Anmäl",
   "Required": "Obligatorisk",
   "Resend": "Skicka igen",
-  "RESET": "ÅTERSTÄLL",
+  "RESET": "Återställ",
   "Reset_password": "Återställ lösenordet",
   "resetting_password": "återställer lösenordet",
   "Resume": "Återuppta",
@@ -527,6 +528,7 @@
   "Room_Info": "Information om rum",
   "Room_Info_Edit": "Redigera information om rum",
   "Room_name_changed_to": "ändrade rummets namn till: {{name}}",
+  "Room_Password": "Rumslösenord",
   "room_removed_read_only_permission": "tog bort behörighet för skrivskyddad åtkomst",
   "room_set_read_only_permission": "skrivskydda rummet",
   "room_unarchived": "avarkiverade rum",
@@ -649,7 +651,7 @@
   "Two_Factor_Success_message": "Tvåfaktorsautentiseringskod skickad! Vänligen kontrollera din e-post.",
   "Type_message": "Skriv meddelande",
   "Types": "Typer",
-  "UNARCHIVE": "AVARKIVERA",
+  "UNARCHIVE": "Avarkivera",
   "unarchive": "avarkivera",
   "unauthorized": "Obehörig",
   "Unfollowed_thread": "Sluta följa tråd",
diff --git a/app/i18n/locales/ta-IN.json b/app/i18n/locales/ta-IN.json
index 33b0c5394d..48b25ac042 100644
--- a/app/i18n/locales/ta-IN.json
+++ b/app/i18n/locales/ta-IN.json
@@ -222,6 +222,7 @@
   "E2E_How_It_Works_info4": "நீங்கள் ஏற்கனவே உள்ள E2E பாஸ்வேர்டை உள்ளீடு செய்த உலாவியிலிருந்து எந்த பருவமும் புதிய பாஸ்வேர்டை அமைக்கலாம்.",
   "Edit": "திருத்து",
   "Edit_Invite": "அழைப்பை திருத்து",
+  "Edit_Room_Photo": "அறை புகைப்படத்தைத் திருத்து",
   "Edit_Status": "நிலையை திருத்து",
   "Email": "மின்னஞ்சல்",
   "Email_Notification_Mode_All": "எல்லா குறிபாக / தனிப்பட்டது",
@@ -566,6 +567,7 @@
   "Room_Info_Edit": "அறை தகவல் திருத்து",
   "Room_name_changed_to": "அறை பெயர் மாற்றினது: {{name}}",
   "Room_not_found": "அறை காணப்படவில்லை",
+  "Room_Password": "அறை கடவுச்சொல்",
   "room_removed_read_only_permission": "மட்டுமே படிக்க அனுமதியை அகற்றினது",
   "room_set_read_only_permission": "அறையை மட்டுமே படிக்க அனுமதியுடன் அமைத்தது",
   "room_unarchived": "கோப்பு சேகரிக்கப்படாத அறை",
diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json
index a4d57e7f0e..9d04f5bd44 100644
--- a/app/i18n/locales/te-IN.json
+++ b/app/i18n/locales/te-IN.json
@@ -221,6 +221,7 @@
   "E2E_How_It_Works_info4": "మీరు అనుమతి పొందకపోతే, మీరు ప్రస్తుతం ఉపయోగించిన E2E పాస్‌వర్డ్ నుండి ఎంక్రిప్షన్ కీకి కొత్త పాస్‌వర్డ్ సెట్ చేయవచ్చు.",
   "Edit": "సవరించు",
   "Edit_Invite": "ఆహ్వానాన్ని సవరించు",
+  "Edit_Room_Photo": "గది ఫోటోను సవరించండి",
   "Edit_Status": "స్థితిని సవరించు",
   "Email": "ఇ-మెయిల్",
   "Email_Notification_Mode_All": "ప్రతి ఉల్లేఖం / DM",
@@ -565,6 +566,7 @@
   "Room_Info_Edit": "గది సమాచారం సవరించు",
   "Room_name_changed_to": "గది పేరును మార్చారు: {{name}}",
   "Room_not_found": "కొన్ని కారణాలతో కమ్మిట్ చేయబడినవి లేవు",
+  "Room_Password": "గది పాస్‌వర్డ్",
   "room_removed_read_only_permission": "గదిలో పఠనాధారిత అనుమతిని తొలగించారు",
   "room_set_read_only_permission": "గదిని కేవలం చదవడానికి రూపొందించారు",
   "room_unarchived": "అభిలోఖిత నుండి తీసుకొనబడింది",
diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json
index 3f9358127a..ab44062fdd 100644
--- a/app/i18n/locales/tr.json
+++ b/app/i18n/locales/tr.json
@@ -26,7 +26,7 @@
   "Announcement": "Duyuru",
   "announcement": "duyuru",
   "Apply_Certificate": "Sertifika uygula",
-  "ARCHIVE": "ARŞİVLE",
+  "ARCHIVE": "Arşi̇vle",
   "archive": "arşivle",
   "are_typing": "yazıyor",
   "Are_you_sure_question_mark": "Emin misiniz?",
@@ -137,6 +137,7 @@
   "E2E_How_It_Works_info4": "Mevcut Uçtan Uca Şifreleme (E2E) şifresini, herhangi bir tarayıcıdan istediğiniz zaman girdiğiniz şifreleme anahtarınız için yeni bir şifre de ayarlayabilirsiniz.",
   "Edit": "Düzenle",
   "Edit_Invite": "Daveti Düzenle",
+  "Edit_Room_Photo": "Oda fotoğrafını düzenle",
   "Edit_Status": "Durumu Düzenle",
   "Email": "E-posta",
   "Email_Notification_Mode_All": "Tüm Bahsetmeler/Özel İletiler",
@@ -375,7 +376,7 @@
   "Report": "Bildir",
   "Required": "Gerekli",
   "Resend": "Yeniden yolla",
-  "RESET": "SIFIRLA",
+  "RESET": "Sifirla",
   "Reset_password": "Şifre sıfırla",
   "resetting_password": "şifre sıfırlanıyor",
   "Review_app_desc": "{{store}} üzerinde bize 5 yıldız verin",
@@ -389,6 +390,7 @@
   "Roles": "Roller",
   "Room_Info": "Oda Bilgisi",
   "Room_Info_Edit": "Oda Bilgilerini Düzenle",
+  "Room_Password": "Oda şifresi",
   "SAVE": "KAYDET",
   "Save": "Kaydet",
   "Save_Changes": "Değişiklikleri Kaydet",
@@ -475,7 +477,7 @@
   "Two_Factor_Authentication": "İki faktörlü Kimlik Doğrulama",
   "Two_Factor_Success_message": "İki faktörlü kimlik doğrulama kodu gönderildi! Lütfen e-postanızı kontrol edin.",
   "Type_message": "İleti yaz",
-  "UNARCHIVE": "ARŞİVDEN ÇIKAR",
+  "UNARCHIVE": "Arşi̇vden çikar",
   "unarchive": "arşivden çıkar",
   "Unfollowed_thread": "Takip edilmeyen başlık",
   "Unignore": "Yok sayma",
diff --git a/app/i18n/locales/zh-CN.json b/app/i18n/locales/zh-CN.json
index ba1821c637..462ec04664 100644
--- a/app/i18n/locales/zh-CN.json
+++ b/app/i18n/locales/zh-CN.json
@@ -133,6 +133,7 @@
   "E2E_How_It_Works_info4": "您也可以随时从已输入既有密码的任何浏览器设定新密码给您的加密金钥。",
   "Edit": "编辑",
   "Edit_Invite": "编辑邀请",
+  "Edit_Room_Photo": "编辑房间照片",
   "Edit_Status": "编辑状态",
   "Email": "邮箱",
   "Email_Notification_Mode_All": "每次被标记或私讯",
@@ -370,6 +371,7 @@
   "Roles": "角色",
   "Room_Info": "聊天室信息",
   "Room_Info_Edit": "聊天室信息编辑",
+  "Room_Password": "房间密码",
   "SAVE": "保存",
   "Save": "保存",
   "Save_Changes": "保存更改",
diff --git a/app/i18n/locales/zh-TW.json b/app/i18n/locales/zh-TW.json
index 32be9e57f0..489eb00b37 100644
--- a/app/i18n/locales/zh-TW.json
+++ b/app/i18n/locales/zh-TW.json
@@ -139,6 +139,7 @@
   "E2E_How_It_Works_info4": "您也可以隨時從已輸入既有密碼的任何瀏覽器設定新密碼給您的加密金鑰。",
   "Edit": "編輯",
   "Edit_Invite": "編輯邀請",
+  "Edit_Room_Photo": "編輯房間照片",
   "Edit_Status": "編輯狀態",
   "Email": "電子郵件",
   "Email_Notification_Mode_All": "每次被標記或私訊",
@@ -388,6 +389,7 @@
   "Roles": "角色",
   "Room_Info": "聊天室資訊",
   "Room_Info_Edit": "修改聊天室資訊",
+  "Room_Password": "房間密碼",
   "SAVE": "儲存",
   "Save": "儲存",
   "Save_Changes": "儲存更改",
diff --git a/app/views/RoomInfoEditView/SwitchContainer.tsx b/app/views/RoomInfoEditView/SwitchContainer.tsx
index 039487a3b9..867b0e2282 100644
--- a/app/views/RoomInfoEditView/SwitchContainer.tsx
+++ b/app/views/RoomInfoEditView/SwitchContainer.tsx
@@ -1,8 +1,7 @@
 import React, { ReactElement } from 'react';
 import { Text, TextStyle, View, ViewStyle } from 'react-native';
 
-import { TSupportedThemes } from '../../theme';
-import { themes } from '../../lib/constants';
+import { useTheme } from '../../theme';
 import styles from './styles';
 import Switch from '../../containers/Switch';
 
@@ -11,11 +10,8 @@ interface ISwitchContainer {
 	value: boolean;
 	disabled?: boolean;
 	leftLabelPrimary: string;
-	leftLabelSecondary: string;
-	rightLabelPrimary?: string;
-	rightLabelSecondary?: string;
+	leftLabelSecondary?: string;
 	onValueChange: (value: any) => void;
-	theme: TSupportedThemes;
 	testID: string;
 	labelContainerStyle?: ViewStyle;
 	leftLabelStyle?: TextStyle;
@@ -29,41 +25,44 @@ const SwitchContainer: React.FC<ISwitchContainer> = React.memo(
 		onValueChange,
 		leftLabelPrimary,
 		leftLabelSecondary,
-		rightLabelPrimary,
-		rightLabelSecondary,
-		theme,
 		testID,
 		labelContainerStyle,
 		leftLabelStyle
-	}) => (
-		<>
-			<View key='switch-container' style={[styles.switchContainer, !!children && styles.switchMargin]}>
-				{leftLabelPrimary && (
-					<View style={[styles.switchLabelContainer, labelContainerStyle]}>
-						<Text style={[styles.switchLabelPrimary, { color: themes[theme].fontTitlesLabels }, leftLabelStyle]}>
-							{leftLabelPrimary}
-						</Text>
-						<Text style={[styles.switchLabelSecondary, { color: themes[theme].fontTitlesLabels }, leftLabelStyle]}>
-							{leftLabelSecondary}
-						</Text>
-					</View>
-				)}
-				<Switch style={styles.switch} onValueChange={onValueChange} value={value} disabled={disabled} testID={testID} />
-				{rightLabelPrimary && (
-					<View style={[styles.switchLabelContainer, labelContainerStyle]}>
-						<Text style={[styles.switchLabelPrimary, { color: themes[theme].fontTitlesLabels }, leftLabelStyle]}>
-							{rightLabelPrimary}
-						</Text>
-						<Text style={[styles.switchLabelSecondary, { color: themes[theme].fontTitlesLabels }, leftLabelStyle]}>
-							{rightLabelSecondary}
-						</Text>
-					</View>
-				)}
+	}) => {
+		const { colors } = useTheme();
+
+		return (
+			<View>
+				<View key='switch-container' style={[styles.switchContainer, !!children && styles.switchMargin]}>
+					{leftLabelPrimary && (
+						<View
+							accessible
+							accessibilityLabel={`${leftLabelPrimary}. ${leftLabelSecondary ?? ''}. `}
+							style={[styles.switchLabelContainer, labelContainerStyle]}>
+							<Text style={[styles.switchLabelPrimary, { color: colors.fontTitlesLabels }, leftLabelStyle]}>
+								{leftLabelPrimary}
+							</Text>
+							{leftLabelSecondary && (
+								<Text style={[styles.switchLabelSecondary, { color: colors.fontSecondaryInfo }, leftLabelStyle]}>
+									{leftLabelSecondary}
+								</Text>
+							)}
+						</View>
+					)}
+					<Switch
+						accessibilityRole='switch'
+						accessible
+						style={styles.switch}
+						onValueChange={onValueChange}
+						value={value}
+						disabled={disabled}
+						testID={testID}
+					/>
+				</View>
+				{children}
 			</View>
-			{children}
-			<View key='switch-divider' style={[styles.divider, { borderColor: themes[theme].strokeLight }]} />
-		</>
-	)
+		);
+	}
 );
 
 export default SwitchContainer;
diff --git a/app/views/RoomInfoEditView/index.tsx b/app/views/RoomInfoEditView/index.tsx
index 4361da529f..fb05de3439 100644
--- a/app/views/RoomInfoEditView/index.tsx
+++ b/app/views/RoomInfoEditView/index.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Q } from '@nozbe/watermelondb';
 import { BlockContext } from '@rocket.chat/ui-kit';
 import { dequal } from 'dequal';
-import { Alert, Keyboard, ScrollView, Text, TextInput, TouchableOpacity, View, StyleSheet } from 'react-native';
+import { Alert, Keyboard, ScrollView, Text, TextInput, View } from 'react-native';
 import { connect } from 'react-redux';
 import { Subscription } from 'rxjs';
 
@@ -47,6 +47,7 @@ import {
 	random
 } from '../../lib/methods/helpers';
 import { Services } from '../../lib/services';
+import Button from '../../containers/Button';
 
 interface IRoomInfoEditViewState {
 	room: ISubscription;
@@ -517,240 +518,182 @@ class RoomInfoEditView extends React.Component<IRoomInfoEditViewProps, IRoomInfo
 			encrypted
 		} = this.state;
 		const { serverVersion, encryptionEnabled, theme } = this.props;
-		const { buttonBackgroundDangerDefault, fontDanger } = themes[theme];
 
 		return (
 			<KeyboardView
 				style={{ backgroundColor: themes[theme].surfaceRoom }}
 				contentContainerStyle={sharedStyles.container}
-				keyboardVerticalOffset={128}
-			>
+				keyboardVerticalOffset={128}>
 				<StatusBar />
 				<SafeAreaView testID='room-info-edit-view' style={{ backgroundColor: themes[theme].surfaceRoom }}>
 					<ScrollView
 						contentContainerStyle={sharedStyles.containerScrollView}
 						testID='room-info-edit-view-list'
-						{...scrollPersistTaps}
-					>
+						{...scrollPersistTaps}>
 						<View style={styles.avatarContainer}>
 							<AvatarWithEdit type={room.t} text={room.name} rid={room.rid} handleEdit={this.handleEditAvatar} />
 						</View>
-						<FormTextInput
-							inputRef={e => {
-								this.name = e;
-							}}
-							label={I18n.t('Name')}
-							value={name}
-							onChangeText={value => this.setState({ name: value })}
-							onSubmitEditing={() => {
-								this.description?.focus();
-							}}
-							error={nameError}
-							testID='room-info-edit-view-name'
-						/>
-						<FormTextInput
-							inputRef={e => {
-								this.description = e;
-							}}
-							label={I18n.t('Description')}
-							value={description}
-							onChangeText={value => this.setState({ description: value })}
-							onSubmitEditing={() => {
-								this.topic?.focus();
-							}}
-							testID='room-info-edit-view-description'
-						/>
-						<FormTextInput
-							inputRef={e => {
-								this.topic = e;
-							}}
-							label={I18n.t('Topic')}
-							value={topic}
-							onChangeText={value => this.setState({ topic: value })}
-							onSubmitEditing={() => {
-								this.announcement?.focus();
-							}}
-							testID='room-info-edit-view-topic'
-						/>
-						<FormTextInput
-							inputRef={e => {
-								this.announcement = e;
-							}}
-							label={I18n.t('Announcement')}
-							value={announcement}
-							onChangeText={value => this.setState({ announcement: value })}
-							onSubmitEditing={() => {
-								this.joinCode?.focus();
-							}}
-							testID='room-info-edit-view-announcement'
-						/>
-						{/* This TextInput avoid appears the password fill when typing into Announcements TextInput */}
-						<View style={{ height: StyleSheet.hairlineWidth, overflow: 'hidden' }}>
-							<TextInput
-								style={{
-									height: StyleSheet.hairlineWidth
+						<View style={styles.inputs}>
+							<FormTextInput
+								inputRef={e => {
+									this.name = e;
+								}}
+								label={I18n.t('Name')}
+								value={name}
+								onChangeText={value => this.setState({ name: value })}
+								onSubmitEditing={() => {
+									this.topic?.focus();
+								}}
+								error={nameError}
+								testID='room-info-edit-view-name'
+								required
+							/>
+							<FormTextInput
+								inputRef={e => {
+									this.topic = e;
+								}}
+								label={I18n.t('Topic')}
+								value={topic}
+								onChangeText={value => this.setState({ topic: value })}
+								onSubmitEditing={() => {
+									this.announcement?.focus();
 								}}
+								testID='room-info-edit-view-topic'
+							/>
+							<FormTextInput
+								inputRef={e => {
+									this.announcement = e;
+								}}
+								label={I18n.t('Announcement')}
+								value={announcement}
+								onChangeText={value => this.setState({ announcement: value })}
+								onSubmitEditing={() => {
+									this.description?.focus();
+								}}
+								testID='room-info-edit-view-announcement'
+							/>
+							<FormTextInput
+								inputRef={e => {
+									this.description = e;
+								}}
+								label={I18n.t('Description')}
+								value={description}
+								onChangeText={value => this.setState({ description: value })}
+								onSubmitEditing={() => {
+									this.joinCode?.focus();
+								}}
+								testID='room-info-edit-view-description'
 							/>
 						</View>
+
 						<FormTextInput
 							inputRef={e => {
 								this.joinCode = e;
 							}}
-							label={I18n.t('Password')}
+							label={I18n.t('Room_Password')}
 							value={joinCode}
 							onChangeText={value => this.setState({ joinCode: value })}
 							secureTextEntry
 							testID='room-info-edit-view-password'
 						/>
-						<SwitchContainer
-							value={t}
-							leftLabelPrimary={I18n.t('Public')}
-							leftLabelSecondary={
-								room.teamMain ? I18n.t('Everyone_can_access_this_team') : I18n.t('Everyone_can_access_this_channel')
-							}
-							rightLabelPrimary={I18n.t('Private')}
-							rightLabelSecondary={
-								room.teamMain
-									? I18n.t('Just_invited_people_can_access_this_team')
-									: I18n.t('Just_invited_people_can_access_this_channel')
-							}
-							onValueChange={this.toggleRoomType}
-							theme={theme}
-							testID='room-info-edit-view-t'
-						/>
-						<SwitchContainer
-							value={ro}
-							leftLabelPrimary={I18n.t('Collaborative')}
-							leftLabelSecondary={
-								room.teamMain
-									? I18n.t('All_users_in_the_team_can_write_new_messages')
-									: I18n.t('All_users_in_the_channel_can_write_new_messages')
-							}
-							rightLabelPrimary={I18n.t('Read_Only')}
-							rightLabelSecondary={I18n.t('Only_authorized_users_can_write_new_messages')}
-							onValueChange={this.toggleReadOnly}
-							disabled={!permissions['set-readonly'] || room.broadcast}
-							theme={theme}
-							testID='room-info-edit-view-ro'
-						/>
-						{ro && !room.broadcast ? (
+						<View style={styles.switches}>
 							<SwitchContainer
-								value={reactWhenReadOnly as boolean}
-								leftLabelPrimary={I18n.t('No_Reactions')}
-								leftLabelSecondary={I18n.t('Reactions_are_disabled')}
-								rightLabelPrimary={I18n.t('Allow_Reactions')}
-								rightLabelSecondary={I18n.t('Reactions_are_enabled')}
-								onValueChange={this.toggleReactions}
-								disabled={!permissions['set-react-when-readonly']}
-								theme={theme}
-								testID='room-info-edit-view-react-when-ro'
+								value={t}
+								leftLabelPrimary={I18n.t('Public')}
+								leftLabelSecondary={
+									room.teamMain ? I18n.t('Everyone_can_access_this_team') : I18n.t('Everyone_can_access_this_channel')
+								}
+								onValueChange={this.toggleRoomType}
+								testID='room-info-edit-view-t'
 							/>
-						) : null}
-						{room.broadcast
-							? [
-									<Text style={styles.broadcast}>{I18n.t('Broadcast')}</Text>,
-									<View style={[styles.divider, { borderColor: themes[theme].strokeLight }]} />
-							  ]
-							: null}
-						{serverVersion && !compareServerVersion(serverVersion, 'lowerThan', '3.0.0') ? (
+
 							<SwitchContainer
-								value={enableSysMes as boolean}
-								leftLabelPrimary={I18n.t('Hide_System_Messages')}
+								value={ro}
+								leftLabelPrimary={I18n.t('Read_Only')}
 								leftLabelSecondary={
-									enableSysMes
-										? I18n.t('Overwrites_the_server_configuration_and_use_room_config')
-										: I18n.t('Uses_server_configuration')
+									room.teamMain
+										? I18n.t('All_users_in_the_team_can_write_new_messages')
+										: I18n.t('All_users_in_the_channel_can_write_new_messages')
 								}
-								theme={theme}
-								testID='room-info-edit-switch-system-messages'
-								onValueChange={this.toggleHideSystemMessages}
-								labelContainerStyle={styles.hideSystemMessages}
-								leftLabelStyle={styles.systemMessagesLabel}
-							>
-								{this.renderSystemMessages()}
-							</SwitchContainer>
-						) : null}
-						{encryptionEnabled ? (
-							<SwitchContainer
-								value={encrypted as boolean}
-								disabled={!t}
-								leftLabelPrimary={I18n.t('Encrypted')}
-								leftLabelSecondary={I18n.t('End_to_end_encrypted_room')}
-								theme={theme}
-								testID='room-info-edit-switch-encrypted'
-								onValueChange={this.toggleEncrypted}
-								labelContainerStyle={styles.hideSystemMessages}
-								leftLabelStyle={styles.systemMessagesLabel}
+								onValueChange={this.toggleReadOnly}
+								disabled={!permissions['set-readonly'] || room.broadcast}
+								testID='room-info-edit-view-ro'
 							/>
-						) : null}
-						<TouchableOpacity
-							style={[
-								styles.buttonContainer,
-								{ backgroundColor: themes[theme].buttonBackgroundSecondaryDefault },
-								!this.formIsChanged() && styles.buttonContainerDisabled
-							]}
+							{ro && !room.broadcast ? (
+								<SwitchContainer
+									value={reactWhenReadOnly as boolean}
+									leftLabelPrimary={I18n.t('No_Reactions')}
+									leftLabelSecondary={I18n.t('Reactions_are_disabled')}
+									onValueChange={this.toggleReactions}
+									disabled={!permissions['set-react-when-readonly']}
+									testID='room-info-edit-view-react-when-ro'
+								/>
+							) : null}
+							{room.broadcast
+								? [
+										<Text style={styles.broadcast}>{I18n.t('Broadcast')}</Text>,
+										<View style={[styles.divider, { borderColor: themes[theme].strokeLight }]} />
+								  ]
+								: null}
+							{serverVersion && !compareServerVersion(serverVersion, 'lowerThan', '3.0.0') ? (
+								<SwitchContainer
+									value={enableSysMes as boolean}
+									leftLabelPrimary={I18n.t('Hide_System_Messages')}
+									testID='room-info-edit-switch-system-messages'
+									onValueChange={this.toggleHideSystemMessages}
+									labelContainerStyle={styles.hideSystemMessages}
+									leftLabelStyle={styles.systemMessagesLabel}>
+									{this.renderSystemMessages()}
+								</SwitchContainer>
+							) : null}
+							{encryptionEnabled ? (
+								<SwitchContainer
+									value={encrypted as boolean}
+									disabled={!t}
+									leftLabelPrimary={I18n.t('Encrypted')}
+									leftLabelSecondary={I18n.t('End_to_end_encrypted_room')}
+									testID='room-info-edit-switch-encrypted'
+									onValueChange={this.toggleEncrypted}
+									labelContainerStyle={styles.hideSystemMessages}
+									leftLabelStyle={styles.systemMessagesLabel}
+								/>
+							) : null}
+						</View>
+						<Button
+							title={I18n.t('Save_Changes')}
 							onPress={this.submit}
 							disabled={!this.formIsChanged()}
 							testID='room-info-edit-view-submit'
-						>
-							<Text style={[styles.button, { color: themes[theme].fontWhite }]} accessibilityRole='button'>
-								{I18n.t('SAVE')}
-							</Text>
-						</TouchableOpacity>
-						<View style={{ flexDirection: 'row' }}>
-							<TouchableOpacity
-								style={[
-									styles.buttonContainer_inverted,
-									styles.buttonInverted,
-									{ flex: 1, borderColor: themes[theme].fontSecondaryInfo },
-									!this.formIsChanged() && styles.buttonContainerDisabled
-								]}
-								onPress={this.reset}
-								disabled={!this.formIsChanged()}
-								testID='room-info-edit-view-reset'
-							>
-								<Text
-									style={[styles.button, styles.button_inverted, { color: themes[theme].fontDefault }]}
-									accessibilityRole='button'
-								>
-									{I18n.t('RESET')}
-								</Text>
-							</TouchableOpacity>
-							<TouchableOpacity
-								style={[
-									styles.buttonInverted,
-									styles.buttonContainer_inverted,
-									archived
-										? !permissions['unarchive-room'] && sharedStyles.opacity5
-										: !permissions['archive-room'] && sharedStyles.opacity5,
-									{ flex: 1, marginLeft: 10, borderColor: buttonBackgroundDangerDefault }
-								]}
-								onPress={this.toggleArchive}
-								disabled={archived ? !permissions['unarchive-room'] : !permissions['archive-room']}
-								testID={archived ? 'room-info-edit-view-unarchive' : 'room-info-edit-view-archive'}
-							>
-								<Text style={[styles.button, styles.button_inverted, { color: fontDanger }]}>
-									{archived ? I18n.t('UNARCHIVE') : I18n.t('ARCHIVE')}
-								</Text>
-							</TouchableOpacity>
-						</View>
+							style={{ marginBottom: 0 }}
+						/>
 						<View style={[styles.divider, { borderColor: themes[theme].strokeLight }]} />
-						<TouchableOpacity
-							style={[
-								styles.buttonContainer_inverted,
-								styles.buttonContainerLastChild,
-								styles.buttonDanger,
-								{ borderColor: buttonBackgroundDangerDefault },
-								!this.hasDeletePermission() && sharedStyles.opacity5
-							]}
+
+						<Button
+							backgroundColor={themes[theme].buttonBackgroundSecondaryDefault}
+							title={I18n.t('RESET')}
+							onPress={this.reset}
+							disabled={!this.formIsChanged()}
+							testID='room-info-edit-view-reset'
+						/>
+						<Button
+							backgroundColor={themes[theme].buttonBackgroundSecondaryDefault}
+							color={themes[theme].fontTitlesLabels}
+							title={archived ? I18n.t('UNARCHIVE') : I18n.t('ARCHIVE')}
+							onPress={this.toggleArchive}
+							disabled={archived ? !permissions['unarchive-room'] : !permissions['archive-room']}
+							testID={archived ? 'room-info-edit-view-unarchive' : 'room-info-edit-view-archive'}
+							style={{ marginBottom: 0 }}
+						/>
+
+						<View style={[styles.divider, { borderColor: themes[theme].strokeLight }]} />
+						<Button
+							color={themes[theme].buttonFontSecondaryDanger}
+							backgroundColor={themes[theme].buttonBackgroundSecondaryDefault}
+							title={I18n.t('Delete')}
 							onPress={room.teamMain ? this.deleteTeam : this.delete}
 							disabled={!this.hasDeletePermission()}
 							testID='room-info-edit-view-delete'
-						>
-							<Text style={[styles.button, styles.button_inverted, { color: fontDanger }]} accessibilityRole='button'>
-								{I18n.t('DELETE')}
-							</Text>
-						</TouchableOpacity>
+						/>
 					</ScrollView>
 				</SafeAreaView>
 			</KeyboardView>
diff --git a/app/views/RoomInfoEditView/styles.ts b/app/views/RoomInfoEditView/styles.ts
index 1e643b7b6c..1861971e34 100644
--- a/app/views/RoomInfoEditView/styles.ts
+++ b/app/views/RoomInfoEditView/styles.ts
@@ -39,18 +39,17 @@ export default StyleSheet.create({
 	},
 	switchLabelContainer: {
 		flex: 1,
-		paddingHorizontal: 10,
-		alignItems: 'flex-end'
+		alignItems: 'flex-start'
 	},
 	switchLabelPrimary: {
 		fontSize: 16,
-		paddingBottom: 6,
+		lineHeight: 24,
 		...sharedStyles.textRegular
 	},
 	switchLabelSecondary: {
-		fontSize: 12,
-		...sharedStyles.textRegular,
-		textAlign: 'right'
+		fontSize: 14,
+		lineHeight: 20,
+		...sharedStyles.textRegular
 	},
 	switch: {
 		alignSelf: 'center'
@@ -58,7 +57,7 @@ export default StyleSheet.create({
 	divider: {
 		height: StyleSheet.hairlineWidth,
 		borderBottomWidth: StyleSheet.hairlineWidth,
-		marginVertical: 20
+		marginVertical: 12
 	},
 	broadcast: {
 		...sharedStyles.textSemibold,
@@ -76,7 +75,7 @@ export default StyleSheet.create({
 	avatarContainer: {
 		alignItems: 'center',
 		justifyContent: 'center',
-		marginBottom: 32,
+		marginBottom: 16,
 		marginTop: 16
 	},
 	resetButton: {
@@ -85,5 +84,14 @@ export default StyleSheet.create({
 		position: 'absolute',
 		bottom: -8,
 		right: -8
+	},
+	inputs: {
+		flex: 1,
+		gap: 12
+	},
+	switches: {
+		flex: 1,
+		gap: 12,
+		marginBottom: 36
 	}
 });
diff --git a/app/views/RoomInfoView/index.tsx b/app/views/RoomInfoView/index.tsx
index dd8e92f01c..caa66f75d8 100644
--- a/app/views/RoomInfoView/index.tsx
+++ b/app/views/RoomInfoView/index.tsx
@@ -103,6 +103,7 @@ const RoomInfoView = (): React.ReactElement => {
 		const HeaderRight = () => (
 			<HeaderButton.Container>
 				<HeaderButton.Item
+					accessibilityLabel={I18n.t('Room_Info_Edit')}
 					iconName='edit'
 					onPress={() => {
 						if (!room) return;
@@ -196,7 +197,7 @@ const RoomInfoView = (): React.ReactElement => {
 			const sub = subRoom.observe();
 			subscription.current = sub.subscribe(changes => {
 				setRoom(changes.asPlain());
-				setHeader((roomType === SubscriptionType.DIRECT) ? false : canEdit);
+				setHeader(roomType === SubscriptionType.DIRECT ? false : canEdit);
 			});
 		} else {
 			try {
@@ -209,7 +210,7 @@ const RoomInfoView = (): React.ReactElement => {
 			}
 		}
 		setShowEdit(canEdit);
-		setHeader((roomType === SubscriptionType.DIRECT) ? false : canEdit);
+		setHeader(roomType === SubscriptionType.DIRECT ? false : canEdit);
 	};
 
 	const createDirect = () =>
diff --git a/e2e/tests/room/08-roominfo.spec.ts b/e2e/tests/room/08-roominfo.spec.ts
index d309a893c9..eb22772d40 100644
--- a/e2e/tests/room/08-roominfo.spec.ts
+++ b/e2e/tests/room/08-roominfo.spec.ts
@@ -16,7 +16,7 @@ async function navigateToRoomInfo(room: string) {
 }
 
 async function swipe(direction: Detox.Direction) {
-	await element(by.id('room-info-edit-view-list')).swipe(direction);
+	await element(by.id('room-info-edit-view-list')).swipe(direction, 'fast', 1);
 }
 
 async function waitForToast() {
@@ -136,24 +136,26 @@ describe('Room info screen', () => {
 		describe('Usage', () => {
 			it('should reset form', async () => {
 				await element(by.id('room-info-edit-view-name')).replaceText('abc');
-				await element(by.id('room-info-edit-view-description')).replaceText('abc');
+				await element(by.id('room-info-edit-view-name')).tapReturnKey();
 				await element(by.id('room-info-edit-view-topic')).replaceText('abc');
 				await element(by.id('room-info-edit-view-topic')).tapReturnKey();
 				await element(by.id('room-info-edit-view-announcement')).replaceText('abc');
 				await element(by.id('room-info-edit-view-announcement')).tapReturnKey();
+				await element(by.id('room-info-edit-view-description')).replaceText('abc');
+				await element(by.id('room-info-edit-view-description')).tapReturnKey();
 				await element(by.id('room-info-edit-view-password')).replaceText('abc');
 				await element(by.id('room-info-edit-view-password')).tapReturnKey();
-				await swipe('down'); // dismiss keyboard
-				await element(by.id('room-info-edit-view-t')).tap();
 				await swipe('up');
+				await element(by.id('room-info-edit-view-t')).tap();
 				await element(by.id('room-info-edit-view-ro')).tap();
 				await element(by.id('room-info-edit-view-react-when-ro')).tap();
+				await swipe('up');
 				await element(by.id('room-info-edit-view-reset')).tap();
 				// after reset
 				await expect(element(by.id('room-info-edit-view-name'))).toHaveText(room);
-				await expect(element(by.id('room-info-edit-view-description'))).toHaveText('');
 				await expect(element(by.id('room-info-edit-view-topic'))).toHaveText('');
 				await expect(element(by.id('room-info-edit-view-announcement'))).toHaveText('');
+				await expect(element(by.id('room-info-edit-view-description'))).toHaveText('');
 				await expect(element(by.id('room-info-edit-view-password'))).toHaveText('');
 				await expect(element(by.id('room-info-edit-view-t'))).toHaveToggleValue(true);
 				await expect(element(by.id('room-info-edit-view-ro'))).toHaveToggleValue(false);
@@ -183,14 +185,13 @@ describe('Room info screen', () => {
 
 			it('should change room description, topic, announcement', async () => {
 				await sleep(5000); // wait for changes to be applied from socket
-				await element(by.id('room-info-edit-view-description')).replaceText('new description');
 				await element(by.id('room-info-edit-view-topic')).replaceText('new topic');
-				await swipe('down'); // dismiss keyboard
-				// announcement is hide by the keyboard
+				await element(by.id('room-info-edit-view-topic')).tapReturnKey();
 				await element(by.id('room-info-edit-view-announcement')).replaceText('new announcement');
 				await element(by.id('room-info-edit-view-announcement')).tapReturnKey();
+				await element(by.id('room-info-edit-view-description')).replaceText('new description');
+				await element(by.id('room-info-edit-view-description')).tapReturnKey();
 				await element(by.id('room-info-edit-view-password')).tapReturnKey();
-				await swipe('down'); // dismiss keyboard
 				await swipe('up');
 				await element(by.id('room-info-edit-view-submit')).tap();
 				await waitForToast();
@@ -227,9 +228,9 @@ describe('Room info screen', () => {
 			// });
 
 			it('should change room type', async () => {
-				await swipe('down');
-				await element(by.id('room-info-edit-view-t')).tap();
+				await sleep(300);
 				await swipe('up');
+				await element(by.id('room-info-edit-view-t')).tap();
 				await element(by.id('room-info-edit-view-submit')).tap();
 				await waitForToast();
 			});
diff --git a/e2e/tests/team/01-createteam.spec.ts b/e2e/tests/team/01-createteam.spec.ts
index b9881297ff..8cce8b17d6 100644
--- a/e2e/tests/team/01-createteam.spec.ts
+++ b/e2e/tests/team/01-createteam.spec.ts
@@ -86,7 +86,7 @@ describe('Create team screen', () => {
 			await waitFor(element(by.id('room-info-edit-view-list')))
 				.toBeVisible()
 				.withTimeout(2000);
-			await element(by.id('room-info-edit-view-list')).swipe('up');
+			await element(by.id('room-info-edit-view-list')).swipe('up', 'fast', 1);
 			await waitFor(element(by.id('room-info-edit-view-delete')))
 				.toBeVisible()
 				.withTimeout(2000);