Merge branch 'master' into nymkappa/google-pay

frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.scss

@@ -85,8 +85,8 @@ tr, td, th {
   }
 
   .pool-logo {
-    width: 22px;
-    height: 22px;
+    width: 18px;
+    height: 18px;
     position: relative;
     top: -1px;
     margin-right: 2px;

frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts

@@ -83,9 +83,9 @@ export class AccelerationsListComponent implements OnInit, OnDestroy {
         this.pageChange(this.page);
       });
 
-      this.miningService.getMiningStats('1m').subscribe(stats => {
-        for (const pool of stats.pools) {
-          this.pools[pool.poolUniqueId] = pool;
+      this.miningService.getPools().subscribe(pools => {
+        for (const pool of pools) {
+          this.pools[pool.unique_id] = pool;
         }
       });
     }

frontend/src/app/components/privacy-policy/privacy-policy.component.html

@@ -5,7 +5,7 @@
     <br><br>
 
     <h2>Privacy Policy</h2>
-    <h6>Updated: July 10, 2024</h6>
+    <h6>Updated: July 19, 2024</h6>
 
     <br><br>
 
@@ -35,7 +35,7 @@
 
       <ul>
 
-        <li>We use basic webserver logging (nginx) for sysadmin purposes, which collects your IP address along with the requests you make. These logs are deleted after 10 days, and we do not share this data with any third-party. To conceal your IP address from our webserver logs, we recommend that you use Tor Browser with our Tor v3 hidden service onion hostname.</li>
+        <li>We use basic webserver logging (nginx) for sysadmin purposes, which collects your IP address along with the requests you make. These logs are deleted after 10 days, and we do not share this data with any third-party.</li>
 
         <br>
 

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

@@ -11,7 +11,9 @@ import {
   tap,
   map,
   retry,
-  startWith
+  startWith,
+  repeat,
+  take
 } from 'rxjs/operators';
 import { Transaction } from '../../interfaces/electrs.interface';
 import { of, merge, Subscription, Observable, Subject, from, throwError, combineLatest, BehaviorSubject } from 'rxjs';
@@ -76,6 +78,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
   transactionTime = -1;
   subscription: Subscription;
   fetchCpfpSubscription: Subscription;
+  transactionTimesSubscription: Subscription;
   fetchRbfSubscription: Subscription;
   fetchCachedTxSubscription: Subscription;
   fetchAccelerationSubscription: Subscription;
@@ -107,6 +110,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
   showCpfpDetails = false;
   miningStats: MiningStats;
   fetchCpfp$ = new Subject<string>();
+  transactionTimes$ = new Subject<string>();
   fetchRbfHistory$ = new Subject<string>();
   fetchCachedTx$ = new Subject<string>();
   fetchAcceleration$ = new Subject<number>();
@@ -226,6 +230,25 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
       this.latestBlock = blocks[0];
     });
 
+    this.transactionTimesSubscription = this.transactionTimes$.pipe(
+      tap(() => {
+        this.isLoadingFirstSeen = true;
+      }),
+      switchMap((txid) => this.apiService.getTransactionTimes$([txid]).pipe(
+        retry({ count: 2, delay: 2000 }),
+        // Try again until we either get a valid response, or the transaction is confirmed
+        repeat({ delay: 2000 }),
+        filter((transactionTimes) => transactionTimes?.length && transactionTimes[0] > 0 && !this.tx.status?.confirmed),
+        take(1),
+      )),
+    )
+    .subscribe((transactionTimes) => {
+      this.isLoadingFirstSeen = false;
+      if (transactionTimes?.length && transactionTimes[0]) {
+        this.transactionTime = transactionTimes[0];
+      }
+    });
+
     this.fetchCpfpSubscription = this.fetchCpfp$
       .pipe(
         switchMap((txId) =>
@@ -573,7 +596,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
             if (tx.firstSeen) {
               this.transactionTime = tx.firstSeen;
             } else {
-              this.getTransactionTime();
+              this.transactionTimes$.next(tx.txid);
             }
           } else {
             this.fetchAcceleration$.next(tx.status.block_height);
@@ -730,7 +753,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
           this.accelerationPositions,
         );
       })
-    )
+    );
   }
 
   ngAfterViewInit(): void {
@@ -764,28 +787,6 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
     return of(false);
   }
 
-  getTransactionTime() {
-    this.isLoadingFirstSeen = true;
-    this.apiService
-      .getTransactionTimes$([this.tx.txid])
-      .pipe(
-        retry({ count: 2, delay: 2000 }),
-        catchError(() => {
-          this.isLoadingFirstSeen = false;
-          return throwError(() => new Error(''));
-        })
-      )
-      .subscribe((transactionTimes) => {
-        if (transactionTimes?.length && transactionTimes[0]) {
-          this.transactionTime = transactionTimes[0];
-        } else {
-          setTimeout(() => {
-            this.getTransactionTime();
-          }, 2000);
-        }
-      });
-  }
-
   setCpfpInfo(cpfpInfo: CpfpInfo): void {
     if (!cpfpInfo || !this.tx) {
       this.cpfpInfo = null;
@@ -1058,6 +1059,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
   ngOnDestroy() {
     this.subscription.unsubscribe();
     this.fetchCpfpSubscription.unsubscribe();
+    this.transactionTimesSubscription.unsubscribe();
     this.fetchRbfSubscription.unsubscribe();
     this.fetchCachedTxSubscription.unsubscribe();
     this.fetchAccelerationSubscription.unsubscribe();

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

@@ -31,6 +31,7 @@ export class MiningService {
       data: MiningStats;
     }
   } = {};
+  poolsData: SinglePoolStats[] = [];
 
   constructor(
     private stateService: StateService,
@@ -57,7 +58,19 @@ export class MiningService {
       );
     }
   }
-
+  
+  /** 
+   * Get names and slugs of all pools
+   */
+  public getPools(): Observable<any[]> {
+    return this.poolsData.length ? of(this.poolsData) : this.apiService.listPools$(undefined).pipe(
+      map(response => {
+        this.poolsData = response.body;
+        return this.poolsData;
+      })
+    );
+    
+  }
   /**
    * Set the hashrate power of ten we want to display
    */