Remove forced default commission/url when pool is closed

Concordium · Nov 16, 2023 · 6c400e8 · 6c400e8
1 parent 2e06a3b
commit 6c400e8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 28 deletions.
diff --git a/app/pages/Accounts/AccountDetailsPage/Baking/AddBaker.tsx b/app/pages/Accounts/AccountDetailsPage/Baking/AddBaker.tsx
@@ -24,10 +24,7 @@ import {
     convertToAddBakerTransaction,
     validateAddBakerValues,
 } from '~/utils/transactionFlows/addBaker';
-import {
-    ConfigureBakerFlowDependencies,
-    getDefaultCommissions,
-} from '~/utils/transactionFlows/configureBaker';
+import { ConfigureBakerFlowDependencies } from '~/utils/transactionFlows/configureBaker';
 import AddBakerStakePage from '~/components/Transfers/configureBaker/AddBakerStakePage';
 import DelegationStatusPage from '~/components/Transfers/configureBaker/DelegationStatusPage';
 import CommissionsPage from '~/components/Transfers/configureBaker/CommissionsPage';
@@ -83,12 +80,7 @@ export default withDeps(
 
         // eslint-disable-next-line react-hooks/exhaustive-deps
         const convert = useCallback(
-            convertToAddBakerTransaction(
-                getDefaultCommissions(chainParameters),
-                account,
-                nonce,
-                exchangeRate
-            ),
+            convertToAddBakerTransaction(account, nonce, exchangeRate),
             [account, nonce, exchangeRate, chainParameters]
         );
 

diff --git a/app/pages/multisig/AccountTransactions/AddBaker.tsx b/app/pages/multisig/AccountTransactions/AddBaker.tsx
@@ -27,7 +27,6 @@ import {
 } from '~/utils/transactionFlows/addBaker';
 import {
     ConfigureBakerFlowDependencies,
-    getDefaultCommissions,
     displayPoolOpen,
     displayRestakeEarnings,
 } from '~/utils/transactionFlows/configureBaker';
@@ -59,10 +58,7 @@ const DisplayValues = ({
     chainParameters,
     ...values
 }: DisplayProps) => {
-    const sanitized = getSanitizedAddBakerValues(
-        values,
-        getDefaultCommissions(chainParameters)
-    );
+    const sanitized = getSanitizedAddBakerValues(values);
 
     const {
         stake,
@@ -185,7 +181,6 @@ export default withDeps(
                 nonce: bigint
             ) =>
                 convertToAddBakerTransaction(
-                    getDefaultCommissions(chainParameters),
                     account,
                     nonce,
                     exchangeRate

diff --git a/app/utils/transactionFlows/addBaker.ts b/app/utils/transactionFlows/addBaker.ts
@@ -14,11 +14,9 @@ import {
     MakeOptional,
     MakeRequired,
     NotOptional,
-    OpenStatus,
     TransactionKindId,
 } from '../types';
 import {
-    Commissions,
     ConfigureBakerFlowState,
     toConfigureBakerPayload,
     convertToBakerTransaction,
@@ -37,29 +35,21 @@ export type AddBakerPayload = MakeOptional<
 export const addBakerTitle = 'Register as a validator';
 
 export const getSanitizedAddBakerValues = (
-    values: Partial<AddBakerFlowState>,
-    defaultCommissions: Commissions
+    values: Partial<AddBakerFlowState>
 ) => {
     const sanitized = {
         ...values,
     };
 
-    if (values.openForDelegation === OpenStatus.ClosedForAll) {
-        // Ensure default pool settings are used when opting for closed pool.
-        sanitized.metadataUrl = '';
-        sanitized.commissions = defaultCommissions;
-    }
-
     return sanitized;
 };
 
 export const convertToAddBakerTransaction = (
-    defaultCommissions: Commissions,
     account: Account,
     nonce: bigint,
     exchangeRate: Fraction
 ) => (values: AddBakerFlowState, expiry?: Date): ConfigureBaker => {
-    const sanitized = getSanitizedAddBakerValues(values, defaultCommissions);
+    const sanitized = getSanitizedAddBakerValues(values);
 
     return convertToBakerTransaction(
         account,