From 07b7feac4b3de78547a5c6b6be593846e6b91988 Mon Sep 17 00:00:00 2001 From: Luke Schoen Date: Tue, 3 Dec 2019 00:02:28 +0100 Subject: [PATCH 1/3] fix: Fixes #1986 proposals of undefined --- packages/app-council/src/useCounter.ts | 2 +- packages/app-democracy/src/useCounter.ts | 4 ++-- packages/app-tech-comm/src/useCounter.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/app-council/src/useCounter.ts b/packages/app-council/src/useCounter.ts index 170dd7b1f0f1..72f829c4ae50 100644 --- a/packages/app-council/src/useCounter.ts +++ b/packages/app-council/src/useCounter.ts @@ -9,7 +9,7 @@ import { useApi, trackStream } from '@polkadot/react-hooks'; export default function useCounter (): number { const { api, isApiReady } = useApi(); - const motions = trackStream(isApiReady ? api.query.council.proposals : undefined, []); + const motions = trackStream(isApiReady ? api.query.council && api.query.council.proposals : undefined, []); const [counter, setCounter] = useState(0); useEffect((): void => { diff --git a/packages/app-democracy/src/useCounter.ts b/packages/app-democracy/src/useCounter.ts index 0128d9b20d8c..fc88ce6ceee1 100644 --- a/packages/app-democracy/src/useCounter.ts +++ b/packages/app-democracy/src/useCounter.ts @@ -7,8 +7,8 @@ import { useApi, trackStream } from '@polkadot/react-hooks'; export default function useCounter (): number { const { api, isApiReady } = useApi(); - const proposals = trackStream(isApiReady ? api.derive.democracy.proposals : undefined, []); - const referenda = trackStream(isApiReady ? api.derive.democracy.referendums : undefined, []); + const proposals = trackStream(isApiReady ? api.derive.democracy && api.derive.democracy.proposals : undefined, []); + const referenda = trackStream(isApiReady ? api.derive.democracy && api.derive.democracy.referendums : undefined, []); const [counter, setCounter] = useState(0); useEffect((): void => { diff --git a/packages/app-tech-comm/src/useCounter.ts b/packages/app-tech-comm/src/useCounter.ts index 0d67129dde4e..92f1e1b635cb 100644 --- a/packages/app-tech-comm/src/useCounter.ts +++ b/packages/app-tech-comm/src/useCounter.ts @@ -9,7 +9,7 @@ import { useApi, trackStream } from '@polkadot/react-hooks'; export default function useCounter (): number { const { api, isApiReady } = useApi(); - const proposals = trackStream(isApiReady ? api.query.technicalCommittee.proposals : undefined, []); + const proposals = trackStream(isApiReady ? api.query.technicalCommittee && api.query.technicalCommittee.proposals : undefined, []); const [counter, setCounter] = useState(0); useEffect((): void => { From e86c5358c2e41f0827399e59d47ecb592576a1f6 Mon Sep 17 00:00:00 2001 From: Luke Schoen Date: Tue, 3 Dec 2019 01:24:21 +0100 Subject: [PATCH 2/3] fix: Prevent undefined proposals in packages/app-council/src/useCounter.ts Co-Authored-By: Jaco Greeff --- packages/app-council/src/useCounter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app-council/src/useCounter.ts b/packages/app-council/src/useCounter.ts index 72f829c4ae50..73192f6b524e 100644 --- a/packages/app-council/src/useCounter.ts +++ b/packages/app-council/src/useCounter.ts @@ -9,7 +9,7 @@ import { useApi, trackStream } from '@polkadot/react-hooks'; export default function useCounter (): number { const { api, isApiReady } = useApi(); - const motions = trackStream(isApiReady ? api.query.council && api.query.council.proposals : undefined, []); + const motions = trackStream(isApiReady ? api.query.council?.proposals : undefined, []); const [counter, setCounter] = useState(0); useEffect((): void => { From 8a19c71d03e9cbbef46d1f0aa393da94aba195b9 Mon Sep 17 00:00:00 2001 From: Luke Schoen Date: Tue, 3 Dec 2019 01:32:50 +0100 Subject: [PATCH 3/3] fix: Revert change since api.derive.democracy is always defined --- packages/app-democracy/src/useCounter.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/app-democracy/src/useCounter.ts b/packages/app-democracy/src/useCounter.ts index fc88ce6ceee1..0128d9b20d8c 100644 --- a/packages/app-democracy/src/useCounter.ts +++ b/packages/app-democracy/src/useCounter.ts @@ -7,8 +7,8 @@ import { useApi, trackStream } from '@polkadot/react-hooks'; export default function useCounter (): number { const { api, isApiReady } = useApi(); - const proposals = trackStream(isApiReady ? api.derive.democracy && api.derive.democracy.proposals : undefined, []); - const referenda = trackStream(isApiReady ? api.derive.democracy && api.derive.democracy.referendums : undefined, []); + const proposals = trackStream(isApiReady ? api.derive.democracy.proposals : undefined, []); + const referenda = trackStream(isApiReady ? api.derive.democracy.referendums : undefined, []); const [counter, setCounter] = useState(0); useEffect((): void => {