Merge branch 'develop' into fix/tags-enterprise

apps/meteor/client/lib/2fa/process2faReturn.ts

@@ -1,10 +1,12 @@
 import { SHA256 } from '@rocket.chat/sha256';
 import { Meteor } from 'meteor/meteor';
+import { lazy } from 'react';
 
-import TwoFactorModal from '../../components/TwoFactorModal';
 import { imperativeModal } from '../imperativeModal';
 import { isTotpInvalidError, isTotpRequiredError } from './utils';
 
+const TwoFactorModal = lazy(() => import('../../components/TwoFactorModal'));
+
 const twoFactorMethods = ['totp', 'email', 'password'] as const;
 
 type TwoFactorMethod = (typeof twoFactorMethods)[number];

apps/meteor/client/main.ts

@@ -1,13 +1,15 @@
-import '../ee/client/ecdh';
-import './polyfills';
+import { FlowRouter } from 'meteor/kadira:flow-router';
 
-import '../lib/oauthRedirectUriClient';
-import './lib/meteorCallWrapper';
-import './importPackages';
+FlowRouter.wait();
 
-import '../ee/client';
-import './methods';
-import './startup';
-import './views/admin';
-import './views/marketplace';
-import './views/account';
+FlowRouter.notFound = {
+	action: () => undefined,
+};
+
+import('./polyfills')
+	.then(() => Promise.all([import('./lib/meteorCallWrapper'), import('../lib/oauthRedirectUriClient')]))
+	.then(() => import('../ee/client/ecdh'))
+	.then(() => import('./importPackages'))
+	.then(() => Promise.all([import('./methods'), import('./startup')]))
+	.then(() => import('../ee/client'))
+	.then(() => Promise.all([import('./views/admin'), import('./views/marketplace'), import('./views/account')]));

apps/meteor/client/polyfills/index.ts

@@ -4,4 +4,3 @@ import './childNodeRemove';
 import './cssVars';
 import './customEventPolyfill';
 import './hoverTouchClick';
-import './objectFromEntries';

apps/meteor/client/providers/RouterProvider.tsx

@@ -17,12 +17,6 @@ import React from 'react';
 import { appLayout } from '../lib/appLayout';
 import { queueMicrotask } from '../lib/utils/queueMicrotask';
 
-FlowRouter.wait();
-
-FlowRouter.notFound = {
-	action: () => undefined,
-};
-
 const subscribers = new Set<() => void>();
 
 const listenToRouteChange = () => {

apps/meteor/ee/server/models/raw/LivechatRooms.ts

@@ -540,6 +540,13 @@ export class LivechatRoomsRawEE extends LivechatRoomsRaw implements ILivechatRoo
 						},
 					},
 				},
+				{
+					$match: {
+						_id: {
+							$ne: null,
+						},
+					},
+				},
 				{
 					$sort: sort || { total: 1 },
 				},