Merge branch 'develop' into fix/missing-colors

apps/meteor/app/discussion/client/index.js

@@ -1,5 +1,4 @@
 // Other UI extensions
 import './lib/messageTypes/discussionMessage';
 import './createDiscussionMessageAction';
-import './discussionFromMessageBox';
 import './tabBar';

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: [

apps/meteor/app/ui-message/client/actionButtons/messageBox.ts

@@ -11,11 +11,9 @@ import { Utilities } from '../../../apps/lib/misc/Utilities';
 
 const getIdForActionButton = ({ appId, actionId }: IUIActionButton): string => `${appId}/${actionId}`;
 
-const APP_GROUP = 'Create_new';
-
 export const onAdded = (button: IUIActionButton): void =>
 	// eslint-disable-next-line no-void
-	void messageBox.actions.add(APP_GROUP, t(Utilities.getI18nKeyForApp(button.labelI18n, button.appId)) as TranslationKey, {
+	void messageBox.actions.add('Apps', t(Utilities.getI18nKeyForApp(button.labelI18n, button.appId)) as TranslationKey, {
 		id: getIdForActionButton(button),
 		// icon: button.icon || '',
 		condition() {
@@ -33,4 +31,4 @@ export const onAdded = (button: IUIActionButton): void =>
 
 export const onRemoved = (button: IUIActionButton): void =>
 	// eslint-disable-next-line no-void
-	void messageBox.actions.remove(APP_GROUP, new RegExp(getIdForActionButton(button)));
+	void messageBox.actions.remove('Apps', new RegExp(getIdForActionButton(button)));

apps/meteor/app/ui-message/client/messageBox/createComposerAPI.ts

@@ -5,7 +5,6 @@ import $ from 'jquery';
 
 import { withDebouncing } from '../../../../lib/utils/highOrderFunctions';
 import type { ComposerAPI } from '../../../../client/lib/chats/ChatAPI';
-import './messageBoxActions';
 import type { FormattingButton } from './messageBoxFormatting';
 import { formattingButtons } from './messageBoxFormatting';
 

apps/meteor/app/ui-message/client/messageBox/messageBox.ts

@@ -1,5 +1,3 @@
-import './messageBoxActions';
-
 const lastFocusedInput: HTMLTextAreaElement | undefined = undefined;
 
 export const refocusComposer = () => {

apps/meteor/app/webdav/client/index.js

@@ -9,7 +9,6 @@ Meteor.startup(() => {
 			return;
 		}
 		c.stop();
-		import('./startup/messageBoxActions');
 		import('./startup/sync');
 		import('./actionButton');
 	});

apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx

@@ -21,7 +21,7 @@ type CreateDiscussionFormValues = {
 };
 
 type CreateDiscussionProps = {
-	parentMessageId: IMessage['_id'];
+	parentMessageId?: IMessage['_id'];
 	onClose: () => void;
 	defaultParentRoom?: IRoom['_id'];
 	nameSuggestion?: string;

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;

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(
-					() => (
-						<Field>
-							<Field.Label>{t('View_mode')}</Field.Label>
-							<Field.Row>
-								<Select value={messageViewMode} onChange={handleMessageViewMode} options={messageViewModeOptions} />
-							</Field.Row>
-							<Field.Hint>{t('Message_view_mode_info')}</Field.Hint>
-						</Field>
-					),
-					[handleMessageViewMode, messageViewMode, messageViewModeOptions, t],
-				)}
 			</FieldGroup>
 		</Accordion.Item>
 	);

apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx

@@ -15,10 +15,11 @@ const audioRecorder = new AudioRecorder();
 type AudioMessageRecorderProps = {
 	rid: IRoom['_id'];
 	tmid?: IMessage['_id'];
+	isRecording?: boolean;
 	chatContext?: ChatAPI; // TODO: remove this when the composer is migrated to React
 } & Omit<AllHTMLAttributes<HTMLDivElement>, 'is'>;
 
-const AudioMessageRecorder = ({ rid, chatContext, ...props }: AudioMessageRecorderProps): ReactElement | null => {
+const AudioMessageRecorder = ({ rid, chatContext, isRecording, ...props }: AudioMessageRecorderProps): ReactElement | null => {
 	const t = useTranslation();
 
 	const [state, setState] = useState<'idle' | 'loading' | 'recording'>('idle');
@@ -167,6 +168,7 @@ const AudioMessageRecorder = ({ rid, chatContext, ...props }: AudioMessageRecord
 	if (state === 'idle') {
 		return (
 			<MessageComposerAction
+				disabled={isRecording}
 				title={t('Audio_message')}
 				icon='mic'
 				className='rc-message-box__icon rc-message-box__audio-message-mic'

apps/meteor/client/views/room/components/body/RoomBody.tsx

@@ -66,7 +66,6 @@ const RoomBody = (): ReactElement => {
 	const hideUsernames = useUserPreference<boolean>('hideUsernames');
 	const displayAvatars = useUserPreference<boolean>('displayAvatars');
 	const useLegacyMessageTemplate = useUserPreference<boolean>('useLegacyMessageTemplate') ?? false;
-	const viewMode = useUserPreference<number>('messageViewMode');
 
 	const wrapperRef = useRef<HTMLDivElement | null>(null);
 	const messagesBoxRef = useRef<HTMLDivElement | null>(null);
@@ -128,11 +127,6 @@ const RoomBody = (): ReactElement => {
 
 	const uploads = useSyncExternalStore(chat.uploads.subscribe, chat.uploads.get);
 
-	const messageViewMode = useMemo(() => {
-		const modes = ['', 'cozy', 'compact'] as const;
-		return modes[viewMode ?? 0] ?? modes[0];
-	}, [viewMode]);
-
 	const { hasMorePreviousMessages, hasMoreNextMessages, isLoadingMoreMessages } = useRoomMessages();
 
 	const allowAnonymousRead = useSetting('Accounts_AllowAnonymousRead') as boolean | undefined;
@@ -580,10 +574,7 @@ const RoomBody = (): ReactElement => {
 									/>
 								))}
 							</div>
-							<div
-								ref={messagesBoxRef}
-								className={['messages-box', messageViewMode, roomLeader && 'has-leader'].filter(isTruthy).join(' ')}
-							>
+							<div ref={messagesBoxRef} className={['messages-box', roomLeader && 'has-leader'].filter(isTruthy).join(' ')}>
 								<NewMessagesButton visible={hasNewMessages} onClick={handleNewMessageButtonClick} />
 								<JumpToRecentMessagesBar visible={hasMoreNextMessages} onClick={handleJumpToRecentButtonClick} />
 								{!canPreview ? (