From 6a6705f104ca9fd2f47ebbc1f38899a22e7f6064 Mon Sep 17 00:00:00 2001
From: Vu Pham <pqv199x@hotmail.com>
Date: Fri, 21 Sep 2018 11:18:43 +0700
Subject: [PATCH 1/2] improve loading screen

---
 app/components/candidates/List.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/components/candidates/List.vue b/app/components/candidates/List.vue
index 9406375b..32f6587d 100644
--- a/app/components/candidates/List.vue
+++ b/app/components/candidates/List.vue
@@ -39,7 +39,14 @@
                 </div>
             </div>
         </div>
-        <div class="container">
+
+        <div
+            v-if="candidates.length <= 0"
+            class="tomo-loading"/>
+
+        <div
+            v-else
+            class="container">
             <div class="row">
                 <div class="col-12">
                     <h3 class="section-title">
@@ -56,7 +63,6 @@
                 :sort-by.sync="sortBy"
                 :sort-desc.sync="sortDesc"
                 :class="'tomo-table tomo-table--candidates ' + tableCssClass"
-                :show-empty="true"
                 empty-text="There are no candidates to show"
                 stacked="md" >
 

From 62d23a7805077eaa2cc03ad370279267495945df Mon Sep 17 00:00:00 2001
From: Nguyen Sy Thanh Son <thanhson1085@gmail.com>
Date: Sat, 22 Sep 2018 17:56:06 +0700
Subject: [PATCH 2/2] Update View.vue

---
 app/components/candidates/View.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/candidates/View.vue b/app/components/candidates/View.vue
index 1d57c95a..0ba512dd 100644
--- a/app/components/candidates/View.vue
+++ b/app/components/candidates/View.vue
@@ -217,7 +217,7 @@
                         <i class="tm-signer color-yellow" />
                         <span>Masternode Rewards</span>
                         <span class="text-truncate section-title__description">
-                            Calculate Reward for Masternode</span>
+                            Estimated Reward for Masternode</span>
                     </h3>
                 </div>
             </div>