Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop -> Staging #1480

Merged
merged 2 commits into from
Jul 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/dpos/components/ElectionTimer.vue
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
45 changes: 22 additions & 23 deletions src/dpos/views/ValidatorList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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",
},
]
}

Expand Down
2 changes: 1 addition & 1 deletion src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/locales/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/locales/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
"validator_list": {
"no_validators_available_please_try": "대시보드 노드를 연결하는 중 오류가 발생했습니다. 나중에 다시 확인해주세요.",
"validators": "검증자",
"next_election_in": "다음 선거 주기까지 남은 시간:",
"next_election_in": "다음 선거 주기까지 남은 시간",
"total_staked_amount": "총 스테이킹 금액",
"stake": "스테이킹",
"name": "이름"
Expand Down
2 changes: 1 addition & 1 deletion src/locales/th.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
"validator_list": {
"no_validators_available_please_try": "连接到管理面板节点时出错。请稍后再查看。",
"validators": "验证者",
"next_election_in": "下一轮选举倒计时",
"next_election_in": "下一轮选举倒计时",
"total_staked_amount": "锁定总量",
"stake": "锁定",
"name": "名字"
Expand Down
Loading