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

Fix commission sort and baker mentions #147

Merged
1 commit merged into from
Nov 30, 2023
Merged

Fix commission sort and baker mentions #147

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 backend/Application/Api/GraphQL/Bakers/BakersQuery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ public IQueryable<Baker> GetBakers(
BakerSort.DelegatorCountDesc => result.OrderBy(x => x.ActiveState.Pool.DelegatorCount == null).ThenByDescending(x => x.ActiveState!.Pool!.DelegatorCount),
BakerSort.BakerApy30DaysDesc => result.OrderBy(x => x.RemovedState.RemovedAt != null).ThenBy(x => x.PoolApys.Apy30Days.BakerApy == null).ThenByDescending(x => x.PoolApys!.Apy30Days.BakerApy),
BakerSort.DelegatorApy30DaysDesc => result.OrderBy(x => x.RemovedState.RemovedAt != null).ThenBy(x => x.PoolApys.Apy30Days.DelegatorsApy == null).ThenByDescending(x => x.PoolApys!.Apy30Days.DelegatorsApy),
BakerSort.BlockCommissionsAsc => result.OrderBy(x => x.ActiveState!.Pool!.CommissionRates.BakingCommission),
BakerSort.BlockCommissionsDesc => result.OrderByDescending(x => x.ActiveState!.Pool!.CommissionRates.BakingCommission),
BakerSort.BlockCommissionsAsc => result.OrderBy(x => x.ActiveState!.Pool!.PaydayStatus.CommissionRates.BakingCommission != null).ThenBy(x => x.ActiveState!.Pool!.PaydayStatus.CommissionRates.BakingCommission),
BakerSort.BlockCommissionsDesc => result.OrderByDescending(x => x.ActiveState!.Pool!.PaydayStatus.CommissionRates.BakingCommission != null).ThenByDescending(x => x.ActiveState!.Pool!.PaydayStatus.CommissionRates.BakingCommission),
_ => throw new NotImplementedException()
};

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Accounts/AccountDetailsBaker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<dl class="grid grid-cols-2 col-span-2 px-4">
<dt id="bakeraccordion-bakerid">Baker ID</dt>
<dt id="bakeraccordion-bakerid">Validator ID</dt>
<dd class="text-right mb-2" aria-labelledby="bakeraccordion-bakerid">
<BakerLink :id="baker.bakerId" />
</dd>
Expand Down
14 changes: 7 additions & 7 deletions frontend/src/utils/translateTransactionTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ const translations = {
INITIALIZE_SMART_CONTRACT_INSTANCE: 'Initialize Smart Contract',
UPDATE_SMART_CONTRACT_INSTANCE: 'Update Smart Contract',
SIMPLE_TRANSFER: 'Simple transfer',
ADD_BAKER: 'Add baker',
CONFIGURE_BAKER: 'Configure baker',
ADD_BAKER: 'Add validator',
CONFIGURE_BAKER: 'Configure validator',
CONFIGURE_DELEGATION: 'Configure delegation',
REMOVE_BAKER: 'Remove baker',
UPDATE_BAKER_STAKE: 'Update baker stake',
UPDATE_BAKER_RESTAKE_EARNINGS: 'Update baker restake earnings',
UPDATE_BAKER_KEYS: 'Update baker keys',
REMOVE_BAKER: 'Remove validator',
UPDATE_BAKER_STAKE: 'Update validator stake',
UPDATE_BAKER_RESTAKE_EARNINGS: 'Update validator restake earnings',
UPDATE_BAKER_KEYS: 'Update validator keys',
UPDATE_CREDENTIAL_KEYS: 'Update credential keys',
ENCRYPTED_TRANSFER: 'Encrypted transfer',
TRANSFER_TO_ENCRYPTED: 'Transfer to encrypted',
Expand Down Expand Up @@ -45,7 +45,7 @@ const translations = {
UPDATE_POOL_PARAMETERS: 'Update pool parameters',
UPDATE_TRANSACTION_FEE_DISTRIBUTION: 'Update transaction fee distribution',
UPDATE_GAS_REWARDS: 'Update gas rewards',
UPDATE_BAKER_STAKE_THRESHOLD: 'Update baker stake threshold',
UPDATE_BAKER_STAKE_THRESHOLD: 'Update validator stake threshold',
UPDATE_COOLDOWN_PARAMETERS: 'Update cooldown parameters',
UPDATE_ADD_ANONYMITY_REVOKER: 'Add anonymity revoker',
UPDATE_ADD_IDENTITY_PROVIDER: 'Add identity provider',
Expand Down