Merge pull request #525 from GetStream/zd-44581

feat: always reselect active channel after reconnect

Author: szuperaz

projects/stream-chat-angular/src/lib/channel.service.spec.ts

@@ -2128,23 +2128,22 @@ describe('ChannelService', () => {
     );
   });
 
-  it('should deselect active channel if active channel is not present after state reconnect', fakeAsync(async () => {
+  it('should relaod active channel if active channel is not present after state reconnect', fakeAsync(async () => {
     await init();
     let activeChannel!: Channel<DefaultStreamChatGenerics>;
     service.activeChannel$.subscribe((c) => (activeChannel = c!));
     let channels!: Channel<DefaultStreamChatGenerics>[];
     service.channels$.subscribe((c) => (channels = c!));
     channels = channels.filter((c) => c.id !== activeChannel.id);
-    const spy = jasmine.createSpy();
-    service.activeChannel$.subscribe(spy);
-    spy.calls.reset();
+    spyOn(activeChannel, 'watch');
     mockChatClient.queryChannels.and.resolveTo(channels);
-    spyOn(service, 'deselectActiveChannel').and.callThrough();
     events$.next({ eventType: 'connection.recovered' } as ClientEvent);
     tick();
+    const spy = jasmine.createSpy();
+    service.activeChannel$.subscribe(spy);
 
-    expect(spy).toHaveBeenCalledWith(undefined);
-    expect(service.deselectActiveChannel).toHaveBeenCalledWith();
+    expect(spy).toHaveBeenCalledWith(activeChannel);
+    expect(activeChannel.watch).toHaveBeenCalledWith();
   }));
 
   it(`shouldn't deselect active channel if active channel is present after state reconnect`, fakeAsync(async () => {

projects/stream-chat-angular/src/lib/channel.service.ts

@@ -1562,8 +1562,25 @@ export class ChannelService<
             (existingChannel) => existingChannel.cid === channel.cid
           )
       );
-      this.channelsSubject.next([...prevChannels, ...filteredChannels]);
       let currentActiveChannel = this.activeChannelSubject.getValue();
+      let isCurrentActiveChannelDeselected = false;
+      const nextChannels = [...prevChannels, ...filteredChannels];
+      if (
+        recoverState &&
+        currentActiveChannel &&
+        !filteredChannels.find((c) => c.cid === currentActiveChannel?.cid)
+      ) {
+        try {
+          await currentActiveChannel.watch();
+          nextChannels.unshift(currentActiveChannel);
+        } catch (e) {
+          isCurrentActiveChannelDeselected = true;
+        }
+      }
+      this.channelsSubject.next(nextChannels);
+      if (isCurrentActiveChannelDeselected) {
+        this.deselectActiveChannel();
+      }
       if (
         filteredChannels.length > 0 &&
         !currentActiveChannel &&
@@ -1572,12 +1589,6 @@ export class ChannelService<
         this.setAsActiveChannel(filteredChannels[0]);
         currentActiveChannel = this.activeChannelSubject.getValue();
       }
-      if (
-        recoverState &&
-        !filteredChannels.find((c) => c.cid === currentActiveChannel?.cid)
-      ) {
-        this.deselectActiveChannel();
-      }
       this.hasMoreChannelsSubject.next(channels.length >= this.options!.limit!);
       this.channelQueryStateSubject.next({ state: 'success' });
       if (

projects/stream-chat-angular/src/lib/chat-client.service.ts

@@ -102,6 +102,7 @@ export class ChatClientService<
     clientOptions?: StreamChatOptions
   ): ConnectAPIResponse<T> {
     this.chatClient = StreamChat.getInstance<T>(apiKey, clientOptions);
+    this.chatClient.recoverStateOnReconnect = false;
     this.chatClient.devToken;
     let result;
     await this.ngZone.runOutsideAngular(async () => {