neptune/ghost-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Voting dialog overhaul (#2653)

Browse Source
This commit is contained in:
Jaco Greeff 2020-04-28 23:03:32 +02:00 committed by GitHub
parent 19d20bdff8
commit 2c2816475b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
packages/page-democracy/src/Overview/Voting.tsx
View File

@ -70,32 +70,54 @@ function Voting ({ proposal, referendumId }: Props): React.ReactElement<Props> |
{isVotingOpen && (
<Modal
header={t('Vote on proposal')}
size='small'
size='large'
>
<Modal.Content>
<ProposedAction
idNumber={referendumId}
proposal={proposal}
/>
<VoteAccount onChange={setAccountId} />
{isCurrentVote && (
<VoteValue
accountId={accountId}
autoFocus
onChange={setBalance}
/>
)}
<Dropdown
help={t('The conviction to use for this vote, with an appropriate lock period.')}
label={t('conviction')}
onChange={setConviction}
options={convictionOpts}
value={conviction}
/>
<VoteToggle
onChange={_onChangeVote}
value={aye}
/>
<Modal.Columns>
<Modal.Column>
<VoteAccount onChange={setAccountId} />
</Modal.Column>
<Modal.Column>
<p>{t('The vote will be recorded for this account. If another account delegated to this one, the delegated votes will also be counted.')}</p>
</Modal.Column>
</Modal.Columns>
<Modal.Columns>
<Modal.Column>
{isCurrentVote && (
<VoteValue
accountId={accountId}
autoFocus
onChange={setBalance}
/>
)}
<Dropdown
help={t('The conviction to use for this vote, with an appropriate lock period.')}
label={t('conviction')}
onChange={setConviction}
options={convictionOpts}
value={conviction}
/>
</Modal.Column>
<Modal.Column>
<p>{t('The balance associated with the vote will be locked as per the conviction specified nd will not be available for transfer or spend during this period.')}</p>
<p>{t('Conviction locks do overlap and is additive, meaning that funds locked during a previous vote can be locked again.')}</p>
</Modal.Column>
</Modal.Columns>
<Modal.Columns>
<Modal.Column>
<VoteToggle
onChange={_onChangeVote}
value={aye}
/>
</Modal.Column>
<Modal.Column>
<p>{t('Register the vote for or against the proposal.')}</p>
</Modal.Column>
</Modal.Columns>
</Modal.Content>
<VoteActions
accountId={accountId}

20
packages/react-components/src/InputNumber.tsx
View File

@ -173,11 +173,16 @@ function InputNumber ({ bitLength = DEFAULT_BITLENGTH, className, defaultValue =
onChange && onChange(valueBn);
}, [onChange, valueBn]);
const _onChange = useCallback(
(input: string) => setValues(
const _onChangeWithSi = useCallback(
(input: string, si: SiDef | null) => setValues(
getValuesFromString(input, si, bitLength, isZeroable, maxValue)
),
[bitLength, isZeroable, maxValue, si]
[bitLength, isZeroable, maxValue]
);
const _onChange = useCallback(
(input: string) => _onChangeWithSi(input, si),
[_onChangeWithSi, si]
);
const _onKeyDown = useCallback(
@ -221,8 +226,13 @@ function InputNumber ({ bitLength = DEFAULT_BITLENGTH, className, defaultValue =
);
const _onSelectSiUnit = useCallback(
(siUnit: string) => setSi(formatBalance.findSi(siUnit)),
[]
(siUnit: string): void => {
const si = formatBalance.findSi(siUnit);
setSi(si);
_onChangeWithSi(value, si);
},
[_onChangeWithSi, value]
);
const maxValueLength = getGlobalMaxValue(bitLength).toString().length - 1;