unify equal functions

Author: rastajpa

packages/insight-previous/src/components/transaction/transaction.ts

@@ -59,12 +59,9 @@ export class TransactionComponent implements OnInit {
   }
 
   public getConfirmations() {
-    this.blocksProvider.getCurrentHeight().subscribe(height => {
-      this.confirmations =
-        this.tx.blockheight > 0
-          ? height - this.tx.blockheight + 1
-          : this.tx.blockheight;
-    });
+    this.txProvider
+      .getConfirmations(this.tx.blockheight)
+      .subscribe(confirmations => (this.confirmations = confirmations));
   }
 
   public goToTx(txId: string, vout?: number, fromVout?: boolean): void {

packages/insight-previous/src/pages/transaction/transaction.ts

@@ -60,7 +60,9 @@ export class TransactionPage {
       data => {
         this.tx = data.tx;
         this.loading = false;
-        this.getConfirmations();
+        this.txProvider
+          .getConfirmations(this.tx.blockheight)
+          .subscribe(confirmations => (this.confirmations = confirmations));
         // Be aware that the tx component is loading data into the tx object
       },
       err => {
@@ -70,15 +72,6 @@ export class TransactionPage {
     );
   }
 
-  public getConfirmations() {
-    this.blocksProvider.getCurrentHeight().subscribe(height => {
-      this.confirmations =
-        this.tx.blockheight > 0
-          ? height - this.tx.blockheight + 1
-          : this.tx.blockheight;
-    });
-  }
-
   public goToBlock(blockHash: string): void {
     this.redirProvider.redir('block-detail', {
       blockHash,

packages/insight-previous/src/providers/transactions/transactions.ts

@@ -116,7 +116,7 @@ export class TxsProvider {
     public http: Http,
     private api: ApiProvider,
     public currency: CurrencyProvider,
-    public blocks: BlocksProvider
+    public blocksProvider: BlocksProvider
   ) {}
 
   public getFee(tx: AppTx): number {
@@ -187,4 +187,10 @@ export class TxsProvider {
       return data.json() as CoinsApiResponse;
     });
   }
+
+  public getConfirmations(blockheight: number): Observable<number> {
+    return this.blocksProvider.getCurrentHeight().map(height => {
+      return blockheight > 0 ? height - blockheight + 1 : blockheight;
+    });
+  }
 }