From 8cf59420654381622e19e0f7403e364d8ee831df Mon Sep 17 00:00:00 2001
From: liangping <18786721@qq.com>
Date: Tue, 30 Aug 2022 08:33:15 +0800
Subject: [PATCH] Fix issues

---
 src/libs/default-handler.js    |  1 -
 src/libs/fetch.js              | 30 +++++++++++++++---------------
 src/views/StakingValidator.vue |  8 +-------
 src/views/WalletAccounts.vue   |  1 -
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/libs/default-handler.js b/src/libs/default-handler.js
index 24658c61..8fd7ae68 100644
--- a/src/libs/default-handler.js
+++ b/src/libs/default-handler.js
@@ -21,7 +21,6 @@ const handler = class DefaultHandler {
   }
 
   processProposalTally(tally) {
-    console.log(tally)
     const result = this.commonProcess(tally)
     return result
   }
diff --git a/src/libs/fetch.js b/src/libs/fetch.js
index 3c4bdea2..d4cf1e21 100644
--- a/src/libs/fetch.js
+++ b/src/libs/fetch.js
@@ -102,26 +102,26 @@ export default class ChainFetch {
   }
 
   async getValidatorDistribution(address) {
-    return this.get(`/distribution/validators/${address}`).then(data => {
-      const value = commonProcess(data)
-      const ret = ValidatorDistribution.create({
-        operator_address: address,
-        self_bond_rewards: value.self_bond_rewards,
-        val_commission: value.val_commission.commission,
-      })
-      return ret
-    })
-    // return Promise.all([
-    //   this.get(`/cosmos/distribution/v1beta1/validators/${address}/commission`),
-    //   this.get(`/cosmos/distribution/v1beta1/validators/${address}/outstanding_rewards`),
-    // ]).then(data => {
+    // return this.get(`/distribution/validators/${address}`).then(data => {
+    //   const value = commonProcess(data)
     //   const ret = ValidatorDistribution.create({
     //     operator_address: address,
-    //     self_bond_rewards: data[1].rewards.rewards,
-    //     val_commission: data[0].commission.commission,
+    //     self_bond_rewards: value.self_bond_rewards,
+    //     val_commission: value.val_commission.commission,
     //   })
     //   return ret
     // })
+    return Promise.all([
+      this.get(`/cosmos/distribution/v1beta1/validators/${address}/commission`),
+      this.get(`/cosmos/distribution/v1beta1/validators/${address}/outstanding_rewards`),
+    ]).then(data => {
+      const ret = ValidatorDistribution.create({
+        operator_address: address,
+        self_bond_rewards: data[1].rewards.rewards,
+        val_commission: data[0].commission.commission,
+      })
+      return ret
+    })
   }
 
   async getStakingDelegatorDelegation(delegatorAddr, validatorAddr) {
diff --git a/src/views/StakingValidator.vue b/src/views/StakingValidator.vue
index 5053f957..5160b75c 100644
--- a/src/views/StakingValidator.vue
+++ b/src/views/StakingValidator.vue
@@ -123,13 +123,7 @@
                 <span class="font-weight-bold">Status</span>
               </th>
               <td class="pb-50 text-capitalize">
-                <b-badge
-                  v-if="validator.status===3"
-                  variant="light-success"
-                >
-                  Active
-                </b-badge>
-                <span v-else>{{ validator.status }}</span>
+                <span>{{ String(validator.status).replace('BOND_STATUS_', '') }}</span>
               </td>
             </tr>
             <tr>
diff --git a/src/views/WalletAccounts.vue b/src/views/WalletAccounts.vue
index 4f9ea5aa..dc101583 100644
--- a/src/views/WalletAccounts.vue
+++ b/src/views/WalletAccounts.vue
@@ -200,7 +200,6 @@
                           </div>
                         </div>
                         <b-button
-                          v-if="balances[acc.addr]"
                           block
                           size="sm"
                           variant="outline-primary"