Merge branch 'release/1.4.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / user-subscription / subscribe-button.component.html

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 2c8481c96091589b39e758c3f403153dda5b05df..d32647b4288292a685bfd635261062454a633b20 100644 (file)
--- a/client/src/app/shared/user-subscription/subscribe-button.component.html
+++ b/client/src/app/shared/user-subscription/subscribe-button.component.html
@@ -33,16 +33,15 @@
 
     <div class="dropdown-menu" ngbDropdownMenu>
 
-      <h6 class="dropdown-header" i18n>Using an ActivityPub-compatible account</h6>
+      <h6 class="dropdown-header" i18n>Using an ActivityPub account</h6>
 
-      <button class="dropdown-item" (click)="subscribe()"
-              *ngIf="subscribed === false">
+      <button class="dropdown-item" (click)="subscribe()">
         <span *ngIf="!isUserLoggedIn()" i18n>Subscribe with an account on {{ videoChannel.host }}</span>
         <span *ngIf="isUserLoggedIn()" i18n>Subscribe with your local account</span>
       </button>
 
-      <button class="dropdown-item" i18n>Subscribe with a remote account:</button>
-      <my-remote-subscribe showHelp="true" account="{{ uriAccount }}"></my-remote-subscribe>
+      <button class="dropdown-item" i18n>Subscribe with a Mastodon account:</button>
+      <my-remote-subscribe showHelp="true" [uri]="channelUri"></my-remote-subscribe>
 
       <div class="dropdown-divider"></div>
 
@@ -51,4 +50,4 @@
 
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>