From c5eee33b32aaf7fa01e7638e61f4be7e92e5eb40 Mon Sep 17 00:00:00 2001
From: Farina Ashfaq <fari.ash16@gmail.com>
Date: Wed, 12 Jun 2019 15:52:43 +0500
Subject: [PATCH] Update txn detail data

---
 .../Transactiondetail.vue                     | 34 +++++++++----------
 .../ViewAccount/ViewAccount.vue               | 13 ++++---
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/renderer/components/DasboardComponents/WalletDashboardComponents/Transactiondetail.vue b/src/renderer/components/DasboardComponents/WalletDashboardComponents/Transactiondetail.vue
index d9904b9..885fe11 100644
--- a/src/renderer/components/DasboardComponents/WalletDashboardComponents/Transactiondetail.vue
+++ b/src/renderer/components/DasboardComponents/WalletDashboardComponents/Transactiondetail.vue
@@ -2,20 +2,20 @@
     <div id="transaction-modal" class="txns_details">
         <div class="popup  md-content ">
             <a href="#" @click="hide" class="btn-close md-close"></a>
-            <div v-if="transaction.transaction_info" class="transaction transaction_details">
+            <div v-if="transaction" class="transaction transaction_details">
                 <h2>Transaction</h2>
                 <p class="trx_hash">
-                    {{transaction.transaction_info && transaction.transaction_info.hash}}</p>
+                    {{transaction.hash}}</p>
                 <p class="trx_time">
-                    {{transaction.transaction_info &&  transaction.transaction_info.timestampDecimal | moment("LLLL")}}<br />
-                    <span>({{transaction.transaction_info &&  transaction.transaction_info.timestampDecimal | moment("from", "now")}})</span>
+                    {{parseInt(transaction.timeUnixEpoch) * 1000 | moment("LLLL")}}<br />
+                    <span>({{transaction &&  transaction.timeUnixEpoch | moment("from", "now")}})</span>
                 </p>
                 <div class="table">
                     <div class="rows">
                         <label>Amount</label>
                         <div class="content">
                             <label class="trx_amount">
-                                {{transaction.transaction_info && transaction.transaction_info.valueDecimal}}
+                                {{ web3.utils.fromWei(transaction.valueInWei.toString(), 'ether')?parseFloat(web3.utils.fromWei(transaction.valueInWei.toString(), 'ether')).toFixed(4):0}}
                                 <span>EXP</span>
                             </label>
                         </div>
@@ -38,7 +38,7 @@
                                     <rect x="27.3" y="26.7" class="st125" width="9.7" height="9.6" />
                                 </svg>
                             <label class="trx_from">
-                                {{transaction.transaction_info && transaction.transaction_info.from}}
+                                {{transaction && transaction.from}}
                             </label>
                         </div>
                     </div>
@@ -60,7 +60,7 @@
                                     <rect x="27.3" y="26.7" class="st125" width="9.7" height="9.6" />
                                 </svg>
                             <label class="trx_to">
-                                {{transaction.transaction_info && transaction.transaction_info.to}}
+                                {{transaction && transaction.to}}
                             </label>
                         </div>
                     </div>
@@ -68,7 +68,7 @@
                         <label>Fee paid</label>
                         <div class="content">
                             <label class="trx_fee_paind">
-                                {{web3.utils.toDecimal(transaction.transaction_recipt_info && transaction.transaction_recipt_info.gasUsed)}}
+                                {{transaction && transaction.transactionFee}} EXP
                             </label>
                         </div>
                     </div>
@@ -76,8 +76,8 @@
                         <label>Gas Limit</label>
                         <div class="content">
                             <label class="tex_gass_limit">
-                                {{transaction.transaction_info &&  web3.utils.fromWei(web3.utils.toDecimal(transaction.transaction_info.gas).toString(), 'ether') * Gwei }}
-                                (GWei)
+                                {{transaction &&  transaction.gasDecimal }}
+                                <!--(GWei)-->
                             </label>
                         </div>
                     </div>
@@ -85,7 +85,7 @@
                         <label>Gas used</label>
                         <div class="content">
                             <label class="tex_gass_used">
-                                {{web3.utils.toDecimal(transaction.transaction_recipt_info && transaction.transaction_recipt_info.gasUsed)}}
+                                {{web3.utils.toDecimal(transaction && transaction.gasUsed)}} ({{(parseInt(transaction.gasUsed)/parseInt(transaction.gasDecimal)) * 100}} %)
                             </label>
                         </div>
                     </div>
@@ -93,7 +93,7 @@
                         <label>Gas price</label>
                         <div class="content">
                             <label class="trx_gass_price">
-                                {{transaction.transaction_recipt_info && parseFloat(web3.utils.fromWei(web3.utils.toDecimal(transaction.transaction_recipt_info.gasUsed).toString(), 'ether') * Gwei).toFixed(6)}}
+                                {{web3.utils.fromWei(transaction.gasPrice.toString(), 'ether')}} EXP ({{transaction.gasPriceInWei}} Gwei)
                             </label>
                         </div>
                     </div>
