diff --git a/packages/page-parachains/src/Overview/index.tsx b/packages/page-parachains/src/Overview/index.tsx index fc096c116a..8260922c6d 100644 --- a/packages/page-parachains/src/Overview/index.tsx +++ b/packages/page-parachains/src/Overview/index.tsx @@ -1,7 +1,7 @@ // Copyright 2017-2021 @polkadot/app-parachains authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { StorageKey } from '@polkadot/types'; +import type { Vec } from '@polkadot/types'; import type { ParaId } from '@polkadot/types/interfaces'; import type { Proposals } from '../types'; @@ -28,14 +28,12 @@ function Overview ({ className, proposals }: Props): React.ReactElement { useEffect((): void => { sessionTrigger && - api.query.paras?.upcomingParasGenesis - ?.keys() - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore - .then((keys: StorageKey<[ParaId]>[]): void => { + api.query.paras?.actionsQueue + ?.entries, [ParaId]>() + .then((entries): void => { mountedRef.current && setUpcomingIds( - keys.map(({ args: [paraId] }) => paraId) + entries.reduce((all, [, ids]) => [...all, ...ids], []) ); }) .catch(console.error); diff --git a/packages/react-hooks/src/useEventTrigger.ts b/packages/react-hooks/src/useEventTrigger.ts index 0f9bd41a8e..03492e254b 100644 --- a/packages/react-hooks/src/useEventTrigger.ts +++ b/packages/react-hooks/src/useEventTrigger.ts @@ -14,16 +14,15 @@ import { useIsMountedRef } from './useIsMountedRef'; type EventCheck = AugmentedEvent<'promise'> | string | false | undefined | null; -export function useEventTrigger (events: EventCheck[]): number { +export function useEventTrigger (checks: EventCheck[]): number { const { api } = useApi(); const [trigger, setTrigger] = useState(() => Date.now()); const mountedRef = useIsMountedRef(); const eventRecords = useCall(api.query.system.events); useEffect((): void => { - const count = eventRecords && eventRecords.filter(({ event, phase }) => - event && phase?.isApplyExtrinsic && - events.some((check) => check && ( + const count = eventRecords && eventRecords.filter(({ event }) => + event && checks.some((check) => check && ( isString(check) ? event.section === check : check.is(event) @@ -31,7 +30,7 @@ export function useEventTrigger (events: EventCheck[]): number { ).length; mountedRef.current && count && setTrigger(Date.now()); - }, [eventRecords, events, mountedRef]); + }, [eventRecords, checks, mountedRef]); return trigger; }