fix confirmation label

Author: rastajpa

packages/insight-previous/CHANGELOG.md

@@ -7,8 +7,4 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @bitpay/insight-previous
 
-
-
-
-
 # [8.0.0](https://github.com/bitpay/bitcore/compare/v5.0.0-beta.44...v8.0.0) (2019-02-27)

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

@@ -11,8 +11,7 @@ export class FooterComponent {
   @Input()
   private chainNetwork: ChainNetwork;
 
-  constructor(public nav: Nav) {
-  }
+  constructor(public nav: Nav) {}
 
   public openPage(page: string): void {
     this.nav.push(page, {

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

@@ -26,19 +26,19 @@
 
   <ion-row align-items-end class="small" *ngIf="!showCoins">
     <ion-col col-12 text-right text-uppercase>
-      <ion-chip item-end color="danger" *ngIf="tx.confirmations === 0">
+      <ion-chip item-end color="danger" *ngIf="confirmations < 0">
         <ion-label>
           Unconfirmed
         </ion-label>
       </ion-chip>
-      <ion-chip item-end color="warning" *ngIf="tx.confirmations === 1">
+      <ion-chip item-end color="warning" *ngIf="confirmations === 1">
         <ion-label>
           1 Confirmation
         </ion-label>
       </ion-chip>
-      <ion-chip item-end color="primary" *ngIf="tx.confirmations > 1">
+      <ion-chip item-end color="primary" *ngIf="confirmations > 1">
         <ion-label>
-          {{ tx.confirmations | number }} Confirmations
+          {{ confirmations }} Confirmations
         </ion-label>
       </ion-chip>
       <ion-chip item-end color="brand">
@@ -148,14 +148,14 @@
       </div>
     </ion-col>
     <ion-col col-6 text-right>
-      <ion-chip color="danger" *ngIf="tx.confirmations === 0">
+      <ion-chip color="danger" *ngIf="confirmations < 0">
         <ion-label>Unconfirmed</ion-label>
       </ion-chip>
-      <ion-chip color="warning" *ngIf="tx.confirmations === 1">
+      <ion-chip color="warning" *ngIf="confirmations === 1">
         <ion-label>1 Confirmation</ion-label>
       </ion-chip>
-      <ion-chip color="primary" *ngIf="tx.confirmations > 1">
-        <ion-label>{{ tx.confirmations | number }} Confirmations
+      <ion-chip color="primary" *ngIf="confirmations > 1">
+        <ion-label>{{ confirmations }} Confirmations
         </ion-label>
       </ion-chip>
       <ion-chip color="brand">

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

@@ -1,5 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { ApiProvider } from '../../providers/api/api';
+import { BlocksProvider } from '../../providers/blocks/blocks';
 import { CurrencyProvider } from '../../providers/currency/currency';
 import { RedirProvider } from '../../providers/redir/redir';
 import {
@@ -25,18 +26,18 @@ export class TransactionComponent implements OnInit {
   public tx: any = {};
   @Input()
   public showCoins = false;
+  public confirmations: number;
 
   constructor(
     public currencyProvider: CurrencyProvider,
     public apiProvider: ApiProvider,
     public txProvider: TxsProvider,
-    public redirProvider: RedirProvider
+    public redirProvider: RedirProvider,
+    public blocksProvider: BlocksProvider
   ) {}
 
   public ngOnInit(): void {
-    if (this.showCoins) {
-      this.getCoins();
-    }
+    this.showCoins ? this.getCoins() : this.getConfirmations();
   }
 
   public getCoins(): void {
@@ -45,6 +46,7 @@ export class TransactionComponent implements OnInit {
       this.tx.vout = data.outputs;
       this.tx.fee = this.txProvider.getFee(this.tx);
       this.tx.valueOut = data.outputs.reduce((a, b) => a + b.value, 0);
+      this.getConfirmations();
     });
   }
 
@@ -56,6 +58,15 @@ export class TransactionComponent implements OnInit {
     return vout.address;
   }
 
+  public getConfirmations() {
+    this.blocksProvider.getCurrentHeight().subscribe(height => {
+      this.confirmations =
+        this.tx.blockheight > 0
+          ? height - this.tx.blockheight + 1
+          : this.tx.blockheight;
+    });
+  }
+
   public goToTx(txId: string, vout?: number, fromVout?: boolean): void {
     this.redirProvider.redir('transaction', {
       txId,

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

@@ -1,10 +1,10 @@
 import { Component, Injectable } from '@angular/core';
-import { 
-  AbstractControl, 
-  FormBuilder, 
-  FormGroup, 
-  ValidationErrors, 
-  Validators 
+import {
+  AbstractControl,
+  FormBuilder,
+  FormGroup,
+  ValidationErrors,
+  Validators
 } from '@angular/forms';
 import { IonicPage, NavParams } from 'ionic-angular';
 import { ApiProvider, ChainNetwork } from '../../providers/api/api';
@@ -51,10 +51,10 @@ export class MessagesPage {
     this.apiProvider.changeNetwork(this.chainNetwork);
     this.currencyProvider.setCurrency();
     this.priceProvider.setCurrency();
- 
+
     this.messageForm = formBuilder.group({
       address: [
-        '', 
+        '',
         Validators.compose([Validators.minLength(1), Validators.required])
       ],
       signature: [
@@ -76,7 +76,8 @@ export class MessagesPage {
       return;
     }
 
-    const bitcore = this.chainNetwork.chain === 'BTC' ? bitcoreLib : bitcoreLibCash;
+    const bitcore =
+      this.chainNetwork.chain === 'BTC' ? bitcoreLib : bitcoreLibCash;
     const message = new bitcore.Message(values.message);
 
     try {
@@ -85,17 +86,17 @@ export class MessagesPage {
       } else {
         this.error = message.error;
       }
-    } catch(e) {
+    } catch (e) {
       this.error = e.message;
       this.logger.error(e.message);
-    };
+    }
   }
 
   private isAddressValid(addr): boolean {
-    const bitcore = this.chainNetwork.chain === 'BTC' ? bitcoreLib : bitcoreLibCash;
-    return !!bitcore.Address.isValid(addr, this.chainNetwork.network) ? 
-      true : 
-      false;
+    const bitcore =
+      this.chainNetwork.chain === 'BTC' ? bitcoreLib : bitcoreLibCash;
+    return !!bitcore.Address.isValid(addr, this.chainNetwork.network)
+      ? true
+      : false;
   }
-
 }

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

@@ -39,7 +39,7 @@ <h2>Summary</h2>
               {{ tx.time * 1000 | date:'medium' }}
             </ion-note>
           </ion-item>
-          <ion-item *ngIf="tx.confirmations !== 0">
+          <ion-item *ngIf="confirmations > 0">
             Mined Time
             <ion-note item-end>
               {{ tx.blocktime * 1000 | date:'medium' }}
@@ -50,7 +50,7 @@ <h2>Summary</h2>
             <ion-note item-end>
               <a (click)="goToBlock(tx.blockhash)">{{ tx.blockhash }}</a>
             </ion-note>
-            <ion-note *ngIf="tx.confirmations === 0" item-end>
+            <ion-note *ngIf="confirmations < 0" item-end>
               Unconfirmed
             </ion-note>
           </ion-item>

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

@@ -1,6 +1,7 @@
 import { Component, Injectable } from '@angular/core';
 import { IonicPage, NavParams } from 'ionic-angular';
 import { ApiProvider, ChainNetwork } from '../../providers/api/api';
+import { BlocksProvider } from '../../providers/blocks/blocks';
 import { CurrencyProvider } from '../../providers/currency/currency';
 import { Logger } from '../../providers/logger/logger';
 import { PriceProvider } from '../../providers/price/price';
@@ -24,6 +25,7 @@ export class TransactionPage {
   public tx: any = {};
   public vout: number;
   public fromVout: boolean;
+  public confirmations: number;
 
   constructor(
     public navParams: NavParams,
@@ -32,7 +34,8 @@ export class TransactionPage {
     public currencyProvider: CurrencyProvider,
     private logger: Logger,
     private priceProvider: PriceProvider,
-    public redirProvider: RedirProvider
+    public redirProvider: RedirProvider,
+    private blocksProvider: BlocksProvider
   ) {
     this.txId = navParams.get('txId');
     this.vout = navParams.get('vout');
@@ -57,6 +60,7 @@ export class TransactionPage {
       data => {
         this.tx = data.tx;
         this.loading = false;
+        this.getConfirmations();
         // Be aware that the tx component is loading data into the tx object
       },
       err => {
@@ -66,6 +70,15 @@ 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,