Fix Tech comm proposal display (Option) (#1995)

* Fix Tech comm proposal display (Option) * Linting
polkadot-js · Dec 3, 2019 · aeb0ea3 · aeb0ea3
1 parent e1d5923
commit aeb0ea3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/packages/app-democracy/src/Overview/ProposalCell.tsx b/packages/app-democracy/src/Overview/ProposalCell.tsx
@@ -12,7 +12,7 @@ import { Call } from '@polkadot/react-components';
 import translate from '../translate';
 
 interface Props extends I18nProps {
-  proposal?: Proposal;
+  proposal?: Proposal | null;
   proposalHash: Hash | string;
 }
 

diff --git a/packages/app-tech-comm/src/Proposals/Proposal.tsx b/packages/app-tech-comm/src/Proposals/Proposal.tsx
@@ -6,10 +6,10 @@ import { Proposal as ProposalType, Votes } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
-import { useApi, trackStream } from '@polkadot/react-hooks';
-import { Option } from '@polkadot/types';
 import { AddressMini } from '@polkadot/react-components';
+import { useApi, trackStream } from '@polkadot/react-hooks';
 import ProposalCell from '@polkadot/app-democracy/Overview/ProposalCell';
+import { Option } from '@polkadot/types';
 import { formatNumber } from '@polkadot/util';
 
 import translate from '../translate';
@@ -21,13 +21,14 @@ interface Props extends I18nProps {
 
 function Proposal ({ className, hash, t }: Props): React.ReactElement<Props> | null {
   const { api } = useApi();
-  const proposal = trackStream<ProposalType>(api.query.technicalCommittee.proposalOf, [hash]);
+  const _proposal = trackStream<Option<ProposalType>>(api.query.technicalCommittee.proposalOf, [hash]);
   const votes = trackStream<Option<Votes>>(api.query.technicalCommittee.voting, [hash]);
 
-  if (!proposal || !votes?.isSome) {
+  if (!votes?.isSome) {
     return null;
   }
 
+  const proposal = _proposal?.unwrapOr(null);
   const { ayes, index, nays, threshold } = votes.unwrap();
 
   return (