Skip to content

Move seconding #1968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacogr merged 1 commit into from
Nov 30, 2019
Merged

Move seconding #1968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions packages/app-democracy/src/Overview/Proposal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,11 @@ function Proposal (props: Props): React.ReactElement<Props> {
className={className}
idNumber={idNumber}
proposal={value}
accessory={
<Seconding
depositors={depositors}
proposalId={idNumber}
/>
}
>
<Seconding
depositors={depositors}
proposalId={idNumber}
/>
{renderProposal(props)}
</ActionItem>
);
Expand Down
4 changes: 2 additions & 2 deletions packages/app-democracy/src/Overview/Seconding.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,14 @@ function Seconding ({ depositors, proposalId, t }: Props): React.ReactElement<Pr
</Modal.Actions>
</Modal>
)}
<div className='ui--Row-buttons'>
<Button.Group>
<Button
isPrimary
label={t('Second proposal')}
icon='toggle off'
onClick={_toggleSeconding}
/>
</div>
</Button.Group>
</>
);
}
Expand Down
6 changes: 3 additions & 3 deletions packages/react-components/src/ProposedAction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const styles = `
`;

function ProposedAction (props: Props): React.ReactElement<Props> {
const { asInset, insetProps, isCollapsible, proposal, withLinks, expandNested } = props;
const { className, asInset, insetProps, isCollapsible, proposal, withLinks, expandNested } = props;
const idNumber = typeof props.idNumber === 'string'
? props.idNumber
: formatNumber(props.idNumber);
Expand Down Expand Up @@ -94,7 +94,7 @@ function ProposedAction (props: Props): React.ReactElement<Props> {
}

return (
<>
<div className={className}>
<h3>{header}</h3>
{isCollapsible
? (
Expand All @@ -111,7 +111,7 @@ function ProposedAction (props: Props): React.ReactElement<Props> {
{params}
</>
)}
</>
</div>
);
}

Expand Down