diff --git a/src/assets/App.css b/src/assets/App.css index 5c7b4b1..ee4c54d 100644 --- a/src/assets/App.css +++ b/src/assets/App.css @@ -724,15 +724,15 @@ textarea { display: table-row; width: 100% !important; } } .ballots-about-i_name { - width: 25%; } + width: 20%; } .ballots-about-i_action { - width: 15%; } + width: 10%; } .ballots-about-i_type { - width: 15%; } + width: 10%; } .ballots-about-i_proposal { width: 30%; } .ballots-about-i_mining-key { - width: 30%; + width: 25%; word-break: break-all; } .ballots-about-i_proposed-min-threshold { width: 60%; @@ -744,7 +744,7 @@ textarea { width: 30%; word-break: break-all; } .ballots-about-i_time { - width: 15%; + width: 10%; text-align: right; } @media screen and (max-width: 768px) { .ballots-about-i_time { diff --git a/src/assets/stylesheets/ballots/about.scss b/src/assets/stylesheets/ballots/about.scss index 9c70b90..db72a47 100644 --- a/src/assets/stylesheets/ballots/about.scss +++ b/src/assets/stylesheets/ballots/about.scss @@ -32,15 +32,15 @@ } &_name { - width: 25%; + width: 20%; } &_action { - width: 15%; + width: 10%; } - +// 25 &_type { - width: 15%; + width: 10%; } &_proposal { @@ -48,7 +48,7 @@ } &_mining-key { - width: 30%; + width: 25%; word-break: break-all; } @@ -68,7 +68,7 @@ } &_time { - width: 15%; + width: 10%; text-align: right; @media screen and (max-width: $tablet-width) { diff --git a/src/components/BallotCard.jsx b/src/components/BallotCard.jsx index 36a22a9..237bd13 100644 --- a/src/components/BallotCard.jsx +++ b/src/components/BallotCard.jsx @@ -338,7 +338,7 @@ export class BallotCard extends React.Component {
Name
+Proposer
{this.creator}
diff --git a/src/components/BallotKeysCard.jsx b/src/components/BallotKeysCard.jsx index 0de4213..c81ac11 100644 --- a/src/components/BallotKeysCard.jsx +++ b/src/components/BallotKeysCard.jsx @@ -11,6 +11,7 @@ export class BallotKeysCard extends React.Component { @observable affectedKeyTypeDisplayName; @observable ballotType; @observable ballotTypeDisplayName; + @observable miningKey; @action("Get ballotTypeDisplayName") getBallotTypeDisplayName(ballotType) { @@ -73,12 +74,20 @@ export class BallotKeysCard extends React.Component { let affectedKey = await contractsStore.votingToChangeKeys.getAffectedKey(id); this.affectedKey = affectedKey; } + @action("Get mining key of keys ballot") + getMiningKey = async () => { + const { contractsStore, id } = this.props; + let miningKey = await contractsStore.votingToChangeKeys.getMiningKey(id); + const metadata = await contractsStore.getValidatorMetadata(miningKey) + this.miningKey = `${metadata.lastName} ${miningKey}`; + } constructor(props) { super(props); this.getAffectedKey(); this.getAffectedKeyType(); this.getBallotType(); + this.getMiningKey(); } isSearchPattern = () => { @@ -120,6 +129,14 @@ export class BallotKeysCard extends React.Component {{this.affectedKey}
Validator key
+{this.miningKey}
+