From 02e14fded84b73b6079c2ed47b9cd6e9fbcce541 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Tue, 21 Dec 2021 21:29:30 +0200
Subject: [PATCH] update configuration.initializer

---
 apps/red-ui/src/app/utils/configuration.initializer.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/red-ui/src/app/utils/configuration.initializer.ts b/apps/red-ui/src/app/utils/configuration.initializer.ts
index 2f31bef07..2f4bc4faf 100644
--- a/apps/red-ui/src/app/utils/configuration.initializer.ts
+++ b/apps/red-ui/src/app/utils/configuration.initializer.ts
@@ -1,4 +1,4 @@
-import { catchError, filter, mergeMapTo, switchMap, take, tap } from 'rxjs/operators';
+import { catchError, filter, mergeMap, switchMap, take, tap } from 'rxjs/operators';
 import { ConfigService } from '@services/config.service';
 import { Title } from '@angular/platform-browser';
 import { from, of, throwError } from 'rxjs';
@@ -21,9 +21,10 @@ export function configurationInitializer(
                 filter(event => event.type === KeycloakEventType.OnReady),
                 switchMap(() => from(keycloakService.isLoggedIn())),
                 switchMap(loggedIn => (!loggedIn ? throwError('Not Logged In') : of({}))),
-                mergeMapTo(generalSettingsService.getGeneralConfigurations()),
+                mergeMap(() => generalSettingsService.getGeneralConfigurations()),
                 tap(configuration => configService.updateDisplayName(configuration.displayName)),
-                tap(() => userPreferenceService.reload().then(() => languageService.chooseAndSetInitialLanguage())),
+                switchMap(() => userPreferenceService.reload()),
+                tap(() => languageService.chooseAndSetInitialLanguage()),
                 catchError(() => {
                     title.setTitle('RedactManager');
                     return of({});