diff --git a/apps/meteor/app/lib/server/startup/settings.ts b/apps/meteor/app/lib/server/startup/settings.ts index c914d2805199..eb0f8c4e01dd 100644 --- a/apps/meteor/app/lib/server/startup/settings.ts +++ b/apps/meteor/app/lib/server/startup/settings.ts @@ -467,26 +467,6 @@ settingsRegistry.addGroup('Accounts', function () { public: true, i18nLabel: 'Enter_Behaviour', }); - - this.add('Accounts_Default_User_Preferences_messageViewMode', 0, { - type: 'select', - values: [ - { - key: 0, - i18nLabel: 'Normal', - }, - { - key: 1, - i18nLabel: 'Cozy', - }, - { - key: 2, - i18nLabel: 'Compact', - }, - ], - public: true, - i18nLabel: 'MessageBox_view_mode', - }); this.add('Accounts_Default_User_Preferences_emailNotificationMode', 'mentions', { type: 'select', values: [ diff --git a/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx b/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx index b4228b1f86b4..115b32ebc57b 100644 --- a/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx +++ b/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx @@ -31,7 +31,6 @@ type CurrentData = { pushNotifications: string; enableAutoAway: boolean; highlights: string; - messageViewMode: number; hideUsernames: boolean; hideRoles: boolean; displayAvatars: boolean; diff --git a/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx index 4d7358bba32b..a9b2996e3195 100644 --- a/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx +++ b/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx @@ -21,7 +21,6 @@ type Values = { displayAvatars: boolean; clockMode: 0 | 1 | 2; sendOnEnter: 'normal' | 'alternative' | 'desktop'; - messageViewMode: 0 | 1 | 2; }; const PreferencesMessagesSection = ({ onChange, commitRef, ...props }: FormSectionProps): ReactElement => { @@ -42,7 +41,6 @@ const PreferencesMessagesSection = ({ onChange, commitRef, ...props }: FormSecti hideFlexTab: useUserPreference('hideFlexTab'), clockMode: useUserPreference('clockMode') ?? 0, sendOnEnter: useUserPreference('sendOnEnter'), - messageViewMode: useUserPreference('messageViewMode'), displayAvatars: useUserPreference('displayAvatars'), }; @@ -62,7 +60,6 @@ const PreferencesMessagesSection = ({ onChange, commitRef, ...props }: FormSecti displayAvatars, clockMode, sendOnEnter, - messageViewMode, } = values as Values; const { @@ -79,7 +76,6 @@ const PreferencesMessagesSection = ({ onChange, commitRef, ...props }: FormSecti handleDisplayAvatars, handleClockMode, handleSendOnEnter, - handleMessageViewMode, } = handlers; const alsoSendThreadMessageToChannelOptions = useMemo( @@ -109,15 +105,6 @@ const PreferencesMessagesSection = ({ onChange, commitRef, ...props }: FormSecti [t], ); - const messageViewModeOptions = useMemo( - (): SelectOption[] => [ - [0 as any, t('Normal')], // TO DO: update SelectOption type to accept number as first item - [1, t('Cozy')], - [2, t('Compact')], - ], - [t], - ); - commitRef.current.messages = commit; // TODO: Weird behaviour when saving clock mode, and then changing it. @@ -275,18 +262,6 @@ const PreferencesMessagesSection = ({ onChange, commitRef, ...props }: FormSecti ), [handleSendOnEnter, sendOnEnter, sendOnEnterOptions, t], )} - {useMemo( - () => ( - - {t('View_mode')} - -