Display events created via extrinsic submission (#582)

* Display events created via extrinsic submission

* Global democracy events
This commit is contained in:
Jaco Greeff 2019-01-10 15:58:40 +01:00 committed by GitHub
parent 3124b113b7
commit 1504b66eeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 86 additions and 42 deletions

View File

@ -124,7 +124,7 @@ class Backup extends React.PureComponent<Props, State> {
const json = keyring.backupAccount(pair, password);
const blob = new Blob([JSON.stringify(json)], { type: 'application/json; charset=utf-8' });
status.value = pair.address();
status.account = pair.address();
status.status = blob ? 'success' : 'error';
status.message = t('status.backup', {
defaultValue: 'account backed up'

View File

@ -141,7 +141,7 @@ class ChangePass extends React.PureComponent<Props, State> {
try {
keyring.encryptAccount(account, newPass);
status.value = account.address();
status.account = account.address();
status.status = 'success';
status.message = t('status.change-password', {
defaultValue: 'password changed'

View File

@ -370,7 +370,7 @@ class Creator extends React.PureComponent<Props, State> {
FileSaver.saveAs(blob, `${pair.address()}.json`);
status.value = pair.address();
status.account = pair.address();
status.status = pair ? 'success' : 'error';
status.message = t('status.created', {
defaultValue: `created account`

View File

@ -259,8 +259,8 @@ class Editor extends React.PureComponent<Props, State> {
}
const status = {
action: 'edit',
value: current.address()
account: current.address(),
action: 'edit'
} as ActionStatus;
try {
@ -340,8 +340,8 @@ class Editor extends React.PureComponent<Props, State> {
this.createState(null),
() => {
const status = {
action: 'forget',
value: current.address()
account: current.address(),
action: 'forget'
} as ActionStatus;
try {

View File

@ -152,7 +152,7 @@ class Restore extends React.PureComponent<Props, State> {
const pair = keyring.restoreAccount(json, password);
status.status = pair ? 'success' : 'error';
status.value = pair.address();
status.account = pair.address();
status.message = t('status.restored', {
defaultValue: 'account restored'
});

View File

@ -169,7 +169,7 @@ class Creator extends React.PureComponent<Props, State> {
try {
keyring.saveAddress(address, { name });
status.value = address;
status.account = address;
status.status = address ? 'success' : 'error';
status.message = t('status.created', {
defaultValue: 'address created'

View File

@ -193,8 +193,8 @@ class Editor extends React.PureComponent<Props, State> {
}
const status = {
action: 'edit',
value: current.address()
account: current.address(),
action: 'edit'
} as ActionStatus;
try {
@ -249,8 +249,8 @@ class Editor extends React.PureComponent<Props, State> {
this.createState(null),
() => {
const status = {
action: 'forget',
value: current.address()
account: current.address(),
action: 'forget'
} as ActionStatus;
try {

View File

@ -40,18 +40,31 @@ class Status extends React.PureComponent<Props> {
(query_system_events || []).forEach(({ event: { data, method, section } }) => {
if (section === 'balances' && method === 'Transfer') {
const recipient = data[1].toString();
const account = data[1].toString();
if (addresses.includes(recipient)) {
if (addresses.includes(account)) {
queueAction({
action: method,
status: 'received',
value: recipient,
message: t('transfer.received', {
account,
action: `${section}.${method}`,
status: 'event',
message: t('status.transfer', {
defaultValue: 'transfer received'
})
});
}
} else if (section === 'democracy') {
const index = data[0].toString();
queueAction({
action: `${section}.${method}`,
status: 'event',
message: t('status.democracy', {
defaultValue: 'update on #{{index}}',
replace: {
index
}
})
});
}
});
}

View File

@ -26,20 +26,20 @@ class CopyIcon extends React.PureComponent<CopyProps> {
);
}
private onCopy = (value: string): void => {
private onCopy = (account: string): void => {
const { onCopy, queueAction, t } = this.props;
if (onCopy) {
onCopy(value);
onCopy(account);
}
if (queueAction) {
queueAction({
account,
action: t('identicon.copy', {
defaultValue: 'clipboard'
}),
status: 'queued',
value: value,
message: t('identicon.copied', {
defaultValue: 'address copied'
})

View File

@ -11,6 +11,7 @@ import React from 'react';
import jsonrpc from '@polkadot/jsonrpc';
import { QueueProvider } from './Context';
import { SubmittableSendResult } from '@polkadot/api/types';
export type Props = BareProps & {
children: React.ReactNode
@ -86,10 +87,7 @@ export default class Queue extends React.Component<Props, State> {
setTimeout(() => {
this.setState(
(prevState: State): State => ({
stqueue: prevState.stqueue.map((item) => ({
...item,
isCompleted: item.isCompleted || item.id === id
}))
stqueue: prevState.stqueue.filter((item) => item.id !== id)
} as State)
);
}, REMOVE_TIMEOUT);
@ -97,7 +95,7 @@ export default class Queue extends React.Component<Props, State> {
return id;
}
queueSetTxStatus = (id: number, status: QueueTx$Status, result?: any, error?: Error): void => {
queueSetTxStatus = (id: number, status: QueueTx$Status, result?: SubmittableSendResult, error?: Error): void => {
this.setState(
(prevState: State): State => ({
txqueue: prevState.txqueue.map((item) =>
@ -119,13 +117,34 @@ export default class Queue extends React.Component<Props, State> {
} as State)
);
this.addResultEvents(result);
if (STATUS_COMPLETE.includes(status)) {
setTimeout(() => {
this.queueSetTxStatus(id, 'completed');
this.setState(
(prevState: State): State => ({
txqueue: prevState.txqueue.filter((item) => item.id !== id)
} as State)
);
}, REMOVE_TIMEOUT);
}
}
private addResultEvents ({ events = [] }: Partial<SubmittableSendResult> = {}) {
events.forEach(({ event: { method, section } }) => {
// filter events handled globally, or those we are not interested in
if ((section === 'democracy') || (section === 'system') || (section === 'balances' && method === 'Transfer')) {
return;
}
this.queueAction({
action: `${section}.${method}`,
status: 'event',
message: 'extrinsic event'
});
});
}
private queueAdd = (value: QueueTx$Extrinsic | QueueTx$Rpc | QueueTx): number => {
const id = ++nextId;
const rpc: RpcMethod = (value as QueueTx$Rpc).rpc || SUBMIT_RPC;

View File

@ -38,7 +38,11 @@ class Status extends React.PureComponent<Props> {
);
}
private renderStatus = ({ action, id, message, status, value }: QueueStatus) => {
private renderStatus = ({ account, action, id, message, status }: QueueStatus) => {
const addressRendered = account
? <AddressMini value={account} />
: undefined;
return (
<div
className={classes('item', status)}
@ -50,7 +54,7 @@ class Status extends React.PureComponent<Props> {
<div className='header'>
{action}
</div>
<AddressMini value={value} />
{addressRendered}
<div className='status'>
{message}
</div>
@ -110,6 +114,9 @@ class Status extends React.PureComponent<Props> {
case 'error':
return 'ban';
case 'event':
return 'assistive listening devices';
case 'received':
return 'telegram plane';

View File

@ -10,10 +10,10 @@ import { AccountId, Address } from '@polkadot/types';
export type Actions = 'create' | 'edit' | 'restore' | 'forget' | 'backup' | 'changePassword' | 'transfer';
export type ActionStatus = {
account?: AccountId | Address | string,
action: Actions | string,
message?: string,
status: 'error' | 'queued' | 'received' | 'success',
value?: AccountId | Address | string
status: 'error' | 'event' | 'queued' | 'received' | 'success'
};
export type AccountInfo = {

View File

@ -256,7 +256,7 @@ header .ui--Button-Group {
margin-bottom: 0.25rem;
padding: 0 0.5rem;
text-align: center;
opacity: 0.9;
opacity: 0.95;
vertical-align: middle;
.desc {
@ -282,6 +282,10 @@ header .ui--Button-Group {
background: #cd9b1d
}
&.event > .wrapper > .container {
background: teal;
}
&.completed > .wrapper > .container,
&.finalised > .wrapper > .container,
&.success > .wrapper > .container {

View File

@ -19,6 +19,7 @@ import { format } from '@polkadot/util/logger';
import ExtrinsicDisplay from './Extrinsic';
import Unlock from './Unlock';
import translate from './translate';
import { UnsubFunction } from '@polkadot/api/promise/types';
type BaseProps = BareProps & {
queue: Array<QueueTx>,
@ -254,7 +255,7 @@ class Signer extends React.PureComponent<Props, State> {
queueSetTxStatus(id, status, result, error);
}
private sendExtrinsic = async ({ accountNonce, accountId, extrinsic, id, isUnsigned }: QueueTx, password?: string): Promise<void> => {
private sendExtrinsic = ({ accountNonce, accountId, extrinsic, id, isUnsigned }: QueueTx, password?: string) => {
if (!extrinsic || !accountId) {
return;
}
@ -282,7 +283,7 @@ class Signer extends React.PureComponent<Props, State> {
console.log(`sendInherent: from=${pair.address()}, nonce=${accountNonce}`);
}
await this.submitExtrinsic(extrinsic, id);
this.submitExtrinsic(extrinsic, id);
}
private async submitRpc ({ method, section }: RpcMethod, values: Array<any>): Promise<QueueTx$Result> {
@ -307,7 +308,7 @@ class Signer extends React.PureComponent<Props, State> {
}
}
private async submitExtrinsic (extrinsic: SubmittableExtrinsic, id: number): Promise<void> {
private submitExtrinsic (extrinsic: SubmittableExtrinsic, id: number) {
const { queueSetTxStatus } = this.props;
try {
@ -315,17 +316,17 @@ class Signer extends React.PureComponent<Props, State> {
console.log('submitAndWatchExtrinsic: encode ::', encoded);
extrinsic.send((result: SubmittableSendResult) => {
if (!result) {
return;
}
const unsubscribe = extrinsic.send((result: SubmittableSendResult) => {
const status = result.type.toLowerCase() as QueueTx$Status;
console.log('submitAndWatchExtrinsic: updated status ::', result);
queueSetTxStatus(id, status, result);
});
if (status === 'finalised') {
unsubscribe();
}
}) as UnsubFunction;
} catch (error) {
console.error('submitAndWatchExtrinsic:', error);