@@ -110,8 +110,8 @@
                     <div class="rows">
                         <label>Block</label>
                         <div class="content">
-                            <a @click="openGanderUrl('https://gander.tech/block/'+transaction.transaction_info.blockNumberDecimal)" href="" class='trx_block' target="_blank">
-                                {{transaction.transaction_info && transaction.transaction_info.blockNumberDecimal}}
+                            <a @click="openGanderUrl('https://gander.tech/block/'+transaction.blockNumberDecimal)" href="" class='trx_block' target="_blank">
+                                {{transaction && transaction.blockNumberDecimal}}
                             </a>
                         </div>
                     </div>
@@ -164,11 +164,11 @@
             fetch(postData){
                 console.log(postData, "postData------");
                 var transaction_list_hash ,updated_transaction_list_hash;
-                axios.post('https://beta-api.gander.tech/gettransactionbyhash', postData)
+                axios.get('https://api.gander.tech/transactionByHash/'+this.txndetaildata)
                     .then((response) => {
                         console.log(response.data.message, "response------");
-                        if(response.data.message){
-                            this.transaction = response.data.message;
+                        if(response.data.data){
+                            this.transaction = response.data.data[0];
                         }
                     })
                     .catch((error) => {
diff --git a/src/renderer/components/DasboardComponents/WalletDashboardComponents/ViewAccount/ViewAccount.vue b/src/renderer/components/DasboardComponents/WalletDashboardComponents/ViewAccount/ViewAccount.vue
index 51a0611..2d44f9c 100644
--- a/src/renderer/components/DasboardComponents/WalletDashboardComponents/ViewAccount/ViewAccount.vue
+++ b/src/renderer/components/DasboardComponents/WalletDashboardComponents/ViewAccount/ViewAccount.vue
@@ -142,11 +142,10 @@
                     </div>
                     <div>
                         <div @click="handletxdetail(transaction)" v-for="(transaction, index) in filtertransaction? filtertransaction:transactions" v-if="istransactions&& transaction.Type != 'mined_transaction'"  class="row transactionDetail md-trigger" data-modal="modal-4" :data-transactionid="transaction.hash">
-                            <label class="date">{{ transaction.timestampDecimal | moment("MMM-DD")}}</label>
-                            <label v-if="transaction.transactionStatus && transaction.transactionStatus === 'Pending'" class="status statstf"><strong>{{transaction.transactionStatus}}</strong></label>
-                            <label v-else-if="transaction.transactionStatus" class="status statstf">{{transaction.transactionStatus}}</label>
-                            <label v-if="!transaction.transactionStatus && transaction.blockNumber" class="status">Completed</label>
-                            <label v-else-if="!transaction.transactionStatus" class="status"><strong>Pending</strong></label>
+                            <label class="date">{{ parseInt(transaction.timeUnixEpoch) * 1000 | moment("MMM-DD")}}</label>
+                            <label v-if="transaction.status && transaction.status === '0x1'" class="status statstf"><strong>Completed</strong></label>
+                            <label v-else-if="transaction.status && transaction.status === '0x0'" class="status statstf">Failed</label>
+                            <label v-else-if="transaction.status && transaction.status === ''" class="status statstf">Pending</label>
                             <div class="account">
                                 <div class="fromAccount">{{transaction.from?transaction.from:'From'}}</div>
                                 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="11px" height="19px" viewBox="0 0 11 19" style="enable-background:new 0 0 11 19;" xml:space="preserve">
@@ -155,7 +154,7 @@
                                 <div class="toAccount">{{transaction.to}}</div>
                             </div>
                             <label class="amount">
-                                <span >{{transaction.valueDecimal?parseFloat(transaction.valueDecimal).toFixed(4):0}} Exp</span>
+                                <span >{{ web3.utils.fromWei(transaction.valueInWei.toString(), 'ether')?parseFloat(web3.utils.fromWei(transaction.valueInWei.toString(), 'ether')).toFixed(4):0}} Exp</span>
                                 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 35 35" style="enable-background:new 0 0 35 35;" xml:space="preserve">
                             <path class="open" d="M0,17.5C0,7.8,7.8,0,17.5,0S35,7.8,35,17.5S27.2,35,17.5,35S0,27.2,0,17.5z M31.5,17.5c0-7.7-6.3-14-14-14s-14,6.3-14,14s6.3,14,14,14S31.5,25.2,31.5,17.5z M10.8,17.9l0.8-0.2L10.8,17.9l8.4-11.5l1.6,1.2l-7.5,10.3l7.7,10L19.3,29L10.8,17.9z"></path>
                         </svg>
@@ -403,7 +402,7 @@
                     .then((response) => {
                         this.istransactions = true;
                         this.notransactions = false;
-                        this.transactions = response.data.message;
+                        this.transactions = response.data.data.transactions;
                         console.log(this.transactions === null ,"this.transactions ");
                         if(this.transactions && this.transactions.length > 0 ){
                             console.log(this.transactions ,"this.transactions ");