From 057cf70fbced3edf59444a58ba0a7708daf7139d Mon Sep 17 00:00:00 2001
From: Vadim Macagon <vadim.macagon@gmail.com>
Date: Tue, 4 Jul 2023 12:59:00 +0700
Subject: [PATCH 1/2] Fix vertical alignment of election timer

The election timer on the validator list page was misaligned.
---
 src/dpos/components/ElectionTimer.vue | 2 +-
 src/locales/en.json                   | 2 +-
 src/locales/es.json                   | 2 +-
 src/locales/ja.json                   | 2 +-
 src/locales/ko.json                   | 2 +-
 src/locales/th.json                   | 2 +-
 src/locales/zh.json                   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/dpos/components/ElectionTimer.vue b/src/dpos/components/ElectionTimer.vue
index f2539651..488c179e 100644
--- a/src/dpos/components/ElectionTimer.vue
+++ b/src/dpos/components/ElectionTimer.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <h5 class="highlight" style="height: 2rem;">
+    <h5 class="highlight">
       <span v-if="timeLeft > 0">{{formattedTimeUntilElection}}</span>
       <b-spinner v-else variant="primary" label="Spinning" small style="margin: 0 0 0.4rem 0.4rem;" />
     </h5>
diff --git a/src/locales/en.json b/src/locales/en.json
index 18d920b3..632133ea 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -384,7 +384,7 @@
     "validator_list": {
       "no_validators_available_please_try": "Error connecting to dashboard node. Please check back later.",
       "validators": "Validators",
-      "next_election_in": "Next election in:",
+      "next_election_in": "Next election in",
       "total_staked_amount": "Total staked amount",
       "effective_rewards": "Base rewards",
       "stake": "Stake",
diff --git a/src/locales/es.json b/src/locales/es.json
index 32d56e12..6df46148 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -330,7 +330,7 @@
     "validator_list": {
       "no_validators_available_please_try": "Error connecting to dashboard node. Please check back later.",
       "validators": "Validators",
-      "next_election_in": "Next election in:",
+      "next_election_in": "Next election in",
       "total_staked_amount": "Total staked amount",
       "stake": "Stake",
       "name": "Name"
diff --git a/src/locales/ja.json b/src/locales/ja.json
index aec64377..36122781 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -330,7 +330,7 @@
     "validator_list": {
       "no_validators_available_please_try": "ダッシュ ボードのノードへの接続中にエラーが発生しました。後ほど再度確認してください。",
       "validators": "バリデーター",
-      "next_election_in": "Next election in:",
+      "next_election_in": "Next election in",
       "total_staked_amount": "Total staked amount",
       "stake": "Stake",
       "name": "Name"
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 48186d94..8aec68b2 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -330,7 +330,7 @@
     "validator_list": {
       "no_validators_available_please_try": "대시보드 노드를 연결하는 중 오류가 발생했습니다. 나중에 다시 확인해주세요.",
       "validators": "검증자",
-      "next_election_in": "다음 선거 주기까지 남은 시간:",
+      "next_election_in": "다음 선거 주기까지 남은 시간",
       "total_staked_amount": "총 스테이킹 금액",
       "stake": "스테이킹",
       "name": "이름"
diff --git a/src/locales/th.json b/src/locales/th.json
index 3555394a..af47b4ee 100644
--- a/src/locales/th.json
+++ b/src/locales/th.json
@@ -330,7 +330,7 @@
     "validator_list": {
       "no_validators_available_please_try": "Error connecting to dashboard node. Please check back later.",
       "validators": "Validators",
-      "next_election_in": "Next election in:",
+      "next_election_in": "Next election in",
       "total_staked_amount": "Total staked amount",
       "stake": "Stake",
       "name": "Name"
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 73799b3c..a567ca18 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -330,7 +330,7 @@
     "validator_list": {
       "no_validators_available_please_try": "连接到管理面板节点时出错。请稍后再查看。",
       "validators": "验证者",
-      "next_election_in": "下一轮选举倒计时：",
+      "next_election_in": "下一轮选举倒计时",
       "total_staked_amount": "锁定总量",
       "stake": "锁定",
       "name": "名字"

From 436846ef96207b7c84ec64de6ecb97bef0e8c3f1 Mon Sep 17 00:00:00 2001
From: Vadim Macagon <vadim.macagon@gmail.com>
Date: Tue, 4 Jul 2023 13:08:02 +0700
Subject: [PATCH 2/2] Rename Active column to State in validator table

---
 src/dpos/views/ValidatorList.vue | 45 ++++++++++++++++----------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/dpos/views/ValidatorList.vue b/src/dpos/views/ValidatorList.vue
index b11c16f8..6a1593eb 100644
--- a/src/dpos/views/ValidatorList.vue
+++ b/src/dpos/views/ValidatorList.vue
@@ -113,12 +113,10 @@
                 </div>
               </template>
 
-              <template slot="active" slot-scope="data">{{
+              <template #cell(state)="data">{{
                 data.item.jailed
                   ? $t("views.validator_detail.jailed")
-                  : data.item.active
-                  ? $t("views.validator_detail.active")
-                  : ""
+                  : (data.item.active ? $t("views.validator_detail.active") : "")
               }}</template>
             </b-table>
           </template>
@@ -163,25 +161,26 @@ export default class ValidatorList extends Vue {
   validatorFields: any[] = []
 
   created() {
-    this.validatorFields = [{ key: "name", sortable: true, label: this.$t("views.validator_list.name") },
-    { key: "active", sortable: true, label: this.$t("views.validator_detail.active") },
-    //  { key: "recentlyMissedBlocks", sortable: true, label: "Recently missed blocks" },
-    {
-      key: "totalStaked",
-      sortable: true,
-      label: this.$t("components.modals.faucet_redelegate_modal.total_stake"),
-      formatter: (value) => formatTokenAmount(value, 18, 0),
-      thClass: "align-center-th",
-      tdClass: "align-right-td",
-    },
-    {
-      key: "fee",
-      sortable: true,
-      label: this.$t("components.validator_extended_detail.fee"),
-      formatter: (value) => value + "%",
-      thClass: "align-center-th",
-      tdClass: "align-right-td",
-    },
+    this.validatorFields = [
+      { key: "name", sortable: true, label: this.$t("views.validator_list.name") },
+      { key: "state", sortable: true, label: this.$t("views.validator_detail.state") },
+      //  { key: "recentlyMissedBlocks", sortable: true, label: "Recently missed blocks" },
+      {
+        key: "totalStaked",
+        sortable: true,
+        label: this.$t("components.modals.faucet_redelegate_modal.total_stake"),
+        formatter: (value) => formatTokenAmount(value, 18, 0),
+        thClass: "align-center-th",
+        tdClass: "align-right-td",
+      },
+      {
+        key: "fee",
+        sortable: true,
+        label: this.$t("components.validator_extended_detail.fee"),
+        formatter: (value) => value + "%",
+        thClass: "align-center-th",
+        tdClass: "align-right-td",
+      },
     ]
   }