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

Tokens: update terminology to prefer 'tokenholder' #1122

Merged
merged 1 commit into from
Apr 10, 2020
Merged

Tokens: update terminology to prefer 'tokenholder' #1122

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
2 changes: 1 addition & 1 deletion apps/token-manager/app/src/components/InfoBoxes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function InfoBoxes({
</Box>
<Box heading="Ownership Distribution">
<Distribution
heading="Token holder stakes"
heading="Tokenholder stakes"
items={stakes}
renderLegendItem={({ item: account }) => {
const isCurrentUser = addressesEqual(account, connectedAccount)
Expand Down
4 changes: 2 additions & 2 deletions apps/token-manager/app/src/screens/EmptyState.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ const EmptyState = React.memo(function NoVotes({ onAssignHolder }) {
`}
>
<EmptyStateCard
text="There are no token holders yet!"
text="There are no tokenholders yet!"
action={
<Button wide mode="strong" onClick={onAssignHolder}>
Add tokens to an address
</Button>
}
illustration={
<img css="margin: auto;" src={emptyIcon} alt="No token holders" />
<img css="margin: auto;" src={emptyIcon} alt="No tokenholders" />
}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/token-manager/app/src/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ function initState({ token, tokenAddress }) {
...tokenSettings,
}

// It's safe to not refresh the balances of all token holders
// It's safe to not refresh the balances of all tokenholders
// because we process any event that could change balances, even with block caching

return inititalState
Expand Down
4 changes: 2 additions & 2 deletions apps/token-manager/test/tokenmanager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ contract('Token Manager', ([root, holder, holder2, anyone]) => {
await assertRevert(tokenManager.assign(holder, 51), errors.TM_ASSIGN_TRANSFER_FROM_REVERTED)
})

it('allows token holders to forwards actions', async () => {
it('allows tokenholders to forwards actions', async () => {
const executionTarget = await ExecutionTarget.new()
await tokenManager.mint(holder, 100)

Expand All @@ -257,7 +257,7 @@ contract('Token Manager', ([root, holder, holder2, anyone]) => {
assert.equal(await executionTarget.counter(), 1, 'should have received execution call')
})

it('disallows non-token holders from forwarding actions', async () => {
it('disallows non-tokenholders from forwarding actions', async () => {
const executionTarget = await ExecutionTarget.new()
const action = { to: executionTarget.address, calldata: executionTarget.contract.execute.getData() }
const script = encodeCallScript([action])
Expand Down