fix: universal emptyError

intershop · Dec 7, 2019 · 14cfa2b · 14cfa2b
1 parent 0bde0f2
commit 14cfa2b
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/app/core/store/restore/restore.effects.ts b/src/app/core/store/restore/restore.effects.ts
@@ -140,16 +140,17 @@ export class RestoreEffects {
 
   @Effect()
   sessionKeepAlive$ = this.appRef.isStable.pipe(
-    takeWhile(() => isPlatformBrowser(this.platformId)),
     whenTruthy(),
     first(),
     concatMapTo(
       this.store$.pipe(
+        takeWhile(() => isPlatformBrowser(this.platformId)),
         select(getCurrentBasket),
-        switchMap(basket =>
-          this.sfeAdapterService.isInitialized()
-            ? EMPTY
-            : interval(RestoreEffects.SESSION_KEEP_ALIVE).pipe(mergeMapTo(basket ? [new LoadBasket()] : []))
+        switchMap(
+          basket =>
+            this.sfeAdapterService.isInitialized()
+              ? EMPTY
+              : interval(RestoreEffects.SESSION_KEEP_ALIVE).pipe(mergeMapTo(basket ? [new LoadBasket()] : [])) // todo: some similar without basket
         )
       )
     )