Merge branch 'develop' into filesDropTarget-ts

RocketChat · Sep 12, 2023 · 7ba2adf · 7ba2adf
2 parents 4c0d1f7 + 711bb92
commit 7ba2adf
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 23 deletions.
diff --git a/.changeset/loud-bees-smoke.md b/.changeset/loud-bees-smoke.md
diff --git a/apps/meteor/app/apps/server/bridges/messages.ts b/apps/meteor/app/apps/server/bridges/messages.ts
@@ -1,4 +1,4 @@
-import type { IMessage, IDirectMessage } from '@rocket.chat/apps-engine/definition/messages';
+import type { IMessage } from '@rocket.chat/apps-engine/definition/messages';
 import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms';
 import type { IUser } from '@rocket.chat/apps-engine/definition/users';
 import type { ITypingDescriptor } from '@rocket.chat/apps-engine/server/bridges/MessageBridge';
@@ -17,7 +17,7 @@ export class AppMessageBridge extends MessageBridge {
 		super();
 	}
 
-	protected async create(message: IMessage | IDirectMessage, appId: string): Promise<string> {
+	protected async create(message: IMessage, appId: string): Promise<string> {
 		this.orch.debugLog(`The App ${appId} is creating a new message.`);
 
 		const convertedMessage = await this.orch.getConverters()?.get('messages').convertAppMessage(message);

diff --git a/apps/meteor/package.json b/apps/meteor/package.json
@@ -225,7 +225,7 @@
 		"@rocket.chat/account-utils": "workspace:^",
 		"@rocket.chat/agenda": "workspace:^",
 		"@rocket.chat/api-client": "workspace:^",
-		"@rocket.chat/apps-engine": "1.41.0-alpha.325",
+		"@rocket.chat/apps-engine": "1.41.0-alpha.312",
 		"@rocket.chat/base64": "workspace:^",
 		"@rocket.chat/cas-validate": "workspace:^",
 		"@rocket.chat/core-services": "workspace:^",

diff --git a/ee/packages/ui-theming/src/paletteDark.ts b/ee/packages/ui-theming/src/paletteDark.ts
@@ -120,12 +120,12 @@ export const palette = [
 		category: 'Button',
 		description: 'Primary Background',
 		list: [
-			{ name: 'button-background-primary-default', token: '', color: '#3976D1' },
-			{ name: 'button-background-primary-hover', token: '', color: '#295EAE' },
-			{ name: 'button-background-primary-press', token: '', color: '#245399' },
-			{ name: 'button-background-primary-focus', token: '', color: '#3976D1' },
-			{ name: 'button-background-primary-keyfocus', token: '', color: '#3976D1' },
-			{ name: 'button-background-primary-disabled', token: '', color: '#1D3963' },
+			{ name: 'button-background-primary-default', token: '', color: '#095AD2' },
+			{ name: 'button-background-primary-hover', token: '', color: '#10529E' },
+			{ name: 'button-background-primary-press', token: '', color: '#01336B' },
+			{ name: 'button-background-primary-focus', token: '', color: '#095AD2' },
+			{ name: 'button-background-primary-keyfocus', token: '', color: '#095AD2' },
+			{ name: 'button-background-primary-disabled', token: '', color: '#012247' },
 		],
 	},
 	{
@@ -177,15 +177,15 @@ export const palette = [
 		list: [
 			{ name: 'button-font-on-primary', token: 'white', color: '#FFFFFF' },
 			{ name: 'button-font-on-secondary', token: 'N400', color: '#E4E7EA' },
-			{ name: 'button-font-on-secondary-danger', token: '', color: '#C14454' },
+			{ name: 'button-font-on-secondary-danger', token: '', color: '#FFC1C9' },
 			{ name: 'button-font-on-danger', token: 'white', color: '#FFFFFF' },
 			{ name: 'button-font-on-success', token: 'white', color: '#FFFFFF' },
 			{ name: 'button-font-on-primary-disabled', token: 'N700', color: '#6C727A' },
 			{ name: 'button-font-on-secondary-disabled', token: 'N700', color: '#6C727A' },
 			{
 				name: 'button-font-on-secondary-danger-disabled',
 				token: '',
-				color: '#613339',
+				color: '#6B0513',
 			},
 			{ name: 'button-font-on-danger-disabled', token: '', color: '#757575' },
 			{ name: 'button-font-on-success-disabled', token: '', color: '#757575' },

diff --git a/yarn.lock b/yarn.lock
@@ -7774,21 +7774,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rocket.chat/apps-engine@npm:1.41.0-alpha.325":
-  version: 1.41.0-alpha.325
-  resolution: "@rocket.chat/apps-engine@npm:1.41.0-alpha.325"
+"@rocket.chat/apps-engine@npm:1.41.0-alpha.312":
+  version: 1.41.0-alpha.312
+  resolution: "@rocket.chat/apps-engine@npm:1.41.0-alpha.312"
   dependencies:
     adm-zip: ^0.5.9
     cryptiles: ^4.1.3
     jose: ^4.11.1
     lodash.clonedeep: ^4.5.0
     semver: ^5.7.1
     stack-trace: 0.0.10
-    uuid: ~8.3.2
+    uuid: ^3.4.0
     vm2: ^3.9.19
   peerDependencies:
     "@rocket.chat/ui-kit": "*"
-  checksum: 3159b69d1174166bfe1fea13ac51e81bc39ddcabad3a8dcd20e4614d33592b7f93ae45625578d7545c149f52f90e9c30dee92a1bbd3f5830f7bcdc13d19fcef4
+  checksum: 003853d3c4d4374ab984474026e4ae657daf4591fe4c375b914aa57c27f576af0fcba66e70c539e056b5d80a1ef655775f6f3a07bf81a36ab6fd438ce464e70f
   languageName: node
   linkType: hard
 
@@ -8556,7 +8556,7 @@ __metadata:
     "@rocket.chat/account-utils": "workspace:^"
     "@rocket.chat/agenda": "workspace:^"
     "@rocket.chat/api-client": "workspace:^"
-    "@rocket.chat/apps-engine": 1.41.0-alpha.325
+    "@rocket.chat/apps-engine": 1.41.0-alpha.312
     "@rocket.chat/base64": "workspace:^"
     "@rocket.chat/cas-validate": "workspace:^"
     "@rocket.chat/core-services": "workspace:^"
@@ -38668,7 +38668,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:^8.0.0, uuid@npm:^8.3.1, uuid@npm:^8.3.2, uuid@npm:~8.3.2":
+"uuid@npm:^8.0.0, uuid@npm:^8.3.1, uuid@npm:^8.3.2":
   version: 8.3.2
   resolution: "uuid@npm:8.3.2"
   bin: