Removing sponsors code.

Support new sponsor confirmation polling.
fixes #319

frontend/src/app/components/about/about.component.html

@@ -173,10 +173,9 @@
 
     <div *ngIf="donationStatus === 4" class="text-center">
       <h2><span i18n="about.sponsor.donation-confirmed">Donation confirmed!</span><br><span i18n="about.sponsor.thank-you">Thank you!</span></h2>
-      <p i18n="about.sponsor.sponsor-completed">If you specified a Twitter handle, the profile photo should now be visible on this page when you reload.</p>
     </div>
 
-    <br><br><br><br>
+    <br><br><br>
 
     <a target="_blank" class="m-2 fw6 mb3 mt2 truncate black-80 f4 link" href="https://github.com/mempool/mempool">
       <span class="dib v-mid">

frontend/src/app/components/about/about.component.ts

@@ -1,19 +1,19 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { WebsocketService } from '../../services/websocket.service';
 import { SeoService } from 'src/app/services/seo.service';
 import { StateService } from 'src/app/services/state.service';
-import { Observable } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { ApiService } from 'src/app/services/api.service';
 import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
-import { map } from 'rxjs/operators';
+import { delay, map, retryWhen, switchMap, tap } from 'rxjs/operators';
 
 @Component({
   selector: 'app-about',
   templateUrl: './about.component.html',
   styleUrls: ['./about.component.scss'],
 })
-export class AboutComponent implements OnInit {
+export class AboutComponent implements OnInit, OnDestroy {
   gitCommit$: Observable<string>;
   donationForm: FormGroup;
   paymentForm: FormGroup;
@@ -22,6 +22,7 @@ export class AboutComponent implements OnInit {
   donationObj: any;
   sponsorsEnabled = this.stateService.env.SPONSORS_ENABLED;
   sponsors = null;
+  requestSubscription: Subscription | undefined;
 
   constructor(
     private websocketService: WebsocketService,
@@ -50,23 +51,37 @@ export class AboutComponent implements OnInit {
       .subscribe((sponsors) => {
         this.sponsors = sponsors;
       });
+  }
 
-    this.apiService.getDonation$()
-    this.stateService.donationConfirmed$.subscribe(() => this.donationStatus = 4);
+  ngOnDestroy() {
+    if (this.requestSubscription) {
+      this.requestSubscription.unsubscribe();
+    }
   }
 
   submitDonation() {
     if (this.donationForm.invalid) {
       return;
     }
-    this.apiService.requestDonation$(
+    this.requestSubscription = this.apiService.requestDonation$(
       this.donationForm.get('amount').value,
       this.donationForm.get('handle').value
     )
-    .subscribe((response) => {
-      this.websocketService.trackDonation(response.id);
-      this.donationObj = response;
-      this.donationStatus = 3;
+    .pipe(
+      tap((response) => {
+        this.donationObj = response;
+        this.donationStatus = 3;
+      }),
+      switchMap(() => this.apiService.checkDonation$(this.donationObj.id)
+        .pipe(
+          retryWhen((errors) => errors.pipe(delay(2000)))
+        )
+      )
+    ).subscribe(() => {
+      this.donationStatus = 4;
+      if (this.donationForm.get('handle').value) {
+        this.sponsors.unshift({ handle: this.donationForm.get('handle').value });
+      }
     });
   }
 

frontend/src/app/interfaces/websocket.interface.ts

@@ -15,13 +15,11 @@ export interface WebsocketResponse {
   tx?: Transaction;
   rbfTransaction?: Transaction;
   transactions?: TransactionStripped[];
-  donationConfirmed?: boolean;
   loadingIndicators?: ILoadingIndicators;
   'track-tx'?: string;
   'track-address'?: string;
   'track-asset'?: string;
   'watch-mempool'?: boolean;
-  'track-donation'?: string;
 }
 
 export interface MempoolBlock {

frontend/src/app/services/api.service.ts

@@ -77,6 +77,10 @@ export class ApiService {
     return this.httpClient.get<any[]>(this.apiBaseUrl + this.apiBasePath + '/api/v1/donations');
   }
 
+  checkDonation$(orderId: string): Observable<any[]> {
+    return this.httpClient.get<any[]>(this.apiBaseUrl + this.apiBasePath + '/api/v1/donations/check?order_id=' + orderId);
+  }
+
   getInitData$(): Observable<WebsocketResponse> {
     return this.httpClient.get<WebsocketResponse>(this.apiBaseUrl + this.apiBasePath + '/api/v1/init-data');
   }

frontend/src/app/services/state.service.ts

@@ -64,7 +64,6 @@ export class StateService {
   vbytesPerSecond$ = new ReplaySubject<number>(1);
   lastDifficultyAdjustment$ = new ReplaySubject<number>(1);
   gitCommit$ = new ReplaySubject<string>(1);
-  donationConfirmed$ = new Subject();
   loadingIndicators$ = new ReplaySubject<ILoadingIndicators>(1);
 
   live2Chart$ = new Subject<OptimizedMempoolStats>();

frontend/src/app/services/websocket.service.ts

@@ -126,10 +126,6 @@ export class WebsocketService {
     this.isTrackingTx = true;
   }
 
-  trackDonation(id: string) {
-    this.websocketSubject.next({ 'track-donation': id });
-  }
-
   stopTrackingTransaction() {
     if (!this.isTrackingTx) {
       return;
@@ -289,9 +285,5 @@ export class WebsocketService {
     if (response['git-commit']) {
       this.stateService.gitCommit$.next(response['git-commit']);
     }
-
-    if (response.donationConfirmed) {
-      this.stateService.donationConfirmed$.next(true);
-    }
   }
 }