Skip to content

Filter signatories based on outstanding approvals #2901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacogr merged 1 commit into from
Jun 8, 2020
Merged

Filter signatories based on outstanding approvals #2901

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions packages/react-signer/src/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ interface State {
signedTx?: string;
tip?: BN;
unlockError?: string | null;
whoFiltered: string[] | null;
}

interface AccountFlags {
Expand Down Expand Up @@ -133,7 +134,8 @@ const initialState: State = {
qrPayload: new Uint8Array(),
showTip: false,
signedTx: '',
unlockError: null
unlockError: null,
whoFiltered: null
};

class Signer extends React.PureComponent<Props, State> {
Expand Down Expand Up @@ -164,13 +166,13 @@ class Signer extends React.PureComponent<Props, State> {
isSendable,
...(isSame
? { multiCall, password, unlockError }
: { multiCall: false, password: '', signatory: null, unlockError: null }
: { multiCall: false, password: '', signatory: null, unlockError: null, whoFiltered: null }
)
};
}

public async componentDidUpdate (): Promise<void> {
const { accountNonce, currentItem, isSendable, isSubmit } = this.state;
const { accountNonce, currentItem, isSendable, isSubmit, whoFiltered } = this.state;

if (currentItem && currentItem.status === 'queued' && !(currentItem.extrinsic || currentItem.payload)) {
return this.sendRpc(currentItem);
Expand All @@ -181,7 +183,7 @@ class Signer extends React.PureComponent<Props, State> {
this.updateNonce().catch(console.error);
}

if (isSendable) {
if (isSendable && !whoFiltered) {
const { isMultisig } = extractExternal(currentItem.accountId);

if (isMultisig) {
Expand Down Expand Up @@ -316,7 +318,7 @@ class Signer extends React.PureComponent<Props, State> {

private renderSignatory (): React.ReactNode {
const { t } = this.props;
const { currentItem, multiCall } = this.state;
const { currentItem, multiCall, whoFiltered } = this.state;
const { isMultisig, who } = currentItem
? extractExternal(currentItem.accountId)
: { isMultisig: false, who: [] };
Expand All @@ -330,7 +332,7 @@ class Signer extends React.PureComponent<Props, State> {
<Modal.Columns>
<Modal.Column>
<InputAddress
filter={who}
filter={whoFiltered || who}
help={t<string>('The multisig signatory for this transaction.')}
label={t<string>('signatory')}
onChange={this.onChangeSignatory}
Expand Down Expand Up @@ -633,12 +635,15 @@ class Signer extends React.PureComponent<Props, State> {

if (currentItem?.accountId && currentItem?.extrinsic) {
const multiModule = api.tx.multisig ? 'multisig' : 'utility';
const { threshold } = extractExternal(currentItem.accountId);
const { threshold, who } = extractExternal(currentItem.accountId);
const optMulti = await api.query[multiModule].multisigs<Option<Multisig>>(currentItem.accountId, currentItem.extrinsic.method.hash);
const multi = optMulti.unwrapOr(null);

if (multi && ((multi.approvals.length + 1) >= threshold)) {
this.setState({ multiCall: true });
if (multi) {
this.setState({
multiCall: ((multi.approvals.length + 1) >= threshold),
whoFiltered: who.filter((w) => !multi.approvals.some((a) => a.eq(w)))
});
}
}
}
Expand Down