diff --git a/packages/apps/public/locales/en/app-council.json b/packages/apps/public/locales/en/app-council.json index d549d10cfc..baad5e7692 100644 --- a/packages/apps/public/locales/en/app-council.json +++ b/packages/apps/public/locales/en/app-council.json @@ -4,6 +4,7 @@ "Close proposal": "Close proposal", "Council overview": "Council overview", "Current prime member, default voting": "Current prime member, default voting", + "In calculating the election outcome, this prioitized vote ordering will be used to determine the final score for the candidates.": "In calculating the election outcome, this prioitized vote ordering will be used to determine the final score for the candidates.", "Motions ({{count}})": "Motions ({{count}})", "No candidates found": "No candidates found", "No council motions": "No council motions", @@ -28,6 +29,10 @@ "The preimage hash of the proposal": "The preimage hash of the proposal", "The proposal that will be affected. Once closed for the current voting round, it would need to be re-submitted to council for a subsequent voting round.": "The proposal that will be affected. Once closed for the current voting round, it would need to be re-submitted to council for a subsequent voting round.", "The unapplied slashed era to cancel.": "The unapplied slashed era to cancel.", + "The value associated with this vote. The amount will be locked (not available for transfer) and used in all subsequent elections.": "The value associated with this vote. The amount will be locked (not available for transfer) and used in all subsequent elections.", + "The vote will be recorded for the selected account.": "The vote will be recorded for the selected account.", + "The votes for the members, runner-ups and candidates. These should be ordered based on your priority.": "The votes for the members, runner-ups and candidates. These should be ordered based on your priority.", + "This account will appear in the list of candidates. With enough votes in an election, it will become either a runner-up or a council member.": "This account will appear in the list of candidates. With enough votes in an election, it will become either a runner-up or a council member.", "This account will be use to approve each candidate.": "This account will be use to approve each candidate.", "Vote": "Vote", "Vote for current candidates": "Vote for current candidates", diff --git a/packages/apps/public/locales/en/app-democracy.json b/packages/apps/public/locales/en/app-democracy.json index 79ff36de8d..f64ba01747 100644 --- a/packages/apps/public/locales/en/app-democracy.json +++ b/packages/apps/public/locales/en/app-democracy.json @@ -4,6 +4,7 @@ "Democracy overview": "Democracy overview", "Fast track": "Fast track", "Fast track proposal": "Fast track proposal", + "If this proposal is passed, the changes will be applied via dispatch and the deposit returned.": "If this proposal is passed, the changes will be applied via dispatch and the deposit returned.", "No active proposals": "No active proposals", "No active referendums": "No active referendums", "No external proposal": "No external proposal", @@ -13,6 +14,7 @@ "Register the vote for or against the proposal.": "Register the vote for or against the proposal.", "Second": "Second", "Second proposal": "Second proposal", + "Seconding a proposal that indicates your backing for the proposal. Proposals with greater interest moves up the queue for potential next referendums.": "Seconding a proposal that indicates your backing for the proposal. Proposals with greater interest moves up the queue for potential next referendums.", "Seconding in a pre-approval that indicates your backing for the proposal. Proposal with greater interest moves up the queue for potential next referendums.": "Seconding in a pre-approval that indicates your backing for the proposal. Proposal with greater interest moves up the queue for potential next referendums.", "Seconds ({{count}})": "Seconds ({{count}})", "Select the account you wish to make the proposal with.": "Select the account you wish to make the proposal with.", @@ -34,6 +36,7 @@ "The locked value for this proposal": "The locked value for this proposal", "The minimum deposit required": "The minimum deposit required", "The preimage hash of the proposal": "The preimage hash of the proposal", + "The proposal is in the queue for future referendums. One proposal from this list will move forward to voting.": "The proposal is in the queue for future referendums. One proposal from this list will move forward to voting.", "The proposal will be registered from this account and the balance lock will be applied here.": "The proposal will be registered from this account and the balance lock will be applied here.", "The referendum info that is voted upon. If passed, the changed will be applied via dispatch and the deposit returned.": "The referendum info that is voted upon. If passed, the changed will be applied via dispatch and the deposit returned.", "The vote will be recorded for this account. If another account delegated to this one, the delegated votes will also be counted.": "The vote will be recorded for this account. If another account delegated to this one, the delegated votes will also be counted.", diff --git a/packages/apps/public/locales/en/app-toolbox.json b/packages/apps/public/locales/en/app-toolbox.json index 4d304b56ce..94784d0f53 100644 --- a/packages/apps/public/locales/en/app-toolbox.json +++ b/packages/apps/public/locales/en/app-toolbox.json @@ -15,11 +15,14 @@ "The input data to hash. This can be either specified as a hex value (0x-prefix) or as a string.": "The input data to hash. This can be either specified as a hex value (0x-prefix) or as a string.", "The input data to sign. This can be either specified as a hex value (0x-prefix) or as a string.": "The input data to sign. This can be either specified as a hex value (0x-prefix) or as a string.", "The resulting signature of the input data, as done with the crypto algorithm from the account. (This could be non-deterministic for some types such as sr25519).": "The resulting signature of the input data, as done with the crypto algorithm from the account. (This could be non-deterministic for some types such as sr25519).", + "The selected account to be unlocked.": "The selected account to be unlocked.", "The signature as by the account being checked, supplied as a hex-formatted string.": "The signature as by the account being checked, supplied as a hex-formatted string.", + "This account that will perform the message signing.": "This account that will perform the message signing.", "This external account cannot be used to sign data. Only Limited support is currently available for signing from any non-internal accounts.": "This external account cannot be used to sign data. Only Limited support is currently available for signing from any non-internal accounts.", "This injected account cannot be used to sign data since the extension does not support raw signing.": "This injected account cannot be used to sign data since the extension does not support raw signing.", "Unlock": "Unlock", "Unlock account": "Unlock account", + "Unlock the account for signing. Once active the signature will be generated based on the content provided.": "Unlock the account for signing. Once active the signature will be generated based on the content provided.", "Verify signature": "Verify signature", "Yes": "Yes", "You are about to unlock your account to allow for the signing of messages. Once active the signature will be generated based on the content provided.": "You are about to unlock your account to allow for the signing of messages. Once active the signature will be generated based on the content provided.", diff --git a/packages/apps/public/locales/en/translation.json b/packages/apps/public/locales/en/translation.json index 6f518a5e84..11b7432927 100644 --- a/packages/apps/public/locales/en/translation.json +++ b/packages/apps/public/locales/en/translation.json @@ -159,7 +159,9 @@ "Hash data": "", "I'm Online": "", "If the recipient account is new, the balance needs to be more than the existential deposit. Likewise if the sending account balance drops below the same value, the account will be removed from the state.": "", + "If this proposal is passed, the changes will be applied via dispatch and the deposit returned.": "", "Important notice": "", + "In calculating the election outcome, this prioitized vote ordering will be used to determine the final score for the candidates.": "", "Inactive nominations ({{count}})": "", "Include an optional tip for faster processing": "", "Initializing connection": "", @@ -326,6 +328,7 @@ "Search for": "", "Second": "", "Second proposal": "", + "Seconding a proposal that indicates your backing for the proposal. Proposals with greater interest moves up the queue for potential next referendums.": "", "Seconding in a pre-approval that indicates your backing for the proposal. Proposal with greater interest moves up the queue for potential next referendums.": "", "Seconds ({{count}})": "", "Select Network": "", @@ -496,6 +499,7 @@ "The percentage reward (0-100) that should be applied for the validator": "", "The preimage hash of the proposal": "", "The private key for your account is derived from this seed. This seed must be kept secret as anyone in its possession has access to the funds of this account. If you validate, use the seed of the session account as the \"--key\" parameter of your node.": "", + "The proposal is in the queue for future referendums. One proposal from this list will move forward to voting.": "", "The proposal that will be affected. Once closed for the current voting round, it would need to be re-submitted to council for a subsequent voting round.": "", "The proposal will be registered from this account and the balance lock will be applied here.": "", "The reason why this tip should be paid.": "", @@ -503,6 +507,7 @@ "The resulting signature of the input data, as done with the crypto algorithm from the account. (This could be non-deterministic for some types such as sr25519).": "", "The scheduling preference for this parachain.": "", "The scheduling setting for this parachain.": "", + "The selected account to be unlocked.": "", "The selected account to perform the derivation on.": "", "The selected validators to nominate, either via the \"currently best algorithm\" or via a manual selection.": "", "The sending account that will be used to send this transaction. Any applicable fees will be paid by this account.": "", @@ -523,14 +528,19 @@ "The twitter name for this identity.": "", "The type of council proposal to submit.": "", "The unapplied slashed era to cancel.": "", + "The value associated with this vote. The amount will be locked (not available for transfer) and used in all subsequent elections.": "", "The value is not in a valid address format": "", "The value is the amount that is being asked for and that will be allocated to the beneficiary if the proposal is approved.": "", + "The vote will be recorded for the selected account.": "", "The vote will be recorded for this account. If another account delegated to this one, the delegated votes will also be counted.": "", + "The votes for the members, runner-ups and candidates. These should be ordered based on your priority.": "", "The voting period to apply in blocks": "", "There are no registered parachains": "", "There is currently an ongoing election for new validator candidates. As such staking operations are not permitted.": "", "Think of the stash as your cold wallet and the controller as your hot wallet. Funding operations are controlled by the stash, any other non-funding actions by the controller itself.": "", "This account is recoverable, with the following friends:": "", + "This account that will perform the message signing.": "", + "This account will appear in the list of candidates. With enough votes in an election, it will become either a runner-up or a council member.": "", "This account will be use to approve each candidate.": "", "This account will make the proposal and be responsible for the bond.": "", "This account will pay the fees for the preimage, based on the size thereof.": "", @@ -569,6 +579,7 @@ "Unknown Owner": "", "Unlock": "", "Unlock account": "", + "Unlock the account for signing. Once active the signature will be generated based on the content provided.": "", "Unlock the sending account to allow signing of this transaction.": "", "Update metadata": "", "Upload": "", diff --git a/packages/page-contracts/src/Codes/Upload.tsx b/packages/page-contracts/src/Codes/Upload.tsx index 30d44d5963..b03a0b58e4 100644 --- a/packages/page-contracts/src/Codes/Upload.tsx +++ b/packages/page-contracts/src/Codes/Upload.tsx @@ -15,7 +15,7 @@ import { compactAddLength } from '@polkadot/util'; import ContractModal, { ContractModalProps, ContractModalState } from '../Modal'; import store from '../store'; import translate from '../translate'; -import { GAS_LIMIT } from '../constants'; +import { DEFAULT_GAS_LIMIT } from '../constants'; interface Props extends ContractModalProps, ApiProps {} @@ -36,7 +36,7 @@ class Upload extends ContractModal { this.defaultState = { ...this.defaultState, - gasLimit: new BN(GAS_LIMIT), + gasLimit: new BN(DEFAULT_GAS_LIMIT), isGasLimit: api.tx.contracts.putCode.meta.args.length === 2, isWasmValid: false, wasm: null diff --git a/packages/page-contracts/src/Contracts/Call.tsx b/packages/page-contracts/src/Contracts/Call.tsx index 74a1b6997e..1055fcfcc0 100644 --- a/packages/page-contracts/src/Contracts/Call.tsx +++ b/packages/page-contracts/src/Contracts/Call.tsx @@ -17,7 +17,7 @@ import Params from '../Params'; import Outcome from './Outcome'; import { useTranslation } from '../translate'; -import { GAS_LIMIT } from '../constants'; +import { DEFAULT_GAS_LIMIT } from '../constants'; import { getCallMessageOptions } from './util'; interface Props extends BareProps { @@ -37,7 +37,7 @@ function Call (props: Props): React.ReactElement | null { const [accountId, setAccountId] = useState(null); const [endowment, setEndowment] = useState(new BN(0)); - const [gasLimit, setGasLimit] = useState(new BN(GAS_LIMIT)); + const [gasLimit, setGasLimit] = useState(new BN(DEFAULT_GAS_LIMIT)); const [isBusy, setIsBusy] = useState(false); const [outcomes, setOutcomes] = useState([]); const [params, setParams] = useState(callMessage ? callMessage.def.args.map(({ type }): any => createValue({ type })) : []); @@ -172,7 +172,7 @@ function Call (props: Props): React.ReactElement | null { value={endowment} /> { constructOptions: [], constructorIndex: -1, endowment: new BN(ENDOWMENT), - gasLimit: new BN(GAS_LIMIT), + gasLimit: new BN(DEFAULT_GAS_LIMIT), isHashValid: false, params: [], ...Deploy.getCodeState(props.codeHash) diff --git a/packages/page-contracts/src/constants.ts b/packages/page-contracts/src/constants.ts index dd2f7761d2..43ab72ee5e 100644 --- a/packages/page-contracts/src/constants.ts +++ b/packages/page-contracts/src/constants.ts @@ -3,7 +3,9 @@ // of the Apache-2.0 license. See the LICENSE file for details. export const ENDOWMENT = 1000; -export const GAS_LIMIT = 500000; + +export const DEFAULT_GAS_LIMIT = '500000'; + export const CONTRACT_NULL = { abi: null, address: null diff --git a/packages/page-council/src/Overview/SubmitCandidacy.tsx b/packages/page-council/src/Overview/SubmitCandidacy.tsx index 02872bf164..00d4e099df 100644 --- a/packages/page-council/src/Overview/SubmitCandidacy.tsx +++ b/packages/page-council/src/Overview/SubmitCandidacy.tsx @@ -20,14 +20,22 @@ function SubmitCandidacy (): React.ReactElement { - + + + + + +

{t('This account will appear in the list of candidates. With enough votes in an election, it will become either a runner-up or a council member.')}

+ + { setAvailable( members .map(([accountId]): string => accountId.toString()) - .concat(runnersUp.map(([accountId]): string => accountId.toString())) - .concat(candidates.map((accountId): string => accountId.toString())) + .concat(runnersUp.map(([accountId]) => accountId.toString())) + .concat(candidates.map((accountId) => accountId.toString())) ); } }, [electionsInfo]); @@ -60,27 +60,52 @@ function Vote ({ electionsInfo }: Props): React.ReactElement { onClick={toggleVisible} /> {isVisible && ( - + - - - + + + + + +

{t('The vote will be recorded for the selected account.')}

+ + + + + + + +

{t('The value associated with this vote. The amount will be locked (not available for transfer) and used in all subsequent elections.')}

+ + + + + + + +

{t('The votes for the members, runner-ups and candidates. These should be ordered based on your priority.')}

+

{t('In calculating the election outcome, this prioitized vote ordering will be used to determine the final score for the candidates.')}

+ + - + + + + + +

{t('The proposal is in the queue for future referendums. One proposal from this list will move forward to voting.')}

+ + -

{t('Seconding in a pre-approval that indicates your backing for the proposal. Proposal with greater interest moves up the queue for potential next referendums.')}

+

{t('Seconding a proposal that indicates your backing for the proposal. Proposals with greater interest moves up the queue for potential next referendums.')}

 diff --git a/packages/page-democracy/src/Overview/Voting.tsx b/packages/page-democracy/src/Overview/Voting.tsx index 45b2bf9ad6..ee840feb2a 100644 --- a/packages/page-democracy/src/Overview/Voting.tsx +++ b/packages/page-democracy/src/Overview/Voting.tsx @@ -81,7 +81,7 @@ function Voting ({ proposal, referendumId }: Props): React.ReactElement | /> -

{t('The referendum info that is voted upon. If passed, the changed will be applied via dispatch and the deposit returned.')}

+

{t('If this proposal is passed, the changes will be applied via dispatch and the deposit returned.')}

 diff --git a/packages/page-parachains/src/Overview/Register.tsx b/packages/page-parachains/src/Overview/Register.tsx index e3eaf73a7a..2918f16235 100644 --- a/packages/page-parachains/src/Overview/Register.tsx +++ b/packages/page-parachains/src/Overview/Register.tsx @@ -93,7 +93,7 @@ function Register ({ nextFreeId = ONE_THOUSAND, sudoKey }: Props): React.ReactEl > diff --git a/packages/page-toolbox/src/Unlock.tsx b/packages/page-toolbox/src/Unlock.tsx index 14cb586fc1..2de5ba2274 100644 --- a/packages/page-toolbox/src/Unlock.tsx +++ b/packages/page-toolbox/src/Unlock.tsx @@ -5,7 +5,7 @@ import { KeyringPair } from '@polkadot/keyring/types'; import React, { useCallback, useEffect, useState } from 'react'; -import { AddressRow, Button, Modal, Password } from '@polkadot/react-components'; +import { Button, InputAddress, Modal, Password } from '@polkadot/react-components'; import { useTranslation } from './translate'; @@ -54,14 +54,24 @@ function Unlock ({ onClose, onUnlock, pair }: Props): React.ReactElement - -

{t('You are about to unlock your account to allow for the signing of messages. Once active the signature will be generated based on the content provided.')}

-
+ + + + + +

{t('This account that will perform the message signing.')}

+ + + + onEnter={_onUnlock} value={password} /> -
- + + +

{t('Unlock the account for signing. Once active the signature will be generated based on the content provided.')}

+ +