From f2cde94b47102998405579bc0ec08f5bacc1b713 Mon Sep 17 00:00:00 2001 From: Tiago Evangelista Date: Thu, 22 May 2025 15:25:48 -0300 Subject: [PATCH 1/3] fix --- apps/meteor/tests/e2e/login.spec.ts | 3 +++ .../components/LoginSwitchLanguageFooter.tsx | 21 ++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/apps/meteor/tests/e2e/login.spec.ts b/apps/meteor/tests/e2e/login.spec.ts index 529e0c310a926..c96871112b04f 100644 --- a/apps/meteor/tests/e2e/login.spec.ts +++ b/apps/meteor/tests/e2e/login.spec.ts @@ -59,6 +59,9 @@ test.describe.parallel('Login', () => { test('Should correctly display switch language button', async ({ page, api }) => { expect((await setSettingValueById(api, 'Language', 'pt-BR')).status()).toBe(200); + const buttonDefault = page.getByRole('button', { name: 'Change to Default' }); + await expect(buttonDefault).not.toBeVisible(); + const button = page.getByRole('button', { name: 'Alterar para português (Brasil)' }); await button.click(); diff --git a/packages/web-ui-registration/src/components/LoginSwitchLanguageFooter.tsx b/packages/web-ui-registration/src/components/LoginSwitchLanguageFooter.tsx index 9c25ddcfc7a73..be4103ff58ae9 100644 --- a/packages/web-ui-registration/src/components/LoginSwitchLanguageFooter.tsx +++ b/packages/web-ui-registration/src/components/LoginSwitchLanguageFooter.tsx @@ -60,13 +60,20 @@ const LoginSwitchLanguageFooter = ({ return ( - {suggestions.map((suggestion) => ( - - ))} + {suggestions.map((suggestion) => { + // If suggestion is "Default", skip it + if (!suggestion.key) { + return; + } + + return ( + + ); + })} ); }; From f74d29d5193ca193925408f67057637763aedcdb Mon Sep 17 00:00:00 2001 From: Tiago Evangelista Pinto Date: Thu, 22 May 2025 15:31:15 -0300 Subject: [PATCH 2/3] add changeset --- .changeset/breezy-ravens-design.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/breezy-ravens-design.md diff --git a/.changeset/breezy-ravens-design.md b/.changeset/breezy-ravens-design.md new file mode 100644 index 0000000000000..91ac3c654cabf --- /dev/null +++ b/.changeset/breezy-ravens-design.md @@ -0,0 +1,6 @@ +--- +"@rocket.chat/meteor": patch +"@rocket.chat/web-ui-registration": patch +--- + +Removes a `Change to Default` button that change the language in login page From 0d377f4e6c647a86f7490151ba692a0eb9cdab7f Mon Sep 17 00:00:00 2001 From: Tiago Evangelista Pinto Date: Sat, 24 May 2025 15:38:31 -0300 Subject: [PATCH 3/3] Update .changeset/breezy-ravens-design.md Co-authored-by: Aleksander Nicacio da Silva --- .changeset/breezy-ravens-design.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/breezy-ravens-design.md b/.changeset/breezy-ravens-design.md index 91ac3c654cabf..f3463379ddeec 100644 --- a/.changeset/breezy-ravens-design.md +++ b/.changeset/breezy-ravens-design.md @@ -3,4 +3,4 @@ "@rocket.chat/web-ui-registration": patch --- -Removes a `Change to Default` button that change the language in login page +Removes the `Change to Default` language button from the login page