Separate mining and audit subscriptions

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

@@ -81,6 +81,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
   mempoolBlocksSubscription: Subscription;
   blocksSubscription: Subscription;
   miningSubscription: Subscription;
+  auditSubscription: Subscription;
   currencyChangeSubscription: Subscription;
   fragmentParams: URLSearchParams;
   rbfTransaction: undefined | Transaction;
@@ -308,24 +309,32 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
       filter((target) => target.txid === this.txId),
       tap(() => {
         this.pool = null;
+      }),
+      switchMap(({ hash, height }) => {
+        const foundBlock = this.cacheService.getCachedBlock(height) || null;
+        return foundBlock ? of(foundBlock.extras.pool) : this.apiService.getBlock$(hash).pipe(
+          map(block => block.extras.pool),
+          retry({ count: 3, delay: 2000 }),
+          catchError(() => of(null))
+        );
+      }),
+      catchError((e) => {
+        return of(null);
+      })
+    ).subscribe(pool => {
+      this.pool = pool;
+    });
+
+    this.auditSubscription = this.fetchMiningInfo$.pipe(
+      filter((target) => target.txid === this.txId),
+      tap(() => {
         this.auditStatus = null;
       }),
       switchMap(({ hash, height, txid }) => {
-        const foundBlock = this.cacheService.getCachedBlock(height) || null;
         const auditAvailable = this.isAuditAvailable(height);
         const isCoinbase = this.tx.vin.some(v => v.is_coinbase);
         const fetchAudit = auditAvailable && !isCoinbase;
-        return combineLatest([
+        return fetchAudit ? this.apiService.getBlockAudit$(hash).pipe(
-          foundBlock ? of(foundBlock.extras.pool) : this.apiService.getBlock$(hash).pipe(
-            map(block => {
-              return block.extras.pool;
-            }),
-            retry({ count: 3, delay: 2000 }),
-            catchError(() => {
-              return of(null);
-            })
-          ),
-          fetchAudit ? this.apiService.getBlockAudit$(hash).pipe(
           map(audit => {
             const isAdded = audit.addedTxs.includes(txid);
             const isPrioritized = audit.prioritizedTxs.includes(txid);
@@ -345,14 +354,12 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
           catchError(() => {
             return of(null);
           })
-          ) : of(isCoinbase ? { coinbase: true } : null)
+        ) : of(isCoinbase ? { coinbase: true } : null);
-        ]);
       }),
       catchError((e) => {
         return of(null);
       })
-    ).subscribe(([pool, auditStatus]) => {
+    ).subscribe(auditStatus => {
-      this.pool = pool;
       this.auditStatus = auditStatus;
 
       this.setIsAccelerated();
@@ -858,6 +865,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
     this.mempoolBlocksSubscription.unsubscribe();
     this.blocksSubscription.unsubscribe();
     this.miningSubscription?.unsubscribe();
+    this.auditSubscription?.unsubscribe();
     this.currencyChangeSubscription?.unsubscribe();
     this.leaveTransaction();
   }