From eb63dd5abd195f6b0a6999d9d9f411e6f7c283fd Mon Sep 17 00:00:00 2001
From: schwartz-concordium
 <132270889+schwartz-concordium@users.noreply.github.com>
Date: Wed, 29 Nov 2023 17:44:07 +0100
Subject: [PATCH] Fix bugs

---
 .../Application/Api/GraphQL/Bakers/BakersQuery.cs  |  4 ++--
 .../components/Accounts/AccountDetailsBaker.vue    |  2 +-
 frontend/src/utils/translateTransactionTypes.ts    | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/backend/Application/Api/GraphQL/Bakers/BakersQuery.cs b/backend/Application/Api/GraphQL/Bakers/BakersQuery.cs
index 886b157de..6964417b7 100644
--- a/backend/Application/Api/GraphQL/Bakers/BakersQuery.cs
+++ b/backend/Application/Api/GraphQL/Bakers/BakersQuery.cs
@@ -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()
         };
 
diff --git a/frontend/src/components/Accounts/AccountDetailsBaker.vue b/frontend/src/components/Accounts/AccountDetailsBaker.vue
index 0528ebbcb..4263aae5d 100644
--- a/frontend/src/components/Accounts/AccountDetailsBaker.vue
+++ b/frontend/src/components/Accounts/AccountDetailsBaker.vue
@@ -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>
diff --git a/frontend/src/utils/translateTransactionTypes.ts b/frontend/src/utils/translateTransactionTypes.ts
index c59b307b4..294ca3d5f 100644
--- a/frontend/src/utils/translateTransactionTypes.ts
+++ b/frontend/src/utils/translateTransactionTypes.ts
@@ -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',
@@ -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',