diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c834a3ee8..94f967812f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. * Updated PR template @fedekunze * [\#1454](https://github.com/cosmos/voyager/issues/1454) Updated a bunch of words to (hopefully) be clearer. @jbibla * [\#1473](https://github.com/cosmos/voyager/issues/1473) added "percent of vote" to validator in vuex module instead of in component @jbibla +* [\#1496](https://github.com/cosmos/voyager/issues/1496) display validator pub_key instead of operator_address on livalidator and validator profile @jbibla ### Fixed diff --git a/app/src/renderer/components/common/TmBalance.vue b/app/src/renderer/components/common/TmBalance.vue index 4a9513b132..49df84ee97 100644 --- a/app/src/renderer/components/common/TmBalance.vue +++ b/app/src/renderer/components/common/TmBalance.vue @@ -114,7 +114,6 @@ export default { .tabs display flex - margin-left 2rem margin-top 2rem .tab diff --git a/app/src/renderer/components/staking/LiValidator.vue b/app/src/renderer/components/staking/LiValidator.vue index afef40c42b..b8496f0650 100644 --- a/app/src/renderer/components/staking/LiValidator.vue +++ b/app/src/renderer/components/staking/LiValidator.vue @@ -2,10 +2,10 @@ li.li-validator(:class='styles') router-link(:to="{ name: 'validator', params: { validator: validator.id }}") .li-validator__value.name - span.validator-profile__status(v-bind:class="statusColor" v-tooltip.top="status") img.avatar(v-if="validator.keybase" :src="validator.keybase.avatarUrl" width="48" height="48") img.avatar(v-else src="~assets/images/validator-icon.svg" width="48" height="48") .vert + span.validator-profile__status(v-bind:class="statusColor" v-tooltip.top="status") .top {{ validator.description.moniker }} short-bech32(:address="validator.operator_address") .li-validator__value.your-votes @@ -137,6 +137,7 @@ export default { .li-validator margin 0.5rem 0rem 0.5rem 2rem + width 100% .li-validator a display flex @@ -209,7 +210,9 @@ export default { display flex flex-direction column color var(--bright) + margin-left 1rem padding-left 1rem + position relative .top padding-bottom 0.5rem @@ -217,6 +220,10 @@ export default { font-size 1rem font-weight 500 + .validator-profile__status + left 0 + top 5px + .bottom font-size sm line-height sm diff --git a/app/src/renderer/components/staking/PageStaking.vue b/app/src/renderer/components/staking/PageStaking.vue index e9fad5ab63..26f107736a 100644 --- a/app/src/renderer/components/staking/PageStaking.vue +++ b/app/src/renderer/components/staking/PageStaking.vue @@ -1,5 +1,5 @@ diff --git a/app/src/renderer/components/staking/TabMyDelegations.vue b/app/src/renderer/components/staking/TabMyDelegations.vue index 059f5303ca..69538c6757 100644 --- a/app/src/renderer/components/staking/TabMyDelegations.vue +++ b/app/src/renderer/components/staking/TabMyDelegations.vue @@ -61,6 +61,10 @@ export default { .info-button color var(--link) +.staking + .tm-data-msg + margin 1rem 0 0 2rem + .check-out-message background var(--app-fg) border 1px solid var(--bc-dim) diff --git a/test/unit/specs/components/staking/LiValidator.spec.js b/test/unit/specs/components/staking/LiValidator.spec.js index 021b7923d9..e0efecc20a 100644 --- a/test/unit/specs/components/staking/LiValidator.spec.js +++ b/test/unit/specs/components/staking/LiValidator.spec.js @@ -11,7 +11,7 @@ describe(`LiValidator`, () => { propsData: { validator: { id: `abc`, - pub_key: `12345`, + pub_key: `cosmosvalpub12345`, operator_address: lcdClientMock.validators[1], tokens: `190000000000`, delegator_shares: `190000000000`, diff --git a/test/unit/specs/components/staking/__snapshots__/LiValidator.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/LiValidator.spec.js.snap index d4ace5b3c6..9ac056767a 100644 --- a/test/unit/specs/components/staking/__snapshots__/LiValidator.spec.js.snap +++ b/test/unit/specs/components/staking/__snapshots__/LiValidator.spec.js.snap @@ -11,9 +11,6 @@ exports[`LiValidator has the expected html structure 1`] = `
- +
diff --git a/test/unit/specs/components/staking/__snapshots__/PageStaking.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/PageStaking.spec.js.snap index 4788f33ec3..3b69b1cc7d 100644 --- a/test/unit/specs/components/staking/__snapshots__/PageStaking.spec.js.snap +++ b/test/unit/specs/components/staking/__snapshots__/PageStaking.spec.js.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`PageStaking has the expected html structure 1`] = ` -"
+"
diff --git a/test/unit/specs/components/staking/__snapshots__/PageValidator.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/PageValidator.spec.js.snap index 629ba9c97a..0e8334edd7 100644 --- a/test/unit/specs/components/staking/__snapshots__/PageValidator.spec.js.snap +++ b/test/unit/specs/components/staking/__snapshots__/PageValidator.spec.js.snap @@ -922,7 +922,43 @@ exports[`PageValidator shows an error if the validator couldn't be found 1`] = ` class="tm-page-main" > - +
+
+ + sentiment_very_dissatisfied + +
+
+
+
+ Aw shucks! +
+
+
+
+ Even though you're connected a full node, we can't display this data for you right now. Please try again later or + + file a bug report + + . Apologies! +
+
+
+
`; diff --git a/test/unit/specs/components/staking/__snapshots__/PanelSort.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/PanelSort.spec.js.snap index 0076839134..706658b191 100644 --- a/test/unit/specs/components/staking/__snapshots__/PanelSort.spec.js.snap +++ b/test/unit/specs/components/staking/__snapshots__/PanelSort.spec.js.snap @@ -10,7 +10,15 @@ exports[`PanelSort has the expected html structure 1`] = `
- +
+
+ ID +
+
- -
+
+
+ Moniker +
+
+
@@ -56,8 +60,9 @@ exports[`TableValidators has the expected html structure 1`] = `
  • - +
    +
    good_greg
    @@ -97,8 +102,9 @@ exports[`TableValidators has the expected html structure 1`] = `
  • - +
    +
    herr_schmidt_revoked
    @@ -138,8 +144,9 @@ exports[`TableValidators has the expected html structure 1`] = `
  • - +
    +
    mr_mounty
    @@ -193,7 +200,15 @@ exports[`TableValidators should filter the delegates 1`] = `
    - +
    +
    + Moniker +
    +
    - +