Make council optional with treasury proposals (#3351)

2021-03-24 10:58:03 +01:00
parent 1a231dfb0d
commit 26c3cc9126
4 changed files with 93 additions and 73 deletions
@@ -37,12 +37,16 @@ export function bounties (instanceId: string, api: ApiInterfaceRx): () => Observ
  return memo(instanceId, (): Observable<DeriveBounties> =>
    combineLatest([
      bountyBase.bountyCount<BountyIndex>(),
-      api.query.council ? api.query.council.proposalCount<ProposalIndex>() : of(0)
+      api.query.council
+        ? api.query.council.proposalCount<ProposalIndex>()
+        : of(0)
    ]).pipe(
      switchMap(() =>
        combineLatest([
          bountyBase.bounties.keys<[BountyIndex]>(),
-          api.derive.council ? api.derive.council.proposals() : of([])
+          api.derive.council
+            ? api.derive.council.proposals()
+            : of([])
        ])
      ),
      switchMap(([keys, proposals]): Observable<Result> => {