From 9422f48536e05c7db20bce672e6a36b299cdbaba Mon Sep 17 00:00:00 2001 From: Horatiu Muresan <39557534+horymury@users.noreply.github.com> Date: Thu, 12 Jan 2023 11:04:45 +0200 Subject: [PATCH] fix(deeplinking) Consider deprecated config (#12758) --- react/features/base/config/reducer.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/react/features/base/config/reducer.ts b/react/features/base/config/reducer.ts index 81d875ebb..dd947e7e0 100644 --- a/react/features/base/config/reducer.ts +++ b/react/features/base/config/reducer.ts @@ -298,8 +298,13 @@ function _translateInterfaceConfig(oldValue: IConfig) { } } - // if we have `deeplinking` defined, ignore deprecated values. Otherwise, compose the config. - if (!oldValue.deeplinking) { + // if we have `deeplinking` defined, ignore deprecated values, except `disableDeepLinking`. + // Otherwise, compose the config. + if (oldValue.deeplinking && newValue.deeplinking) { // make TS happy + newValue.deeplinking.disabled = oldValue.deeplinking.hasOwnProperty('disabled') + ? oldValue.deeplinking.disabled + : Boolean(oldValue.disableDeepLinking); + } else { const disabled = Boolean(oldValue.disableDeepLinking); const deeplinking: IDeeplinkingConfig = { desktop: {} as IDeeplinkingPlatformConfig,