neptune/ghost-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

collective => council (#1462)

Browse Source
This commit is contained in:
kwingram25 2019-08-02 12:51:07 +01:00 committed by Jaco Greeff
parent 407b4785b1
commit 07e79097ff
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/app-council/src/Motions/Motion.tsx
View File

@ -145,7 +145,7 @@ export default withMulti(
translate,
withCalls<Props>(
[
'query.collective.proposalOf',
'query.council.proposalOf',
{
paramName: 'hash',
propName: 'proposal',
@ -154,7 +154,7 @@ export default withMulti(
}
],
[
'query.collective.voting',
'query.council.voting',
{
paramName: 'hash',
propName: 'votes',

2
packages/app-council/src/Motions/Propose.tsx
View File

@ -47,7 +47,7 @@ class Propose extends TxModal<Props, State> {
protected headerText = (): string => this.props.t('Propose a council motion');
protected txMethod = (): string => 'collective.propose';
protected txMethod = (): string => 'council.propose';
protected txParams = (): [BN | null, ...Proposal[]] => {
const { method, threshold } = this.state;

8
packages/app-council/src/Motions/index.tsx
View File

@ -15,7 +15,7 @@ import Propose from './Propose';
import translate from '../translate';
interface Props extends I18nProps {
collective_proposals?: Hash[];
council_proposals?: Hash[];
}
class Proposals extends React.PureComponent<Props> {
@ -36,9 +36,9 @@ class Proposals extends React.PureComponent<Props> {
}
private renderProposals (): React.ReactNode {
const { collective_proposals = [] } = this.props;
const { council_proposals = [] } = this.props;
return collective_proposals.map((hash: Hash): React.ReactNode => (
return council_proposals.map((hash: Hash): React.ReactNode => (
<Motion
hash={hash.toHex()}
key={hash.toHex()}
@ -49,6 +49,6 @@ class Proposals extends React.PureComponent<Props> {
export default translate(
withCalls<Props>(
'query.collective.proposals'
'query.council.proposals'
)(Proposals)
);

2
packages/app-treasury/src/Overview/Approve.tsx
View File

@ -37,7 +37,7 @@ class Approve extends TxModal<Props, State> {
protected headerText = (): string => this.props.t('Approve or reject proposal');
protected txMethod = (): string => 'collective.propose';
protected txMethod = (): string => 'council.propose';
protected txParams = (): [number, any] => {
const { api, proposalId, threshold } = this.props;

2
packages/ui-app/src/Voting.tsx
View File

@ -48,7 +48,7 @@ class Voting extends TxModal<Props, State> {
protected txMethod = (): string => {
const { isCouncil } = this.props;
return isCouncil ? 'collective.vote' : 'democracy.vote';
return isCouncil ? 'council.vote' : 'democracy.vote';
}
protected txParams = (): any[] => {