From 2f4bde77495fad51980305b738871e2cdd4a00a7 Mon Sep 17 00:00:00 2001 From: Gleidson Daniel Silva Date: Wed, 6 Mar 2024 10:02:02 -0300 Subject: [PATCH 1/4] chore: update notification troubleshoot page copy (#5603) --- app/i18n/locales/en.json | 4 ++-- app/i18n/locales/pt-BR.json | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json index f350b1a33..1cc406b30 100644 --- a/app/i18n/locales/en.json +++ b/app/i18n/locales/en.json @@ -137,7 +137,7 @@ "Create_account": "Create an account", "Created_snippet": "created a snippet", "Custom_push_gateway_connected_description": "Your workspace uses a custom push notification gateway. Check with your workspace administrator for any issues.", - "Custom_push_gateway_connection": "Custom Gateway Connection", + "Custom_push_gateway_connection": "Custom gateway connection", "DELETE": "DELETE", "Dark": "Dark", "Dark_level": "Dark level", @@ -474,7 +474,7 @@ "Push_Notifications_Alert_Info": "These notifications are delivered to you when the app is not open", "Push_Troubleshooting": "Push Troubleshooting", "Push_gateway_connected_description": "Send a push notification to yourself to check if the gateway is working", - "Push_gateway_connection": "Push Gateway Connection", + "Push_gateway_connection": "Push gateway connection", "Push_gateway_not_connected_description": "We're not able to connect to the push gateway. If this issue persists please check with your workspace administrator.", "Queued_chats": "Queued chats", "Quote": "Quote", diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json index 67e06b1d6..b1cd1ab83 100644 --- a/app/i18n/locales/pt-BR.json +++ b/app/i18n/locales/pt-BR.json @@ -23,7 +23,7 @@ "All_users_in_the_channel_can_write_new_messages": "Todos usuários no canal podem enviar mensagens novas", "All_users_in_the_team_can_write_new_messages": "Todos usuários no canal podem enviar mensagens novas", "Allow_Reactions": "Permitir reagir", - "Allow_push_notifications_for_rocket_chat": "Nenhuma ação adicional é necessária", + "Allow_push_notifications_for_rocket_chat": "Permitir notificações push para Rocket.Chat", "Also_send_thread_message_to_channel_behavior": "Também enviar mensagem do tópico para o canal", "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.", @@ -100,7 +100,7 @@ "Close_emoji_selector": "Fechar seletor de emojis", "Code_or_password_invalid": "Código ou senha inválido", "Collaborative": "Colaborativo", - "Community_edition_push_quota": "Cota de notificações push Community Edition", + "Community_edition_push_quota": "Cota de notificações push community edition", "Condensed": "Condensado", "Confirm": "Confirmar", "Confirmation": "Confirmação", @@ -134,7 +134,7 @@ "Create_account": "Criar conta", "Created_snippet": "criou um snippet", "Custom_push_gateway_connected_description": "Seu workspace utiliza um gateway de notificação push personalizado. Verifique com o administrador do seu workspace se há algum problema.", - "Custom_push_gateway_connection": "Conexão Personalizada com o Gateway", + "Custom_push_gateway_connection": "Conexão personalizada com o gateway", "DELETE": "EXCLUIR", "Dark": "Escuro", "Dark_level": "Nível escuro", @@ -390,7 +390,7 @@ "No_channels_in_team": "Nenhum canal nesta equipe", "No_discussions": "Sem discussões", "No_files": "Não há arquivos", - "No_further_action_is_needed": "Ir para configurações do dispositivo", + "No_further_action_is_needed": "Nenhuma ação adicional é necessária", "No_label_provided": "Sem {{label}}.", "No_limit": "Sem limite", "No_match_found": "Nenhum resultado encontrado.", @@ -466,7 +466,7 @@ "Push_Notifications_Alert_Info": "Essas notificações são entregues a você quando o aplicativo não está aberto", "Push_Troubleshooting": "Solucionar Problemas de Push", "Push_gateway_connected_description": "Envie uma notificação push para si mesmo para verificar se o gateway está funcionando.", - "Push_gateway_connection": "Conexão com o Gateway de Push", + "Push_gateway_connection": "Conexão com o gateway de push", "Push_gateway_not_connected_description": "Não conseguimos conectar ao gateway de push. Se esse problema persistir, por favor, verifique com o administrador do seu workspace.", "Queued_chats": "Bate-papos na fila", "Quote": "Citar", @@ -695,7 +695,7 @@ "Wi_Fi_and_mobile_data": "Wi-Fi e dados móveis", "Without_Servers": "Sem workspaces", "Workspace_URL_Example": "Ex. sua-empresa.rocket.chat", - "Workspace_consumption": "Consumo do Workspace", + "Workspace_consumption": "Consumo do workspace", "Workspace_consumption_description": "Existe uma quantidade definida de notificações push por mês", "Workspaces": "Workspaces", "Would_like_to_place_on_hold": "Gostaria de colocar essa conversa em espera?", From 2c0cfa168187ccaefd73811251c8e38c41c07e69 Mon Sep 17 00:00:00 2001 From: Gleidson Daniel Silva Date: Wed, 6 Mar 2024 10:04:12 -0300 Subject: [PATCH 2/4] regression: validate that the login error value is actually a string (#5602) --- app/views/LoginView/handleLoginErrors.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/LoginView/handleLoginErrors.ts b/app/views/LoginView/handleLoginErrors.ts index 37f1b2080..5e352b286 100644 --- a/app/views/LoginView/handleLoginErrors.ts +++ b/app/views/LoginView/handleLoginErrors.ts @@ -26,10 +26,12 @@ const LOGIN_SUBMIT_ERRORS = { }; export const handleLoginErrors = (error: keyof typeof LOGIN_SUBMIT_ERRORS): string => { - const errorKey = Object.keys(LOGIN_SUBMIT_ERRORS).find(key => error.includes(key)) as keyof typeof LOGIN_SUBMIT_ERRORS; - const e = errorKey ? LOGIN_SUBMIT_ERRORS[errorKey].i18n : 'Login_error'; - if (i18n.isTranslated(e)) { - return i18n.t(e); + if (typeof error === 'string') { + const errorKey = Object.keys(LOGIN_SUBMIT_ERRORS).find(key => error?.includes(key)) as keyof typeof LOGIN_SUBMIT_ERRORS; + const e = errorKey ? LOGIN_SUBMIT_ERRORS[errorKey]?.i18n : 'Login_error'; + if (i18n.isTranslated(e)) { + return i18n.t(e); + } } return i18n.t('Login_error'); }; From 3b6177002a549aec07b60dd12679d8c7323412d7 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Wed, 6 Mar 2024 15:58:31 -0300 Subject: [PATCH 3/4] fix: message.md not getting cleaned up correctly (#5606) --- app/lib/methods/updateMessages.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/lib/methods/updateMessages.ts b/app/lib/methods/updateMessages.ts index c8f9dc2b0..08df5577b 100644 --- a/app/lib/methods/updateMessages.ts +++ b/app/lib/methods/updateMessages.ts @@ -139,6 +139,9 @@ export default async function updateMessages({ if (newMessage && !newMessage?.blocks) { newMessage.blocks = null; } + if (newMessage && !newMessage?.md) { + newMessage.md = undefined; + } Object.assign(m, newMessage); }) ); From 29421c940bef2140fc198900451227f8f6e968ae Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Thu, 7 Mar 2024 14:45:29 -0300 Subject: [PATCH 4/4] fix: request room e2ee key not working properly (#5607) --- app/lib/services/restApi.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/services/restApi.ts b/app/lib/services/restApi.ts index 47c367508..94866c268 100644 --- a/app/lib/services/restApi.ts +++ b/app/lib/services/restApi.ts @@ -76,7 +76,7 @@ export const e2eUpdateGroupKey = (uid: string, rid: string, key: string): any => export const e2eRequestRoomKey = (rid: string, e2eKeyId: string): Promise<{ message: { msg?: string }; success: boolean }> => // RC 0.70.0 - sdk.methodCallWrapper('stream-notify-room-users', `${rid}/e2ekeyRequest`, rid, e2eKeyId); + sdk.methodCall('stream-notify-room-users', `${rid}/e2ekeyRequest`, rid, e2eKeyId); export const e2eAcceptSuggestedGroupKey = (rid: string): Promise<{ success: boolean }> => // RC 5.5