Skip to content

Jitsi Meet - Secure, Simple and Scalable Video Conferences that you use as a standalone app or embed in your web application.

refactor(dynamic-branding): make getDynamicBrandingUrl synchronous

Hristo Terezov93a9bfbf821a
diff --git a/react/features/dynamic-branding/actions.any.ts b/react/features/dynamic-branding/actions.any.ts
index 396b050c33..a16d27e0af 100644
--- a/react/features/dynamic-branding/actions.any.ts
+++ b/react/features/dynamic-branding/actions.any.ts
@@ -25,7 +25,7 @@ export function fetchCustomBrandingData() {
const { customizationReady } = state['features/dynamic-branding'];
if (!customizationReady) {
- const url = await getDynamicBrandingUrl(state);
+ const url = getDynamicBrandingUrl(state);
if (url) {
try {
diff --git a/react/features/dynamic-branding/actions.native.ts b/react/features/dynamic-branding/actions.native.ts
index 6d7cfa7751..6490d8c60c 100644
--- a/react/features/dynamic-branding/actions.native.ts
+++ b/react/features/dynamic-branding/actions.native.ts
@@ -21,7 +21,7 @@ import logger from './logger';
export function fetchCustomBrandingData() {
return async function(dispatch: IStore['dispatch'], getState: IStore['getState']) {
const state = getState();
- const dynamicBrandingUrl = await getDynamicBrandingUrl(state);
+ const dynamicBrandingUrl = getDynamicBrandingUrl(state);
if (dynamicBrandingUrl) {
try {
diff --git a/react/features/dynamic-branding/functions.any.ts b/react/features/dynamic-branding/functions.any.ts
index 59d5348611..0ea689c817 100644
--- a/react/features/dynamic-branding/functions.any.ts
+++ b/react/features/dynamic-branding/functions.any.ts
@@ -33,9 +33,9 @@ export function extractFqnFromPath(state?: IReduxState) {
*
* @param {Object | Function} stateful - The redux store, state, or
* {@code getState} function.
- * @returns {string}
+ * @returns {string | undefined} The branding URL, or undefined when no branding is configured.
*/
-export async function getDynamicBrandingUrl(stateful: IStateful) {
+export function getDynamicBrandingUrl(stateful: IStateful): string | undefined {
const state = toState(stateful);
return buildDynamicBrandingUrl(state['features/base/config'], extractFqnFromPath(state));
diff --git a/react/features/dynamic-branding/middleware.any.ts b/react/features/dynamic-branding/middleware.any.ts
index 18fe74f7e5..22398de5a8 100644
--- a/react/features/dynamic-branding/middleware.any.ts
+++ b/react/features/dynamic-branding/middleware.any.ts
@@ -21,8 +21,9 @@ MiddlewareRegistry.register(store => next => action => {
// The icons are loaded separately so the theme and the rest of the branding are
// applied right away instead of waiting for every SVG to arrive.
if (customIcons) {
- getDynamicBrandingUrl(store.getState())
- .then(url => fetchCustomIcons(customIcons, url ? takePreloadedIcons(url) : undefined))
+ const url = getDynamicBrandingUrl(store.getState());
+
+ fetchCustomIcons(customIcons, url ? takePreloadedIcons(url) : undefined)
.then(icons => store.dispatch(setDynamicBrandingIcons(icons)))
.catch((error: any) => {
logger.error('Error fetching branded custom icons:', error);