Fix client build

2 files changed, 17 insertions, 12 deletions

diff --git a/client/src/app/shared/user-subscription/subscribe-button.component.html b/client/src/app/shared/user-subscription/subscribe-button.component.html
index 1c2288ebb..7d33b0621 100644
--- a/client/src/app/shared/user-subscription/subscribe-button.component.html
+++ b/client/src/app/shared/user-subscription/subscribe-button.component.html
@@ -7,12 +7,12 @@
       <ng-template i18n #single>Subscribe</ng-template>
       <ng-template #multiple>
         <span i18n>Subscribe to all channels</span>
-        <span *ngIf="isAtLeastOneChannelSubscribed()">{{subscribeStatus(true).length}}/{{subscribed.size}} 
+        <span *ngIf="isAtLeastOneChannelSubscribed()">{{ subscribeStatus(true).length }}/{{ subscribed.size }}
           <ng-container i18n>channels subscribed</ng-container>
         </span>
       </ng-template>
     </span>
-    <span *ngIf="!isBigButton() && displayFollowers && videoChannels.length > 1 && videoChannels[0].followersCount !== 0" class="followers-count">
+    <span *ngIf="!isBigButton() && displayFollowers && videoChannels.length > 1 && videoChannel.followersCount !== 0" class="followers-count">
       {{ videoChannels[0].followersCount | myNumberFormatter }}
     </span>
   </ng-template>
@@ -23,7 +23,7 @@
             (click)="subscribe()">
       <ng-template [ngTemplateOutlet]="userLoggedOut"></ng-template>
     </button>
-  
+
     <button
       *ngIf="isAllChannelsSubscribed()" type="button"
       class="btn btn-sm" role="button"
@@ -55,7 +55,7 @@
       </button>
 
       <button class="dropdown-item" i18n>Subscribe with a Mastodon account:</button>
-      <my-remote-subscribe showHelp="true" [uri]="channelUri"></my-remote-subscribe>
+      <my-remote-subscribe showHelp="true" [uri]="uri"></my-remote-subscribe>
 
       <div class="dropdown-divider"></div>
 
diff --git a/client/src/app/shared/user-subscription/subscribe-button.component.ts b/client/src/app/shared/user-subscription/subscribe-button.component.ts
index 1ebfdc82f..888f6552a 100644
--- a/client/src/app/shared/user-subscription/subscribe-button.component.ts
+++ b/client/src/app/shared/user-subscription/subscribe-button.component.ts
@@ -40,11 +40,11 @@ export class SubscribeButtonComponent implements OnInit {
   get handle () {
     return this.account
       ? this.account.nameWithHost
-      : this.videoChannels[0].name + '@' + this.videoChannels[0].host
+      : this.videoChannel.name + '@' + this.videoChannel.host
   }
 
   get channelHandle () {
-    return this.getChannelHandler(this.videoChannels[0])
+    return this.getChannelHandler(this.videoChannel)
   }
 
   get uri () {
@@ -65,6 +65,10 @@ export class SubscribeButtonComponent implements OnInit {
     return rssFeed.url
   }
 
+  get videoChannel () {
+    return this.videoChannels[0]
+  }
+
   ngOnInit () {
     this.loadSubscribedStatus()
   }
@@ -83,7 +87,7 @@ export class SubscribeButtonComponent implements OnInit {
       .filter(handle => this.subscribeStatus(false).includes(handle))
       .map(handle => this.userSubscriptionService.addSubscription(handle))
 
-    forkJoin(observableBatch)
+    merge(observableBatch, 2)
       .subscribe(
         () => {
           this.notifier.success(
@@ -153,18 +157,19 @@ export class SubscribeButtonComponent implements OnInit {
     this.router.navigate([ '/login' ])
   }
 
-  private getChannelHandler (videoChannel: VideoChannel) {
-    return videoChannel.name + '@' + videoChannel.host
-  }
-
-  private subscribeStatus (subscribed: boolean) {
+  subscribeStatus (subscribed: boolean) {
     const accumulator: string[] = []
     for (const [key, value] of this.subscribed.entries()) {
       if (value === subscribed) accumulator.push(key)
     }
+
     return accumulator
   }
 
+  private getChannelHandler (videoChannel: VideoChannel) {
+    return videoChannel.name + '@' + videoChannel.host
+  }
+
   private loadSubscribedStatus () {
     if (!this.isUserLoggedIn()) return