add unparsed addresses

Darren Nelsen · Darren Nelsen · commit c747dde96cd1 · 2018-07-10T12:46:05.000-04:00
diff --git a/packages/insight/app/src/components/transaction/transaction.html b/packages/insight/app/src/components/transaction/transaction.html
@@ -75,7 +75,7 @@
           <div>
             <div class="ellipsis">
               <p>
-                <a (click)="goToAddress(vout.address)">{{ vout.address }}</a>
+                <a (click)="goToAddress(vout.address)">{{ getAddress(vout) }}</a>
               </p>
             </div>
             <div *ngIf="expanded">
diff --git a/packages/insight/app/src/components/transaction/transaction.ts b/packages/insight/app/src/components/transaction/transaction.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { Input } from '@angular/core';
 import { NavController } from 'ionic-angular';
 import { CurrencyProvider } from '../../providers/currency/currency';
-import { TxsProvider } from '../../providers/transactions/transactions';
+import { TxsProvider, ApiInput } from '../../providers/transactions/transactions';
 
 /**
  * Generated class for the TransactionComponent component.
@@ -43,12 +43,12 @@ export class TransactionComponent {
     });
   }
 
-  public getAddress(vout: any): string {
-    if (vout.scriptPubKey && vout.scriptPubKey.addresses) {
-      return vout.scriptPubKey.addresses[0];
-    } else {
+  public getAddress(vout: ApiInput): string {
+    if (vout.address === 'false') {
       return 'Unparsed address';
     }
+
+    return vout.address;
   }
 
   public goToTx(txId: string): void {
diff --git a/packages/insight/app/src/pages/transaction/transaction.ts b/packages/insight/app/src/pages/transaction/transaction.ts
@@ -36,10 +36,7 @@ export class TransactionPage {
       data => {
         this.tx = data.tx;
         this.loading = false;
-        this.txProvider.getCoins(this.txId).subscribe(coinData => {
-          this.tx.inputs = coinData.inputs;
-          this.tx.outputs = coinData.outputs;
-        });
+        // Be aware that the tx component is loading data into the tx object
       },
       err => {
         console.log('err is', err);
diff --git a/packages/insight/app/src/providers/transactions/transactions.ts b/packages/insight/app/src/providers/transactions/transactions.ts
@@ -40,7 +40,10 @@ export type ApiInput = {
   coinbase: boolean;
   vout: number;
   address: string;
-  script: string;
+  script: {
+    asm: string;
+    type: string
+  };
   value: number;
 };
 
