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

Refresh scheduled/rpoposals on session change (#4432)

Browse Source
This commit is contained in:
Jaco Greeff 2021-01-16 12:37:02 +01:00 committed by GitHub
parent 37f0fccf97
commit 25324be46d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/page-parachains/src/Proposals/useProposals.ts
View File

@ -9,14 +9,16 @@ import { useEffect, useMemo, useState } from 'react';
import { useApi, useCall, useIsMountedRef } from '@polkadot/react-hooks';
function createResult (approvedIds: ParaId[], proposalKeys: { args: [ParaId] }[], scheduledProposals: [{ args: [SessionIndex] }, ParaId[]][]): Proposals {
function createResult (sessionIndex: SessionIndex, approvedIds: ParaId[], proposalKeys: { args: [ParaId] }[], scheduledProposals: [{ args: [SessionIndex] }, ParaId[]][]): Proposals {
return {
approvedIds,
proposalIds: proposalKeys.map(({ args: [id] }) => id),
scheduled: scheduledProposals.map(([{ args: [sessionIndex] }, scheduledIds]) => ({
scheduledIds,
sessionIndex
}))
scheduled: scheduledProposals
.map(([{ args: [sessionIndex] }, scheduledIds]) => ({
scheduledIds,
sessionIndex
}))
.filter((s) => s.sessionIndex.gt(sessionIndex))
};
}
@ -25,6 +27,7 @@ export default function useProposals (): Proposals | undefined {
const mountedRef = useIsMountedRef();
const [state, setState] = useState<Proposals | undefined>();
const [trigger, setTrigger] = useState(Date.now());
const sessionIndex = useCall<SessionIndex>(api.query.session.currentIndex);
const approvedIds = useCall<ParaId[]>(api.query.proposeParachain?.approvedProposals);
const events = useCall<EventRecord[]>(api.query.system.events);
@ -39,7 +42,7 @@ export default function useProposals (): Proposals | undefined {
// re-get all our entries in the list
useEffect((): void => {
approvedIds && trigger &&
approvedIds && sessionIndex && trigger &&
Promise
.all([
api.query.proposeParachain.proposals.keys(),
@ -47,10 +50,10 @@ export default function useProposals (): Proposals | undefined {
])
.then(([proposals, scheduledProposals]) =>
mountedRef.current &&
setState(createResult(approvedIds, proposals as any, scheduledProposals as any))
setState(createResult(sessionIndex, approvedIds, proposals as any, scheduledProposals as any))
)
.catch(console.error);
}, [api, approvedIds, mountedRef, trigger]);
}, [api, approvedIds, mountedRef, sessionIndex, trigger]);
return state;
}