Skip to content
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

Voting: update terminology to prefer 'cast' #1123

Merged
merged 1 commit into from
Apr 10, 2020
Merged

Voting: update terminology to prefer 'cast' #1123

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
4 changes: 2 additions & 2 deletions apps/voting/app/src/components/VoteCasted.js → apps/voting/app/src/components/VoteCast.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useAppState } from '@aragon/api-react'
import useExtendedVoteData from '../hooks/useExtendedVoteData'
import { VOTE_YEA } from '../vote-types'

function VoteCasted({ vote }) {
function VoteCast({ vote }) {
const { connectedAccountVote } = vote
const { userBalance } = useExtendedVoteData(vote)
const { tokenSymbol } = useAppState()
Expand Down Expand Up @@ -86,4 +86,4 @@ function VoteCasted({ vote }) {
)
}

export default VoteCasted
export default VoteCast
15 changes: 8 additions & 7 deletions apps/voting/app/src/screens/VoteDetail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import LocalLabelAppBadge from '../components/LocalIdentityBadge/LocalLabelAppBa
import SummaryBar from '../components/SummaryBar'
import SummaryRows from '../components/SummaryRows'
import VoteActions from '../components/VoteActions'
import VoteCast from '../components/VoteCast'
import VoteStatus from '../components/VoteStatus'
import VoteText from '../components/VoteText'
import VoteCasted from '../components/VoteCasted'
import { percentageList, round, safeDiv } from '../math-utils'
import { getQuorumProgress } from '../vote-utils'
import { VOTE_NAY, VOTE_YEA } from '../vote-types'
Expand Down Expand Up @@ -189,7 +189,7 @@ function VoteDetail({ vote, onBack, onVote, onExecute }) {
symbol={tokenSymbol}
connectedAccountVote={connectedAccountVote}
/>
{youVoted && <VoteCasted vote={vote} />}
{youVoted && <VoteCast vote={vote} />}
</div>
<VoteActions
onExecute={handleExecute}
Expand Down Expand Up @@ -246,11 +246,12 @@ function VoteDetail({ vote, onBack, onVote, onExecute }) {
<React.Fragment>
Minimum Approval %
<Help hint="What is Minimum Approval?">
<strong>Minimum Approval</strong> is the percentage of
the total token supply that is required to vote “Yes” on
a proposal before it can be approved. For example, if the
“Minimum Approval” is set to 20%, then more than 20% of the
outstanding token supply must vote “Yes” on a proposal for it to pass.
<strong>Minimum Approval</strong> is the percentage of the
total token supply that is required to vote “Yes” on a
proposal before it can be approved. For example, if the
“Minimum Approval” is set to 20%, then more than 20% of the
outstanding token supply must vote “Yes” on a proposal for
it to pass.
</Help>
</React.Fragment>
}
Expand Down
2 changes: 1 addition & 1 deletion apps/voting/app/src/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ async function updateConnectedAccount(state, { account }) {
connectedAccount = account
return {
...state,
// fetch all the votes casted by the connected account
// Fetch all the votes cast by the connected account
connectedAccountVotes: state.votes
? await getAccountVotes({
connectedAccount: account,
Expand Down