Merge branch 'develop' into chat-hist-reg

RocketChat · Nov 30, 2022 · bd8cb3a · bd8cb3a
2 parents 145c2d2 + ab6da16
commit bd8cb3a
Show file tree

Hide file tree

Showing 5 changed files with 475 additions and 26 deletions.
diff --git a/apps/meteor/app/threads/client/flextab/thread.ts b/apps/meteor/app/threads/client/flextab/thread.ts
@@ -379,8 +379,9 @@ Template.thread.onRendered(function (this: ThreadTemplateInstance) {
 		const { Threads, state } = Template.instance() as ThreadTemplateInstance;
 		const tmid = state.get('tmid');
 		const threads = Threads.findOne({ $or: [{ tmid }, { _id: tmid }] });
+		const isLoading = state.get('loading');
 
-		if (!threads) {
+		if (!isLoading && !threads) {
 			this.closeThread();
 		}
 	});

diff --git a/apps/meteor/app/ui-message/client/messageBox/messageBox.ts b/apps/meteor/app/ui-message/client/messageBox/messageBox.ts
@@ -126,16 +126,16 @@ Template.messageBox.onCreated(function (this: MessageBoxTemplateInstance) {
 			input.focus();
 		});
 	};
+});
+
+Template.messageBox.onRendered(function (this: MessageBoxTemplateInstance) {
+	let inputSetup = false;
 
 	const { chatMessagesInstance } = this.data;
 
 	chatMessagesInstance.quotedMessages.subscribe(() => {
 		this.replyMessageData.set(chatMessagesInstance.quotedMessages.get());
 	});
-});
-
-Template.messageBox.onRendered(function (this: MessageBoxTemplateInstance) {
-	let inputSetup = false;
 
 	this.autorun(() => {
 		const { rid, subscription } = Template.currentData() as MessageBoxTemplateInstance['data'];

diff --git a/...eteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx b/...eteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx
@@ -1,8 +1,7 @@
 import { IGroupVideoConference } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
-import { Button, Message, Box, Avatar } from '@rocket.chat/fuselage';
+import { Button, Message, Box, Avatar, Palette } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import colors from '@rocket.chat/fuselage-tokens/colors';
 import { useTranslation, useSetting } from '@rocket.chat/ui-contexts';
 import React, { ReactElement } from 'react';
 
@@ -39,12 +38,11 @@ const VideoConfListItem = ({
 	const hovered = css`
 		&:hover,
 		&:focus {
-			background: ${colors.n100};
+			background: ${Palette.surface['surface-tint']};
 			.rcx-message {
-				background: ${colors.n100};
+				background: ${Palette.surface['surface-tint']};
 			}
 		}
-		border-bottom: 2px solid ${colors.n300} !important;
 	`;
 
 	const handleJoinConference = useMutableCallback((): void => {
@@ -53,7 +51,14 @@ const VideoConfListItem = ({
 	});
 
 	return (
-		<Box className={[...className, hovered].filter(Boolean)} pb='x8'>
+		<Box
+			color='default'
+			borderBlockEndWidth={2}
+			borderBlockEndColor='stroke-extra-light'
+			borderBlockEndStyle='solid'
+			className={[...className, hovered].filter(Boolean)}
+			pb='x8'
+		>
 			<Message {...props}>
 				<Message.LeftContainer>
 					{username && <UserAvatar username={username} className='rcx-message__avatar' size='x36' />}

diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json
@@ -11,7 +11,7 @@
   "__username__was_set__role__by__user_by_": "__user_by__ muutti käyttäjän __username__ rooliksi __role__ ",
   "This_room_encryption_has_been_enabled_by__username_": "Tämän huoneen salauksen käynnisti __username__ ",
   "This_room_encryption_has_been_disabled_by__username_": "Tämän huoneen salauksen pysäytti __username__",
-  "Enabled_E2E_Encryption_for_this_room": "Päästä päähän salaus sallittu huoneessa",
+  "Enabled_E2E_Encryption_for_this_room": "otti E2E-salauksen käyttöön tässä huoneessa",
   "Disabled_E2E_Encryption_for_this_room": "Päästä päähän salaus ei sallittu huoneessa",
   "@username": "@kayttajatunnus",
   "@username_message": "@kayttajatunnus <message>",