Merge branch 'SonicWizard-master'

app/src/components/head-nav/head-nav.ts

@@ -6,6 +6,7 @@ import { ApiProvider } from '../../providers/api/api';
 import { CurrencyProvider } from '../../providers/currency/currency';
 import { ActionSheetController } from 'ionic-angular';
 import { PopoverController } from 'ionic-angular';
+import { ToastController } from 'ionic-angular';
 import { DenominationComponent } from '../denomination/denomination';
 
 /**
@@ -24,7 +25,6 @@ export class HeadNavComponent {
   public loading: boolean;
   @Input() public title: string;
   public q: string;
-  public badQuery: boolean = false;
 
   constructor(
     private navCtrl: NavController,
@@ -32,7 +32,8 @@ export class HeadNavComponent {
     private api: ApiProvider,
     public currency: CurrencyProvider,
     public actionSheetCtrl: ActionSheetController,
-    public popoverCtrl: PopoverController
+    public popoverCtrl: PopoverController,
+    public toastCtrl: ToastController
   ) {
   }
 
@@ -93,17 +94,17 @@ export class HeadNavComponent {
 
   /* tslint:disable:no-unused-variable */
   private reportBadQuery(): void {
-    this.badQuery = true;
+    this.presentToast();
-    console.log('badQuery', this.badQuery);
+  }
 
-    setTimeout(
+  private presentToast(): void {
-      function (): void {
+    const toast: any = this.toastCtrl.create({
-        this.badQuery = false;
+      message: 'No matching records found!',
-        console.log('badQuery', this.badQuery);
+      duration: 3000,
-      }.bind(this),
+      position: 'top'
-      2000
+    });
-    );
+    toast.present();
-  };
+  }
 
   private resetSearch(): void {
     this.q = '';

app/src/components/transaction/transaction.html

@@ -47,10 +47,8 @@
               </p>
               <div *ngFor="let item of vin.items">
                 <div *ngIf="item.scriptSig">
-                  <div *ngFor="let scriptSig of item.scriptSig.asm | split:' '">
                   <div class="unlocking-script">
-                      <p>{{ scriptSig }}</p>
+                    <p>{{ item.scriptSig.asm }}
-                    </div>
                   </div>
                 </div>
               </div>
@@ -87,7 +85,7 @@
                 <b>Locking Script</b>
               </p>
               <div class="locking-script">
-                <p>{{vout.scriptPubKey.asm}}</p>
+                <p>{{ vout.scriptPubKey.asm }}</p>
               </div>
             </div>
           </div>