feat: changed tenant provider

src/components/app/NavigationBar.tsx

@@ -15,8 +15,8 @@ import {
 	ConsultingTypesContext,
 	SessionsDataContext,
 	SET_SESSIONS,
-	TenantContext,
-	LocaleContext
+	LocaleContext,
+	useTenant
 } from '../../globalState';
 import { initNavigationHandler } from './navigationHandler';
 import { ReactComponent as LogoutIconOutline } from '../../resources/img/icons/logout_outline.svg';
@@ -62,7 +62,7 @@ export const NavigationBar = ({
 		group: unreadGroup,
 		teamsessions: unreadTeamSessions
 	} = useContext(RocketChatUnreadContext);
-	const { tenant } = useContext(TenantContext);
+	const tenant = useTenant();
 
 	const ref_menu = useRef<any>([]);
 	const ref_local = useRef<any>();

src/components/app/app.tsx

@@ -14,7 +14,6 @@ import { ContextProvider } from '../../globalState/state';
 import { WebsocketHandler } from './WebsocketHandler';
 import ErrorBoundary from './ErrorBoundary';
 import { LanguagesProvider } from '../../globalState/provider/LanguagesProvider';
-import { TenantThemingLoader } from './TenantThemingLoader';
 import {
 	AppConfigProvider,
 	InformalProvider,
@@ -137,7 +136,6 @@ const RouterWrapper = ({ extraRoutes }: RouterWrapperProps) => {
 				)}
 				<Route>
 					<ContextProvider>
-						<TenantThemingLoader />
 						{startWebsocket && (
 							<WebsocketHandler
 								disconnect={disconnectWebsocket}

src/components/askerInfo/AskerInfoContent.tsx

@@ -5,9 +5,9 @@ import {
 	AUTHORITIES,
 	hasUserAuthority,
 	SessionTypeContext,
-	TenantContext,
 	UserDataContext,
-	ActiveSessionContext
+	ActiveSessionContext,
+	useTenant
 } from '../../globalState';
 import { AskerInfoData } from './AskerInfoData';
 import { AskerInfoAssign } from './AskerInfoAssign';
@@ -17,7 +17,7 @@ import { AskerInfoTools } from './AskerInfoTools';
 import { Box } from '../box/Box';
 
 export const AskerInfoContent = () => {
-	const { tenant } = useContext(TenantContext);
+	const tenant = useTenant();
 	const { activeSession } = useContext(ActiveSessionContext);
 	const { userData } = useContext(UserDataContext);
 

src/components/error/Error.tsx

@@ -6,13 +6,16 @@ import { ReactComponent as Icon401 } from '../../resources/img/illustrations/una
 import { ReactComponent as Icon404 } from '../../resources/img/illustrations/not-found.svg';
 import { ReactComponent as Icon500 } from '../../resources/img/illustrations/internal-server-error.svg';
 import { Button, BUTTON_TYPES } from '../button/Button';
-import useTenantTheming from '../../utils/useTenantTheming';
 import '../../resources/styles/styles';
 import './error.styles';
 import { useTranslation } from 'react-i18next';
 import { LocaleSwitch } from '../localeSwitch/LocaleSwitch';
 import { useAppConfig } from '../../hooks/useAppConfig';
-import { LocaleProvider, AppConfigProvider } from '../../globalState';
+import {
+	LocaleProvider,
+	AppConfigProvider,
+	TenantProvider
+} from '../../globalState';
 import { AppConfigInterface } from '../../globalState/interfaces';
 import { useResponsive } from '../../hooks/useResponsive';
 
@@ -27,15 +30,16 @@ type ErrorProps = {
 
 export const Error = ({ config }: ErrorProps) => (
 	<AppConfigProvider config={config}>
-		<LocaleProvider>
-			<ErrorContent />
-		</LocaleProvider>
+		<TenantProvider>
+			<LocaleProvider>
+				<ErrorContent />
+			</LocaleProvider>
+		</TenantProvider>
 	</AppConfigProvider>
 );
 
 export const ErrorContent = () => {
 	const { t: translate } = useTranslation();
-	useTenantTheming();
 	const settings = useAppConfig();
 	const statusCode = getStatusCode();
 	const { fromL } = useResponsive();

src/components/header/Header.tsx

@@ -1,15 +1,14 @@
 import * as React from 'react';
 import { Headline } from '../headline/Headline';
 import { Text } from '../text/Text';
-import { useContext } from 'react';
-import { TenantContext } from '../../globalState';
+import { useTenant } from '../../globalState';
 import './header.styles';
 import { useTranslation } from 'react-i18next';
 import { LocaleSwitch } from '../localeSwitch/LocaleSwitch';
 
 export const Header = ({ showLocaleSwitch = false }) => {
 	const { t: translate } = useTranslation();
-	const { tenant } = useContext(TenantContext);
+	const tenant = useTenant();
 
 	return (
 		<header className="header">

src/components/login/Login.tsx

@@ -26,7 +26,6 @@ import {
 	AUTHORITIES,
 	hasUserAuthority,
 	RocketChatGlobalSettingsContext,
-	TenantContext,
 	UserDataContext,
 	LocaleContext,
 	useTenant
@@ -76,7 +75,7 @@ export const Login = () => {
 	const tenantData = useTenant();
 
 	const { locale, initLocale } = useContext(LocaleContext);
-	const { tenant } = useContext(TenantContext);
+	const tenant = useTenant();
 	const { getSetting } = useContext(RocketChatGlobalSettingsContext);
 	const { userData, reloadUserData } = useContext(UserDataContext);
 	const { Stage } = useContext(GlobalComponentContext);

src/components/registration/RegistrationForm.tsx

@@ -8,8 +8,8 @@ import { redirectToApp } from './autoLogin';
 import {
 	NOTIFICATION_TYPE_ERROR,
 	NotificationsContext,
-	TenantContext,
-	useLocaleData
+	useLocaleData,
+	useTenant
 } from '../../globalState';
 import {
 	AgencyDataInterface,
@@ -88,7 +88,7 @@ export const RegistrationForm = () => {
 		string[]
 	>([]);
 
-	const { tenant } = useContext(TenantContext);
+	const tenant = useTenant();
 	const { featureToolsEnabled } = getTenantSettings();
 
 	// Logout from budibase

src/globalState/provider/LocaleProvider.tsx

@@ -5,14 +5,12 @@ import { InformalContext } from './InformalProvider';
 import { useAppConfig } from '../../hooks/useAppConfig';
 import { setValueInCookie } from '../../components/sessionCookie/accessSessionCookie';
 import { useTenant } from './TenantProvider';
-import useTenantTheming from '../../utils/useTenantTheming';
 import { LocaleContext, TLocaleContext } from '../context/LocaleContext';
 
 export const STORAGE_KEY_LOCALE = 'locale';
 
 export function LocaleProvider(props) {
 	const settings = useAppConfig();
-	const isLoading = useTenantTheming();
 	const tenant = useTenant();
 	const [initialized, setInitialized] = useState(false);
 	const [initLocale, setInitLocale] = useState(null);
@@ -23,7 +21,7 @@ export function LocaleProvider(props) {
 	useEffect(() => {
 		// If using the tenant service we should load first the tenant because we need the
 		// active languages from the server to apply it on loading
-		if ((settings.useTenantService && isLoading) || initialized) {
+		if (initialized) {
 			return;
 		}
 
@@ -58,7 +56,6 @@ export function LocaleProvider(props) {
 		});
 	}, [
 		initialized,
-		isLoading,
 		settings.i18n,
 		settings.translation,
 		settings.useTenantService,