Merge remote-tracking branch 'origin/release-7.0.0' into develop

.changeset/bump-patch-1729881407116.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.

.changeset/pre.json

@@ -72,6 +72,7 @@
     "bump-patch-1729526930133",
     "bump-patch-1729648473274",
     "bump-patch-1729717124346",
+    "bump-patch-1729881407116",
     "chilled-boats-sip",
     "chilled-files-relate",
     "chilly-flowers-brake",
@@ -123,6 +124,7 @@
     "pink-wombats-wait",
     "plenty-hairs-camp",
     "poor-falcons-doubt",
+    "pretty-ladybugs-sneeze",
     "proud-bugs-cry",
     "purple-papayas-collect",
     "purple-tools-heal",

apps/meteor/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @rocket.chat/meteor
 
+## 7.0.0-rc.4
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- ([#33770](https://github.com/RocketChat/Rocket.Chat/pull/33770)) Fixes page loading during reconnections
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  </details>
+
 ## 7.0.0-rc.3
 
 ### Patch Changes

apps/meteor/client/views/marketplace/AppsPage/AppsPageContent.tsx

@@ -5,7 +5,6 @@ import React, { useEffect, useMemo, useState, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { usePagination } from '../../../components/GenericTable/hooks/usePagination';
-import { PageContent } from '../../../components/Page';
 import { useAppsResult } from '../../../contexts/hooks/useAppsResult';
 import { AsyncStatePhase } from '../../../lib/asyncState';
 import MarketplaceHeader from '../components/MarketplaceHeader';
@@ -225,7 +224,7 @@ const AppsPageContent = (): ReactElement => {
 	};
 
 	return (
-		<PageContent>
+		<>
 			<MarketplaceHeader unsupportedVersion={unsupportedVersion} title={t(`Apps_context_${context}`)} />
 			<AppsFilters
 				text={text}
@@ -258,7 +257,7 @@ const AppsPageContent = (): ReactElement => {
 			)}
 			{getEmptyState()}
 			{appsResult.phase === AsyncStatePhase.REJECTED && !unsupportedVersion && <AppsPageConnectionError onButtonClick={reload} />}
-		</PageContent>
+		</>
 	);
 };
 

apps/meteor/ee/server/services/CHANGELOG.md

@@ -1,5 +1,19 @@
 # rocketchat-services
 
+## 2.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  </details>
+
 ## 2.0.0-rc.3
 
 ### Patch Changes

apps/meteor/ee/server/services/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "rocketchat-services",
 	"private": true,
-	"version": "2.0.0-rc.3",
+	"version": "2.0.0-rc.4",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {

apps/uikit-playground/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @rocket.chat/uikit-playground
 
+## 0.6.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  </details>
+
 ## 0.6.0-rc.3
 
 ### Patch Changes

apps/uikit-playground/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rocket.chat/uikit-playground",
   "private": true,
-  "version": "0.6.0-rc.3",
+  "version": "0.6.0-rc.4",
   "type": "module",
   "scripts": {
     "dev": "vite",

ee/apps/account-service/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @rocket.chat/account-service
 
+## 0.4.9-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  </details>
+
 ## 0.4.9-rc.3
 
 ### Patch Changes

ee/apps/account-service/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/account-service",
 	"private": true,
-	"version": "0.4.9-rc.3",
+	"version": "0.4.9-rc.4",
 	"description": "Rocket.Chat Account service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",

ee/apps/authorization-service/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @rocket.chat/authorization-service
 
+## 0.4.9-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  </details>
+
 ## 0.4.9-rc.3
 
 ### Patch Changes

ee/apps/authorization-service/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/authorization-service",
 	"private": true,
-	"version": "0.4.9-rc.3",
+	"version": "0.4.9-rc.4",
 	"description": "Rocket.Chat Authorization service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",

ee/apps/ddp-streamer/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.9-rc.4
+
+### Patch Changes
+
+- ([#33770](https://github.com/RocketChat/Rocket.Chat/pull/33770)) Fixes page loading during reconnections
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  </details>
+
 ## 0.3.9-rc.3
 
 ### Patch Changes

ee/apps/ddp-streamer/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/ddp-streamer",
 	"private": true,
-	"version": "0.3.9-rc.3",
+	"version": "0.3.9-rc.4",
 	"description": "Rocket.Chat DDP-Streamer service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",

ee/apps/omnichannel-transcript/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.9-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  </details>
+
 ## 0.4.9-rc.3
 
 ### Patch Changes

ee/apps/omnichannel-transcript/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/omnichannel-transcript",
 	"private": true,
-	"version": "0.4.9-rc.3",
+	"version": "0.4.9-rc.4",
 	"description": "Rocket.Chat service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",

ee/apps/presence-service/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @rocket.chat/presence-service
 
+## 0.4.9-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  </details>
+
 ## 0.4.9-rc.3
 
 ### Patch Changes

ee/apps/presence-service/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/presence-service",
 	"private": true,
-	"version": "0.4.9-rc.3",
+	"version": "0.4.9-rc.4",
 	"description": "Rocket.Chat Presence service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",

ee/apps/queue-worker/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @rocket.chat/queue-worker
 
+## 0.4.9-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  </details>
+
 ## 0.4.9-rc.3
 
 ### Patch Changes

ee/apps/queue-worker/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/queue-worker",
 	"private": true,
-	"version": "0.4.9-rc.3",
+	"version": "0.4.9-rc.4",
 	"description": "Rocket.Chat service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",

ee/apps/stream-hub-service/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.9-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  - @rocket.chat/[email protected]
+  </details>
+
 ## 0.4.9-rc.3
 
 ### Patch Changes

ee/apps/stream-hub-service/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/stream-hub-service",
 	"private": true,
-	"version": "0.4.9-rc.3",
+	"version": "0.4.9-rc.4",
 	"description": "Rocket.Chat Stream Hub service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",

ee/packages/license/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 1.0.0-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/[email protected]
+  </details>
+
 ## 1.0.0-rc.3
 
 ### Patch Changes

ee/packages/license/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "1.0.0-rc.3",
+	"version": "1.0.0-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",

ee/packages/network-broker/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @rocket.chat/network-broker
 
+## 0.1.1-rc.4
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/[email protected]
+  </details>
+
 ## 0.1.1-rc.3
 
 ### Patch Changes

ee/packages/network-broker/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/network-broker",
-	"version": "0.1.1-rc.3",
+	"version": "0.1.1-rc.4",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",