From 3a37450da237e4d124ad09cc06aa8dfe3d4d7cb8 Mon Sep 17 00:00:00 2001 From: Sayan Banerjee Date: Sun, 24 Dec 2023 01:13:44 +0530 Subject: [PATCH 1/3] language set to default on startup --- .../views/account/preferences/AccountPreferencesPage.tsx | 2 +- .../views/account/preferences/useAccountPreferencesValues.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx b/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx index 77997422a21e0..b240c230d4e01 100644 --- a/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx +++ b/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx @@ -25,7 +25,7 @@ const AccountPreferencesPage = (): ReactElement => { const dataDownloadEnabled = useSetting('UserData_EnableDownload'); const preferencesValues = useAccountPreferencesValues(); - const methods = useForm({ defaultValues: preferencesValues }); + const methods = useForm({ defaultValues: preferencesValues }); const { handleSubmit, reset, diff --git a/apps/meteor/client/views/account/preferences/useAccountPreferencesValues.ts b/apps/meteor/client/views/account/preferences/useAccountPreferencesValues.ts index b99a2a6c1ebee..819e24a08283e 100644 --- a/apps/meteor/client/views/account/preferences/useAccountPreferencesValues.ts +++ b/apps/meteor/client/views/account/preferences/useAccountPreferencesValues.ts @@ -1,7 +1,7 @@ import { useUserPreference } from '@rocket.chat/ui-contexts'; export type AccountPreferencesData = { - language?: string; + language: string; dontAskAgainList?: string[]; enableAutoAway?: boolean; idleTimeLimit?: number; @@ -39,7 +39,7 @@ export type AccountPreferencesData = { }; export const useAccountPreferencesValues = (): AccountPreferencesData => { - const language = useUserPreference('language'); + const language = useUserPreference('language') || ''; const userDontAskAgainList = useUserPreference<{ action: string; label: string }[]>('dontAskAgainList') || []; const dontAskAgainList = userDontAskAgainList.map(({ action }) => action); const enableAutoAway = useUserPreference('enableAutoAway'); From 96600d788842874c2a99c619d51e435feba49496 Mon Sep 17 00:00:00 2001 From: Douglas Fabris Date: Tue, 26 Dec 2023 11:30:38 -0300 Subject: [PATCH 2/3] fix: review --- .../client/views/account/preferences/AccountPreferencesPage.tsx | 2 +- .../views/account/preferences/useAccountPreferencesValues.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx b/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx index b240c230d4e01..77997422a21e0 100644 --- a/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx +++ b/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx @@ -25,7 +25,7 @@ const AccountPreferencesPage = (): ReactElement => { const dataDownloadEnabled = useSetting('UserData_EnableDownload'); const preferencesValues = useAccountPreferencesValues(); - const methods = useForm({ defaultValues: preferencesValues }); + const methods = useForm({ defaultValues: preferencesValues }); const { handleSubmit, reset, diff --git a/apps/meteor/client/views/account/preferences/useAccountPreferencesValues.ts b/apps/meteor/client/views/account/preferences/useAccountPreferencesValues.ts index 819e24a08283e..a85ef275638e4 100644 --- a/apps/meteor/client/views/account/preferences/useAccountPreferencesValues.ts +++ b/apps/meteor/client/views/account/preferences/useAccountPreferencesValues.ts @@ -1,7 +1,7 @@ import { useUserPreference } from '@rocket.chat/ui-contexts'; export type AccountPreferencesData = { - language: string; + language?: string; dontAskAgainList?: string[]; enableAutoAway?: boolean; idleTimeLimit?: number; From ed0f522c0fa4e6399337a6fba77b16bfea3cb454 Mon Sep 17 00:00:00 2001 From: Douglas Fabris Date: Tue, 26 Dec 2023 12:52:02 -0300 Subject: [PATCH 3/3] chore: changeset --- .changeset/chilled-cooks-end.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/chilled-cooks-end.md diff --git a/.changeset/chilled-cooks-end.md b/.changeset/chilled-cooks-end.md new file mode 100644 index 0000000000000..820a3bf679f1b --- /dev/null +++ b/.changeset/chilled-cooks-end.md @@ -0,0 +1,5 @@ +--- +"@rocket.chat/meteor": patch +--- + +Fixed an issue displaying the language selection preference empty when it should display 'Default' on the initial value