grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Align contract event log l&f with transactions (#2812)

Browse Source 
* Event into own component, align with transactions

* Pass value & type through from event log params

* Reformat display columns
This commit is contained in:
Jaco Greeff
2016-10-25 16:02:12 +02:00
committed by GitHub
parent 8d0cff3599
commit 7eacf07629
12 changed files with 272 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/src/dapps/tokenreg/Status/actions.js
View File

@@ -148,27 +148,27 @@ export const subscribeEvents = () => (dispatch, getState) => {
return dispatch(setTokenData(params.id.toNumber(), {
tla: '...',
base: -1,
address: params.addr,
name: params.name,
address: params.addr.value,
name: params.name.value,
isPending: true
}));
}
if (event === 'Registered' && type === 'mined') {
return dispatch(loadToken(params.id.toNumber()));
return dispatch(loadToken(params.id.value.toNumber()));
}
if (event === 'Unregistered' && type === 'pending') {
return dispatch(setTokenPending(params.id.toNumber(), true));
return dispatch(setTokenPending(params.id.value.toNumber(), true));
}
if (event === 'Unregistered' && type === 'mined') {
return dispatch(deleteToken(params.id.toNumber()));
return dispatch(deleteToken(params.id.value.toNumber()));
}
if (event === 'MetaChanged' && type === 'pending') {
return dispatch(setTokenData(
params.id.toNumber(),
params.id.value.toNumber(),
{ metaPending: true, metaMined: false }
));
}
@@ -176,13 +176,13 @@ export const subscribeEvents = () => (dispatch, getState) => {
if (event === 'MetaChanged' && type === 'mined') {
setTimeout(() => {
dispatch(setTokenData(
params.id.toNumber(),
params.id.value.toNumber(),
{ metaPending: false, metaMined: false }
));
}, 5000);
return dispatch(setTokenData(
params.id.toNumber(),
params.id.value.toNumber(),
{ metaPending: false, metaMined: true }
));
}