Merge fixes

src/state/MediaViewModel.ts

@@ -32,7 +32,6 @@ import {
   Observable,
   Subject,
   combineLatest,
-  distinctUntilChanged,
   distinctUntilKeyChanged,
   filter,
   fromEvent,
@@ -40,7 +39,6 @@ import {
   map,
   merge,
   of,
-  shareReplay,
   startWith,
   switchMap,
   throttleTime,
@@ -114,11 +112,11 @@ function observeRemoteTrackReceivingOkay(
   };
 
   return combineLatest([
-    observeTrackReference(participant, source),
+    observeTrackReference(of(participant), source),
     interval(1000).pipe(startWith(0)),
   ]).pipe(
     switchMap(async ([trackReference]) => {
-      const track = trackReference.publication?.track;
+      const track = trackReference?.publication?.track;
       if (!track || !(track instanceof RemoteTrack)) {
         return undefined;
       }
@@ -269,12 +267,16 @@ abstract class BaseMediaViewModel extends ViewModel {
           v?.publication?.isEncrypted === false),
     ).pipe(this.scope.state());
 
-    if (participant.isLocal || encryptionSystem.kind === E2eeType.NONE) {
+    this.encryptionStatus = this.participant.pipe(
-      this.encryptionStatus = of(EncryptionStatus.Okay).pipe(
+      switchMap((participant): Observable<EncryptionStatus> => {
-        this.scope.state(),
+        if (
-      );
+          !participant ||
+          participant.isLocal ||
+          encryptionSystem.kind === E2eeType.NONE
+        ) {
+          return of(EncryptionStatus.Okay);
         } else if (encryptionSystem.kind === E2eeType.PER_PARTICIPANT) {
-      this.encryptionStatus = combineLatest([
+          return combineLatest([
             encryptionErrorObservable(
               livekitRoom,
               participant,
@@ -298,10 +300,9 @@ abstract class BaseMediaViewModel extends ViewModel {
             }),
             filter((x) => !!x),
             startWith(EncryptionStatus.Connecting),
-        this.scope.state(),
           );
         } else {
-      this.encryptionStatus = combineLatest([
+          return combineLatest([
             encryptionErrorObservable(
               livekitRoom,
               participant,
@@ -322,9 +323,11 @@ abstract class BaseMediaViewModel extends ViewModel {
             ),
             filter((x) => !!x),
             startWith(EncryptionStatus.Connecting),
-        this.scope.state(),
           );
         }
+      }),
+      this.scope.state(),
+    );
   }
 }