diff --git a/packages/app-accounts/src/Backup.tsx b/packages/app-accounts/src/Backup.tsx index ed8e150acc..05e57a4662 100644 --- a/packages/app-accounts/src/Backup.tsx +++ b/packages/app-accounts/src/Backup.tsx @@ -124,7 +124,7 @@ class Backup extends React.PureComponent { 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' diff --git a/packages/app-accounts/src/ChangePass.tsx b/packages/app-accounts/src/ChangePass.tsx index a867e086b8..85b514ab4d 100644 --- a/packages/app-accounts/src/ChangePass.tsx +++ b/packages/app-accounts/src/ChangePass.tsx @@ -141,7 +141,7 @@ class ChangePass extends React.PureComponent { 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' diff --git a/packages/app-accounts/src/Creator.tsx b/packages/app-accounts/src/Creator.tsx index f639714c8b..a7237b49be 100644 --- a/packages/app-accounts/src/Creator.tsx +++ b/packages/app-accounts/src/Creator.tsx @@ -370,7 +370,7 @@ class Creator extends React.PureComponent { 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` diff --git a/packages/app-accounts/src/Editor.tsx b/packages/app-accounts/src/Editor.tsx index baec38d6a9..87b974a8f5 100644 --- a/packages/app-accounts/src/Editor.tsx +++ b/packages/app-accounts/src/Editor.tsx @@ -259,8 +259,8 @@ class Editor extends React.PureComponent { } const status = { - action: 'edit', - value: current.address() + account: current.address(), + action: 'edit' } as ActionStatus; try { @@ -340,8 +340,8 @@ class Editor extends React.PureComponent { this.createState(null), () => { const status = { - action: 'forget', - value: current.address() + account: current.address(), + action: 'forget' } as ActionStatus; try { diff --git a/packages/app-accounts/src/Restore.tsx b/packages/app-accounts/src/Restore.tsx index 086a2d375e..b0c8d9a4d7 100644 --- a/packages/app-accounts/src/Restore.tsx +++ b/packages/app-accounts/src/Restore.tsx @@ -152,7 +152,7 @@ class Restore extends React.PureComponent { 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' }); diff --git a/packages/app-addresses/src/Creator.tsx b/packages/app-addresses/src/Creator.tsx index 669c02a6f9..d509e24414 100644 --- a/packages/app-addresses/src/Creator.tsx +++ b/packages/app-addresses/src/Creator.tsx @@ -169,7 +169,7 @@ class Creator extends React.PureComponent { try { keyring.saveAddress(address, { name }); - status.value = address; + status.account = address; status.status = address ? 'success' : 'error'; status.message = t('status.created', { defaultValue: 'address created' diff --git a/packages/app-addresses/src/Editor.tsx b/packages/app-addresses/src/Editor.tsx index 583f832679..c604e018ea 100644 --- a/packages/app-addresses/src/Editor.tsx +++ b/packages/app-addresses/src/Editor.tsx @@ -193,8 +193,8 @@ class Editor extends React.PureComponent { } const status = { - action: 'edit', - value: current.address() + account: current.address(), + action: 'edit' } as ActionStatus; try { @@ -249,8 +249,8 @@ class Editor extends React.PureComponent { this.createState(null), () => { const status = { - action: 'forget', - value: current.address() + account: current.address(), + action: 'forget' } as ActionStatus; try { diff --git a/packages/apps/src/Status.tsx b/packages/apps/src/Status.tsx index ae3eacf53a..6d610610f2 100644 --- a/packages/apps/src/Status.tsx +++ b/packages/apps/src/Status.tsx @@ -40,18 +40,31 @@ class Status extends React.PureComponent { (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 + } + }) + }); } }); } diff --git a/packages/ui-app/src/IdentityIcon.tsx b/packages/ui-app/src/IdentityIcon.tsx index e3a3910fcb..1f7c4d6156 100644 --- a/packages/ui-app/src/IdentityIcon.tsx +++ b/packages/ui-app/src/IdentityIcon.tsx @@ -26,20 +26,20 @@ class CopyIcon extends React.PureComponent { ); } - 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' }) diff --git a/packages/ui-app/src/Status/Queue.tsx b/packages/ui-app/src/Status/Queue.tsx index bf277841d8..b07416cc70 100644 --- a/packages/ui-app/src/Status/Queue.tsx +++ b/packages/ui-app/src/Status/Queue.tsx @@ -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 { 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 { 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 { } 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 = {}) { + 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; diff --git a/packages/ui-app/src/Status/index.tsx b/packages/ui-app/src/Status/index.tsx index e585fd2afa..c2a29d94ca 100644 --- a/packages/ui-app/src/Status/index.tsx +++ b/packages/ui-app/src/Status/index.tsx @@ -38,7 +38,11 @@ class Status extends React.PureComponent { ); } - private renderStatus = ({ action, id, message, status, value }: QueueStatus) => { + private renderStatus = ({ account, action, id, message, status }: QueueStatus) => { + const addressRendered = account + ? + : undefined; + return (
{
{action}
- + {addressRendered}
{message}
@@ -110,6 +114,9 @@ class Status extends React.PureComponent { case 'error': return 'ban'; + case 'event': + return 'assistive listening devices'; + case 'received': return 'telegram plane'; diff --git a/packages/ui-app/src/Status/types.ts b/packages/ui-app/src/Status/types.ts index d809e5ee6c..48d3404d84 100644 --- a/packages/ui-app/src/Status/types.ts +++ b/packages/ui-app/src/Status/types.ts @@ -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 = { diff --git a/packages/ui-app/src/styles/components.css b/packages/ui-app/src/styles/components.css index aad470282b..9e0e28e612 100644 --- a/packages/ui-app/src/styles/components.css +++ b/packages/ui-app/src/styles/components.css @@ -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 { diff --git a/packages/ui-signer/src/Modal.tsx b/packages/ui-signer/src/Modal.tsx index 30695fda3e..65fb402a3e 100644 --- a/packages/ui-signer/src/Modal.tsx +++ b/packages/ui-signer/src/Modal.tsx @@ -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, @@ -254,7 +255,7 @@ class Signer extends React.PureComponent { queueSetTxStatus(id, status, result, error); } - private sendExtrinsic = async ({ accountNonce, accountId, extrinsic, id, isUnsigned }: QueueTx, password?: string): Promise => { + private sendExtrinsic = ({ accountNonce, accountId, extrinsic, id, isUnsigned }: QueueTx, password?: string) => { if (!extrinsic || !accountId) { return; } @@ -282,7 +283,7 @@ class Signer extends React.PureComponent { 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): Promise { @@ -307,7 +308,7 @@ class Signer extends React.PureComponent { } } - private async submitExtrinsic (extrinsic: SubmittableExtrinsic, id: number): Promise { + private submitExtrinsic (extrinsic: SubmittableExtrinsic, id: number) { const { queueSetTxStatus } = this.props; try { @@ -315,17 +316,17 @@ class Signer extends React.PureComponent { 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);