poanetwork
/
poa-dapps-voting
mirror of https://github.com/poanetwork/poa-dapps-voting.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

(Fix) Optimized ballot card

This commit is contained in:
Vadim Arasev 2018-06-19 12:56:54 +03:00
parent 61dc67ce2b
commit f2957e42e0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/BallotCard.jsx
View File

@ -52,7 +52,8 @@ export class BallotCard extends React.Component {
} }
const { contractsStore, votingType } = this.props; const { contractsStore, votingType } = this.props;
let description = 'Finalization is available after ballot time is finished'; let description = 'Finalization is available after ballot time is finished';
if (this.getContract(contractsStore, votingType).doesMethodExist('canBeFinalizedNow')) { //if (this.getContract(contractsStore, votingType).doesMethodExist('canBeFinalizedNow')) {
if (this.canBeFinalized !== null) {
description += ' or all validators are voted'; description += ' or all validators are voted';
} }
return description; return description;

6
src/components/BallotKeysCard.jsx
View File

@ -60,12 +60,18 @@ export class BallotKeysCard extends React.Component {
if (votingState.hasOwnProperty('newVotingKey')) { if (votingState.hasOwnProperty('newVotingKey')) {
this.newVotingKey = votingState.newVotingKey; this.newVotingKey = votingState.newVotingKey;
if (this.newVotingKey === "0x0000000000000000000000000000000000000000") {
this.newVotingKey = "";
}
} else { } else {
this.getNewVotingKey(); this.getNewVotingKey();
} }
if (votingState.hasOwnProperty('newPayoutKey')) { if (votingState.hasOwnProperty('newPayoutKey')) {
this.newPayoutKey = votingState.newPayoutKey; this.newPayoutKey = votingState.newPayoutKey;
if (this.newPayoutKey === "0x0000000000000000000000000000000000000000") {
this.newPayoutKey = "";
}
} else { } else {
this.getNewPayoutKey(); this.getNewPayoutKey();
} }