UI: display loading message in history tab

hivewallet · Jul 26, 2015 · 9f69e4e · 9f69e4e
1 parent eb2ad98
commit 9f69e4e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/app/pages/history/index.js b/app/pages/history/index.js
@@ -19,17 +19,20 @@ module.exports = function(el){
         var date = new Date(timestamp)
         return strftime('%b %d %l:%M %p', date)
       },
-      satoshiToBtc: satoshiToBtc
+      satoshiToBtc: satoshiToBtc,
+      loadingTx: true
     }
   })
 
   emitter.on('append-transactions', function(newTxs){
     Array.prototype.unshift.apply(transactions, newTxs)
     ractive.set('transactions', transactions)
+    ractive.set('loadingTx', false)
   })
 
   emitter.on('set-transactions', function(newTxs) {
     ractive.set('transactions', newTxs)
+    ractive.set('loadingTx', false)
   })
 
   ractive.on('show-detail', function(event) {

diff --git a/app/pages/history/index.ract b/app/pages/history/index.ract
@@ -1,5 +1,10 @@
 
 <div class="transactions">
+  {{#loadingTx}}
+    <div class="transactions__message">
+      <div class="_message">{{translate("Loading transactions...")}}</div>
+    </div>
+  {{/loadingTx}}
   {{#transactions.length}}
     <h3 class="_title">{{translate("Your transaction history")}}</h3>
   {{/transactions.length}}
@@ -27,11 +32,13 @@
     </div>
   {{/transactions}}
   {{^transactions}}
-    <div class="transactions__message">
-      <div class="_icon">
-        {{>svg_help}}
+    {{^loadingTx}}
+      <div class="transactions__message">
+        <div class="_icon">
+          {{>svg_help}}
+        </div>
+        <div class="_message">{{translate("You do not have any transactions yet")}}</div>
       </div>
-      <div class="_message">{{translate("You do not have any transactions yet")}}</div>
-    </div>
+    {{/loadingTx}}
   {{/transactions}}
 </div>