Added aggregateItems

app/src/components/transaction/transaction.html

@@ -27,19 +27,23 @@
       </ion-list>
 
       <ion-list [hidden]="tx.isCoinBase">
-        <ion-item *ngFor="let vin of tx.vin">
+        <ion-item *ngFor="let vin of aggregateItems(tx.vin)">
           <div>
-            <p><a (click)="goToAddress(vin.addr)">{{ vin.addr }}</a> <span item-end>{{ currency.getConversion(vin.value) }}</span></p>
+            <p><a (click)="goToAddress(vin.addr)">{{ vin.addr }}</a></p>
             <div [hidden]="!expanded">
               <p *ngIf="vin.confirmations"><b>Confirmations</b> {{vin.confirmations}}</p>
-              <p><b>scriptSig</b></p>
-              <div *ngIf="vin.scriptSig">
-                <div *ngFor="let item of vin.scriptSig.asm | split:' '" class="ellipsis">
+              <div *ngIf="vin.scriptSig" class="ellipsis">
+                <p><b>scriptSig</b></p>
+                <div *ngFor="let item of vin.scriptSig.asm | split:' '">
                   <p>{{item}}</p>
                 </div>
               </div>
             </div>
           </div>
+
+          <div item-end>
+            {{ currency.getConversion(vin.value) }}
+          </div>
         </ion-item>
       </ion-list>
 

app/src/components/transaction/transaction.ts

@@ -15,6 +15,8 @@ import { CurrencyProvider } from '../../providers/currency/currency';
 })
 export class TransactionComponent {
 
+  private COIN: number = 100000000;
+
   public expanded: boolean = false;
   @Input() public tx: any = {};
 
@@ -44,4 +46,74 @@ export class TransactionComponent {
   public toggleExpanded(): void {
     this.expanded = !this.expanded;
   }
+
+  public aggregateItems(items: Array<any>): Array<any> {
+    console.log('aggregateItems called');
+    if (!items) return [];
+
+    let l: number = items.length;
+
+    let ret: Array<any> = [];
+    let tmp: any = {};
+    let u: number = 0;
+
+    for (let i: number = 0; i < l; i++) {
+
+      let notAddr: boolean = false;
+      // non standard input
+      if (items[i].scriptSig && !items[i].addr) {
+        items[i].addr = 'Unparsed address [' + u++ + ']';
+        items[i].notAddr = true;
+        notAddr = true;
+      }
+
+      // non standard output
+      if (items[i].scriptPubKey && !items[i].scriptPubKey.addresses) {
+        items[i].scriptPubKey.addresses = ['Unparsed address [' + u++ + ']'];
+        items[i].notAddr = true;
+        notAddr = true;
+      }
+
+      // multiple addr at output
+      if (items[i].scriptPubKey && items[i].scriptPubKey.addresses.length > 1) {
+        items[i].addr = items[i].scriptPubKey.addresses.join(',');
+        ret.push(items[i]);
+        continue;
+      }
+
+      let addr: string = items[i].addr || (items[i].scriptPubKey && items[i].scriptPubKey.addresses[0]);
+
+      if (!tmp[addr]) {
+        tmp[addr] = {};
+        tmp[addr].valueSat = 0;
+        tmp[addr].count = 0;
+        tmp[addr].addr = addr;
+        tmp[addr].items = [];
+      }
+      tmp[addr].isSpent = items[i].spentTxId;
+
+      tmp[addr].doubleSpentTxID = tmp[addr].doubleSpentTxID   || items[i].doubleSpentTxID;
+      tmp[addr].doubleSpentIndex = tmp[addr].doubleSpentIndex || items[i].doubleSpentIndex;
+      tmp[addr].dbError = tmp[addr].dbError || items[i].dbError;
+      tmp[addr].valueSat += Math.round(items[i].value * this.COIN);
+      tmp[addr].items.push(items[i]);
+      tmp[addr].notAddr = notAddr;
+
+      if (items[i].unconfirmedInput)
+        tmp[addr].unconfirmedInput = true;
+
+      tmp[addr].count++;
+    }
+
+    console.log('tmp is', tmp);
+
+    for (let v in tmp) {
+      let obj: any = tmp[v];
+      console.log('obj isb', obj);
+      obj.value = obj.value || parseInt(obj.valueSat) / this.COIN;
+      ret.push(obj);
+    }
+
+    return ret;
+  };
 }