Merge branch 'develop' into feat/new-user-panel-pending

.changeset/red-cheetahs-heal.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes a cosmetic issue where emoji picker object and symbols category icon are swapped

apps/meteor/client/views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx

@@ -30,10 +30,10 @@ const mapCategoryIcon = (category: string) => {
 			return 'airplane';
 
 		case 'objects':
-			return 'percentage';
+			return 'lamp-bulb';
 
 		case 'symbols':
-			return 'lamp-bulb';
+			return 'percentage';
 
 		case 'flags':
 			return 'flag';

apps/meteor/reporters/rocketchat.ts

@@ -20,7 +20,7 @@ class RocketChatReporter implements Reporter {
 		this.run = options.run;
 	}
 
-	onTestEnd(test: TestCase, result: TestResult) {
+	async onTestEnd(test: TestCase, result: TestResult) {
 		if (process.env.REPORTER_ROCKETCHAT_REPORT !== 'true') {
 			console.log('REPORTER_ROCKETCHAT_REPORT is not true, skipping', {
 				draft: this.draft,
@@ -36,15 +36,23 @@ class RocketChatReporter implements Reporter {
 			draft: this.draft,
 			run: this.run,
 		};
-		console.log(`Sending test result to Rocket.Chat: ${JSON.stringify(payload)}`);
-		return fetch(this.url, {
-			method: 'POST',
-			body: JSON.stringify(payload),
-			headers: {
-				'Content-Type': 'application/json',
-				'X-Api-Key': this.apiKey,
-			},
-		});
+
+		try {
+			const res = await fetch(this.url, {
+				method: 'POST',
+				body: JSON.stringify(payload),
+				headers: {
+					'Content-Type': 'application/json',
+					'X-Api-Key': this.apiKey,
+				},
+			});
+
+			if (!res.ok) {
+				console.error('Error sending test result to Rocket.Chat', JSON.stringify(payload), res);
+			}
+		} catch (error) {
+			console.error('Unknown error while sending test result to Rocket.Chat', JSON.stringify(payload), error);
+		}
 	}
 }