From 3f1332ffca3a72172168bd05b2e2fe5d82efc0b7 Mon Sep 17 00:00:00 2001
From: Darren Nelsen <darren@bitpay.com>
Date: Thu, 3 Aug 2017 10:20:19 -0400
Subject: [PATCH] rename transaction object to tx in transaction page

---
 app/src/pages/transaction/transaction.html | 10 +++++-----
 app/src/pages/transaction/transaction.ts   |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/pages/transaction/transaction.html b/app/src/pages/transaction/transaction.html
index a66b0bc..4294f86 100644
--- a/app/src/pages/transaction/transaction.html
+++ b/app/src/pages/transaction/transaction.html
@@ -18,7 +18,7 @@
     <ion-row>
       <ion-col col-12>
         <h1>Transaction</h1>
-        <p>{{ transaction.txid }}</p>
+        <p>{{ tx.txid }}</p>
       </ion-col>
     </ion-row>
     <ion-row>
@@ -26,19 +26,19 @@
     </ion-row>
     <ion-row>
       <ion-col col-6>Size</ion-col>
-      <ion-col col-6 text-right>{{ transaction.size }} (bytes)</ion-col>
+      <ion-col col-6 text-right>{{ tx.size }} (bytes)</ion-col>
     </ion-row>
     <ion-row>
       <ion-col col-6>Received Time</ion-col>
-      <ion-col col-6 text-right>{{ transaction.receivedTime }}</ion-col>
+      <ion-col col-6 text-right>{{ tx.time * 1000 | date:'medium' }}</ion-col>
     </ion-row>
     <ion-row>
       <ion-col col-6>Mined Time</ion-col>
-      <ion-col col-6 text-right>{{ transaction.minedTime }}</ion-col>
+      <ion-col col-6 text-right>{{ tx.blocktime * 1000 | date:'medium' }}</ion-col>
     </ion-row>
     <ion-row>
       <ion-col col-6>Included in Block</ion-col>
-      <ion-col col-6 text-right>{{ transaction.blockhash }}</ion-col>
+      <ion-col col-6 text-right>{{ tx.blockhash }}</ion-col>
     </ion-row>
     <ion-row>
       <ion-col col-12><h2>Details</h2></ion-col>
diff --git a/app/src/pages/transaction/transaction.ts b/app/src/pages/transaction/transaction.ts
index 5427fb5..d1f5ff8 100644
--- a/app/src/pages/transaction/transaction.ts
+++ b/app/src/pages/transaction/transaction.ts
@@ -20,7 +20,7 @@ export class TransactionPage {
 
   public loading: boolean = true;
   private txId: string;
-  public transaction: any = {};
+  public tx: any = {};
 
   constructor(public navCtrl: NavController, public navParams: NavParams, private http: Http) {
     this.txId = navParams.get('txId');
@@ -31,8 +31,8 @@ export class TransactionPage {
 
     this.http.get(apiPrefix + 'tx/' + this.txId).subscribe(
       (data) => {
-        this.transaction = JSON.parse(data['_body']);
-        console.log('transaction', this.transaction);
+        this.tx = JSON.parse(data['_body']);
+        console.log('tx', this.tx);
         this.loading = false;
       },
       (err) => {