diff --git a/src/components/BallotKeysCard.jsx b/src/components/BallotKeysCard.jsx index 281ca4b..22b8e44 100644 --- a/src/components/BallotKeysCard.jsx +++ b/src/components/BallotKeysCard.jsx @@ -359,7 +359,7 @@ export class BallotKeysCard extends React.Component {
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore
+{constants.CARD_FINALIZE_DESCRIPTION}
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Affected key address of validator to vote for. Example: 0xc70760D23557A4FDE612C0bE63b26EBD023C51Ee.
@@ -29,11 +29,11 @@ export class BallotKeysMetadata extends React.Component { onChange={e => ballotStore.changeBallotMetadata(e, "miningKey", "ballotKeys")} />- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Mining key address of validator to vote for. Example: 0xc70760D23557A4FDE612C0bE63b26EBD023C51Ee.
-- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Ballot's end time.
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore
+{constants.CARD_FINALIZE_DESCRIPTION}
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Proposed value of the minimum threshold for keys ballot consensus.
@@ -29,7 +29,7 @@ export class BallotMinThresholdMetadata extends React.Component { onChange={e => ballotStore.changeBallotMetadata(e, "endTime")} />- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Ballot's end time.
diff --git a/src/components/BallotProxyCard.jsx b/src/components/BallotProxyCard.jsx index 43e3191..f0d0a40 100644 --- a/src/components/BallotProxyCard.jsx +++ b/src/components/BallotProxyCard.jsx @@ -295,7 +295,7 @@ export class BallotProxyCard extends React.Component {Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore
+{constants.CARD_FINALIZE_DESCRIPTION}
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Proposed address of a new proxy contract.
@@ -39,7 +39,7 @@ export class BallotProxyMetadata extends React.Component { >- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Choose proxy contract type.
@@ -51,7 +51,7 @@ export class BallotProxyMetadata extends React.Component { onChange={e => ballotStore.changeBallotMetadata(e, "endTime")} />- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Ballot's end time.
diff --git a/src/components/KeysTypes.jsx b/src/components/KeysTypes.jsx index a7cc20b..2414c50 100644 --- a/src/components/KeysTypes.jsx +++ b/src/components/KeysTypes.jsx @@ -17,7 +17,7 @@ export class KeysTypes extends React.Component { />- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Add new key.
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Remove existing key.
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Remove existing key and add new key.
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Mining key type.
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Payout key type.
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Voting key type.
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do - eiusmod tempor incididunt ut labore + Ballot to add, remove or swap any type of key for existing or new validators.
@@ -234,8 +233,7 @@ export class NewBallot extends React.Component { />- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do - eiusmod tempor incididunt ut labore + Ballot to change the minimum threshold for consensus to vote for keys.
@@ -248,8 +246,7 @@ export class NewBallot extends React.Component { />- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do - eiusmod tempor incididunt ut labore + Ballot to change one of the proxy contracts.
diff --git a/src/components/Validator.jsx b/src/components/Validator.jsx index 0728f7c..b814013 100644 --- a/src/components/Validator.jsx +++ b/src/components/Validator.jsx @@ -18,7 +18,7 @@ export class Validator extends React.Component { onChange={e => validatorStore.changeValidatorMetadata(e, "fullName")} />- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Proposed validator's full name. Example: Jefferson L. Flowers.
@@ -30,7 +30,7 @@ export class Validator extends React.Component { onChange={e => validatorStore.changeValidatorMetadata(e, "address")} />- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Proposed validator's registration address. Example: 110 Wall St., New York.
@@ -96,7 +96,7 @@ export class Validator extends React.Component { >- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Proposed validator's US state. Example: New York.
@@ -108,7 +108,7 @@ export class Validator extends React.Component { onChange={e => validatorStore.changeValidatorMetadata(e, "zipCode")} />- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Proposed validator's postal code. Example: 10005.
@@ -120,7 +120,7 @@ export class Validator extends React.Component { onChange={e => validatorStore.changeValidatorMetadata(e, "licenseID")} />- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + Proposed validator's notary license ID. Example: 191947.
@@ -132,7 +132,7 @@ export class Validator extends React.Component { onChange={e => validatorStore.changeValidatorMetadata(e, "licenseExpiration")} />- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod + When proposed validator's notary license is expired. Example: 11/10/2021.
diff --git a/src/constants.js b/src/constants.js index b4c6795..142969c 100644 --- a/src/constants.js +++ b/src/constants.js @@ -16,6 +16,7 @@ Check POA Network wi constants.WRONG_NETWORK_MSG = `You aren't connected to POA Network. Please, switch on POA plugin and refresh the page. Check POA Network wiki for more info.`; +constants.CARD_FINALIZE_DESCRIPTION = "Finalization is available after ballot time is finished"; module.exports = { constants } \ No newline at end of file diff --git a/src/contracts/addresses.js b/src/contracts/addresses.js index 120ca36..71b7df2 100644 --- a/src/contracts/addresses.js +++ b/src/contracts/addresses.js @@ -1,9 +1,9 @@ module.exports = { - KEYS_MANAGER_ADDRESS: '0xfc90125492e58dbfe80c0bfb6a2a759c4f703ca8', - VOTING_TO_CHANGE_KEYS_ADDRESS: '0x49df4ec19243263e5db22da5865b4f482b8323a0', - VOTING_TO_CHANGE_MIN_THRESHOLD: '0x8829ebe113535826e8af17ed51f83755f675789a', - VOTING_TO_CHANGE_PROXY: '0x6b728399b41a38d4109f7af2213d4cc31ca87812', - METADATA_ADDRESS: '0xcBB2912666c7e8023B7ec78B6842702eB26336aC', - POA_ADDRESS: '0x8bf38d4764929064f2d4d3a56520a76ab3df415b', - BALLOTS_STORAGE_ADDRESS: '0x0d7590c7aedf1e7e85fc9a1ee88f6f17d3ba762f' + KEYS_MANAGER_ADDRESS: '0x0e4a78ba651fcf2058e1326e16fc9160553ca467', + VOTING_TO_CHANGE_KEYS_ADDRESS: '0x534165101c5eec16c4a18102b98b8a903644e513', + VOTING_TO_CHANGE_MIN_THRESHOLD: '0xf7ee04d7e85ecf98ad62f96b0a40ab82de1eb0e3', + VOTING_TO_CHANGE_PROXY: '0x13d3c35d9947d77c677a648b9916998c4393622f', + METADATA_ADDRESS: '0x1ada723e24f414a72bac6a127f4b2a8d91dfec38', + POA_ADDRESS: '0xf472e0e43570b9afaab67089615080cf7c20018d', + BALLOTS_STORAGE_ADDRESS: '0x886cc61ef0ec40300378104eb547c2e86117b819' } \ No newline at end of file diff --git a/src/stores/BallotStore.js b/src/stores/BallotStore.js index 0d2cbc6..fa74247 100644 --- a/src/stores/BallotStore.js +++ b/src/stores/BallotStore.js @@ -39,7 +39,7 @@ class BallotStore { this.ballotKeys = { keyType: this.KeyType.mining, keysBallotType: this.KeysBallotType.add, - memo: "", + //memo: "", affectedKey: "", miningKey: "" };