fxies

apps/web/src/app/vault/individual-vault/vault-onboarding/services/abstraction/vault-onboarding.service.ts

@@ -8,5 +8,5 @@ import { VaultOnboardingTasks } from "../vault-onboarding.service";
 
 export abstract class VaultOnboardingService {
   abstract setVaultOnboardingTasks(newState: VaultOnboardingTasks): Promise<void>;
-  abstract vaultOnboardingState$(userId: UserId): Observable<VaultOnboardingTasks | null>;
+  abstract vaultOnboardingState$(userId: UserId): Observable<VaultOnboardingTasks>;
 }

apps/web/src/app/vault/individual-vault/vault-onboarding/services/vault-onboarding.service.ts

@@ -1,5 +1,5 @@
-import { Injectable } from "@angular/core";
+import { Injectable, OnDestroy } from "@angular/core";
-import { Observable } from "rxjs";
+import { Observable, Subject, takeUntil } from "rxjs";
 
 import {
   SingleUserState,
@@ -27,17 +27,29 @@ const VAULT_ONBOARDING_KEY = new UserKeyDefinition<VaultOnboardingTasks>(
 );
 
 @Injectable()
-export class VaultOnboardingService implements VaultOnboardingServiceAbstraction {
+export class VaultOnboardingService implements VaultOnboardingServiceAbstraction, OnDestroy {
-  private vaultOnboardingState?: SingleUserState<VaultOnboardingTasks> = null;
+  private destroy$ = new Subject<void>();
+  private vaultOnboardingState: SingleUserState<VaultOnboardingTasks> | undefined;
 
-  constructor(private stateProvider: StateProvider) {}
+  constructor(private stateProvider: StateProvider) {
+    this.stateProvider.activeUserId$.pipe(takeUntil(this.destroy$)).subscribe((userId) => {
+      if (userId) {
+        this.vaultOnboardingState = this.stateProvider.getUser(userId, VAULT_ONBOARDING_KEY);
+      }
+    });
+  }
 
-  vaultOnboardingState$(userId: UserId): Observable<VaultOnboardingTasks | null> {
+  ngOnDestroy(): void {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+
+  vaultOnboardingState$(userId: UserId): Observable<VaultOnboardingTasks> {
     this.vaultOnboardingState = this.stateProvider.getUser(userId, VAULT_ONBOARDING_KEY);
     return this.vaultOnboardingState.state$;
   }
   async setVaultOnboardingTasks(newState: VaultOnboardingTasks): Promise<void> {
-    await this.vaultOnboardingState?.update(() => {
+    await this.vaultOnboardingState.update(() => {
       return { ...newState };
     });
   }

apps/web/src/app/vault/individual-vault/vault-onboarding/vault-onboarding.component.spec.ts

@@ -44,6 +44,7 @@ describe("VaultOnboardingComponent", () => {
     };
     mockVaultOnboardingService = mock<VaultOnboardingServiceAbstraction>();
     mockStateProvider = {
+      activeUserId$: of(Utils.newGuid() as UserId),
       getUser: jest.fn().mockReturnValue(
         of({
           createAccount: true,