From 77356f243934757ba2a6744e6df6eb26543c26e4 Mon Sep 17 00:00:00 2001 From: OtavioStasiak Date: Mon, 18 Nov 2024 16:10:20 -0300 Subject: [PATCH 1/5] chore: updated E2EEnterYourPasswordView layout --- app/stacks/InsideStack.tsx | 8 ++++++-- app/views/E2EEnterYourPasswordView.tsx | 10 +++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/stacks/InsideStack.tsx b/app/stacks/InsideStack.tsx index adbd46a588..b3cc15d2f1 100644 --- a/app/stacks/InsideStack.tsx +++ b/app/stacks/InsideStack.tsx @@ -283,7 +283,11 @@ const E2EEnterYourPasswordStackNavigator = () => { return ( - + ); }; @@ -305,7 +309,7 @@ const InsideStackNavigator = () => { diff --git a/app/views/E2EEnterYourPasswordView.tsx b/app/views/E2EEnterYourPasswordView.tsx index 34050ceb6e..d673dc5e77 100644 --- a/app/views/E2EEnterYourPasswordView.tsx +++ b/app/views/E2EEnterYourPasswordView.tsx @@ -23,7 +23,7 @@ const styles = StyleSheet.create({ info: { fontSize: 16, lineHeight: 24, - marginVertical: 4, + marginTop: 24, ...sharedStyles.textRegular } }); @@ -82,10 +82,14 @@ const E2EEnterYourPasswordView = (): React.ReactElement => { contentContainerStyle={sharedStyles.container} keyboardVerticalOffset={128}> - + Date: Fri, 22 Nov 2024 00:16:36 -0300 Subject: [PATCH 2/5] fix: added label on show and hide password input --- app/containers/TextInput/FormTextInput.tsx | 5 ++++- app/i18n/locales/ar.json | 2 ++ app/i18n/locales/bn-IN.json | 2 ++ app/i18n/locales/cs.json | 2 ++ app/i18n/locales/de.json | 2 ++ app/i18n/locales/en.json | 2 ++ app/i18n/locales/es.json | 2 ++ app/i18n/locales/fi.json | 2 ++ app/i18n/locales/fr.json | 2 ++ app/i18n/locales/hi-IN.json | 2 ++ app/i18n/locales/hu.json | 2 ++ app/i18n/locales/it.json | 2 ++ app/i18n/locales/ja.json | 2 ++ app/i18n/locales/nl.json | 2 ++ app/i18n/locales/pt-BR.json | 2 ++ app/i18n/locales/pt-PT.json | 2 ++ app/i18n/locales/ru.json | 2 ++ app/i18n/locales/sl-SI.json | 2 ++ app/i18n/locales/sv.json | 2 ++ app/i18n/locales/ta-IN.json | 2 ++ app/i18n/locales/te-IN.json | 2 ++ app/i18n/locales/tr.json | 2 ++ app/i18n/locales/zh-CN.json | 2 ++ app/i18n/locales/zh-TW.json | 2 ++ app/stacks/InsideStack.tsx | 8 ++------ 25 files changed, 52 insertions(+), 7 deletions(-) diff --git a/app/containers/TextInput/FormTextInput.tsx b/app/containers/TextInput/FormTextInput.tsx index f1c9da893d..4de684eff9 100644 --- a/app/containers/TextInput/FormTextInput.tsx +++ b/app/containers/TextInput/FormTextInput.tsx @@ -167,7 +167,10 @@ export const FormTextInput = ({ ) : null} {secureTextEntry ? ( - setShowPassword(!showPassword)} style={[styles.iconContainer, styles.iconRight]}> + setShowPassword(!showPassword)} + style={[styles.iconContainer, styles.iconRight]}> { return ( - + ); }; @@ -309,7 +305,7 @@ const InsideStackNavigator = () => { From 8ed97262105553aa2554af5a3f923593103972c0 Mon Sep 17 00:00:00 2001 From: OtavioStasiak Date: Fri, 22 Nov 2024 03:17:22 +0000 Subject: [PATCH 3/5] action: organized translations --- app/i18n/locales/pt-BR.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json index bfb7697963..70dd02fa12 100644 --- a/app/i18n/locales/pt-BR.json +++ b/app/i18n/locales/pt-BR.json @@ -317,9 +317,9 @@ "Group_by": "Agrupar por", "Has_left_the_team": "saiu do time", "Help": "Ajuda", + "Hide_Password": "Ocultar Senha", "Hide_room": "Ocultar", "Hide_System_Messages": "Esconder mensagens do sistema", - "Hide_Password": "Ocultar Senha", "Hide_type_messages": "Esconder mensagens de \"{{type}}\"", "How_It_Works": "Como funciona", "I_Saved_My_E2E_Password": "Salvei minha senha E2E", @@ -682,8 +682,8 @@ "Show_badge_for_mentions_Info": "Mostrar contador somente para menções diretas", "Show_less": "Mostrar menos", "Show_more": "Mostrar mais", - "Show-Password": "Exibir senha", "Show_the_keyboard_shortcut_list": "Mostrar a lista de atalhos de teclado", + "Show-Password": "Exibir senha", "Sign_Up": "Registrar", "Skip": "Pular", "Slash_Gimme_Description": "Mostra (つ ◕_◕) つ antes de sua mensagem", From 2483bf96dbaaa9c34b9dcdae35b514cf0aae9c85 Mon Sep 17 00:00:00 2001 From: OtavioStasiak Date: Fri, 22 Nov 2024 16:08:03 -0300 Subject: [PATCH 4/5] fix: label on closeButton --- app/views/E2EEnterYourPasswordView.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/E2EEnterYourPasswordView.tsx b/app/views/E2EEnterYourPasswordView.tsx index d673dc5e77..f0684265c4 100644 --- a/app/views/E2EEnterYourPasswordView.tsx +++ b/app/views/E2EEnterYourPasswordView.tsx @@ -18,6 +18,7 @@ import { useTheme } from '../theme'; import sharedStyles from './Styles'; import { showToast } from '../lib/methods/helpers/showToast'; import { showErrorAlert, useDebounce } from '../lib/methods/helpers'; +import i18n from '../i18n'; const styles = StyleSheet.create({ info: { @@ -66,7 +67,9 @@ const E2EEnterYourPasswordView = (): React.ReactElement => { useLayoutEffect(() => { navigation.setOptions({ - headerLeft: () => , + headerLeft: () => ( + + ), title: I18n.t('Enter_E2EE_Password') }); }, [navigation]); From ed83e9a2f8d4c31f45e7b69fe8753038f7da8479 Mon Sep 17 00:00:00 2001 From: OtavioStasiak Date: Fri, 22 Nov 2024 16:09:36 -0300 Subject: [PATCH 5/5] fix: lint --- app/views/E2EEnterYourPasswordView.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/E2EEnterYourPasswordView.tsx b/app/views/E2EEnterYourPasswordView.tsx index f0684265c4..311fea30b0 100644 --- a/app/views/E2EEnterYourPasswordView.tsx +++ b/app/views/E2EEnterYourPasswordView.tsx @@ -18,7 +18,6 @@ import { useTheme } from '../theme'; import sharedStyles from './Styles'; import { showToast } from '../lib/methods/helpers/showToast'; import { showErrorAlert, useDebounce } from '../lib/methods/helpers'; -import i18n from '../i18n'; const styles = StyleSheet.create({ info: { @@ -68,7 +67,7 @@ const E2EEnterYourPasswordView = (): React.ReactElement => { useLayoutEffect(() => { navigation.setOptions({ headerLeft: () => ( - + ), title: I18n.t('Enter_E2EE_Password') });