Skip to content

Commit

Permalink
Onboarding: update Fundraising and re-enable (#1270)
Browse files Browse the repository at this point in the history
  • Loading branch information
@izqui @sohkai
izqui authored and sohkai committed Jan 24, 2020
1 parent 81b26cc commit 2f8e1e2
Show file tree
Hide file tree
Showing 6 changed files with 208 additions and 196 deletions.
62 changes: 31 additions & 31 deletions ...templates/fundraising/components/Board.js → ...mplates/fundraising/components/Council.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,15 @@ function validationError(
return 'Please add a token symbol.'
}
if (signatures < 0) {
return 'Please ensure that board voting requires at least one signature.'
return 'Please ensure that council voting requires at least one signature.'
}
if (duration < 10 * MINUTE_IN_SECONDS) {
return 'Please ensure the vote duration is equal to or longer than 10 minutes.'
}
return null
}

function Board({
function Council({
dataKey,
screenProps: { back, data, next, screenIndex, screens },
title,
Expand Down Expand Up @@ -309,7 +309,7 @@ function Board({
>
<KnownAppBadge
appName="token-manager.aragonpm.eth"
label="Tokens: Board"
label="Tokens: Council"
/>
</span>
settings
Expand All @@ -321,9 +321,9 @@ function Board({
margin-bottom: ${3 * GU}px;
`}
>
These settings determine who should be a member of the Board and
These settings determine who should be a member of the council and
information related to the token used for determining membership. The
Board acts similarly to a traditional multisig account.
council acts similarly to a traditional multisig account.
</Info>
<div
css={`
Expand All @@ -333,11 +333,11 @@ function Board({
<Field
label={
<React.Fragment>
Board token name
<Help hint="What’s the board token name?">
<strong>Board token name</strong> will be the name assigned to
the token representing your organization's board.{' '}
<em>For example: My Board Token.</em>
Council token name
<Help hint="What’s the council token name?">
<strong>Council token name</strong> will be the name assigned to
the token representing the organization's council.{' '}
<em>For example: My Council Token.</em>
</Help>
</React.Fragment>
}
Expand All @@ -347,7 +347,7 @@ function Board({
ref={handleTokenNameRef}
id={id}
onChange={handleTokenNameChange}
placeholder="My Board Token"
placeholder="My Council Token"
value={tokenName}
wide
/>
Expand All @@ -357,12 +357,12 @@ function Board({
<Field
label={
<React.Fragment>
Board token symbol
<Help hint="What’s the board token symbol?">
<strong>Board token symbol</strong> will be the shortened name
Council token symbol
<Help hint="What’s the council token symbol?">
<strong>Council token symbol</strong> will be the shortened name
(typically in capital letters) assigned to the token
representing your organization's board.{' '}
<em>For example: BRD.</em>
representing the organization's council.{' '}
<em>For example: CNL.</em>
</Help>
</React.Fragment>
}
Expand All @@ -372,7 +372,7 @@ function Board({
id={id}
onChange={handleTokenSymbolChange}
value={tokenSymbol}
placeholder="BRD"
placeholder="CNL"
wide
/>
)}
Expand All @@ -386,7 +386,7 @@ function Board({
${fieldsLayout}
`}
>
<div>Board members</div>
<div>Council members</div>
</div>
}
>
Expand Down Expand Up @@ -434,7 +434,7 @@ function Board({
>
<KnownAppBadge
appName="voting.aragonpm.eth"
label="Voting: Board"
label="Voting: Council"
/>
</span>
settings
Expand All @@ -447,14 +447,14 @@ function Board({
margin-bottom: ${3 * GU}px;
`}
>
These settings affect the decision making process for board members.
These settings affect the decision making process for council members.
</Info>
<Field
label={
<React.Fragment>
Number of signatures
<Help hint="What’s the number of signatures?">
<strong>Number of signatures</strong> is the number of board
<strong>Number of signatures</strong> is the number of council
members who need to approve a vote for it to pass.
</Help>
</React.Fragment>
Expand Down Expand Up @@ -485,10 +485,10 @@ function Board({
<React.Fragment>
Vote duration
<Help hint="What’s the vote duration?">
<strong>Vote Duration</strong> is the length of time that board's
votes will be open for participation. For example, if the Vote
Duration is set to 24 hours, then board members will have 24 hours
to participate in the vote.
<strong>Vote Duration</strong> is the length of time that
council's votes will be open for participation. For example, if
the Vote Duration is set to 24 hours, then council members will
have 24 hours to participate in the vote.
</Help>
</React.Fragment>
}
Expand All @@ -515,18 +515,18 @@ function Board({
)
}

Board.propTypes = {
Council.propTypes = {
dataKey: PropTypes.string,
screenProps: ScreenPropsType.isRequired,
title: PropTypes.string,
}

Board.defaultProps = {
dataKey: 'board',
title: 'Configure board',
Council.defaultProps = {
dataKey: 'council',
title: 'Configure council',
}

Board.formatReviewFields = formatReviewFields
Council.formatReviewFields = formatReviewFields

function Subtitle({ content }) {
const theme = useTheme()
Expand Down Expand Up @@ -698,4 +698,4 @@ function formatReviewFields(screenData) {
]
}

export default Board
export default Council
34 changes: 17 additions & 17 deletions ...lates/fundraising/components/BoardInfo.js → ...tes/fundraising/components/CouncilInfo.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
import { GU, useTheme } from '@aragon/ui'
import { Header, Navigation, ScreenPropsType } from '../../kit'

function BoardInfo({
function CouncilInfo({
screenProps: { back, data, next, screenIndex, screens },
}) {
const handleSubmit = useCallback(
Expand All @@ -17,7 +17,7 @@ function BoardInfo({
return (
<div>
<Header
title="Organization's board"
title="Organization's council"
subtitle="Read the following information attentively"
/>
<div
Expand All @@ -26,30 +26,30 @@ function BoardInfo({
`}
>
<Paragraph>
The board acts as the representatives of the project being funded by
the fundraising campaign. Board members are represented through a
custom token and enforce their decision via a dedicated voting app set
to be used as a multisig. Their privileges are intentionally limited
to protect shareholders.
The council acts as the project team being funded by the fundraising
campaign. Council members are represented through a custom token and
enforce their decisions via a dedicated voting app that acts similarly
to a traditional multisig account. Their privileges are intentionally
limited to protect token holders.
</Paragraph>
<Paragraph>The board only has the ability to:</Paragraph>
<Paragraph>The council only has the ability to:</Paragraph>
<Paragraph>
<Strong>Manage board members.</Strong> The board decides on who is to
be included or excluded from the board.
<Strong>Manage council members.</Strong> The council decides on who is
to be included or excluded from the council.
</Paragraph>
<Paragraph>
<Strong>Open the presale.</Strong> The board decides on when the
<Strong>Open the presale.</Strong> The council decides on when the
presale—and thus the fundraising campaign—is started.
</Paragraph>
<Paragraph>
<Strong>Handle the fundraising's proceeds.</Strong> The fundraising
proceeds are periodically transferred to a Vault / Finance app
controlled by the Board at their discretion.
controlled by the council at their discretion.
</Paragraph>
<Paragraph>
<Strong>Open shareholder votes.</Strong> The board decides on when new
votes should be opened for shareholders to enforce decisions over the
organization.
<Strong>Open token holder votes.</Strong> The council decides on when
new votes should be opened for token holders to enforce decisions over
the organization.
</Paragraph>
</div>
<Navigation
Expand All @@ -63,7 +63,7 @@ function BoardInfo({
)
}

BoardInfo.propTypes = {
CouncilInfo.propTypes = {
screenProps: ScreenPropsType.isRequired,
}

Expand Down Expand Up @@ -105,4 +105,4 @@ Strong.propTypes = {
children: PropTypes.string,
}

export default BoardInfo
export default CouncilInfo
Loading

0 comments on commit 2f8e1e2

Please sign in to comment.