From 256f6e3aec37ab3e20cefb9dc09b3847ff9af18c Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Tue, 24 Jan 2023 16:35:08 -0300
Subject: [PATCH] Chore: OmnichannelRoomIconProvider order breaking
 VideoConfPopup (#27740)

---
 apps/meteor/client/providers/MeteorProvider.tsx | 17 ++++++++++-------
 apps/meteor/client/views/root/AppRoot.tsx       | 13 +++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/meteor/client/providers/MeteorProvider.tsx b/apps/meteor/client/providers/MeteorProvider.tsx
index dcdbc7a7e04a9..6e779267c8c5a 100644
--- a/apps/meteor/client/providers/MeteorProvider.tsx
+++ b/apps/meteor/client/providers/MeteorProvider.tsx
@@ -1,5 +1,6 @@
 import React, { FC } from 'react';
 
+import { OmnichannelRoomIconProvider } from '../components/RoomIcon/OmnichannelRoomIcon/provider/OmnichannelRoomIconProvider';
 import AttachmentProvider from '../components/message/Attachments/providers/AttachmentProvider';
 import AuthorizationProvider from './AuthorizationProvider';
 import AvatarUrlProvider from './AvatarUrlProvider';
@@ -36,13 +37,15 @@ const MeteorProvider: FC = ({ children }) => (
 													<DeviceProvider>
 														<ModalProvider>
 															<AuthorizationProvider>
-																<VideoConfProvider>
-																	<CallProvider>
-																		<OmnichannelProvider>
-																			<AttachmentProvider>{children}</AttachmentProvider>
-																		</OmnichannelProvider>
-																	</CallProvider>
-																</VideoConfProvider>
+																<OmnichannelRoomIconProvider>
+																	<VideoConfProvider>
+																		<CallProvider>
+																			<OmnichannelProvider>
+																				<AttachmentProvider>{children}</AttachmentProvider>
+																			</OmnichannelProvider>
+																		</CallProvider>
+																	</VideoConfProvider>
+																</OmnichannelRoomIconProvider>
 															</AuthorizationProvider>
 														</ModalProvider>
 													</DeviceProvider>
diff --git a/apps/meteor/client/views/root/AppRoot.tsx b/apps/meteor/client/views/root/AppRoot.tsx
index 9f954d5650e25..0568bbad4eb4f 100644
--- a/apps/meteor/client/views/root/AppRoot.tsx
+++ b/apps/meteor/client/views/root/AppRoot.tsx
@@ -1,7 +1,6 @@
 import { QueryClientProvider } from '@tanstack/react-query';
 import React, { FC, lazy, Suspense } from 'react';
 
-import { OmnichannelRoomIconProvider } from '../../components/RoomIcon/OmnichannelRoomIcon/provider/OmnichannelRoomIconProvider';
 import { queryClient } from '../../lib/queryClient';
 import PageLoading from './PageLoading';
 
@@ -16,13 +15,11 @@ const AppRoot: FC = () => (
 	<Suspense fallback={<PageLoading />}>
 		<QueryClientProvider client={queryClient}>
 			<MeteorProvider>
-				<OmnichannelRoomIconProvider>
-					<ConnectionStatusBar />
-					<BannerRegion />
-					<AppLayout />
-					<PortalsWrapper />
-					<ModalRegion />
-				</OmnichannelRoomIconProvider>
+				<ConnectionStatusBar />
+				<BannerRegion />
+				<AppLayout />
+				<PortalsWrapper />
+				<ModalRegion />
 			</MeteorProvider>
 		</QueryClientProvider>
 	</Suspense>