@veloceapps/sdk 10.0.0-36 → 10.0.0-37

package/fesm2020/veloceapps-sdk.mjs

@@ -9,11 +9,11 @@ import { ToastType, LoaderModule, LetDirectiveModule } from '@veloceapps/compone
 import * as i5 from '@veloceapps/sdk/cms';
 import { extractElementMetadata, extendElementMetadata, btoaSafe, PreviewModule, FlowAction, LauncherModule } from '@veloceapps/sdk/cms';
 import * as i2 from '@veloceapps/sdk/core';
-import { FLOW_CUSTOMIZATION, ContextService, FlowStateService, FlowInfoService, QuoteDraftService, ConfigurationService, IntegrationState, SdkCoreModule } from '@veloceapps/sdk/core';
+import { FLOW_CUSTOMIZATION, ContextService, FlowStateService, FlowInfoService, QuoteDraftService, ConfigurationService, IntegrationState, RuntimeSettingsService, SdkCoreModule } from '@veloceapps/sdk/core';
 import * as i3 from 'primeng/button';
 import { ButtonModule } from 'primeng/button';
 import * as i1 from 'primeng/dynamicdialog';
-import { BehaviorSubject, Subject, filter, first, tap, takeUntil, catchError, of, map, switchMap, shareReplay, startWith, distinctUntilChanged, from, take, combineLatest, forkJoin, throwError } from 'rxjs';
+import { BehaviorSubject, Subject, filter, first, tap, takeUntil, catchError, of, map, switchMap, shareReplay, startWith, distinctUntilChanged, from, take, combineLatest, throwError } from 'rxjs';
 import * as i1$2 from '@angular/router';
 import { NavigationEnd, NavigationStart, NavigationCancel, NavigationError, RouterModule } from '@angular/router';
 import { mapShoppingCartSettings, getMaxRenewalTermsValue, UITemplateType, SalesforceIdUtils, ConfigurationContextMode, isVeloceError, extractErrorDetails, UUID } from '@veloceapps/core';
@@ -973,8 +973,8 @@ class ContextGuard {
                 return of(true);
             }
         }
-        // Initialize context and runtime settings
-        return forkJoin([this.contextService.create(headerId, mode), this.runtimeSettingsService.create()]).pipe(tap(([context]) => {
+        // Initialize runtime settings and context
+        return this.contextService.create(headerId, mode).pipe(tap(context => {
             this.contextService.update({
                 ...context,
                 properties: {
@@ -983,8 +983,6 @@ class ContextGuard {
                     ...getDefaultProperties({ mode }),
                 },
             });
-            // Init currency settings
-            this.runtimeSettingsService.initCurrency(context.properties['CurrencyIsoCode']);
         }), map(() => true), catchError(e => {
             const message = e instanceof HttpErrorResponse ? e.error.message : e;
             const errorDetails = isVeloceError(e.error) ? extractErrorDetails(e.error) : [];
@@ -1036,6 +1034,7 @@ const keepFlowInitialized = (route) => {
     const quoteDraft = inject(QuoteDraftService);
     const configurationService = inject(ConfigurationService);
     const integrationState = inject(IntegrationState);
+    const runtimeSettingsService = inject(RuntimeSettingsService);
     const { flowId } = route.queryParams;
     const flow = flowInfoService.flow;
     if (flow && flow?.id === flowId) {
@@ -1051,7 +1050,7 @@ const keepFlowInitialized = (route) => {
     if (!flowId) {
         return true;
     }
-    return flowInfoService.init$(flowId, route.queryParams).pipe(map(() => true), catchError(e => {
+    return runtimeSettingsService.create().pipe(switchMap(() => flowInfoService.init$(flowId, route.queryParams)), map(() => true), catchError(e => {
         const message = e instanceof HttpErrorResponse ? e.error.message : e;
         const errorDetails = isVeloceError(e.error) ? extractErrorDetails(e.error) : [];
         return routerService.showErrorPage$(message, errorDetails);