Allow voting on treasury page

package.json

@@ -10,10 +10,10 @@
     "packages/*"
   ],
   "resolutions": {
-    "@polkadot/api": "^0.99.0-beta.7",
-    "@polkadot/api-contract": "^0.99.0-beta.7",
+    "@polkadot/api": "^0.99.0-beta.9",
+    "@polkadot/api-contract": "^0.99.0-beta.9",
     "@polkadot/keyring": "^1.7.1",
-    "@polkadot/types": "^0.99.0-beta.7",
+    "@polkadot/types": "^0.99.0-beta.9",
     "@polkadot/util": "^1.7.1",
     "@polkadot/util-crypto": "^1.7.1",
     "babel-core": "^7.0.0-bridge.0",

packages/app-accounts/src/modals/Backup.tsx

@@ -67,7 +67,6 @@ export default function ({ address, onClose }: Props): React.ReactElement<Props>
   return (
     <Modal
       className='app--accounts-Modal'
-      dimmer='inverted'
       open
     >
       <Modal.Header>{t('Backup account')}</Modal.Header>

packages/app-accounts/src/modals/ChangePass.tsx

@@ -37,7 +37,6 @@ class ChangePass extends TxComponent<Props, State> {
     return (
       <Modal
         className='app--accounts-Modal'
-        dimmer='inverted'
         open
       >
         <Modal.Header>{t('Change account password')}</Modal.Header>

packages/app-accounts/src/modals/Create.tsx

@@ -189,7 +189,6 @@ function Create ({ className, onClose, onStatusChange, seed: propsSeed, t, type:
   return (
     <Modal
       className={className}
-      dimmer='inverted'
       open
     >
       <Modal.Header>{t('Add an account via seed')}</Modal.Header>

packages/app-accounts/src/modals/CreateConfirmation.tsx

@@ -18,10 +18,7 @@ interface Props extends I18nProps {
 
 function CreateConfirmation ({ address, name, onClose, onCommit, t }: Props): React.ReactElement<Props> | null {
   return (
-    <Modal
-      dimmer='inverted'
-      open
-    >
+    <Modal open>
       <Modal.Header>
         {t('Important notice')}
       </Modal.Header>

packages/app-accounts/src/modals/Derive.tsx

@@ -136,7 +136,6 @@ function Derive ({ className, from, onClose, t }: Props): React.ReactElement {
   return (
     <Modal
       className={className}
-      dimmer='inverted'
       open
     >
       <Modal.Header>{t('Derive account from pair')}</Modal.Header>

packages/app-accounts/src/modals/Import.tsx

@@ -38,10 +38,7 @@ class Import extends TxComponent<Props, State> {
     const { isFileValid, isPassValid } = this.state;
 
     return (
-      <Modal
-        dimmer='inverted'
-        open
-      >
+      <Modal open>
         <Modal.Header>{t('Add via backup file')}</Modal.Header>
         {this.renderInput()}
         <Modal.Actions>

packages/app-accounts/src/modals/Qr.tsx

@@ -49,7 +49,6 @@ function QrModal ({ className, onClose, onStatusChange, t }: Props): React.React
   return (
     <Modal
       className={className}
-      dimmer='inverted'
       open
     >
       <Modal.Header>{t('Add account via Qr')}</Modal.Header>

packages/app-accounts/src/modals/Transfer.tsx

@@ -89,7 +89,6 @@ function Transfer ({ className, onClose, recipientId: propRecipientId, senderId:
   return (
     <Modal
       className='app--accounts-Modal'
-      dimmer='inverted'
       open
     >
       <Modal.Header>{t('Send funds')}</Modal.Header>

packages/app-address-book/src/modals/Create.tsx

@@ -77,10 +77,7 @@ function Create ({ onClose, onStatusChange, t }: Props): React.ReactElement<Prop
   };
 
   return (
-    <Modal
-      dimmer='inverted'
-      open
-    >
+    <Modal open>
       <Modal.Header>{t('Add an address')}</Modal.Header>
       <Modal.Content>
         <AddressRow

packages/app-contracts/package.json

@@ -11,7 +11,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.7.5",
-    "@polkadot/api-contract": "^0.99.0-beta.7",
+    "@polkadot/api-contract": "^0.99.0-beta.9",
     "@polkadot/react-components": "^0.38.0-beta.51"
   }
 }

packages/app-contracts/src/Contracts/Call.tsx

@@ -113,7 +113,6 @@ function Call (props: Props): React.ReactElement<Props> | null {
   return (
     <Modal
       className={[className || '', 'app--contracts-Modal'].join(' ')}
-      dimmer='inverted'
       onClose={onClose}
       open={isOpen}
     >

packages/app-contracts/src/Modal.tsx

@@ -54,7 +54,6 @@ class ContractModal<P extends ContractModalProps, S extends ContractModalState>
     return (
       <Modal
         className='app--contracts-Modal'
-        dimmer='inverted'
         onClose={this.onClose}
         open={isOpen}
       >

packages/app-contracts/src/RemoveABI.tsx

@@ -24,7 +24,6 @@ function RemoveABI ({ code, onClose, onRemove, t }: Props): React.ReactElement<P
   return (
     <Modal
       className='app--accounts-Modal'
-      dimmer='inverted'
       onClose={onClose}
       open
     >

packages/app-council/src/Motions/Motion.tsx

@@ -2,29 +2,23 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Proposal as ProposalType, Votes } from '@polkadot/types/interfaces';
+import { DerivedCouncilProposal } from '@polkadot/api-derive/types';
 import { I18nProps } from '@polkadot/react-components/types';
 
-import BN from 'bn.js';
 import React from 'react';
-import { Option } from '@polkadot/types';
 
 import { AddressMini, Voting } from '@polkadot/react-components';
-import { withCalls, withMulti } from '@polkadot/react-api';
 import ProposalCell from '@polkadot/app-democracy/Overview/ProposalCell';
 import { formatNumber } from '@polkadot/util';
 
 import translate from '../translate';
 
 interface Props extends I18nProps {
-  chain_bestNumber?: BN;
-  hash: string;
-  proposal: ProposalType | null;
-  votes: Votes | null;
+  motion: DerivedCouncilProposal;
 }
 
-function Motion ({ className, hash, proposal, t, votes }: Props): React.ReactElement<Props> | null {
-  if (!proposal || !votes) {
+function Motion ({ className, motion: { hash, proposal, votes }, t }: Props): React.ReactElement<Props> | null {
+  if (!votes) {
     return null;
   }
 
@@ -33,7 +27,11 @@ function Motion ({ className, hash, proposal, t, votes }: Props): React.ReactEle
   return (
     <tr className={className}>
       <td className='number top'><h1>{formatNumber(index)}</h1></td>
-      <ProposalCell className='top' proposalHash={hash} proposal={proposal} />
+      <ProposalCell
+        className='top'
+        proposalHash={hash}
+        proposal={proposal}
+      />
       <td className='number top'>
         <label>{t('threshold')}</label>
         {formatNumber(ayes.length)}/{formatNumber(threshold)}
@@ -70,21 +68,4 @@ function Motion ({ className, hash, proposal, t, votes }: Props): React.ReactEle
   );
 }
 
-export default withMulti(
-  Motion,
-  translate,
-  withCalls<Props>(
-    ['query.council.proposalOf', {
-      paramName: 'hash',
-      propName: 'proposal',
-      transform: (value: Option<ProposalType>): ProposalType | null =>
-        value.unwrapOr(null)
-    }],
-    ['query.council.voting', {
-      paramName: 'hash',
-      propName: 'votes',
-      transform: (value: Option<Votes>): Votes | null =>
-        value.unwrapOr(null)
-    }]
-  )
-);
+export default translate(Motion);

packages/app-council/src/Motions/index.tsx

@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Hash } from '@polkadot/types/interfaces';
+import { DerivedCouncilProposals, DerivedCouncilProposal } from '@polkadot/api-derive/types';
 import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
@@ -13,7 +13,7 @@ import Propose from './Propose';
 import translate from '../translate';
 
 interface Props extends I18nProps {
-  motions?: Hash[];
+  motions?: DerivedCouncilProposals;
 }
 
 function Proposals ({ className, motions, t }: Props): React.ReactElement<Props> {
@@ -24,10 +24,10 @@ function Proposals ({ className, motions, t }: Props): React.ReactElement<Props>
         ? (
           <Table>
             <Table.Body>
-              {motions?.map((hash: Hash): React.ReactNode => (
+              {motions?.map((motion: DerivedCouncilProposal): React.ReactNode => (
                 <Motion
-                  hash={hash.toHex()}
-                  key={hash.toHex()}
+                  key={motion.hash.toHex()}
+                  motion={motion}
                 />
               ))}
             </Table.Body>

packages/app-council/src/Overview/Summary.tsx

@@ -38,7 +38,7 @@ function Summary ({ bestNumber, className, electionsInfo: { members, candidateCo
           </CardSummary>
         </section>
       )}
-      {bestNumber && termDuration && termDuration.gtn(0) && (
+      {bestNumber && termDuration?.gtn(0) && (
         <section>
           <CardSummary
             label={t('term progress')}

packages/app-council/src/index.tsx

@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Hash } from '@polkadot/types/interfaces';
+import { DerivedCouncilProposals } from '@polkadot/api-derive/types';
 import { AppProps, BareProps, I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
@@ -23,7 +23,7 @@ interface Props extends AppProps, BareProps, I18nProps {}
 function App ({ basePath, className, t }: Props): React.ReactElement<Props> {
   const { api } = useApi();
   const { pathname } = useLocation();
-  const motions = useCall<Hash[]>(api.query.council.proposals, []);
+  const motions = useCall<DerivedCouncilProposals>(api.derive.council.proposals, []);
 
   return (
     <main className={className}>

packages/app-council/src/useCounter.ts

@@ -2,14 +2,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Hash } from '@polkadot/types/interfaces';
+import { DerivedCouncilProposals } from '@polkadot/api-derive/types';
 
 import { useState, useEffect } from 'react';
 import { useApi, useCall } from '@polkadot/react-hooks';
 
 export default function useCounter (): number {
   const { api, isApiReady } = useApi();
-  const motions = useCall<Hash[]>(isApiReady ? api.query.council?.proposals : undefined, []);
+  const motions = useCall<DerivedCouncilProposals>(isApiReady ? api.derive.council.proposals : undefined, []);
   const [counter, setCounter] = useState(0);
 
   useEffect((): void => {

packages/app-democracy/src/Overview/DispatchEntry.tsx

@@ -43,7 +43,10 @@ function DispatchEntry ({ blockNumber, hash, referendumIndex, t }: Props): React
           </>
         )}
       </td>
-      <ProposalCell proposalHash={hash} proposal={proposal} />
+      <ProposalCell
+        proposalHash={hash}
+        proposal={proposal}
+      />
     </tr>
   );
 }

packages/app-democracy/src/Overview/Externals.tsx

@@ -61,7 +61,11 @@ function Externals ({ className, t }: Props): React.ReactElement<Props> | null {
             <td className='number together top'>
               {expanded && <FormatBalance label={<label>{t('locked')}</label>} value={expanded.balance} />}
             </td>
-            <ProposalCell className='top' proposalHash={hash} proposal={expanded?.proposal} />
+            <ProposalCell
+              className='top'
+              proposalHash={hash}
+              proposal={expanded?.proposal}
+            />
           </tr>
         </Table.Body>
       </Table>

packages/app-democracy/src/Overview/PreImage.tsx

@@ -39,7 +39,6 @@ function PreImage ({ className, onClose, t }: Props): React.ReactElement<Props>
   return (
     <Modal
       className={className}
-      dimmer='inverted'
       open
     >
       <Modal.Header>{t('Submit preimage')}</Modal.Header>

packages/app-democracy/src/Overview/Proposal.tsx

@@ -31,7 +31,11 @@ function Proposal ({ className, t, value: { balance, hash, index, proposal, prop
       <td className='number together top'>
         <FormatBalance label={<label>{t('locked')}</label>} value={balance} />
       </td>
-      <ProposalCell className='top' proposalHash={hash} proposal={proposal} />
+      <ProposalCell
+        className='top'
+        proposalHash={hash}
+        proposal={proposal}
+      />
       <td className='top seconding'>
         {seconding.length !== 0 && (
           <details>

packages/app-democracy/src/Overview/Propose.tsx

@@ -29,7 +29,6 @@ function Propose ({ className, onClose, t }: Props): React.ReactElement<Props> {
   return (
     <Modal
       className={className}
-      dimmer='inverted'
       open
     >
       <Modal.Header>{t('Submit proposal')}</Modal.Header>

packages/app-democracy/src/Overview/Referendum.tsx

@@ -84,7 +84,11 @@ function Referendum ({ chain_bestNumber, className, democracy_referendumVotesFor
   return (
     <tr className={className}>
       <td className='number top'><h1>{formatNumber(value.index)}</h1></td>
-      <ProposalCell className='top' proposalHash={value.hash} proposal={value.proposal} />
+      <ProposalCell
+        className='top'
+        proposalHash={value.hash}
+        proposal={value.proposal}
+      />
       <td className='number together top'>
         <label>{t('remaining')}</label>
         {formatNumber(value.info.end.sub(chain_bestNumber).subn(1))} blocks

packages/app-democracy/src/Overview/Seconding.tsx

@@ -33,7 +33,6 @@ function Seconding ({ depositors, proposalId, t }: Props): React.ReactElement<Pr
     <>
       {isSecondingOpen && (
         <Modal
-          dimmer='inverted'
           open
           size='small'
         >