From 984cd5c01ed2a06982983613aafbcb451f8da028 Mon Sep 17 00:00:00 2001
From: moneroexamples <moneroexamples@tuta.io>
Date: Sun, 10 Sep 2017 06:48:54 +0800
Subject: [PATCH] fetching data status added to Transaction Details

---
 html/js/config.js                          |  2 +-
 html/js/controllers/transaction_details.js | 17 +++++++++++++++++
 html/modals/transaction-details.html       | 19 ++++++++++++++-----
 src/OutputInputIdentification.cpp          |  3 +++
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/html/js/config.js b/html/js/config.js
index 6fdd734..0d6c11a 100755
--- a/html/js/config.js
+++ b/html/js/config.js
@@ -1,6 +1,6 @@
 var config = {
     apiUrl: "http://127.0.0.1:1984/",
-    mainnetExplorerUrl: "https://xmrchain.net/",
+    mainnetExplorerUrl: "https://moneroexplorer.com/",
     testnetExplorerUrl: "http://139.162.32.245:8082/",
     testnet: false,
     coinUnitPlaces: 12,
diff --git a/html/js/controllers/transaction_details.js b/html/js/controllers/transaction_details.js
index e6ebdce..f9d8c9a 100644
--- a/html/js/controllers/transaction_details.js
+++ b/html/js/controllers/transaction_details.js
@@ -16,6 +16,21 @@ thinwalletCtrls.controller('TransactionDetailsCtrl', function ($scope,
 
     $scope.error = "";
 
+    // set data to be shown in the modal window
+    $scope.ring_size        = "";
+    $scope.fee              = "";
+    $scope.tx_size          = "";
+    $scope.no_confirmations = "";
+    $scope.tx_height        = "";
+    $scope.tx_pub_key       = "";
+    $scope.coinbase         = "";
+    $scope.timestamp        = "";
+    $scope.tx_age           = "";
+    $scope.payment_id       = "";
+    $scope.tx_amount        = "";
+
+    $scope.fetching = true;
+
     var tx_hash = ModalService.getModalUrlParams("tx_hash");
 
     //console.log(tx_hash);
@@ -103,6 +118,8 @@ thinwalletCtrls.controller('TransactionDetailsCtrl', function ($scope,
 
             $scope.payment_id = data.payment_id;
 
+            $scope.fetching = false;
+
              //console.log($scope.tx_amount);
 
         }, function(data) {
diff --git a/html/modals/transaction-details.html b/html/modals/transaction-details.html
index b58f00a..7c13fc7 100755
--- a/html/modals/transaction-details.html
+++ b/html/modals/transaction-details.html
@@ -6,7 +6,16 @@
       </a>
       <h1 class="head-modal">Transaction details</h1>
       <div class="subhead-text modal review" style="margin-bottom: 10px">{{ tx_hash }}</div>
-      <div class="w-form form-wrapper">
+
+      <div class="w-form form-wrapper" ng-show="fetching">
+        <div class="w-row">
+          <div class="w-col w-col-12 responsive-column">
+            <div class="review-text">Fetching data. Please wait ...</div>
+          </div>
+        </div>
+      </div>
+
+      <div class="w-form form-wrapper" ng-show="!fetching">
         <div class="w-row">
           <div class="w-col w-col-3 responsive-column">
             <label class="field-label review" for="Amount">Amount</label>
@@ -55,10 +64,10 @@
             <a class="login-link" href="{{ explorerLink }} " target="_blank">{{ explorerLink }} </a>
           </div>
         </div>
-        <br/>
-        <div class="w-form-fail error-backing" style="display: block;" ng-show="!!error">
-          <p>{{error}}</p>
-        </div>
+      </div>
+      <br/>
+      <div class="w-form-fail error-backing" style="display: block;" ng-show="!!error">
+        <p>{{error}}</p>
       </div>
     </div>
   </div>
diff --git a/src/OutputInputIdentification.cpp b/src/OutputInputIdentification.cpp
index 164ebe2..c54486d 100755
--- a/src/OutputInputIdentification.cpp
+++ b/src/OutputInputIdentification.cpp
@@ -249,6 +249,9 @@ OutputInputIdentification::identify_inputs(
             // is without our output, we can assume this tx does
             // not contain any of our spendings.
             //break;
+
+            // this break was disable due to this issue
+            // https://github.com/moneroexamples/openmonero/issues/44
         }
 
     } // for (const txin_to_key& in_key: input_key_imgs)